diff --git a/data/ui_hotkeys.py b/data/ui_hotkeys.py index d084511..855dc10 100644 --- a/data/ui_hotkeys.py +++ b/data/ui_hotkeys.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'hotkeys.ui' # -# Created by: PyQt5 UI code generator 5.15.0 +# Created by: PyQt5 UI code generator 5.15.2 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -47,12 +47,15 @@ class Ui_MainWindow(object): " margin: 4px;\n" " border: none;\n" "}\n" +"\n" "QListWidget::item[Custom=\"true\"]{\n" " background: rgb(48, 48, 48);\n" "}\n" +"\n" "QListWidget::item:hover{\n" " background: rgb(53, 53, 53);\n" "}\n" +"\n" "QListWidget::item:selected{\n" " background: rgb(48, 48, 48);\n" " color: black;\n" @@ -64,12 +67,15 @@ class Ui_MainWindow(object): " background: rgb(48, 48, 48);\n" " width: 16px;\n" "}\n" +"\n" "QScrollBar::handle:vertical{\n" " background: rgb(48, 48, 48);\n" "}\n" +"\n" "QScrollBar::sub-page:vertical{\n" " background: rgb(58, 58, 58);\n" "}\n" +"\n" "QScrollBar::add-page:vertical{\n" " background: rgb(58, 58, 58);\n" "}\n" @@ -81,6 +87,7 @@ class Ui_MainWindow(object): "#exit_button{\n" " margin-bottom: 1px;\n" "}\n" +"\n" "#exit_button:hover{\n" " color: black;\n" " background: rgba(254, 119, 122, 128);\n" @@ -89,57 +96,15 @@ class Ui_MainWindow(object): "#min_button{\n" " margin-bottom: 1px;\n" "}\n" +"\n" "#min_button:hover{\n" " color: black;\n" " background: rgba(194, 213, 254, 128);\n" "}\n" "\n" -"#pref_button{\n" -" margin-bottom: 1px;\n" -"}\n" -"#pref_button:hover{\n" +"#delete_button:hover{\n" " color: black;\n" -" background: rgba(194, 213, 254, 128);\n" -"}\n" -"\n" -"#hotkeys_button{\n" -" margin-bottom: 1px;\n" -"}\n" -"#hotkeys_button:hover{\n" -" color: black;\n" -" background: rgba(194, 213, 254, 128);\n" -"}\n" -"\n" -"#select_label{\n" -" background: black;\n" -" color: white;\n" -"}\n" -"\n" -"#catList::item{\n" -" padding: 6px;\n" -"}\n" -"\n" -"QSlider::groove:horizontal {\n" -" border: none;\n" -" height: 40px;\n" -" margin: 0px;\n" -"}\n" -"QSlider::handle:horizontal {\n" -" background-color: rgb(53, 53, 53);\n" -" border: none;\n" -" height: 40px;\n" -" width: 40px;\n" -" margin: -15px 0px;\n" -"}\n" -"QSlider::sub-page:horizontal {\n" -" border: none;\n" -" height: 40px;\n" -" margin: 1px;\n" -" background: rgb(63, 63, 63);\n" -"}\n" -"\n" -"#update_button:hover{\n" -" background:rgba(10, 128, 179, 128);\n" +" background: rgba(254, 119, 122, 128);\n" "}") self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") @@ -151,11 +116,11 @@ class Ui_MainWindow(object): self.min_button.setGeometry(QtCore.QRect(340, 0, 41, 31)) self.min_button.setStyleSheet("") self.min_button.setObjectName("min_button") - self.Hotkeys = QtWidgets.QLabel(self.centralwidget) - self.Hotkeys.setGeometry(QtCore.QRect(20, 40, 291, 20)) - self.Hotkeys.setStyleSheet("background: none;\n" + self.title = QtWidgets.QLabel(self.centralwidget) + self.title.setGeometry(QtCore.QRect(20, 40, 291, 20)) + self.title.setStyleSheet("background: none;\n" "") - self.Hotkeys.setObjectName("Hotkeys") + self.title.setObjectName("title") self.background = QtWidgets.QWidget(self.centralwidget) self.background.setGeometry(QtCore.QRect(0, 0, 421, 71)) self.background.setStyleSheet("") @@ -171,7 +136,7 @@ class Ui_MainWindow(object): self.background.raise_() self.exit_button.raise_() self.min_button.raise_() - self.Hotkeys.raise_() + self.title.raise_() self.hotkeyList.raise_() self.delete_button.raise_() MainWindow.setCentralWidget(self.centralwidget) @@ -184,5 +149,5 @@ class Ui_MainWindow(object): MainWindow.setWindowTitle(_translate("MainWindow", "Hotkeys")) self.exit_button.setText(_translate("MainWindow", "X")) self.min_button.setText(_translate("MainWindow", "-")) - self.Hotkeys.setText(_translate("MainWindow", "Hotkeys")) + self.title.setText(_translate("MainWindow", "Hotkeys")) self.delete_button.setText(_translate("MainWindow", "Delete")) diff --git a/data/ui_preferences.py b/data/ui_preferences.py index d8df477..0cd1ed3 100644 --- a/data/ui_preferences.py +++ b/data/ui_preferences.py @@ -116,22 +116,22 @@ class Ui_MainWindow(object): self.min_button.setStyleSheet("") self.min_button.setObjectName("min_button") self.gridLayoutWidget = QtWidgets.QWidget(self.centralwidget) - self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 70, 391, 211)) + self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 80, 391, 201)) self.gridLayoutWidget.setObjectName("gridLayoutWidget") self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget) self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setHorizontalSpacing(6) self.gridLayout.setObjectName("gridLayout") - self.label_8 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_8.setStyleSheet("background:none") - self.label_8.setObjectName("label_8") - self.gridLayout.addWidget(self.label_8, 0, 0, 1, 1) - self.label_5 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_5.setObjectName("label_5") - self.gridLayout.addWidget(self.label_5, 5, 0, 1, 1) - self.label_2 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 2, 0, 1, 1) + self.pref_over = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over.setStyleSheet("background:none") + self.pref_over.setObjectName("pref_over") + self.gridLayout.addWidget(self.pref_over, 0, 0, 1, 1) + self.pref_over_el5 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el5.setObjectName("pref_over_el5") + self.gridLayout.addWidget(self.pref_over_el5, 5, 0, 1, 1) + self.pref_over_el2 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el2.setObjectName("pref_over_el2") + self.gridLayout.addWidget(self.pref_over_el2, 2, 0, 1, 1) self.select_move_down = QtWidgets.QPushButton(self.gridLayoutWidget) self.select_move_down.setObjectName("select_move_down") self.gridLayout.addWidget(self.select_move_down, 2, 1, 1, 1) @@ -141,24 +141,24 @@ class Ui_MainWindow(object): self.select_move_up = QtWidgets.QPushButton(self.gridLayoutWidget) self.select_move_up.setObjectName("select_move_up") self.gridLayout.addWidget(self.select_move_up, 1, 1, 1, 1) - self.label_3 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1) + self.pref_over_el3 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el3.setObjectName("pref_over_el3") + self.gridLayout.addWidget(self.pref_over_el3, 3, 0, 1, 1) self.stop_sound = QtWidgets.QPushButton(self.gridLayoutWidget) self.stop_sound.setObjectName("stop_sound") self.gridLayout.addWidget(self.stop_sound, 6, 1, 1, 1) - self.label_6 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_6.setObjectName("label_6") - self.gridLayout.addWidget(self.label_6, 6, 0, 1, 1) - self.label_4 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_4.setObjectName("label_4") - self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1) + self.pref_over_el6 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el6.setObjectName("pref_over_el6") + self.gridLayout.addWidget(self.pref_over_el6, 6, 0, 1, 1) + self.pref_over_el4 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el4.setObjectName("pref_over_el4") + self.gridLayout.addWidget(self.pref_over_el4, 4, 0, 1, 1) self.select_move_left = QtWidgets.QPushButton(self.gridLayoutWidget) self.select_move_left.setObjectName("select_move_left") self.gridLayout.addWidget(self.select_move_left, 3, 1, 1, 1) - self.label = QtWidgets.QLabel(self.gridLayoutWidget) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 1, 0, 1, 1) + self.pref_over_el1 = QtWidgets.QLabel(self.gridLayoutWidget) + self.pref_over_el1.setObjectName("pref_over_el1") + self.gridLayout.addWidget(self.pref_over_el1, 1, 0, 1, 1) self.play_sound = QtWidgets.QPushButton(self.gridLayoutWidget) self.play_sound.setObjectName("play_sound") self.gridLayout.addWidget(self.play_sound, 5, 1, 1, 1) @@ -166,26 +166,22 @@ class Ui_MainWindow(object): self.background.setGeometry(QtCore.QRect(0, 0, 421, 71)) self.background.setStyleSheet("") self.background.setObjectName("background") - self.label_7 = QtWidgets.QLabel(self.background) - self.label_7.setGeometry(QtCore.QRect(10, 10, 161, 41)) - self.label_7.setStyleSheet("") - self.label_7.setObjectName("label_7") - self.label_9 = QtWidgets.QLabel(self.centralwidget) - self.label_9.setGeometry(QtCore.QRect(10, 290, 201, 31)) - self.label_9.setObjectName("label_9") + self.title = QtWidgets.QLabel(self.background) + self.title.setGeometry(QtCore.QRect(10, 10, 161, 41)) + self.title.setStyleSheet("") + self.title.setObjectName("title") + self.pref_themes = QtWidgets.QLabel(self.centralwidget) + self.pref_themes.setGeometry(QtCore.QRect(10, 290, 201, 31)) + self.pref_themes.setObjectName("pref_themes") self.themesList = QtWidgets.QListWidget(self.centralwidget) - self.themesList.setGeometry(QtCore.QRect(10, 330, 401, 131)) + self.themesList.setGeometry(QtCore.QRect(10, 330, 401, 161)) self.themesList.setObjectName("themesList") - self.update_button = QtWidgets.QPushButton(self.centralwidget) - self.update_button.setGeometry(QtCore.QRect(10, 460, 181, 31)) - self.update_button.setObjectName("update_button") self.background.raise_() self.exit_button.raise_() self.min_button.raise_() self.gridLayoutWidget.raise_() - self.label_9.raise_() + self.pref_themes.raise_() self.themesList.raise_() - self.update_button.raise_() MainWindow.setCentralWidget(self.centralwidget) self.retranslateUi(MainWindow) @@ -196,19 +192,18 @@ class Ui_MainWindow(object): MainWindow.setWindowTitle(_translate("MainWindow", "Preferences")) self.exit_button.setText(_translate("MainWindow", "X")) self.min_button.setText(_translate("MainWindow", "-")) - self.label_8.setText(_translate("MainWindow", "Overlay control")) - self.label_5.setText(_translate("MainWindow", "Overlay play sound")) - self.label_2.setText(_translate("MainWindow", "Overlay menu down")) + self.pref_over.setText(_translate("MainWindow", "Overlay control")) + self.pref_over_el5.setText(_translate("MainWindow", "Overlay play sound")) + self.pref_over_el2.setText(_translate("MainWindow", "Overlay menu down")) self.select_move_down.setText(_translate("MainWindow", "PushButton")) self.select_move_right.setText(_translate("MainWindow", "PushButton")) self.select_move_up.setText(_translate("MainWindow", "PushButton")) - self.label_3.setText(_translate("MainWindow", "Overlay menu left")) + self.pref_over_el3.setText(_translate("MainWindow", "Overlay menu left")) self.stop_sound.setText(_translate("MainWindow", "PushButton")) - self.label_6.setText(_translate("MainWindow", "Overlay stop sound")) - self.label_4.setText(_translate("MainWindow", "Overlay menu right")) + self.pref_over_el6.setText(_translate("MainWindow", "Overlay stop sound")) + self.pref_over_el4.setText(_translate("MainWindow", "Overlay menu right")) self.select_move_left.setText(_translate("MainWindow", "PushButton")) - self.label.setText(_translate("MainWindow", "Overlay menu up")) + self.pref_over_el1.setText(_translate("MainWindow", "Overlay menu up")) self.play_sound.setText(_translate("MainWindow", "PushButton")) - self.label_7.setText(_translate("MainWindow", "Preferences")) - self.label_9.setText(_translate("MainWindow", "Themes")) - self.update_button.setText(_translate("MainWindow", "Check for update")) + self.title.setText(_translate("MainWindow", "Preferences")) + self.pref_themes.setText(_translate("MainWindow", "Themes")) diff --git a/data/ui_sundpood.py b/data/ui_sundpood.py index 8950290..18dadfd 100644 --- a/data/ui_sundpood.py +++ b/data/ui_sundpood.py @@ -17,6 +17,9 @@ class Ui_MainWindow(object): MainWindow.resize(640, 480) MainWindow.setMinimumSize(QtCore.QSize(640, 480)) MainWindow.setMaximumSize(QtCore.QSize(640, 480)) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap("icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + MainWindow.setWindowIcon(icon) MainWindow.setStyleSheet("QWidget{\n" " background: rgb(44, 44, 44); \n" " font: 25 14pt \"Calibri Light\";\n" @@ -128,10 +131,6 @@ class Ui_MainWindow(object): " height: 40px;\n" " margin: 1px;\n" " background: rgb(63, 63, 63);\n" -"}\n" -"\n" -"#update_button:hover{\n" -" background:rgba(10, 128, 179, 128);\n" "}") self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") @@ -168,17 +167,17 @@ class Ui_MainWindow(object): self.catList.setGeometry(QtCore.QRect(0, 280, 171, 201)) self.catList.setStyleSheet("") self.catList.setObjectName("catList") - self.label = QtWidgets.QLabel(self.background) - self.label.setGeometry(QtCore.QRect(6, 253, 161, 31)) + self.cat_label = QtWidgets.QLabel(self.background) + self.cat_label.setGeometry(QtCore.QRect(6, 253, 161, 31)) font = QtGui.QFont() font.setFamily("Calibri Light") font.setPointSize(14) font.setBold(False) font.setItalic(False) font.setWeight(3) - self.label.setFont(font) - self.label.setAlignment(QtCore.Qt.AlignCenter) - self.label.setObjectName("label") + self.cat_label.setFont(font) + self.cat_label.setAlignment(QtCore.Qt.AlignCenter) + self.cat_label.setObjectName("cat_label") self.volume_slider = QtWidgets.QSlider(self.background) self.volume_slider.setGeometry(QtCore.QRect(10, 170, 151, 20)) self.volume_slider.setMaximum(100) @@ -208,5 +207,5 @@ class Ui_MainWindow(object): self.hotkeys_button.setText(_translate("MainWindow", "Hotkeys")) self.stop_button.setText(_translate("MainWindow", "Stop")) self.hkset.setText(_translate("MainWindow", "Set hotkey")) - self.label.setText(_translate("MainWindow", "Categories")) + self.cat_label.setText(_translate("MainWindow", "Categories")) self.play_button.setText(_translate("MainWindow", "Play"))