From 714599aeaaf95af82a36cf44f2324a59d9d29e5c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 1 Dec 2014 11:37:06 +0100 Subject: Refactor generic settings dialog - move items on top like on Mac OS (right is free for accounts now) - The account icon no longer reflects the current status (in prep for multi-account) --- src/gui/settingsdialog.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/gui/settingsdialog.h') diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index fd35e5140..bfa8a186c 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -19,8 +19,8 @@ #include "progressdispatcher.h" +class QAction; class QStandardItemModel; -class QListWidgetItem; namespace Mirall { @@ -28,7 +28,6 @@ namespace Ui { class SettingsDialog; } class AccountSettings; -class ProtocolWidget; class Application; class FolderMan; class ownCloudGui; @@ -46,7 +45,7 @@ public: public slots: void showActivityPage(); - void slotUpdateAccountIcon(const QIcon& icon); + void slotSwitchPage(QAction *action); protected: void reject() Q_DECL_OVERRIDE; @@ -56,11 +55,9 @@ private slots: private: Ui::SettingsDialog *_ui; + QHash _actions; AccountSettings *_accountSettings; - QListWidgetItem *_accountItem; - ProtocolWidget *_protocolWidget; - - int _protocolIdx; + QAction *_protocolAction; }; } -- cgit v1.2.3