feat：evfs施工中

Author: eee555

src/mineSweeperGUI.py

@@ -32,17 +32,12 @@ class MineSweeperGUI(MineSweeperVideoPlayer):
     def __init__(self, MainWindow: MainWindow, args):
         self.mainWindow = MainWindow
         self.checksum_guard = metaminesweeper_checksum.ChecksumGuard()
-
         super(MineSweeperGUI, self).__init__(MainWindow, args)
 
-        # MineSweeperGUI父类的init中读.ini、读图片、设置字体、局面初始化等
-
         self.time_10ms: int = 0  # 已毫秒为单位的游戏时间，全局统一的
         self.showTime(self.time_10ms // 100)
-        
-        self.initVideoPlayer()
-        
-        
+
+
         self.timer_10ms = QTimer()
         self.timer_10ms.setInterval(10)  # 10毫秒回调一次的定时器
         self.timer_10ms.timeout.connect(self.timeCount)

src/mineSweeperVideoPlayer.py

@@ -7,9 +7,11 @@
 import  videoControl
 import ms_toollib as ms
 from mineSweeperGUIEvent import MineSweeperGUIEvent
+from mainWindowGUI import MainWindow
 
 class MineSweeperVideoPlayer(MineSweeperGUIEvent):
-    def initVideoPlayer(self):
+    def __init__(self, MainWindow: MainWindow, args):
+        super(MineSweeperVideoPlayer, self).__init__(MainWindow, args)
         self.ui_video_control = videoControl.ui_Form(self.r_path, self.game_setting,
                                                      self.mainWindow)
         self.video_time_step = 0.01  # 录像时间的步长，定时器始终是10毫秒
@@ -20,18 +22,13 @@ def initVideoPlayer(self):
         self.ui_video_control.videoSetTime.connect(self.video_set_time)
         self.ui_video_control.videoSetTimePeriod.connect(self.video_set_a_time)
         self.ui_video_control.label_speed.wEvent.connect(self.video_set_speed)
-        self.ui_video_control.tabWidget.currentChanged.connect(self.on_tab_changed)
+        self.ui_video_control.tabWidget.tabBar().tabBarClicked.connect(self.on_tab_clicked)
         self.timer_video = QTimer()
         self.timer_video.timeout.connect(self.video_playing_step)
 
 
     # 打开录像文件的回调
     def action_OpenFile(self, openfile_name=None):
-        # self.setting_path / 'replay'
-        
-        # self.ui_video_control = videoControl.ui_Form(self.r_path, self.game_setting,
-        #                                              self.mainWindow)
-        
         self.unlimit_cursor()
         if not openfile_name:
             openfile_name = QFileDialog.\
@@ -88,17 +85,15 @@ def action_OpenFile(self, openfile_name=None):
                                         "super_fl_local"])
             self.ui_video_control.add_new_video_tab(video)
             # self.tab_data.append(video)
+        tab_count = self.ui_video_control.tabWidget.count()
+        self.ui_video_control.tabWidget.setCurrentIndex(tab_count - 1)
         self.play_video(video)
 
 
     # 播放新录像，调整局面尺寸等
     # 控制台中，不添加新标签、连接信号。假如关闭就展示
     # 播放AvfVideo、RmvVideo、EvfVideo、MvfVideo或BaseVideo
     def play_video(self, video, new_tab=False):
-        # if self.game_state == 'display':
-        #     self.ui_video_control.QWidget.close()
-        # self.game_state = 'display'
-        
         if self.game_state != 'display':
             self.game_state = 'display'
         self.video_playing = False
@@ -185,7 +180,7 @@ def play_video(self, video, new_tab=False):
 
 
     # 切换标签时，播放标签中的录像
-    def on_tab_changed(self, idt):
+    def on_tab_clicked(self, idt):
         if isinstance(self.ui_video_control.tabWidget.widget(idt), videoControl.VideoTabWidget):
             self.play_video(self.ui_video_control.tabWidget.widget(idt).video)
         ...

src/ui/ui_video_control.py

@@ -145,6 +145,7 @@ def setupUi(self, Form):
         font.setItalic(False)
         font.setWeight(50)
         self.doubleSpinBox_time.setFont(font)
+        self.doubleSpinBox_time.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
         self.doubleSpinBox_time.setStyleSheet("font: 20pt \"微软雅黑\";\n"
 "color: #50A6EA;\n"
 "background-color: rgb(240, 240, 240);")
@@ -159,6 +160,7 @@ def setupUi(self, Form):
         self.horizontalLayout.addWidget(self.doubleSpinBox_time)
         self.verticalLayout.addWidget(self.widget)
         self.tabWidget = QtWidgets.QTabWidget(Form)
+        self.tabWidget.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
         self.tabWidget.setStyleSheet("QTabWidget::pane { margin: 0px; border: 0px; }\n"
 "")
         self.tabWidget.setTabsClosable(True)

src/videoControl.py

@@ -1,7 +1,7 @@
 from ui.uiComponents import RoundQWidget
 from ui.ui_video_control import Ui_Form
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QScrollArea, QLabel, QCheckBox,\
-    QSizePolicy, QHBoxLayout
+    QSizePolicy, QHBoxLayout, QMenu, QAction, QMessageBox
 from PyQt5.QtCore import Qt, QRect, QSize, pyqtSignal
 from PyQt5.QtGui import QFont
 from PyQt5 import QtCore, QtGui
@@ -397,8 +397,6 @@ def __init__(self, r_path, game_setting, parent):
         self.QWidget.move(game_setting.value("DEFAULT/videocontroltop", 100, int),
                           game_setting.value("DEFAULT/videocontrolleft", 300, int))
         self.tabWidget.tabCloseRequested.connect(self.close_tab)
-        # 所有录像数据，打开、关闭标签时维护。包含录像和录像集
-        # self.videos = []
 
 
     def add_new_video_tab(self, video):

uiFiles/ui_video_control.ui

@@ -278,6 +278,9 @@ color: #50A6EA;}</string>
           <bold>false</bold>
          </font>
         </property>
+        <property name="contextMenuPolicy">
+         <enum>Qt::NoContextMenu</enum>
+        </property>
         <property name="styleSheet">
          <string notr="true">font: 20pt &quot;微软雅黑&quot;;
 color: #50A6EA;
@@ -311,6 +314,9 @@ background-color: rgb(240, 240, 240);</string>
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
+     <property name="contextMenuPolicy">
+      <enum>Qt::NoContextMenu</enum>
+     </property>
      <property name="styleSheet">
       <string notr="true">QTabWidget::pane { margin: 0px; border: 0px; }
 </string>