working on monochrome icon (#2071)

* working on monochrome icon

* Update pipeline

* adjusted icns to be monochrome

* Added 1045 monochrome

.github/workflows/MacOS-pack.yml

@@ -55,7 +55,7 @@ jobs:
           mkdir -p "${DIR_BULD}"
           cd "${DIR_BULD}"
           rm -rf ./src/flameshot.dmg ./src/flameshot.app/
-          cmake .. -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
+          cmake .. -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 -DUSE_MONOCHROME_ICON=True
 
       - name: Compile
         run: |

CMakeLists.txt

@@ -63,6 +63,7 @@ set(RUN_IN_PLACE
 
 
 option(FLAMESHOT_DEBUG_CAPTURE "Enable mode to make debugging easier" OFF)
+option(USE_MONOCHROME_ICON "Build using monochrome icon as default" OFF)
 option(GENERATE_TS "Regenerate translation source files" OFF)
 option(USE_EXTERNAL_SINGLEAPPLICATION "Use external QtSingleApplication library" OFF)
 option(USE_EXTERNAL_SPDLOG "Use external spdlog library" OFF)

data/graphics.qrc

@@ -4,6 +4,8 @@
         <file>img/app/flameshot.svg</file>
         <file>img/app/org.flameshot.Flameshot.png</file>
         <file>img/app/flameshot.png</file>
+        <file>img/app/flameshot.monochrome.png</file>
+        <file>img/app/flameshot.monochrome.svg</file>
         <file>img/app/keyboard.svg</file>
         <file>img/material/black/accept.svg</file>
         <file>img/material/black/arrow-bottom-left.svg</file>

data/img/app/flameshot.monochrome.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   viewBox="0 0 64 64"
+   width="64"
+   height="64"
+   id="svg17"
+   sodipodi:docname="flameshot.monochrome.svg"
+   inkscape:version="1.1.1 (c3084ef, 2021-09-22)"
+   inkscape:export-filename="/Users/jeremy/github/flameshot/data/img/app/flameshot.monochrome.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     id="namedview19"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="8.4375"
+     inkscape:cx="40.651852"
+     inkscape:cy="32"
+     inkscape:window-width="1440"
+     inkscape:window-height="762"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg17" />
+  <path
+     style="fill:#ffffff;stroke-width:0.118519"
+     d="m 18.568536,51.336722 c -1.832415,-2.545001 -3.878548,-6.25409 -4.695325,-8.511366 -0.681939,-1.88463 -0.962924,-3.184673 -1.033323,-4.780911 -0.09806,-2.22352 0.301495,-3.572888 1.536342,-5.188451 2.345871,-3.069124 4.401255,-6.901667 5.543966,-10.337475 0.928327,-2.791218 1.402163,-5.817428 1.229421,-7.851852 -0.0429,-0.505185 -0.04732,-0.918518 -0.0098,-0.918518 0.123852,0 2.048097,3.000333 2.698394,4.207407 2.405296,4.464683 3.409423,7.988021 3.27081,11.476805 -0.07085,1.783138 -0.341563,2.985742 -0.971364,4.315093 -0.502367,1.060369 -0.82647,1.532683 -2.135329,3.111806 -2.728805,3.292273 -4.46968,6.746937 -4.987086,9.896582 -0.228735,1.392393 -0.171954,3.763002 0.11483,4.794203 0.09886,0.355487 0.163755,0.662337 0.144203,0.68189 -0.01955,0.01955 -0.337119,-0.383293 -0.705704,-0.895213 z"
+     id="path294" />
+  <path
+     style="fill:#f2f2f2;stroke-width:0.118519"
+     d="m 19.207296,51.377778 c -0.254828,-0.823346 -0.295929,-3.4079 -0.07445,-4.681481 0.506094,-2.910199 2.022102,-6.058585 4.298686,-8.927338 0.508213,-0.640406 1.20716,-1.520406 1.553215,-1.955555 0.773331,-0.972432 1.585805,-2.610045 1.921355,-3.872663 0.320159,-1.2047 0.435251,-3.527522 0.24531,-4.950918 -0.07632,-0.571893 -0.166786,-1.112855 -0.201047,-1.202138 -0.04122,-0.107421 0.291143,-0.375709 0.98256,-0.793131 5.746,-3.468974 9.311867,-8.495445 9.744056,-13.735294 l 0.08309,-1.007408 0.435346,1.362963 c 2.956056,9.254696 2.900509,17.19445 -0.151325,21.630141 -1.113384,1.618247 -2.855008,2.961847 -4.977427,3.839907 -3.930714,1.626166 -6.811665,3.464574 -9.18799,5.863094 -2.399167,2.421572 -3.876845,5.116375 -4.362485,7.955747 l -0.16217,0.948148 z"
+     id="path370" />
+  <path
+     style="fill:#b3b3b3;stroke-width:0.118519"
+     d="m 19.555557,51.357419 c 0,-0.638645 0.645167,-2.68005 1.225444,-3.877484 2.087508,-4.30769 5.958296,-7.563472 12.132772,-10.205072 1.706189,-0.729951 2.52315,-1.20406 3.473199,-2.015603 1.926809,-1.645906 3.242533,-4.133682 3.777426,-7.142372 l 0.195193,-1.097927 1.479464,-0.514375 c 2.726814,-0.948049 5.394823,-2.246223 7.147054,-3.477543 1.953877,-1.373019 3.991669,-3.667942 4.474308,-5.038879 0.08548,-0.242806 0.172453,-0.424431 0.193273,-0.403611 0.06714,0.06714 -0.430864,3.666928 -0.733571,5.302558 -1.809781,9.778889 -5.443267,16.457192 -10.32597,18.979009 -1.338606,0.691362 -2.422545,0.993456 -4.371926,1.218454 -8.403832,0.969975 -14.728058,3.614913 -17.794074,7.441898 -0.375118,0.468218 -0.724908,0.901973 -0.777312,0.963899 -0.0536,0.06334 -0.09528,0.0052 -0.09528,-0.132952 z"
+     id="path409" />
+</svg>

packaging/macos/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleIconFile</key>
 	<string>flameshot</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.lupodharkael.flameshot</string>
+	<string>com.Flameshot.flameshot</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>

src/CMakeLists.txt

@@ -21,18 +21,20 @@ if (APPLE)
             COMMAND bash "-c" "mkdir -p flameshot.iconset"
     )
     execute_process(
-            COMMAND bash "-c" "sips -z 16 16     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_16x16.png"
+            COMMAND bash "-c" "sips -z 16 16     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_16x16.png"
-            COMMAND bash "-c" "sips -z 32 32     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_16x16@2x.png"
+            COMMAND bash "-c" "sips -z 32 32     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_16x16@2x.png"
-            COMMAND bash "-c" "sips -z 32 32     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_32x32.png"
+            COMMAND bash "-c" "sips -z 32 32     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_32x32.png"
-            COMMAND bash "-c" "sips -z 64 64     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_32x32@2x.png"
+            COMMAND bash "-c" "sips -z 64 64     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_32x32@2x.png"
-            COMMAND bash "-c" "sips -z 64 64     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_64x64x.png"
+            COMMAND bash "-c" "sips -z 64 64     \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_64x64x.png"
-            COMMAND bash "-c" "sips -z 128 128   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_64x64@2.png"
+            COMMAND bash "-c" "sips -z 128 128   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome.png --out flameshot.iconset/icon_64x64@2.png"
-            COMMAND bash "-c" "sips -z 128 128   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.png --out flameshot.iconset/icon_128x128.png"
+            COMMAND bash "-c" "sips -z 128 128   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_128x128.png"
-            COMMAND bash "-c" "sips -z 256 256   \"${CMAKE_SOURCE_DIR}\"/data/img/app/org.flameshot.Flameshot-1024.png --out flameshot.iconset/icon_128x128@2x.png"
+            COMMAND bash "-c" "sips -z 256 256   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_128x128@2x.png"
-            COMMAND bash "-c" "sips -z 256 256   \"${CMAKE_SOURCE_DIR}\"/data/img/app/org.flameshot.Flameshot-1024.png --out flameshot.iconset/icon_256x256.png"
+            COMMAND bash "-c" "sips -z 256 256   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_256x256.png"
-            COMMAND bash "-c" "sips -z 512 512   \"${CMAKE_SOURCE_DIR}\"/data/img/app/org.flameshot.Flameshot-1024.png --out flameshot.iconset/icon_256x256@2x.png"
+            COMMAND bash "-c" "sips -z 512 512   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_256x256@2x.png"
-            COMMAND bash "-c" "sips -z 512 512   \"${CMAKE_SOURCE_DIR}\"/data/img/app/org.flameshot.Flameshot-1024.png --out flameshot.iconset/icon_512x512.png"
+            COMMAND bash "-c" "sips -z 512 512   \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_512x512.png"
-            COMMAND bash "-c" "sips -z 1024 1024 \"${CMAKE_SOURCE_DIR}\"/data/img/app/org.flameshot.Flameshot-1024.png --out flameshot.iconset/icon_512x512@2x.png"
+            COMMAND bash "-c" "sips -z 1024 1024 \"${CMAKE_SOURCE_DIR}\"/data/img/app/flameshot.monochrome-1024.png --out flameshot.iconset/icon_512x512@2x.png"
+          
+          
             COMMAND bash "-c" "iconutil -c icns flameshot.iconset"
     )
 
@@ -233,6 +235,10 @@ if (FLAMESHOT_DEBUG_CAPTURE)
     target_compile_definitions(flameshot PRIVATE FLAMESHOT_DEBUG_CAPTURE)
 endif ()
 
+if (USE_MONOCHROME_ICON)
+    target_compile_definitions(flameshot PRIVATE USE_MONOCHROME_ICON)
+endif ()
+
 foreach (FILE ${QM_FILES})
     get_filename_component(F_NAME ${FILE} NAME)
     add_custom_command(

src/config/configwindow.cpp

@@ -36,7 +36,7 @@ ConfigWindow::ConfigWindow(QWidget* parent)
     layout->addWidget(m_tabWidget);
 
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("Configuration"));
 
     connect(ConfigHandler::getInstance(),

src/config/setshortcutwidget.cpp

@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2020 Yurii Puchkov at Namecheap & Contributors
 
 #include "setshortcutwidget.h"
+#include "src/utils/globalvalues.h"
 #include <QIcon>
 #include <QKeyEvent>
 #include <QLabel>
@@ -12,7 +13,7 @@ SetShortcutDialog::SetShortcutDialog(QDialog* parent)
   : QDialog(parent)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("Set Shortcut"));
     m_ks = QKeySequence();
 

src/config/shortcutswidget.cpp

@@ -5,6 +5,7 @@
 #include "capturetool.h"
 #include "setshortcutwidget.h"
 #include "src/core/qguiappcurrentscreen.h"
+#include "src/utils/globalvalues.h"
 #include "toolfactory.h"
 #include <QHeaderView>
 #include <QIcon>
@@ -25,7 +26,7 @@ ShortcutsWidget::ShortcutsWidget(QWidget* parent)
   : QWidget(parent)
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("Hot Keys"));
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))

