jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rearrange Settings tab

Browse source
This commit is contained in:
Adam Honse 2021-09-28 22:44:44 -05:00
parent 0724d7cfc0
commit bec0751a7f
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt/OpenRGBDialog2.cpp
View file

@ -415,16 +415,16 @@ OpenRGBDialog2::OpenRGBDialog2(QWidget *parent) : QMainWindow(parent), ui(new Op
\*-----------------------------------------------------*/
AddSoftwareInfoPage();
/*-----------------------------------------------------*\
| Add the Supported Devices page |
\*-----------------------------------------------------*/
AddSupportedDevicesPage();
/*-----------------------------------------------------*\
| Add the settings page |
\*-----------------------------------------------------*/
AddSettingsPage();
/*-----------------------------------------------------*\
| Add the Supported Devices page |
\*-----------------------------------------------------*/
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);
}

10
qt/OpenRGBSettingsPage.cpp
View file

@ -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);
}

1
qt/OpenRGBSettingsPage.h
View file

@ -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

11
qt/OpenRGBSettingsPage.ui
View file

@ -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/>

9
qt/OpenRGBSupportedDevicesPage.cpp
View file

@ -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

2
qt/OpenRGBSupportedDevicesPage.h
View file

@ -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);

7
qt/OpenRGBSupportedDevicesPage.ui
View file

@ -40,13 +40,6 @@
</item>
<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">