Fix settings dialog for mac.

- Fixes adding/removing accounts with separator in the toolbar -
accounts were not added in the right order and removing was not
including the separator.
- Fixes button sizes in the activities list - the buttons were too small
for the text.

Signed-off-by: Camila San <hello@camila.codes>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 8f1a9707e..89439d239 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -100,7 +100,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     _actionBefore = new QAction;
     _toolBar->addAction(_actionBefore);
 
-    // Adds space
+    // Adds space between users + activities and general + network actions
     QWidget* spacer = new QWidget();
     spacer->setMinimumWidth(10);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
@@ -217,6 +217,8 @@ void SettingsDialog::accountAdded(AccountState *s)
     bool brandingSingleAccount = !Theme::instance()->multiAccount();
 
     _activitySettings[s] = new ActivitySettings(s, this);
+
+    // if this is not the first account, then before we continue to add more accounts we add a separator
     if(AccountManager::instance()->accounts().first().data() != s &&
         AccountManager::instance()->accounts().size() >= 1){
         _actionGroupWidgets.insert(_toolBar->insertSeparator(_actionBefore), _activitySettings[s]);
@@ -330,6 +332,7 @@ void SettingsDialog::accountRemoved(AccountState *s)
     if(_activitySettings.contains(s)){
         _activitySettings[s]->slotRemoveAccount();
         _activitySettings[s]->hide();
+
         // get the settings widget and the separator
         foreach(QAction *action, _actionGroupWidgets.keys(_activitySettings[s])){
             _actionGroupWidgets.remove(action);