Olivier Goffart
795922e2a0
Fix compilation with old GCC
...
that does not understand nullptr
Note that we can't just replace nullptr by 0 in createIndex otherwise
it would be ambiguious.
So leave it commented to show that your intention is to create it with
a null pointer (which is the default because of the default parameter)
2015-07-30 10:44:07 +02:00
Olivier Goffart
0ccaae9a22
Confirm feature: Confirm for any folder, not only shared ones
...
issue #3148
2015-07-27 09:54:20 +02:00
Olivier Goffart
cdb88d621c
Qt4 build: Qt::ItemNeverHasChildren was added in Qt 5.1
2015-07-14 15:01:33 +02:00
Olivier Goffart
b485e8f97f
AccountSettings: disable the add folder button when syncing the entire owncloud #3438
2015-07-14 11:03:25 +02:00
Olivier Goffart
ab23368764
FolderStatusModel: init all private members
2015-07-14 10:15:19 +02:00
Olivier Goffart
6030b4416d
Account Settings: hide the [add folder] button when syncing the entire owncloud #3438
2015-07-13 16:29:01 +02:00
Christian Kamm
ae69ff032b
Folders: Show as disconnected when account is disconnected.
...
Previously you could get a green folder icon even when the account
was signed out or disconnected for another reason.
2015-07-03 15:03:18 +02:00
Christian Kamm
e390c22f96
FolderStatusModel: Minor cleanup.
2015-07-03 14:28:04 +02:00
Christian Kamm
030d1e636b
Progress UI: Properly reset bar after a sync.
2015-07-03 11:26:03 +02:00
Christian Kamm
ba613a152a
FolderStatusModel: Always update on sync state change.
...
Previously the icon and progress report could easily get
somewhat stale and go out of sync with the tray icon.
2015-07-02 14:17:38 +02:00
Olivier Goffart
7a324ff25b
Utility: improve the function to conver a duration to string
...
- Make it translatable
- Make use of the %n so that it supports plurals (but this will only
take effect if we have an english translation)
- Only put two units. eg: "5 years 7 months" instead of
"5 years 7 months 12 days 34 minutes 23 seconds"
Even when it is "2 hours 23 minutes" the amount of second does not
matter, especially since the estimation is likely to be boggus anyway
Issues #2672 and #3097
2015-06-29 14:59:28 +02:00
Olivier Goffart
c11358219a
FolderStatusModel: fix a coverity warning
2015-06-17 12:46:49 +02:00
Olivier Goffart
0cfc518c33
Fix coverity build which does not support nsdmi
2015-06-16 09:30:29 +02:00
Olivier Goffart
a3c543a627
Move FolderStatusDelegate to its own file
2015-06-15 14:16:21 +02:00
Olivier Goffart
81c10da8dc
Accountsettings: Show a notification when there are new unconfirmed folders
2015-06-12 12:19:24 +02:00
Olivier Goffart
cc3543dbd2
Confirm feature: The UI part in the selective sync view
...
Folder that are over the threshold will appear in red in the
selective sync view and will be deselected by default
2015-06-11 15:46:01 +02:00
Olivier Goffart
05ed126bfd
Account config: add the size in the selective sync part
2015-06-11 14:13:09 +02:00
Olivier Goffart
5ab20e64bf
AccountSettings: fix selective sync checking
...
We need to set the root item to partially checked in case there
is some folders in the blacklist
The root item do not have checkmark so it is good
2015-06-10 17:00:08 +02:00
Olivier Goffart
e9e11d251f
Fix compilation after merge of the confirm and the new-ui branch
2015-06-10 16:22:14 +02:00
Olivier Goffart
12f760535d
Fix folder concatenation with Qt4
...
QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have
to take in account different slashes possibilities
2015-06-02 20:47:06 +02:00
Olivier Goffart
e1f94cea4f
FolderStatusModel: handle network error in the LSCol
2015-06-02 20:47:06 +02:00
Olivier Goffart
fc23e810fd
folderstatusmodel: clean includes
2015-06-02 20:01:13 +02:00
Olivier Goffart
e587c8e2dc
multi-account: compile with Qt4
2015-06-02 19:57:41 +02:00
Olivier Goffart
984434c728
AccountSettings: move the progress handling in FolderStatusModel
...
This is required to compile with Qt4 because signals were protected.
And the logic anyway belongs to the model
2015-06-02 19:45:23 +02:00
Olivier Goffart
e02f1a222e
FolderMan: refactor some function to take a Folder* instead of an alias
...
I want to remove this dependency of alias in the code because we might get
rid of it entierly later
2015-04-28 17:49:05 +02:00
Olivier Goffart
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
Christian Kamm
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
Olivier Goffart
85ff245aef
Account settings: add the progress back on the new ui
2015-04-09 12:06:47 +02:00
Olivier Goffart
426d2338d9
Settings: New UI that intergate the selective sync within the account settings
2015-03-27 16:50:35 +01:00
Daniel Molkentin
00e42d1177
More HIDPI support
...
Except for the non-native activity tab
icon in settings, this should fix #11
2015-02-12 19:44:40 +01:00
Olivier Goffart
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Daniel Molkentin
4fc044d368
Merge branch 'master' into move_lib_to_sep_dir
...
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Daniel Molkentin
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00