Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Molkentin <danimo@owncloud.com>2015-08-11 22:45:27 +0300
committerDaniel Molkentin <danimo@owncloud.com>2015-08-11 22:45:27 +0300
commita9acb185a0b364b72c5ed985c2707390afd11d36 (patch)
tree053d15cde51874222d23a175fb945c7d2367b01a /src/gui/settingsdialog.h
parent3267c15affe4572472ac13e9290e2ce65679749d (diff)
SettingsDialog: Fixup default action setting
This broke silently when switching from pure actions to widgets
Diffstat (limited to 'src/gui/settingsdialog.h')
-rw-r--r--src/gui/settingsdialog.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index dbd4ff23e..9eafd82ab 100644
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -50,6 +50,7 @@ public:
void addAccount(const QString &title, QWidget *widget);
+ void setDefaultAction();
public slots:
void showActivityPage();
void slotSwitchPage(QAction *action);
@@ -67,6 +68,7 @@ private:
void customizeStyle();
QIcon createColorAwareIcon(const QString &name);
QAction *createColorAwareAction(const QString &iconName, const QString &fileName);
+ void addActionToToolBar(QAction *action);
Ui::SettingsDialog * const _ui;
QActionGroup* _actionGroup;
@@ -75,8 +77,9 @@ private:
QToolBar* _toolBar;
// Maps the actions from the action group to the toolbar actions
- QHash<QAction*, QAction*> _toolbarActions;
+ QHash<QAction*, QAction*> _toolbarAccountActions;
+ QAction * _seperatorAction;
QAction * _protocolAction;
ownCloudGui *_gui;
};