Rearrange Settings tab

qt/OpenRGBDialog2.cpp

@@ -416,14 +416,14 @@ OpenRGBDialog2::OpenRGBDialog2(QWidget *parent) : QMainWindow(parent), ui(new Op
     AddSoftwareInfoPage();
 
     /*-----------------------------------------------------*\
-    | Add the Supported Devices page                        |
+    | Add the settings page                                 |
     \*-----------------------------------------------------*/
-    AddSupportedDevicesPage();
+    AddSettingsPage();
 
     /*-----------------------------------------------------*\
-    | Add the settings page                                 |
+    | Add the Supported Devices page                        |
     \*-----------------------------------------------------*/
-    AddSettingsPage();
+    AddSupportedDevicesPage();
 
     /*-----------------------------------------------------*\
     | Initialize the plugin manager                         |
@@ -633,7 +633,7 @@ void OpenRGBDialog2::AddSettingsPage()
     /*-----------------------------------------------------*\
     | Create the tab label                                  |
     \*-----------------------------------------------------*/
-    TabLabel* SettingsTabLabel = new TabLabel(SettingsLabelString, "Settings");
+    TabLabel* SettingsTabLabel = new TabLabel(SettingsLabelString, "General Settings");
 
     ui->SettingsTabBar->tabBar()->setTabButton(ui->SettingsTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SettingsTabLabel);
 }

qt/OpenRGBSettingsPage.cpp

@@ -2,6 +2,8 @@
 #include "OpenRGBSettingsPage.h"
 #include "ui_OpenRGBSettingsPage.h"
 #include "ResourceManager.h"
+#include <QUrl>
+#include <QDesktopServices>
 
 using namespace Ui;
 
@@ -500,3 +502,11 @@ void OpenRGBSettingsPage::SaveSettings()
 {
     ResourceManager::get()->GetSettingsManager()->SaveSettings();
 }
+
+void Ui::OpenRGBSettingsPage::on_OpenSettingsFolderButton_clicked()
+{
+    std::string config_dir = ResourceManager::get()->GetConfigurationDirectory();
+    QUrl url = QUrl::fromLocalFile(QString::fromStdString(config_dir));
+    QDesktopServices::openUrl(url);
+}
+

qt/OpenRGBSettingsPage.h

@@ -48,6 +48,7 @@ private slots:
     void on_CheckboxAutoStartSetServerPort_clicked();
     void on_CheckboxAutoStartCustom_clicked();
     void on_CheckboxRunZoneChecks_clicked();
+    void on_OpenSettingsFolderButton_clicked();
 };
 
 #endif // OPENRGBSETTINGSPAGE_H

qt/OpenRGBSettingsPage.ui

@@ -24,8 +24,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>449</width>
-        <height>574</height>
+        <width>416</width>
+        <height>459</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_3">
@@ -172,6 +172,13 @@
      </widget>
     </widget>
    </item>
+   <item row="1" column="1" colspan="6">
+    <widget class="QPushButton" name="OpenSettingsFolderButton">
+     <property name="text">
+      <string>Open Settings Folder</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

qt/OpenRGBSupportedDevicesPage.cpp

@@ -1,8 +1,6 @@
 #include "OpenRGBSupportedDevicesPage.h"
 #include "ui_OpenRGBSupportedDevicesPage.h"
 #include "ResourceManager.h"
-#include <QUrl>
-#include <QDesktopServices>
 
 using namespace Ui;
 
@@ -46,13 +44,6 @@ void OpenRGBSupportedDevicesPage::on_SaveButton_clicked()
     detectorTableModel->applySettings();
 }
 
-void OpenRGBSupportedDevicesPage::on_OpenSettingsFolderButton_clicked()
-{
-    std::string config_dir = ResourceManager::get()->GetConfigurationDirectory();
-    QUrl url = QUrl::fromLocalFile(QString::fromStdString(config_dir));
-    QDesktopServices::openUrl(url);
-}
-
 void OpenRGBSupportedDevicesPage::on_Filter_textChanged(const QString &arg1)
 {
 #ifdef _QT6

qt/OpenRGBSupportedDevicesPage.h

@@ -23,8 +23,6 @@ public:
 private slots:
     void on_SaveButton_clicked();
 
-    void on_OpenSettingsFolderButton_clicked();
-
     void on_Filter_textChanged(const QString &arg1);
 
     void on_ToggleAllCheckbox_toggled(const bool checked);

qt/OpenRGBSupportedDevicesPage.ui

@@ -41,13 +41,6 @@
    <item>
     <layout class="QHBoxLayout" name="ButtonsLayout">
      <item>
-      <widget class="QPushButton" name="OpenSettingsFolderButton">
-       <property name="text">
-        <string>Open settings folder</string>
-       </property>
-      </widget>
-     </item>
-     <item>
       <widget class="QPushButton" name="SaveButton">
        <property name="text">
         <string>Apply changes</string>