소스 검색

Preferences 窗口按 reset 恢复默认设置
新增状态栏 stage 信息

mrh 2 년 전
부모
커밋
bc30c9cfd6
4개의 변경된 파일28개의 추가작업 그리고 13개의 파일을 삭제
  1. 6 1
      GuiShell.py
  2. 1 0
      gui.py
  3. 7 9
      main_windows.py
  4. 14 3
      ui/Preferences.py

+ 6 - 1
GuiShell.py

@@ -101,7 +101,12 @@ class _GuiMain():
             print("Allow BlackBox")
         else:
             print("Do Not Allow BlackBox")
-        time.sleep(1)
+        time.sleep(0.5)
+        self._stage = "elaborating"
+        gui.signale("Stage")
+        time.sleep(0.5)
+        self._stage = "elaborated"
+        gui.signale("Stage")
         self.Title = "NeoConstraint - "+top
         # self.SideBar = _GuiSideBar("Hierarchy", _GuiTree(["", "DFFs", "SubModules"], [_GuiTreeRow([_GuiTreeRow([], "SubDesign1", [
         #                             "12", "0"]), _GuiTreeRow([_GuiTreeRow([], "Sub3", ["5", "0"])], "SubDesign2", ["34", "1"])], "DemoDesign", ["123", "2"]),]))

+ 1 - 0
gui.py

@@ -52,6 +52,7 @@ def handle_signal(dat):
         sig_call = {'start':mainWindows.show, 'stop':mainWindows.hide, 'exit':mainWindows.close,
                     'busy': mainWindows.busy, 
                     "ready": mainWindows.ready, 
+                    "stage": mainWindows.stage,
                     }
         call = sig_call.get(dat)
         if call:

+ 7 - 9
main_windows.py

@@ -108,8 +108,8 @@ class MainWindow(Ui_MainWindow, QMainWindow):
         self.MessageTreeView.customContextMenuRequested.connect(self.message_right_click_menu)
         self.status_label = QLabel("Ready")
         self.statusbar.addWidget(self.status_label)
-        self.loader = QUiLoader()
-        
+        self.stage_label = QLabel()
+        self.statusbar.addPermanentWidget(self.stage_label)
         
         # -- MENUE --
         # file
@@ -334,13 +334,7 @@ class MainWindow(Ui_MainWindow, QMainWindow):
     def reload_design(self):
         thread = threading.Thread(target=self.GUI.ReloadDesign)
         thread.start()
-
-    def add_sub_win(self):
-        print('add sub')
-        self.t = self.loader.load("ui/TimingAnalyze.ui")
-        self.mdiArea.addSubWindow(self.t)
-        self.t.show()
-
+        
     def busy(self):
         self.status_label.setText("Busy")
         self.setCursor(Qt.WaitCursor)
@@ -348,4 +342,8 @@ class MainWindow(Ui_MainWindow, QMainWindow):
     def ready(self):
         self.status_label.setText("Ready")
         self.setCursor(Qt.ArrowCursor)
+    
+    def stage(self):
+        print(self.GUI._stage)
+        self.stage_label.setText(self.GUI._stage)
         

+ 14 - 3
ui/Preferences.py

@@ -19,14 +19,17 @@ class PreferencesWindows(Ui_Preferences, QDialog):
         self.mainWindow = mainWindow
         self.btn_ok.clicked.connect(self.ok)
         self.btn_apply.clicked.connect(self.apply)
-        self.btn_reset.clicked.connect(self.mainWindow.GUI.ViewGetDefault)
+        self.btn_reset.clicked.connect(self.reset)
         self.btn_save.clicked.connect(self.view_save)
+        self.font_family.addItems(QFontDatabase().families())
+        self.sys_font_family.addItems(QFontDatabase().families())
         text_font_size, text_font_family, sys_font_size, sys_font_family = get_font_size(mainWindow)
+        self.set_font_widget_info(text_font_size, text_font_family, sys_font_size, sys_font_family)
+    
+    def set_font_widget_info(self, text_font_size, text_font_family, sys_font_size, sys_font_family):
         self.font_size.setValue(text_font_size)
-        self.font_family.addItems(QFontDatabase().families())
         self.font_family.setCurrentText(text_font_family)
         self.sys_font_size.setValue(sys_font_size)
-        self.sys_font_family.addItems(QFontDatabase().families())
         self.sys_font_family.setCurrentText(sys_font_family)
         
     def change_list_widget(self, item:QListWidgetItem):
@@ -48,6 +51,14 @@ class PreferencesWindows(Ui_Preferences, QDialog):
         sys_font_family = self.sys_font_family.currentText()
         self.mainWindow.GUI.ViewSetDefault(text_font_size, text_font_family,sys_font_size,sys_font_family)
     
+    def reset(self):
+        self.mainWindow.GUI.ViewGetDefault()
+        self.set_font_widget_info(
+            self.mainWindow.GUI.TextFontSize,
+            self.mainWindow.GUI.TextFont,
+            self.mainWindow.GUI.SysFontSize,
+            self.mainWindow.GUI.SysFont)
+    
     def apply(self):
         self.view_set()