diff --git a/OpenRGB.pro b/OpenRGB.pro index c951c158..13dbdbe1 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -186,6 +186,8 @@ HEADERS += qt/OpenRGBZoneResizeDialog.h \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.h \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h \ qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h \ @@ -517,6 +519,8 @@ SOURCES += qt/hsv.cpp \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.cpp \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.cpp \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp \ qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp \ @@ -864,6 +868,8 @@ FORMS += qt/OpenRGBZoneResizeDialog.ui \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.ui \ qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.ui \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.ui \ + qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.ui \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui \ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui \ qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.ui \ diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 59338de0..6c438223 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -453,6 +453,11 @@ OpenRGBDialog2::OpenRGBDialog2(QWidget *parent) : QMainWindow(parent), ui(new Op \*-----------------------------------------------------*/ AddQMKORGBSettingsPage(); + /*-----------------------------------------------------*\ + | Add the Philips Wiz settings page | + \*-----------------------------------------------------*/ + AddPhilipsWizSettingsPage(); + /*-----------------------------------------------------*\ | Add the SMBus Tools page if enabled | \*-----------------------------------------------------*/ @@ -651,6 +656,34 @@ void OpenRGBDialog2::AddE131SettingsPage() ui->SettingsTabBar->tabBar()->setTabButton(ui->SettingsTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SettingsTabLabel); } +void OpenRGBDialog2::AddPhilipsWizSettingsPage() +{ + /*-----------------------------------------------------*\ + | Create the Settings page | + \*-----------------------------------------------------*/ + PhilipsWizSettingsPage = new OpenRGBPhilipsWizSettingsPage(); + + ui->SettingsTabBar->addTab(PhilipsWizSettingsPage, ""); + + QString SettingsLabelString; + + if(IsDarkTheme()) + { + SettingsLabelString = "light_dark.png"; + } + else + { + SettingsLabelString = "light.png"; + } + + /*-----------------------------------------------------*\ + | Create the tab label | + \*-----------------------------------------------------*/ + TabLabel* SettingsTabLabel = new TabLabel(SettingsLabelString, "Philips Wiz Devices"); + + ui->SettingsTabBar->tabBar()->setTabButton(ui->SettingsTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SettingsTabLabel); +} + void OpenRGBDialog2::AddQMKORGBSettingsPage() { /*-----------------------------------------------------*\ diff --git a/qt/OpenRGBDialog2.h b/qt/OpenRGBDialog2.h index 9e8c8e75..3f6155db 100644 --- a/qt/OpenRGBDialog2.h +++ b/qt/OpenRGBDialog2.h @@ -10,6 +10,7 @@ #include "OpenRGBSupportedDevicesPage.h" #include "OpenRGBSettingsPage.h" #include "OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.h" +#include "OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h" #include "OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h" #include "OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.h" #include "PluginManager.h" @@ -64,6 +65,7 @@ private: OpenRGBSupportedDevicesPage *SupportedPage; OpenRGBSettingsPage *SettingsPage; OpenRGBE131SettingsPage *E131SettingsPage; + OpenRGBPhilipsWizSettingsPage *PhilipsWizSettingsPage; OpenRGBQMKORGBSettingsPage *QMKORGBSettingsPage; OpenRGBSerialSettingsPage *SerialSettingsPage; @@ -85,6 +87,7 @@ private: void AddSupportedDevicesPage(); void AddSettingsPage(); void AddE131SettingsPage(); + void AddPhilipsWizSettingsPage(); void AddQMKORGBSettingsPage(); void AddSerialSettingsPage(); void AddPluginsPage(PluginManager* plugin_manager); diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp new file mode 100644 index 00000000..e6b2f946 --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp @@ -0,0 +1,16 @@ +#include "OpenRGBPhilipsWizSettingsEntry.h" +#include "ui_OpenRGBPhilipsWizSettingsEntry.h" + +using namespace Ui; + +OpenRGBPhilipsWizSettingsEntry::OpenRGBPhilipsWizSettingsEntry(QWidget *parent) : + QWidget(parent), + ui(new Ui::OpenRGBPhilipsWizSettingsEntryUi) +{ + ui->setupUi(this); +} + +OpenRGBPhilipsWizSettingsEntry::~OpenRGBPhilipsWizSettingsEntry() +{ + delete ui; +} diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h new file mode 100644 index 00000000..ddc4ee5a --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h @@ -0,0 +1,21 @@ +#ifndef OPENRGBPHILIPSWIZSETTINGSENTRY_H +#define OPENRGBPHILIPSWIZSETTINGSENTRY_H + +#include "ui_OpenRGBPhilipsWizSettingsEntry.h" +#include + +namespace Ui { +class OpenRGBPhilipsWizSettingsEntry; +} + +class Ui::OpenRGBPhilipsWizSettingsEntry : public QWidget +{ + Q_OBJECT + +public: + explicit OpenRGBPhilipsWizSettingsEntry(QWidget *parent = nullptr); + ~OpenRGBPhilipsWizSettingsEntry(); + Ui::OpenRGBPhilipsWizSettingsEntryUi *ui; +}; + +#endif // OPENRGBPHILIPSWIZSETTINGSENTRY_H diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.ui b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.ui new file mode 100644 index 00000000..c8c742a9 --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.ui @@ -0,0 +1,49 @@ + + + OpenRGBPhilipsWizSettingsEntryUi + + + + 0 + 0 + 190 + 59 + + + + + 0 + 0 + + + + Form + + + + + + + + + + + + + + + IP: + + + + + + + + + + IPEdit + + + + diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.cpp b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.cpp new file mode 100644 index 00000000..b4e7940c --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.cpp @@ -0,0 +1,105 @@ +#include "OpenRGBPhilipsWizSettingsPage.h" +#include "ui_OpenRGBPhilipsWizSettingsPage.h" +#include "ResourceManager.h" + +using namespace Ui; + +OpenRGBPhilipsWizSettingsPage::OpenRGBPhilipsWizSettingsPage(QWidget *parent) : + QWidget(parent), + ui(new Ui::OpenRGBPhilipsWizSettingsPageUi) +{ + ui->setupUi(this); + + json wiz_settings; + + /*-------------------------------------------------*\ + | Get Philips Wiz settings | + \*-------------------------------------------------*/ + wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("PhilipsWizDevices"); + + /*-------------------------------------------------*\ + | If the Wiz settings contains devices, process | + \*-------------------------------------------------*/ + if(wiz_settings.contains("devices")) + { + for(unsigned int device_idx = 0; device_idx < wiz_settings["devices"].size(); device_idx++) + { + OpenRGBPhilipsWizSettingsEntry* entry = new OpenRGBPhilipsWizSettingsEntry; + + if(wiz_settings["devices"][device_idx].contains("ip")) + { + entry->ui->IPEdit->setText(QString::fromStdString(wiz_settings["devices"][device_idx]["ip"])); + } + + entries.push_back(entry); + + QListWidgetItem* item = new QListWidgetItem; + + item->setSizeHint(entry->sizeHint()); + + ui->PhilipsWizDeviceList->addItem(item); + ui->PhilipsWizDeviceList->setItemWidget(item, entry); + ui->PhilipsWizDeviceList->show(); + } + } +} + +OpenRGBPhilipsWizSettingsPage::~OpenRGBPhilipsWizSettingsPage() +{ + delete ui; +} + +void Ui::OpenRGBPhilipsWizSettingsPage::on_AddPhilipsWizDeviceButton_clicked() +{ + OpenRGBPhilipsWizSettingsEntry* entry = new OpenRGBPhilipsWizSettingsEntry; + entries.push_back(entry); + + QListWidgetItem* item = new QListWidgetItem; + + item->setSizeHint(entry->sizeHint()); + + ui->PhilipsWizDeviceList->addItem(item); + ui->PhilipsWizDeviceList->setItemWidget(item, entry); + ui->PhilipsWizDeviceList->show(); +} + +void Ui::OpenRGBPhilipsWizSettingsPage::on_RemovePhilipsWizDeviceButton_clicked() +{ + int cur_row = ui->PhilipsWizDeviceList->currentRow(); + + if(cur_row < 0) + { + return; + } + + QListWidgetItem* item = ui->PhilipsWizDeviceList->takeItem(cur_row); + + ui->PhilipsWizDeviceList->removeItemWidget(item); + delete item; + + delete entries[cur_row]; + entries.erase(entries.begin() + cur_row); +} + +void Ui::OpenRGBPhilipsWizSettingsPage::on_SavePhilipsWizConfigurationButton_clicked() +{ + json wiz_settings; + + /*-------------------------------------------------*\ + | Get Philips Wiz settings | + \*-------------------------------------------------*/ + wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("PhilipsWizDevices"); + + wiz_settings["devices"].clear(); + + for(unsigned int device_idx = 0; device_idx < entries.size(); device_idx++) + { + /*-------------------------------------------------*\ + | Required parameters | + \*-------------------------------------------------*/ + wiz_settings["devices"][device_idx]["ip"] = entries[device_idx]->ui->IPEdit->text().toStdString(); + } + + ResourceManager::get()->GetSettingsManager()->SetSettings("PhilipsWizDevices", wiz_settings); + ResourceManager::get()->GetSettingsManager()->SaveSettings(); +} diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h new file mode 100644 index 00000000..6af02ecb --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h @@ -0,0 +1,34 @@ +#ifndef OPENRGBPHILIPSWIZSETTINGSPAGE_H +#define OPENRGBPHILIPSWIZSETTINGSPAGE_H + +#include "ui_OpenRGBPhilipsWizSettingsPage.h" +#include + +#include "OpenRGBPhilipsWizSettingsEntry.h" + +namespace Ui { +class OpenRGBPhilipsWizSettingsPage; +} + +class Ui::OpenRGBPhilipsWizSettingsPage : public QWidget +{ + Q_OBJECT + +public: + explicit OpenRGBPhilipsWizSettingsPage(QWidget *parent = nullptr); + ~OpenRGBPhilipsWizSettingsPage(); + +private slots: + void on_AddPhilipsWizDeviceButton_clicked(); + + void on_RemovePhilipsWizDeviceButton_clicked(); + + void on_SavePhilipsWizConfigurationButton_clicked(); + +private: + Ui::OpenRGBPhilipsWizSettingsPageUi *ui; + std::vector entries; + +}; + +#endif // OPENRGBPHILIPSWIZSETTINGSPAGE_H diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.ui b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.ui new file mode 100644 index 00000000..e66effcb --- /dev/null +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.ui @@ -0,0 +1,49 @@ + + + OpenRGBPhilipsWizSettingsPageUi + + + + 0 + 0 + 400 + 300 + + + + Form + + + + + + Add + + + + + + + Remove + + + + + + + Save + + + + + + + QAbstractItemView::ScrollPerPixel + + + + + + + +