diff --git a/CMakeLists.txt b/CMakeLists.txt index 61ec6150..595e5acb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) # For resources.qrc # Tell websocketpp not to use system boost add_definitions(-DASIO_STANDALONE) @@ -90,6 +91,7 @@ set(obs-websocket_SOURCES src/requesthandler/rpc/RequestResult.cpp src/forms/SettingsDialog.cpp src/forms/ConnectInfo.cpp + src/forms/resources.qrc src/utils/Json.cpp src/utils/Crypto.cpp src/utils/Platform.cpp diff --git a/src/forms/SettingsDialog.cpp b/src/forms/SettingsDialog.cpp index bb008f17..2d660082 100644 --- a/src/forms/SettingsDialog.cpp +++ b/src/forms/SettingsDialog.cpp @@ -11,6 +11,12 @@ #include "../plugin-macros.generated.h" +QString GetToolTipIcon() +{ + bool lightTheme = QApplication::palette().text().color().redF() < 0.5; + return lightTheme ? ":toolTip/images/help.svg" : ":toolTip/images/help_light.svg"; +} + SettingsDialog::SettingsDialog(QWidget* parent) : QDialog(parent, Qt::Dialog), ui(new Ui::SettingsDialog), @@ -18,9 +24,11 @@ SettingsDialog::SettingsDialog(QWidget* parent) : sessionTableTimer(new QTimer) { ui->setupUi(this); - ui->websocketSessionTable->horizontalHeader()->resizeSection(3, 100); + ui->websocketSessionTable->horizontalHeader()->resizeSection(3, 100); // Resize Session Table column widths ui->websocketSessionTable->horizontalHeader()->resizeSection(4, 100); + ui->enableDebugLoggingToolTipLabel->setPixmap(QPixmap(GetToolTipIcon())); // Set the appropriate tooltip icon for the theme + connect(sessionTableTimer, &QTimer::timeout, this, &SettingsDialog::FillSessionTable); connect(ui->buttonBox, &QDialogButtonBox::clicked, diff --git a/src/forms/SettingsDialog.ui b/src/forms/SettingsDialog.ui index cb1431c3..9aade501 100644 --- a/src/forms/SettingsDialog.ui +++ b/src/forms/SettingsDialog.ui @@ -78,14 +78,44 @@ - - - OBSWebSocket.Settings.DebugEnableHoverText + + + 0 - - OBSWebSocket.Settings.DebugEnable - - + + + + OBSWebSocket.Settings.DebugEnableHoverText + + + OBSWebSocket.Settings.DebugEnable + + + + + + + OBSWebSocket.Settings.DebugEnableHoverText + + + :/toolTip/images/help.svg + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -263,7 +293,9 @@ - + + + buttonBox diff --git a/src/forms/images/help.svg b/src/forms/images/help.svg new file mode 100644 index 00000000..d1175742 --- /dev/null +++ b/src/forms/images/help.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/forms/images/help_light.svg b/src/forms/images/help_light.svg new file mode 100644 index 00000000..5cd3c7df --- /dev/null +++ b/src/forms/images/help_light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/forms/resources.qrc b/src/forms/resources.qrc new file mode 100644 index 00000000..d6add2c6 --- /dev/null +++ b/src/forms/resources.qrc @@ -0,0 +1,6 @@ + + + images/help_light.svg + images/help.svg + +