Добавил скроллбары для пользовательского интерфейса и изменил номер в…

…ерсии
sportiduino · Aug 28, 2019 · 41793a7 · 41793a7
1 parent bc08a17
commit 41793a7
Show file tree

Hide file tree

Showing 6 changed files with 1,386 additions and 1,363 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.7.1] - 2019-08-28
+- Added user interface scrolling on small displays
+
 ## [0.7.0] - 2019-07-23
 - Added russian localization
 - Redesigned UI

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # sportiduinoPQ
 
-### version 0.7.0
+### version 0.7.1
 
 In the [last release](https://github.com/alexandervolikov/SportiduinoPQ/releases), you can download the program with the exe file for Windows systems, the installation is not required. 
 

diff --git a/README.ru.md b/README.ru.md
@@ -1,6 +1,6 @@
 # sportiduinoPQ
 
-### версия 0.7.0
+### версия 0.7.1
 
 В [последнем релизе](https://github.com/alexandervolikov/SportiduinoPQ/releases) можно скачать программу с exe файлом для Windows систем, установка не требуется 
 

diff --git a/SportiduinoPQ.py b/SportiduinoPQ.py
@@ -28,7 +28,7 @@ def __init__(self):
         super().__init__()
         self.setupUi(self)
 
-        self.setWindowTitle("SportiduinoPQ v0.7.0")
+        self.setWindowTitle("SportiduinoPQ v0.7.1")
 
         self.log =''
         self.readData = []

diff --git a/design.py b/design.py
@@ -83,7 +83,22 @@ def setupUi(self, MainWindow):
         self.choiseCom.addItem("")
         self.horizontalLayout.addWidget(self.choiseCom)
         self.verticalLayout.addLayout(self.horizontalLayout)
-        self.Log = QtWidgets.QTabWidget(self.centralwidget)
+        self.scrollArea = QtWidgets.QScrollArea(self.centralwidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.scrollArea.sizePolicy().hasHeightForWidth())
+        self.scrollArea.setSizePolicy(sizePolicy)
+        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.scrollArea.setFrameShadow(QtWidgets.QFrame.Plain)
+        self.scrollArea.setWidgetResizable(False)
+        self.scrollArea.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
+        self.scrollArea.setObjectName("scrollArea")
+        self.scrollAreaWidgetContents = QtWidgets.QWidget()
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 213, 648))
+        self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
+        self.Log = QtWidgets.QTabWidget(self.scrollAreaWidgetContents)
+        self.Log.setGeometry(QtCore.QRect(0, 0, 213, 648))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -445,7 +460,8 @@ def setupUi(self, MainWindow):
         self.label_7.setGeometry(QtCore.QRect(10, 210, 111, 31))
         self.label_7.setObjectName("label_7")
         self.Log.addTab(self.tab_3, "")
-        self.verticalLayout.addWidget(self.Log)
+        self.scrollArea.setWidget(self.scrollAreaWidgetContents)
+        self.verticalLayout.addWidget(self.scrollArea)
         self.horizontalLayout_4.addLayout(self.verticalLayout)
         self.verticalLayout_2 = QtWidgets.QVBoxLayout()
         self.verticalLayout_2.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
@@ -478,23 +494,6 @@ def setupUi(self, MainWindow):
         self.cbAntennaGain.setCurrentIndex(5)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
         MainWindow.setTabOrder(self.Connec, self.choiseCom)
-        MainWindow.setTabOrder(self.choiseCom, self.Log)
-        MainWindow.setTabOrder(self.Log, self.SetTime)
-        MainWindow.setTabOrder(self.SetTime, self.SetNum)
-        MainWindow.setTabOrder(self.SetNum, self.SetStart)
-        MainWindow.setTabOrder(self.SetStart, self.SetFinish)
-        MainWindow.setTabOrder(self.SetFinish, self.ClearSt)
-        MainWindow.setTabOrder(self.ClearSt, self.CheckSt)
-        MainWindow.setTabOrder(self.CheckSt, self.LogCard)
-        MainWindow.setTabOrder(self.LogCard, self.ReadLog)
-        MainWindow.setTabOrder(self.ReadLog, self.SleepCard)
-        MainWindow.setTabOrder(self.SleepCard, self.WorkTime)
-        MainWindow.setTabOrder(self.WorkTime, self.StartFinish)
-        MainWindow.setTabOrder(self.StartFinish, self.CheckInitTime)
-        MainWindow.setTabOrder(self.CheckInitTime, self.AutoDel)
-        MainWindow.setTabOrder(self.AutoDel, self.PassCard)
-        MainWindow.setTabOrder(self.PassCard, self.LoadSet)
-        MainWindow.setTabOrder(self.LoadSet, self.SaveSet)
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate