实现 菜单栏 - save as default

解决 ReportClocks 窗口传参不全
创建子窗口时，使主窗口变灰，解决在另一台计算机上子窗口无法置顶
Hierarchy点右上角的关闭后，View - SideBar的勾同步取消勾选

main_windows.py

@@ -126,7 +126,7 @@ class MainWindow(Ui_MainWindow, QMainWindow):
         self.actionSidebar.triggered.connect(lambda: self.sub_win.side_bar.mdisubwin.setHidden(not self.actionSidebar.isChecked()))
         self.actionConsole.triggered.connect(lambda: self.tabWidget.setHidden(not self.actionConsole.isChecked()))
         self.actionStatusBar.triggered.connect(lambda: self.statusbar.setHidden(not self.actionStatusBar.isChecked()))
-        self.actionSave_as_Default
+        self.actionSave_as_Default.triggered.connect(self.action_save_as_default)
         self.actionPreferences.triggered.connect(self.preferences)
         # Design
         self.actionAnalyze.triggered.connect(self.show_analyze_window)
@@ -185,6 +185,10 @@ class MainWindow(Ui_MainWindow, QMainWindow):
             return
         widget.selectAll()
     
+    def action_save_as_default(self):
+        text_font_size, text_font_family, sys_font_size, sys_font_family = get_font_size(self)
+        self.GUI.ViewSetDefault(text_font_size, text_font_family,sys_font_size,sys_font_family)
+    
     def action_tab_widget(self):
         action_sender = self.sender()
         action = {

sub_windows.py

@@ -296,8 +296,13 @@ class SideBarWin(Ui_SideBar, MdiActionWindow):
     def closeEvent(self, event: QCloseEvent):
         event.ignore()
         self.mdisubwin.hide()
+        self.ui.actionSidebar.setChecked(False)
         self.menuWindow_action.setChecked(False)
     
+    def show(self):
+        self.ui.actionSidebar.setChecked(True)
+        return super().show()
+    
     def right_click_menu(self, pos):
         sender = self.sender()
         pop_menu  = QMenu()

ui/AddFile.py

@@ -46,7 +46,7 @@ class FileCategory:
 class AddPathWindow(Ui_AddPathWindow, QDialog):
     add_file_sig = Signal(str,str)
     def __init__(self, parent, path) -> None:
-        super().__init__()
+        super().__init__(parent)
         self.setupUi(self)
         self.setWindowTitle("Add Path")
         self.file_suffix = ["All Directories(*.*)"]

ui/ReportClocks.py

@@ -6,7 +6,7 @@ from ui.ui_ReportClocks import Ui_ReportClocks
 
 class ReportClocks(Ui_ReportClocks, QDialog):
     def __init__(self, mainWindow) -> None:
-        super().__init__()
+        super().__init__(mainWindow)
         self.setupUi(self)
         self.btn_ok.clicked.connect(self.report_clocks)
         self.mainWindow = mainWindow

ui/ReportClocks.ui

@@ -34,7 +34,7 @@
        <item>
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="1" column="0">
-          <widget class="QLabel" name="end_point">
+          <widget class="QLabel" name="label_end_point">
            <property name="text">
             <string>Endpoint Clocks</string>
            </property>
@@ -48,7 +48,7 @@
           </widget>
          </item>
          <item row="2" column="0">
-          <widget class="QLabel" name="exclude">
+          <widget class="QLabel" name="label_exclude">
            <property name="text">
             <string>Exclude Clocks</string>
            </property>
@@ -58,10 +58,10 @@
           <widget class="QLineEdit" name="start_point"/>
          </item>
          <item row="1" column="1">
-          <widget class="QLineEdit" name="lineEdit_2"/>
+          <widget class="QLineEdit" name="end_point"/>
          </item>
          <item row="2" column="1">
-          <widget class="QLineEdit" name="lineEdit_3"/>
+          <widget class="QLineEdit" name="exclude"/>
          </item>
         </layout>
        </item>

ui/ReportVirtualTiming.py

@@ -6,7 +6,7 @@ from ui.ui_ReportVirtualTiming import Ui_ReportVirtualTiming
 
 class ReportVirtualTiming(Ui_ReportVirtualTiming, QDialog):
     def __init__(self, mainWindow) -> None:
-        super().__init__(mainWindow)
+        super().__init__(mainWindow, Qt.WindowStaysOnTopHint)
         self.setupUi(self)
         self.lineEdit_endpoint.setValidator(QRegExpValidator(QRegExp("[0-9]+$")))
         self.lineEdit_endpoint.setPlaceholderText("please enter a number")

ui/ui_ReportClocks.py

@@ -33,35 +33,35 @@ class Ui_ReportClocks(object):
 
         self.gridLayout_2 = QGridLayout()
         self.gridLayout_2.setObjectName(u"gridLayout_2")
-        self.end_point = QLabel(ReportClocks)
-        self.end_point.setObjectName(u"end_point")
+        self.label_end_point = QLabel(ReportClocks)
+        self.label_end_point.setObjectName(u"label_end_point")
 
-        self.gridLayout_2.addWidget(self.end_point, 1, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_end_point, 1, 0, 1, 1)
 
         self.label = QLabel(ReportClocks)
         self.label.setObjectName(u"label")
 
         self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1)
 
