1
1
mirror of https://github.com/KenanZhu/AutoLibrary.git synced 2026-06-18 15:33:03 +08:00

Compare commits

..

2 Commits

4 changed files with 84 additions and 14 deletions
+24
View File
@@ -84,6 +84,30 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
self.CancelButton.clicked.connect(self.onCancelButtonClicked) self.CancelButton.clicked.connect(self.onCancelButtonClicked)
def showEvent(
self,
event
):
result = super().showEvent(event)
screen_rect = self.screen().geometry()
target_pos = self.parent().geometry().center()
target_pos.setX(target_pos.x() - self.width()//2)
target_pos.setY(target_pos.y() - self.height()//2)
if target_pos.x() < 0:
target_pos.setX(0)
if target_pos.x() + self.width() > screen_rect.width():
target_pos.setX(screen_rect.width() - self.width())
if target_pos.y() < 0:
target_pos.setY(0)
if target_pos.y() + self.height() > screen_rect.height():
target_pos.setY(screen_rect.height() - self.height())
self.move(target_pos)
return result
def closeEvent( def closeEvent(
self, self,
event: QCloseEvent event: QCloseEvent
+12 -14
View File
@@ -169,8 +169,8 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
event: QCloseEvent event: QCloseEvent
): ):
if self.__timer and self.__timer.isActive(): if self.__msg_queue_timer and self.__msg_queue_timer.isActive():
self.__timer.stop() self.__msg_queue_timer.stop()
if self.__timer_task_timer and self.__timer_task_timer.isActive(): if self.__timer_task_timer and self.__timer_task_timer.isActive():
self.__timer_task_timer.stop() self.__timer_task_timer.stop()
if self.__is_running_timer_task: if self.__is_running_timer_task:
@@ -203,9 +203,9 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
self self
): ):
self.__timer = QTimer() self.__msg_queue_timer = QTimer()
self.__timer.timeout.connect(self.pollMsgQueue) self.__msg_queue_timer.timeout.connect(self.pollMsgQueue)
self.__timer.start(100) self.__msg_queue_timer.start(100)
def startTimerTaskPolling( def startTimerTaskPolling(
@@ -256,13 +256,13 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
def setControlButtons( def setControlButtons(
self, self,
config_button_enabled: bool, config_button_enabled: bool,
start_button_enabled: bool, stop_button_enabled: bool,
stop_button_enabled: bool start_button_enabled: bool
): ):
self.ConfigButton.setEnabled(config_button_enabled) self.ConfigButton.setEnabled(config_button_enabled)
self.StartButton.setEnabled(start_button_enabled)
self.StopButton.setEnabled(stop_button_enabled) self.StopButton.setEnabled(stop_button_enabled)
self.StartButton.setEnabled(start_button_enabled)
@Slot() @Slot()
def showMsg( def showMsg(
@@ -312,9 +312,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
self.__alConfigWidget.configWidgetCloseSingal.disconnect(self.onConfigWidgetClosed) self.__alConfigWidget.configWidgetCloseSingal.disconnect(self.onConfigWidgetClosed)
self.__alConfigWidget.deleteLater() self.__alConfigWidget.deleteLater()
self.__alConfigWidget = None self.__alConfigWidget = None
self.ConfigButton.setEnabled(True) self.setControlButtons(True, False, True)
self.StartButton.setEnabled(True)
self.StopButton.setEnabled(False)
self.__config_paths = config_paths self.__config_paths = config_paths
@Slot(dict) @Slot(dict)
@@ -337,7 +335,7 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
self.__current_timer_task_thread.showMsgSignal.disconnect(self.showMsg) self.__current_timer_task_thread.showMsgSignal.disconnect(self.showMsg)
self.__current_timer_task_thread.deleteLater() self.__current_timer_task_thread.deleteLater()
self.__current_timer_task_thread = None self.__current_timer_task_thread = None
self.setControlButtons(True, True, False) self.setControlButtons(True, False, True)
self.__is_running_timer_task = False self.__is_running_timer_task = False
self.__timer_task_timer.start(500) self.__timer_task_timer.start(500)
timer_task["executed"] = True timer_task["executed"] = True
@@ -371,8 +369,8 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
self.__config_paths self.__config_paths
) )
self.__alConfigWidget.configWidgetCloseSingal.connect(self.onConfigWidgetClosed) self.__alConfigWidget.configWidgetCloseSingal.connect(self.onConfigWidgetClosed)
self.__alConfigWidget.setWindowFlags(Qt.Window) self.__alConfigWidget.setWindowFlags(Qt.WindowType.Window)
self.__alConfigWidget.setWindowModality(Qt.ApplicationModal) self.__alConfigWidget.setWindowModality(Qt.WindowModality.ApplicationModal)
self.__alConfigWidget.show() self.__alConfigWidget.show()
self.__alConfigWidget.raise_() self.__alConfigWidget.raise_()
self.__alConfigWidget.activateWindow() self.__alConfigWidget.activateWindow()
+24
View File
@@ -115,6 +115,30 @@ class ALSeatMapWidget(QWidget):
self.CancelButton.clicked.connect(self.onCancelButtonClicked) self.CancelButton.clicked.connect(self.onCancelButtonClicked)
def showEvent(
self,
event
):
result = super().showEvent(event)
screen_rect = self.screen().geometry()
target_pos = self.parent().geometry().center()
target_pos.setX(target_pos.x() - self.width()//2)
target_pos.setY(target_pos.y() - self.height()//2)
if target_pos.x() < 0:
target_pos.setX(0)
if target_pos.x() + self.width() > screen_rect.width():
target_pos.setX(screen_rect.width() - self.width())
if target_pos.y() < 0:
target_pos.setY(0)
if target_pos.y() + self.height() > screen_rect.height():
target_pos.setY(screen_rect.height() - self.height())
self.move(target_pos)
return result
def closeEvent( def closeEvent(
self, self,
event: QCloseEvent event: QCloseEvent
+24
View File
@@ -254,6 +254,30 @@ class ALTimerTaskWidget(QWidget, Ui_ALTimerTaskWidget):
return False return False
def showEvent(
self,
event
):
result = super().showEvent(event)
screen_rect = self.screen().geometry()
target_pos = self.parent().geometry().center()
target_pos.setX(target_pos.x() - self.width()//2)
target_pos.setY(target_pos.y() - self.height()//2)
if target_pos.x() < 0:
target_pos.setX(0)
if target_pos.x() + self.width() > screen_rect.width():
target_pos.setX(screen_rect.width() - self.width())
if target_pos.y() < 0:
target_pos.setY(0)
if target_pos.y() + self.height() > screen_rect.height():
target_pos.setY(screen_rect.height() - self.height())
self.move(target_pos)
return result
def closeEvent( def closeEvent(
self, self,
event: QCloseEvent event: QCloseEvent