From b11bc95f93bf9578afff82f5b811d9907e396e6c Mon Sep 17 00:00:00 2001 From: MrXnneHang Date: Fri, 27 Sep 2024 13:38:38 +0800 Subject: [PATCH] feature:v1.3-release --- LoadingWindow.py | 4 +--- MainWindowThread.py | 6 ++---- MainWindowUI.py | 2 +- app.py | 14 +++++++------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/LoadingWindow.py b/LoadingWindow.py index 7de45b2..8478ed5 100644 --- a/LoadingWindow.py +++ b/LoadingWindow.py @@ -1,7 +1,5 @@ import sys -from PyQt5 import QtCore, QtWidgets -from PyQt5.QtWidgets import QApplication, QDialog, QLabel, QVBoxLayout, QMainWindow - +from PyQt5.QtWidgets import QDialog, QLabel from PyQt5.QtCore import Qt from util import load_config,set_pos from MainWindowThread import DrawAnimationThread diff --git a/MainWindowThread.py b/MainWindowThread.py index e8ecf65..ebd2154 100644 --- a/MainWindowThread.py +++ b/MainWindowThread.py @@ -1,7 +1,5 @@ -import sys -from PyQt5.QtCore import QThread, pyqtSignal, QTimer -from PyQt5.QtGui import QPixmap, QImage,QIcon -from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QPushButton, QLabel +from PyQt5.QtCore import QThread, pyqtSignal +from PyQt5.QtGui import QPixmap, QImage from time import sleep import numpy as np from util import split_gif_to_frames,split_mp4_to_frames diff --git a/MainWindowUI.py b/MainWindowUI.py index 9377769..6cc8be1 100644 --- a/MainWindowUI.py +++ b/MainWindowUI.py @@ -80,7 +80,7 @@ def __init__(self): def initUI(self): - self.setWindowTitle('Yasumi Clock v1.2') + self.setWindowTitle('Yasumi Clock v1.3') set_pos(self.main_window_pos,self) diff --git a/app.py b/app.py index 0bedcc4..7a97332 100644 --- a/app.py +++ b/app.py @@ -1,17 +1,15 @@ import sys +from LoadingWindow import LoadingWindow from PyQt5 import QtCore, QtWidgets from PyQt5.QtCore import QTimer, QTime, Qt from PyQt5.QtGui import QPixmap, QImage,QIcon - - -from yasumi_draw_rec import ManualSelectionWindow -from MainWindowThread import DrawAnimationThread -from LoadingWindow import LoadingWindow from yasumi_window import yasumiWindow from MainWindowUI import Main_Window_UI from sqlite import init_db,add_focus_record from history_window import HistoryWindowUI +from yasumi_draw_rec import ManualSelectionWindow + class Main_Window_Response(Main_Window_UI): """主窗口的响应 @@ -175,10 +173,12 @@ def closeEvent(self, event): loading_window = LoadingWindow() + loading_window.setWindowIcon(QIcon(loading_window.src_conifg["icon"])) + loading_window.show() mainWindow = Main_Window_Response(loading_window) mainWindow.setWindowIcon(QIcon(mainWindow.src_config["icon"])) - loading_window.setWindowIcon(QIcon(mainWindow.src_config["icon"])) - loading_window.show() + + # mainWindow.show() timer = QtCore.QTimer()