src/core/controller.cpp

@@ -10,6 +10,7 @@
 #include "src/config/configwindow.h"
 #include "src/core/qguiappcurrentscreen.h"
 #include "src/utils/confighandler.h"
+#include "src/utils/globalvalues.h"
 #include "src/utils/history.h"
 #include "src/utils/screengrabber.h"
 #include "src/utils/systemnotification.h"
@@ -465,7 +466,7 @@ void Controller::enableTrayIcon()
     m_trayIcon->setContextMenu(m_trayIconMenu);
 #endif
     QIcon trayIcon =
-      QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
+      QIcon::fromTheme("flameshot-tray", QIcon(GlobalValues::iconPathPNG()));
     m_trayIcon->setIcon(trayIcon);
 
 #if defined(Q_OS_MACOS)
@@ -527,7 +528,7 @@ void Controller::sendTrayNotification(const QString& text,
 {
     if (m_trayIcon) {
         m_trayIcon->showMessage(
-          title, text, QIcon(":img/app/flameshot.svg"), timeout);
+          title, text, QIcon(GlobalValues::iconPath()), timeout);
     }
 }
 

src/tools/imgur/imguruploader.cpp

@@ -4,6 +4,7 @@
 #include "imguruploader.h"
 #include "src/utils/confighandler.h"
 #include "src/utils/filenamehandler.h"
