Merge branch 'main' into feat/generate-data

2025-11-04 13:41:24 +03:00 · 2023-09-26 16:48:49 +03:00
parent b8c6b0f7df fe15f9ac3c
commit 91509fc70a
5 changed files with 153 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
-## 1.0.0 (2023-09-26)
+# Changelog
+
+## 0.1.0 (2023-09-26)
+
+
+### Новые функции
+
+* добавлено окно "О программе" (with Kitty) ([#14](https://github.com/shizand/statapp/issues/14)) ([b105228](https://github.com/shizand/statapp/commit/b105228d3c7f0b2f7f804b4aa7fc6407015bb0c2))


 ### Исправления

-* добавил обязательное окно, с обязательной гифкой ([#8](https://github.com/shizand/statapp/issues/8)) 04cdcd9, closes #6
+* добавил обязательное окно, с обязательной гифкой ([#8](https://github.com/shizand/statapp/issues/8)) ([04cdcd9](https://github.com/shizand/statapp/commit/04cdcd92214b9625facb0465a805bbf5496601a1))
--- a/statapp/about_window.py
+++ b/statapp/about_window.py
@@ -0,0 +1,21 @@
+from PySide6.QtGui import QMovie
+from PySide6.QtWidgets import QMainWindow
+
+from statapp.ui.ui_about_window import Ui_AboutWindow
+
+
+class AboutWindow(QMainWindow):
+    pixmap = None
+
+    def __init__(self):
+        super().__init__()
+        self.ui = Ui_AboutWindow()
+        self.ui.setupUi(self)
+
+        image_path = 'statapp\\images\\sticker.gif'
+        movie = QMovie(image_path)
+        self.ui.labelgif.setMovie(movie)
+        movie.start()
+
+        self.pixmap = movie
+        self.setFixedSize(self.size())
--- a/statapp/main_window.py
+++ b/statapp/main_window.py
@@ -2,8 +2,9 @@ import numpy as np
 from PySide6.QtCore import Slot
 from PySide6.QtWidgets import QMainWindow

-from statapp.generate_window import GenerateWindow
 from statapp.models.data_model import DataModel
+from statapp.generate_window import GenerateWindow
+from statapp.about_window import AboutWindow
 from statapp.ui.ui_main_window import Ui_MainWindow


@@ -24,3 +25,10 @@ class MainWindow(QMainWindow):

            # self.model._data = y
            self.model.updateAllData(y)
+
+    @Slot()
+    def on_aboutmenuaction_triggered(self):
+        global about_window
+        about_window = AboutWindow()
+        about_window.show()
+
--- a/statapp/ui/about_window.ui
+++ b/statapp/ui/about_window.ui
@@ -9,8 +9,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>878</width>
-    <height>727</height>
+    <width>476</width>
+    <height>543</height>
   </rect>
  </property>
  <property name="windowTitle">
@@ -23,8 +23,8 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="1">
-       <widget class="QLabel" name="labelbasegigamen">
+      <item row="4" column="1">
+       <widget class="QLabel" name="labelowner">
        <property name="font">
         <font>
          <pointsize>14</pointsize>
@@ -37,7 +37,7 @@
         </font>
        </property>
        <property name="text">
-         <string>Теоретический фундамент: Дмитрюк Т. Г.</string>
+         <string>Донецкий Национальный Технический Университет</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
@@ -65,8 +65,8 @@
        </property>
       </widget>
      </item>
-      <item row="3" column="1">
-       <widget class="QLabel" name="labelowner">
+      <item row="1" column="1">
+       <widget class="QLabel" name="labelbasegigamen">
        <property name="font">
         <font>
          <pointsize>14</pointsize>
@@ -79,7 +79,7 @@
         </font>
        </property>
        <property name="text">
-         <string>Донецкий Национальный Технический Университет</string>
+         <string>Теоретический фундамент: Дмитрюк Т. Г.</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
@@ -87,7 +87,19 @@
       </widget>
      </item>
      <item row="2" column="1">
-       <widget class="QLabel" name="labelowner_2">
+       <widget class="QLabel" name="labelgif">
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>500</width>
+          <height>600</height>
+         </size>
+        </property>
        <property name="font">
         <font>
          <pointsize>14</pointsize>
@@ -99,12 +111,12 @@
          <kerning>true</kerning>
         </font>
        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
        <property name="text">
         <string/>
        </property>
-        <property name="pixmap">
-         <pixmap>../images/sticker.gif</pixmap>
-        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
--- a/statapp/ui/ui_about_window.py
+++ b/statapp/ui/ui_about_window.py
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'about_window.ui'
+##
+## Created by: Qt User Interface Compiler version 6.5.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)
+
+class Ui_AboutWindow(object):
+    def setupUi(self, AboutWindow):
+        if not AboutWindow.objectName():
+            AboutWindow.setObjectName(u"AboutWindow")
+        AboutWindow.setEnabled(True)
+        AboutWindow.resize(476, 543)
+        AboutWindow.setAutoFillBackground(False)
+        self.centralwidget = QWidget(AboutWindow)
+        self.centralwidget.setObjectName(u"centralwidget")
+        self.gridLayout_2 = QGridLayout(self.centralwidget)
+        self.gridLayout_2.setObjectName(u"gridLayout_2")
+        self.gridLayout = QGridLayout()
+        self.gridLayout.setObjectName(u"gridLayout")
+        self.labelowner = QLabel(self.centralwidget)
+        self.labelowner.setObjectName(u"labelowner")
+        font = QFont()
+        font.setPointSize(14)
+        font.setBold(False)
+        font.setItalic(False)
+        font.setUnderline(False)
+        font.setStrikeOut(False)
+        font.setKerning(True)
+        font.setStyleStrategy(QFont.PreferDefault)
+        self.labelowner.setFont(font)
+        self.labelowner.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.labelowner, 4, 1, 1, 1)
+
+        self.labeldevelopers = QLabel(self.centralwidget)
+        self.labeldevelopers.setObjectName(u"labeldevelopers")
+        self.labeldevelopers.setFont(font)
+        self.labeldevelopers.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.labeldevelopers, 0, 1, 1, 1)
+
+        self.labelbasegigamen = QLabel(self.centralwidget)
+        self.labelbasegigamen.setObjectName(u"labelbasegigamen")
+        self.labelbasegigamen.setFont(font)
+        self.labelbasegigamen.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.labelbasegigamen, 1, 1, 1, 1)
+
+        self.labelgif = QLabel(self.centralwidget)
+        self.labelgif.setObjectName(u"labelgif")
+        self.labelgif.setMinimumSize(QSize(50, 50))
+        self.labelgif.setMaximumSize(QSize(500, 600))
+        self.labelgif.setFont(font)
+        self.labelgif.setFrameShape(QFrame.NoFrame)
+        self.labelgif.setAlignment(Qt.AlignCenter)
+
+        self.gridLayout.addWidget(self.labelgif, 2, 1, 1, 1)
+
+
+        self.gridLayout_2.addLayout(self.gridLayout, 0, 0, 1, 1)
+
+        AboutWindow.setCentralWidget(self.centralwidget)
+
+        self.retranslateUi(AboutWindow)
+
+        QMetaObject.connectSlotsByName(AboutWindow)
+    # setupUi
+
+    def retranslateUi(self, AboutWindow):
+        AboutWindow.setWindowTitle(QCoreApplication.translate("AboutWindow", u"\u041e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0435", None))
+        self.labelowner.setText(QCoreApplication.translate("AboutWindow", u"\u0414\u043e\u043d\u0435\u0446\u043a\u0438\u0439 \u041d\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0422\u0435\u0445\u043d\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0423\u043d\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442", None))
+        self.labeldevelopers.setText(QCoreApplication.translate("AboutWindow", u"\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438: \u0421\u043b\u0438\u043f\u0435\u043d\u043a\u043e \u041c., \u041b\u0430\u0437\u0443\u0440\u0435\u043d\u043a\u043e \u0415.", None))
+        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
+