Merge branch 'master' into dev

Author: eee555

src/ui/ui_main_board.py

@@ -402,21 +402,13 @@ def setupUi(self, MainWindow):
         self.actionauto_update.setObjectName("actionauto_update")
         self.action_open_folder = QtWidgets.QAction(MainWindow)
         self.action_open_folder.setObjectName("action_open_folder")
-        self.actionchajian = QtWidgets.QAction(MainWindow)
+        self.actionlu = QtWidgets.QAction(MainWindow)
         font = QtGui.QFont()
         font.setFamily("微软雅黑")
         font.setPointSize(12)
-        font.setBold(False)
-        font.setWeight(50)
-        self.actionchajian.setFont(font)
-        self.actionchajian.setObjectName("actionchajian")
-        self.action_open_replay = QtWidgets.QAction(MainWindow)
-        font = QtGui.QFont()
-        font.setFamily("微软雅黑")
-        font.setPointSize(12)
-        self.action_open_replay.setFont(font)
-        self.action_open_replay.setMenuRole(QtWidgets.QAction.TextHeuristicRole)
-        self.action_open_replay.setObjectName("action_open_replay")
+        self.actionlu.setFont(font)
+        self.actionlu.setMenuRole(QtWidgets.QAction.TextHeuristicRole)
+        self.actionlu.setObjectName("actionlu")
         self.actionddd = QtWidgets.QAction(MainWindow)
         font = QtGui.QFont()
         font.setFamily("微软雅黑")
@@ -446,8 +438,7 @@ def setupUi(self, MainWindow):
         self.menu_2.addAction(self.language_menu.menuAction())
         self.menu_3.addAction(self.actiongaun_yv)
         self.menu_3.addAction(self.actionauto_update)
-        self.menu_3.addAction(self.actionchajian)
-        self.menu_4.addAction(self.action_open_replay)
+        self.menu_4.addAction(self.actionlu)
         self.menu_4.addAction(self.actionddd)
         self.menubar.addAction(self.menu.menuAction())
         self.menubar.addAction(self.menu_2.menuAction())
@@ -481,8 +472,7 @@ def retranslateUi(self, MainWindow):
         self.actionauto_update.setText(_translate("MainWindow", "检查更新"))
         self.action_open_folder.setText(_translate("MainWindow", "录像位置"))
         self.action_open_folder.setShortcut(_translate("MainWindow", "W"))
-        self.actionchajian.setText(_translate("MainWindow", "插件"))
-        self.action_open_replay.setText(_translate("MainWindow", "录像所在位置"))
+        self.actionlu.setText(_translate("MainWindow", "录像所在位置"))
         self.actionddd.setText(_translate("MainWindow", "设置所在位置"))
 from ui.mineLabel import mineLabel
 from ui.mineNumLabel import mineNumLabel

uiFiles/main_board.ui

@@ -693,6 +693,19 @@
     <addaction name="action_open_replay"/>
     <addaction name="actionddd"/>
    </widget>
+   <widget class="QMenu" name="menu_4">
+    <property name="contextMenuPolicy">
+     <enum>Qt::DefaultContextMenu</enum>
+    </property>
+    <property name="tearOffEnabled">
+     <bool>false</bool>
+    </property>
+    <property name="title">
+     <string>查看</string>
+    </property>
+    <addaction name="action_open_replay"/>
+    <addaction name="actionddd"/>
+   </widget>
    <addaction name="menu"/>
    <addaction name="menu_2"/>
    <addaction name="menu_4"/>
@@ -1000,20 +1013,6 @@
     <string>W</string>
    </property>
   </action>
-  <action name="actionchajian">
-   <property name="text">
-    <string>插件</string>
-   </property>
-   <property name="font">
-    <font>
-     <family>微软雅黑</family>
-     <pointsize>12</pointsize>
-     <weight>50</weight>
-     <bold>false</bold>
-    </font>
-   </property>
-  </action>
-
   <action name="action_open_replay">
    <property name="text">
     <string>录像所在位置</string>
@@ -1028,7 +1027,6 @@
     <enum>QAction::TextHeuristicRole</enum>
    </property>
   </action>
-
   <action name="actionddd">
    <property name="text">
     <string>设置所在位置</string>