add config to disable grim warrning close flameshot-org#3186

Monirzadeh · Dec 30, 2023 · 6539323 · 6539323
1 parent 3d21e49
commit 6539323
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/flameshot.example.ini b/flameshot.example.ini
@@ -48,6 +48,9 @@
 ;; Whether the tray icon is disabled (bool)
 ;disabledTrayIcon=false
 ;
+;; Disable Grim Warnnig notification
+;disabledGrimWarnning=true
+;
 ;; Automatically close daemon when it's not needed (not available on Windows)
 ;autoCloseIdleDaemon=false
 ;

diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
@@ -78,6 +78,7 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("showSidePanelButton"         ,Bool               ( true          )),
     OPTION("showDesktopNotification"     ,Bool               ( true          )),
     OPTION("disabledTrayIcon"            ,Bool               ( false         )),
+    OPTION("disabledGrimWarnning"        ,Bool               ( false         )),
     OPTION("historyConfirmationToDelete" ,Bool               ( true          )),
 #if !defined(DISABLE_UPDATE_CHECKER)
     OPTION("checkForUpdates"             ,Bool               ( true          )),

diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
@@ -88,6 +88,7 @@ class ConfigHandler : public QObject
                          bool)
     CONFIG_GETTER_SETTER(filenamePattern, setFilenamePattern, QString)
     CONFIG_GETTER_SETTER(disabledTrayIcon, setDisabledTrayIcon, bool)
+    CONFIG_GETTER_SETTER(disabledGrimWarnning, disabledGrimWarnning, bool)
     CONFIG_GETTER_SETTER(drawThickness, setDrawThickness, int)
     CONFIG_GETTER_SETTER(drawFontSize, setDrawFontSize, int)
     CONFIG_GETTER_SETTER(keepOpenAppLauncher, setKeepOpenAppLauncher, bool)

diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp
@@ -12,6 +12,7 @@
 #include <QPixmap>
 #include <QProcess>
 #include <QScreen>
+#include "src/utils/confighandler.h"
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
 #include "request.h"
@@ -141,10 +142,12 @@ QPixmap ScreenGrabber::grabEntireDesktop(bool& ok)
                   "activate the grim-based general wayland screenshot adapter");
                 freeDesktopPortal(ok, res);
 #else
+        if (!ConfigHandler().disabledGrimWarnning()) {
                 AbstractLogger::warning()
                   << tr("grim's screenshot component is implemented based on "
                         "wlroots, it may not be used in GNOME or similar "
                         "desktop environments");
+        }
                 generalGrimScreenshot(ok, res);
 #endif
                 break;