Sfoglia il codice sorgente

perf(gui): Distinguish master or dev version. Tools will be ignored in the master version

runhey 3 anni fa
parent
commit
7f252a7a46

+ 9 - 1
module/config/argument/setting-template.json

@@ -1 +1,9 @@
-{"displayMode":1,"darkMode":2,"primaryColor":"Yellow","nativeText":true,"language":"简体中文","dpiStrategy":"default"}
+{
+    "displayMode": 1,
+    "darkMode": 2,
+    "primaryColor": "Yellow",
+    "nativeText": true,
+    "language": "简体中文",
+    "dpiStrategy": "default",
+    "branch": "master"
+}

+ 14 - 6
module/gui/qml/Global/MainEvent.qml

@@ -24,6 +24,7 @@ QtObject {
     property bool nativeText: true
     property bool nativeText: true
     property string language: ""
     property string language: ""
     property string dpiStrategy: ""
     property string dpiStrategy: ""
+    property string branch: ""
 
 
     property int runStatus: MainEvent.RunStatus.Empty
     property int runStatus: MainEvent.RunStatus.Empty
     property string menuTitle: ""
     property string menuTitle: ""
@@ -53,6 +54,13 @@ QtObject {
         mainEvent.nativeText = set["nativeText"]
         mainEvent.nativeText = set["nativeText"]
         mainEvent.language = set["language"]
         mainEvent.language = set["language"]
         mainEvent.dpiStrategy = set["dpiStrategy"]
         mainEvent.dpiStrategy = set["dpiStrategy"]
+        if ('branch' in set){
+            mainEvent.branch = set['branch']
+        }else{
+            mainEvent.branch = "master"
+            mainEvent.settings["branch"] = mainEvent.branch
+            setting.update(JSON.stringify(mainEvent.settings, null, "  "))
+        }
 
 
         var primary_color = set["primaryColor"]
         var primary_color = set["primaryColor"]
         if(primary_color === "Yellow"){mainEvent.primaryColor = FluColors.Yellow}
         if(primary_color === "Yellow"){mainEvent.primaryColor = FluColors.Yellow}
@@ -76,7 +84,7 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
     }
     }
     onDarkModeChanged: {
     onDarkModeChanged: {
 
 
@@ -88,7 +96,7 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
     }
     }
     onPrimaryColorChanged: {
     onPrimaryColorChanged: {
         if(mainEvent.settings === ""){
         if(mainEvent.settings === ""){
@@ -112,7 +120,7 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
     }
     }
     onNativeTextChanged: {
     onNativeTextChanged: {
 
 
@@ -125,7 +133,7 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
     }
     }
     onLanguageChanged: {
     onLanguageChanged: {
         if(mainEvent.settings === ""){
         if(mainEvent.settings === ""){
@@ -137,7 +145,7 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
 
 
     }
     }
     onDpiStrategyChanged: {
     onDpiStrategyChanged: {
@@ -149,6 +157,6 @@ QtObject {
         if(settingInit){
         if(settingInit){
             return
             return
         }
         }
-        setting.update(JSON.stringify(mainEvent.settings))
+        setting.update(JSON.stringify(mainEvent.settings, null, "  "))
     }
     }
 }
 }

+ 6 - 0
module/gui/qml/Page/ScriptView.qml

@@ -107,6 +107,12 @@ SplitPanel{
 
 
         //创建左边的菜单
         //创建左边的菜单
         const data = JSON.parse(process_manager.gui_menu())
         const data = JSON.parse(process_manager.gui_menu())
+        if(MainEvent.branch == 'master'){
+            if('Tools' in data){
+                delete data['Tools']
+            }
+        }
+
         create(data)
         create(data)
 
 
         // 点击的时候顺带创建 python 进程
         // 点击的时候顺带创建 python 进程