[Pkg-owncloud-commits] [owncloud-client] 33/484: SyncLog Dialog WIP
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:07 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 0c148025a3a544c358542aea32ac631c202f9054
Author: Klaas Freitag <freitag at owncloud.com>
Date: Wed Sep 30 12:02:05 2015 +0200
SyncLog Dialog WIP
---
src/gui/CMakeLists.txt | 2 +
src/gui/generalsettings.cpp | 6 +++
src/gui/generalsettings.h | 1 +
src/gui/generalsettings.ui | 106 +++++++++++++++++++++++++++++---------------
4 files changed, 80 insertions(+), 35 deletions(-)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a892ab1..c2075f8 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -21,6 +21,7 @@ set(client_UI
ignorelisteditor.ui
networksettings.ui
protocolwidget.ui
+ synclogdialog.ui
settingsdialog.ui
sharedialog.ui
sslerrordialog.ui
@@ -68,6 +69,7 @@ set(client_SRCS
authenticationdialog.cpp
proxyauthhandler.cpp
proxyauthdialog.cpp
+ synclogdialog.cpp
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/shibbolethcredentials.cpp
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 703dd29..45f19b3 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -84,6 +84,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
connect(_ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));
connect(_ui->addAccountButton, SIGNAL(clicked()), SLOT(slotOpenAccountWizard()));
+ connect(_ui->openSyncLog, SIGNAL(clicked()), SLOT(slotOpenSyncLog()));
connect(AccountManager::instance(), SIGNAL(accountAdded(AccountState*)),
SLOT(slotAccountAddedOrRemoved()));
@@ -150,6 +151,11 @@ void GeneralSettings::slotToggleOptionalDesktopNotifications(bool enable)
cfgFile.setOptionalDesktopNotifications(enable);
}
+void GeneralSettings::slotOpenSyncLog()
+{
+
+}
+
void GeneralSettings::slotIgnoreFilesEditor()
{
if (_ignoreEditor.isNull()) {
diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
index e64c784..53dd245 100644
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -44,6 +44,7 @@ private slots:
void slotUpdateInfo();
void slotIgnoreFilesEditor();
void slotOpenAccountWizard();
+ void slotOpenSyncLog();
void slotAccountAddedOrRemoved();
diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
index 3742a22..8175052 100644
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -23,14 +23,14 @@
<item row="0" column="0">
<widget class="QCheckBox" name="autostartCheckBox">
<property name="text">
- <string>Launch on System Startup</string>
+ <string>&Launch on System Startup</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="desktopNotificationsCheckBox">
<property name="text">
- <string>Show Desktop Notifications</string>
+ <string>Show &Desktop Notifications</string>
</property>
</widget>
</item>
@@ -40,7 +40,7 @@
<string>For System Tray</string>
</property>
<property name="text">
- <string>Use Monochrome Icons</string>
+ <string>Use &Monochrome Icons</string>
</property>
</widget>
</item>
@@ -53,12 +53,60 @@
<string>Advanced</string>
</property>
<layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="ignoredFilesButton">
+ <property name="text">
+ <string>Edit &Ignored Files</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="addAccountButton">
+ <property name="text">
+ <string>&Add an Account</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QCheckBox" name="newFolderLimitCheckBox">
<property name="text">
- <string>Ask confirmation before downloading folders larger than</string>
+ <string>Ask &confirmation before downloading folders larger than</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -97,7 +145,7 @@
</item>
</layout>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="2" column="0">
<widget class="QCheckBox" name="crashreporterCheckBox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -106,45 +154,21 @@
</sizepolicy>
</property>
<property name="text">
- <string>Show crash reporter</string>
+ <string>S&how crash reporter</string>
</property>
</widget>
</item>
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QPushButton" name="ignoredFilesButton">
- <property name="text">
- <string>Edit Ignored Files</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item row="2" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
- <widget class="QPushButton" name="addAccountButton">
+ <widget class="QPushButton" name="openSyncLog">
<property name="text">
- <string>Add an Account</string>
+ <string>&Open Synclog</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_2">
+ <spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -243,6 +267,18 @@
</item>
</layout>
</widget>
+ <tabstops>
+ <tabstop>autostartCheckBox</tabstop>
+ <tabstop>desktopNotificationsCheckBox</tabstop>
+ <tabstop>monoIconsCheckBox</tabstop>
+ <tabstop>ignoredFilesButton</tabstop>
+ <tabstop>addAccountButton</tabstop>
+ <tabstop>newFolderLimitCheckBox</tabstop>
+ <tabstop>newFolderLimitSpinBox</tabstop>
+ <tabstop>crashreporterCheckBox</tabstop>
+ <tabstop>openSyncLog</tabstop>
+ <tabstop>restartButton</tabstop>
+ </tabstops>
<resources/>
<connections>
<connection>
--
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