diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c0fb9e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +OpenRGBE131ReceiverPlugin.pro.user diff --git a/OpenRGB b/OpenRGB index 938f670..fb88964 160000 --- a/OpenRGB +++ b/OpenRGB @@ -1 +1 @@ -Subproject commit 938f67016c1a776fe43b12ee5fe2fa12ae2e9358 +Subproject commit fb88964b8e514cdf4eb22da314e13f8db06a3636 diff --git a/OpenRGBE131ReceiverDialog.cpp b/OpenRGBE131ReceiverDialog.cpp index a2607a4..ee1e7af 100644 --- a/OpenRGBE131ReceiverDialog.cpp +++ b/OpenRGBE131ReceiverDialog.cpp @@ -148,13 +148,13 @@ void OpenRGBE131ReceiverDialog::UpdateTreeView() | Create a signal mapper for LineEdit fields | \*-----------------------------------------------------*/ QSignalMapper* LineEditMapper = new QSignalMapper(this); - connect(LineEditMapper, SIGNAL(mapped(QObject *)), this, SLOT(on_LineEdit_updated(QObject *))); + connect(LineEditMapper, SIGNAL(mapped(QObject *)), this, SLOT(LineEdit_updated_slot(QObject *))); /*-----------------------------------------------------*\ | Create a signal mapper for CheckBox fields | \*-----------------------------------------------------*/ QSignalMapper* CheckBoxMapper = new QSignalMapper(this); - connect(CheckBoxMapper, SIGNAL(mapped(QObject *)), this, SLOT(on_CheckBox_updated(QObject *))); + connect(CheckBoxMapper, SIGNAL(mapped(QObject *)), this, SLOT(CheckBox_updated_slot(QObject *))); for(unsigned int universe_idx = 0; universe_idx < universe_list.size(); universe_idx++) { @@ -504,7 +504,7 @@ void OpenRGBE131ReceiverDialog::on_ButtonStopReceiver_clicked() UpdateOnlineStatus(); } -void OpenRGBE131ReceiverDialog::on_LineEdit_updated(QObject* lineedit_argument) +void OpenRGBE131ReceiverDialog::LineEdit_updated_slot(QObject* lineedit_argument) { /*-----------------------------------------------------*\ | Update the parameter | @@ -532,7 +532,7 @@ void OpenRGBE131ReceiverDialog::on_LineEdit_updated(QObject* lineedit_argument) } } -void OpenRGBE131ReceiverDialog::on_CheckBox_updated(QObject* checkbox_argument) +void OpenRGBE131ReceiverDialog::CheckBox_updated_slot(QObject* checkbox_argument) { /*-----------------------------------------------------*\ | Update the parameter | diff --git a/OpenRGBE131ReceiverDialog.h b/OpenRGBE131ReceiverDialog.h index 9b8906e..6f14895 100644 --- a/OpenRGBE131ReceiverDialog.h +++ b/OpenRGBE131ReceiverDialog.h @@ -26,27 +26,18 @@ public slots: private slots: void on_ButtonStartReceiver_clicked(); - void on_ButtonStopReceiver_clicked(); - - void on_LineEdit_updated(QObject* lineedit_argument); - - void on_CheckBox_updated(QObject* checkbox_argument); - void on_ButtonAddController_clicked(); - void on_ButtonRemoveController_clicked(); - void on_ButtonAddUniverse_clicked(); - void on_ButtonRemoveUniverse_clicked(); - void on_ButtonAutoMap_clicked(); - void on_ButtonSaveMap_clicked(); - void on_ButtonLoadMap_clicked(); + void LineEdit_updated_slot(QObject* lineedit_argument); + void CheckBox_updated_slot(QObject* checkbox_argument); + private: ResourceManager* resource_manager; Ui::OpenRGBE131ReceiverDialog *ui; diff --git a/OpenRGBE131ReceiverPlugin.cpp b/OpenRGBE131ReceiverPlugin.cpp index 8405c01..03605bd 100644 --- a/OpenRGBE131ReceiverPlugin.cpp +++ b/OpenRGBE131ReceiverPlugin.cpp @@ -16,12 +16,14 @@ OpenRGBPluginInfo OpenRGBPlugin::GetPluginInfo() info.Name = "OpenRGB E1.31 Receiver Plugin"; info.Description = "Receive E1.31 lighting control data from external applications to control OpenRGB devices"; - info.Version = "0"; - info.Commit = ""; + info.Version = VERSION_STRING; + info.Commit = GIT_COMMIT_ID; info.URL = "https://gitlab.com/OpenRGBDevelopers/OpenRGBE131ReceiverPlugin"; info.Location = OPENRGB_PLUGIN_LOCATION_TOP; info.Label = "E1.31 Receiver"; + info.TabIcon.load(":/OpenRGBE131ReceiverPlugin.png"); + info.Icon.load(":/OpenRGBE131ReceiverPlugin.png"); return(info); } diff --git a/OpenRGBE131ReceiverPlugin.png b/OpenRGBE131ReceiverPlugin.png new file mode 100644 index 0000000..53a87bb Binary files /dev/null and b/OpenRGBE131ReceiverPlugin.png differ diff --git a/OpenRGBE131ReceiverPlugin.pro b/OpenRGBE131ReceiverPlugin.pro index e2b1183..e1f6e47 100644 --- a/OpenRGBE131ReceiverPlugin.pro +++ b/OpenRGBE131ReceiverPlugin.pro @@ -14,10 +14,20 @@ QT += greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +#-----------------------------------------------------------------------------------------------# +# Automatically generated build information # +#-----------------------------------------------------------------------------------------------# +PLUGIN_VERSION = 0.8 +GIT_COMMIT_ID = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD) + +DEFINES += \ + VERSION_STRING=\\"\"\"$$PLUGIN_VERSION\\"\"\" \ + GIT_COMMIT_ID=\\"\"\"$$GIT_COMMIT_ID\\"\"\" + #-----------------------------------------------------------------------------------------------# # Application Configuration # #-----------------------------------------------------------------------------------------------# - TEMPLATE = lib DEFINES += ORGBEXAMPLEPLUGIN_LIBRARY @@ -106,3 +116,6 @@ macx: { CONFIG += c++17 LIBS += -framework OpenAL } + +RESOURCES += \ + resources.qrc diff --git a/resources.qrc b/resources.qrc new file mode 100644 index 0000000..8524ef7 --- /dev/null +++ b/resources.qrc @@ -0,0 +1,5 @@ + + + OpenRGBE131ReceiverPlugin.png + +