chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-19 20:08:02 +02:00
Code Activity
2,322 Commits 4 Branches 173 Tags
v1.5.0-beta1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 951ac79a68 Destinguish between rename and move in wording. 2013-11-28 10:58:04 +01:00
Klaas Freitag ce47adb482 push version to 1.5.0beta1 2013-11-28 10:58:04 +01:00
Klaas Freitag 80a01ecff3 Use the activity icon in settings dialog. 2013-11-28 09:47:49 +01:00
Klaas Freitag 5f3ce25ccf Push version to 1.4.90 2013-11-28 09:44:09 +01:00
Klaas Freitag 0d85810c23 Change tab name in settingsdialog to Activity rather than Status. 2013-11-28 09:44:09 +01:00
Klaas Freitag 23007613a9 Fix progress bar in new propagator. 2013-11-27 16:48:16 +01:00
Klaas Freitag 59072a81f1 Put detailed sync status widget into ButtonGroup for common style. 2013-11-26 14:27:32 +01:00
Klaas Freitag d55bffb319 Removed not longer needed Info button. 
The detailed sync status is now in the same dialog in another tab.
 2013-11-26 14:15:37 +01:00
Klaas Freitag 232cbc45b5 Simplify progress and error signals again. 
Now handle everything through the progress signal and let the errors
be progressed in the done slot.

Remove unused code, fix sorting of the list, more efficiency.

This fixes #916
 2013-11-26 14:02:11 +01:00
Klaas Freitag a88d45bff4 Comment some unused code. 2013-11-26 14:02:11 +01:00
Klaas Freitag 090e474d70 Add a couple of missing progress signals. 2013-11-26 14:02:11 +01:00
Klaas Freitag 4f7546768b Do not blacklist Softerrors. 2013-11-26 14:02:11 +01:00
Klaas Freitag 7a3c086be2 Display a proper error message for missing sync directory on server. 
this fixes bug mirall#1149
 2013-11-26 14:02:11 +01:00
dragotin cb6918f3d5 Merge pull request #1203 from pascalBokBok/patch-1 
Remove spammy "sync starting" notification on every program start.

Thanks!
 2013-11-26 02:39:08 -08:00
Klaas Freitag 33ff6b3934 Even if problems occured show the Ok-Icon in the setup dialog. 
Fixes bug #942.
 2013-11-25 17:49:59 +01:00
Klaas Freitag 2e4043b498 Show proper error message and icon according to error class. 2013-11-25 16:18:07 +01:00
Klaas Freitag dc29046d61 Add new progressProblem signal and slots. 
Now the sync problems are handled differently than the sync progress
to ease error message handling and stuff.
 2013-11-25 16:18:07 +01:00
Klaas Freitag 0c6dca25c4 Register meta type for SyncProblem 2013-11-25 16:18:07 +01:00
Klaas Freitag 1a3f246c46 Add new Error Types to progress: Soft, Normal, Fatal. 2013-11-25 16:18:07 +01:00
Klaas Freitag fd1552f7a0 Handle SoftError and show blacklisted files. 2013-11-24 22:27:11 +01:00
Klaas Freitag 055a8d7e74 Do not display error messages if user aborts the sync run. 2013-11-24 22:26:50 +01:00
Klaas Freitag 1964e60eb0 Do not show an error message if user aborted. Also CSYNC_STATUS fixes. 2013-11-24 22:21:29 +01:00
Klaas Freitag 11acfde55a Refresh the Protocol widget when the dialog is raised. 2013-11-24 22:20:43 +01:00
Klaas Freitag ecb2444923 Handle changing source file in upload correctly. 
Delete the file on the server if the source file is new, but
the source did not arrive completely within a timespan.
 2013-11-22 19:45:26 +01:00
Klaas Freitag 65bd4be16e Make sure all queries are initialized on our database object. 
Since we use a database with the non default name, we need to do that,
otherwise the query is initialized on the default db which is not open
in our case.
 2013-11-22 15:37:35 +01:00
