Skip to content

Commit

Permalink
Merge pull request #29 from slayer29179/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@timothycrosley
timothycrosley authored Jan 29, 2021
2 parents ce2156a + b9265ee commit aa762ee
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 81 deletions.
1 change: 1 addition & 0 deletions streamdeck_ui/gui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ def start(_exit: bool = False) -> None:

ui.actionExport.triggered.connect(partial(export_config, main_window))
ui.actionImport.triggered.connect(partial(import_config, main_window))
ui.actionExit.triggered.connect(app.exit)

timer = QTimer()
timer.timeout.connect(partial(sync, ui))
Expand Down
8 changes: 7 additions & 1 deletion streamdeck_ui/main.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
<x>0</x>
<y>0</y>
<width>844</width>
<height>30</height>
<height>27</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand All @@ -288,6 +288,7 @@
</property>
<addaction name="actionImport"/>
<addaction name="actionExport"/>
<addaction name="actionExit"/>
</widget>
<addaction name="menuFile"/>
</widget>
Expand All @@ -302,6 +303,11 @@
<string>Export</string>
</property>
</action>
<action name="actionExit">
<property name="text">
<string>Exit</string>
</property>
</action>
</widget>
<resources/>
<connections/>
Expand Down
110 changes: 30 additions & 80 deletions streamdeck_ui/ui_main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
# Form implementation generated from reading ui file 'streamdeck_ui/main.ui',
# licensing of 'streamdeck_ui/main.ui' applies.
#
# Created: Sun Oct 6 02:46:55 2019
# by: pyside2-uic running on PySide2 5.13.1
# Created: Sat Feb 15 12:29:53 2020
# by: pyside2-uic running on PySide2 5.13.2
#
# WARNING! All changes made in this file will be lost!

from PySide2 import QtCore, QtGui, QtWidgets


class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
Expand All @@ -27,24 +26,18 @@ def setupUi(self, MainWindow):
self.device_list.setMinimumSize(QtCore.QSize(400, 0))
self.device_list.setObjectName("device_list")
self.horizontalLayout_3.addWidget(self.device_list)
spacerItem = QtWidgets.QSpacerItem(
40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum
)
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem)
self.label_4 = QtWidgets.QLabel(self.centralwidget)
sizePolicy = QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred
)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
self.label_4.setSizePolicy(sizePolicy)
self.label_4.setObjectName("label_4")
self.horizontalLayout_3.addWidget(self.label_4)
self.brightness = QtWidgets.QSlider(self.centralwidget)
sizePolicy = QtWidgets.QSizePolicy(
QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed
)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.brightness.sizePolicy().hasHeightForWidth())
Expand Down Expand Up @@ -172,7 +165,7 @@ def setupUi(self, MainWindow):
self.verticalLayout_2.addLayout(self.verticalLayout)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 844, 30))
self.menubar.setGeometry(QtCore.QRect(0, 0, 844, 27))
self.menubar.setObjectName("menubar")
self.menuFile = QtWidgets.QMenu(self.menubar)
self.menuFile.setObjectName("menuFile")
Expand All @@ -184,84 +177,41 @@ def setupUi(self, MainWindow):
self.actionImport.setObjectName("actionImport")
self.actionExport = QtWidgets.QAction(MainWindow)
self.actionExport.setObjectName("actionExport")
self.actionExit = QtWidgets.QAction(MainWindow)
self.actionExit.setObjectName("actionExit")
self.menuFile.addAction(self.actionImport)
self.menuFile.addAction(self.actionExport)
self.menuFile.addAction(self.actionExit)
self.menubar.addAction(self.menuFile.menuAction())

self.retranslateUi(MainWindow)
self.pages.setCurrentIndex(0)
QtCore.QMetaObject.connectSlotsByName(MainWindow)

