From ac7142c4df5cf218ddf5b032d80ac340639f99d0 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sun, 11 Oct 2020 17:22:19 +0800 Subject: [PATCH] fix: correcting images name --- CMakeLists.txt | 2 +- src/config/configwindow.cpp | 2 +- src/tools/imgur/imguruploader.cpp | 2 +- src/tools/launcher/applauncherwidget.cpp | 2 +- src/utils/screenshotsaver.cpp | 3 ++- src/widgets/infowindow.cpp | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d20245c..0a3bfc17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Powerful yet simple to use screenshot sof set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_HOMEPAGE_URL "https://flameshot.org") set(CPACK_PACKAGE_CONTACT "flameshot-org developers ") -set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/img/app/flameshot.svg") # TODO: Can any generator make use of this? +set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/img/app/org.flameshot.Flameshot.svg") # TODO: Can any generator make use of this? set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") # TODO: Where is this used? Do we need a better source? if(WIN32) diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index 737c6573..ccd10714 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -39,7 +39,7 @@ ConfigWindow::ConfigWindow(QWidget* parent) setAttribute(Qt::WA_DeleteOnClose); const int size = GlobalValues::buttonBaseSize() * 12; setMinimumSize(size, size); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Configuration")); auto changedSlot = [this](QString s) { diff --git a/src/tools/imgur/imguruploader.cpp b/src/tools/imgur/imguruploader.cpp index 26e3f149..a457c1c3 100644 --- a/src/tools/imgur/imguruploader.cpp +++ b/src/tools/imgur/imguruploader.cpp @@ -50,7 +50,7 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) , m_pixmap(capture) { setWindowTitle(tr("Upload to Imgur")); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QRect position = frameGeometry(); diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index 4ae24175..1ca1dc50 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -52,7 +52,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent) , m_pixmap(p) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("Open With")); m_keepOpen = ConfigHandler().keepOpenAppLauncherValue(); diff --git a/src/utils/screenshotsaver.cpp b/src/utils/screenshotsaver.cpp index fd5c433d..40363042 100644 --- a/src/utils/screenshotsaver.cpp +++ b/src/utils/screenshotsaver.cpp @@ -108,7 +108,8 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture) QString msg = QObject::tr("Error trying to save as ") + savePath; QMessageBox saveErrBox( QMessageBox::Warning, QObject::tr("Save Error"), msg); - saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg")); + saveErrBox.setWindowIcon( + QIcon(":img/app/org.flameshot.Flameshot.svg")); saveErrBox.exec(); } } diff --git a/src/widgets/infowindow.cpp b/src/widgets/infowindow.cpp index b624adfa..23bc8c8d 100644 --- a/src/widgets/infowindow.cpp +++ b/src/widgets/infowindow.cpp @@ -36,7 +36,7 @@ InfoWindow::InfoWindow(QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); - setWindowIcon(QIcon(":img/app/flameshot.svg")); + setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg")); setWindowTitle(tr("About")); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))