Commit graph

111 commits

Author SHA1 Message Date
Klaas Freitag
971caca5e8 Implement change of the network throttling during a running sync run. 2014-02-02 12:51:19 +01:00
Klaas Freitag
7bb7b1d73b Remove wipeAllJournals after rebase mistake. 2014-01-20 16:19:30 +01:00
Klaas Freitag
0eebc0e5be Add folder to schedule queue in setupFolders method.
This fixes bug #1352
2014-01-20 16:19:30 +01:00
Klaas Freitag
ce077f97c6 Checks if the folder from map is still defined.
I saw a crash were a folder which was deleted was dereferenced later
in the Quota check slot. There the folder pointer returned from folder
map was zero.
2014-01-20 16:19:29 +01:00
Olivier Goffart
be874e36da remove unused variable and functions 2014-01-20 15:10:53 +01:00
Olivier Goffart
3a9c485515 Fix crashwhile removing a folder
in a QMap, Accessing an entry that does not exists create the null entry
We should not use operator[] if we are not sure the folder indeed exists
2014-01-20 14:59:35 +01:00
Klaas Freitag
aba1252e60 Remove inotify from cmake files. 2014-01-14 15:06:06 +01:00
Klaas Freitag
f9080c59ab Remove FolderWatcher from Folder and move to FolderMan. 2014-01-13 11:30:27 +01:00
Klaas Freitag
38cc564aed Show proper sync status in tray, incl. Pause status. 2013-12-20 15:16:52 +01:00
Olivier Goffart
89d1e2d924 When reconfiguring, we need to clear the _currentSyncFolder
Else, if we reconfigure when the folder is syncing, it may be impossible to
sync again.
This happens for example when changing the password when the folder is
syncing
2013-12-09 17:16:04 +01:00
Olivier Goffart
f5f56e45c0 Fix pausing one of the folder pauses all foder after it while restarting. 2013-11-29 10:57:34 +01:00
Daniel Molkentin
0a9a3d8f04 Cleanup in folderman 2013-11-18 09:37:09 +01:00
Daniel Molkentin
171572e400 Remember paused state throughout application restarts
Fixes #823
2013-11-13 18:58:35 +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
3af622d535 Make quota display work 2013-11-05 18:15:47 +01:00
Daniel Molkentin
29c846a764 WIP: Dissolve owncloudinfo class 2013-10-21 21:42:52 +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
Klaas Freitag
d0d362664b Handle proxy on folder level, not folderman level. 2013-10-14 16:11:52 +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
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
3c95d342ee Handle sync enable flag correctly in folder scheduling.
This fixes bug #1083.
2013-10-09 14:27:28 +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
273105e78b Handle new case SyncAbortRequested. 2013-10-03 16:21:54 +02:00
Klaas Freitag
c7d30bae98 Handle new sync result enum. 2013-10-03 15:32:44 +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
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
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
ee840b62e5 Fix syncEnable in folder and folderman. 2013-09-23 15:10:42 +02:00
Klaas Freitag
287ec2f3df Enable and disable syncing also in the folder objects. 2013-09-11 10:50:03 +02:00
Klaas Freitag
6f637e40d8 Enable and disable syncing also in the folder objects. 2013-09-11 10:32:09 +02:00
Olivier Goffart
6da2f6bbaa Qt5: QSettings is no longer case insensitive 2013-09-09 14:00:13 +02:00
Olivier Goffart
c15de69156 Reconfigure the proxy when needed 2013-08-27 10:02:59 +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
Klaas Freitag
df5ef6fe67 Added new information icon. 2013-08-08 11:16:28 +02:00
Klaas Freitag
1943cc60b6 Added missing switch cases to calm compiler warnings. 2013-08-07 14:46:57 +02:00
Olivier Goffart
07d9d3770b Refactor: move the pollTimer to the folder 2013-08-05 20:13:39 +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
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
56e5627b6b ownCloudFolder -> Folder
Fixes #769
2013-07-22 20:30:38 +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
40c2d891c1 Refactor sync result
Sync result computation is now owned by FolderMan
2013-07-22 12:10:13 +02:00
Daniel Molkentin
b8f783f104 Set proxies and ignored files before every sync run 2013-07-16 16:05:04 +02:00
Daniel Molkentin
c164beb040 Commit squashed refactoring branch
- introduce settings dialog
- general settings for general / proxy settings
- standalone proxy settings dialog removed
- standalone status dialog removed
- moved status dialog into settings dialog
- radically cut down links in context menu
- add help link to context menu

This needs more cleanup and testing. Known issues:

- When the wizard is called while the settings dialog
  is open, it will not show old information (see FIXME)
- Some settings are not implemented yet (greyed out)
- The counter in the FileItemDialog is not correct the
  first time around.

Based on the discussion done with Jan and Klaas during the
Nuenberg workshop.
2013-07-04 20:02:44 +02:00
Klaas Freitag
4bbb29c2b4 Terminate sync process in the wizard rather than in folderman unload. 2013-07-02 17:01:16 +02:00
Daniel Molkentin
4ff1a13f32 Implement folder display.
- Displayed as disabled action
- Refactor davRequest along the way
  - take Verb as QByteArray
  - pass along a QIODevice

Not implemented for Qt < 4.8
2013-06-28 23:01:31 +02:00
Daniel Molkentin
4945ce3c8c Use awesome Qt template magic 2013-06-28 22:27:53 +02:00