+#include "src/utils/globalvalues.h"
 #include "src/utils/history.h"
 #include "src/utils/systemnotification.h"
 #include "src/widgets/imagelabel.h"
@@ -37,7 +38,7 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent)
   , m_pixmap(capture)
 {
     setWindowTitle(tr("Upload to Imgur"));
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
     QRect position = frameGeometry();

src/tools/launcher/applauncherwidget.cpp

@@ -39,7 +39,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent)
   , m_pixmap(p)
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("Open With"));
 
     m_keepOpen = ConfigHandler().keepOpenAppLauncher();

src/tools/pin/pinwidget.cpp

@@ -4,6 +4,7 @@
 #include "pinwidget.h"
 #include "qguiappcurrentscreen.h"
 #include "src/utils/confighandler.h"
+#include "src/utils/globalvalues.h"
 #include <QApplication>
 #include <QLabel>
 #include <QScreen>
@@ -17,7 +18,7 @@ PinWidget::PinWidget(const QPixmap& pixmap,
   : QWidget(parent)
   , m_pixmap(pixmap)
 {
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
     // set the bottom widget background transparent
     setAttribute(Qt::WA_TranslucentBackground);

src/utils/globalvalues.cpp

@@ -15,3 +15,21 @@ QString GlobalValues::versionInfo()
     return QStringLiteral("Flameshot " APP_VERSION " (" FLAMESHOT_GIT_HASH ")"
                           "\nCompiled with Qt " QT_VERSION_STR);
 }
+
+QString GlobalValues::iconPath()
+{
+#if USE_MONOCHROME_ICON
+    return QString(":img/app/flameshot.monochrome.svg");
+#else
+    return QString(":img/app/flameshot.svg");
+#endif
+}
+
+QString GlobalValues::iconPathPNG()
+{
+#if USE_MONOCHROME_ICON
+    return QString(":img/app/flameshot.monochrome.png");
+#else
+    return QString(":img/app/flameshot.png");
+#endif
+}

src/utils/globalvalues.h

@@ -9,5 +9,6 @@ namespace GlobalValues {
 
 int buttonBaseSize();
 QString versionInfo();
-
+QString iconPath();
+QString iconPathPNG();
 }

src/utils/screenshotsaver.cpp

@@ -5,6 +5,7 @@
 #include "src/core/controller.h"
 #include "src/utils/confighandler.h"
 #include "src/utils/filenamehandler.h"
+#include "src/utils/globalvalues.h"
 #include "src/utils/systemnotification.h"
 #include "utils/desktopinfo.h"
 #include <QApplication>
@@ -216,7 +217,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
 
         QMessageBox saveErrBox(
           QMessageBox::Warning, QObject::tr("Save Error"), msg);
-        saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
+        saveErrBox.setWindowIcon(QIcon(GlobalValues::iconPath()));
         saveErrBox.exec();
     }
 

