fix: добавлена поддержка Windows 7 (#18)

This commit is contained in:
2023-09-27 10:20:56 +03:00
committed by GitHub
parent ffd796a11d
commit fe37f33d84
9 changed files with 122 additions and 184 deletions

View File

@@ -1,5 +1,5 @@
import sys
from PySide6.QtWidgets import QApplication
from PySide2.QtWidgets import QApplication
from statapp.main_window import MainWindow
@@ -8,7 +8,7 @@ def main():
app = QApplication(sys.argv)
window = MainWindow()
window.show()
return app.exec()
return app.exec_()
if __name__ == "__main__":

View File

@@ -1,5 +1,5 @@
from PySide6.QtGui import QMovie
from PySide6.QtWidgets import QMainWindow
from PySide2.QtGui import QMovie
from PySide2.QtWidgets import QMainWindow
from statapp.ui.ui_about_window import Ui_AboutWindow
from statapp.utils import resource_path

View File

@@ -1,10 +1,9 @@
from PySide6.QtCore import Slot
from PySide6.QtWidgets import QMainWindow
from PySide2.QtCore import Slot
from PySide2.QtWidgets import QMainWindow
from statapp.about_window import AboutWindow
from statapp.ui.ui_main_window import Ui_MainWindow
class MainWindow(QMainWindow):
def __init__(self):
super().__init__()
@@ -15,4 +14,4 @@ class MainWindow(QMainWindow):
def on_aboutmenuaction_triggered(self):
global about_window
about_window = AboutWindow()
about_window.show()
about_window.show()

View File

@@ -3,20 +3,15 @@
################################################################################
## Form generated from reading UI file 'about_window.ui'
##
## Created by: Qt User Interface Compiler version 6.5.2
## Created by: Qt User Interface Compiler version 5.15.2
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
QMetaObject, QObject, QPoint, QRect,
QSize, QTime, QUrl, Qt)
from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
QFont, QFontDatabase, QGradient, QIcon,
QImage, QKeySequence, QLinearGradient, QPainter,
QPalette, QPixmap, QRadialGradient, QTransform)
from PySide6.QtWidgets import (QApplication, QFrame, QGridLayout, QLabel,
QMainWindow, QSizePolicy, QWidget)
from PySide2.QtCore import *
from PySide2.QtGui import *
from PySide2.QtWidgets import *
class Ui_AboutWindow(object):
def setupUi(self, AboutWindow):
@@ -87,4 +82,3 @@ class Ui_AboutWindow(object):
self.labelbasegigamen.setText(QCoreApplication.translate("AboutWindow", u"\u0422\u0435\u043e\u0440\u0435\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0444\u0443\u043d\u0434\u0430\u043c\u0435\u043d\u0442: \u0414\u043c\u0438\u0442\u0440\u044e\u043a \u0422. \u0413.", None))
self.labelgif.setText("")
# retranslateUi

View File

@@ -3,22 +3,15 @@
################################################################################
## Form generated from reading UI file 'main_window.ui'
##
## Created by: Qt User Interface Compiler version 6.5.2
## Created by: Qt User Interface Compiler version 5.15.2
##
## WARNING! All changes made in this file will be lost when recompiling UI file!
################################################################################
from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
QMetaObject, QObject, QPoint, QRect,
QSize, QTime, QUrl, Qt)
from PySide6.QtGui import (QAction, QBrush, QColor, QConicalGradient,
QCursor, QFont, QFontDatabase, QGradient,
QIcon, QImage, QKeySequence, QLinearGradient,
QPainter, QPalette, QPixmap, QRadialGradient,
QTransform)
from PySide6.QtWidgets import (QApplication, QGridLayout, QHeaderView, QLabel,
QMainWindow, QMenu, QMenuBar, QSizePolicy,
QStatusBar, QTableView, QWidget)
from PySide2.QtCore import *
from PySide2.QtGui import *
from PySide2.QtWidgets import *
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
@@ -83,4 +76,3 @@ class Ui_MainWindow(object):
self.modelmenu.setTitle(QCoreApplication.translate("MainWindow", u"\u041c\u043e\u0434\u0435\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", None))
self.helpmenu.setTitle(QCoreApplication.translate("MainWindow", u"\u0421\u043f\u0440\u0430\u0432\u043a\u0430", None))
# retranslateUi