mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-19 12:22:16 +03:00
Code Issues Projects Releases Packages Wiki Activity
16542 commits 487 branches 258 tags 462 MiB
Commit graph

312 commits

Author SHA1 Message Date
Markus Goetz
c4006795cc OS X: Attempt to fix account add oddities #4237 2015-12-02 17:59:41 +01:00
Klaas Freitag
770ad54229 AccountSettings: Update the visibility of the add account button. 
That fixes #4238
 2015-12-02 16:33:37 +01:00
Markus Goetz
a75209d104 Account: Invalidate credentials when clicking "Sign out" #4241 2015-12-02 16:31:58 +01:00
Olivier Goffart
e27374324d AccountSettings: Remove the F5 reset folder shortcut 
This secret key was used to wipe the database. In the past this was
usefull because of many bugs, but now this is not usefull anymore.
And cause trouble because it also erase the selective sync list.

Issue #4182
 2015-12-02 12:27:53 +01:00
Markus Goetz
c24a8ba208 Account removal: More crash fixes for Windows 
Seems things happen a bit different here, maybe because of paint events.

For #4229 #4202
 2015-12-01 19:21:52 +01:00
Markus Goetz
db7d70a929 Account removal: Do it inside global application object 
For #4229 #4202
 2015-12-01 16:32:04 +01:00
Christian Kamm
23ed68c8dd Re-apply ee69ab2021 2015-11-24 13:45:02 +01:00
Christian Kamm
2982c79444 Settings: Fix "Choose what to sync" #4187 
There was a duplicate connect() due to a merge problem (?) in
7e4c0bd515
 2015-11-24 13:41:00 +01:00
Christian Kamm
7e56408331 SelectiveSync: Show Apply/Cancel less 
Before the selective sync status text and apply/cancel buttons
were shown as soon as any folder was expanded. This changes it
to only show when the model is dirty (or a big folder confirmation
is needed).

This is nice because we auto-open the folder list sometimes
and having the apply/cancel buttons visible makes users think a
decision is needed.
 2015-11-24 13:01:10 +01:00
Klaas Freitag
becbb7b284 AccountSettings: Address jans suggestions in #4139 
- Changed sequence of menu items
- lowercased entries
- removed the "Account" from entries, its in the toolbox button already
- added a little space between toolbox button label and the rectangle.
 2015-11-16 15:50:32 +01:00
Klaas Freitag
7e4c0bd515 AccountSettings: Add a toolbox button for the account specific actions. 
Also move the 'Add Account' button from the General Tab, where it
is not properly found, to the new account toolbox.
 2015-11-13 14:50:07 +01:00
Olivier Goffart
a127debc54 Quota: handle special negative value for the quota #3940 
Don't show a progress bar if there is an unkown or unlimited total
 2015-10-29 14:33:29 +01:00
Olivier Goffart
89f2a9e6dc Account Settings: A link should make sure all the parents are expanded 2015-10-27 17:37:12 +01:00
Klaas Freitag
1c1ef52cf1 AccountSettings: Display a link for undecided dirs in the sub text. 
This only works in case the index is known. If not, no link is
shown, but we wait for the next update of the model.
 2015-10-27 17:37:12 +01:00
Klaas Freitag
40c82c5c36 AccountSettings: Add index to undecided folder to be able to select it. 2015-10-27 17:37:12 +01:00
Klaas Freitag
46558d79a5 Add slot to handle clicks on folder names. 2015-10-27 17:37:12 +01:00
Olivier Goffart
fac00348d9 Use the term folder sync connection in more places #3757 2015-10-27 12:12:21 +01:00
Olivier Goffart
3c93fd4fb7 AccountSettings: don't disable pause when offline (#4010) 2015-10-27 10:32:33 +01: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
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
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
Christian Kamm
efdb29d2f9 AccountSettings: Show disabled 'Add Folder' tooltip on click #3645 2015-10-14 11:34:30 +02:00
Christian Kamm
efefc2d986 Merge branch '2.0' 
Conflicts:
	doc/images/menu.png
	doc/images/settings_network.png
 2015-10-02 15:44:50 +02:00
Klaas Freitag
440687af21 AccountSettings: Disable context menu of sync folders when not connected. 
This is the second part to fix #3860
 2015-09-29 18:19:26 +02:00
Klaas Freitag
b72e2b146d AccountSettings: only expand root elements on single click. 
Also, toggle expanding on single click for root elements.
 2015-09-25 13:57:44 +02:00
Klaas Freitag
a1421ff74f AccountSettings: Do not allow to expand the folder list when disconnected. 
This is supposed to fix #3860
 2015-09-25 12:22:51 +02:00
