Skip to content

Commit 2836b9f

Browse files
AndreWohnslandAndreWohnsland
authored
Merge pull request #503 from AndreWohnsland/dev
Fix option window
2 parents a5594d7 + e4ce7e2 commit 2836b9f

File tree

1 file changed

+99
-99
lines changed

1 file changed

+99
-99
lines changed

‎src/ui_elements/optionwindow.py‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,42 @@ def setupUi(self, Optionwindow):
4949
self.verticalLayout_3.setObjectName("verticalLayout_3")
5050
self.gridLayout_2 = QtWidgets.QGridLayout()
5151
self.gridLayout_2.setObjectName("gridLayout_2")
52+
self.button_calibration = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
53+
self.button_calibration.setMinimumSize(QtCore.QSize(0, 80))
54+
self.button_calibration.setMaximumSize(QtCore.QSize(5000, 300))
55+
font = QtGui.QFont()
56+
font.setPointSize(28)
57+
font.setBold(True)
58+
self.button_calibration.setFont(font)
59+
self.button_calibration.setObjectName("button_calibration")
60+
self.gridLayout_2.addWidget(self.button_calibration, 0, 1, 1, 1)
61+
self.button_logs = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
62+
self.button_logs.setMinimumSize(QtCore.QSize(0, 80))
63+
self.button_logs.setMaximumSize(QtCore.QSize(5000, 300))
64+
font = QtGui.QFont()
65+
font.setPointSize(28)
66+
font.setBold(True)
67+
self.button_logs.setFont(font)
68+
self.button_logs.setObjectName("button_logs")
69+
self.gridLayout_2.addWidget(self.button_logs, 4, 0, 1, 1)
70+
self.button_restore = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
71+
self.button_restore.setMinimumSize(QtCore.QSize(0, 80))
72+
self.button_restore.setMaximumSize(QtCore.QSize(5000, 300))
73+
font = QtGui.QFont()
74+
font.setPointSize(28)
75+
font.setBold(True)
76+
self.button_restore.setFont(font)
77+
self.button_restore.setObjectName("button_restore")
78+
self.gridLayout_2.addWidget(self.button_restore, 2, 1, 1, 1)
79+
self.button_addons = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
80+
self.button_addons.setMinimumSize(QtCore.QSize(0, 80))
81+
self.button_addons.setMaximumSize(QtCore.QSize(5000, 300))
82+
font = QtGui.QFont()
83+
font.setPointSize(28)
84+
font.setBold(True)
85+
self.button_addons.setFont(font)
86+
self.button_addons.setObjectName("button_addons")
87+
self.gridLayout_2.addWidget(self.button_addons, 9, 0, 1, 1)
5288
self.button_config = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
5389
self.button_config.setMinimumSize(QtCore.QSize(0, 80))
5490
self.button_config.setMaximumSize(QtCore.QSize(5000, 300))
@@ -58,15 +94,15 @@ def setupUi(self, Optionwindow):
5894
self.button_config.setFont(font)
5995
self.button_config.setObjectName("button_config")
6096
self.gridLayout_2.addWidget(self.button_config, 1, 0, 1, 1)
61-
self.button_calibration = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
62-
self.button_calibration.setMinimumSize(QtCore.QSize(0, 80))
63-
self.button_calibration.setMaximumSize(QtCore.QSize(5000, 300))
97+
self.button_events = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
98+
self.button_events.setMinimumSize(QtCore.QSize(0, 80))
99+
self.button_events.setMaximumSize(QtCore.QSize(5000, 300))
64100
font = QtGui.QFont()
65101
font.setPointSize(28)
66102
font.setBold(True)
67-
self.button_calibration.setFont(font)
68-
self.button_calibration.setObjectName("button_calibration")
69-
self.gridLayout_2.addWidget(self.button_calibration, 0, 1, 1, 1)
103+
self.button_events.setFont(font)
104+
self.button_events.setObjectName("button_events")
105+
self.gridLayout_2.addWidget(self.button_events, 6, 0, 1, 1)
70106
self.button_clean = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
71107
self.button_clean.setMinimumSize(QtCore.QSize(0, 80))
72108
self.button_clean.setMaximumSize(QtCore.QSize(5000, 300))
@@ -76,24 +112,15 @@ def setupUi(self, Optionwindow):
76112
self.button_clean.setFont(font)
77113
self.button_clean.setObjectName("button_clean")
78114
self.gridLayout_2.addWidget(self.button_clean, 0, 0, 1, 1)
79-
self.button_check_internet = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
80-
self.button_check_internet.setMinimumSize(QtCore.QSize(0, 80))
81-
self.button_check_internet.setMaximumSize(QtCore.QSize(5000, 300))
82-
font = QtGui.QFont()
83-
font.setPointSize(28)
84-
font.setBold(True)
85-
self.button_check_internet.setFont(font)
86-
self.button_check_internet.setObjectName("button_check_internet")
87-
self.gridLayout_2.addWidget(self.button_check_internet, 7, 1, 1, 1)
88-
self.button_update_system = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
89-
self.button_update_system.setMinimumSize(QtCore.QSize(0, 80))
90-
self.button_update_system.setMaximumSize(QtCore.QSize(5000, 300))
115+
self.button_export = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
116+
self.button_export.setMinimumSize(QtCore.QSize(0, 80))
117+
self.button_export.setMaximumSize(QtCore.QSize(5000, 300))
91118
font = QtGui.QFont()
92119
font.setPointSize(28)
93120
font.setBold(True)
94-
self.button_update_system.setFont(font)
95-
self.button_update_system.setObjectName("button_update_system")
96-
self.gridLayout_2.addWidget(self.button_update_system, 4, 1, 1, 1)
121+
self.button_export.setFont(font)
122+
self.button_export.setObjectName("button_export")
123+
self.gridLayout_2.addWidget(self.button_export, 1, 1, 1, 1)
97124
self.button_update_software = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
98125
self.button_update_software.setMinimumSize(QtCore.QSize(0, 80))
99126
self.button_update_software.setMaximumSize(QtCore.QSize(5000, 300))
@@ -102,7 +129,7 @@ def setupUi(self, Optionwindow):
102129
font.setBold(True)
103130
self.button_update_software.setFont(font)
104131
self.button_update_software.setObjectName("button_update_software")
105-
self.gridLayout_2.addWidget(self.button_update_software, 6, 0, 1, 2)
132+
self.gridLayout_2.addWidget(self.button_update_software, 7, 0, 1, 2)
106133
self.button_rfid = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
107134
self.button_rfid.setEnabled(False)
108135
self.button_rfid.setMinimumSize(QtCore.QSize(0, 80))
@@ -112,43 +139,25 @@ def setupUi(self, Optionwindow):
112139
font.setBold(True)
113140
self.button_rfid.setFont(font)
114141
self.button_rfid.setObjectName("button_rfid")
115-
self.gridLayout_2.addWidget(self.button_rfid, 8, 1, 1, 1)
116-
self.button_restore = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
117-
self.button_restore.setMinimumSize(QtCore.QSize(0, 80))
118-
self.button_restore.setMaximumSize(QtCore.QSize(5000, 300))
119-
font = QtGui.QFont()
120-
font.setPointSize(28)
121-
font.setBold(True)
122-
self.button_restore.setFont(font)
123-
self.button_restore.setObjectName("button_restore")
124-
self.gridLayout_2.addWidget(self.button_restore, 2, 1, 1, 1)
125-
self.button_wifi = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
126-
self.button_wifi.setMinimumSize(QtCore.QSize(0, 80))
127-
self.button_wifi.setMaximumSize(QtCore.QSize(5000, 300))
128-
font = QtGui.QFont()
129-
font.setPointSize(28)
130-
font.setBold(True)
131-
self.button_wifi.setFont(font)
132-
self.button_wifi.setObjectName("button_wifi")
133-
self.gridLayout_2.addWidget(self.button_wifi, 7, 0, 1, 1)
134-
self.button_export = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
135-
self.button_export.setMinimumSize(QtCore.QSize(0, 80))
136-
self.button_export.setMaximumSize(QtCore.QSize(5000, 300))
142+
self.gridLayout_2.addWidget(self.button_rfid, 9, 1, 1, 1)
143+
self.button_about = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
144+
self.button_about.setMinimumSize(QtCore.QSize(0, 80))
145+
self.button_about.setMaximumSize(QtCore.QSize(5000, 300))
137146
font = QtGui.QFont()
138147
font.setPointSize(28)
139148
font.setBold(True)
140-
self.button_export.setFont(font)
141-
self.button_export.setObjectName("button_export")
142-
self.gridLayout_2.addWidget(self.button_export, 1, 1, 1, 1)
143-
self.button_logs = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
144-
self.button_logs.setMinimumSize(QtCore.QSize(0, 80))
145-
self.button_logs.setMaximumSize(QtCore.QSize(5000, 300))
149+
self.button_about.setFont(font)
150+
self.button_about.setObjectName("button_about")
151+
self.gridLayout_2.addWidget(self.button_about, 11, 0, 1, 2)
152+
self.button_sumup = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
153+
self.button_sumup.setMinimumSize(QtCore.QSize(0, 80))
154+
self.button_sumup.setMaximumSize(QtCore.QSize(5000, 300))
146155
font = QtGui.QFont()
147156
font.setPointSize(28)
148157
font.setBold(True)
149-
self.button_logs.setFont(font)
150-
self.button_logs.setObjectName("button_logs")
151-
self.gridLayout_2.addWidget(self.button_logs, 4, 0, 1, 1)
158+
self.button_sumup.setFont(font)
159+
self.button_sumup.setObjectName("button_sumup")
160+
self.gridLayout_2.addWidget(self.button_sumup, 10, 1, 1, 1)
152161
self.button_shutdown = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
153162
self.button_shutdown.setMinimumSize(QtCore.QSize(0, 80))
154163
self.button_shutdown.setMaximumSize(QtCore.QSize(5000, 300))
@@ -167,15 +176,6 @@ def setupUi(self, Optionwindow):
167176
self.button_backup.setFont(font)
168177
self.button_backup.setObjectName("button_backup")
169178
self.gridLayout_2.addWidget(self.button_backup, 2, 0, 1, 1)
170-
self.button_addons = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
171-
self.button_addons.setMinimumSize(QtCore.QSize(0, 80))
172-
self.button_addons.setMaximumSize(QtCore.QSize(5000, 300))
173-
font = QtGui.QFont()
174-
font.setPointSize(28)
175-
font.setBold(True)
176-
self.button_addons.setFont(font)
177-
self.button_addons.setObjectName("button_addons")
178-
self.gridLayout_2.addWidget(self.button_addons, 8, 0, 1, 1)
179179
self.button_reboot = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
180180
self.button_reboot.setMinimumSize(QtCore.QSize(0, 80))
181181
self.button_reboot.setMaximumSize(QtCore.QSize(5000, 300))
@@ -185,33 +185,33 @@ def setupUi(self, Optionwindow):
185185
self.button_reboot.setFont(font)
186186
self.button_reboot.setObjectName("button_reboot")
187187
self.gridLayout_2.addWidget(self.button_reboot, 3, 0, 1, 1)
188-
self.button_news = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
189-
self.button_news.setMinimumSize(QtCore.QSize(0, 80))
190-
self.button_news.setMaximumSize(QtCore.QSize(5000, 300))
188+
self.button_wifi = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
189+
self.button_wifi.setMinimumSize(QtCore.QSize(0, 80))
190+
self.button_wifi.setMaximumSize(QtCore.QSize(5000, 300))
191191
font = QtGui.QFont()
192192
font.setPointSize(28)
193193
font.setBold(True)
194-
self.button_news.setFont(font)
195-
self.button_news.setObjectName("button_news")
196-
self.gridLayout_2.addWidget(self.button_news, 9, 0, 1, 1)
197-
self.button_about = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
198-
self.button_about.setMinimumSize(QtCore.QSize(0, 80))
199-
self.button_about.setMaximumSize(QtCore.QSize(5000, 300))
194+
self.button_wifi.setFont(font)
195+
self.button_wifi.setObjectName("button_wifi")
196+
self.gridLayout_2.addWidget(self.button_wifi, 8, 0, 1, 1)
197+
self.button_check_internet = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
198+
self.button_check_internet.setMinimumSize(QtCore.QSize(0, 80))
199+
self.button_check_internet.setMaximumSize(QtCore.QSize(5000, 300))
200200
font = QtGui.QFont()
201201
font.setPointSize(28)
202202
font.setBold(True)
203-
self.button_about.setFont(font)
204-
self.button_about.setObjectName("button_about")
205-
self.gridLayout_2.addWidget(self.button_about, 10, 0, 1, 2)
206-
self.button_sumup = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
207-
self.button_sumup.setMinimumSize(QtCore.QSize(0, 80))
208-
self.button_sumup.setMaximumSize(QtCore.QSize(5000, 300))
203+
self.button_check_internet.setFont(font)
204+
self.button_check_internet.setObjectName("button_check_internet")
205+
self.gridLayout_2.addWidget(self.button_check_internet, 8, 1, 1, 1)
206+
self.button_news = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
207+
self.button_news.setMinimumSize(QtCore.QSize(0, 80))
208+
self.button_news.setMaximumSize(QtCore.QSize(5000, 300))
209209
font = QtGui.QFont()
210210
font.setPointSize(28)
211211
font.setBold(True)
212-
self.button_sumup.setFont(font)
213-
self.button_sumup.setObjectName("button_sumup")
214-
self.gridLayout_2.addWidget(self.button_sumup, 9, 1, 1, 1)
212+
self.button_news.setFont(font)
213+
self.button_news.setObjectName("button_news")
214+
self.gridLayout_2.addWidget(self.button_news, 10, 0, 1, 1)
215215
self.button_resources = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
216216
self.button_resources.setMinimumSize(QtCore.QSize(0, 80))
217217
self.button_resources.setMaximumSize(QtCore.QSize(5000, 300))
@@ -220,16 +220,16 @@ def setupUi(self, Optionwindow):
220220
font.setBold(True)
221221
self.button_resources.setFont(font)
222222
self.button_resources.setObjectName("button_resources")
223-
self.gridLayout_2.addWidget(self.button_resources, 5, 1, 1, 1)
224-
self.button_events = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
225-
self.button_events.setMinimumSize(QtCore.QSize(0, 80))
226-
self.button_events.setMaximumSize(QtCore.QSize(5000, 300))
223+
self.gridLayout_2.addWidget(self.button_resources, 4, 1, 1, 1)
224+
self.button_update_system = QtWidgets.QPushButton(parent=self.scrollAreaWidgetContents)
225+
self.button_update_system.setMinimumSize(QtCore.QSize(0, 80))
226+
self.button_update_system.setMaximumSize(QtCore.QSize(5000, 300))
227227
font = QtGui.QFont()
228228
font.setPointSize(28)
229229
font.setBold(True)
230-
self.button_events.setFont(font)
231-
self.button_events.setObjectName("button_events")
232-
self.gridLayout_2.addWidget(self.button_events, 5, 0, 1, 1)
230+
self.button_update_system.setFont(font)
231+
self.button_update_system.setObjectName("button_update_system")
232+
self.gridLayout_2.addWidget(self.button_update_system, 6, 1, 1, 1)
233233
self.verticalLayout_3.addLayout(self.gridLayout_2)
234234
self.scrollArea.setWidget(self.scrollAreaWidgetContents)
235235
self.gridLayout.addWidget(self.scrollArea, 4, 0, 1, 1)
@@ -243,30 +243,30 @@ def retranslateUi(self, Optionwindow):
243243
Optionwindow.setWindowTitle(_translate("Optionwindow", "Options"))
244244
self.button_back.setText(_translate("Optionwindow", "< Back"))
245245
self.button_back.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
246-
self.button_config.setText(_translate("Optionwindow", "Change Config"))
247-
self.button_config.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
248246
self.button_calibration.setText(_translate("Optionwindow", "Calibration"))
249247
self.button_calibration.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
248+
self.button_logs.setText(_translate("Optionwindow", "Logs"))
249+
self.button_restore.setText(_translate("Optionwindow", "Restore"))
250+
self.button_addons.setText(_translate("Optionwindow", "Addons"))
251+
self.button_config.setText(_translate("Optionwindow", "Change Config"))
252+
self.button_config.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
253+
self.button_events.setText(_translate("Optionwindow", "Events"))
250254
self.button_clean.setText(_translate("Optionwindow", "Cleaning"))
251255
self.button_clean.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
252-
self.button_check_internet.setText(_translate("Optionwindow", "Check Internet"))
253-
self.button_update_system.setText(_translate("Optionwindow", "Update System"))
256+
self.button_export.setText(_translate("Optionwindow", "Export"))
254257
self.button_update_software.setText(_translate("Optionwindow", "Update CocktailBerry Software"))
255258
self.button_update_software.setProperty("cssClass", _translate("Optionwindow", "btn-inverted"))
256259
self.button_rfid.setText(_translate("Optionwindow", "Write RFID"))
257-
self.button_restore.setText(_translate("Optionwindow", "Restore"))
258-
self.button_wifi.setText(_translate("Optionwindow", "WiFi"))
259-
self.button_export.setText(_translate("Optionwindow", "Export"))
260-
self.button_logs.setText(_translate("Optionwindow", "Logs"))
260+
self.button_about.setText(_translate("Optionwindow", "About CocktailBerry"))
261+
self.button_sumup.setText(_translate("Optionwindow", "SumUp Setup"))
261262
self.button_shutdown.setText(_translate("Optionwindow", "Shutdown"))
262263
self.button_backup.setText(_translate("Optionwindow", "Backup"))
263-
self.button_addons.setText(_translate("Optionwindow", "Addons"))
264264
self.button_reboot.setText(_translate("Optionwindow", "Reboot"))
265+
self.button_wifi.setText(_translate("Optionwindow", "WiFi"))
266+
self.button_check_internet.setText(_translate("Optionwindow", "Check Internet"))
265267
self.button_news.setText(_translate("Optionwindow", "News"))
266-
self.button_about.setText(_translate("Optionwindow", "About CocktailBerry"))
267-
self.button_sumup.setText(_translate("Optionwindow", "SumUp Setup"))
268268
self.button_resources.setText(_translate("Optionwindow", "Resource Usage"))
269-
self.button_events.setText(_translate("Optionwindow", "Events"))
269+
self.button_update_system.setText(_translate("Optionwindow", "Update System"))
270270

271271

272272
if __name__ == "__main__":

0 commit comments

Comments
 (0)