use frameless windows

CheshireCC · Dec 26, 2023 · 1e9fd1a · 1e9fd1a
1 parent 12daf5e
commit 1e9fd1a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/fasterWhisperGUIConfig.json b/fasterWhisperGUIConfig.json
@@ -67,8 +67,8 @@
         "tabShadowEnabled": false,
         "tabMaxWidth": 326,
         "closeDisplayMode": 0,
-        "whisperXMinSpeaker": 1,
-        "whisperXMaxSpeaker": 1,
+        "whisperXMinSpeaker": 0,
+        "whisperXMaxSpeaker": 0,
         "outputFormat": 0,
         "outputEncoding": 1
     }

diff --git a/faster_whisper_GUI/UI_MainWindows.py b/faster_whisper_GUI/UI_MainWindows.py
@@ -5,20 +5,20 @@
 # from pathlib import Path
 
 from PySide6.QtCore import  ( 
-                                # Qt,
                                 QCoreApplication,
-                                QTranslator
+                                QTranslator,
+                                Qt
                             )
 
 from PySide6.QtWidgets import  (
                                 # QSpacerItem,
-                                QApplication,
+                                # QApplication,
                                 QWidget
                                 , QStackedWidget
                                 , QVBoxLayout
                                 , QHBoxLayout
                                 , QGridLayout
-                                , QMainWindow
+                                # , QMainWindow
                             )
 
 from PySide6.QtGui import QIcon
@@ -33,10 +33,10 @@
 
                         )
 
-# from qframelesswindow import (
-#                                 FramelessMainWindow 
-#                                 , StandardTitleBar
-#                             )
+from qframelesswindow import (
+                                FramelessMainWindow 
+                                , StandardTitleBar
+                            )
 
 from .config import (Language_dict
                     , Preciese_list
@@ -71,7 +71,7 @@
 # =======================================================================================
 # UI
 # =======================================================================================
-class UIMainWin(QMainWindow):
+class UIMainWin(FramelessMainWindow):
     """V"""
 
     def tr(self, text):
@@ -197,11 +197,11 @@ def initWin(self):
         StyleSheet.MAIN_WINDOWS.apply(self)
 
         # self.resize(800, 500)
-        self.setGeometry(500, 200, 1250, 825)
+        self.setGeometry(100, 100, 1250, 825)
 
         # TODO: 添加标题栏 
-        # self.setTitleBar(StandardTitleBar(self))
-        # self.titleBar.setAttribute(Qt.WA_StyledBackground)
+        self.setTitleBar(StandardTitleBar(self))
+        self.titleBar.setAttribute(Qt.WA_StyledBackground)
 
         self.setWindowTitle(f"FasterWhisperGUI-{__version__}--fw-{__FasterWhisper_version__}--WhisperX-{__WhisperX_version__}")
 

diff --git a/faster_whisper_GUI/modelLoad.py b/faster_whisper_GUI/modelLoad.py
@@ -67,8 +67,11 @@ def loadModel(self,model_size_or_path:str=None):
 
         model = None
         try:
+            if model_size_or_path is None:
+                model_size_or_path = self.model_size_or_path
+
             model = WhisperModel(
-                                    self.model_size_or_path, 
+                                    model_size_or_path, 
                                     device=self.device, 
                                     device_index=self.device_index,
                                     compute_type=self.compute_type,
@@ -99,4 +102,5 @@ def loadModel(self,model_size_or_path:str=None):
 
         self.setStatusSignal.emit(True)
 
-        return model
+        return model
+