[Pkg-owncloud-commits] [owncloud-client] 52/498: Merge branch 'master' into new-ui
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:33 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 be1b39067d875b3a808c8a635396e2d9b17547ef
Merge: 2715910 ddfb7f3
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Mon Apr 27 12:32:12 2015 +0200
Merge branch 'master' into new-ui
ChangeLog | 46 +-
VERSION.cmake | 6 +-
admin/osx/create_mac_pkg.sh.cmake | 2 +-
admin/osx/macdeployqt.py | 10 +-
admin/osx/sign_app.sh | 4 +-
admin/win/nsi/l10n/Galician.nsh | 4 +-
csync/CMakeLists.txt | 8 +-
csync/src/csync.h | 2 -
csync/src/csync_owncloud.c | 6 +-
csync/src/csync_version.h.in | 17 +-
doc/advancedusage.rst | 1 +
doc/architecture.rst | 6 +-
doc/autoupdate.rst | 10 +-
doc/installing.rst | 3 +
doc/introduction.rst | 3 +
doc/options.rst | 21 +-
doc/owncloudcmd.rst | 66 +-
src/3rdparty/qtsingleapplication/qtlocalpeer.cpp | 1 +
src/cmd/cmd.cpp | 2 +-
src/gui/accountmigrator.h | 3 -
src/gui/accountsettings.cpp | 25 +-
src/gui/accountsettings.h | 2 +-
src/gui/application.cpp | 2 -
src/gui/folder.cpp | 89 +-
src/gui/folder.h | 2 +-
src/gui/owncloudgui.cpp | 22 +-
src/gui/owncloudgui.h | 2 +-
src/gui/owncloudsetupwizard.cpp | 59 +-
src/gui/owncloudsetupwizard.h | 1 -
src/gui/protocolwidget.cpp | 12 +-
src/gui/protocolwidget.h | 2 +-
src/gui/sharedialog.h | 1 -
src/gui/socketapi.cpp | 8 +-
src/gui/socketapi.h | 2 +-
src/libsync/cookiejar.cpp | 1 +
src/libsync/creds/httpcredentials.h | 1 +
src/libsync/discoveryphase.cpp | 16 +-
src/libsync/owncloudpropagator.cpp | 130 +-
src/libsync/owncloudpropagator.h | 28 +-
src/libsync/progressdispatcher.cpp | 191 +-
src/libsync/progressdispatcher.h | 280 +-
src/libsync/propagatedownload.cpp | 80 +-
src/libsync/propagatedownload.h | 2 +-
src/libsync/propagateremotedelete.cpp | 18 +-
src/libsync/propagateremotedelete.h | 2 +-
src/libsync/propagateremotemkdir.cpp | 28 +-
src/libsync/propagateremotemkdir.h | 2 +-
src/libsync/propagateremotemove.cpp | 32 +-
src/libsync/propagateremotemove.h | 2 +-
src/libsync/propagateupload.cpp | 135 +-
src/libsync/propagateupload.h | 8 +-
src/libsync/propagator_legacy.cpp | 118 +-
src/libsync/propagator_legacy.h | 8 +-
src/libsync/propagatorjobs.cpp | 44 +-
src/libsync/propagatorjobs.h | 6 +-
src/libsync/syncengine.cpp | 411 ++-
src/libsync/syncengine.h | 8 +-
src/libsync/syncfileitem.h | 8 +-
src/libsync/theme.h | 1 +
translations/client_ca.ts | 898 ++++---
translations/client_cs.ts | 884 ++++---
translations/client_de.ts | 887 ++++---
translations/client_el.ts | 880 ++++---
translations/client_en.ts | 840 +++---
translations/client_es.ts | 876 ++++---
translations/client_es_AR.ts | 850 +++---
translations/client_et.ts | 897 ++++---
translations/client_eu.ts | 857 +++---
translations/client_fa.ts | 848 +++---
translations/client_fi.ts | 881 ++++---
translations/client_fr.ts | 926 ++++---
translations/client_gl.ts | 874 ++++---
translations/client_hu.ts | 848 +++---
translations/client_it.ts | 866 ++++---
translations/client_ja.ts | 886 ++++---
translations/client_nl.ts | 882 ++++---
translations/client_pl.ts | 871 ++++---
translations/client_pt.ts | 890 ++++---
translations/client_pt_BR.ts | 887 ++++---
translations/client_ru.ts | 878 ++++---
translations/client_sk.ts | 889 ++++---
translations/client_sl.ts | 871 ++++---
translations/client_sr.ts | 1072 ++++----
translations/client_sv.ts | 875 ++++---
translations/client_th.ts | 848 +++---
translations/client_tr.ts | 889 ++++---
translations/client_uk.ts | 887 ++++---
translations/client_zh_CN.ts | 912 ++++---
translations/client_zh_TW.ts | 860 ++++---
translations/mirall_en.ts | 3005 ----------------------
90 files changed, 15625 insertions(+), 15899 deletions(-)
diff --cc src/gui/accountsettings.cpp
index 4a8be3b,5d7f915..45f11bb
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@@ -507,10 -683,10 +508,10 @@@ void AccountSettings::slotSetProgress(c
int overallPercent = 0;
if( totalFileCount > 0 ) {
// Add one 'byte' for each files so the percentage is moving when deleting or renaming files
- overallPercent = qRound(double(completedSize + progress._completedFileCount)/double(totalSize + totalFileCount) * 100.0);
+ overallPercent = qRound(double(completedSize + completedFile)/double(totalSize + totalFileCount) * 100.0);
}
- overallPercent = qBound(0, overallPercent, 100);
- item->setData( overallPercent, FolderStatusDelegate::SyncProgressOverallPercent);
+ progressInfo->_overallPercent = qBound(0, overallPercent, 100);
+ emit _model->dataChanged(_model->index(folderIndex), _model->index(folderIndex), roles);
}
void AccountSettings::slotHideProgress()
diff --cc src/gui/accountsettings.h
index bf5d112,380e68c..86bd74c
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@@ -60,9 -61,11 +60,9 @@@ public slots
void slotOpenOC();
void slotUpdateFolderState( Folder* );
void slotDoubleClicked( const QModelIndex& );
- void slotSetProgress(const QString& folder, const Progress::Info& progress);
+ void slotSetProgress(const QString& folder, const ProgressInfo& progress);
- void slotButtonsSetEnabled();
void slotUpdateQuota( qint64,qint64 );
- void slotIgnoreFilesEditor();
void slotAccountStateChanged(int state);
void setGeneralErrors( const QStringList& errors );
diff --cc src/gui/folder.cpp
index 9a47a10,e326210..35e1d63
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@@ -573,10 -567,20 +573,10 @@@ void Folder::slotWatchedPathChanged(con
}
}
-void Folder::setConfigFile( const QString& file )
-{
- _configFile = file;
-}
-
-QString Folder::configFile()
-{
- return _configFile;
-}
-
static void addErroredSyncItemPathsToList(const SyncFileItemVector& items, QSet<QString>* set) {
- Q_FOREACH(const SyncFileItem &item, items) {
- if (item.hasErrorStatus()) {
- set->insert(item._file);
+ Q_FOREACH(const SyncFileItemPtr &item, items) {
+ if (item->hasErrorStatus()) {
+ set->insert(item->_file);
}
}
}
--
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