def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(
QtWidgets.QApplication.translate("MainWindow", "MainWindow", None, -1)
)
self.label_4.setText(
QtWidgets.QApplication.translate("MainWindow", "Brightness:", None, -1)
)
self.pages.setTabText(
self.pages.indexOf(self.page_1),
QtWidgets.QApplication.translate("MainWindow", "Page 1", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_2),
QtWidgets.QApplication.translate("MainWindow", "2", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_3),
QtWidgets.QApplication.translate("MainWindow", "3", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_4),
QtWidgets.QApplication.translate("MainWindow", "4", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_5),
QtWidgets.QApplication.translate("MainWindow", "5", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_6),
QtWidgets.QApplication.translate("MainWindow", "6", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_7),
QtWidgets.QApplication.translate("MainWindow", "7", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_8),
QtWidgets.QApplication.translate("MainWindow", "8", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.page_9),
QtWidgets.QApplication.translate("MainWindow", "9", None, -1),
)
self.pages.setTabText(
self.pages.indexOf(self.tab_10),
QtWidgets.QApplication.translate("MainWindow", "10", None, -1),
)
self.groupBox.setTitle(
QtWidgets.QApplication.translate("MainWindow", "Configure Button", None, -1)
)
MainWindow.setWindowTitle(QtWidgets.QApplication.translate("MainWindow", "MainWindow", None, -1))
self.label_4.setText(QtWidgets.QApplication.translate("MainWindow", "Brightness:", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_1), QtWidgets.QApplication.translate("MainWindow", "Page 1", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_2), QtWidgets.QApplication.translate("MainWindow", "2", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_3), QtWidgets.QApplication.translate("MainWindow", "3", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_4), QtWidgets.QApplication.translate("MainWindow", "4", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_5), QtWidgets.QApplication.translate("MainWindow", "5", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_6), QtWidgets.QApplication.translate("MainWindow", "6", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_7), QtWidgets.QApplication.translate("MainWindow", "7", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_8), QtWidgets.QApplication.translate("MainWindow", "8", None, -1))
self.pages.setTabText(self.pages.indexOf(self.page_9), QtWidgets.QApplication.translate("MainWindow", "9", None, -1))
self.pages.setTabText(self.pages.indexOf(self.tab_10), QtWidgets.QApplication.translate("MainWindow", "10", None, -1))
self.groupBox.setTitle(QtWidgets.QApplication.translate("MainWindow", "Configure Button", None, -1))
self.label.setText(QtWidgets.QApplication.translate("MainWindow", "Image:", None, -1))
self.imageButton.setText(QtWidgets.QApplication.translate("MainWindow", "Choose", None, -1))
self.label_2.setText(QtWidgets.QApplication.translate("MainWindow", "Text:", None, -1))
self.label_3.setText(QtWidgets.QApplication.translate("MainWindow", "Command:", None, -1))
self.label_5.setText(
QtWidgets.QApplication.translate("MainWindow", "Press Keys:", None, -1)
)
self.label_6.setText(
QtWidgets.QApplication.translate("MainWindow", "Write Text:", None, -1)
)
self.label_8.setText(
QtWidgets.QApplication.translate("MainWindow", "Switch Page:", None, -1)
)
self.label_7.setText(
QtWidgets.QApplication.translate("MainWindow", "Brightness +/-:", None, -1)
)
self.label_5.setText(QtWidgets.QApplication.translate("MainWindow", "Press Keys:", None, -1))
self.label_6.setText(QtWidgets.QApplication.translate("MainWindow", "Write Text:", None, -1))
self.label_8.setText(QtWidgets.QApplication.translate("MainWindow", "Switch Page:", None, -1))
self.label_7.setText(QtWidgets.QApplication.translate("MainWindow", "Brightness +/-:", None, -1))
self.menuFile.setTitle(QtWidgets.QApplication.translate("MainWindow", "File", None, -1))
self.actionImport.setText(
QtWidgets.QApplication.translate("MainWindow", "Import", None, -1)
)
self.actionExport.setText(
QtWidgets.QApplication.translate("MainWindow", "Export", None, -1)
)
self.actionImport.setText(QtWidgets.QApplication.translate("MainWindow", "Import", None, -1))
self.actionExport.setText(QtWidgets.QApplication.translate("MainWindow", "Export", None, -1))
self.actionExit.setText(QtWidgets.QApplication.translate("MainWindow", "Exit", None, -1))

0 comments on commit aa762ee

Please sign in to comment.