Revert removed spacer and fix button sizes

nextmcloud · Nov 24, 2023 · 946b43d · 946b43d
1 parent 94ddeaf
commit 946b43d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/src/gui/nmcgui/nmcsettingsdialog.cpp b/src/gui/nmcgui/nmcsettingsdialog.cpp
@@ -50,8 +50,10 @@ void NMCSettingsDialog::slotSwitchPage(QAction *action)
 
 void NMCSettingsDialog::slotAccountAvatarChanged()
 {
-    //Intercept the base class slot, so the round avatar is not set.
-    //Empty
+    //Intercept the base class slot, so the round avatar is not set. (so, dont pass to base class)
+
+    //Fix Account button size, for ech new created account
+    fixAccountButtonSzie();
 }
 
 void OCC::NMCSettingsDialog::setDefaultSettings()
@@ -61,18 +63,43 @@ void OCC::NMCSettingsDialog::setDefaultSettings()
 
 void OCC::NMCSettingsDialog::setLayout()
 {
+    //Fix network and general settings button size
     const auto actions = _toolBar->actions();
     for(auto *action : actions)
     {
-        _toolBar->widgetForAction(action)->setFixedWidth(142);
+        if((action->text() == QCoreApplication::translate("OCC::SettingsDialog","General") || action->text() == QCoreApplication::tr("General")) ||
+            (action->text() == QCoreApplication::translate("OCC::SettingsDialog","Network") || action->text() == QCoreApplication::tr("Network")) ||
+            (action->text() == QCoreApplication::translate("OCC::SettingsDialog","Account") || action->text() == QCoreApplication::tr("Account")))
+        {
+            auto *widget = _toolBar->widgetForAction(action);
+            if(widget)
+            {
+                widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+                widget->setFixedWidth(142);
+            }
+        }
     }
+
+    //Fix initial account btton size
+    fixAccountButtonSzie();
 }
 
 void OCC::NMCSettingsDialog::setLogic()
 {
   //Empty
 }
 
+void NMCSettingsDialog::fixAccountButtonSzie()
+{
+    auto action = _toolBar->actions().at(0);
+    auto *widget = _toolBar->widgetForAction(action);
+    if(widget)
+    {
+        widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+        widget->setFixedWidth(142);
+    }
+}
+
 
 
 } // namespace OCC
diff --git a/src/gui/nmcgui/nmcsettingsdialog.h b/src/gui/nmcgui/nmcsettingsdialog.h
@@ -41,6 +41,9 @@ public slots:
     void setDefaultSettings() override final;
     void setLayout() override final;
     void setLogic() override final;
+
+private:
+    void fixAccountButtonSzie();
 };
 
 

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
@@ -111,12 +111,11 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     _actionGroup->setExclusive(true);
     connect(_actionGroup, &QActionGroup::triggered, this, &SettingsDialog::slotSwitchPage);
 
-    //NMC Customization, remove the spacer, so the widgets are aligned on the left side.
     // Adds space between users + activities and general + network actions
-    //auto *spacer = new QWidget();
-    //spacer->setMinimumWidth(10);
-    //spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-    //_toolBar->addWidget(spacer);
+    auto *spacer = new QWidget();
+    spacer->setMinimumWidth(10);
+    spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
+    _toolBar->addWidget(spacer);
 
     QAction *generalAction = createColorAwareAction(QLatin1String(":/client/theme/settings.svg"), tr("General"));
     _actionGroup->addAction(generalAction);