Olivier Goffart
e8e27b61f6
Revert the changes that fetch the file id in the propagator.
...
We don't want to fetch the file id in the propagator.
Revert "Put item member variable to base class."
This reverts commit f7aa2aa348
.
Revert "Add isValidFileId and getFileIdPropget methods."
This reverts commit ccd254abba
.
2013-11-14 14:59:03 +01:00
Klaas Freitag
f7aa2aa348
Put item member variable to base class.
2013-11-14 11:37:32 +01:00
Klaas Freitag
ccd254abba
Add isValidFileId and getFileIdPropget methods.
2013-11-14 11:37:08 +01:00
Daniel Molkentin
8f61cc4041
Hint the OS to not show [?] in Wizards and Dialogs
...
Fixes #1156
2013-11-13 20:12:56 +01:00
Daniel Molkentin
21c9fc2d35
Cleanup
2013-11-13 19:11:46 +01:00
Daniel Molkentin
171572e400
Remember paused state throughout application restarts
...
Fixes #823
2013-11-13 18:58:35 +01:00
Olivier Goffart
52e01b39d6
Adapt to csync 'md5'->'etag' change
2013-11-13 14:28:41 +01:00
Daniel Molkentin
af1dcfd179
Compile fix
2013-11-13 14:24:02 +01:00
Daniel Molkentin
233a6908dd
Partial revert "Compile with Qt5"
...
This reverts commit 878ae56a71
.
2013-11-13 14:19:01 +01:00
Daniel Molkentin
ae83c12f05
Fix compiler warning
2013-11-13 14:19:01 +01:00
Daniel Molkentin
878ae56a71
Compile with Qt5
2013-11-13 14:00:12 +01:00
Daniel Molkentin
ca79d3b437
Merge remote-tracking branch 'origin/master' into account_refactoring
2013-11-13 13:55:58 +01:00
Klaas Freitag
14081a197b
Call ne_sock_init and ne_sock_exit to initialize neons SSL stack.
...
See https://github.com/owncloud/mirall/issues/1115 for more details on
why that is done here now.
2013-11-11 17:47:24 +01:00
Daniel Molkentin
9fe2549938
Add user info if the auth backends provides it
2013-11-11 16:57:15 +01:00
Klaas Freitag
e0a50d4bb9
PostSyncCleanup added: Remove superfluous entries from database after
...
sync.
2013-11-11 16:45:40 +01:00
Daniel Molkentin
ad1c1f4130
Remove legacy code
2013-11-11 15:36:49 +01:00
Daniel Molkentin
406ed5a0c0
Make new folder wizard work again
2013-11-11 15:20:07 +01:00
Daniel Molkentin
d5081f4328
Fix logic
2013-11-11 14:02:54 +01:00
Daniel Molkentin
95d7afb0d0
cleanups
2013-11-11 10:57:33 +01:00
Klaas Freitag
2b2987d962
Make sure to rebuild the recent changes menu.
2013-11-11 10:06:14 +01:00
Klaas Freitag
2eb77445be
Add rename actions to progress dispatching.
...
With that fix rename operations are shown as such in the progress
window and in bubble help etc.
2013-11-08 16:21:59 +01:00
Daniel Molkentin
12b1b38351
Fix connect
2013-11-08 14:02:13 +01:00
Daniel Molkentin
b0abb6362a
Don't set the content header length
...
This breaks POSTS and is not needed in QNAM, since QNAM
does this itself internally.
2013-11-08 14:01:56 +01:00
Klaas Freitag
a458ffd472
Add missing return in error case.
2013-11-08 12:56:54 +01:00
Daniel Molkentin
60b6f520e7
Make Shibboleth browser aware of Accounts
...
Needed for SSL error handling. It's also more consistent.
2013-11-07 18:47:38 +01:00
Daniel Molkentin
8d0d5b4077
Make redirects work
2013-11-07 18:46:57 +01:00
Daniel Molkentin
5c9a6afb82
Fix crash when opening settings without a valid account
2013-11-07 18:46:28 +01:00
Klaas Freitag
162acc1cc2
Fix conflict file handling, create a proper conflict file name.
...
Before this fix, the conflict file name was set in the file name
variable which lead to the problem that the subsequent rename of
the temp file to the final final filename was moving the temp file on
the conflict file. No final file was there.
2013-11-07 16:53:22 +01:00
Daniel Molkentin
33c3d2a7d0
Wizard: Initialize account credentials.
...
Required to be able to readily retrieve the user name later on
2013-11-07 15:24:49 +01:00
Daniel Molkentin
1238ab4f69
fix broken connect() statement
2013-11-07 12:50:55 +01:00
Daniel Molkentin
a42ff5a07c
Show floating point prec. in account settings, too
2013-11-07 12:50:39 +01:00
Daniel Molkentin
aa4b6bd4ea
Readd "online" notion as a state in account.
...
This gets updated by the ConnectionValidator. Not sure if that's
the best choice, but it mimmicks the old behavior the closest.
2013-11-07 12:22:17 +01:00
Daniel Molkentin
478ba9c5ef
Fix approved SSL certificates being forgotten
2013-11-07 12:04:45 +01:00
Daniel Molkentin
bd46ad56fc
Add new quotainfo class
2013-11-07 10:14:38 +01:00
Daniel Molkentin
bde5e86c50
Reformatting fixes
2013-11-07 10:14:25 +01:00
Daniel Molkentin
ec0f01fd7c
Ensure an SSL Error Handler is always available
2013-11-07 10:14:12 +01:00
Klaas Freitag
fe4c1cc35a
Remove straycat code from mirall.
2013-11-06 14:20:44 +01:00
Daniel Molkentin
3af622d535
Make quota display work
2013-11-05 18:15:47 +01:00
Klaas Freitag
ee4cbf52dc
Remove straycats collected in the reconcile phase from journal.
2013-11-05 17:53:01 +01:00
Klaas Freitag
5cd2be058d
Fix local rename.
2013-11-05 17:50:09 +01:00
Klaas Freitag
3a21edca2b
Keep originalFile member as QString rather than C string.
...
This avoids encoding problems with interesting file names.
2013-11-05 17:48:51 +01:00
Klaas Freitag
c6a926842a
Fix recursivley flag misinterpretation.
2013-11-05 17:47:51 +01:00
Daniel Molkentin
440b5164ad
Build fix
2013-11-04 16:41:59 +01:00
Daniel Molkentin
cc5f17a7d2
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
src/mirall/folder.cpp
2013-11-04 16:38:55 +01:00
Daniel Molkentin
85d5b82811
- Make saving/restoring accounts work.
...
- Prepare for fetching quota
2013-11-04 16:36:23 +01:00
Olivier Goffart
f0a1ac4346
Fix syncing folder with nothing in it
...
Do the start after connecting, as the finish may be imediate if there
is nothing to do.
2013-10-31 12:11:56 +01:00
Olivier Goffart
bdc39f9cc2
Allow folder that are prefix of another
2013-10-31 11:41:56 +01:00
Olivier Goffart
d3ae2f42a7
Reset the proxy module property at every sync
...
This is required for the fix for #713
Since the module properties are shared in global variables shared by
every folders, removing another folder may clean the proxy settings.
So we need to restore them at every sync
2013-10-31 11:39:43 +01:00
Olivier Goffart
df39ab0b2f
Don't leak the system tray
2013-10-31 10:52:19 +01:00
Olivier Goffart
28833ee5ac
Fix crash when removing folder while syncing.
...
We need to set _thread to 0 after destoying it
2013-10-31 10:51:45 +01:00
Klaas Freitag
c66a1d1895
Removed unused code from LocalRename
2013-10-30 18:14:33 +01:00
Klaas Freitag
cdee0dc1cf
Added a PropagateLocalRename job to do local renames.
2013-10-30 17:37:34 +01:00
Klaas Freitag
a43c5fcfe8
Fix header name according to changes on server master.
2013-10-30 17:37:34 +01:00
Olivier Goffart
5c67f39476
Ignore error 404 on DELETE
...
This may happen if we have stale entries in the database
2013-10-30 17:33:06 +01:00
Olivier Goffart
fb47657b1f
Make F6 in the account config sync the selected folder, for debugging purposes
...
Issue #409
2013-10-30 16:58:08 +01:00
Olivier Goffart
76d46af4b7
Revert "Implement a sync now button"
...
Actually, after discussion with the team, we decided this button is a bad idea
This reverts commit b56fcd8ebd
.
2013-10-30 16:48:28 +01:00
Daniel Molkentin
86af2848dd
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
Daniel Molkentin
4ca310b63b
Remove ownCloudInfo for good
2013-10-30 16:33:15 +01:00
Daniel Molkentin
14c2ff44f3
More porting to Account class
...
- Finish port of owncloud setup wizard to Account
- Deprive MirallConfigFile of the customHandle
2013-10-30 16:31:47 +01:00
Olivier Goffart
b56fcd8ebd
Implement a sync now button
...
The button is in the account config, next to the "pause/resume" button
Fixes #409
2013-10-30 16:27:00 +01:00
Olivier Goffart
e38d6d974b
Replace _Button* with _button
...
Identifiers starting with underscore and uppercase are reserved in C++.
2013-10-30 15:52:30 +01:00
Olivier Goffart
9500c5ffab
Do not change the instruction anymore when we finish an item
...
The status is in the status. Keep the original instruction so the
UI knows what to display for eath item
2013-10-30 10:46:05 +01:00
Olivier Goffart
b079cedbf5
Use the status instead of the instruction for finished items
2013-10-30 10:44:41 +01:00
Olivier Goffart
6e088e28f5
Adjust the mtime in case of fake conflicts
...
"Fake conflicts" happen when the etag changes on the server, and the
mtime changes on the client, but the actual file is still exactly
the same. We correctly detect them as false conflict and we do not
generate the conflict file for them.
But we should also update the local mtime to the server mtime so future
sync don't get confused.
2013-10-29 12:23:51 +01:00
Olivier Goffart
01e2743bae
Always download the conflicted files.
...
Conflicts have a direction==NONE. And they need to be downloaded, not uploaded
2013-10-29 12:13:30 +01:00
Olivier Goffart
75ffa787a6
emit the EndDownload progress at the right place.
...
It was put in rename instead of download
2013-10-29 12:13:30 +01:00
Olivier Goffart
4ad9f34807
Save the UPDATED files in the database
...
Those are files that were detected as "resolved conflict".
They should have been a conflict because they both were new, or both
had their local mtime or remote etag modified, but the size and mtime
is the same on the server. This typically happen when the database is removed.
Nothing will be done for those file, but we still need to update the database.
2013-10-29 12:13:30 +01:00
Daniel Molkentin
a91799a11c
Make the setup wizard compile again
...
- introduces more jobs
- needs more cleaning up
2013-10-28 20:01:59 +01:00
Olivier Goffart
adc47948a5
Add a comment explaining OwncloudPropagator::start
2013-10-28 17:00:27 +01:00
Olivier Goffart
6e886e28e9
Merge branch 'propagator-job'
...
Conflicts:
src/mirall/owncloudpropagator.cpp
2013-10-28 16:26:25 +01:00
Olivier Goffart
84a40dcb59
Refactor the new propagator in jobs
...
This makes the code (IMHO) more easy to understand, and will allow
even more easy parallelism
2013-10-28 15:58:35 +01:00
Klaas Freitag
68ba99b7f0
Fixed fileID parsing and improved logging.
2013-10-28 15:28:34 +01:00
Klaas Freitag
2fefc428a8
Write file Id to journal table.
...
Since this requires a change of existing sync journals, database migration
code was added.
2013-10-25 13:31:00 +02:00
Klaas Freitag
17220f2604
Query file Id from server if unknown.
2013-10-25 13:31:00 +02:00
Klaas Freitag
7a68961b25
Add handling for the file_id data to the sync items.
2013-10-25 13:31:00 +02:00
Daniel Molkentin
aa2baa45fb
Cleanups, ownership for ssl error handler
2013-10-24 12:55:26 +02:00
Daniel Molkentin
eda5feb82c
Bring back proper ssl handling
2013-10-24 00:29:08 +02:00
Daniel Molkentin
d2b445c80c
Basic port, misses wizard
2013-10-23 14:48:53 +02:00
hefee
a927caf2b0
Fixing Utility::platform for all platforms
2013-10-23 00:59:29 +02:00
Daniel Molkentin
29c846a764
WIP: Dissolve owncloudinfo class
2013-10-21 21:42:52 +02:00
Daniel Molkentin
a91ba0fd48
WIP: Move network tasks from ownCloudInfo into Job classes.
2013-10-18 12:24:29 +02:00
Daniel Molkentin
a25d55a265
Add QtJson to 3rdparty, use it in ownCloudInfo
2013-10-18 02:00:19 +02:00
Olivier Goffart
0efbfb10aa
Fix MOVE of directory.
...
Remove the right entry from the database (i.e: the original file name)
Fetch the etags of the sub entries
2013-10-17 13:06:39 +02:00
Olivier Goffart
cb8006b89f
Fix comments of the propagation step.
...
Also, don't mark item as removed if the instruction is not REMOVE
2013-10-17 12:09:44 +02:00
Klaas Freitag
660469cbf5
Do not propagate a move of the Shared folder.
2013-10-17 10:48:31 +02:00
Daniel Molkentin
a06e551469
Merge pull request #1103 from Absolight/freebsd-port
...
Patches for FreeBSD
2013-10-16 08:52:46 -07:00
Olivier Goffart
746b86a1dd
Save the progress db once a chunk has been upload
...
Allow to resume when we cancel the sync
2013-10-16 16:47:24 +02:00
Mathieu Arnold
1c594b6a8d
FreeBSD doesn't have statvfs64, like MacOS X.
2013-10-16 15:57:59 +02:00
Olivier Goffart
313832de8d
Put the progress database within the journal
2013-10-16 12:01:14 +02:00
Olivier Goffart
2c63f7a24d
Merge branch '1.4'
...
Conflicts:
VERSION.cmake
src/mirall/application.cpp
src/mirall/application.h
src/mirall/csyncthread.cpp
src/mirall/folder.cpp
src/mirall/folder.h
src/mirall/folderman.cpp
2013-10-15 17:00:53 +02:00
Olivier Goffart
10fba886dc
Do not elide the progress text
...
It's size is computed so the text fit, there is no need to alide it.
Fixes #1094
2013-10-15 14:58:34 +02:00
Klaas Freitag
d0d362664b
Handle proxy on folder level, not folderman level.
2013-10-14 16:11:52 +02:00
Klaas Freitag
f841450dae
Do append non empty lines not starting with a hash to ignores.
2013-10-14 16:11:52 +02:00
Klaas Freitag
a3927c5c2c
Avoid quick flickering up of the ok-icon for the sync prepare state.
...
For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
2013-10-14 12:59:08 +02:00
Klaas Freitag
89cfa387cd
Remove bogus html formatting tag.
2013-10-14 11:46:02 +02:00
Olivier Goffart
1fccb23442
Don't show desktop notification when the user don't want to
...
Fix #1093
2013-10-14 11:33:47 +02:00
Klaas Freitag
bfd50ffcd0
Do not show progress if nothing is transmitted, show number of deletes.
2013-10-14 11:16:17 +02:00
Klaas Freitag
4f2a171913
Avoid quick flickering up of the ok-icon for the sync prepare state.
...
For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
2013-10-11 17:54:26 +02:00
Daniel Molkentin
005d70a73c
Proxy support: Reset useSystemConfiguration() in all cases but DefaultProxy
...
Fixes #1016
2013-10-11 14:25:35 +02:00
Klaas Freitag
592291cbcb
Fix initialized after warning.
2013-10-11 12:10:47 +02:00
Klaas Freitag
7236bd7dd4
Make problem warnings not appearing in the tray.
...
This fixes bug #944 : Do not show the warning icon in the tray.
2013-10-11 12:09:27 +02:00
Klaas Freitag
c02d5f41a5
Remove bogus html formatting tag.
2013-10-11 12:09:27 +02:00
Daniel Molkentin
5a7cd815ab
Reconnect if network is unavailable after startup
...
Fixes : #1080
2013-10-11 11:43:23 +02:00
Klaas Freitag
fb4728c7ee
Handle sync enable flag correctly in folder scheduling.
...
This fixes bug #1083 .
Conflicts:
src/mirall/folder.cpp
2013-10-10 11:32:56 +02:00
Klaas Freitag
f34621578e
Use qint64 rather than int64_t.
2013-10-09 14:33:24 +02:00
Klaas Freitag
5e50b1f1fd
Add some progress meassuring logging.
2013-10-09 14:33:09 +02:00
Klaas Freitag
3c95d342ee
Handle sync enable flag correctly in folder scheduling.
...
This fixes bug #1083 .
2013-10-09 14:27:28 +02:00
Klaas Freitag
53ac5427a8
Integrate progress dialog into settings dialog.
2013-10-09 14:27:28 +02:00
Klaas Freitag
1ed8afba09
Minor changes.
2013-10-09 14:27:28 +02:00
Klaas Freitag
ef81a8a2ad
Use qint64 rather than int64_t.
2013-10-08 15:41:15 +02:00
Klaas Freitag
fa9d1614e7
Add some progress meassuring logging.
2013-10-08 14:07:46 +02:00
Olivier Goffart
05fbfb520f
Protect the sync database by a mutex since it is used by the thread
2013-10-04 21:05:46 +02:00
Daniel Molkentin
805e1330ad
Compile with MinGW
2013-10-04 20:29:42 +02:00
Olivier Goffart
7c6fcf688c
Fix the fact that some success was reported as error
2013-10-04 15:55:59 +02:00
Olivier Goffart
127055dd70
Refactor a bit the error reporting from the propagator
...
Add different classes of error failures.
Fatal error means the sync should be stopped.
SoftErrors are not to be displayed to the user.
We still need to make a classification of the errors.
2013-10-04 15:55:59 +02:00
Markus Goetz
f4929e849e
CsyncThread: Activate recursive PROPFIND
2013-10-04 15:42:40 +02:00
Olivier Goffart
d8d2d36638
Fix SQL Query
2013-10-03 23:00:47 +02:00
Olivier Goffart
baa9ba089c
Save the database after each operation.
2013-10-03 22:41:12 +02:00
Olivier Goffart
3495b822a5
TMP
2013-10-03 20:01:07 +02:00
Daniel Molkentin
be88d425fc
Fix connecting to the mysql db
2013-10-03 19:52:09 +02:00
Klaas Freitag
94a06cec5b
WIP on the journal database.
2013-10-03 18:52:02 +02:00
Klaas Freitag
4008f6b309
Fix file status enum names.
2013-10-03 17:55:32 +02:00
Klaas Freitag
daac6886a0
Added method setFileRecord to update sync journal
2013-10-03 17:48:14 +02:00
Daniel Molkentin
e304dfd5b9
Add socketapi
...
Slightly amended by: Daniel Molkentin <danimo@owncloud.com>
2013-10-03 17:05:01 +02:00
Klaas Freitag
2e3aabf99b
Read header without prefix path now that it's in 3rdparty.
2013-10-03 16:47:48 +02:00
Klaas Freitag
4501c64e61
Do not include whole header of csync_exclude.
2013-10-03 16:22:31 +02:00
Klaas Freitag
273105e78b
Handle new case SyncAbortRequested.
2013-10-03 16:21:54 +02:00
Klaas Freitag
2707116350
Minor fixes for file_status
2013-10-03 16:12:50 +02:00
Klaas Freitag
c7d30bae98
Handle new sync result enum.
2013-10-03 15:32:44 +02:00
Klaas Freitag
be328581a7
Implemented sync status function for overlay icons.
2013-10-03 15:29:10 +02:00
Klaas Freitag
c32bc27b3e
Add sync journal database class that opens the csync db to read from it.
2013-10-03 15:29:10 +02:00
Klaas Freitag
0fef88a9b9
Some comments added.
2013-10-03 15:29:10 +02:00
Klaas Freitag
3e0fc56495
Dont show the [i] icon in the tray, see bug #942
2013-10-03 15:29:10 +02:00
Olivier Goffart
396ec4f888
Fix race condition in the logger.
...
Logs can come from multiple thread, we need to keep the _logstream
protected by a mutex
2013-10-03 14:37:13 +02:00
Olivier Goffart
79ea7c3eed
Abort the sync asynchroniously
...
Don't block the GUI when clicking on pause
Mirall issue #968
2013-10-03 14:36:32 +02:00
Olivier Goffart
b18810f381
Implement abort with the new propagator
...
abort was implemented in csync after the new propagator was written,
so it was not working with the new propagator
2013-10-03 14:35:56 +02:00
Daniel Molkentin
339ed20abc
Utility::showInFileManager(): Substitute valid desktop file parameters
2013-10-03 12:05:00 +02:00
Klaas Freitag
44ed577992
List results for all folders, not only one.
2013-10-03 11:36:18 +02:00
Klaas Freitag
f6685accc3
Use subdirs for more xdg dirs to go through
2013-10-02 19:23:06 +02:00
Klaas Freitag
2c2e79c13d
Consider the folder of items to delete from info window.
2013-10-02 19:23:06 +02:00
Daniel Molkentin
81961068a2
Utility: Move OS specific implementations into separate files
2013-10-02 19:15:56 +02:00
Daniel Molkentin
4e91a6450c
Change the recent changes menu and file item dialog behavior
...
Recent Changes:
- "No items synced recently"
- Add separator to the details section
- Make items clickable (will open file location in file manager)
- If a file was deleted, disable it
File Item Dialog:
- Make items clickable (will open file location in file manager)
This is implemented via a new method Utility::showInFileManager(QString),
which goes through great lengths to use use the right file manager on all
OSes/WMs/DEs, and make sure it selects the file in question if possible.
This needs good testing, though.
Fixes #1044
2013-10-02 18:17:48 +02:00
Daniel Molkentin
3dc2547bb5
WIP
2013-10-02 18:16:32 +02:00
Olivier Goffart
47f299f0ee
Send the last known etag to the server in a If-Match header
...
That way we avoid race conditions in case the file changed between the
update and the reconcile
2013-10-02 15:57:49 +02:00
Olivier Goffart
d135aab86c
clear the etag in every cases, not only when we upload files
2013-10-02 15:57:49 +02:00
Olivier Goffart
e2a2b882bb
Remove the unused errorDetails
...
It was not displayed to the user. Only use errorString instead.
Also report neon error to the user
2013-10-02 15:57:49 +02:00
Klaas Freitag
d8309a64cb
Even more cleanup.
2013-10-02 15:55:15 +02:00
Klaas Freitag
55722099fa
More refactoring: Logger and Logbrowser out of application class.
2013-10-02 15:29:24 +02:00
Klaas Freitag
2149814428
Fix/enhance user information about problems on startup.
...
Pass the error conditions to the gui class.
2013-10-01 18:25:43 +02:00
Klaas Freitag
ea1c951006
Refactoring: Moved all GUI related computing out of application class.
...
Created ownCloudGui class to contain all gui related stuff.
2013-10-01 13:58:01 +02:00
Klaas Freitag
4a96f9a5c9
Add Mirall namespace.
2013-10-01 13:58:01 +02:00
Klaas Freitag
fcc4151810
Fix sequence of directories in help text.
2013-10-01 13:58:01 +02:00
Klaas Freitag
74983af3b4
Make evaluateSync public, review pls.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f5bcb11fe9
Add connected server to error message.
2013-10-01 13:58:00 +02:00
Klaas Freitag
f6f1c638a5
Allow Constructor to be public, for synclibrary
2013-10-01 13:58:00 +02:00
Daniel Molkentin
9b62104f30
Add Folder column to Details sync protocol
...
Also fixes padding
Fixes #1037
2013-09-30 14:12:59 +02:00
Daniel Molkentin
df36ebf308
Merge branch '1.4'
...
Conflicts:
VERSION.cmake
2013-09-30 13:34:10 +02:00
Daniel Molkentin
86e42a9cf0
Fix possible endless loop in inotify
...
Fixes #1041
2013-09-27 20:10:12 +02:00
Klaas Freitag
de9dcbd231
Transmit the new mtime of the file with the PUT request.
...
If the server supports it already, we can save another request by
sending the mtime as a header value in the PUT request and check the
servers reply for a acknoledge header.
2013-09-25 14:26:13 +02:00
Klaas Freitag
5cf13dfa32
Make logging work again.
2013-09-24 15:56:03 +02:00
Klaas Freitag
27b9a5aed9
Merge branch '1.4', brings in the changes we did for 1.4.1
2013-09-24 14:18:25 +02:00
Klaas Freitag
0959ceeff2
Disable delete of folder object temparily.
2013-09-23 15:10:42 +02:00
Klaas Freitag
1988c9d8c4
Do complete sync if network was disconnected.
...
This fixes owncloud/mirall#1007
2013-09-23 15:10:42 +02:00
Klaas Freitag
1eaa1e47fe
Be more careful with items in model when deleting rows.
2013-09-23 15:10:42 +02:00
Klaas Freitag
31923b314e
Removed left over stuff from refactoring.
2013-09-23 15:10:42 +02:00
Klaas Freitag
ee840b62e5
Fix syncEnable in folder and folderman.
2013-09-23 15:10:42 +02:00
Daniel Molkentin
b0beeea95f
More fixes related to object destruction on exit
...
- _logBrowser is not delete on close, call deleteLater
- move writing geometry out of dtor.
- _folderWizard was unused, remove it and all related noops
Hopefully solves #945
2013-09-20 14:18:28 +02:00
Daniel Molkentin
d0a4650d69
Settings: calculate sidebar width dynamically
...
Fixes #1020
2013-09-20 10:40:22 +02:00
Daniel Molkentin
ec5a84cf01
Pop up config wizard if no server url is configured.
...
Fixes #1018 .
2013-09-19 17:24:22 +02:00
Daniel Molkentin
6a8753b119
Start only one wizard, delete it when done
2013-09-19 12:11:46 +02:00
Daniel Molkentin
23fab90a31
_tray is a QPointer, not a QScopedPointer
2013-09-18 16:41:37 +02:00
Daniel Molkentin
8fdf9cac6b
Try to be more graceful during shutdown
...
- Do not delete _tray, use deleteLater() via QScropedPointer
- force closing any dialoges that might want to write their
geometry in aboutToQuit(), before the actual destruction
of the sync thread, etc starts.
This tries to fix #945
2013-09-18 15:42:35 +02:00
Daniel Molkentin
525d12f5a2
Make "Sync started" message optional
...
Fixes #934
2013-09-18 14:14:42 +02:00
Daniel Molkentin
15d247a708
Ui::SslErrorDialog belongs within the Mirall namespace
2013-09-18 14:06:23 +02:00
Daniel Molkentin
a1d0b85277
Add copyright header to syncfileitem.h
...
Fixes #993
2013-09-15 22:49:24 +02:00
Daniel Molkentin
5e5a77b040
Fix parameter order
2013-09-15 22:48:12 +02:00
Daniel Molkentin
e420ae6942
Folder Wizard: Fix various issues
...
- Use data role for pathes
- call root dir "ownCloud"
- don't connect() multiple times
- ensure chars like # or ? in path are interpreted as part of the url path segment
Should fix #992
2013-09-15 22:47:35 +02:00
Thomas Müller
e38d0807c9
moving back to 1024 as divider for kB, MB, GB & TB
...
(cherry picked from commit c87c456ae0
)
2013-09-13 20:14:47 +02:00
Thomas Müller
c87c456ae0
moving back to 1024 as divider for kB, MB, GB & TB
2013-09-13 15:00:49 +02:00
Daniel Molkentin
f97bb240d7
Setting thread priority is only possible after calling start()
2013-09-11 15:52:07 +02:00
Daniel Molkentin
574e029254
Setting thread priority is only possible after calling start()
2013-09-11 15:51:06 +02:00
Klaas Freitag
ce5934461e
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:33:07 +02:00
Klaas Freitag
80332fb6ab
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:30:29 +02:00
Klaas Freitag
287ec2f3df
Enable and disable syncing also in the folder objects.
2013-09-11 10:50:03 +02:00
Klaas Freitag
eb5824f713
Handle startup network errors correctly.
2013-09-11 10:49:45 +02:00
Klaas Freitag
6f637e40d8
Enable and disable syncing also in the folder objects.
2013-09-11 10:32:09 +02:00
Klaas Freitag
ec06663dee
Handle startup network errors correctly.
2013-09-11 10:32:09 +02:00
Olivier Goffart
177114f8d9
Initialize the size of the SyncItem
2013-09-11 08:49:09 +02:00
Olivier Goffart
6bfdfd1af0
Fix progress with new propagator
2013-09-11 08:42:29 +02:00
Daniel Molkentin
fd30df82cb
Folder Wizard: More sanity checks
...
Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes #962
2013-09-10 23:38:00 +02:00
Daniel Molkentin
55f2fcb4c6
Folder Wizard: More sanity checks
...
Check if a server folder or its parent
is already part of a sync and refuse
to create a sync in this case.
Avoids "recursive syncing"
Fixes #962
2013-09-10 23:37:52 +02:00
Daniel Molkentin
f597f99198
Wait up to 30 secs before complaining about missing systray
...
Conflicts:
src/mirall/utility.cpp
Fixes #949
2013-09-10 11:40:02 +02:00
Daniel Molkentin
00d09763af
Fix compile error
2013-09-10 11:37:52 +02:00
Daniel Molkentin
5639572ef3
Wait up to 30 secs before complaining about missing systray
2013-09-10 11:37:52 +02:00
Olivier Goffart
6da2f6bbaa
Qt5: QSettings is no longer case insensitive
2013-09-09 14:00:13 +02:00
Olivier Goffart
198cb43ad6
Qt5: Q_WS_* macro were deprecated, replace by QT_OS_*
...
in particular, QT_WS_X11 is no longer defined
2013-09-09 13:31:39 +02:00
Daniel Molkentin
51a7cbeb55
kill warning
2013-09-05 20:15:55 +02:00
Daniel Molkentin
171a9e1575
fix Qt 5 build on Mac/Win
2013-09-05 19:53:39 +02:00
Klaas Freitag
76deabe4df
Use List to handle errors and display multiline.
2013-09-05 19:28:23 +02:00
Klaas Freitag
74ec37f3c7
Use List to handle errors and display multiline.
2013-09-05 19:25:59 +02:00
Daniel Molkentin
35ac6610c7
Compile with Qt5 on Linux
2013-09-05 17:13:31 +02:00
Daniel Molkentin
23d8f01012
Fix locating translations on linux
2013-09-05 11:08:00 +02:00
Daniel Molkentin
05178f0fbf
Fix locating translations on linux
2013-09-05 11:06:40 +02:00
Klaas Freitag
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Daniel Molkentin
625b21152e
Merge branch 'qt5'
2013-09-04 15:01:21 +02:00
Klaas Freitag
4fa6faf608
Hide quota and display explanation if no quota info is available.
2013-09-03 14:25:28 +02:00
Klaas Freitag
a24ae13d9c
Added logging to quota info result slot.
2013-09-03 14:25:28 +02:00
Klaas Freitag
81c720c05b
Remove dots from the end of error messages.
2013-09-02 17:37:16 +02:00
Klaas Freitag
edcdcb945a
Show the reason why a file was ignored.
2013-09-02 17:25:23 +02:00
Daniel Molkentin
ab4c6247c7
Fix display of "Monochrome icon" setting
...
The logic was inverse, and there was a typo in the string. Oh my...
2013-08-31 14:14:24 +02:00
Olivier Goffart
02b3033ca3
Use the same convention as on the server to format strings
...
* use power of 10 SI units
* use "B" instead of "bytes"
* use at least 2 significant digit, but no more than one digit after
the period
2013-08-29 12:06:41 +02:00
Olivier Goffart
a27c8ad90c
Fix crash in case of error
...
the QObject::parent() is 0
2013-08-28 21:26:42 +02:00
Olivier Goffart
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
Olivier Goffart
336bbb2403
Compile with Qt4
2013-08-28 20:14:40 +02:00
Daniel Molkentin
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
Olivier Goffart
c15de69156
Reconfigure the proxy when needed
2013-08-27 10:02:59 +02:00
Daniel Molkentin
77e7a1fa8d
Fix casing in settings dialog
2013-08-26 20:22:24 +02:00
Daniel Molkentin
f6d45b68ef
More clear error messages
2013-08-26 20:20:10 +02:00
Olivier Goffart
c3326efe94
Do not sort the entries in the syc protocol dialog alphabetically
...
The entries should be sorted chronogically. But now the QTreeWidget can
only sort them alphabetically by the time, which is not what we want.
Disalbe the sorting, and always insert the elements in the reverse
order.
Fix #890
2013-08-26 17:27:44 +02:00
Daniel Molkentin
c0e056bb84
Only show help if a URL is provided
2013-08-26 14:27:39 +02:00
Olivier Goffart
e78eab46ff
Fix saving the geometry of the log browser
2013-08-23 12:41:29 +02:00
Olivier Goffart
19a08f8d5e
Make remember the size of the settings dialog
...
Before, we saved the geometry in the closeEvent which is only called if
the user press the [x] in the title bar. But it is not called when the
user accept the dialog (by pressing the close button or the enter key)
So save the geometry in the destructor of the dialog instead.
One also must call delete from the Application destructor because it was
leaking
2013-08-23 12:25:16 +02:00
Olivier Goffart
c6319117fd
Better default size for the setting dialog
2013-08-23 11:59:49 +02:00
Daniel Molkentin
b0ab3ca80b
Theme: Add documentation after recent changes
2013-08-23 10:36:09 +02:00
Daniel Molkentin
9f89a2fe76
More adjustments around the application name
...
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
APPLICATION_NAME
2013-08-23 10:30:03 +02:00
Daniel Molkentin
e386bfb550
fix x-compilation
2013-08-23 00:36:05 +02:00
Olivier Goffart
d3a333e03c
Fix the 'copy button' in the protocol log
...
Fix #863
Also added more padding for the filename because it might be big, and in
case it's not enough, always add at least a space.
2013-08-22 16:20:04 +02:00
Olivier Goffart
04d3e282fb
Stop the poll timer when the folder is disabled
...
No need to request etag every 30 second for disabled folder.
When the folder is re-enabled, the Timer is actived again after the sync
2013-08-22 12:35:28 +02:00
Olivier Goffart
4be5f970d5
Default to no limit upload
...
We don't want to make the transfer slow by default
2013-08-22 12:26:34 +02:00
Daniel Molkentin
42abf4101c
Honor cmake's install prefix
...
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.
This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
2013-08-22 09:40:25 +02:00
onnozweers
13a6393ec5
Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)
2013-08-21 22:11:02 +02:00
Olivier Goffart
3c2bb1e2bc
Compile after the merge
2013-08-21 15:29:04 +02:00
Olivier Goffart
24af9f38f4
Merge branch 'csync_lgpl' into propagator-ng
...
Conflicts:
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/folder.cpp
src/mirall/progressdispatcher.h
src/mirall/syncfileitem.h
2013-08-21 13:19:02 +02:00
Daniel Molkentin
e5117a98c9
Quota bar: Reduce border width to 1px per request
...
As requested by Jan
2013-08-21 11:34:49 +02:00
Daniel Molkentin
c1f7af7e6f
Write desktop file manually, add gnome startup property
...
Fixes #893
2013-08-21 11:09:56 +02:00
Olivier Goffart
b4c116e2a2
Add the new directories comming from the sync in the watcher
2013-08-21 00:45:36 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02:00
Olivier Goffart
29d2094626
Hide password in the account settings
...
Fix #811
2013-08-19 13:42:01 +02:00
Klaas Freitag
c3b82e6818
Fix sequence for recently changed items.
2013-08-19 13:06:48 +02:00
Olivier Goffart
1a7c89326b
Fix crash when finishing the wizard
...
As shown on this backtrace:
=13334== Invalid read of size 8
QCoreApplication::postEvent(QObject*,QEvent*, int)
Mirall::ownCloudInfo::slotReplyFinished()
[...]
==13334== Address 0x1afb91d8 is 8 bytes inside a block of size 16 free'd
operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
QNetworkAccessManager::~QNetworkAccessManager()
Mirall::MirallAccessManager::~MirallAccessManager()
[...]
Mirall::ownCloudInfo::setNetworkAccessManager(QNetworkAccessManager*)
Mirall::ownCloudInfo::setCustomConfigHandle(QString const&)
Mirall::OwncloudSetupWizard::slotAssistantFinished(int)
[...]
Mirall::OwncloudWizard::basicSetupFinished(int)
Mirall::OwncloudWizard::slotCurrentPageChanged(int)
[...]
QWizard::currentIdChanged(int) (in
Mirall::OwncloudWizard::successfulStep()
Mirall::OwncloudSetupWizard::finalizeSetup(bool)
Mirall::OwncloudSetupWizard::slotAuthCheckReply(QString const&,
[...]
Mirall::ownCloudInfo::ownCloudDirExists(QString const&, QNetworkReply*)
Mirall::ownCloudInfo::slotReplyFinished()
The QNetworkManager was destroyed in a slot connected to a signal emited
by slotReplyFinished, but we did not finish with the QNetworkReply yet.
Fix the crash by using QueuedConnection so the QNetworkAccessManager is
not destroyed before slotReplyFinished has completed.
2013-08-19 12:43:52 +02:00
Daniel Molkentin
3a1f04ac2d
Allow folders with characters that need percent-encoding
...
Fixes #191
2013-08-18 20:24:24 +02:00
Klaas Freitag
a9d94ef732
Show error message in status dialog in error case.
2013-08-18 19:27:20 +02:00
Klaas Freitag
2756d17873
Fix/add missing status strings to theme.
2013-08-18 19:20:25 +02:00
Klaas Freitag
34d7f84fc2
Minor cleanup.
2013-08-18 17:59:03 +02:00
Daniel Molkentin
cea9b389bf
Account Settings: Use native highlight color
2013-08-18 17:00:37 +02:00
Daniel Molkentin
be48cb646c
Setup wizard: Start sync when displaying result page
2013-08-18 15:23:52 +02:00
Klaas Freitag
47eb5ff1d9
Do not keep the log if the log window is not visible.
2013-08-18 13:28:40 +02:00
Klaas Freitag
b608f5a670
Progressbar and quota bar tweaking.
2013-08-17 22:56:02 +02:00
Klaas Freitag
e81dc34c4e
Add a tooltip in the sync protocol list.
2013-08-17 17:57:33 +02:00
Klaas Freitag
1603e627a3
Remove superflous conflict case.
2013-08-17 17:57:33 +02:00
Klaas Freitag
bf978b3e0f
Handle Progress as a namespace rather than a class.
2013-08-17 17:57:33 +02:00
Klaas Freitag
0fdaf33288
Use correct translation call from QCoreApplication.
2013-08-17 17:57:33 +02:00
Klaas Freitag
367c4153c1
Show a bubble if the quota was exceeded.
2013-08-17 17:57:33 +02:00
Klaas Freitag
395c673a24
Fix the quota bar for quotas larger 100%.
2013-08-17 17:57:32 +02:00
Olivier Goffart
22de23c651
Fix the 'no limit' upload setting
...
Fix issue #879
2013-08-17 16:11:45 +02:00
Olivier Goffart
23926d2461
small leak
2013-08-16 20:18:35 +02:00
Olivier Goffart
c03f31b6ba
put the 'Account' item first
2013-08-16 15:09:54 +02:00
Olivier Goffart
a1060a8538
fixup the layout of the account settings
2013-08-16 15:03:38 +02:00
Daniel Molkentin
b9228e64ff
Make Folder Reset an expert option (F5)
...
This feature should not be required, but might be helpful
in the debugging process.
2013-08-15 17:00:07 +02:00
Olivier Goffart
c4084de716
Remove the 'Remove Account' button
...
It is not doing anything right now, and we have no plans to implement it
in a short future
Fix Issue #866
2013-08-15 16:42:08 +02:00
Olivier Goffart
3c667918e7
Fix Reconfiguration keeps sync folder definition
...
Issue #875
2013-08-15 16:35:03 +02:00
Olivier Goffart
e55745cbcf
Remove connection from unexisting signal to unexisting slot
2013-08-15 16:16:22 +02:00
Olivier Goffart
dce8cb83d9
Do not forget the config on the second page of the wizzard
...
Fixes mirral issue #874 where certificate was not stored on the first
page
2013-08-15 15:45:16 +02:00
Olivier Goffart
8dc956c55b
Put all the debug in the log window
...
Don't emit debug before we installed the hook and created he log window
Also no debug if we use --help
2013-08-15 15:45:16 +02:00
Daniel Molkentin
6c77921a32
Admendment of last commit
2013-08-15 13:09:20 +02:00
Daniel Molkentin
55e4748f06
allow relative directories for --confdir
2013-08-15 13:01:05 +02:00
Daniel Molkentin
5ff9e02517
Implement --logfile - (log to stdout)
2013-08-15 12:24:52 +02:00
Klaas Freitag
0e5bfc03ce
Removed label on request of Jan.
2013-08-15 12:17:01 +02:00
Klaas Freitag
b309d333a6
Minor wording and margin fixes.
2013-08-15 11:30:48 +02:00
Daniel Molkentin
ee439382ed
Logger: always log to log widget
2013-08-15 10:56:16 +02:00
Klaas Freitag
192212c682
Handle quota exceeding as error.
2013-08-15 08:15:43 +02:00
Klaas Freitag
148bdfdcd6
Some minor cleanups.
2013-08-15 08:15:43 +02:00
Olivier Goffart
e4128cd5d8
progress with new propagator
2013-08-14 19:59:16 +02:00
Daniel Molkentin
9651f1cddf
Folder Wizard: Decode percent encoding
2013-08-14 19:24:02 +02:00
Daniel Molkentin
5feb9b0806
folderwizard: layout fixes
2013-08-14 19:24:02 +02:00
Klaas Freitag
44b9ee19e7
Flatten the itemprogressdialog and show a flat list.
2013-08-14 18:24:06 +02:00
Klaas Freitag
cc16d19bc4
Removed unused defines.
2013-08-14 18:24:06 +02:00
Klaas Freitag
b96c2de2b7
Cleaned folder class, removed a couple of signals and helper classes.
2013-08-14 18:24:06 +02:00
Klaas Freitag
f882b80708
Fix wording to more consolidated style, Jan request.
2013-08-14 18:24:06 +02:00
Daniel Molkentin
1f274699e5
Pressing F12 in Settings now open the log browser
2013-08-14 17:46:58 +02:00
Daniel Molkentin
697e355f07
Hide mono icon options if the resource has no mono icons
2013-08-14 16:35:42 +02:00
Olivier Goffart
f8e6326880
Default to not cancel
...
So that the owncloudcmd client is not blocked
2013-08-14 15:44:30 +02:00
Olivier Goffart
67c5f513aa
Fix compilation after merge
2013-08-14 15:36:34 +02:00
Olivier Goffart
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Olivier Goffart
04f32bd397
Revert "TMP threaded"
...
This reverts commit 5bb4c3be43
.
2013-08-14 14:59:32 +02:00
Olivier Goffart
e89bdfc422
Make the Pause button stop the sync
2013-08-14 14:57:56 +02:00
Olivier Goffart
c2cc9e62a7
Fix the brandwith limit
...
The unit in mirall are in kbytes/s, but csync expect byte/s
2013-08-14 14:57:56 +02:00
Daniel Molkentin
1f2ae0d061
Folder Wizard UI clean up
...
Input from Jan
2013-08-14 14:01:33 +02:00
Olivier Goffart
91a39588c6
re-enable the sync if the syncing was disabled because the connection is down at startup
2013-08-14 12:59:56 +02:00
Olivier Goffart
a642f86d5b
Detect connection failure from the polling
2013-08-14 12:34:03 +02:00
Olivier Goffart
00cf290574
reduce a bit the log output
2013-08-14 12:34:03 +02:00
Daniel Molkentin
88b4ff9809
Wording changes proposed by Jan
2013-08-14 11:57:19 +02:00
Daniel Molkentin
ddd0965a82
Fix include after class rename
2013-08-14 11:11:47 +02:00
Klaas Freitag
0a9491ff46
Improved timestamp formatting in item sync progress dialog.
2013-08-14 08:04:46 +02:00
Klaas Freitag
32b44e3d87
Removed unused dialog class.
2013-08-14 08:04:46 +02:00
Klaas Freitag
268004b4ff
Get correct action kind from progress Dispatcher in case of Context
...
kind.
2013-08-14 08:04:46 +02:00
Daniel Molkentin
6c0f6ae62e
Make copy action copy all fields again
...
Fixes #863
2013-08-13 15:39:28 +02:00
Yoann Laissus
b058185d3b
Don't add empty entries in hidden files editor with an empty string
...
or when cancel is clicked
2013-08-12 13:10:16 +02:00
Olivier Goffart
82fb8c49cf
Do not clear the pending event in the polling anymore
...
This is useless, and can even cause problems now since polling only do
a sync when the server has actually changed
2013-08-09 14:10:21 +02:00
Daniel Molkentin
d3378c131a
Fix formatting for 1 byte size in octetsToString()
2013-08-09 13:02:24 +02:00
Daniel Molkentin
ff4d2d488f
Add cancel button to wizard on Mac
...
Fixes #848
2013-08-09 01:08:46 +02:00
Daniel Molkentin
b0852b4cf5
No ... for entires that do not spawn a dialog
2013-08-08 20:27:16 +02:00
Daniel Molkentin
c047b4d4de
Seems autowrapping doesn't work everywhere. Enforce it
2013-08-08 17:52:09 +02:00
Olivier Goffart
6655da9d24
Fix warning
2013-08-08 16:03:57 +02:00
Daniel Molkentin
4e3d4c3153
Credits: Add Jan
2013-08-08 15:51:36 +02:00
Olivier Goffart
52a47fbc67
Force a sync run after 5 minutes
2013-08-08 14:32:14 +02:00
Daniel Molkentin
0086916b4d
Retain all old settings when running the setup wizard
...
Fixes #825
Fixes #759
2013-08-08 13:04:05 +02:00
Klaas Freitag
df5ef6fe67
Added new information icon.
2013-08-08 11:16:28 +02:00
Klaas Freitag
c9e51dcfc1
Display properly elided text in progress.
2013-08-08 11:16:28 +02:00
Daniel Molkentin
c05adfd817
Open Top-Level-Dialogs modal, not semi-modal
2013-08-08 10:36:09 +02:00
Daniel Molkentin
055410e38f
Setup proxy connection before every sync
2013-08-08 00:46:23 +02:00
Daniel Molkentin
c24d6bd71c
Notify user if there is a problem with the inotify watcher
2013-08-07 15:00:10 +02:00
Daniel Molkentin
9b319cf189
Significantly simply logging
2013-08-07 15:00:10 +02:00
Klaas Freitag
1a9eb19f0d
Fix even more compile warnings.
2013-08-07 14:51:31 +02:00
Klaas Freitag
1943cc60b6
Added missing switch cases to calm compiler warnings.
2013-08-07 14:46:57 +02:00
Daniel Molkentin
f8878833de
Fix compiler warning
2013-08-07 12:18:44 +02:00
Klaas Freitag
364d4340fd
Show a more informative problem message in progress.
2013-08-07 12:15:28 +02:00
Klaas Freitag
6226a6ee8f
Enable delete messages for progress display.
2013-08-07 10:28:34 +02:00
Daniel Molkentin
c49edeb09d
Fix regression in FolderWizard over 1.3
...
Now it's possible to also pick subdirectory
of in arbitrary depths again
2013-08-06 21:50:22 +02:00
Klaas Freitag
7e794cd94f
Tell the progress dialog about a new sync result object.
2013-08-06 18:07:59 +02:00
Klaas Freitag
933a62de01
Add recent action entries in correct sequence to menu.
2013-08-06 18:07:31 +02:00
Klaas Freitag
23f8e3b4f8
Allow Delete notification.
2013-08-06 18:06:54 +02:00
Klaas Freitag
3502edf71b
More detailed strings for the progress kind.
2013-08-06 18:06:39 +02:00
Klaas Freitag
4d8a371e43
Display information from SyncResult.
2013-08-06 18:06:05 +02:00
Klaas Freitag
01fd3242c4
Add folder alias to sync result structure.
2013-08-06 18:04:42 +02:00
Klaas Freitag
9c289334e9
Handle notifications for deletes.
2013-08-06 18:04:08 +02:00
Olivier Goffart
a9f23a8331
Get the etag of all subfolder for the root directory
...
The root directory etag is not updated when the files change.
That's why we need to check the etag of all its sub items
2013-08-05 20:13:39 +02:00
Olivier Goffart
5d24599546
Fetch the etag of the folder to see if it has changed before syncing
...
Notice that this does not work for the toplevel directory yet, as
owncloud does not change the etag of the root folder
2013-08-05 20:13:39 +02:00
Olivier Goffart
07d9d3770b
Refactor: move the pollTimer to the folder
2013-08-05 20:13:39 +02:00
Daniel Molkentin
c9ddb12b5a
Build after merge
2013-08-05 20:14:22 +02:00
Daniel Molkentin
0932ee6051
Merge branch 'shibboleth'
...
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
2013-08-05 19:54:06 +02:00
Daniel Molkentin
ee1b8465a3
Revert "Temporarily log HTTP traffic done by MirallAccessManager."
...
This reverts commit 5930ca8ac7
.
2013-08-05 19:47:48 +02:00
Daniel Molkentin
26bd164168
Safer implementation for substitution of WebDav URL
...
- Use of RegEx is dangerous with folder names
containing e.g. '(' or ')'.
- Didn't work in my case at all.
2013-08-05 19:45:24 +02:00
Olivier Goffart
203b9c7f6b
leak fix
2013-08-05 16:49:18 +02:00
Daniel Molkentin
7932ec3cc1
IgnoreListEditor: slightly better text
2013-08-05 16:26:17 +02:00
Daniel Molkentin
3f15e02881
Add support for deletable ignores in IgnoreListEditor.
2013-08-05 16:13:26 +02:00
Olivier Goffart
6fb5c04bde
Finish danimo's patch that refactor the scheduler
...
Wait a full poll interval after the end of the sync
2013-08-05 15:15:15 +02:00
Olivier Goffart
578bcc3522
Remove scheduler logic from folderman and moved it in folderman
...
Also fetch and parse the etag when doing a PROPFIND to get the quota
(Patch from danimo)
2013-08-05 15:15:15 +02:00
Daniel Molkentin
99dea76fd1
Fix path display in folder wizard
...
The new implementation did not work correctly when owncloud is installed
in a subdirectory.
2013-08-05 14:28:05 +02:00
Klaas Freitag
67f57a443c
Disable unknown csync flags for now.
2013-08-05 12:30:24 +02:00
Klaas Freitag
2b3b4f9daf
Start setup wizard if no config exists on startup.
2013-08-05 12:19:53 +02:00
Klaas Freitag
16d81db117
Show deletes in progress.
2013-08-05 09:39:06 +02:00
Krzesimir Nowak
5930ca8ac7
Temporarily log HTTP traffic done by MirallAccessManager.
...
To be reverted later.
2013-08-02 14:30:15 +02:00
Klaas Freitag
49be4a3be2
Propagate soft errors into SyncResult, icon fixes.
2013-08-02 14:22:01 +02:00
Klaas Freitag
5e82dc1841
Some more refinements on item progress
2013-08-02 12:16:21 +02:00
Klaas Freitag
6ce1c17ee1
Give application class control over itemprogressdialog
2013-08-02 11:33:45 +02:00
Krzesimir Nowak
b0236eaa24
Fix folder item being inactive.
2013-08-01 19:11:05 +02:00
Daniel Molkentin
19bbff708e
Improve FolderWizard
2013-08-01 18:22:13 +02:00
Klaas Freitag
1399ea13cc
Fixed rounding of size display.
2013-08-01 16:58:36 +02:00
Klaas Freitag
a25d9fd3b4
Added itemprogressdialog class to show the sync progress and problems.
2013-08-01 16:58:36 +02:00
Krzesimir Nowak
f6e3838eb2
Create a QNetworkAccessManager subclass which sets proper user agent and use it.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
c1fdecae2d
Fix misc warnings.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
69a4558fe4
Actually use the remoteFolder sent by signal.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
50edac8ee8
Split setup page into server and advanced parts.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
fa95a638af
Fill username in HTTP credentials setup page.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6543a01418
Fix warnings emitted by clang.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
9724e52f1b
Fix warnings.
...
Should be now compilable when run with -Wall -Wextra -Wpedantic
-Werror.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
78b6f4df01
Move the creds/ and wizard/ directories one level higher.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
b7e88aa2ef
Fix copyright headers.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
224fd21612
Fix displaying URL in account settings.
...
I deleted too much code there last time.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
a6bf33c501
Make "Connect" button inactive until we get a Shibboleth cookie.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
306a9421fb
Avoid a crash when disposing Shibboleth browser.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
d5885daf0f
Move credential related files to creds directory.
...
CredentialStore is now only used for HTTP credentials, so it was moved
into http directory under creds.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
52b3f7105d
Remove unused stuff.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
7f6dc291c0
Create HTTP credentials object for config without type value.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
eacb849353
Fix credentials handling in csync.
...
CSync module's properties can be set only after it was initialized, so
we split the sync context vfunc into two: the one ran before
initialization and the one ran before sync beginning.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
367bc401ee
Add Shibboleth credentials implementation.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
92af3ea725
Add and use credentials abstraction. Implement HTTP and dummy credentials.
...
To achieve that MirallConfigFile now exports several general
settings-related methods for subclasses (here: for HttpConfigFile), so
it does not have to contain any code targeted for specific
credentials.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
582ce4cfa0
Cleanup setup wizard. Split setup page into two.
...
First page is for giving server URL and advanced setup and second page
is for giving credentials. Second page will differ based on
authentication type supported by ownCloud server. For now only HTTP
credentials are supported.
2013-08-01 16:53:43 +02:00
Daniel Molkentin
1967226c71
fix networksettings.ui _again_
2013-08-01 13:48:42 +02:00
Klaas Freitag
a64724be0e
More sophisticated progress, add Recent Changes Menu to tray.
...
ProgressDispatcher now stores a queue of events as well as sync
problems, better known as soft errors. The tray menu displays a
sub menu with 5 recent changes and adds a more... button that
shows a warning icon if soft errors had happend.
More to implement.
2013-07-30 22:24:48 +02:00
Klaas Freitag
a0d9d41455
Use const reference parameters for custom struct parameters.
2013-07-30 22:24:48 +02:00
Klaas Freitag
84e8ab5b71
Make progress aware of errors, first step.
2013-07-30 22:24:48 +02:00
Markus Goetz
f5bbb12434
Crash hotfix, need to dig down actual cause
2013-07-30 15:49:57 +02:00
Klaas Freitag
edf8147561
Small cleanups.
2013-07-26 15:10:03 +02:00
Klaas Freitag
3a9ab3a86f
Consolidated progress displaying to a single slot from csync.
2013-07-26 13:44:38 +02:00
Klaas Freitag
8f912ca0c5
Adopt to new progress API in csync, WIP
2013-07-25 16:28:45 +02:00
Olivier Goffart
a827056d28
Fix upload limit
2013-07-25 11:21:02 +02:00
Klaas Freitag
6c90989584
Make progress display more robust.
2013-07-25 11:00:19 +02:00
Daniel Molkentin
08acf5e9aa
Network Settings: Reword entries, fix uic warnings
2013-07-25 10:41:44 +02:00
Daniel Molkentin
bca295183b
Make use of bandwidth limiting, split general/network settings.
...
Fixes #14
2013-07-24 19:53:20 +02:00
Markus Goetz
a400a2e0bb
OS X: Fix window messup
2013-07-24 17:06:35 +02:00
Daniel Molkentin
8c15839753
Remove all >= Qt 4.7 ifdefs
2013-07-24 15:34:37 +02:00
Klaas Freitag
810024f4c9
Reworked progress display for more performance.
...
Moved most of the logic to the dialog class to be able to only update
the GUI if there are really changes rather than doing it whenever a
change happens.
2013-07-24 14:40:47 +02:00
Klaas Freitag
de7bcca5fe
Fixed signal and slot parameter list for progress.
2013-07-24 14:40:47 +02:00
Klaas Freitag
6552a48639
Make compactFormatDouble a bit smarter.
2013-07-24 14:40:47 +02:00
Daniel Molkentin
aee0f0c882
make addFolderDefintion easier to read
2013-07-24 14:27:57 +02:00
Daniel Molkentin
e353193fbb
FolderMan: Remove dead code
2013-07-24 14:23:32 +02:00
Daniel Molkentin
fb547e9100
Fix/compactify comments in folderman.h
2013-07-24 14:16:52 +02:00
Markus Goetz
44289c8781
OS X: Fix compile
2013-07-24 14:08:16 +02:00
Daniel Molkentin
d4a5ab252d
Drop Compat with Qt 4.6
...
We now require Qt 4.7 due to QNAM
2013-07-24 13:59:03 +02:00
Daniel Molkentin
a3b3c28694
CSyncThread: Fix unreachable code
2013-07-23 14:34:06 +02:00
Klaas Freitag
976c41a3b8
Beautified ProgressDispatcher
2013-07-23 13:32:33 +02:00
Daniel Molkentin
da087292fd
First version of progress in the context menu
2013-07-23 13:19:17 +02:00
Klaas Freitag
274f59f93b
Reworked progress again following mirall bug #137
2013-07-23 12:23:29 +02:00
Klaas Freitag
85d810d2cf
Rename signal from folderProgress to itemProgress.
2013-07-23 12:23:20 +02:00
Daniel Molkentin
47f151c594
FolderWizard: Return targetPath properly
2013-07-22 23:14:41 +02:00
Daniel Molkentin
7b5ef2186e
Remove accidential change
2013-07-22 23:14:12 +02:00
Daniel Molkentin
8236dafb96
INotify backend: honor ignored files
...
Actually this needs a careful redesign,
but this is good enough to fix the issue.
Fixes : #763
2013-07-22 21:39:13 +02:00
Daniel Molkentin
56e5627b6b
ownCloudFolder -> Folder
...
Fixes #769
2013-07-22 20:30:38 +02:00
Daniel Molkentin
38db0eddab
Make selection of target ListView-based
...
Fixes #222
2013-07-22 18:07:44 +02:00
Daniel Molkentin
710625e2a3
Spelling bee
2013-07-22 18:06:27 +02:00
Daniel Molkentin
a5e7af6c1f
Make FolderMan a singleton
...
It doesn't "belong" to application (think about lib use cases).
This is better.
2013-07-22 13:59:52 +02:00
Daniel Molkentin
5fe4d2db2b
Introduce MirallConfigFile::save/restoreGeometry()
2013-07-22 12:28:43 +02:00
Daniel Molkentin
b2c587e2f8
Settings: Show overall state as account icon
...
Requires the previous refactoring commit
2013-07-22 12:11:12 +02:00
Daniel Molkentin
40c2d891c1
Refactor sync result
...
Sync result computation is now owned by FolderMan
2013-07-22 12:10:13 +02:00
Klaas Freitag
d5ad3a8a70
Removed mistakenly checked in file.
2013-07-22 09:47:15 +02:00
Daniel Molkentin
c74382af4f
octetsToString: Add TB case to pretty printer
2013-07-20 01:27:41 +02:00
Daniel Molkentin
0be0111724
Use WA_DeleteOnClose for settings
...
instead of trying brain dead things
2013-07-20 01:27:00 +02:00
Daniel Molkentin
f0d454b511
Ignore list editor fixes
2013-07-20 01:26:11 +02:00
Daniel Molkentin
b79a45403e
Implement UI changes discussed with Jan.
...
Fixes #785
Fixes #782
Fixes #781
2013-07-19 22:14:21 +02:00
Klaas Freitag
1cc60e755b
Rather show overall progress in settings dialog.
2013-07-19 17:05:46 +02:00
Daniel Molkentin
7fb7cc8c46
Don't hardcode strings, use constants instead
...
This hopefully reduces the chances for
regressions during refactoring.
2013-07-19 16:28:12 +02:00
Daniel Molkentin
1400889b23
Small cleanups
2013-07-19 16:28:12 +02:00
Daniel Molkentin
44fa9bd141
remove skip save pwd parameter -- not used any longer
2013-07-19 16:28:12 +02:00
Klaas Freitag
992dffa032
Add an overall progress counter to progressDispatcher
2013-07-19 13:05:30 +02:00
Klaas Freitag
5fa7e48c24
Do not show the frame around the progress.
2013-07-19 11:07:47 +02:00
Klaas Freitag
3b00dfebed
Add a textual display of the file size in progress.
2013-07-19 10:04:09 +02:00
Klaas Freitag
b42c7e07e6
More work on progress display of file up and download.
...
This is at least working for file upload, untested for downloads
and other operations. Needs more testing and more polish.
2013-07-17 22:34:11 +02:00
Markus Goetz
ab7bfabf12
Put cookies into csync
...
We already have the auth cookies from the quota request,
so put them into csync to avoid a 401 roundtrip
2013-07-17 16:27:18 +02:00
Markus Goetz
ab72644ace
Check if quota request had HTTP 207
2013-07-17 15:08:48 +02:00
Daniel Molkentin
218fa040c8
Reduce thread priority
2013-07-16 16:05:37 +02:00
Daniel Molkentin
b8f783f104
Set proxies and ignored files before every sync run
2013-07-16 16:05:04 +02:00
Daniel Molkentin
edd9d9aee3
Fix disabled state _again_
...
Seems like a bug in Designer
2013-07-12 18:05:59 +02:00
Daniel Molkentin
8c66085621
Folder wizard: Warn if a chosen dir is read-only
...
Fixes #755
2013-07-12 13:54:20 +02:00
Klaas Freitag
40ab325a37
Cleaned up credentialstore class a bit.
...
Removed all "user mode" stuff from the class that was used to ask the
user interactively for the password. We do not do that any more.
2013-07-12 12:22:11 +02:00
Klaas Freitag
7ae95b14f4
Added method to check if the password is in the config file.
2013-07-12 12:21:34 +02:00
Klaas Freitag
6b5b9db20a
Handle progress through ProgressDispatcher class, WIP.
2013-07-11 12:32:58 +02:00
Daniel Molkentin
eb39d144e4
Use default cookie jar again
2013-07-10 18:59:01 +02:00
Daniel Molkentin
cfaaf4a2c4
Don't always send Auth headers
...
Use slotAuthentication again instead.
2013-07-10 18:57:52 +02:00
Daniel Molkentin
279a738aa6
General Settings: Fix spacing in layout
2013-07-10 12:46:43 +02:00
Daniel Molkentin
10b55f11a2
Fix build for Qt <= 4.6
2013-07-10 09:48:10 +02:00
Daniel Molkentin
25065c4151
Remember geometry of LogBrowser
2013-07-10 09:34:41 +02:00
Daniel Molkentin
d2657bc154
Do display floating points with precision of 1
...
For several GB of quota, we might end up showing
<1% far too long. So show one decimal number,
unless it's zero.
2013-07-10 09:34:41 +02:00
Daniel Molkentin
4fde3f4a65
Quota in Account Settings: properly round value
2013-07-10 09:34:41 +02:00
Daniel Molkentin
e398cfb27c
Introduce Utility::compactFormatDouble()
...
Like QLocale::toString(double, 'f', prec), but drops trailing
zeros after the decimal point.
2013-07-10 09:34:27 +02:00
Daniel Molkentin
3cc670ec29
Send non-standard port along with host
...
In QNAM, that's actually the default,
and we were overriding it incorrectly
for no obvious reason. When using the
QHTTP fallback, we need to submit a
non-standard port manually.
Fixes #748
2013-07-10 08:43:10 +02:00
Markus Goetz
c8d9e8458a
OS X: Find out if we are a startup item
2013-07-09 17:30:50 +02:00
Markus Goetz
892419e880
OS X: Ability to disable startup item
2013-07-09 17:13:41 +02:00
Markus Goetz
13fb49cf39
Make Jenkins happy
2013-07-09 14:23:58 +02:00
Markus Goetz
eabe3f968e
Raise settings dialog when creating
...
Else at least on OS X it is burried somewhere.
2013-07-09 14:18:23 +02:00
Markus Goetz
2ca5eaaab9
utility.cpp: Make compile on OS X
2013-07-09 14:07:48 +02:00
Daniel Molkentin
eed3deac67
Acount Settings: Enable in place password change
2013-07-08 14:49:01 +02:00
Daniel Molkentin
748ff13bce
Utility::freeDiskSpace()
...
Does not yet work for UNC locations
2013-07-08 14:48:17 +02:00
Daniel Molkentin
6c7700c2e7
Save size of settings dialog
...
Fixes #541
2013-07-08 04:01:36 +02:00
Daniel Molkentin
c8ccb014c8
Use plural form for sync notification
...
Fixes #419
2013-07-08 03:19:49 +02:00
Daniel Molkentin
f1bd14e8de
Remove superflous cast
2013-07-08 01:44:49 +02:00
Daniel Molkentin
024d01a192
Cleanly install themed clients next to owncloud on Unix
...
- Renames libowncloudsync for themes
- Properly names i18n dir
2013-07-08 01:44:49 +02:00
Daniel Molkentin
b2d02ef0bd
Improve labeling in case of root sync
2013-07-07 01:24:56 +02:00
Daniel Molkentin
751d7deda6
Utility: Compile on Windows again
...
Theme moc files belong with libowncloud
2013-07-06 22:42:02 +02:00