diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2014-12-01 13:37:06 +0300 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2014-12-01 13:37:06 +0300 |
commit | 714599aeaaf95af82a36cf44f2324a59d9d29e5c (patch) | |
tree | 9f06ff8d46b7fdd4f56dec529a3074556a8b5afe /src/gui/settingsdialog.h | |
parent | 8866494c940d1b26980ea438f095c9d88cfbb4c9 (diff) |
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)
Diffstat (limited to 'src/gui/settingsdialog.h')
-rw-r--r-- | src/gui/settingsdialog.h | 11 |
1 files changed, 4 insertions, 7 deletions
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<QAction*, QWidget*> _actions; AccountSettings *_accountSettings; - QListWidgetItem *_accountItem; - ProtocolWidget *_protocolWidget; - - int _protocolIdx; + QAction *_protocolAction; }; } |