Activity tab doesn't vanish with too many accounts #4188

The bug was introduced by a bad merge.

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 6caa38c33ebdd9e49b1b1d214ac577214d558c36..5ade5f665741d42342efee8308cf06a681fc0899 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -84,7 +84,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
     // all buttons must have the same size in order to keep a good layout
     _activityAction = createColorAwareAction(QLatin1String(":/client/resources/activity.png"), tr("Activity"));
     _actionGroup->addAction(_activityAction);
-    addActionToToolBar(_activityAction);
+    _toolBar->addAction(_activityAction);
     _activitySettings = new ActivitySettings;
     _ui->stack->addWidget(_activitySettings);
     connect( _activitySettings, SIGNAL(guiLog(QString,QString)), _gui,
@@ -308,15 +308,6 @@ QAction *SettingsDialog::createColorAwareAction(const QString &iconPath, const Q
     return action;
 }
 
-void SettingsDialog::addActionToToolBar(QAction *action) {
-    QToolButton* btn = new QToolButton;
-    btn->setDefaultAction(action);
-    btn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-    _toolBar->addWidget(btn);
-    btn->setMinimumWidth(_toolBar->sizeHint().height() * 1.3);
-}
-
 void SettingsDialog::slotRefreshActivity( AccountState* accountState )
 {
     if (accountState) {

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index 290fadd1c1240129082b48d5d1ca33c741d7c54a..d86c27646a0b6782426eb6d1a6a5d6f280935980 100644 (file)
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -69,7 +69,6 @@ private slots:
 
 private:
     void customizeStyle();
-    void addActionToToolBar(QAction* action);
 
     QIcon createColorAwareIcon(const QString &name);
     QAction *createColorAwareAction(const QString &iconName, const QString &fileName);