fix styleFont not set for macOS

ArkToria · Dec 1, 2021 · 2b0afe7 · 2b0afe7
1 parent b0d0bdc
commit 2b0afe7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/SingleApplication.cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/qrc.cmake")
 
 # Qt 6.2
-find_package(Qt6 6.2 COMPONENTS Gui Core Quick Widgets DBus 
+find_package(Qt6 6.2 COMPONENTS Gui Core Quick Widgets DBus QuickControls2
     Core5Compat Sql LinguistTools Concurrent ToolsTools REQUIRED)
 
 # curl
@@ -169,6 +169,7 @@ target_link_libraries(across PRIVATE
     Qt::Core5Compat
     Qt::Sql
     Qt::Concurrent
+    Qt::QuickControls2
     CURL::libcurl
     fmt::fmt
     gRPC::grpc++

diff --git a/i18n/across_zh_CN.ts b/i18n/across_zh_CN.ts
@@ -1214,55 +1214,55 @@
 <context>
     <name>across::GroupList</name>
     <message>
-        <location filename="../../../ACross/src/view_models/grouplist.cpp" line="408"/>
-        <location filename="../../../ACross/src/view_models/grouplist.cpp" line="412"/>
-        <location filename="../../../ACross/src/view_models/grouplist.cpp" line="429"/>
-        <location filename="../../../ACross/src/view_models/grouplist.cpp" line="433"/>
+        <location filename="../src/view_models/grouplist.cpp" line="408"/>
+        <location filename="../src/view_models/grouplist.cpp" line="412"/>
+        <location filename="../src/view_models/grouplist.cpp" line="429"/>
+        <location filename="../src/view_models/grouplist.cpp" line="433"/>
         <source>Copy [%1] URL to clipboard</source>
         <translation>复制 [%1] 链接到剪贴板</translation>
     </message>
 </context>
 <context>
     <name>across::NodeFormModel</name>
     <message>
-        <location filename="../../../ACross/src/view_models/nodeformmodel.cpp" line="446"/>
+        <location filename="../src/view_models/nodeformmodel.cpp" line="446"/>
         <source>custom configuration encoding to url is not supported</source>
         <translation>未支持自定义配置编码到链接格式</translation>
     </message>
 </context>
 <context>
     <name>across::NodeList</name>
     <message>
-        <location filename="../../../ACross/src/view_models/nodelist.cpp" line="342"/>
+        <location filename="../src/view_models/nodelist.cpp" line="342"/>
         <source>Copy [%1] URL to clipboard</source>
         <translation>复制 [%1] 链接到剪贴板</translation>
     </message>
 </context>
 <context>
     <name>across::SystemTray</name>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="149"/>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="169"/>
+        <location filename="../src/view_models/systemtray.cpp" line="149"/>
+        <location filename="../src/view_models/systemtray.cpp" line="169"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="170"/>
+        <location filename="../src/view_models/systemtray.cpp" line="170"/>
         <source>Connect</source>
         <translation>连接</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="171"/>
+        <location filename="../src/view_models/systemtray.cpp" line="171"/>
         <source>Disconnect</source>
         <translation>断开</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="172"/>
+        <location filename="../src/view_models/systemtray.cpp" line="172"/>
         <source>Reconnect</source>
         <translation>重连</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="173"/>
+        <location filename="../src/view_models/systemtray.cpp" line="173"/>
         <source>Quit</source>
         <translation>退出</translation>
     </message>
@@ -1271,25 +1271,25 @@
         <translation type="vanished">入站</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="151"/>
+        <location filename="../src/view_models/systemtray.cpp" line="151"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/systemtray.cpp" line="181"/>
+        <location filename="../src/view_models/systemtray.cpp" line="181"/>
         <source>OFF</source>
         <translation>关闭</translation>
     </message>
 </context>
 <context>
     <name>across::setting::ConfigTools</name>
     <message>
-        <location filename="../../../ACross/src/view_models/configtools.cpp" line="1039"/>
+        <location filename="../src/view_models/configtools.cpp" line="1039"/>
         <source>Failed to parse version</source>
         <translation>无法解析版本</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/configtools.cpp" line="1042"/>
+        <location filename="../src/view_models/configtools.cpp" line="1042"/>
         <source>New Version: v%1</source>
         <translation>新版本：v%1</translation>
     </message>
@@ -1298,7 +1298,7 @@
         <translation type="vanished">新版本：%1</translation>
     </message>
     <message>
-        <location filename="../../../ACross/src/view_models/configtools.cpp" line="1044"/>
+        <location filename="../src/view_models/configtools.cpp" line="1044"/>
         <source>Already the latest version</source>
         <translation>已经是最新版本</translation>
     </message>

diff --git a/src/app.cpp b/src/app.cpp
@@ -12,6 +12,10 @@ Application::Application(int &argc, char **argv)
     setWindowIcon(QIcon(":misc/design/logo.svg"));
     setDesktopFileName("org.arktoria.across");
 
+#ifdef Q_OS_MAC
+    setStyle("Basic"); // fix styleFont not set
+#endif
+
     connect(this, &SingleApplication::receivedMessage, this,
             &Application::onMessageReceived, Qt::QueuedConnection);
 }

diff --git a/src/app.h b/src/app.h
@@ -9,6 +9,7 @@
 #include <QStringLiteral>
 #include <QTranslator>
 #include <QUrl>
+#include <QtQuickControls2>
 
 #include "singleapplication.h"
 

diff --git a/src/views/home/NodeEditForm.qml b/src/views/home/NodeEditForm.qml
@@ -19,7 +19,7 @@ Window {
     title: qsTr("Edit Configuration")
 
     flags: Qt.platform.os === "windows" ? Qt.Window : Qt.WindowStaysOnTopHint
-    modality: Qt.ApplicationModal
+    modality: Qt.platform.os === "osx" ? Qt.NonModal : Qt.ApplicationModal
 
     property var nodeModel: null
     property int fontSize: 14

diff --git a/src/views/home/NodeShareForm.qml b/src/views/home/NodeShareForm.qml
@@ -18,7 +18,7 @@ Window {
     title: qsTr("Share Configuration")
 
     flags: Qt.platform.os === "windows" ? Qt.Window : Qt.WindowStaysOnTopHint
-    modality: Qt.ApplicationModal
+    modality: Qt.platform.os === "osx" ? Qt.NonModal : Qt.ApplicationModal
 
     property var nodeModel: null
     property int fontSize: 14