[Pkg-owncloud-commits] [owncloud-client] 02/26: Make the "details" manu entry work
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Dec 9 00:01:56 UTC 2013
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 58eb000163ed3b75d3584a71a3e368905d35cef9
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Fri Nov 29 11:18:59 2013 +0100
Make the "details" manu entry work
Fix #1214
---
src/mirall/owncloudgui.cpp | 7 +++++++
src/mirall/owncloudgui.h | 1 +
src/mirall/settingsdialog.cpp | 7 +++++++
src/mirall/settingsdialog.h | 1 +
4 files changed, 16 insertions(+)
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 5c57490..424fb84 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -486,6 +486,13 @@ void ownCloudGui::slotShowSettings()
_settingsDialog->slotRefreshResultList();
}
+void ownCloudGui::slotShowSyncProtocol()
+{
+ slotShowSettings();
+ _settingsDialog->showActivityPage();
+}
+
+
void ownCloudGui::slotShutdown()
{
// those do delete on close
diff --git a/src/mirall/owncloudgui.h b/src/mirall/owncloudgui.h
index bf88a6f..d1018d2 100644
--- a/src/mirall/owncloudgui.h
+++ b/src/mirall/owncloudgui.h
@@ -59,6 +59,7 @@ public slots:
void slotShowGuiMessage(const QString &title, const QString &message);
void slotFoldersChanged();
void slotShowSettings();
+ void slotShowSyncProtocol();
void slotShutdown();
void slotSyncStateChange( const QString& alias );
void slotTrayClicked( QSystemTrayIcon::ActivationReason reason );
diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp
index 78c6a97..0bf77bd 100644
--- a/src/mirall/settingsdialog.cpp
+++ b/src/mirall/settingsdialog.cpp
@@ -177,4 +177,11 @@ void SettingsDialog::slotRefreshResultList() {
_protocolWidget->setupList();
}
}
+
+void SettingsDialog::showActivityPage()
+{
+ _ui->labelWidget->setCurrentRow(_protocolIdx);
+}
+
+
} // namespace Mirall
diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h
index 194023b..8fbdd95 100644
--- a/src/mirall/settingsdialog.h
+++ b/src/mirall/settingsdialog.h
@@ -47,6 +47,7 @@ public:
public slots:
void slotSyncStateChange(const QString& alias);
void slotRefreshResultList();
+ void showActivityPage();
protected:
void reject();
--
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