Klaas Freitag 8d2950f66c Enable the overall file count in progress again. 2013-11-21 11:37:47 +01:00
Klaas Freitag 55e82ee4c1 Made transaction management a bit more transparent. Some fixes. 2013-11-21 11:13:58 +01:00
Klaas Freitag aa17be40cc Some database code cleanups. 2013-11-20 18:19:14 +01:00
Klaas Freitag 97c661c909 Cleanups 2013-11-20 14:59:58 +01:00
Klaas Freitag 2767e7084a Minor cleanups. 2013-11-20 14:27:44 +01:00
Klaas Freitag 5900b1ad25 Add blacklisting for files with error conditions. 2013-11-20 14:27:44 +01:00
Klaas Freitag 20b9ae757d Add a http status code varialbe to the sync item object. 2013-11-20 14:27:44 +01:00
Klaas Freitag aff2dd9f44 The IGNORE statement is handled further down the code. 2013-11-20 14:27:44 +01:00
Klaas Freitag e30c484a7a Ignore the SIGPIPE signal as that disturbs debugging with Qt Creator. 
It is questionable why this happens and if this patch really helps,
or if it might have side effects. Input appreciated :)
 2013-11-20 14:27:44 +01:00
Klaas Freitag 0f6dd8748f Fixed some header wording. 2013-11-20 14:27:44 +01:00
Klaas Freitag a342f63fdf Changed wording: Replaced Protocol against Status. 2013-11-20 14:27:44 +01:00
Klaas Freitag f30ac49264 Cached more queries, used safe QSqlQuery pattern 2013-11-18 13:02:09 +01:00
Klaas Freitag 49ba252fff Database initialize code cleanup. 
If the QSqlQuery class is called with a query in the constructor, the query
is executed immediately. In fact, we executed each query twice before.
Later on we might want to implement a wrapper clas around the query.
 2013-11-18 10:02:33 +01:00
Klaas Freitag 69269f8f75 Use transactions to speed up database access. 2013-11-18 10:02:32 +01:00
Klaas Freitag e73730cb94 Close database after retrieval of file record count. 
As the csync updater opens the database itself, it is cleaner to close
the db before and open it again after csync has finished.
Added a close method to the journal class.
 2013-11-18 10:02:32 +01:00
Klaas Freitag 098e04c13f Set PRAGMA synchronous to NORMAL 2013-11-18 10:02:32 +01:00
Klaas Freitag b0f6628584 Moved implementation of start() to cpp file. 2013-11-18 10:02:32 +01:00
Klaas Freitag 42f6867329 Add some useful logging. 2013-11-18 10:02:32 +01:00
Klaas Freitag bf6e1f10ce Prepare the queries after the database was migrated. 2013-11-15 11:21:27 +01:00
Klaas Freitag c22f8a47f1 Initialise values properly, avoid warning. 2013-11-15 10:32:13 +01:00
Klaas Freitag 858facb5e0 Use precompiled database statements. 2013-11-15 10:32:13 +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
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
Klaas Freitag e0a50d4bb9 PostSyncCleanup added: Remove superfluous entries from database after 
sync.
 2013-11-11 16:45:40 +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
Klaas Freitag a458ffd472 Add missing return in error case. 2013-11-08 12:56:54 +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
Klaas Freitag c58e9d17a8 Again minor doc changes. 2013-11-07 10:29:27 +01:00
Klaas Freitag 41ccbc0334 Minor docu change. 2013-11-07 10:28:14 +01:00
Klaas Freitag fe4c1cc35a Remove straycat code from mirall. 2013-11-06 14:20:44 +01:00
Klaas Freitag b6152c19d6 Adjust generic build documentation to the current state. 2013-11-06 11:13:55 +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
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
Klaas Freitag e63fc184a5 Options parsing added. 2013-10-28 16:07:13 +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
Klaas Freitag 660469cbf5 Do not propagate a move of the Shared folder. 2013-10-17 10:48:31 +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
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
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
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
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
Klaas Freitag 2e3aabf99b Read header without prefix path now that it's in 3rdparty. 2013-10-03 16:47:48 +02:00
Klaas Freitag 59bf8740a0 Add c_jhash.h header from csync to 3rdparty. 2013-10-03 16:41:23 +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