Skip to content

Commit aa762ee

Browse files
timothycrosleytimothycrosley
authored
Merge pull request #29 from slayer29179/master
2 parents ce2156a + b9265ee commit aa762ee

File tree

3 files changed

+38
-81
lines changed

3 files changed

+38
-81
lines changed

‎streamdeck_ui/gui.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ def start(_exit: bool = False) -> None:
273273

274274
ui.actionExport.triggered.connect(partial(export_config, main_window))
275275
ui.actionImport.triggered.connect(partial(import_config, main_window))
276+
ui.actionExit.triggered.connect(app.exit)
276277

277278
timer = QTimer()
278279
timer.timeout.connect(partial(sync, ui))

‎streamdeck_ui/main.ui‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<x>0</x>
280280
<y>0</y>
281281
<width>844</width>
282-
<height>30</height>
282+
<height>27</height>
283283
</rect>
284284
</property>
285285
<widget class="QMenu" name="menuFile">
@@ -288,6 +288,7 @@
288288
</property>
289289
<addaction name="actionImport"/>
290290
<addaction name="actionExport"/>
291+
<addaction name="actionExit"/>
291292
</widget>
292293
<addaction name="menuFile"/>
293294
</widget>
@@ -302,6 +303,11 @@
302303
<string>Export</string>
303304
</property>
304305
</action>
306+
<action name="actionExit">
307+
<property name="text">
308+
<string>Exit</string>
309+
</property>
310+
</action>
305311
</widget>
306312
<resources/>
307313
<connections/>

‎streamdeck_ui/ui_main.py‎

Lines changed: 30 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
# Form implementation generated from reading ui file 'streamdeck_ui/main.ui',
44
# licensing of 'streamdeck_ui/main.ui' applies.
55
#
6-
# Created: Sun Oct 6 02:46:55 2019
7-
# by: pyside2-uic running on PySide2 5.13.1
6+
# Created: Sat Feb 15 12:29:53 2020
7+
# by: pyside2-uic running on PySide2 5.13.2
88
#
99
# WARNING! All changes made in this file will be lost!
1010

1111
from PySide2 import QtCore, QtGui, QtWidgets
1212

13-
1413
class Ui_MainWindow(object):
1514
def setupUi(self, MainWindow):
1615
MainWindow.setObjectName("MainWindow")
@@ -27,24 +26,18 @@ def setupUi(self, MainWindow):
2726
self.device_list.setMinimumSize(QtCore.QSize(400, 0))
2827
self.device_list.setObjectName("device_list")
2928
self.horizontalLayout_3.addWidget(self.device_list)
30-
spacerItem = QtWidgets.QSpacerItem(
31-
40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
32-
)
29+
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
3330
self.horizontalLayout_3.addItem(spacerItem)
3431
self.label_4 = QtWidgets.QLabel(self.centralwidget)
35-
sizePolicy = QtWidgets.QSizePolicy(
36-
QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred
37-
)
32+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
3833
sizePolicy.setHorizontalStretch(0)
3934
sizePolicy.setVerticalStretch(0)
4035
sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
4136
self.label_4.setSizePolicy(sizePolicy)
4237
self.label_4.setObjectName("label_4")
4338
self.horizontalLayout_3.addWidget(self.label_4)
4439
self.brightness = QtWidgets.QSlider(self.centralwidget)
45-
sizePolicy = QtWidgets.QSizePolicy(
46-
QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed
47-
)
40+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
4841
sizePolicy.setHorizontalStretch(0)
4942
sizePolicy.setVerticalStretch(0)
5043
sizePolicy.setHeightForWidth(self.brightness.sizePolicy().hasHeightForWidth())
@@ -172,7 +165,7 @@ def setupUi(self, MainWindow):
172165
self.verticalLayout_2.addLayout(self.verticalLayout)
173166
MainWindow.setCentralWidget(self.centralwidget)
174167
self.menubar = QtWidgets.QMenuBar(MainWindow)
175-
self.menubar.setGeometry(QtCore.QRect(0, 0, 844, 30))
168+
self.menubar.setGeometry(QtCore.QRect(0, 0, 844, 27))
176169
self.menubar.setObjectName("menubar")
177170
self.menuFile = QtWidgets.QMenu(self.menubar)
178171
self.menuFile.setObjectName("menuFile")
@@ -184,84 +177,41 @@ def setupUi(self, MainWindow):
184177
self.actionImport.setObjectName("actionImport")
185178
self.actionExport = QtWidgets.QAction(MainWindow)
186179
self.actionExport.setObjectName("actionExport")
180+
self.actionExit = QtWidgets.QAction(MainWindow)
181+
self.actionExit.setObjectName("actionExit")
187182
self.menuFile.addAction(self.actionImport)
188183
self.menuFile.addAction(self.actionExport)
184+
self.menuFile.addAction(self.actionExit)
189185
self.menubar.addAction(self.menuFile.menuAction())
190186

191187
self.retranslateUi(MainWindow)
192188
self.pages.setCurrentIndex(0)
193189
QtCore.QMetaObject.connectSlotsByName(MainWindow)
194190

