remove pb zm

constant.py

@@ -12,12 +12,16 @@ import os
 
 class Content:
     StartTimeColumn = 0
-    AsideColumnNumber = 2
-    SpeedColumnNumber = 3
-    ActivateColumns = [2, 3]
+    AsideColumnNumber = 4
+    SpeedColumnNumber = 5
+    # ActivateColumns = [2, 3]
+    ActivateColumns = [4,5]
     # ColumnCount = 3
     ObjectName = "all_tableWidget"
-    TimeFormatColumns = [0]
+    # TimeFormatColumns = [0]
+    TimeFormatColumns = [0, 1]
+    SpeedList = ["1.00(4字/秒)", "1.10(4.5字/秒)", "1.25(5字/秒)",
+                 "1.50(6字/秒)", "1.75(7字/秒)", "2.00(8字/秒)", "2.50(10字/秒)"]
 
 
 class Aside:

create_dialog_ui.py

@@ -24,17 +24,20 @@ class Ui_Dialog(object):
         self.name_input.setObjectName("name_input")
         self.root_input = QtWidgets.QLineEdit(Dialog)
         self.root_input.setObjectName("root_input")
-        self.gridLayout.addWidget(self.root_input, 1, 1, 1, 1)
+        self.gridLayout.addWidget(self.root_input, 0, 1, 1, 1)
         self.get_dir = QtWidgets.QPushButton(Dialog)
         self.get_dir.setObjectName("get_dir")
-        self.gridLayout.addWidget(self.get_dir, 1, 2, 1, 1)
+        self.gridLayout.addWidget(self.get_dir, 0, 2, 1, 1)
+
         self.rootLabel = QtWidgets.QLabel(Dialog)
         self.rootLabel.setObjectName("rootLabel")
-        self.gridLayout.addWidget(self.rootLabel, 1, 0, 1, 1)
+        self.gridLayout.addWidget(self.rootLabel, 0, 0, 1, 1)
+
         self.nameLabel = QtWidgets.QLabel(Dialog)
         self.nameLabel.setObjectName("nameLabel")
-        self.gridLayout.addWidget(self.nameLabel, 0, 0, 1, 1)
-        self.gridLayout.addWidget(self.name_input, 0, 1, 1, 1)
+        self.gridLayout.addWidget(self.nameLabel, 1, 0, 1, 1)
+
+        self.gridLayout.addWidget(self.name_input, 1, 1, 1, 1)
         self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
@@ -64,7 +67,7 @@ class Ui_Dialog(object):
         _translate = QtCore.QCoreApplication.translate
         Dialog.setWindowTitle(_translate("Dialog", "Dialog"))
         self.nameLabel.setText(_translate("Dialog", "工程名称"))
-        self.rootLabel.setText(_translate("Dialog", "工程文件夹"))
+        self.rootLabel.setText(_translate("Dialog", "目标路径"))
         self.get_dir.setText(_translate("Dialog", "打开文件夹"))
         self.confirm.setText(_translate("Dialog", "确认"))
         self.cancel.setText(_translate("Dialog", "取消"))

main_window_ui.py

@@ -225,7 +225,7 @@ class Ui_MainWindow(object):
         self.zm_tableWidget.setRowCount(0)
         self.zm_tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.horizontalLayout_2.addWidget(self.zm_tableWidget)
-        self.tabWidget.addTab(self.zm_tab, "")
+        # self.tabWidget.addTab(self.zm_tab, "")
         self.pb_tab = QtWidgets.QWidget()
         self.pb_tab.setObjectName("pb_tab")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.pb_tab)
@@ -236,7 +236,7 @@ class Ui_MainWindow(object):
         self.pb_tableWidget.setRowCount(0)
         self.pb_tableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.horizontalLayout_3.addWidget(self.pb_tableWidget)
-        self.tabWidget.addTab(self.pb_tab, "")
+        # self.tabWidget.addTab(self.pb_tab, "")
         self.shuiping.addWidget(self.tabWidget)
         self.shuiping.setStretch(0, 3)
         self.shuiping.setStretch(1, 5)

management.py

@@ -96,7 +96,8 @@ class Element:
     def to_list(self):
         return [self.st_time_sec, self.ed_time_sec, self.subtitle, self.suggest, self.aside, self.speed]
     def to_short_list(self):
-        return [self.st_time_sec, self.subtitle, self.aside, self.speed]
+        # return [self.st_time_sec, self.subtitle, self.aside, self.speed]
+        return [self.st_time_sec, self.ed_time_sec, self.subtitle, self.suggest, self.aside, self.speed]
     def to_aside_list(self):
         # return [self.st_time_sec, self.ed_time_sec, self.suggest, self.aside, self.speed]
         return [self.st_time_sec, self.suggest, self.aside, self.speed]
@@ -128,7 +129,8 @@ class ProjectContext:
         self.aside_header = ['起始时间', '推荐字数', '解说脚本',"语速", "预览音频"]
         self.subtitle_header = ["起始时间", "终止时间", "字幕"]
 
-        self.contentHeader = ["起始时间", "字幕", "解说脚本", "语速"]
+        # self.contentHeader = ["起始时间", "字幕", "解说脚本", "语速"]
+        self.contentHeader = ["起始时间", "结束时间", "字幕", "推荐字数", "解说脚本", "语速", "预览音频"]
         self.excel_sheet_name = "旁白插入位置建议"
         self.history_records = []
         self.records_pos = 0
@@ -254,6 +256,11 @@ class ProjectContext:
         if not self.initial_ing:
             save_excel_to_path(self.all_elements, self.excel_path, self.write_header, self.excel_sheet_name)
 
+    def refresh_speed(self, row, speed: str)->None:
+        self.all_elements[int(row)].speed = speed
+        if not self.initial_ing:
+            save_excel_to_path(self.all_elements, self.excel_path, self.write_header, self.excel_sheet_name)
+
     # 加载整个工程，填充到ProjectContext上下文中
     def load_project(self):
         pass

start.py

@@ -8,7 +8,6 @@ from PyQt5.QtWidgets import *;
 from main_window import MainWindow
 from qt_material import apply_stylesheet
 import os
-import subprocess
 os.environ['PYQTGRAPH_QT_LIB'] = 'PyQt5'
 
 project_path = None
@@ -23,7 +22,6 @@ def change_project_path(path):
 
 if __name__ == '__main__':
     try:
-        subprocess.call(['deploy.bat'])
         QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
         QCoreApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
         currentExitCode = MainWindow.EXIT_CODE_REBOOT