diff --git a/src/gui/ALAboutDialog.py b/src/gui/ALAboutDialog.py index aa60ae5..4ce7363 100644 --- a/src/gui/ALAboutDialog.py +++ b/src/gui/ALAboutDialog.py @@ -60,7 +60,7 @@ class ALAboutDialog(QDialog, Ui_ALAboutDialog): def generateAboutText( self - ): + ) -> str: os_info = self.getOSInfo() about_text = f""" diff --git a/src/gui/ALAboutDialog.ui b/src/gui/ALAboutDialog.ui index d030e9d..15afe83 100644 --- a/src/gui/ALAboutDialog.ui +++ b/src/gui/ALAboutDialog.ui @@ -104,7 +104,7 @@ 0 - + 56 diff --git a/src/gui/ALAddTimerTaskDialog.ui b/src/gui/ALAddTimerTaskDialog.ui index c0ef6db..3690f91 100644 --- a/src/gui/ALAddTimerTaskDialog.ui +++ b/src/gui/ALAddTimerTaskDialog.ui @@ -86,16 +86,16 @@ 5 - 5 + 3 - 5 + 3 - 5 + 3 - 5 + 3 @@ -135,16 +135,16 @@ - 5 + 3 - 5 + 3 - 5 + 3 - 5 + 3 5 diff --git a/src/gui/ALConfigWidget.ui b/src/gui/ALConfigWidget.ui index f6b9c2e..bd191df 100644 --- a/src/gui/ALConfigWidget.ui +++ b/src/gui/ALConfigWidget.ui @@ -94,19 +94,19 @@ - 0 + 5 - 5 + 3 - 5 + 3 - 5 + 3 - 5 + 3 @@ -178,6 +178,9 @@ + + 5 + @@ -309,7 +312,7 @@ - 0 + 5 @@ -546,7 +549,7 @@ - 0 + 5 @@ -703,7 +706,7 @@ - 0 + 5 @@ -899,7 +902,7 @@ - 0 + 5 @@ -1049,7 +1052,7 @@ - 0 + 5 @@ -1092,7 +1095,7 @@ - + 80 @@ -1153,10 +1156,10 @@ 3 - + 3 - + 5 @@ -1649,6 +1652,21 @@ 当前配置 + + 3 + + + 3 + + + 3 + + + 3 + + + 5 + @@ -1775,6 +1793,21 @@ 导出路径 + + 3 + + + 3 + + + 3 + + + 3 + + + 5 + diff --git a/src/gui/ALMainWindow.ui b/src/gui/ALMainWindow.ui index f9d7a7a..8a8a75c 100644 --- a/src/gui/ALMainWindow.ui +++ b/src/gui/ALMainWindow.ui @@ -34,13 +34,13 @@ 5 - 3 + 5 0 - 3 + 5 0 diff --git a/src/gui/ALSeatFrame.py b/src/gui/ALSeatFrame.py index 481b37b..a4dea55 100644 --- a/src/gui/ALSeatFrame.py +++ b/src/gui/ALSeatFrame.py @@ -28,7 +28,7 @@ class ALSeatFrame(QFrame): super().__init__(parent) self.__seat_number = seat_number self.__is_selected = False - + self.setupUi() def setupUi( @@ -49,9 +49,9 @@ class ALSeatFrame(QFrame): font-weight: bold; } """) - self.label = QLabel(self.__seat_number, self) - self.label.setAlignment(Qt.AlignCenter) - self.label.setGeometry(0, 0, 60, 40) + self.Label = QLabel(self.__seat_number, self) + self.Label.setAlignment(Qt.AlignCenter) + self.Label.setGeometry(0, 0, 60, 40) def mousePressEvent( self, diff --git a/src/gui/ALSeatMapWidget.py b/src/gui/ALSeatMapWidget.py index 1503b51..d83e3fd 100644 --- a/src/gui/ALSeatMapWidget.py +++ b/src/gui/ALSeatMapWidget.py @@ -67,6 +67,8 @@ class ALSeatMapWidget(QWidget): self.setWindowTitle(f"选择楼层座位 - AutoLibrary") self.SeatMapWidgetMainLayout = QVBoxLayout(self) + self.SeatMapWidgetMainLayout.setContentsMargins(5, 5, 5, 5) + self.SeatMapWidgetMainLayout.setSpacing(5) self.TitleLabel = QLabel(f"楼层座位分布图: {self.__floor}-{self.__room}") self.TitleLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) self.TitleLabel.setStyleSheet("font-size: 16px; font-weight: bold; margin: 10px;") @@ -99,9 +101,13 @@ class ALSeatMapWidget(QWidget): self.ConfirmButton = QPushButton("确认") self.ConfirmButton.setFixedSize(80, 25) + self.ConfirmButton.setAutoDefault(True) + self.ConfirmButton.setDefault(True) self.CancelButton = QPushButton("取消") self.CancelButton.setFixedSize(80, 25) self.SeatMapWidgetControlLayout = QHBoxLayout() + self.SeatMapWidgetControlLayout.setContentsMargins(0, 0, 0, 0) + self.SeatMapWidgetControlLayout.setSpacing(5) self.SeatMapWidgetControlLayout.setAlignment(Qt.AlignmentFlag.AlignRight) self.SeatMapWidgetControlLayout.addWidget(self.CancelButton) self.SeatMapWidgetControlLayout.addWidget(self.ConfirmButton)