Icon fixes

friction2d · May 30, 2024 · ed8eccb · ed8eccb
1 parent 3a25422
commit ed8eccb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -1133,7 +1133,7 @@ void MainWindow::setupMenuBar()
 
     const auto help = mMenuBar->addMenu(tr("Help", "MenuBar"));
 
-    const auto aboutAct = help->addAction(QIcon::fromTheme("friction"),
+    const auto aboutAct = help->addAction(QIcon::fromTheme(AppSupport::getAppID()),
                                           tr("About", "MenuBar_Help"),
                                           this,
                                           &MainWindow::openAboutWindow);
@@ -1162,7 +1162,7 @@ void MainWindow::setupMenuBar()
     if (eSettings::instance().fCurrentInterfaceDPI != 1.) {
         frictionButton->setIconSize(QSize(eSizesUI::widget, eSizesUI::widget));
     }
-    frictionButton->setIcon(QIcon::fromTheme("friction"));
+    frictionButton->setIcon(QIcon::fromTheme(AppSupport::getAppID()));
     frictionButton->setDefaultAction(aboutAct);
     frictionButton->setToolTip(QString());
     frictionButton->setFocusPolicy(Qt::NoFocus);
@@ -1992,7 +1992,7 @@ void MainWindow::updateRecentMenu()
     for (const auto &path : mRecentFiles) {
         QFileInfo info(path);
         if (!info.exists()) { continue; }
-        mRecentMenu->addAction(QIcon::fromTheme("friction"), info.baseName(), [path, this]() {
+        mRecentMenu->addAction(QIcon::fromTheme(AppSupport::getAppID()), info.baseName(), [path, this]() {
             openFile(path);
         });
     }

diff --git a/src/core/GUI/edialogs.cpp b/src/core/GUI/edialogs.cpp
@@ -31,11 +31,12 @@
 #include <QFileIconProvider>
 #include <QFileSystemModel>
 #include <QSortFilterProxyModel>
+#include "appsupport.h"
 
 class evIconProvider : public QFileIconProvider {
 public:
     evIconProvider() {
-        mEvIcon = QIcon::fromTheme("friction");
+        mEvIcon = QIcon::fromTheme(AppSupport::getAppID());
     }
 
     QIcon icon(const QFileInfo & info) const {

diff --git a/src/core/appsupport.cpp b/src/core/appsupport.cpp
@@ -152,7 +152,7 @@ const QString AppSupport::getAppDomain()
 
 const QString AppSupport::getAppID()
 {
-    return QString::fromUtf8("graphics.friction");
+    return QString::fromUtf8("graphics.friction.Friction");
 }
 
 const QString AppSupport::getAppUrl()

diff --git a/src/ui/widgets/aboutwidget.cpp b/src/ui/widgets/aboutwidget.cpp
@@ -47,7 +47,7 @@ AboutWidget::AboutWidget(QWidget *parent)
                                       "</div>").arg(AppSupport::getAppVersion(),
                                                     QString::number(96),
                                                     AppSupport::getAppDisplayName(),
-                                                    AppSupport::getAppName());
+                                                    AppSupport::getAppID());
     const auto buildInfo = AppSupport::getAppBuildInfo(true);
     if (!buildInfo.isEmpty()) {
         label.append(buildInfo);

diff --git a/src/ui/widgets/welcomedialog.cpp b/src/ui/widgets/welcomedialog.cpp
@@ -60,7 +60,7 @@ WelcomeDialog::WelcomeDialog(QMenu *recentMenu,
                                         .arg(AppSupport::getAppVersion(),
                                              QString::number(logoSize),
                                              AppSupport::getAppDisplayName(),
-                                             AppSupport::getAppName()));
+                                             AppSupport::getAppID()));
 
     const auto buttonWid = new QWidget(this);
     buttonWid->setContentsMargins(0, 0, 0, 0);