Merge branch 'master' into feat_1

main_window.ui

@@ -514,6 +514,7 @@ QPushButton:pressed {
     <addaction name="action_open_project"/>
     <addaction name="separator"/>
     <addaction name="import_movie"/>
+    <addaction name="action_export"/>
     <addaction name="separator"/>
     <addaction name="action_save"/>
    </widget>
@@ -525,6 +526,7 @@ QPushButton:pressed {
     <addaction name="action_redo"/>
     <addaction name="action_view_history"/>
     <addaction name="separator"/>
+    <addaction name="action_insert_aside_from_now"/>
     <addaction name="action_operate"/>
    </widget>
    <widget class="QMenu" name="menu_3">
@@ -601,6 +603,16 @@ QPushButton:pressed {
     <string>操作表格</string>
    </property>
   </action>
+  <action name="action_export">
+   <property name="text">
+    <string>导出</string>
+   </property>
+  </action>
+  <action name="action_insert_aside_from_now">
+   <property name="text">
+    <string>当前位置插入旁白</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

main_window_ui.py

@@ -300,16 +300,22 @@ class Ui_MainWindow(object):
         self.action_refresh_tab.setObjectName("action_refresh_tab")
         self.action_operate = QtWidgets.QAction(MainWindow)
         self.action_operate.setObjectName("action_operate")
+        self.action_export = QtWidgets.QAction(MainWindow)
+        self.action_export.setObjectName("action_export")
+        self.action_insert_aside_from_now = QtWidgets.QAction(MainWindow)
+        self.action_insert_aside_from_now.setObjectName("action_insert_aside_from_now")
         self.menu.addAction(self.actionxinjian)
         self.menu.addAction(self.action_open_project)
         self.menu.addSeparator()
         self.menu.addAction(self.import_movie)
+        self.menu.addAction(self.action_export)
         self.menu.addSeparator()
         self.menu.addAction(self.action_save)
         self.menu_2.addAction(self.action_undo)
         self.menu_2.addAction(self.action_redo)
         self.menu_2.addAction(self.action_view_history)
         self.menu_2.addSeparator()
+        self.menu_2.addAction(self.action_insert_aside_from_now)
         self.menu_2.addAction(self.action_operate)
         self.menu_3.addAction(self.actiona_3)
         self.menu_3.addAction(self.actiona_4)
@@ -352,6 +358,8 @@ class Ui_MainWindow(object):
         self.action_view_history.setText(_translate("MainWindow", "----"))
         self.action_refresh_tab.setText(_translate("MainWindow", "刷新且保存表格"))
         self.action_operate.setText(_translate("MainWindow", "操作表格"))
+        self.action_export.setText(_translate("MainWindow", "导出"))
+        self.action_insert_aside_from_now.setText(_translate("MainWindow", "当前位置插入旁白"))
 
 
 from myVideoWidget import myVideoWidget