src/widgets/capturelauncher.cpp

@@ -3,6 +3,7 @@
 
 #include "capturelauncher.h"
 #include "src/core/controller.h"
+#include "src/utils/globalvalues.h"
 #include "src/utils/screengrabber.h"
 #include "src/utils/screenshotsaver.h"
 #include "src/widgets/imagelabel.h"
@@ -23,7 +24,7 @@ CaptureLauncher::CaptureLauncher(QDialog* parent)
   , m_id(0)
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     m_imageLabel = new ImageLabel(this);
     bool ok;
     m_imageLabel->setScreenshot(ScreenGrabber().grabEntireDesktop(ok));

src/widgets/historywidget.cpp

@@ -1,5 +1,6 @@
 #include "historywidget.h"
 #include "src/utils/confighandler.h"
+#include "src/utils/globalvalues.h"
 #include "src/utils/history.h"
 #include "src/widgets/notificationwidget.h"
 #include <QApplication>
@@ -17,11 +18,10 @@
 #include <QScrollArea>
 #include <QUrl>
 #include <QVBoxLayout>
-
 HistoryWidget::HistoryWidget(QWidget* parent)
   : QDialog(parent)
 {
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setWindowTitle(tr("Latest Uploads"));
     resize(QDesktopWidget().availableGeometry(this).size() * 0.5);

src/widgets/imguruploaddialog.cpp

@@ -3,6 +3,7 @@
 
 #include "imguruploaddialog.h"
 #include "src/utils/confighandler.h"
+#include "src/utils/globalvalues.h"
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QLabel>
@@ -13,7 +14,7 @@ ImgurUploadDialog::ImgurUploadDialog(QDialog* parent)
 {
     setAttribute(Qt::WA_DeleteOnClose);
     setMinimumSize(400, 120);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("Upload Confirmation"));
 
     layout = new QVBoxLayout(this);

src/widgets/infowindow.cpp

@@ -27,7 +27,7 @@ InfoWindow::InfoWindow(QWidget* parent)
   : QWidget(parent)
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowIcon(QIcon(GlobalValues::iconPath()));
     setWindowTitle(tr("About"));
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
@@ -46,7 +46,7 @@ InfoWindow::InfoWindow(QWidget* parent)
 void InfoWindow::initLabels()
 {
     auto* icon = new QLabel();
-    icon->setPixmap(QPixmap(":img/app/flameshot.svg"));
+    icon->setPixmap(QPixmap(GlobalValues::iconPath()));
     icon->setAlignment(Qt::AlignHCenter);
     m_layout->addWidget(icon);