diff options
author | Klaas Freitag <freitag@owncloud.com> | 2015-11-16 19:02:05 +0300 |
---|---|---|
committer | Klaas Freitag <freitag@owncloud.com> | 2015-11-16 19:02:05 +0300 |
commit | 87aa1de67aabf25db9a163347e79b702e52f9632 (patch) | |
tree | dd04229d2c71894b1b363cb504b9bf3512eb7faf /src/gui/settingsdialog.h | |
parent | 74ed0b4f096685ce4238dfebf9836fa5305b915d (diff) | |
parent | ccb871c30b24d624641539caac6a417e9682c339 (diff) |
Merge branch 'newactivity'
Diffstat (limited to 'src/gui/settingsdialog.h')
-rw-r--r-- | src/gui/settingsdialog.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index bc5776306..290fadd1c 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -18,6 +18,7 @@ #include <QStyledItemDelegate> #include "progressdispatcher.h" +#include "owncloudgui.h" class QAction; class QActionGroup; @@ -35,6 +36,7 @@ class AccountSettings; class Application; class FolderMan; class ownCloudGui; +class ActivitySettings; /** * @brief The SettingsDialog class @@ -54,6 +56,7 @@ public slots: void showFirstPage(); void showActivityPage(); void slotSwitchPage(QAction *action); + void slotRefreshActivity(AccountState *accountState ); protected: void reject() Q_DECL_OVERRIDE; @@ -66,6 +69,8 @@ private slots: private: void customizeStyle(); + void addActionToToolBar(QAction* action); + QIcon createColorAwareIcon(const QString &name); QAction *createColorAwareAction(const QString &iconName, const QString &fileName); Ui::SettingsDialog * const _ui; @@ -76,7 +81,9 @@ private: QToolBar* _toolBar; - QAction * _protocolAction; + ActivitySettings *_activitySettings; + + QAction * _activityAction; ownCloudGui *_gui; }; |