[Pkg-owncloud-commits] [owncloud-client] 113/498: Merge branch 'master' into new-ui
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:41 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 507206367ff611205da88848aa49a416b4cec3dd
Merge: d7fa03c 54a42e4
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Tue May 26 14:56:08 2015 +0200
Merge branch 'master' into new-ui
CMakeLists.txt | 2 +-
ChangeLog | 31 +
admin/win/nsi/l10n/.tx/config | 48 +-
admin/win/nsi/l10n/Norwegian.nsh | 46 +
admin/win/nsi/l10n/bin/build_locale_nsi.py | 2 +-
admin/win/nsi/l10n/bin/l10n.sh | 1 +
admin/win/nsi/l10n/languages.nsh | 3 +-
cmake/modules/NSIS.template.in | 21 +-
cmake/modules/QtVersionAbstraction.cmake | 1 +
config.h.in | 2 +
csync/src/csync.c | 14 +
csync/src/csync_rename.cc | 16 +
csync/src/csync_rename.h | 3 +
csync/tests/ownCloud/ownCloud/Test.pm | 10 +-
csync/tests/ownCloud/t_recall.pl | 85 ++
doc/architecture.rst | 2 +-
doc/troubleshooting.rst | 4 +
src/gui/accountsettings.ui | 3 +
src/gui/accountstate.cpp | 16 +-
src/gui/accountstate.h | 2 +
src/gui/application.cpp | 4 +-
src/gui/folderwizard.h | 1 +
src/gui/wizard/owncloudhttpcredspage.ui | 3 +
src/libsync/CMakeLists.txt | 10 +-
src/libsync/bandwidthmanager.cpp | 4 +-
src/libsync/configfile.cpp | 15 +
src/libsync/configfile.h | 6 +
src/libsync/filesystem.cpp | 59 ++
src/libsync/filesystem.h | 9 +
src/libsync/networkjobs.cpp | 11 +-
src/libsync/owncloudpropagator.cpp | 15 +
src/libsync/ownsql.cpp | 2 +-
src/libsync/progressdispatcher.h | 6 +-
src/libsync/propagatedownload.cpp | 74 +-
src/libsync/propagatedownload.h | 10 +-
src/libsync/propagateupload.cpp | 65 +-
src/libsync/propagateupload.h | 10 +
src/libsync/propagatorjobs.h | 16 +
src/libsync/syncengine.cpp | 16 +-
src/libsync/syncfileitem.h | 1 +
src/libsync/syncjournaldb.cpp | 60 +-
src/libsync/syncjournaldb.h | 9 -
src/libsync/theme.cpp | 9 +-
src/libsync/theme.h | 9 +-
src/libsync/transmissionchecksumvalidator.cpp | 151 +++
src/libsync/transmissionchecksumvalidator.h | 74 ++
src/libsync/utility.cpp | 20 +-
src/libsync/utility.h | 2 +-
test/CMakeLists.txt | 2 +
test/testfilesystem.h | 93 ++
test/testowncloudpropagator.h | 2 +-
test/testtranschecksumvalidator.h | 159 ++++
test/testxmlparse.h | 8 +-
translations/.tx/config | 1 +
translations/client_ca.ts | 129 +--
translations/client_cs.ts | 129 +--
translations/client_de.ts | 133 +--
translations/client_el.ts | 129 +--
translations/client_en.ts | 129 +--
translations/client_es.ts | 129 +--
translations/client_es_AR.ts | 129 +--
translations/client_et.ts | 129 +--
translations/client_eu.ts | 129 +--
translations/client_fa.ts | 129 +--
translations/client_fi.ts | 129 +--
translations/client_fr.ts | 137 +--
translations/client_gl.ts | 129 +--
translations/client_hu.ts | 129 +--
translations/client_it.ts | 129 +--
translations/client_ja.ts | 129 +--
translations/{client_sv.ts => client_nb_NO.ts} | 1166 ++++++++++++------------
translations/client_nl.ts | 131 +--
translations/client_pl.ts | 129 +--
translations/client_pt.ts | 178 ++--
translations/client_pt_BR.ts | 136 +--
translations/client_ru.ts | 129 +--
translations/client_sk.ts | 129 +--
translations/client_sl.ts | 129 +--
translations/client_sr.ts | 129 +--
translations/client_sv.ts | 129 +--
translations/client_th.ts | 129 +--
translations/client_tr.ts | 129 +--
translations/client_uk.ts | 129 +--
translations/client_zh_CN.ts | 145 +--
translations/client_zh_TW.ts | 129 +--
85 files changed, 3971 insertions(+), 2399 deletions(-)
diff --cc src/gui/accountsettings.ui
index c2c3f63,a19dcbe..f390eb2
--- a/src/gui/accountsettings.ui
+++ b/src/gui/accountsettings.ui
@@@ -13,48 -13,87 +13,51 @@@
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0" colspan="2">
- <widget class="QGroupBox" name="syncStatusGroupBox">
- <property name="title">
- <string>Account to Synchronize</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="SslButton" name="sslButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="connectLabel">
- <property name="text">
- <string>Connected with <server> as <user></string>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QWidget" name="accountStatus" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="SslButton" name="sslButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="connectLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
++ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <widget class="QListView" name="_folderList"/>
+ </property>
+ <property name="text">
+ <string>Connected with <server> as <user></string>
+ </property>
+ </widget>
</item>
- <item row="1" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QPushButton" name="_buttonAdd">
- <property name="text">
- <string>Add Folder...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="_buttonEnable">
- <property name="text">
- <string>Pause</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="_buttonRemove">
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="_buttonSelectiveSync">
- <property name="text">
- <string>Choose What to Sync</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <item>
+ <widget class="QPushButton" name="deleteButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Delete</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
--
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