[Pkg-owncloud-commits] [owncloud-client] 226/484: SettingsDialog: Make ActivityWidget a member.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:37:45 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 3b8e1dcd8985d35b7431dea8522994a6281eb73b
Author: Klaas Freitag <freitag at owncloud.com>
Date: Sun Nov 1 22:29:37 2015 +0100
SettingsDialog: Make ActivityWidget a member.
---
src/gui/settingsdialog.cpp | 6 ++++--
src/gui/settingsdialog.h | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 8bfee9f..03f2946 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -85,8 +85,8 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
// FIXME: Put this QTabWidget into its own class to be used here.
QTabWidget *tabs = new QTabWidget(this);
tabs->addTab(new ProtocolWidget, tr("Sync Protocol"));
- ActivityWidget *activityWidget = new ActivityWidget;
- tabs->addTab(activityWidget, tr("Server Activity"));
+ _activityWidget = new ActivityWidget;
+ tabs->addTab(_activityWidget, tr("Server Activity"));
_ui->stack->addWidget(tabs);
QAction *generalAction = createColorAwareAction(QLatin1String(":/client/resources/settings.png"), tr("General"));
@@ -213,6 +213,8 @@ void SettingsDialog::accountAdded(AccountState *s)
connect( accountSettings, SIGNAL(folderChanged()), _gui, SLOT(slotFoldersChanged()));
connect( accountSettings, SIGNAL(openFolderAlias(const QString&)),
_gui, SLOT(slotFolderOpenAction(QString)));
+
+
}
void SettingsDialog::accountRemoved(AccountState *s)
diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index de905bd..2d731f6 100644
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -35,6 +35,7 @@ class AccountSettings;
class Application;
class FolderMan;
class ownCloudGui;
+class ActivityWidget;
/**
* @brief The SettingsDialog class
@@ -79,6 +80,8 @@ private:
// Maps the actions from the action group to the toolbar actions
QHash<QAction*, QAction*> _toolbarAccountActions;
+ ActivityWidget *_activityWidget;
+
QAction * _activityAction;
ownCloudGui *_gui;
};
--
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