完成 Mac 初版

imlinhanchao · Mar 2, 2020 · 56bb618 · 56bb618
1 parent 8413f0e
commit 56bb618
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 15 deletions.
diff --git a/src/KeyGenius.pro b/src/KeyGenius.pro
@@ -30,7 +30,13 @@ HEADERS += \
     inc/cross/definition_win.h \
     widget.h
 
-mac:LIBS += -framework ApplicationServices
+macx {
+    LIBS += -framework Foundation
+    LIBS += -framework AppKit
+
+    OBJECTIVE_SOURCES += inc/cross/objectivec.mm
+    HEADERS +=  inc/cross/objectivec.h
+}
 
 FORMS += \
     widget.ui

diff --git a/src/inc/cross/cross.h b/src/inc/cross/cross.h
@@ -10,5 +10,6 @@
 #ifdef Q_OS_MAC
 
 #include "definition_mac.h"
+#include "objectivec.h"
 
 #endif
diff --git a/src/inc/cross/definition_mac.h b/src/inc/cross/definition_mac.h
@@ -5,23 +5,15 @@
 
 #define ICON_RES ":/icon/KeyGenius.icns"
 
-#ifdef __cplusplus
 
 #include <QSettings>
 #include <QKeySequence>
-
-extern "C" {
-#endif
-
 #include <Carbon/Carbon.h>
 #include <ApplicationServices/ApplicationServices.h>
 
 unsigned int Sleep(unsigned int m);
 void KeybdEvent(CGKeyCode key, bool bkeydown);
 
-#ifdef __cplusplus
-
-}
 
 CGKeyCode toCGKeyCode(Qt::Key k);
 
@@ -39,8 +31,8 @@ typedef struct _HOTKEY_CFG
 
     _HOTKEY_CFG()
     {
-        vkNext = Qt::Key_F1 + Qt::ALT;
-        vkStop = Qt::Key_F2 + Qt::CTRL;
+        vkNext = Qt::Key_N + Qt::ALT;
+        vkStop = Qt::Key_S+ Qt::ALT;
         vkKey1 = Qt::Key_S + Qt::CTRL;
         vkKey2 = Qt::Key_F7;
         nTimeInterval = 5000;
@@ -99,5 +91,3 @@ typedef struct _HOTKEY_CFG
 }HOTKEY_CFG, *PHOTKEY_CFG;
 
 #endif
-
-#endif
diff --git a/src/inc/cross/objectivec.h b/src/inc/cross/objectivec.h
@@ -0,0 +1,10 @@
+#ifndef OBJECTIVE_H
+#define OBJECTIVE_H
+
+class ObjectiveC
+{
+public:
+    static void HideWindow();
+};
+
+#endif // OBJECTIVE_H
diff --git a/src/inc/cross/objectivec.mm b/src/inc/cross/objectivec.mm
@@ -0,0 +1,9 @@
+#include "objectivec.h"
+#import <Foundation/Foundation.h>
+#import <AppKit/AppKit.h>
+#import <CoreData/CoreData.h>
+
+void ObjectiveC::HideWindow()
+{
+    [NSApp hide:nil];
+}
diff --git a/src/res/Info.plist b/src/res/Info.plist
@@ -18,7 +18,5 @@
         <string>hancel.@EXECUTABLE@</string>
         <key>NOTE</key>
         <string>This file was generated by Qt/QMake.</string>
-        <key>LSUIElement</key>
-        <string>1</string>
 </dict>
 </plist>
diff --git a/src/widget.cpp b/src/widget.cpp
@@ -19,13 +19,16 @@ void Widget::InitUi()
 {
     m_ui->spinBox_interval->setSingleStep(1000);
     m_ui->spinBox_interval->setMaximum(2000000000);
+
     m_config = Config::GetConfig();
+
     m_ui->keySequence_switch->setKeySequence(m_config.toKey(HOTKEY_CFG::next));
     m_ui->keySequence_start->setKeySequence(m_config.toKey(HOTKEY_CFG::stop));
     m_ui->keySequence_key1->setKeySequence(m_config.toKey(HOTKEY_CFG::key1));
     m_ui->keySequence_key2->setKeySequence(m_config.toKey(HOTKEY_CFG::key2));
     m_ui->spinBox_interval->setValue(m_config.nTimeInterval);
 
+
     QIcon icon = QIcon(ICON_RES);
     m_trayIcon = new QSystemTrayIcon(this);
     m_trayIcon->setIcon(icon);
@@ -129,7 +132,12 @@ void Widget::changeEvent(QEvent *e)
     if((e->type() == QEvent::WindowStateChange) && isMinimized())
     {
         e->ignore();
+#ifdef Q_OS_MAC
+        ObjectiveC *obc = new ObjectiveC();
+        obc->HideWindow();
+#else
         hide();
+#endif
     }
 }