Skip to content

Commit

Permalink
feature:v1.3-release
Browse files Browse the repository at this point in the history
  • Loading branch information
MrXnneHang committed Sep 27, 2024
1 parent b2aaf54 commit b11bc95
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
4 changes: 1 addition & 3 deletions LoadingWindow.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions MainWindowThread.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion MainWindowUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
14 changes: 7 additions & 7 deletions app.py
Original file line number Diff line number Diff line change
@@ -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):
"""主窗口的响应
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit b11bc95

Please sign in to comment.