Major Controller refactor (#2295)
* Change Controller interface to mimic the CLI Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove obsolete handleCaptureTaken Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Extract system tray icon into separate class The implementation is not complete and full of bugs Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove Controller::handleCaptureFailed Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix a QObject connection Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Controller: remove unused includes Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make check for updates work again Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move functionality to daemon and tray icon Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Rename SystemTray to TrayIcon Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add missing trayicon.* files Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add missing QDesktopWidget Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix syntax errors Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add missing include Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Include missing QOperatingSystemVersion on Mac Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move update checking to daemon Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove obsolete method Controller::doLater Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Some cleanup Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Rename Controller to Flameshot Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Final touches Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#include "systemnotification.h"
|
||||
#include "src/core/controller.h"
|
||||
#include "src/core/flameshot.h"
|
||||
#include "src/utils/confighandler.h"
|
||||
#include <QApplication>
|
||||
#include <QUrl>
|
||||
@@ -8,6 +8,8 @@
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusInterface>
|
||||
#include <QDBusMessage>
|
||||
#else
|
||||
#include "src/core/flameshotdaemon.h"
|
||||
#endif
|
||||
|
||||
SystemNotification::SystemNotification(QObject* parent)
|
||||
@@ -44,8 +46,10 @@ void SystemNotification::sendMessage(const QString& text,
|
||||
this,
|
||||
[&]() {
|
||||
// The call is queued to avoid recursive static initialization of
|
||||
// Controller and ConfigHandler.
|
||||
Controller::getInstance()->sendTrayNotification(text, title, timeout);
|
||||
// Flameshot and ConfigHandler.
|
||||
if (FlameshotDaemon::instance())
|
||||
FlameshotDaemon::instance()->sendTrayNotification(
|
||||
text, title, timeout);
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user