Major Controller refactor (#2295)

* Change Controller interface to mimic the CLI Signed-off-by: Haris Gušić <[email protected]> * Remove obsolete handleCaptureTaken Signed-off-by: Haris Gušić <[email protected]> * Extract system tray icon into separate class The implementation is not complete and full of bugs Signed-off-by: Haris Gušić <[email protected]> * Remove Controller::handleCaptureFailed Signed-off-by: Haris Gušić <[email protected]> * Fix a QObject connection Signed-off-by: Haris Gušić <[email protected]> * Controller: remove unused includes Signed-off-by: Haris Gušić <[email protected]> * Make check for updates work again Signed-off-by: Haris Gušić <[email protected]> * Move functionality to daemon and tray icon Signed-off-by: Haris Gušić <[email protected]> * Rename SystemTray to TrayIcon Signed-off-by: Haris Gušić <[email protected]> * Add missing trayicon.* files Signed-off-by: Haris Gušić <[email protected]> * Add missing QDesktopWidget Signed-off-by: Haris Gušić <[email protected]> * Fix syntax errors Signed-off-by: Haris Gušić <[email protected]> * Add missing include Signed-off-by: Haris Gušić <[email protected]> * Include missing QOperatingSystemVersion on Mac Signed-off-by: Haris Gušić <[email protected]> * Move update checking to daemon Signed-off-by: Haris Gušić <[email protected]> * Remove obsolete method Controller::doLater Signed-off-by: Haris Gušić <[email protected]> * Some cleanup Signed-off-by: Haris Gušić <[email protected]> * Rename Controller to Flameshot Signed-off-by: Haris Gušić <[email protected]> * Final touches Signed-off-by: Haris Gušić <[email protected]>
flameshot-org · Mar 25, 2022 · 54690d5 · 54690d5
1 parent e97f733
commit 54690d5
Show file tree

Hide file tree

Showing 20 changed files with 945 additions and 929 deletions.
diff --git a/src/config/generalconf.cpp b/src/config/generalconf.cpp
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
 
 #include "generalconf.h"
-#include "src/core/controller.h"
+#include "src/core/flameshot.h"
 #include "src/utils/confighandler.h"
 #include <QCheckBox>
 #include <QComboBox>
@@ -127,7 +127,6 @@ void GeneralConf::showDesktopNotificationChanged(bool checked)
 void GeneralConf::checkForUpdatesChanged(bool checked)
 {
     ConfigHandler().setCheckForUpdates(checked);
-    Controller::getInstance()->setCheckForUpdatesEnabled(checked);
 }
 
 void GeneralConf::allowMultipleGuiInstancesChanged(bool checked)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1,13 +1,13 @@
 target_sources(flameshot PRIVATE
-    controller.h
+    flameshot.h
     flameshotdaemon.h
     flameshotdbusadapter.h
     qguiappcurrentscreen.h
 )
 
 target_sources(flameshot PRIVATE
     capturerequest.cpp
-    controller.cpp
+    flameshot.cpp
     flameshotdaemon.cpp
     flameshotdbusadapter.cpp
     qguiappcurrentscreen.cpp

diff --git a/src/core/capturerequest.cpp b/src/core/capturerequest.cpp
@@ -3,7 +3,7 @@
 
 #include "capturerequest.h"
 #include "confighandler.h"
-#include "controller.h"
+#include "flameshot.h"
 #include "imgupload/imguploadermanager.h"
 #include "pinwidget.h"
 #include "src/utils/screenshotsaver.h"