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
eded901f69
Minor code cleanups-
2013-09-11 10:49:10 +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
Klaas Freitag
3c5c432e1d
Minor code cleanups-
2013-09-11 10:32:09 +02:00
Olivier Goffart
927f7549d4
Revert "Compile (find httpbf)"
...
This reverts commit 2d2e843804
2013-09-11 09:00:27 +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
Olivier Goffart
2d2e843804
Compile (find httpbf)
2013-09-11 08:11:03 +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
d8888432c3
Send basic auth in utf8.
...
Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes #941
2013-09-10 23:04:10 +02:00
Daniel Molkentin
59425741b6
Send basic auth in utf8.
...
Implies circumventing QAuthenticator and handling
authentication manually again.
Fixes #941
2013-09-10 23:03:52 +02:00
Daniel Molkentin
3577ba2981
Fix httpbf/neon linkage
2013-09-10 19:50:44 +02:00
Daniel Molkentin
48b4c57d92
Use shared version of libhttpbf, package it on win
2013-09-10 14:45:08 +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
6b9950a9a0
Qt5: DBUS is only needed for FDO
2013-09-05 18:41:49 +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
Daniel Molkentin
64dd0d1b45
Consistent look for top-labels
2013-09-03 14:24:34 +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
Daniel Molkentin
58f4f3623f
Startup: Unity has no proper Systray implementation
...
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:51:00 +02:00
Daniel Molkentin
18a58f73de
Startup: Unity has no proper Systray implementation
...
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:45:52 +02:00
Olivier Goffart
c15de69156
Reconfigure the proxy when needed
2013-08-27 10:02:59 +02:00
Daniel Molkentin
b97701586e
Properly install icons
2013-08-26 21:18:56 +02:00
Daniel Molkentin
ec5c65a530
install correct file
2013-08-26 20:35:56 +02:00
Daniel Molkentin
77e7a1fa8d
Fix casing in settings dialog
2013-08-26 20:22:24 +02:00
Klaas Freitag