195191
def retranslateUi(self, MainWindow):
196-
MainWindow.setWindowTitle(
197-
QtWidgets.QApplication.translate("MainWindow", "MainWindow", None, -1)
198-
)
199-
self.label_4.setText(
200-
QtWidgets.QApplication.translate("MainWindow", "Brightness:", None, -1)
201-
)
202-
self.pages.setTabText(
203-
self.pages.indexOf(self.page_1),
204-
QtWidgets.QApplication.translate("MainWindow", "Page 1", None, -1),
205-
)
206-
self.pages.setTabText(
207-
self.pages.indexOf(self.page_2),
208-
QtWidgets.QApplication.translate("MainWindow", "2", None, -1),
209-
)
210-
self.pages.setTabText(
211-
self.pages.indexOf(self.page_3),
212-
QtWidgets.QApplication.translate("MainWindow", "3", None, -1),
213-
)
214-
self.pages.setTabText(
215-
self.pages.indexOf(self.page_4),
216-
QtWidgets.QApplication.translate("MainWindow", "4", None, -1),
217-
)
218-
self.pages.setTabText(
219-
self.pages.indexOf(self.page_5),
220-
QtWidgets.QApplication.translate("MainWindow", "5", None, -1),
221-
)
222-
self.pages.setTabText(
223-
self.pages.indexOf(self.page_6),
224-
QtWidgets.QApplication.translate("MainWindow", "6", None, -1),
225-
)
226-
self.pages.setTabText(
227-
self.pages.indexOf(self.page_7),
228-
QtWidgets.QApplication.translate("MainWindow", "7", None, -1),
229-
)
230-
self.pages.setTabText(
231-
self.pages.indexOf(self.page_8),
232-
QtWidgets.QApplication.translate("MainWindow", "8", None, -1),
233-
)
234-
self.pages.setTabText(
235-
self.pages.indexOf(self.page_9),
236-
QtWidgets.QApplication.translate("MainWindow", "9", None, -1),
237-
)
238-
self.pages.setTabText(
239-
self.pages.indexOf(self.tab_10),
240-
QtWidgets.QApplication.translate("MainWindow", "10", None, -1),
241-
)
242-
self.groupBox.setTitle(
243-
QtWidgets.QApplication.translate("MainWindow", "Configure Button", None, -1)
244-
)
192+
MainWindow.setWindowTitle(QtWidgets.QApplication.translate("MainWindow", "MainWindow", None, -1))
193+
self.label_4.setText(QtWidgets.QApplication.translate("MainWindow", "Brightness:", None, -1))
194+
self.pages.setTabText(self.pages.indexOf(self.page_1), QtWidgets.QApplication.translate("MainWindow", "Page 1", None, -1))
195+
self.pages.setTabText(self.pages.indexOf(self.page_2), QtWidgets.QApplication.translate("MainWindow", "2", None, -1))
196+
self.pages.setTabText(self.pages.indexOf(self.page_3), QtWidgets.QApplication.translate("MainWindow", "3", None, -1))
197+
self.pages.setTabText(self.pages.indexOf(self.page_4), QtWidgets.QApplication.translate("MainWindow", "4", None, -1))
198+
self.pages.setTabText(self.pages.indexOf(self.page_5), QtWidgets.QApplication.translate("MainWindow", "5", None, -1))
199+
self.pages.setTabText(self.pages.indexOf(self.page_6), QtWidgets.QApplication.translate("MainWindow", "6", None, -1))
200+
self.pages.setTabText(self.pages.indexOf(self.page_7), QtWidgets.QApplication.translate("MainWindow", "7", None, -1))
201+
self.pages.setTabText(self.pages.indexOf(self.page_8), QtWidgets.QApplication.translate("MainWindow", "8", None, -1))
202+
self.pages.setTabText(self.pages.indexOf(self.page_9), QtWidgets.QApplication.translate("MainWindow", "9", None, -1))
203+
self.pages.setTabText(self.pages.indexOf(self.tab_10), QtWidgets.QApplication.translate("MainWindow", "10", None, -1))
204+
self.groupBox.setTitle(QtWidgets.QApplication.translate("MainWindow", "Configure Button", None, -1))
245205
self.label.setText(QtWidgets.QApplication.translate("MainWindow", "Image:", None, -1))
246206
self.imageButton.setText(QtWidgets.QApplication.translate("MainWindow", "Choose", None, -1))
247207
self.label_2.setText(QtWidgets.QApplication.translate("MainWindow", "Text:", None, -1))
248208
self.label_3.setText(QtWidgets.QApplication.translate("MainWindow", "Command:", None, -1))
249-
self.label_5.setText(
250-
QtWidgets.QApplication.translate("MainWindow", "Press Keys:", None, -1)
251-
)
252-
self.label_6.setText(
253-
QtWidgets.QApplication.translate("MainWindow", "Write Text:", None, -1)
254-
)
255-
self.label_8.setText(
256-
QtWidgets.QApplication.translate("MainWindow", "Switch Page:", None, -1)
257-
)
258-
self.label_7.setText(
259-
QtWidgets.QApplication.translate("MainWindow", "Brightness +/-:", None, -1)
260-
)
209+
self.label_5.setText(QtWidgets.QApplication.translate("MainWindow", "Press Keys:", None, -1))
210+
self.label_6.setText(QtWidgets.QApplication.translate("MainWindow", "Write Text:", None, -1))
211+
self.label_8.setText(QtWidgets.QApplication.translate("MainWindow", "Switch Page:", None, -1))
212+
self.label_7.setText(QtWidgets.QApplication.translate("MainWindow", "Brightness +/-:", None, -1))
261213
self.menuFile.setTitle(QtWidgets.QApplication.translate("MainWindow", "File", None, -1))
262-
self.actionImport.setText(
263-
QtWidgets.QApplication.translate("MainWindow", "Import", None, -1)
264-
)
265-
self.actionExport.setText(
266-
QtWidgets.QApplication.translate("MainWindow", "Export", None, -1)
267-
)
214+
self.actionImport.setText(QtWidgets.QApplication.translate("MainWindow", "Import", None, -1))
215+
self.actionExport.setText(QtWidgets.QApplication.translate("MainWindow", "Export", None, -1))
216+
self.actionExit.setText(QtWidgets.QApplication.translate("MainWindow", "Exit", None, -1))
217+

0 commit comments

Comments
 (0)