Merge pull request #272 from Ikaros-521/owner

顶部菜单栏新增Q群跳转，改名帮助
Ikaros-521 · Sep 1, 2023 · 8b75307 · 8b75307
2 parents 8f316f6 + 4f9a2b6
commit 8b75307
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1568,6 +1568,8 @@ cmd运行`npm i docsify-cli -g`
   - 修复智谱AI返回内容有\n时，也会进行语音合成的bug
   - 删除部分违禁词
   - 念用户名时，删除用户名中存在的特殊符号
+  - 顶部菜单栏新增Q群跳转，改名 帮助  
+
 
 </details>
 

diff --git a/UI_main.py b/UI_main.py
@@ -86,7 +86,7 @@ def setupUi(self, MainWindow):
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, -3421, 984, 9724))
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 984, 9724))
         self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
         self.verticalLayout.setContentsMargins(35, 20, 35, 20)
@@ -1839,10 +1839,17 @@ def setupUi(self, MainWindow):
         self.action_online_doc.setObjectName("action_online_doc")
         self.action_about = QtWidgets.QAction(MainWindow)
         self.action_about.setObjectName("action_about")
+        self.action_tip1 = QtWidgets.QAction(MainWindow)
+        self.action_tip1.setObjectName("action_tip1")
+        self.action_official_qq_group = QtWidgets.QAction(MainWindow)
+        self.action_official_qq_group.setObjectName("action_official_qq_group")
         self.menu_about.addAction(self.action_official_store)
         self.menu_about.addAction(self.action_video_tutorials)
         self.menu_about.addAction(self.action_online_doc)
         self.menu_about.addAction(self.action_about)
+        self.menu_about.addSeparator()
+        self.menu_about.addAction(self.action_tip1)
+        self.menu_about.addAction(self.action_official_qq_group)
         self.menu.addAction(self.action_exit)
         self.menubar.addAction(self.menu.menuAction())
         self.menubar.addAction(self.menu_about.menuAction())
@@ -2168,10 +2175,12 @@ def retranslateUi(self, MainWindow):
         self.pushButton_talk_chat_box_send.setText(_translate("MainWindow", "发送"))
         self.pushButton_factory.setText(_translate("MainWindow", "恢复出厂配置"))
         self.pushButton_talk_page.setText(_translate("MainWindow", "④聊天页"))
-        self.menu_about.setTitle(_translate("MainWindow", "关于"))
+        self.menu_about.setTitle(_translate("MainWindow", "帮助"))
         self.menu.setTitle(_translate("MainWindow", "文件"))
         self.action_official_store.setText(_translate("MainWindow", "官方仓库"))
         self.action_video_tutorials.setText(_translate("MainWindow", "视频教程"))
         self.action_exit.setText(_translate("MainWindow", "退出"))
         self.action_online_doc.setText(_translate("MainWindow", "在线文档"))
         self.action_about.setText(_translate("MainWindow", "关于"))
+        self.action_tip1.setText(_translate("MainWindow", "本软件完全免费"))
+        self.action_official_qq_group.setText(_translate("MainWindow", "官方Q群：587663288"))
diff --git a/main.py b/main.py
@@ -1897,6 +1897,7 @@ def init_ui(self):
         self.ui.action_online_doc.triggered.connect(self.openBrowser_online_doc)
         self.ui.action_about.triggered.connect(self.alert_about)
         self.ui.action_exit.triggered.connect(self.exit_soft)
+        self.ui.action_official_qq_group.triggered.connect(self.openBrowser_official_qq_group)
 
         # 创建节流函数，并将其保存为类的属性，delay秒内只执行一次
         self.throttled_save = self.throttle(self.save, 1)
@@ -3115,6 +3116,11 @@ def openBrowser_online_doc(self):
         url = QUrl("http://ikaros521.eu.org/AI-Vtuber")  # 指定要打开的网页地址
         QDesktopServices.openUrl(url)
 
+    # 跳转到官方Q群
+    def openBrowser_official_qq_group(self):
+        url = QUrl("https://qm.qq.com/cgi-bin/qm/qr?k=sYTkGUFactreB4MJZx-aPeWvYtpWaJYG&jump_from=webapi&authKey=NVHJc5hDHOk0ynysKZ8BqIpnLxYfsJWnCb0vH02xBwE2BYP8UPSce7qJ4EPa6wGu")  # 指定要打开的网页地址
+        QDesktopServices.openUrl(url)
+
     # 弹出关于窗口
     def alert_about(self):
         about_str = """

diff --git a/ui/main.ui b/ui/main.ui
@@ -136,7 +136,7 @@ background-color: rgba(255, 255, 255, 50);
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-3421</y>
+             <y>0</y>
              <width>984</width>
              <height>9724</height>
             </rect>
@@ -3299,12 +3299,15 @@ font: 75 12pt &quot;微软雅黑&quot;;</string>
    </property>
    <widget class="QMenu" name="menu_about">
     <property name="title">
-     <string>关于</string>
+     <string>帮助</string>
     </property>
     <addaction name="action_official_store"/>
     <addaction name="action_video_tutorials"/>
     <addaction name="action_online_doc"/>
     <addaction name="action_about"/>
+    <addaction name="separator"/>
+    <addaction name="action_tip1"/>
+    <addaction name="action_official_qq_group"/>
    </widget>
    <widget class="QMenu" name="menu">
     <property name="title">
@@ -3341,6 +3344,16 @@ font: 75 12pt &quot;微软雅黑&quot;;</string>
     <string>关于</string>
    </property>
   </action>
+  <action name="action_tip1">
+   <property name="text">
+    <string>本软件完全免费</string>
+   </property>
+  </action>
+  <action name="action_official_qq_group">
+   <property name="text">
+    <string>官方Q群：587663288</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>