2.2.6

Author: xland

App/App.cpp

@@ -8,13 +8,10 @@
 #include <QSharedMemory>
 #include <QMessageBox>
 #include "App.h"
-#include "Tray.h"
-#include "Logger.h"
 #include "NativeRect.h"
 #include "Font.h"
 #include "../Win/WinFull.h"
 #include "../Win/WinPin.h"
-#include "../Lib/QHotKey/qhotkey.h"
 #include "../Tool/ToolMain.h"
 #include "../Tool/ToolSub.h"
 #include "../Tool/ColorCtrl.h"
@@ -23,42 +20,21 @@ namespace {
     std::unique_ptr<App> app; 
     QList<QRect> screens;
     QList<QRect> windows;
-    QSharedMemory* smSingleApp;
 }
 void App::init()
 {
-    new Logger(qApp);
     initConfig();
     start();
 }
 void App::dispose()
 {
-    app.reset();
-    if (smSingleApp->isAttached()) {
-		smSingleApp->detach();//如果是最后一个进程，则会自动删除共享内存
-    }        
+    app.reset();       
 }
 void App::start()
 {
     NativeRect::init();
     WinFull::init();
 }
-bool App::singleAppLock()
-{
-    smSingleApp = new QSharedMemory("ScreenCapture", qApp);
-    bool flag{ false };
-    if (smSingleApp->attach(QSharedMemory::ReadOnly)) {
-        smSingleApp->detach();
-        flag = false;
-    }
-    else if (smSingleApp->create(1)) {
-        flag = true;
-    }
-    if (!flag) {
-        QMessageBox::warning(nullptr, "Warning", "ScreenCapture is already running.");
-    }    
-    return flag;
-}
 void App::initConfig()
 {
     QString jsonStr = R"888({
@@ -408,12 +384,9 @@ void App::initConfig()
     }
     QJsonObject jsonObject = document.object();
     auto lang = jsonObject["defaultLang"].toString();
-    Tray::initData(jsonObject["tray"].toObject(), lang);
     WinPin::initData(jsonObject["winPin"].toArray(), lang);
     ToolMain::initData(jsonObject["toolMain"].toArray(), lang);
     ToolSub::initData(jsonObject["toolSub"].toObject(), lang);
     ColorCtrl::initData(jsonObject["colorCtrl"].toObject(), lang);
     Font::initData(jsonObject["icon"].toObject());
-    auto hotkey = new QHotkey(QKeySequence(jsonObject["hotKey"].toString()), true,qApp);
-    QObject::connect(hotkey, &QHotkey::activated, &App::start);
 }