From 9c49c6e0b54f3e8893d2e6489306b278b673a53c Mon Sep 17 00:00:00 2001 From: Flavio Tordini Date: Fri, 24 Nov 2023 01:47:47 +0100 Subject: [PATCH] revert window icon code --- src/main.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 6a5e86e..1e4e6d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,6 +128,26 @@ int main(int argc, char **argv) { MainWindow *mainWindow = new MainWindow(); mainWindow->show(); +#ifndef APP_MAC + QIcon appIcon; + if (QDir(dataDir).exists()) { + appIcon = QIcon::fromTheme(Constants::UNIX_NAME); + } else { + dataDir = qApp->applicationDirPath() + "/data"; + const int iconSizes[] = {16, 22, 32, 48, 64, 128, 256, 512}; + for (int iconSize : iconSizes) { + QString size = QString::number(iconSize); + QString png = dataDir + '/' + size + 'x' + size + '/' + Constants::UNIX_NAME + + QLatin1String(".png"); + appIcon.addFile(png, QSize(iconSize, iconSize)); + } + } + if (appIcon.isNull()) { + appIcon.addFile(":/images/app.png"); + } + mainWindow->setWindowIcon(appIcon); +#endif + #ifdef QAPPLICATION_CLASS mainWindow->connect(&app, &SingleApplication::receivedMessage, mainWindow, [mainWindow](auto instanceId, auto message) {