-        self.exclude = QLabel(ReportClocks)
-        self.exclude.setObjectName(u"exclude")
+        self.label_exclude = QLabel(ReportClocks)
+        self.label_exclude.setObjectName(u"label_exclude")
 
-        self.gridLayout_2.addWidget(self.exclude, 2, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_exclude, 2, 0, 1, 1)
 
         self.start_point = QLineEdit(ReportClocks)
         self.start_point.setObjectName(u"start_point")
 
         self.gridLayout_2.addWidget(self.start_point, 0, 1, 1, 1)
 
-        self.lineEdit_2 = QLineEdit(ReportClocks)
-        self.lineEdit_2.setObjectName(u"lineEdit_2")
+        self.end_point = QLineEdit(ReportClocks)
+        self.end_point.setObjectName(u"end_point")
 
-        self.gridLayout_2.addWidget(self.lineEdit_2, 1, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.end_point, 1, 1, 1, 1)
 
-        self.lineEdit_3 = QLineEdit(ReportClocks)
-        self.lineEdit_3.setObjectName(u"lineEdit_3")
+        self.exclude = QLineEdit(ReportClocks)
+        self.exclude.setObjectName(u"exclude")
 
-        self.gridLayout_2.addWidget(self.lineEdit_3, 2, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.exclude, 2, 1, 1, 1)
 
 
         self.horizontalLayout.addLayout(self.gridLayout_2)
@@ -133,9 +133,9 @@ class Ui_ReportClocks(object):
 
     def retranslateUi(self, ReportClocks):
         ReportClocks.setWindowTitle(QCoreApplication.translate("ReportClocks", u"ReportClocks", None))
-        self.end_point.setText(QCoreApplication.translate("ReportClocks", u"Endpoint Clocks", None))
+        self.label_end_point.setText(QCoreApplication.translate("ReportClocks", u"Endpoint Clocks", None))
         self.label.setText(QCoreApplication.translate("ReportClocks", u"Startpoint Clocks", None))
-        self.exclude.setText(QCoreApplication.translate("ReportClocks", u"Exclude Clocks", None))
+        self.label_exclude.setText(QCoreApplication.translate("ReportClocks", u"Exclude Clocks", None))
         self.auto_include.setText(QCoreApplication.translate("ReportClocks", u"Auto Include Generated Clocks", None))
         self.include_ascync.setText(QCoreApplication.translate("ReportClocks", u"Include Asynchronous Clock Relations", None))
         self.btn_ok.setText(QCoreApplication.translate("ReportClocks", u"OK", None))