Christian Kamm
8f8bf98ca6 Folder settings: Ensure path is cleaned #3811 
Paths with a trailing backslash lead to a failing sync beforehand.
These paths can appear in some migration scenarios.
 2015-09-17 12:31:37 +02:00
Markus Goetz
ca95276298 UI: Only expand 1 level in folder list #3585 2015-09-16 11:06:32 -04:00
Markus Goetz
15e4d9e317 UI: Allow folder expanding from button click #3585 2015-09-15 21:10:14 -04:00
Markus Goetz
ef607e29de UI: Expand folder treeview on single click #3585 2015-09-15 20:59:27 -04:00
Daniel Molkentin
5347a991cf Merge pull request #3806 from owncloud/phil-davis-sync-remove 
Adjust message box text for sync removal
 2015-09-14 14:05:39 +02:00
Phil Davis
1aff9bca95 Adjust message box text for account removal 
Since the context menu text was changed to "Remove Account" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3793
 2015-09-11 08:46:53 +05:45
Phil Davis
d76f76f429 Adjust message box text for sync removal 
Since the context menu text was changed to "Remove Sync" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3745
 2015-09-11 08:42:02 +05:45
Daniel Molkentin
be3529ebcb Adjust strings in settings dialogs 
Implements  #3745 & #3793
 2015-09-10 01:46:28 +02:00
Klaas Freitag
088c0d471a AccountSettings: Do not prepend the folder alias to the undecided folders 
This fixes bug #3685
 2015-09-09 17:52:39 +02:00
Jocelyn Turcotte
bcfc16c0f6 Add a sign in button in the settings window 
It's not obvious for users that they should sign in through
the tray icon, especially if they were automatically signed out.
 2015-09-01 18:40:20 +02:00
Olivier Goffart
f77ae28ed1 AccountSettings: Fix coverity warning 
FolderMan::folder might return null
 2015-09-01 11:39:55 +02:00
Olivier Goffart
0d08bbec74 AccountSettings: remove unused member 
Fix a coverity warning
 2015-09-01 11:37:47 +02:00
Jocelyn Turcotte
c48c5b9286 Move the progress bar to the right of the quota label 
Also change the label to show the free space and show
the used and total space only on a tooltip of the bar.

Related to #3644
 2015-08-31 12:33:21 +02:00
Jocelyn Turcotte
cb1bcdc8e0 Tweak the settings UI 
- Move the cancel and apply buttons side by side
- Hide the notification label when empty
- Clamp elements at the top together a bit
 2015-08-28 15:51:11 +02:00
Jocelyn Turcotte
f38deb44fb Don't disable the selective sync cancel button 
This makes its interaction more consistent versus other
kinds of dialogs or versus when the selective sync config
has been changed or not.
 2015-08-28 12:14:56 +02:00
Christian Kamm
92f6134ed3 AccountSettings: Adjust quota info design #3644 #3651 2015-08-24 15:06:11 +02:00
Christian Kamm
a0f9b834b6 Adjust buttons on remove folder/account questions #3654 2015-08-24 15:05:40 +02:00
Christian Kamm
344d3565f8 Another account deletion wording update #3649 2015-08-19 15:55:29 +02:00
Christian Kamm
a7d0f0cdd4 Adjust wording of delete account/folder message #3643 2015-08-19 10:59:34 +02:00
Olivier Goffart
2dbe822972 Account Settings: remove the storage use label #3567 2015-08-14 11:52:09 +02:00
Olivier Goffart
5f832b5b39 Account Settings: Reorder the options in the context menu #3584 2015-08-13 15:07:51 +02:00
Olivier Goffart
f32c8d0570 Account settings: add a button to show the context menu #3584 2015-08-13 12:34:22 +02:00
Olivier Goffart
b49e9e8f30 Account Settings: rename and re-order the options in the context menu 2015-08-13 12:32:59 +02:00
Olivier Goffart
6fcb48a0c7 Account settings: Double click no longer open in the file browser #3585 
Add a separate option in the context menu for it
 2015-08-13 11:53:00 +02:00
Christian Kamm
c2c924931b Ignore hidden: Default to enabled #2086 
It was 'false' for migrated folders and folders created by the OC
setup wizard.
 2015-08-10 11:15:39 +02:00
Olivier Goffart
8b52a121bb AccountSettings: Show the wizard to add an account when the last account was deleted #3564 2015-08-07 13:15:02 +02:00
Olivier Goffart
dc299b0bf9 Account settings: Fix a label 
The feature is for all folder, not only shared folder
 2015-08-05 16:12:58 +02:00
Olivier Goffart
952c249039 Selective sync: on the first sync, do not ask confirmation for every folders 
Since we already confirmed a previous selective sync dialog
 2015-08-05 16:11:59 +02:00
