From 17392a8e0600b5ba5615facf0da75084b6992a2f Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 25 Oct 2025 10:56:04 -0400 Subject: [PATCH] refactor: rename symbolic icon to full fqdn name. --- deploy/linux/deploy.cmake | 3 +-- src/apps/res/deskflow.qrc | 8 ++++---- ...ow-symbolic.svg => org.deskflow.deskflow-symbolic.svg} | 0 .../apps/64/{deskflow.svg => org.deskflow.deskflow.svg} | 0 ...ow-symbolic.svg => org.deskflow.deskflow-symbolic.svg} | 0 .../apps/64/{deskflow.svg => org.deskflow.deskflow.svg} | 0 src/lib/gui/MainWindow.cpp | 2 +- src/lib/gui/dialogs/AboutDialog.cpp | 3 ++- src/lib/gui/dialogs/SettingsDialog.cpp | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) rename src/apps/res/icons/deskflow-dark/apps/64/{deskflow-symbolic.svg => org.deskflow.deskflow-symbolic.svg} (100%) rename src/apps/res/icons/deskflow-dark/apps/64/{deskflow.svg => org.deskflow.deskflow.svg} (100%) rename src/apps/res/icons/deskflow-light/apps/64/{deskflow-symbolic.svg => org.deskflow.deskflow-symbolic.svg} (100%) rename src/apps/res/icons/deskflow-light/apps/64/{deskflow.svg => org.deskflow.deskflow.svg} (100%) diff --git a/deploy/linux/deploy.cmake b/deploy/linux/deploy.cmake index 203d84c21..39e97b3b9 100644 --- a/deploy/linux/deploy.cmake +++ b/deploy/linux/deploy.cmake @@ -16,9 +16,8 @@ install(FILES ${MY_DIR}/org.deskflow.deskflow.png DESTINATION share/icons/hicolo # Install our symbolic icon install( - FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg + FILES ${CMAKE_SOURCE_DIR}/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg DESTINATION share/icons/hicolor/symbolic/apps/ - RENAME org.deskflow.deskflow-symbolic.svg ) # Install our metainfo diff --git a/src/apps/res/deskflow.qrc b/src/apps/res/deskflow.qrc index c81ec246d..e6ea98f1d 100644 --- a/src/apps/res/deskflow.qrc +++ b/src/apps/res/deskflow.qrc @@ -57,8 +57,8 @@ icons/deskflow-dark/actions/32/document-save-as.svg icons/deskflow-dark/actions/32/help-about.svg icons/deskflow-dark/actions/32/view-refresh.svg - icons/deskflow-dark/apps/64/deskflow.svg - icons/deskflow-dark/apps/64/deskflow-symbolic.svg + icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg + icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg icons/deskflow-dark/devices/64/video-display.svg icons/deskflow-dark/places/64/user-trash.svg icons/deskflow-dark/status/32/software-updates-release.svg @@ -130,8 +130,8 @@ icons/deskflow-light/actions/32/document-save-as.svg icons/deskflow-light/actions/32/help-about.svg icons/deskflow-light/actions/32/view-refresh.svg - icons/deskflow-light/apps/64/deskflow.svg - icons/deskflow-light/apps/64/deskflow-symbolic.svg + icons/deskflow-light/apps/64/org.deskflow.deskflow.svg + icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg icons/deskflow-light/devices/64/video-display.svg icons/deskflow-light/status/32/software-updates-release.svg icons/deskflow-light/status/64/dialog-error.svg diff --git a/src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg b/src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg similarity index 100% rename from src/apps/res/icons/deskflow-dark/apps/64/deskflow-symbolic.svg rename to src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow-symbolic.svg diff --git a/src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg b/src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg similarity index 100% rename from src/apps/res/icons/deskflow-dark/apps/64/deskflow.svg rename to src/apps/res/icons/deskflow-dark/apps/64/org.deskflow.deskflow.svg diff --git a/src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg b/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg similarity index 100% rename from src/apps/res/icons/deskflow-light/apps/64/deskflow-symbolic.svg rename to src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow-symbolic.svg diff --git a/src/apps/res/icons/deskflow-light/apps/64/deskflow.svg b/src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg similarity index 100% rename from src/apps/res/icons/deskflow-light/apps/64/deskflow.svg rename to src/apps/res/icons/deskflow-light/apps/64/org.deskflow.deskflow.svg diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 770deff3e..1b77d6ee3 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -93,7 +93,7 @@ MainWindow::MainWindow() { ui->setupUi(this); - setWindowIcon(QIcon::fromTheme(kAppId)); + setWindowIcon(QIcon::fromTheme(kRevFqdnName)); addDockWidget(Qt::BottomDockWidgetArea, m_logDock); diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp index 9f531c7c7..9b52ea386 100644 --- a/src/lib/gui/dialogs/AboutDialog.cpp +++ b/src/lib/gui/dialogs/AboutDialog.cpp @@ -27,7 +27,8 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique const QSize pixmapSize(px, px); ui->lblIcon->setFixedSize(pixmapSize); - ui->lblIcon->setPixmap(QPixmap(QIcon::fromTheme(kAppId).pixmap(QSize().scaled(pixmapSize, Qt::KeepAspectRatio)))); + ui->lblIcon->setPixmap(QPixmap(QIcon::fromTheme(kRevFqdnName).pixmap(QSize().scaled(pixmapSize, Qt::KeepAspectRatio))) + ); ui->btnCopyVersion->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::EditCopy)); connect(ui->btnCopyVersion, &QPushButton::clicked, this, &AboutDialog::copyVersionText); diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp index e7d67db04..62a2f81e1 100644 --- a/src/lib/gui/dialogs/SettingsDialog.cpp +++ b/src/lib/gui/dialogs/SettingsDialog.cpp @@ -44,8 +44,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, const IServerConfig &serverConfi ui->comboTlsKeyLength->setItemIcon(1, QIcon::fromTheme(QIcon::ThemeIcon::SecurityHigh)); ui->lblTlsCertInfo->setFixedSize(28, 28); - ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("%1-symbolic").arg(kAppId))); - ui->rbIconColorful->setIcon(QIcon::fromTheme(kAppId)); + ui->rbIconMono->setIcon(QIcon::fromTheme(QStringLiteral("%1-symbolic").arg(kRevFqdnName))); + ui->rbIconColorful->setIcon(QIcon::fromTheme(kRevFqdnName)); // 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.