From 3cce11f9d9d891d956c7e54a5986bc426432e623 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 12 Jan 2025 22:51:24 -0500 Subject: [PATCH] fix: missing setting colorful icon --- src/apps/deskflow-gui/dialogs/SettingsDialog.cpp | 4 +++- src/apps/deskflow-gui/dialogs/SettingsDialog.ui | 12 +----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp index 1758bb699..de5fcd859 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp @@ -49,6 +49,9 @@ SettingsDialog::SettingsDialog( ui->m_pPushButtonTlsCertPath->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen)); ui->m_pButtonBrowseLog->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen)); + ui->rb_icon_mono->setIcon(QIcon(QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow-symbolic").arg(iconMode()))); + ui->rb_icon_colorful->setIcon(QIcon(QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow").arg(iconMode()))); + // force the first tab, since qt creator sets the active tab as the last one // the developer was looking at, and it's easy to accidentally save that. ui->m_pTabWidget->setCurrentIndex(0); @@ -243,7 +246,6 @@ void SettingsDialog::loadFromConfig() ui->rb_icon_colorful->setChecked(true); else ui->rb_icon_mono->setChecked(true); - ui->rb_icon_mono->setIcon(QIcon(QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow-symbolic").arg(iconMode()))); updateTlsControls(); } diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.ui b/src/apps/deskflow-gui/dialogs/SettingsDialog.ui index d946bef59..8bf2b0273 100644 --- a/src/apps/deskflow-gui/dialogs/SettingsDialog.ui +++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.ui @@ -174,10 +174,6 @@ Colorful - - - :/icons/common/deskflow.svg:/icons/common/deskflow.svg - @@ -185,10 +181,6 @@ Monocolor - - - :/icons/deskflow-dark/apps/64/deskflow-symbolic.svg:/icons/deskflow-dark/apps/64/deskflow-symbolic.svg - @@ -794,9 +786,7 @@ m_pRadioSystemScope m_pComboElevate - - - + m_pButtonBox