From b2b3956dea63d9b116715987fe4ac9e0cadc9620 Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Fri, 5 Apr 2024 02:02:42 +0800
Subject: [PATCH] HelpView: Rename to HelperWindow.

---
 3rdparty/RibbonUI                             |  2 +-
 app_source/CMakeLists.txt                     |  2 +-
 .../HelpView.qml => HelperWindow.qml}         | 46 +++++++++----------
 app_source/qml/Main.qml                       |  3 +-
 4 files changed, 27 insertions(+), 26 deletions(-)
 rename app_source/qml/{components/HelpView.qml => HelperWindow.qml} (61%)

diff --git a/3rdparty/RibbonUI b/3rdparty/RibbonUI
index b48cbe6..edeee77 160000
--- a/3rdparty/RibbonUI
+++ b/3rdparty/RibbonUI
@@ -1 +1 @@
-Subproject commit b48cbe6719f8ba98f61a1473811cb44a0f234a56
+Subproject commit edeee77c443075ffb80a7e981a822718b47c2c7f
diff --git a/app_source/CMakeLists.txt b/app_source/CMakeLists.txt
index f96b3bc..6df8969 100644
--- a/app_source/CMakeLists.txt
+++ b/app_source/CMakeLists.txt
@@ -49,7 +49,7 @@ set(
     qml/components/ZigBeeDataView.qml qml/components/TabBar.qml qml/components/CenterView.qml
     qml/components/ListTable.qml qml/components/DeviceList.qml qml/components/KeysList.qml
     qml/components/EventsHistoryList.qml qml/components/FrameChooser.qml qml/components/RibbonMarkDownViewer.qml
-    qml/components/HelpView.qml
+    qml/HelperWindow.qml
 )
 
 set(js_files js/markdown-it.js js/markdown-it-deflist.js js/markdown-it-emoji.js
diff --git a/app_source/qml/components/HelpView.qml b/app_source/qml/HelperWindow.qml
similarity index 61%
rename from app_source/qml/components/HelpView.qml
rename to app_source/qml/HelperWindow.qml
index 3fc4d44..9811403 100644
--- a/app_source/qml/components/HelpView.qml
+++ b/app_source/qml/HelperWindow.qml
@@ -5,26 +5,24 @@ import RibbonUI
 import ProtocolParser
 import "."
 
-Item {
-    id:root
-    implicitHeight: 550
-    implicitWidth: 550
-    property string title: qsTr("帮助")
+RibbonWindow {
+    id: root
+    height: 550
+    width: 550
+    title_bar.show_darkmode_btn: false
+    title_bar.show_style_switch: false
+    title: qsTr("帮助")
     Component.onCompleted: Tools.writeDirtoTempDir(":/qt/qml/ProtocolParser/")
 
-    RibbonText{
-        anchors{
-            top:parent.top
-            topMargin: 10
-            horizontalCenter: parent.horizontalCenter
-        }
-        text: title
-    }
-
     RibbonMarkDownViewer{
         id: viewer
         anchors.fill: parent
-        anchors.margins: 35
+        anchors{
+            topMargin: 10
+            leftMargin: anchors.topMargin
+            rightMargin: anchors.topMargin
+            bottomMargin: viewer.can_goback || viewer.can_goforward ? 30 : 10
+        }
         file_name: 'qrc:/qt/qml/ProtocolParser/README.md'
         base_url: 'qrc:/qt/qml/ProtocolParser/'
         resource_dir: Tools.baseDir
@@ -32,10 +30,11 @@ Item {
 
     RibbonButton{
         anchors{
-            bottom: root.bottom
-            bottomMargin: 10
-            left: root.left
-            leftMargin: 30
+            topMargin: 5
+            bottom: parent.bottom
+            bottomMargin: 5
+            left: parent.left
+            leftMargin: viewer.anchors.leftMargin
         }
         show_bg: false
         show_hovered_bg: false
@@ -48,10 +47,11 @@ Item {
 
     RibbonButton{
         anchors{
-            bottom: root.bottom
-            bottomMargin: 10
-            right: root.right
-            rightMargin: 30
+            topMargin: 5
+            bottom: parent.bottom
+            bottomMargin: 5
+            right: parent.right
+            rightMargin: viewer.anchors.rightMargin
         }
         show_bg: false
         show_hovered_bg: false
diff --git a/app_source/qml/Main.qml b/app_source/qml/Main.qml
index 4540991..7f15719 100644
--- a/app_source/qml/Main.qml
+++ b/app_source/qml/Main.qml
@@ -12,6 +12,7 @@ RibbonWindow {
     minimumWidth: 1200
     height: 800
     minimumHeight: 800
+    comfirmed_quit: true
     title: qsTr("Protocol Parser") + ` V${PPAPP_Version}`
 
     title_bar.right_content:RowLayout{
@@ -27,7 +28,7 @@ RibbonWindow {
             text_color: title_bar.title_text_color
             text_color_reverse: false
             onClicked: {
-                Window.window.popup.show_content("qrc:/qt/qml/ProtocolParser/components/HelpView.qml")
+                root.show_window("qrc:/qt/qml/ProtocolParser/HelperWindow.qml")
             }
         }
     }