Olivier Goffart
38da1b7de1 AccountSettings: automatically refresh and expands the undecided folders #3541 2015-08-05 12:51:49 +02:00
Olivier Goffart
ec86d1a151 Wizards: allow adding a folder in a non-existing directory and create that folder 
The owncloud wizard already created the directory, but the recent addition
of FolderMan::checkPathValidityForNewFolder stopped allowing unexisting directories.

So change FolderMan::checkPathValidityForNewFolder to allow non existing directory
and whange the FolderWizard to create the directory if it does not exist.

Issue #3492
 2015-07-28 12:14:52 +02:00
Markus Goetz
a58cb049b2 OS X: Fix layout of quota info in SettingsDialog 2015-07-20 18:43:18 +02:00
Christian Kamm
9acc9d2d44 Fix Qt4 build. 
QMap::first is new in Qt 5.2
 2015-07-17 12:07:48 +02:00
Klaas Freitag
a5528b7cd4 AccountSettings: When adding a new folder, set ignore hidden flag. 
The value is taken from existing folder definitions, or defaults to true.
 2015-07-15 15:54:41 +02:00
Christian Kamm
908881cbf7 AccountSettings: Fix label for ServiceUnavailable state. 2015-07-15 14:02:45 +02:00
Christian Kamm
2ac8646320 AccountSettings: Improve error reporting. #3084 
Previously the errors were only visible in the tray icon tooltip!
 2015-07-15 12:04:44 +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
d1bfc7a636 Settings: fix broken signal/slot connection: 
No such slot OCC::GeneralSettings::slotForceRemoteDiscoveryOnFolders()
      (sender name:   'OCC__IgnoreListEditor')
      (receiver name: 'OCC__GeneralSettings')

