[Pkg-owncloud-commits] [owncloud-client] 43/484: Merge branch '2.0'
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit efefc2d986360d082247cc2e517aa6102e512c5a
Merge: 9f8d109 3cbd63a
Author: Christian Kamm <mail at ckamm.de>
Date: Fri Oct 2 15:44:50 2015 +0200
Merge branch '2.0'
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
CMakeLists.txt | 12 +-
CONTRIBUTING.md | 6 +-
OWNCLOUD.cmake | 2 +-
admin/osx/create_mac_pkg.sh.cmake | 2 +-
admin/win/nsi/l10n/Basque.nsh | 2 +-
admin/win/nsi/l10n/Catalan.nsh | 2 +-
admin/win/nsi/l10n/Czech.nsh | 4 +-
admin/win/nsi/l10n/Dutch.nsh | 2 +-
admin/win/nsi/l10n/English.nsh | 2 +-
admin/win/nsi/l10n/Estonian.nsh | 2 +-
admin/win/nsi/l10n/Farsi.nsh | 2 +-
admin/win/nsi/l10n/Finnish.nsh | 2 +-
admin/win/nsi/l10n/French.nsh | 2 +-
admin/win/nsi/l10n/Galician.nsh | 2 +-
admin/win/nsi/l10n/German.nsh | 2 +-
admin/win/nsi/l10n/Greek.nsh | 2 +-
admin/win/nsi/l10n/Hungarian.nsh | 2 +-
admin/win/nsi/l10n/Italian.nsh | 2 +-
admin/win/nsi/l10n/Japanese.nsh | 2 +-
admin/win/nsi/l10n/Norwegian.nsh | 4 +-
admin/win/nsi/l10n/Polish.nsh | 2 +-
admin/win/nsi/l10n/Portuguese.nsh | 2 +-
admin/win/nsi/l10n/PortugueseBR.nsh | 2 +-
admin/win/nsi/l10n/Russian.nsh | 2 +-
admin/win/nsi/l10n/SimpChinese.nsh | 2 +-
admin/win/nsi/l10n/Slovak.nsh | 2 +-
admin/win/nsi/l10n/Slovenian.nsh | 2 +-
admin/win/nsi/l10n/Spanish.nsh | 2 +-
admin/win/nsi/l10n/SpanishInternational.nsh | 2 +-
admin/win/nsi/l10n/Swedish.nsh | 2 +-
admin/win/nsi/l10n/Thai.nsh | 2 +-
admin/win/nsi/l10n/Turkish.nsh | 2 +-
admin/win/nsi/l10n/Ukrainian.nsh | 2 +-
admin/win/nsi/l10n/pofiles/messages.pot | 4 +-
cmake/modules/DefineCompilerFlags.cmake | 2 +-
cmake/modules/NSIS.template.in | 4 +-
cmake/modules/UseDoxygen.cmake | 2 +-
cmake/scripts/generate_lib_file | 4 +-
csync/ChangeLog | 10 +-
csync/INSTALL | 4 +-
csync/README | 2 +-
csync/src/csync_update.c | 11 +-
csync/src/vio/csync_vio_local_win.c | 14 +-
doc/images/client-1.png | Bin 0 -> 34342 bytes
doc/images/client-2.png | Bin 0 -> 41642 bytes
doc/images/client-3.png | Bin 0 -> 68758 bytes
doc/images/client-4.png | Bin 0 -> 64091 bytes
doc/images/client-7.png | Bin 0 -> 5865 bytes
doc/images/client1.png | Bin 20745 -> 0 bytes
doc/images/client2.png | Bin 20002 -> 0 bytes
doc/images/client3.png | Bin 34633 -> 0 bytes
doc/images/client4.png | Bin 22525 -> 0 bytes
doc/images/client5.png | Bin 18958 -> 0 bytes
doc/images/client6.png | Bin 53866 -> 53600 bytes
doc/images/ignored_files_editor.png | Bin 35364 -> 31193 bytes
doc/images/menu.png | Bin 13714 -> 4969 bytes
doc/images/settings_network.png | Bin 40176 -> 43075 bytes
doc/installing.rst | 72 +-
doc/introduction.rst | 39 +-
doc/navigating.rst | 51 +-
doc/visualtour.rst | 2 +-
.../MacOSX/OwnCloudFinder/ContentManager.m | 4 +-
.../OwnCloudFinder.xcodeproj/project.pbxproj | 2 +-
.../MacOSX/OwnCloudFinder/RequestManager.m | 9 +-
.../MacOSX/OwnCloudInjector/OwnCloudInjector.m | 2 +-
shell_integration/MacOSX/common/SyncClientProxy.m | 2 +-
shell_integration/dolphin/README | 4 +-
shell_integration/dolphin_kf5/README | 2 +-
shell_integration/nautilus/syncstate.py | 9 +-
.../windows/OCOverlays/OverlayConstants.h | 2 +-
src/cmd/CMakeLists.txt | 2 +-
src/cmd/cmd.cpp | 31 +-
src/crashreporter/CMakeLists.txt | 2 +-
src/gui/accountmanager.cpp | 7 +-
src/gui/accountsettings.cpp | 67 +-
src/gui/accountsettings.h | 2 +
src/gui/accountsettings.ui | 2 +-
src/gui/accountstate.cpp | 7 +-
src/gui/application.cpp | 20 +
src/gui/application.h | 3 +
src/gui/folder.cpp | 19 +-
src/gui/folder.h | 3 +
src/gui/folderman.cpp | 10 +-
src/gui/generalsettings.cpp | 7 +
src/gui/ignorelisteditor.cpp | 20 +-
src/gui/main.cpp | 4 +-
src/gui/owncloudgui.cpp | 42 +-
src/gui/owncloudsetupwizard.cpp | 5 +-
src/gui/socketapi.cpp | 3 +-
src/gui/updater/ocupdater.h | 2 +-
src/gui/wizard/owncloudconnectionmethoddialog.h | 1 +
src/gui/wizard/owncloudsetuppage.cpp | 19 +-
src/gui/wizard/owncloudwizard.cpp | 2 -
src/gui/wizard/owncloudwizard.h | 2 -
src/libsync/account.cpp | 22 +-
src/libsync/account.h | 9 +-
src/libsync/connectionvalidator.cpp | 5 +-
src/libsync/discoveryphase.cpp | 2 +-
src/libsync/owncloudpropagator.cpp | 13 +-
src/libsync/owncloudpropagator.h | 10 +-
src/libsync/syncengine.cpp | 6 +-
src/libsync/theme.cpp | 4 +
src/libsync/theme.h | 8 +
src/libsync/utility.cpp | 20 +-
test/scripts/README.rst | 6 +-
test/testfilesystem.h | 4 +-
test/testplan.txt | 8 +-
test/testutility.h | 24 +-
theme.qrc | 48 +-
theme/black/state-download-128.png | Bin 0 -> 1265 bytes
theme/black/state-download-16.png | Bin 0 -> 456 bytes
theme/black/state-download-256.png | Bin 0 -> 2490 bytes
theme/black/state-download-32.png | Bin 0 -> 819 bytes
theme/black/state-download-64.png | Bin 0 -> 732 bytes
theme/black/state-download.svg | 13 +
theme/black/state-error-128.png | Bin 0 -> 1297 bytes
theme/black/state-error-16.png | Bin 1455 -> 467 bytes
theme/black/state-error-256.png | Bin 0 -> 2575 bytes
theme/black/state-error-32.png | Bin 1964 -> 866 bytes
theme/black/state-error-64.png | Bin 3174 -> 734 bytes
theme/black/state-error.svg | 16 +
theme/black/state-information-128.png | Bin 0 -> 1218 bytes
theme/black/state-information-16.png | Bin 1396 -> 463 bytes
theme/black/state-information-256.png | Bin 0 -> 2307 bytes
theme/black/state-information-32.png | Bin 1757 -> 797 bytes
theme/black/state-information-64.png | Bin 1925 -> 725 bytes
theme/black/state-information.svg | 14 +
theme/black/state-offline-128.png | Bin 0 -> 1171 bytes
theme/black/state-offline-16.png | Bin 1430 -> 466 bytes
theme/black/state-offline-256.png | Bin 0 -> 2227 bytes
theme/black/state-offline-32.png | Bin 1810 -> 838 bytes
theme/black/state-offline-64.png | Bin 1712 -> 710 bytes
theme/black/state-offline.svg | 14 +
theme/black/state-ok-128.png | Bin 0 -> 1214 bytes
theme/black/state-ok-16.png | Bin 1390 -> 451 bytes
theme/black/state-ok-256.png | Bin 0 -> 2433 bytes
theme/black/state-ok-32.png | Bin 1903 -> 839 bytes
theme/black/state-ok-64.png | Bin 2619 -> 682 bytes
theme/black/state-ok.svg | 16 +
theme/black/state-pause-128.png | Bin 0 -> 1125 bytes
theme/black/state-pause-16.png | Bin 1380 -> 450 bytes
theme/black/state-pause-256.png | Bin 0 -> 2160 bytes
theme/black/state-pause-32.png | Bin 1686 -> 778 bytes
theme/black/state-pause-64.png | Bin 2224 -> 657 bytes
theme/black/state-pause.svg | 12 +
theme/black/state-sync-128.png | Bin 0 -> 1417 bytes
theme/black/state-sync-16.png | Bin 1427 -> 476 bytes
theme/black/state-sync-256.png | Bin 0 -> 2804 bytes
theme/black/state-sync-32.png | Bin 1963 -> 918 bytes
theme/black/state-sync-64.png | Bin 2695 -> 816 bytes
theme/black/state-sync.svg | 16 +
theme/black/state-warning-128.png | Bin 0 -> 1274 bytes
theme/black/state-warning-16.png | Bin 0 -> 449 bytes
theme/black/state-warning-256.png | Bin 0 -> 2487 bytes
theme/black/state-warning-32.png | Bin 0 -> 813 bytes
theme/black/state-warning-64.png | Bin 0 -> 752 bytes
theme/black/state-warning.svg | 16 +
theme/colored/owncloud-icon-128.png | Bin 8094 -> 4296 bytes
theme/colored/owncloud-icon-22.png | Bin 781 -> 713 bytes
theme/colored/owncloud-icon-256.png | Bin 18212 -> 9012 bytes
theme/colored/owncloud-icon-32.png | Bin 1305 -> 1061 bytes
theme/colored/owncloud-icon-48.png | Bin 2212 -> 1581 bytes
theme/colored/owncloud-icon-512.png | Bin 38334 -> 18391 bytes
theme/colored/owncloud-icon-64.png | Bin 3306 -> 2153 bytes
theme/colored/owncloud-icon.svg | 2217 ++++++++++++--------
theme/colored/state-download-256.png | Bin 18762 -> 17123 bytes
theme/colored/state-error-128.png | Bin 8855 -> 7123 bytes
theme/colored/state-error-256.png | Bin 19454 -> 17213 bytes
theme/colored/state-error-32.png | Bin 3252 -> 3226 bytes
theme/colored/state-error-64.png | Bin 5792 -> 5483 bytes
theme/colored/state-information-128.png | Bin 7600 -> 6295 bytes
theme/colored/state-information-256.png | Bin 17298 -> 15967 bytes
theme/colored/state-information-32.png | Bin 2963 -> 2938 bytes
theme/colored/state-information-64.png | Bin 4896 -> 4418 bytes
theme/colored/state-offline-128.png | Bin 6098 -> 4136 bytes
theme/colored/state-offline-16.png | Bin 1669 -> 1392 bytes
theme/colored/state-offline-256.png | Bin 12471 -> 9246 bytes
theme/colored/state-offline-32.png | Bin 2644 -> 2032 bytes
theme/colored/state-offline-64.png | Bin 4087 -> 3061 bytes
theme/colored/state-ok-128.png | Bin 9223 -> 7584 bytes
theme/colored/state-ok-256.png | Bin 20611 -> 18075 bytes
theme/colored/state-ok-32.png | Bin 3223 -> 3208 bytes
theme/colored/state-ok-64.png | Bin 5472 -> 5332 bytes
theme/colored/state-pause-128.png | Bin 8556 -> 7277 bytes
theme/colored/state-pause-256.png | Bin 18561 -> 17237 bytes
theme/colored/state-pause-32.png | Bin 3132 -> 3114 bytes
theme/colored/state-pause-64.png | Bin 5661 -> 5604 bytes
theme/colored/state-sync-128.png | Bin 10072 -> 8256 bytes
theme/colored/state-sync-256.png | Bin 22157 -> 19446 bytes
theme/colored/state-sync-32.png | Bin 3275 -> 3269 bytes
theme/colored/state-sync-64.png | Bin 5766 -> 5594 bytes
theme/colored/state-warning-128.png | Bin 8845 -> 7553 bytes
theme/colored/state-warning-256.png | Bin 19797 -> 18175 bytes
theme/white/state-download-128.png | Bin 0 -> 1157 bytes
theme/white/state-download-16.png | Bin 0 -> 360 bytes
theme/white/state-download-256.png | Bin 0 -> 2367 bytes
theme/white/state-download-32.png | Bin 0 -> 640 bytes
theme/white/state-download-64.png | Bin 0 -> 649 bytes
theme/white/state-download.svg | 15 +
theme/white/state-error-128.png | Bin 0 -> 1191 bytes
theme/white/state-error-16.png | Bin 1269 -> 370 bytes
theme/white/state-error-256.png | Bin 0 -> 2429 bytes
theme/white/state-error-32.png | Bin 1676 -> 735 bytes
theme/white/state-error-64.png | Bin 3033 -> 645 bytes
theme/white/state-error.svg | 18 +
theme/white/state-information-128.png | Bin 0 -> 1099 bytes
theme/white/state-information-16.png | Bin 1273 -> 358 bytes
theme/white/state-information-256.png | Bin 0 -> 2170 bytes
theme/white/state-information-32.png | Bin 1575 -> 644 bytes
theme/white/state-information-64.png | Bin 1817 -> 632 bytes
theme/white/state-information.svg | 16 +
theme/white/state-offline-128.png | Bin 0 -> 1069 bytes
theme/white/state-offline-16.png | Bin 1288 -> 295 bytes
theme/white/state-offline-256.png | Bin 0 -> 2073 bytes
theme/white/state-offline-32.png | Bin 1611 -> 671 bytes
theme/white/state-offline-64.png | Bin 1635 -> 612 bytes
theme/white/state-offline.svg | 14 +
theme/white/state-ok-128.png | Bin 0 -> 1174 bytes
theme/white/state-ok-16.png | Bin 1241 -> 366 bytes
theme/white/state-ok-256.png | Bin 0 -> 2346 bytes
theme/white/state-ok-32.png | Bin 1652 -> 724 bytes
theme/white/state-ok-64.png | Bin 2576 -> 668 bytes
theme/white/state-ok.svg | 14 +
theme/white/state-pause-128.png | Bin 0 -> 1034 bytes
theme/white/state-pause-16.png | Bin 1256 -> 360 bytes
theme/white/state-pause-256.png | Bin 0 -> 2037 bytes
theme/white/state-pause-32.png | Bin 1504 -> 651 bytes
theme/white/state-pause-64.png | Bin 2179 -> 600 bytes
theme/white/state-pause.svg | 14 +
theme/white/state-sync-128.png | Bin 0 -> 1287 bytes
theme/white/state-sync-16.png | Bin 1287 -> 304 bytes
theme/white/state-sync-256.png | Bin 0 -> 2599 bytes
theme/white/state-sync-32.png | Bin 1662 -> 743 bytes
theme/white/state-sync-64.png | Bin 2585 -> 704 bytes
theme/white/state-sync.svg | 18 +
theme/white/state-warning-128.png | Bin 0 -> 1174 bytes
theme/white/state-warning-16.png | Bin 0 -> 355 bytes
theme/white/state-warning-256.png | Bin 0 -> 2300 bytes
theme/white/state-warning-32.png | Bin 0 -> 675 bytes
theme/white/state-warning-64.png | Bin 0 -> 656 bytes
theme/white/state-warning.svg | 16 +
translations/client_ca.ts | 472 ++---
translations/client_cs.ts | 464 ++--
translations/client_de.ts | 500 +++--
translations/client_el.ts | 470 ++---
translations/client_en.ts | 420 ++--
translations/client_es.ts | 464 ++--
translations/client_es_AR.ts | 590 +++---
translations/client_et.ts | 476 ++---
translations/client_eu.ts | 444 ++--
translations/client_fa.ts | 432 ++--
translations/client_fi.ts | 518 +++--
translations/client_fr.ts | 476 ++---
translations/client_gl.ts | 472 ++---
translations/client_hu.ts | 581 +++--
translations/client_it.ts | 448 ++--
translations/client_ja.ts | 472 ++---
translations/client_nb_NO.ts | 629 +++---
translations/client_nl.ts | 483 +++--
translations/client_pl.ts | 460 ++--
translations/client_pt.ts | 498 +++--
translations/client_pt_BR.ts | 470 ++---
translations/client_ru.ts | 472 ++---
translations/client_sk.ts | 589 +++---
translations/client_sl.ts | 462 ++--
translations/client_sr.ts | 460 ++--
translations/client_sv.ts | 450 ++--
translations/client_th.ts | 480 +++--
translations/client_tr.ts | 472 ++---
translations/client_uk.ts | 462 ++--
translations/client_zh_CN.ts | 468 ++---
translations/client_zh_TW.ts | 430 ++--
272 files changed, 9422 insertions(+), 8833 deletions(-)
diff --cc src/gui/accountsettings.cpp
index 1b39ce7,df9a6fd..bdaa2e3
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@@ -120,8 -120,26 +120,27 @@@ AccountSettings::AccountSettings(Accoun
connect( &_quotaInfo, SIGNAL(quotaUpdated(qint64,qint64)),
this, SLOT(slotUpdateQuota(qint64,qint64)));
+ connect(ui->signInButton, SIGNAL(clicked()) , this, SLOT(slotSignInAccount()));
connect(ui->deleteButton, SIGNAL(clicked()) , this, SLOT(slotDeleteAccount()));
+
+ // Expand already on single click
+ ui->_folderList->setExpandsOnDoubleClick(false);
+ QObject::connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
+ this, SLOT(slotFolderListClicked(const QModelIndex&)));
+ }
+
+ void AccountSettings::doExpand()
+ {
+ ui->_folderList->expandToDepth(0);
+ }
+
+ void AccountSettings::slotFolderListClicked( const QModelIndex& indx )
+ {
+ if( _model->classify(indx) == FolderStatusModel::RootFolder &&
+ _accountState && _accountState->state() == AccountState::Connected ) {
+ bool expanded = ! (ui->_folderList->isExpanded(indx));
+ ui->_folderList->setExpanded(indx, expanded);
+ }
}
void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list