Olivier Goffart
6e8527e66d
Wizard: Show the remote folder name when the theme has one
...
Relates to issue #2788
2015-02-06 14:50:52 +01:00
Olivier Goffart
70c8803a79
SelectiveSync: show a message in case of error or if there is no subfolder
...
Usefull when the folder does not exist (for example in case the theme
has a defaultServerFolder that does not yet exist, #2788 )
But also to avoid confusion (issue #2663 )
2015-02-06 12:27:54 +01:00
Olivier Goffart
0d2fb0754c
Wizard: Fix the advanced setup page when the theme has a defaultServerFolder
...
Especially the selective sync dialog
Task #2788
2015-02-06 12:27:54 +01:00
Olivier Goffart
3169a6f170
SelectiveSync: change the wording of the dialog on the wizard
...
Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option
Relates to #2580
2015-02-05 16:22:04 +01:00
Olivier Goffart
0f98a90858
Wizard: Add an option in the theme to default to nothing selected in the selective sync
...
Issue #2580
2015-01-22 15:57:55 +01:00
Markus Goetz
c9f9d55658
Merge branch 'qnam_csync_update'
...
Conflicts:
src/libsync/networkjobs.cpp
2015-01-22 14:34:36 +01:00
Olivier Goffart
f2a7e0b28f
Selective sync dialog: give a proper size by default
2015-01-21 15:37:00 +01:00
Markus Goetz
906779c4b1
SyncEngine: Use QNAM for csync_update
...
This is for #2507
2015-01-20 18:27:25 +01:00
Olivier Goffart
2b8b204cfc
SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error
2015-01-15 13:07:16 +01:00
Olivier Goffart
ac0e8b1fe1
Qt 4 fix
2015-01-14 16:30:10 +01:00
Olivier Goffart
da0f7317b4
Wizard: Show the size of the folders that will be downloaded
...
Part of #2580
2015-01-14 16:11:07 +01:00
Olivier Goffart
885aafcea3
SelectiveSync dialog: Show the sizes of the folder
2015-01-14 15:08:09 +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
Daniel Molkentin
ae85aa33fd
Adjust namespaces
2014-11-09 22:34:07 +01:00
Daniel Molkentin
f2eadacf09
Remove "Mirall" from class names
2014-11-09 22:30:29 +01:00
Daniel Molkentin
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04: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
e5471d8318
Build after merge
2014-08-26 14:33:21 +02:00