The slot was in another settings page (because the button 'edit ignored files'
was moved.

Move the actual code to IgnoreListEditor where it logically belong.
Add a comment on the why this code is there.
 2015-07-07 20:46:39 +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
4420d52919 QuotaInfo: Ensure label fits into progress bar. #3393 2015-07-02 10:28:33 +02:00
Christian Kamm
2fa00168cf Sync scheduling: fix per-account scheduling. #3379 
application.cpp still had a global folder syncing on/off switch
when an account connected or disconnected. That couldn't work with
multiaccount.

Instead FolderMan listens to accountStateChanged messages and
schedules or de-schedules the folders for accounts that change state.
 2015-07-01 14:53:07 +02:00
Olivier Goffart
e7d7646151 QuotaInfo: only request the quota when the UI is visible 2015-06-26 15:43:19 +02:00
Olivier Goffart
29fecb029e Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	VERSION.cmake
        src/gui/accountsettings.cpp
	src/gui/accountsettings.h
 2015-06-25 12:30:52 +02:00
Christian Kamm
deb5e68e15 Ignores: Force a remote discovery after ignore list change #3172 
The problem was that the modified ignore pattern was not applied
to the parts of the remote tree we simply retrieve from the db
because the folder etag didn't change.

Even worse, if one removed an ignore pattern, the un-ignored
files would not be synced correctly.

With this change, a modification to the ignore list always results
in a full remote discovery. This guarantees that we find un-ignored
files.
 2015-06-19 14:58:47 +02:00
Christian Kamm
84bae92264 AccountSettings: Fix initial visibility of sel sync panel #3355 2015-06-17 14:43:38 +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
e9e11d251f Fix compilation after merge of the confirm and the new-ui branch 2015-06-10 16:22:14 +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
3a7bd3f95c AccountManager: save the config after removing an account 2015-05-12 15:37:16 +02:00
Olivier Goffart
716b0c68da Merge remote-tracking branch 'origin/master' into new-ui 2015-05-12 15:20:40 +02:00
Olivier Goffart
1edd46b995 Multi-Account: add possibility to delete an account 2015-05-12 15:16:32 +02:00
Daniel Molkentin
b54f2b3b31 Merge remote-tracking branch 'origin/1.9' 
Conflicts:
	VERSION.cmake
	src/libsync/propagatedownload.cpp
	src/libsync/propagateupload.cpp
 2015-05-12 10:03:38 +02:00
Christian Kamm
73e2254a80 AccountState: Treat *any* 503 as a temporary error. #3113 2015-05-07 09:21:52 +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
04382c467b Progress: Fix broken signal connection 2015-04-27 12:34:15 +02:00
Olivier Goffart
be1b39067d Merge branch 'master' into new-ui 2015-04-27 12:32:12 +02:00
Christian Kamm
27159104a9 Folders: Store inside account config. 2015-04-24 13:42:35 +02:00
Christian Kamm
68bf22f469 Revert "AccountSettings: Update progress only twice per second. #3014" 
This reverts commit 0f33e266ce.

The change was not meant to be merged, see discussion in #3014.
 2015-04-22 11:46:00 +02:00
Christian Kamm
96ecdb866d Time estimate: Refactor remaining time guess. #2328 2015-04-22 11:20:31 +02:00
Christian Kamm
7d68c628db Time estimation: Use a consistent check for size dependence. #2328 2015-04-22 10:45:41 +02:00
Christian Kamm
0f33e266ce AccountSettings: Update progress only twice per second. #3014 2015-04-22 10:45:41 +02:00
Olivier Goffart
a932eac832 Multi-account WIP 2015-04-17 17:56:17 +02:00
Olivier Goffart
afdd01488f AccountManager: Move out of libsync 
The AccountManager does not belong in the libsync because it is not
part of the synchronisation algorithm, but is just an helper class
for the UI to maintain the account and read/save the config
 2015-04-09 16:19:17 +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
Christian Kamm
5c7fd24ea8 Handle 503 due to maintenance more gracefully. #2884 2015-02-25 12:02:10 +01:00
Christian Kamm
e4fce1250b Progress: Ensure overall progress is between 0 and 100. #2648 
This should *already* be the case - but @dahan1999 reported that
it fixed #2648.
 2015-02-12 10:09:07 +01:00
Markus Goetz
f233af04f6 Windows XP: Possible fix for #2648 2015-02-04 18:49:04 +01:00
Christian Kamm
350ad98c27 Folderwizard: Prepare for multiaccount. #43 
Avoid accessing the global account instance and instead pass it in
from the outside.
 2015-01-28 10:40:32 +01:00
Olivier Goffart
3169833cd7 gui: Still give a decent experience if there is no system tray 
Helps for tasks #1138, #2023, #2123
 2015-01-26 13:00:45 +01:00
Daniel Molkentin
c3468b7ed6 Merge remote-tracking branch 'origin/master' into accountstate 
Conflicts:
	src/gui/owncloudsetupwizard.cpp
	src/gui/owncloudsetupwizard.h
	src/libsync/propagatedownload.cpp
	src/libsync/propagatedownload.h
 2015-01-08 15:33:39 +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
Christian Kamm
38ebfec1fb Use global Account/AccountState less. 
* Use a shared pointer to Account everywhere to ensure
  the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
  for all jobs they run

Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
 2014-12-18 15:39:51 +01:00
Christian Kamm
6c7acd585e Account: Split into libsync/Account and gui/AccountState. 
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.

I also moved quotainfo to gui since it depends on the account state.
 2014-12-18 15:39:51 +01:00
Olivier Goffart
414838cae8 Settings dialog: remove the code that was updating the account icon 
I just wanted to fix the warning:
 QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108

It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
 2014-12-16 11:36:52 +01:00
Daniel Molkentin
2db17a57d2 Fix header names 2014-11-09 23:25:57 +01:00
Daniel Molkentin
ae85aa33fd Adjust namespaces 2014-11-09 22:34:07 +01:00
Christian Kamm
7ae0338f5c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
 2014-10-22 10:41:55 +02:00
Olivier Goffart
50e718b1e7 Merge branch '1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folder.cpp
	src/gui/socketapi.cpp
	translations/mirall_ca.ts
	translations/mirall_cs.ts
	translations/mirall_de.ts
	translations/mirall_el.ts
	translations/mirall_en.ts
	translations/mirall_es.ts
	translations/mirall_es_AR.ts
	translations/mirall_et.ts
	translations/mirall_eu.ts
	translations/mirall_fa.ts
	translations/mirall_fi.ts
	translations/mirall_fr.ts
	translations/mirall_gl.ts
	translations/mirall_hu.ts
	translations/mirall_it.ts
	translations/mirall_ja.ts
	translations/mirall_nl.ts
	translations/mirall_pl.ts
	translations/mirall_pt.ts
	translations/mirall_pt_BR.ts
	translations/mirall_ru.ts
	translations/mirall_sk.ts
	translations/mirall_sl.ts
	translations/mirall_sv.ts
	translations/mirall_th.ts
	translations/mirall_tr.ts
	translations/mirall_uk.ts
	translations/mirall_zh_CN.ts
	translations/mirall_zh_TW.ts
 2014-09-18 17:10:21 +02:00
Klaas Freitag
bcff1ced5e Merge branch '1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp
 2014-08-29 20:40:33 +02:00
Daniel Molkentin
cf12a56b4c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/socketapi.cpp
 2014-08-27 18:22:07 +02: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
df3c3bca02 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
Renamed from src/mirall/accountsettings.cpp (Browse further)