diff --git a/OpenRGB.pro b/OpenRGB.pro
index d38622769..9f32dbd71 100644
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -175,6 +175,8 @@ HEADERS +=
qt/OpenRGBZoneResizeDialog.h \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.h \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.h \
serial_port/find_usb_serial_port.h \
@@ -484,6 +486,8 @@ SOURCES +=
qt/hsv.cpp \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.cpp \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.cpp \
serial_port/serial_port.cpp \
@@ -813,6 +817,8 @@ FORMS +=
qt/OpenRGBZoneResizeDialog.ui \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.ui \
qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.ui \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui \
+ qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.ui \
qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.ui \
diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp
index d747a9bfe..58d52f063 100644
--- a/qt/OpenRGBDialog2.cpp
+++ b/qt/OpenRGBDialog2.cpp
@@ -412,6 +412,11 @@ OpenRGBDialog2::OpenRGBDialog2(QWidget *parent) : QMainWindow(parent), ui(new Op
\*-----------------------------------------------------*/
AddSerialSettingsPage();
+ /*-----------------------------------------------------*\
+ | Add the QMK OpenRGB Protocol settings page |
+ \*-----------------------------------------------------*/
+ AddQMKORGBSettingsPage();
+
/*-----------------------------------------------------*\
| Add the SMBus Tools page if enabled |
\*-----------------------------------------------------*/
@@ -604,6 +609,35 @@ void OpenRGBDialog2::AddE131SettingsPage()
ui->SettingsTabBar->tabBar()->setTabButton(ui->SettingsTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SettingsTabLabel);
}
+void OpenRGBDialog2::AddQMKORGBSettingsPage()
+{
+ /*-----------------------------------------------------*\
+ | Create the Settings page |
+ \*-----------------------------------------------------*/
+ QMKORGBSettingsPage = new OpenRGBQMKORGBSettingsPage();
+
+ ui->SettingsTabBar->addTab(QMKORGBSettingsPage, "");
+
+ QString SettingsLabelString = "![](";
+ SettingsLabelString += ":/keyboard";
+ if(IsDarkTheme()) SettingsLabelString += "_dark";
+ SettingsLabelString += ".png) | QMK OpenRGB Protocol |
";
+
+ QLabel *SettingsTabLabel = new QLabel();
+ SettingsTabLabel->setText(SettingsLabelString);
+ SettingsTabLabel->setIndent(20);
+ if(IsDarkTheme())
+ {
+ SettingsTabLabel->setGeometry(0, 25, 200, 50);
+ }
+ else
+ {
+ SettingsTabLabel->setGeometry(0, 0, 200, 25);
+ }
+
+ ui->SettingsTabBar->tabBar()->setTabButton(ui->SettingsTabBar->tabBar()->count() - 1, QTabBar::LeftSide, SettingsTabLabel);
+}
+
void OpenRGBDialog2::AddSerialSettingsPage()
{
/*-----------------------------------------------------*\
diff --git a/qt/OpenRGBDialog2.h b/qt/OpenRGBDialog2.h
index 79a0ecc50..df517fd7b 100644
--- a/qt/OpenRGBDialog2.h
+++ b/qt/OpenRGBDialog2.h
@@ -9,6 +9,7 @@
#include "OpenRGBSupportedDevicesPage.h"
#include "OpenRGBSettingsPage.h"
#include "OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.h"
+#include "OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h"
#include "OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.h"
#include "PluginManager.h"
@@ -58,6 +59,7 @@ private:
OpenRGBSupportedDevicesPage *SupportedPage;
OpenRGBSettingsPage *SettingsPage;
OpenRGBE131SettingsPage *E131SettingsPage;
+ OpenRGBQMKORGBSettingsPage *QMKORGBSettingsPage;
OpenRGBSerialSettingsPage *SerialSettingsPage;
bool ShowI2CTools = false;
@@ -77,6 +79,7 @@ private:
void AddSupportedDevicesPage();
void AddSettingsPage();
void AddE131SettingsPage();
+ void AddQMKORGBSettingsPage();
void AddSerialSettingsPage();
void AddPluginTab(PluginManager* plugin_manager,int plugin_index);
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp
new file mode 100644
index 000000000..4016cf728
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp
@@ -0,0 +1,16 @@
+#include "OpenRGBQMKORGBSettingsEntry.h"
+#include "ui_OpenRGBQMKORGBSettingsEntry.h"
+
+using namespace Ui;
+
+OpenRGBQMKORGBSettingsEntry::OpenRGBQMKORGBSettingsEntry(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::OpenRGBQMKORGBSettingsEntryUi)
+{
+ ui->setupUi(this);
+}
+
+OpenRGBQMKORGBSettingsEntry::~OpenRGBQMKORGBSettingsEntry()
+{
+ delete ui;
+}
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h
new file mode 100644
index 000000000..c4df39f01
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h
@@ -0,0 +1,21 @@
+#ifndef OPENRGBQMKORGBSETTINGSENTRY_H
+#define OPENRGBQMKORGBSETTINGSENTRY_H
+
+#include "ui_OpenRGBQMKORGBSettingsEntry.h"
+#include
+
+namespace Ui {
+class OpenRGBQMKORGBSettingsEntry;
+}
+
+class Ui::OpenRGBQMKORGBSettingsEntry : public QWidget
+{
+ Q_OBJECT
+
+public:
+ explicit OpenRGBQMKORGBSettingsEntry(QWidget *parent = nullptr);
+ ~OpenRGBQMKORGBSettingsEntry();
+ Ui::OpenRGBQMKORGBSettingsEntryUi *ui;
+};
+
+#endif // OPENRGBQMKORGBSETTINGSENTRY_H
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui
new file mode 100644
index 000000000..3907ef31b
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui
@@ -0,0 +1,71 @@
+
+
+ OpenRGBQMKORGBSettingsEntryUi
+
+
+
+ 0
+ 0
+ 531
+ 237
+
+
+
+
+ 0
+ 0
+
+
+
+ Form
+
+
+ -
+
+
+
+
+
+
-
+
+
+ -
+
+
+ -
+
+
+ Name:
+
+
+
+ -
+
+
+ -
+
+
+ USB PID:
+
+
+
+ -
+
+
+ USB VID:
+
+
+
+
+
+
+
+
+
+ NameEdit
+ USBVIDEdit
+ USBPIDEdit
+
+
+
+
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp
new file mode 100644
index 000000000..e08831e3f
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp
@@ -0,0 +1,117 @@
+#include "OpenRGBQMKORGBSettingsPage.h"
+#include "ui_OpenRGBQMKORGBSettingsPage.h"
+#include "ResourceManager.h"
+
+using namespace Ui;
+
+OpenRGBQMKORGBSettingsPage::OpenRGBQMKORGBSettingsPage(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::OpenRGBQMKORGBSettingsPageUi)
+{
+ ui->setupUi(this);
+
+ json qmk_settings;
+
+ /*-------------------------------------------------*\
+ | Get QMKOpenRGB settings |
+ \*-------------------------------------------------*/
+ qmk_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("QMKOpenRGBDevices");
+
+ /*-------------------------------------------------*\
+ | If the LEDStrip settings contains devices, process|
+ \*-------------------------------------------------*/
+ if(qmk_settings.contains("devices"))
+ {
+ for(unsigned int device_idx = 0; device_idx < qmk_settings["devices"].size(); device_idx++)
+ {
+ OpenRGBQMKORGBSettingsEntry* entry = new OpenRGBQMKORGBSettingsEntry;
+
+ if(qmk_settings["devices"][device_idx].contains("name"))
+ {
+ entry->ui->NameEdit->setText(QString::fromStdString(qmk_settings["devices"][device_idx]["name"]));
+ }
+
+ if(qmk_settings["devices"][device_idx].contains("usb_vid"))
+ {
+ entry->ui->USBVIDEdit->setText(QString::fromStdString(qmk_settings["devices"][device_idx]["usb_vid"]));
+ }
+
+ if(qmk_settings["devices"][device_idx].contains("usb_pid"))
+ {
+ entry->ui->USBPIDEdit->setText(QString::fromStdString(qmk_settings["devices"][device_idx]["usb_pid"]));
+ }
+
+ entries.push_back(entry);
+
+ QListWidgetItem* item = new QListWidgetItem;
+
+ item->setSizeHint(entry->sizeHint());
+
+ ui->QMKORGBDeviceList->addItem(item);
+ ui->QMKORGBDeviceList->setItemWidget(item, entry);
+ ui->QMKORGBDeviceList->show();
+ }
+ }
+}
+
+OpenRGBQMKORGBSettingsPage::~OpenRGBQMKORGBSettingsPage()
+{
+ delete ui;
+}
+
+void Ui::OpenRGBQMKORGBSettingsPage::on_AddQMKORGBDeviceButton_clicked()
+{
+ OpenRGBQMKORGBSettingsEntry* entry = new OpenRGBQMKORGBSettingsEntry;
+ entries.push_back(entry);
+
+ QListWidgetItem* item = new QListWidgetItem;
+
+ item->setSizeHint(entry->sizeHint());
+
+ ui->QMKORGBDeviceList->addItem(item);
+ ui->QMKORGBDeviceList->setItemWidget(item, entry);
+ ui->QMKORGBDeviceList->show();
+}
+
+void Ui::OpenRGBQMKORGBSettingsPage::on_RemoveQMKORGBDeviceButton_clicked()
+{
+ int cur_row = ui->QMKORGBDeviceList->currentRow();
+
+ if(cur_row < 0)
+ {
+ return;
+ }
+
+ QListWidgetItem* item = ui->QMKORGBDeviceList->takeItem(cur_row);
+
+ ui->QMKORGBDeviceList->removeItemWidget(item);
+ delete item;
+
+ delete entries[cur_row];
+ entries.erase(entries.begin() + cur_row);
+}
+
+void Ui::OpenRGBQMKORGBSettingsPage::on_SaveQMKORGBConfigurationButton_clicked()
+{
+ json qmk_settings;
+
+ /*-------------------------------------------------*\
+ | Get QMKOpenRGB settings |
+ \*-------------------------------------------------*/
+ qmk_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("QMKOpenRGBDevices");
+
+ qmk_settings["devices"].clear();
+
+ for(unsigned int device_idx = 0; device_idx < entries.size(); device_idx++)
+ {
+ /*-------------------------------------------------*\
+ | Required parameters |
+ \*-------------------------------------------------*/
+ qmk_settings["devices"][device_idx]["name"] = entries[device_idx]->ui->NameEdit->text().toStdString();
+ qmk_settings["devices"][device_idx]["usb_vid"] = entries[device_idx]->ui->USBVIDEdit->text().toStdString();
+ qmk_settings["devices"][device_idx]["usb_pid"] = entries[device_idx]->ui->USBPIDEdit->text().toStdString();
+ }
+
+ ResourceManager::get()->GetSettingsManager()->SetSettings("QMKOpenRGBDevices", qmk_settings);
+ ResourceManager::get()->GetSettingsManager()->SaveSettings();
+}
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h
new file mode 100644
index 000000000..964ce1a2f
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h
@@ -0,0 +1,34 @@
+#ifndef OPENRGBQMKORGBSETTINGSPAGE_H
+#define OPENRGBQMKORGBSETTINGSPAGE_H
+
+#include "ui_OpenRGBQMKORGBSettingsPage.h"
+#include
+
+#include "OpenRGBQMKORGBSettingsEntry.h"
+
+namespace Ui {
+class OpenRGBQMKORGBSettingsPage;
+}
+
+class Ui::OpenRGBQMKORGBSettingsPage : public QWidget
+{
+ Q_OBJECT
+
+public:
+ explicit OpenRGBQMKORGBSettingsPage(QWidget *parent = nullptr);
+ ~OpenRGBQMKORGBSettingsPage();
+
+private slots:
+ void on_AddQMKORGBDeviceButton_clicked();
+
+ void on_RemoveQMKORGBDeviceButton_clicked();
+
+ void on_SaveQMKORGBConfigurationButton_clicked();
+
+private:
+ Ui::OpenRGBQMKORGBSettingsPageUi *ui;
+ std::vector entries;
+
+};
+
+#endif // OPENRGBQMKORGBSETTINGSPAGE_H
diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui
new file mode 100644
index 000000000..faf8d12b7
--- /dev/null
+++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui
@@ -0,0 +1,49 @@
+
+
+ OpenRGBQMKORGBSettingsPageUi
+
+
+
+ 0
+ 0
+ 400
+ 300
+
+
+
+ Form
+
+
+ -
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Save
+
+
+
+ -
+
+
+ QAbstractItemView::ScrollPerPixel
+
+
+
+
+
+
+
+