Olivier Goffart
d4bd327fef
Merge branch 'parallel_upload'
...
Conflicts:
src/mirall/csyncthread.cpp
2014-02-19 10:24:34 +01:00
Olivier Goffart
2de288c5f3
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
VERSION.cmake
2014-02-19 10:21:23 +01:00
Markus Goetz
fcc0e89044
Update phase: Allow benchmarking / progress update
2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt
8267b9e590
remove 'File' word from notification
2014-02-18 18:42:49 +01:00
Jan-Christoph Borchardt
5a68e5f58d
remove superfluous tooltip from server address input field
2014-02-18 17:21:25 +01:00
Klaas Freitag
e4965ab06b
Mac FS watcher: ignore events from the same process
2014-02-18 16:28:25 +01:00
Olivier Goffart
496d900fee
Refactor the renameReplace in its own function
...
Share a bit more code between legacy and qnam download job
2014-02-18 14:05:52 +01:00
Olivier Goffart
58bda69f8b
PropagateRemoteRename is not a legacy job
...
move it back to propagatorjobs.cpp
2014-02-18 13:52:40 +01:00
Olivier Goffart
89b5ddec56
Fix the logs in the update phase
...
Since csync use a thread local variable for the logs, we need
to reset it when we enter the update thread
2014-02-18 13:48:13 +01:00
Olivier Goffart
f7419094f3
move the file system helpers in their own file
2014-02-18 12:54:40 +01:00
Olivier Goffart
432f377750
Use the legacy jobs when using bandwidth limiting
...
Or if a environement variable is set
2014-02-18 12:24:35 +01:00
Olivier Goffart
c32beb957d
Move the jobs around between files
...
Renamed owncloudpropagator_qnam to propagator_qnam
Move the jobs in propagatorjobs.cpp
Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and
rename the jobs accordingly
2014-02-18 12:21:05 +01:00
Denis Dzyubenko
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
hefee
1b03dc759b
fixing typo
...
GNU Public License-> GNU General Public License
2014-02-17 22:42:51 +01:00
Olivier Goffart
a39caa1cda
Make owncloudcmd work with the parallel upload/download
...
Also make it work when there syncing a remote subfolder
2014-02-17 17:31:03 +01:00
Olivier Goffart
a4ee8d6f6f
Remove unused function
2014-02-17 15:25:47 +01:00
Olivier Goffart
b35e38f80f
Parallel download
2014-02-17 13:48:56 +01:00
Klaas Freitag
e134ae22ac
Disable explorer.exe integration on WinXP
2014-02-13 17:21:30 +01:00
Daniel Molkentin
e66757335b
Theme: Update general disclaimer.
2014-02-13 17:04:52 +01:00
Markus Goetz
372f8b3426
OS X: Document how to disable the auto updater
2014-02-13 14:11:04 +01:00
Olivier Goffart
7b6269b4bf
Fix chunking
...
- Do not start them in parallel, start them in sequence instead, as they are quite
and there are already other jobs running in parallel normaly
- Do not load the fill into memory
- Support resuming
2014-02-13 14:02:05 +01:00
Markus Goetz
8b9cd432b5
OS X: Read system-wide plist in /Library
...
Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates
2014-02-13 12:52:57 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
Daniel Molkentin
fd40a25030
Use the appName (which is the short name) instead of the full length name
...
The full length name is allowed to change (or should be)
2014-02-12 18:06:01 +01:00
Daniel Molkentin
05ae467cd5
Remove debug
2014-02-12 18:05:28 +01:00
Daniel Molkentin
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
Daniel Molkentin
bcf73cfc40
SSLButton: Omit arrow on Windows which can't display it
2014-02-12 17:55:05 +01:00
Daniel Molkentin
f79ecfe001
more verbose ssl error logging
2014-02-12 17:54:45 +01:00
Olivier Goffart
a4442ebb40
Merge branch 'master' into parallel_upload
...
Conflicts:
src/mirall/owncloudpropagator.cpp
src/mirall/owncloudpropagator.h
2014-02-12 16:50:45 +01:00
Olivier Goffart
93f31fa9d7
Merge branch '1.5'
2014-02-12 16:44:24 +01:00
Olivier Goffart
f35b1f8a2b
Only starts 6 jobs in parallel
2014-02-12 16:33:55 +01:00
Olivier Goffart
6db8daabf7
Make abort work even when there are parallel uploads
2014-02-12 16:33:55 +01:00
Olivier Goffart
a677f97b7f
Fix removing and renaming directories from the Shared directory
2014-02-12 13:44:55 +01:00
Olivier Goffart
01c0a3c099
use Utility::sleep
2014-02-12 11:16:27 +01:00
Markus Goetz
153aa31da2
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
(cherry picked from commit 104cf680a6
)
2014-02-12 11:14:43 +01:00
Markus Goetz
8c9a65635f
Propagator: Fix compilation
...
It is still protected on Qt4
2014-02-10 15:46:09 +01:00
Markus Goetz
104cf680a6
OS X: Workaround Qt5 QNAM bug
...
This made the sign out/sign in handling not work.
2014-02-10 15:42:46 +01:00
Markus Goetz
79d14f0760
Propagator: Use cross platform sleep function
2014-02-10 14:34:48 +01:00
Klaas Freitag
6387777c18
Added chunking for the new uploading.
2014-02-10 13:00:22 +01:00
Klaas Freitag
41a4f1fc37
Only wait half a second before the next folder sync is started.
2014-02-07 11:53:58 +01:00
Daniel Molkentin
5a6a8b504c
Mac OS: Build fix
2014-02-06 22:32:17 +01:00
Daniel Molkentin
97345447ab
Updater: Unify Sparkle&non-Sparkle URLs
...
...now that we have the support on the server-side.
2014-02-06 18:56:33 +01:00
Olivier Goffart
bb378902ae
Also force an update of the etag in case of renames
...
Imagine we have a file:
foo/bar/moo
if we do mv 'foo' 'foo2' and that we issue a MOVE on the server
and will update the entry 'foo' in the database with the new etag
If we write the etag of foo but not the etag of the sub item, when
we read from db on the next sync, we will miss them and beleive they
have been removed on the server
2014-02-06 17:56:27 +01:00
Olivier Goffart
8f1494f8f2
Report an error if fetching the etag fails
...
Very important in case of renames, else, if the server did not perform
the rename, we may end up deleting the files
2014-02-06 17:56:27 +01:00
Daniel Molkentin
4ae66b8b20
ShibbolethCredetials: Try to avoid re-auth
...
...by storing the shib cookie in key chain
2014-02-06 13:02:01 +01:00
Daniel Molkentin
ccb45bfea6
Move code from HTTPCredentials to more generic locations
...
This is a preparation to make them usable from the Shibboleth
credentials class.
2014-02-06 13:02:01 +01:00
Daniel Molkentin
bee5940c42
Credentials: Remove unused fetchFromUser methods
2014-02-06 13:02:01 +01:00
Olivier Goffart
f67d2e6418
Start all the jobs in parallel
2014-02-06 12:11:45 +01:00
Olivier Goffart
9a6275a5e3
use QNAM for the PUT
...
Not yet supported:
- chunking
- if the file changes while uploading
- aborting
- owncloudcmd (because of the dependency to the account and the credidentials)
2014-02-06 11:50:16 +01:00
Olivier Goffart
2d9c0b6c31
Move CSyncThread in the main thread, and just do the neon jobs in a thread
...
It is important because then we can do assynchronious job that needs
QNAM in the main thread
2014-02-05 20:18:03 +01:00
Olivier Goffart
49562ca3b6
Remove unused members
2014-02-05 16:40:56 +01:00
Daniel Molkentin
33ab854922
SslErrorDialog: Ensure to run into a timeout while showing the dialog
2014-02-05 14:18:31 +01:00
Markus Goetz
1471e15674
Sparkle: Add more delegate methods
2014-02-04 18:43:49 +01:00
Markus Goetz
e001e70816
Sparkle: Get it working
2014-02-04 17:37:01 +01:00
Olivier Goffart
4ade023b96
Find another way to ignore the csync journal from the file watcher
2014-02-04 16:46:14 +01:00
Olivier Goffart
ec266054be
Don't use QFileInfo to get the last modified time.
...
We can use the _modtime, since normaly we just set the the modtime
of the file to this time.
The problem is that Qt does follow symlinks (FILE_FLAG_OPEN_REPARSE_POINT)
And therefore was causing problem with symbolic links.
Fixes #1307
2014-02-04 16:17:58 +01:00
Olivier Goffart
324214d072
fix the 'Sign In' menu entry
2014-02-04 15:06:17 +01:00
Klaas Freitag
ae5c9a29f6
Detect renames and removes in read only Shared directory, restore files.
...
This fixes bug #1386
2014-02-04 15:03:06 +01:00
Klaas Freitag
72a6b00919
Add some usage hints.
2014-02-04 15:03:06 +01:00
Olivier Goffart
e06cfe06fe
FolderWatcher: ignore the csync journal
2014-02-04 14:57:25 +01:00
Olivier Goffart
d2a41342e1
Better error message when the write permission are missing in the local directory
...
Fixes #1394
2014-02-04 11:10:22 +01:00
Markus Goetz
6f960d406e
Qt5: Use same path for config as Qt4
2014-02-04 10:02:28 +01:00
Daniel Molkentin
c19978bdc4
Fix Qt5 jenkins build failure
2014-02-04 08:50:45 +01:00
Markus Goetz
fdc8050e3d
Folder Wizard: Re-evaluate after local folder changed
2014-02-03 18:19:25 +01:00
Markus Goetz
62f5b0ebac
Folder Wizard: Make it more clear that we mean a remote folder
2014-02-03 17:27:54 +01:00
Markus Goetz
11c368f0bc
Sparkle: Fix compilation if not found
2014-02-03 16:31:24 +01:00
Daniel Molkentin
19e7c4f66f
NSISUpdater: Fix logic to invoke updater on non-explicit start
2014-02-03 13:46:20 +01:00
Klaas Freitag
971caca5e8
Implement change of the network throttling during a running sync run.
2014-02-02 12:51:19 +01:00
Daniel Molkentin
c2f3cfa4b5
Amendment to last commit
2014-01-31 14:53:20 +01:00
Daniel Molkentin
52971c27cf
Updater: More refinements
2014-01-31 14:49:10 +01:00
Daniel Molkentin
b3683976ca
Updater: Fix corner cases related to failed auto-updates
...
- Don't re-download updates whom's auto-install has clearly failed before
- Don't signal newly available auto-upgrade if it has failed once
- Remove downloaded update after (un)successful auto-update
- Remove as many temporary keys after an (un)successful auto-update
2014-01-31 12:42:00 +01:00
Daniel Molkentin
4c6e0b5c07
SSL Button fixes
...
- Use OU as display name if CN is empty (often true for CA/interm. certs)
- Handle trust anchors in intermediate chain gracefully
2014-01-31 10:35:35 +01:00
Daniel Molkentin
4e0cf7c822
Fix win32 build
2014-01-31 09:35:43 +01:00
Daniel Molkentin
528d434c1f
Amendment to last commit
2014-01-30 13:07:32 +01:00
Daniel Molkentin
2f81999d6c
Fix OS X build
2014-01-30 12:16:09 +01:00
Klaas Freitag
225123951d
Make compile under MacOSX
2014-01-30 11:17:14 +01:00
Daniel Molkentin
dfa1dfaa7d
AutoRaise SSLButton
2014-01-30 09:53:00 +01:00
Daniel Molkentin
74db151427
SSLButton: remove superflous extra argument
2014-01-30 09:53:00 +01:00
Daniel Molkentin
cb8131c382
Remove cmake message
2014-01-29 12:16:21 +01:00
Olivier Goffart
6540f54512
Don't use QDateTime::toTime_t or QDateTime::fromTime_t
...
They only take an uint, and time_t is 64bit.
This breaks when date are before 1970
Fixes #1380
2014-01-29 11:47:13 +01:00
Daniel Molkentin
1aa050bea9
Add Tests, make Updater classes into a static lib
2014-01-29 10:43:21 +01:00
Daniel Molkentin
ca5f96e1bb
Updater: More refactoring towards testability
2014-01-29 10:43:21 +01:00
Daniel Molkentin
d361bda922
Fix wording
2014-01-28 16:23:39 +01:00
Daniel Molkentin
62f4e813ee
Settings: Allow opening links in updater label
2014-01-28 16:23:24 +01:00
Daniel Molkentin
505e0e9632
Fix build on Win32
...
regression introduced by ec9efd78
2014-01-28 15:49:19 +01:00
Olivier Goffart
50aa31d192
winEventFilter does not exist on Qt5
2014-01-28 15:30:58 +01:00
Daniel Molkentin
c8006f1163
Compile fix
2014-01-28 13:42:09 +01:00
Daniel Molkentin
637565cca1
Updater: Don't overwrite unannouned (newer) versions
2014-01-28 13:36:16 +01:00
Daniel Molkentin
a22884d164
Show message if the updater times out
2014-01-28 13:36:16 +01:00
Daniel Molkentin
58fd57fdcd
Make update URL a compile time option
2014-01-28 13:36:16 +01:00
Daniel Molkentin
2bee51c101
Updater: Logic fix
2014-01-28 13:36:16 +01:00
Olivier Goffart
2ed5dd178a
Fix fetching the user name in the wizzard
2014-01-28 13:18:21 +01:00
Olivier Goffart
803cb5d015
fix signal slot connection
2014-01-28 12:45:41 +01:00
Olivier Goffart
e31000d759
Handle the fact that the user might cancel the password dialog
...
Add a new state of the account in which the credidentials are invalid,
but we are still trying to get the user enter his password.
Make sure that fetched() is ALWAYS emitted after we call fetch on the
credidentials, so we can know that the user pressed cancel. In that
case, go in the SignedOut state.
Fixes #1353
2014-01-28 11:49:09 +01:00
Daniel Molkentin
f408593d27
more build fixes
2014-01-28 11:01:05 +01:00
Daniel Molkentin
6d21058ca1
build fixes
2014-01-28 10:34:56 +01:00
Daniel Molkentin
1da94e5e2b
Updater: More refactoring
...
- Renamed GenericUpdater -> OCUpdater
- Make more API Private
- Split up in classes to reduce complexity:
- PassiveUpdateNotifier subclass for Linux
- NSISUpdater for Windows
2014-01-28 10:01:23 +01:00
Olivier Goffart
397763ba61
Fix HttpCredentials::invalidateToken to invalidate the password in the config file
2014-01-27 16:57:10 +01:00
Daniel Molkentin
72ae44b8b1
Updater: relaunch Client after update
2014-01-27 13:04:27 +01:00
Olivier Goffart
e6be6fc695
Remove dead code
2014-01-27 12:44:46 +01:00
Olivier Goffart
18966bf061
Add missing include
2014-01-27 12:36:52 +01:00
Olivier Goffart
bf95509dbe
Do not include "private" header from "public" header
2014-01-27 12:31:54 +01:00
Olivier Goffart
50b9a7b191
remove unused include from header file
2014-01-27 11:58:50 +01:00
Olivier Goffart
08c03d19b9
Only one quote should be enough
...
Should fix #1295
2014-01-24 20:28:17 +01:00
Daniel Molkentin
42f5aa072d
Link against Sparkle if available
2014-01-24 11:58:11 +01:00
Klaas Freitag
688d394576
Check for INotify if compiling for Linuxe and friends
2014-01-23 16:05:35 +01:00
Klaas Freitag
5841cf4020
Add and remove watches for folders independent from sync dir.
...
Before it was just in case of download.
2014-01-23 13:23:27 +01:00
Klaas Freitag
e9e132c06c
Make use of the new linux folder watcher.
2014-01-23 13:23:27 +01:00
Klaas Freitag
e3723fcfc2
Add a new folder watcher implementation for Linux.
2014-01-23 13:23:27 +01:00
Daniel Molkentin
8485a7fd30
Fix typo
2014-01-22 16:09:22 +01:00
Daniel Molkentin
129aef5beb
Revert "Formatting hashes with : seems to be out of fashion"
...
This reverts commit c52e3a0732
.
2014-01-22 00:00:34 +01:00
Daniel Molkentin
54c0c4057b
Improve SSL detail display
2014-01-21 15:54:06 +01:00
Daniel Molkentin
c52e3a0732
Formatting hashes with : seems to be out of fashion
2014-01-21 15:25:51 +01:00
Klaas Freitag
699f6a62f8
Do not set sync-state to Prepare in setSyncEnabled().
...
This method is also called if the sync was disabled due to
network problems and such, ie. from the ETag change check.
In that case, we do not want to go to the Prepare state as
we not neccessarily want to have the folder synced now.
This fixes the problem that the folders were resynced way
to often which we had in master for a couple of days now.
2014-01-21 15:25:05 +01:00
Olivier Goffart
61f3b839ab
Fix compilation in Qt5
...
Some Qt SSL function used to return QString now return a QStringList.
By having QStringList(...).join(':') the code will compile both
if the ... is a QString or a QStringList. So the code will still
compile in Qt4.
2014-01-21 15:09:12 +01:00
Olivier Goffart
29590fa00b
Revert "Commented opening of files from the activity view as it does not work."
...
This reverts commit c50b0a995b
.
This was only broken on windows and probabyl fixed by commit 23f52bcd
2014-01-21 13:01:05 +01:00
Olivier Goffart
0c33fc6e8a
Do not block while launching the explorer on linux
...
Fixes #1338
2014-01-21 13:01:05 +01:00
Daniel Molkentin
c4c36d641b
Remove garbage include
2014-01-21 12:34:51 +01:00
Klaas Freitag
4d8e65cfd0
Hide useless logging that indicates an error.
2014-01-21 12:10:49 +01:00
Daniel Molkentin
2370060ac5
Implement Certificate Information Widget
...
Currently used in status window. Before, there was no way to know
about the current certificate situation.
Fixes #44
2014-01-21 09:21:33 +01:00
Daniel Molkentin
d4bb0e44cd
Wizard: Gracefully fall back to HTTP if HTTPS connection fails
...
If the connection fails, the user is now being asked if he does
agree to a new attempt via an unencrypted connection. If he complies,
the connection will be reattempted using plain HTTP.
Fixes #1356
2014-01-20 19:46:09 +01:00
Daniel Molkentin
9b9b62d4e3
Wizard: Prepend 'https://' if no scheme is set
...
First part of fix for #1356
2014-01-20 17:53:46 +01:00
Daniel Molkentin
2780dae569
Setup Wizard: Fix http(s) label size
2014-01-20 17:41:57 +01:00
Daniel Molkentin
562513d5a5
Propagator: Don't pass arbitrary strings as formating string
...
Not a security issue since this code was never in any release.
2014-01-20 17:22:29 +01:00
Daniel Molkentin
a2e9353296
Fix copy & paste problem in Ignore List Editor
...
Fixes #1355
2014-01-20 17:08:30 +01:00
Olivier Goffart
7f76fcff5e
Do not account the size of deleted or renamed file in the progress
...
Fixes #1360
2014-01-20 17:00:28 +01:00
Olivier Goffart
0afbb264e0
cleanup mutex usage in CSyncThread
...
The only method which is used from another thread is abort().
So the only thing that needs protection is that function, and the
function which may race with. Which are csync_request_abort which
should not race with csync_resume
2014-01-20 17:00:28 +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
a6b0ccfa12
Remove explicit logging.
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
Klaas Freitag
c705a6360d
Rather removeFolder than addFolder to watcher (typo fix).
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
Olivier Goffart
4df1d7d893
Remove unused variables
2014-01-20 14:59:23 +01:00
Olivier Goffart
bbf3a64c02
Fix crash.
...
toUtf8() returns a temporary QByteArray wuich is only valid until the
end of the statement (the next ';'). QByteArray::data() returns a
pointer to the QByteArray's data which is only valid if the QByteArray
is valid.
Keeping the char* is therefore wrong.
2014-01-20 14:24:20 +01:00
Olivier Goffart
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
Klaas Freitag
45c75f722c
Show an indicator if the url is encrypted or not in connection wizard.
...
Fixes bug #1350
2014-01-16 17:40:46 +01:00
Olivier Goffart
6257ed6605
Make sure that the jobs have the Q_OBJECT macro.
...
so tr() works there
2014-01-16 14:06:17 +01:00
Klaas Freitag
0455d96462
Fix untranslated error messages.
2014-01-16 13:04:57 +01:00
Klaas Freitag
d2e8043a4a
Use ClientProxy that reads the client config in commandline client.
...
Fixes mirall#1347
2014-01-16 12:52:11 +01:00
Klaas Freitag
98689d48f1
Check if configuration actually exists.
...
If not, set System Proxy as default.
2014-01-16 12:52:11 +01:00
Klaas Freitag
ec9efd7894
Make use of the new Proxy handling class.
2014-01-16 12:52:11 +01:00
Klaas Freitag
671100ce5c
Add a class ClientProxy that handles proxy setting for Qt and csync.
2014-01-16 12:52:11 +01:00
Daniel Molkentin
96633307c0
Move owncloudcmd into Bundle on OS X
...
Fixes #1300
2014-01-15 18:14:37 +01:00
Daniel Molkentin
2009fbc886
Deploy all of Sparkle manually
2014-01-15 17:52:19 +01:00
Daniel Molkentin
4caa038de6
More sparkle fixes
2014-01-15 16:01:35 +01:00
Daniel Molkentin
f5dc2b3127
Compile on OS X
2014-01-15 12:45:43 +01:00
Olivier Goffart
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
Daniel Molkentin
dc9f145a24
New Updater for Windows, passive notification on Linux, Sparkle on Mac
2014-01-15 11:09:31 +01:00
Klaas Freitag
55da857e59
A bit of refactoring, add useful names and set the alias properly.
...
The alias field is now set from the last component of the picked
local dir. Also some tooltips were added.
2014-01-14 17:40:42 +01:00
Klaas Freitag
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
Klaas Freitag
561f32cede
License header cleanups.
2014-01-13 16:16:19 +01:00
Klaas Freitag
e0d8d93b50
Removed obsolete inotify class of folderwatcher.
2014-01-13 16:07:52 +01:00
Klaas Freitag
3d8505d7f4
Adopt mac folderwatcher to the new folderwatcher.
2014-01-13 16:00:41 +01:00
Klaas Freitag
18171862ac
Unify folderwatcher private constructor.
2014-01-13 15:29:05 +01:00
Klaas Freitag
0e5858b1aa
Add a pathIsIgnored method to the folderwatcher.
2014-01-13 15:29:05 +01:00
Klaas Freitag
5482ad1fd3
Remove event buffering from watcher, other refactoring.
2014-01-13 15:28:56 +01:00
Klaas Freitag
f9080c59ab
Remove FolderWatcher from Folder and move to FolderMan.
2014-01-13 11:30:27 +01:00
Klaas Freitag
a12288ff21
Use folderwatcher based on Qt for Linux.
2014-01-13 11:30:27 +01:00
Klaas Freitag
d5b8d24f91
Add NoSymLink tag to the filter specification.
...
Should finally fix bug #1331
2014-01-10 09:09:22 +01:00
Klaas Freitag
9da06f10f6
Removed unused event interval getter/setter.
2014-01-10 09:09:22 +01:00
Olivier Goffart
ebee52ea8a
Merge branch '1.5'
2014-01-09 12:32:08 +01:00
Klaas Freitag
e5804b5d12
Use a more Qt'ish folder recursing method, remove unused class.
...
Added unit test.
2014-01-08 14:36:42 +01:00
Klaas Freitag
e5d43c2b9c
Add a utility function to write a random file.
2014-01-08 14:36:42 +01:00
Klaas Freitag
a522cebf0c
Add missing switch case.
2014-01-08 14:36:42 +01:00
Olivier Goffart
1bc4089d95
Fix hiding temporary files on windows
...
tmpFileName is a relative path, and we need an absolute path to
pass to the function that hides the files
2014-01-08 13:33:16 +01:00
Olivier Goffart
b7b06a8795
Preserve the permission of the file we download
...
Related to issue #820
2014-01-08 13:17:35 +01:00
Olivier Goffart
4006e490f3
Do not write the removed folder on the DB
...
Should fix #1329
2014-01-08 12:51:42 +01:00
Klaas Freitag
273463daf4
Fix progress for the case that the source file changes during upload.
...
If the source file changes, the overall transmission size is not longer
correct. Fixed that by pushing the change over the previously calculated
size to csyncthread. Also set the mtime and size in the item object in
propagator to avoid doublicate uploading.
2014-01-07 15:42:21 +01:00
Klaas Freitag
7da84dbe44
Check on timer member is zero.
2014-01-07 10:30:41 +01:00
hefee
4e0496f74d
respect XDG_CONFIG_HOME for getting user config dir.
...
Under linux the XDG Base Directory Specification define different
enviroment variables where to store what.
2013-12-31 02:10:44 +01:00
Sven Strickroth
8743be6f11
Close dialog if button was clicked not just pressed
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-12-21 03:36:43 +01:00
Klaas Freitag
38cc564aed
Show proper sync status in tray, incl. Pause status.
2013-12-20 15:16:52 +01:00
Klaas Freitag
72b479c1e0
Added proxy support to owncloudcmd.
2013-12-19 16:48:10 +01:00
Klaas Freitag
d17be6f1ff
Do the neon ssl initialization.
...
This fixes bug #1298 and also probably #1297 . More tests needed.
2013-12-19 13:33:31 +01:00
Klaas Freitag
c50b0a995b
Commented opening of files from the activity view as it does not work.
...
See https://github.com/owncloud/mirall/issues/1295
2013-12-17 14:16:25 +01:00
Klaas Freitag
66c0a3b448
Read password from old settings if exist.
2013-12-17 12:56:01 +01:00
Klaas Freitag
23f52bcd56
Fix open the explorer code.
2013-12-17 10:16:25 +01:00
Stefan Profanter
a93b9ee33a
Fixed parent folder detection if sibling directory starts with same name
...
Since `cleanPath` removes all the trailing slashes (84bfbd4cb0
:src/corelib/io/qdir.cpp#L2118) the check at line 138 wrongly assumed that
`D:\Test` is a parent folder of `D:\TestFoo`.
2013-12-15 16:22:53 +01:00
Daniel Molkentin
bef180a7bc
Remove UTF-8 BOM, confuses old GCCs
2013-12-13 20:27:08 +01:00
Daniel Molkentin
9010e1015e
Better fix for override urls
2013-12-12 17:17:07 +01:00
Klaas Freitag
9bf15178f9
Fix button states in account widget
2013-12-12 16:38:45 +01:00
Daniel Molkentin
5b2c734fe5
Respect the override URL properly
2013-12-12 16:20:01 +01:00
Klaas Freitag
bc5f7d899a
Save and restore activity view state.
...
Fixes bug #1256
2013-12-12 15:16:43 +01:00
Klaas Freitag
ec77ecfd0f
Show error reason for blacklisted files in sync activity.
2013-12-12 12:21:24 +01:00
Klaas Freitag
09745c7f75
Fix: Allow to retry sync also for fatal err conditions.
...
Otherwise there would not have been a chance to resync for example data
that was Forbidden because of a read only share.
Also removed some commented code.
2013-12-12 11:39:05 +01:00
Daniel Molkentin
9ffb33293c
QuotaInfo: Keep polling quota if a previous request fails
2013-12-12 10:53:51 +01:00
Klaas Freitag
aa213eeafb
Do not check for the ETag in case the HTTP request connected.
2013-12-11 13:51:38 +01:00
Daniel Molkentin
76a60e889c
Start timer only after the last quota request was answered
2013-12-11 13:48:31 +01:00
Olivier Goffart
fa195eb1e8
Logger: Initialize all variables
...
To avoid valgrind warnings in owncloudcmd
2013-12-11 13:23:42 +01:00
Klaas Freitag
b68e721f05
Do not error out on ETag if the status klass is != 2.
2013-12-11 12:59:11 +01:00
Klaas Freitag
bbfb2f2a60
Do not force resync if status is SyncResult::Problem.
2013-12-11 12:59:11 +01:00
Olivier Goffart
bf309f83f4
Don't keep the temporary file if the transfer fails because of a wrong etag
...
The downloaded file is corrupted, remove it.
2013-12-11 12:48:11 +01:00
Daniel Molkentin
80d202c630
Fix build on Win32
2013-12-10 17:19:36 +01:00
Olivier Goffart
47308cdc01
define NE_LFS from cmake
2013-12-10 16:20:49 +01:00
Daniel Molkentin
03e9a06c7d
Fix build
2013-12-10 16:07:49 +01:00
Thomas Müller
370cf45357
fixing add button behavior in single folder mode
2013-12-10 15:59:59 +01:00
Thomas Müller
638b62a3ae
prevent crash on 'add folder'
2013-12-10 15:59:59 +01:00
Klaas Freitag
6707e93f31
Add NE_LFS define for correct size of ne_off_t
2013-12-10 15:28:02 +01:00
Olivier Goffart
0360babe02
usleep is not working on windows, use QThread::usleep
...
Shoud fix #1082
2013-12-10 14:03:01 +01:00
Klaas Freitag
a743f804f5
Ignore another sqlite journal tmp name that shows up on win32.
2013-12-10 13:19:57 +01:00
Olivier Goffart
b6e4575dea
Do not initialize all the application if another instance is running
...
This fixes a crash becasue we were constructing the systemtray and then
destroying it too early before the systemtray could initilize itself.
(This work around a bug in QSystemTray which crashes if it is destroyed
before it is registered to the X11 server)
2013-12-10 12:48:59 +01:00
Daniel Molkentin
2cf7ba91c1
Don't install headers on OS X
2013-12-09 20:39:55 +01:00
hefee
f8478ac27b
Fixing typos
2013-12-09 20:17:56 +01:00
Olivier Goffart
bb2f221edf
Fix broken slot connection
...
The slot was renamed.
2013-12-09 19:19:49 +01:00
Daniel Molkentin
1291ffaf02
Small adjustments to the last commit
2013-12-09 17:16:42 +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
Klaas Freitag
857ef33056
Use proper email in license header.
2013-12-09 17:02:17 +01:00
Daniel Molkentin
f5e8efd435
Add build number into versioning scheme
...
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
Olivier Goffart
e5edb8e2c7
Fix opening the explorer with a selected file on windows.
...
Should Fix #1249
2013-12-09 16:13:48 +01:00
Klaas Freitag
5f31d13236
Install headers for owncloudsync
2013-12-08 08:55:18 +01:00
Klaas Freitag
fc986b0ab8
If item is a directory, remove its contents from the database as well.
...
Fixes bug #1257
2013-12-06 16:38:43 +01:00
Klaas Freitag
c5e435f9bd
Let recursive removal also remove the top dir.
2013-12-06 16:37:30 +01:00
Klaas Freitag
599451d250
Unchanged files still count as files.
2013-12-06 16:37:01 +01:00
Klaas Freitag
af78f1996c
Set action string as tooltip
2013-12-06 15:50:14 +01:00
Klaas Freitag
41d5445980
Display rename-target in sync protocol action column.
2013-12-06 15:07:25 +01:00
Klaas Freitag
e5afd8b901
Maintain the file type correctly.
2013-12-06 14:11:51 +01:00
Klaas Freitag
6fad20d5fc
Show local MOVE operations only for top level directory instead for all
...
files.
This fixes bug mirall#1240
2013-12-06 12:32:26 +01:00
Daniel Molkentin
dff17ec08e
A different user constitutes a different account
...
Fixes #1231
2013-12-05 19:03:40 +01:00
Daniel Molkentin
df5a72eb38
Resize wizard if advanced options are required
...
Fixes #1130
2013-12-05 17:43:57 +01:00
Olivier Goffart
fa9d9c9909
Maybe we need to destroy the decompress context before the request.
...
Possibly fix the issue #1229
2013-12-05 16:51:39 +01:00
Daniel Molkentin
a0d1dc8807
Avoid horizontal scrollbar
...
...by intproducing more tooltips and set eliding to center elide
You can still force a scrollbar, but it's not there by default
and the center eliding makes pathes more meaningful
Fixes #1213
2013-12-05 16:42:07 +01:00
Klaas Freitag
9e2f6c0258
Close the sync journal if a folder gets removed.
...
This fixes bug #1252
2013-12-05 16:06:46 +01:00
Daniel Molkentin
ee2efbb071
Fix for c3dc84c58f
.
...
This resulted in the wizard not coming up the second time around
because it wasn't destructed properly.
Also fix a comment.
2013-12-05 16:00:32 +01:00
Daniel Molkentin
c3dc84c58f
Don't close setup wizard when the initial sync run is started
...
Fixes regression over 1.4.2
2013-12-04 20:26:18 +01:00
Daniel Molkentin
72b0f4e573
Add man page for owncloudcmd
...
Fixes #1234
2013-12-04 20:07:05 +01:00
Klaas Freitag
861de89e9c
Add translatable error messages for individual file errors.
...
The error messages coming out of the csync updater and were
string based before which could not be translated.
2013-12-04 12:19:38 +01:00
Klaas Freitag
a6dfc0a83e
Refactoring, pick proper method name.
2013-12-04 11:36:24 +01:00
Klaas Freitag
859f776440
Set proper enable state of blacklist button after the dialog was opened.
...
Also set proper tooltips.
2013-12-04 11:32:46 +01:00
Klaas Freitag
4b7f75059a
Fixed check for SQL command successs.
2013-12-04 10:31:05 +01:00
Klaas Freitag
b3620e320b
Avoid a comparison warning on win32
2013-12-03 17:09:57 +01:00
Klaas Freitag
883576cb95
Fix Win32 move file operation.
2013-12-03 17:07:42 +01:00
Daniel Molkentin
62ec7aa9c5
Add file forgotten in last commit
2013-12-03 16:24:17 +01:00
Daniel Molkentin
99fc570267
Replace Q_OS_WIN32 by Q_OS_WIN
...
Fixes #1238
2013-12-03 16:23:49 +01:00
Olivier Goffart
1f5c4bde14
Fix windows rename of temporary files
2013-12-03 16:10:44 +01:00
Klaas Freitag
046d180d2f
Rather count the blacklist items in the database.
...
Use database functions to count the entries rather than trying to
compute it from the progress items the widget got.
2013-12-03 14:48:49 +01:00
Klaas Freitag
278e76b774
Add blackListEntryCount method.
2013-12-03 14:48:49 +01:00
Olivier Goffart
09d850bfaa
When the temporary file is the same size as the file we would download, just keep it
...
Don't download the file if the temporary file is complete.
else, we get error from server: Requested Range not satisfiable
2013-12-03 14:44:04 +01:00
Klaas Freitag
f0a6047ecf
Add a button to acitivity view to clean the blacklist.
2013-12-03 14:04:01 +01:00
Klaas Freitag
e8ffb17b3b
Add a slot to wipe the folder's blacklist.
2013-12-03 14:04:01 +01:00
Klaas Freitag
09d4fa2127
Fixed wording, do not expose the term blacklist to users.
2013-12-03 14:04:01 +01:00
Daniel Molkentin
f521301c51
Add plugins in install_qt4_executable to ensure the lib paths get fixed up
...
Fixes #1228
2013-12-03 13:33:50 +01:00
Olivier Goffart
de5161137f
remove unneeded file
2013-12-03 13:11:41 +01:00
Klaas Freitag
1abfd4ba44
Fixed wording, removed the term "problem".
2013-12-03 12:31:28 +01:00
Klaas Freitag
ecf45856e1
Add missing call to CloseHandle on the win32 platform.
...
This fixes bug mirall#1236 and also mirall#1237
Also some minor cleanups.
2013-12-03 10:08:17 +01:00
Klaas Freitag
c03b2bbc87
Make unblacklisting depending on Up or Download
...
Compare modtime in case of uploading and ETag in case of downloading
as they are the correct indicators.
2013-11-29 16:16:04 +01:00
Klaas Freitag
2f708c0877
Move checkAccountExists out of gui class.
2013-11-29 16:16:04 +01:00
Olivier Goffart
58eb000163
Make the "details" manu entry work
...
Fix #1214
2013-11-29 11:18:59 +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
Klaas Freitag
951ac79a68
Destinguish between rename and move in wording.
2013-11-28 10:58:04 +01:00
Olivier Goffart
ef8fe11f5a
Do not write the directory etag in the database in case of soft error
...
Else we won't retry next time as we think nothing has changed.
2013-11-28 10:01:30 +01:00
Olivier Goffart
30db533cea
Stop iterating files when aborting.
2013-11-28 10:01:30 +01:00
Olivier Goffart
99eeaa0db5
no need to set twice the error string
...
done() is already taking care of that
2013-11-28 10:01:30 +01:00
Klaas Freitag
80a01ecff3
Use the activity icon in settings dialog.
2013-11-28 09:47:49 +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
Daniel Molkentin
0fc51704f5
Enable accessibility on OS X
...
Fixes #736
2013-11-27 15:43:47 +01:00
Daniel Molkentin
46a403eb02
Report connection errors explicitly on explicit sign in attempts
...
Implicit connection attempts fail silently. This is roughly what
users expect from e.g. mail clients.
Fixes #1205 .
2013-11-27 14:15:56 +01:00
Daniel Molkentin
e719e80409
ConnectionValidator: Account::setState no longer takes a bool
...
This makes the client come up with the correct state when the
initial connect fails.
2013-11-27 14:12:30 +01:00
Daniel Molkentin
310278f580
Account: Swap connected and disconnected state
...
Also, avoid full integer enumeration
2013-11-27 14:11:10 +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
Olivier Goffart
5c8b6ed902
Fix Remove -gzip from etag
...
Remove it from both "foo"-gzip and "foo-gzip"
See issue #1195
2013-11-26 12:10:52 +01:00
pascalBokBok
489cc8aa29
Remove spammy "sync starting" notification on every program start.
2013-11-26 10:01:36 +01:00
Daniel Molkentin
0d85dcdd9e
Toggle Settings window when clicking on the icon
...
This restores the old behavior for every DE but OS X and Ubuntu Unity
(which respond to all clicks by opening the menu).
Discussed in #896
2013-11-26 03:15:03 +01:00
Daniel Molkentin
7eddff39e7
Wizard: Allow /index.php or /remote.php/webdav in URLs.
...
We will strip those. Also works on paste.
Fixes #349
2013-11-26 02:32:04 +01:00
Daniel Molkentin
81e47b0896
Folder wizard: sanitize error detection
...
* Wrap text properly
* Format multiple warnings as bullet points
* Use 'Folder' instead of 'Directory' everywhere
* Fix false positives when checking if one directory contains another
* Fix logic errors in target folder warning detection
Fixes #1201
2013-11-26 02:03:00 +01:00
Daniel Molkentin
ef0c7348ad
Account Settings: Fix label
2013-11-26 00:04:50 +01:00
Daniel Molkentin
050bb55f1e
Wizard: Do not start from scratch if the initial folder is non-default
...
Before, the folder was initialized to "ownCloud" in any case,
which lead the wizard to conclude it had to sync everything anew,
because the location moved -- even if the folder location was manually
corrected.
Fixes parts of #1172
2013-11-26 00:04:33 +01:00
Markus Goetz
fa715ce135
Propagator: Open download file as Unbuffered
2013-11-25 19:25:19 +01:00
Markus Goetz
911e0bdd6e
Propagator: Check write errors when downloading
2013-11-25 19:25:19 +01:00
Olivier Goffart
fa0f773fcb
Separate the case of file changing durng upload in the chunk or non chunk case.
...
If the file is changed between chunk, it is easy and we can just retry as the
file has not been changed on the server.
But if the file is changed after it has been updated on the server, we must still
update the database with the etag. (and possibly delete the partial file)
Relates to issue #1002
2013-11-25 19:16:54 +01:00
Markus Goetz
ac8296fb94
Propagator: Check E-Tag when resuming
...
Should fix #756
2013-11-25 19:01:04 +01:00
Daniel Molkentin
f47ce2fea6
Account Settings: Set initial button state correctly
...
Fixes #1185
2013-11-25 17:56:09 +01: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
Olivier Goffart
ca3d8ab193
Add one case of missing -gzip removal
2013-11-25 17:48:57 +01:00
Daniel Molkentin
d85009a2e9
Account Settings: fix connect error
...
Fixes #1198
2013-11-25 17:34:40 +01:00
Markus Goetz
72d2ac09e3
Propagator: Don't ignore error if no HTTP error code
2013-11-25 16:37:48 +01:00
Olivier Goffart
6b7da798b8
Remove -gzip from Etag
...
Fix #1195
2013-11-25 16:30:13 +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
Daniel Molkentin
ad6c42b031
Wizard: let us handle/ignore credential failures
2013-11-25 15:50:19 +01:00
Daniel Molkentin
9ddedf81ac
Cleanup: "Use QMutexLocker"
2013-11-25 15:34:17 +01:00
Daniel Molkentin
685c13dead
Distiguish "Signed out" from "Disconnected"
2013-11-25 15:34:17 +01:00
Daniel Molkentin
2a17a2a102
Remove credential-exposing debug output
2013-11-25 15:34:16 +01:00
Daniel Molkentin
4e22fff427
Introduce online/offline state, accessible via GUI
2013-11-25 15:34:16 +01:00
Daniel Molkentin
6165c38289
Fix indentation
2013-11-25 15:34:16 +01:00
Daniel Molkentin
f554cca3d6
Fix initial state of quota info class.
2013-11-25 15:34:16 +01:00
Daniel Molkentin
67132326d2
Prefix tooltips with app name
2013-11-25 15:34:16 +01:00
Daniel Molkentin
ea2b5fb29c
Query credentials when needed. Put the account offline if user aborts.
...
This is only implemented for HTTP auth. Shibboleth still does its own thing.
2013-11-25 15:34:16 +01:00
Daniel Molkentin
0a2861a731
Disable quota polling when default account does not exist or is offline
2013-11-25 15:34:16 +01:00
Olivier Goffart
6f17131e3c
Fix mutex usage in the journal
...
All public function must lock the mutex. And therefore none of the journal
function may call public function because the mutex is already locked.
So have a public commit that lock the mutex, and a private commitInternal
that assume the mutex is locked
2013-11-25 15:11:37 +01:00
Olivier Goffart
ca3885de2a
Fix some SQL error and warning
...
Such as:
Error opening the db: "Driver not loaded Driver not loaded"
or
QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor
We need to clear the QSqlDatabase _db handle before calling removeDatabase.
And we also need to give a different name to different folder database, just to be sure
2013-11-25 15:07:58 +01:00
Daniel Molkentin
37d6f6eeab
Build on OS X
2013-11-25 10:54:18 +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
Daniel Molkentin
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
Markus Goetz
e551e92e13
Downloads: Ignore file if no ETag was sent
...
Fixes part of #970
2013-11-19 12:44:25 +01:00
Markus Goetz
b98d97a96d
SyncJournalDb: Fix warnings
...
I got those warnings for the latter sync runs:
11-19 10:58:15:997 QSqlDatabasePrivate::removeDatabase: connection 'qt_sql_default_connection' is still in use, all queries will cease to work.
11-19 10:58:15:997 QSqlDatabasePrivate::addDatabase: duplicate connection name 'qt_sql_default_connection', old connection removed.
2013-11-19 11:28:08 +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
Daniel Molkentin
0a9a3d8f04
Cleanup in folderman
2013-11-18 09:37:09 +01:00
Daniel Molkentin
ec850e83b9
Folders need to be setup before initializing the GUI
...
This fixes the incomplete context menu
2013-11-18 09:37:09 +01:00
Markus Goetz
08665d6ac2
Settings: Don't specify encoding
...
QSettings automatically does escaping. When UTF-8 was set, I
got all kind of problems with the QByteArray for the geometry
and the umlaut in my name for the proxy user.
2013-11-18 09:30:42 +01:00
Markus Goetz
4194a078d5
Revert "set utf8 for the central settings file"
...
This reverts commit 6758c89130
.
2013-11-15 15:45:21 +01:00
Daniel Molkentin
6758c89130
set utf8 for the central settings file
2013-11-15 14:43:48 +01:00
Olivier Goffart
c15a1eedd1
Only update the db for ETAG if the etag has changed for directories
2013-11-15 13:53:18 +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
Olivier Goffart
b3972a5ba8
Do not fetch the file id in the propagator with a HEAD
...
Normally, the fileid comes with the PUT or the GET.
If it did not comes with the PUT, it means the server do not support
fileid, we should not query it with a useless HEAD.
Also, in case the fileid changes (which it should not) update anyway
to the new fileid in the db
2013-11-15 10:18:19 +01:00
Daniel Molkentin
36e8273da0
fix mac builds
2013-11-14 20:53:56 +01:00
Daniel Molkentin
7ba8983f0a
Change all Network Jobs to use start()
2013-11-14 19:20:19 +01:00
Markus Goetz
088aa6ebdd
Wizard: Default button to Next
2013-11-14 19:13:59 +01:00
Markus Goetz
767ec4ed59
Wizard: Support redirects again
2013-11-14 17:54:38 +01:00
Markus Goetz
b12b8c981d
Wizard: Also reset timeout on forwards
2013-11-14 17:23:56 +01:00
Markus Goetz
b499a62593
Wizard: Timeout handling for CheckServerJob
2013-11-14 17:23:56 +01:00
Markus Goetz
fa0a2764a4
Fix changing URL in wizard
2013-11-14 17:23:56 +01:00
Markus Goetz
a537a98f03
Tray menu: Populate at start
2013-11-14 17:23:56 +01:00
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
Daniel Molkentin
578431c791
Fix building owncloudcmd in case of theming
2013-11-14 14:20:09 +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
2ff4ebc72f
Make user() available throught AbsctractCredentials
2013-11-13 13:59: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
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
22ed29a30b
Remove obsolete credentialstore class
2013-11-11 15:24:07 +01:00
Daniel Molkentin
64b59f8679
Don't use integration directory
2013-11-11 15:22:51 +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
64ef43d918
Fix the key used for storing the password
2013-11-07 15:59:58 +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
800abbf8b7
Make http credentials work
2013-11-05 18:16:00 +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
59bc1d8966
Credential Store is no longer static
...
It now belongs to HttpCredentials
2013-10-30 16:32:34 +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
Klaas Freitag
e63fc184a5
Options parsing added.
2013-10-28 16:07:13 +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
Olivier Goffart
8e90782107
Make owncloudcmd display the debug output
2013-10-28 15:45:37 +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
38679f79b5
Need inotify on FreeBSD for libsync
2013-10-23 01:24:27 +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
Daniel Molkentin
c2c01bccfc
Fix literal occurances of "ownCloud" in GUI
2013-10-10 11:35:22 +02:00
Daniel Molkentin
2240039442
Fix literal occurances of "ownCloud" in GUI
2013-10-10 11:34:45 +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
Mackie Messer
ba9ac03b0b
Put plugins in PlugIns, not Plugins on Mac
...
Requires 770539f0a5
on csync
2013-10-04 13:01:46 +02:00
Mackie Messer
0257f7e169
Add sqlite plugin for OS X
2013-10-04 13:01:46 +02:00
Olivier Goffart
8ed2588cdf
Fix build with Qt5
2013-10-03 23:14:10 +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
59bf8740a0
Add c_jhash.h header from csync to 3rdparty.
2013-10-03 16:41:23 +02:00
Olivier Goffart
21cd57228e
Fix build with Qt5
...
Missing SQL module
2013-10-03 16:29:47 +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
82cd79c004
Add unify defines to header.
2013-10-01 13:58:00 +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
e250672e4a
CMake: libhttplib -> httplib
2013-09-30 23:16:04 +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
7048bd8cc9
Handle app icon names properly.
2013-09-24 12:19:29 +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
363efaa408
Theming build fix: Icons need shortname
2013-09-20 23:09:41 +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
a057eb8590
Fix focus issue during setup wizard
2013-09-19 14:52:41 +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
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
.
Turns out i had an old build of csync
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
Daniel Molkentin
f6d45b68ef
More clear error messages
2013-08-26 20:20:10 +02:00
Daniel Molkentin
24d76a0d75
desktop file == executable
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
Daniel Molkentin
2c8e95a0f4
Be more specific when disconnecting the signal
...
Fixes a crash, amends be48cb646c
2013-08-18 19:41:01 +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
71b1e881d8
Setup Wizard: Only label button "Connect" where suitable
2013-08-18 15:23:52 +02:00
Daniel Molkentin
7ba47e9d44
Code formatting fixes
2013-08-18 15:23:52 +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
Daniel Molkentin
e01ce20431
Wizard: Do not use FormLayout for URL line edit
...
Looks ugly on Mac
Fixes #870
2013-08-15 15:58:20 +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
Daniel Molkentin
7f7ebc36f5
Fix showing help when app is running
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
4d7c014b23
Resize dialog
2013-08-14 17:47:10 +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
b59952b539
Wrap custom message label
2013-08-14 11:58: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
Krzesimir Nowak
87cb2a7114
Set busy cursor when doing page loading in browser.
2013-08-07 15:05:42 +02:00
Krzesimir Nowak
a875b46a80
Add cookie handling for Shibboleth credentials.
...
Which cookies are going to be stored are determined only when setting
up or modifying an account. Cookie handling allow us to avoid choosing
Identity Provider everytime when browser page appears.
2013-08-07 15:03:13 +02:00
Krzesimir Nowak
704ba791fd
Fail the sync if we close the browser without passing proper credentials.
2013-08-07 15:03:13 +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
Krzesimir Nowak
002142539b
Remove most of the dead code in Shibboleth setup page.
...
The effect of most of the code wasn't even visible after making a
browser an independent window.
2013-08-06 14:56:26 +02:00
Krzesimir Nowak
e1d1c10fad
Fix workflow in wizard.
...
Pressing back in third window should show us browser again. Closing
browser window should show us server setup window again.
2013-08-06 14:35:11 +02:00
Krzesimir Nowak
577bc546d8
Handle SSL problems also for Shibboleth servers.
2013-08-06 11:56:27 +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
Krzesimir Nowak
00e819bd92
Make sure we don't append several copies of cookies for syncing.
...
Also, make sure we don't append old Shibboleth ones as well.
2013-08-05 18:39:26 +02:00
Krzesimir Nowak
740d33b378
Revert "Go back if browser in wizard is destroyed before getting a cookie."
...
This reverts commit da370c8b36
.
2013-08-05 17:57:32 +02:00
Krzesimir Nowak
f0b284eda7
Refresh Shibboleth cookie if it gets outdated during sync.
2013-08-05 17:42:03 +02:00
Krzesimir Nowak
da370c8b36
Go back if browser in wizard is destroyed before getting a cookie.
2013-08-05 17:29:11 +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
fb79b8a7f8
Omit the server setup page in wizard if URL is overriden by theme.
2013-08-01 19:17:41 +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
72d51e4667
Show browser as independent window instead of putting it into dialog.
...
When browser is shown, dialog is hidden. It reappears after we are
done with logging in.
2013-08-01 16:53:43 +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
4104db65bb
Remove unused method.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
36cb827406
Print correct subtitles when modifying account details.
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
928eae419f
Hide resolution widget in advanced setup page if nothing has changed.
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
945951cda5
Fix indentation.
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
3b6aeb1fc8
Make browser inside Shibboleth wizard page a bit larger.
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
9413a30a08
Fix build when using QtKeyChain.
2013-08-01 16:53:43 +02:00
Krzesimir Nowak
6a9a2559d2
Fix shibboleth syncing after client restart.
...
We needed to notify shibboleth-specific QNAM about new cookie and then
stop cramming that cookie into request via setHeader, but rather put
it to cookie jar and let Qt handle the cookie insertion into requests.
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
Daniel Molkentin
f1878640c8
Linux: install all available icon sizes
2013-07-27 13:06:38 +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