Olivier Goffart
a608b4e9e0
Folder: set csync verbosity to 0 if the Logger is not there
...
csync_log was still accounting for 8% of the local discovery (because
of vsnprintf and asprintf)
2015-10-22 01:13:35 +02:00
Olivier Goffart
f6a543ada3
Logger: speedup the sync discovery when the log is innactive
...
The sync throw a lot of log message, and QDateTime::fromCurrentTime is
quite expensive. So don't call it if it's not needed.
2015-10-22 00:22:25 +02:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Olivier Goffart
c80e72da83
Sharing: change coding style of enum
...
From all upper case to camel case
This hopefully fix the Windows build which fails because DELETE seems
to be a macro
2015-10-21 18:40:04 +02:00
Roeland Douma
ec351e00ad
Merge pull request #3773 from owncloud/split_sharedialog
...
Split sharedialog code
2015-10-21 16:55:59 +02:00
Olivier Goffart
cf242871ea
SyncEngine: keep a static pointer to the codec
...
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
2015-10-21 16:38:26 +02:00
Olivier Goffart
597d36dcf2
csync_statedb: Use the index in csync_statedb_get_below_path
...
Make an index from the path, and make a query that uses the index
2015-10-21 16:38:26 +02:00
Olivier Goffart
9c388787bb
csync_update: Don't fetch the etag in the local discovery from the DB
...
We don't need it, and it's slow.
This saves a lot of DB queries
(Also replaced a strlen>0 with a faster check)
2015-10-21 16:38:26 +02:00
Markus Goetz
f739d8fdd3
sqlite: Update to version 3.9.1
...
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
2015-10-21 15:55:41 +02:00
Markus Goetz
98b966d274
OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
2015-10-20 15:42:43 +02:00
Olivier Goffart
674b6f2373
Account Settings: clear the focus of the "Sign In" button when clicked
...
So that the focus does not go to the "Remove Account" button instead
which would be wierd
2015-10-20 13:56:35 +02:00
Olivier Goffart
407ff0a99d
Theme: cache the QIcon::fromTheme
...
We are calling that every time we draw the folder delegate.
Which is a lot when the sync is runing and the progress bar is moving
2015-10-20 13:24:11 +02:00
Olivier Goffart
0b6d21e3d5
Logger: don't call qFormatLog when unessesary
...
That's a lot of string operations that can be avoided if the log window
is not shown
2015-10-20 13:22:48 +02:00
Markus Goetz
4c9bc42b69
Revert libqsqlite changes for now
...
QtWebKit depends on it unfortunately
2015-10-20 13:04:33 +02:00
Olivier Goffart
557b704069
Fix compilation warning
...
shibbolethcredentials.h:59:10: warning: 'askFromUser' overrides a member
function but is not marked 'override' [-Winconsistent-missing-override]
2015-10-20 11:35:25 +02:00
Olivier Goffart
4369e31a49
Folder Model: don't try to fetch data if the account is disconnected
...
Now that it expands automatically, it would do lots of query to the
server when the account is disconnected. (all resulting in 401)
2015-10-19 18:32:34 +02:00
Olivier Goffart
23b5a74c17
Account Settings: Don't expand while clicking on the '...' button
2015-10-19 18:23:56 +02:00
Olivier Goffart
ee69ab2021
Account Settings: Don't disable double click expanding for sub folders
...
The root folder open on simple click, but the sub folder don't, so keep
this behaviour which is the native behaviour
2015-10-19 18:12:49 +02:00
Olivier Goffart
374f29c4d3
Account Settings: Fix crash for acocunts withour folder
...
Was broken by 027a865fbc
2015-10-19 18:08:11 +02:00
Markus Goetz
67910e7d60
Discovery: Call it "Checking for changes in" in UI
...
For #3431
2015-10-19 15:59:16 +02:00
Markus Goetz
ccec186b98
ETagJob: Depth 0 for server >= 8.1 #3730
2015-10-19 15:31:27 +02:00
Markus Goetz
24a801dfd3
CMake/NSIS: We don't need QtSql (more)
2015-10-19 13:56:36 +02:00
Markus Goetz
af79bc9211
CMake/NSIS: We don't need QtSql
...
The NSIS change also had a redundant libsqlite3 DLL entry
2015-10-19 13:46:46 +02:00
Klaas Freitag
a3904f4d32
Theme: Revert logic of singleAccount switch.
...
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.
Note that existing brandings need to rename the switch.
https://github.com/owncloud/ownbrander/issues/443
2015-10-19 12:26:42 +02:00
Olivier Goffart
5cac90b3eb
SelectiveSyncTreeView: show the size for the root item ( #3755 )
2015-10-19 10:58:54 +02:00
Olivier Goffart
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Roeland Jago Douma
4a04dc1a3e
Typos
2015-10-16 12:51:24 +02:00
Roeland Jago Douma
0e97fbb730
Use overloaded functions
2015-10-16 12:48:48 +02:00
Olivier Goffart
0c59c85127
SyncEngine: Folders with ignored files should not count when counting none files
...
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
2015-10-16 11:43:52 +02:00
Markus Goetz
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
Olivier Goffart
87fa1794a1
Updater: remove unused function
...
It was even throwing a warning because it is an infinite recursion
2015-10-16 09:56:26 +02:00
Olivier Goffart
81e30cd8d2
Merge pull request #3695 from owncloud/nomkpath3692
...
Folder: Do not create the sync folder if it does not exist #3692
2015-10-16 09:21:15 +02:00
Markus Goetz
983671c8cb
Shibboleth: Add our base user agent to WebKit
...
For #3913
2015-10-16 09:15:47 +02:00
Roeland Jago Douma
40ab3ee751
Now only 1 constructor to ocssharejob
...
* Pass the share_id to the functions that need it
2015-10-16 08:28:13 +02:00
Roeland Jago Douma
f95fea9866
Move permissions to OcsShareJob
2015-10-16 08:09:57 +02:00
Roeland Jago Douma
03719334ea
Remove unused members
2015-10-15 22:27:55 +02:00
Roeland Jago Douma
4441053b1c
Thumbnailjob fixes
...
* Comments
* Use the path of the abstractnetworkjob
2015-10-15 22:18:22 +02:00
Roeland Jago Douma
a34b663828
Now add parameters in a less crappy way
2015-10-15 21:58:16 +02:00
Roeland Jago Douma
db1f4d4016
OCSJob -> OcsJob and more docs
2015-10-15 20:54:52 +02:00
Roeland Jago Douma
3ea944d1b3
Added setPublicUpload to OcsShareJob
2015-10-15 20:34:56 +02:00
Roeland Jago Douma
b293aa762c
Split sharing code
...
There is now a generic OCSJob which must be inherited by other jobs. This is in
prepartion for the other OCS job that will come (for the Sharee API endpoint
for example).
More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code
we now only say what we want (a new share, set the password etc). And the code
in libsync will make that happen. Error handling is for now still done in the
GUI part.
For now the ocsjob and ocssharejob live in gui but probabaly we should
create a libshare or libocs at some point.
2015-10-15 20:05:47 +02:00
Markus Goetz
b5e75afc17
General settings: Align checkbox #3758
2015-10-15 19:15:50 +02:00
Markus Goetz
027a865fbc
Account Settings: Show selective sync buttons after list load
...
Especially nice when having a slower network.
For #3839
2015-10-15 18:52:16 +02:00
Markus Goetz
132b5f5130
Account Settings: Expand selective sync on show #3585
2015-10-15 17:27:38 +02:00
Markus Goetz
c3754e1fdd
folderstatusmodel.h: Fix warning
2015-10-15 17:27:29 +02:00
Christian Kamm
c418d67920
Merge remote-tracking branch 'origin/2.0'
2015-10-15 15:54:09 +02:00
Christian Kamm
67e9a06d30
Progress estimation: Adjust low-transfer detection #3942
...
Progress estimation is usually based on transfer speed. That makes no
sense when we're doing operations like deletes, that need very little
data transfer but nevertheless take a long time.
This hack attempts to detect this case better and switches to a
different estimate.
We should rewrite this to maintain and update estimates for the
transfer speed, per-file overhead and chunk-assembly overhead each
time an item finishes. Then we could provide more consistent progress
estimates without ad-hoc fixes like this one.
Also, there's an issue where resuming a partial download will lead
to exaggerated transfer speed estimates.
2015-10-15 15:04:11 +02:00
Christian Kamm
abd63035c1
ETag: Allow parsing of weak tags #3946
2015-10-15 14:57:34 +02:00
Markus Goetz
745cf55abb
SelectiveSync: Increase folder list timeout to 60
...
Already done for 2.1 in 05eee16959
For #3524
2015-10-15 14:43:11 +02:00