Added resource file

This commit is contained in:
Dilan Boskan 2021-03-13 09:14:09 +01:00
parent 87f64b8334
commit 4c8872404f
7 changed files with 1494 additions and 72 deletions

View File

@ -2,8 +2,6 @@
Run the application
"""
from src import app
import sys
if __name__ == "__main__":
app.run()

1420
src/resources/resources.py Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,6 @@
<RCC>
<qresource prefix="img">
<file>images/banner.png</file>
<file>images/download.png</file>
</qresource>
</RCC>

View File

@ -710,7 +710,7 @@ class Ui_SettingsWindow(object):
self.scrollAreaWidgetContents = QWidget()
self.scrollAreaWidgetContents.setObjectName(
u"scrollAreaWidgetContents")
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 747, 394))
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 53, 35))
self.scrollAreaWidgetContents.setStyleSheet(u"QFrame#frame_engine, QFrame#frame_modelOptions {\n"
" background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0.221409, y2:0.587, stop:0.119318 rgba(85, 78, 163, 255), stop:0.683616 rgba(0, 0, 0, 0));\n"
"}")
@ -745,7 +745,7 @@ class Ui_SettingsWindow(object):
self.scrollAreaWidgetContents_4 = QWidget()
self.scrollAreaWidgetContents_4.setObjectName(
u"scrollAreaWidgetContents_4")
self.scrollAreaWidgetContents_4.setGeometry(QRect(0, 0, 747, 394))
self.scrollAreaWidgetContents_4.setGeometry(QRect(0, 0, 53, 35))
self.scrollAreaWidgetContents_4.setStyleSheet(u"QFrame#frame_engine, QFrame#frame_modelOptions {\n"
" background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0.221409, y2:0.587, stop:0.119318 rgba(85, 78, 163, 255), stop:0.683616 rgba(0, 0, 0, 0));\n"
"}")
@ -923,32 +923,13 @@ class Ui_SettingsWindow(object):
self.groupBox_export.setMinimumSize(QSize(0, 104))
self.groupBox_export.setAcceptDrops(True)
self.groupBox_export.setFlat(True)
self.gridLayout_8 = QGridLayout(self.groupBox_export)
self.gridLayout_8.setObjectName(u"gridLayout_8")
self.gridLayout_8.setHorizontalSpacing(20)
self.gridLayout_8.setVerticalSpacing(10)
self.gridLayout_8.setContentsMargins(35, 10, 30, 10)
self.frame_13 = QFrame(self.groupBox_export)
self.frame_13.setObjectName(u"frame_13")
self.frame_13.setMinimumSize(QSize(100, 0))
self.frame_13.setFrameShape(QFrame.NoFrame)
self.frame_13.setFrameShadow(QFrame.Raised)
self.horizontalLayout_8 = QHBoxLayout(self.frame_13)
self.horizontalLayout_8.setSpacing(0)
self.horizontalLayout_8.setObjectName(u"horizontalLayout_8")
self.horizontalLayout_8.setContentsMargins(0, 0, 0, 0)
self.label_3 = QLabel(self.frame_13)
self.label_3.setObjectName(u"label_3")
sizePolicy5.setHeightForWidth(
self.label_3.sizePolicy().hasHeightForWidth())
self.label_3.setSizePolicy(sizePolicy5)
self.label_3.setMinimumSize(QSize(110, 0))
self.label_3.setAlignment(
Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter)
self.horizontalLayout_8.addWidget(self.label_3)
self.pushButton_exportDirectory = QPushButton(self.frame_13)
self.horizontalLayout_11 = QHBoxLayout(self.groupBox_export)
self.horizontalLayout_11.setObjectName(u"horizontalLayout_11")
self.horizontalLayout_11.setContentsMargins(35, 10, 30, 10)
self.gridLayout_10 = QGridLayout()
self.gridLayout_10.setObjectName(u"gridLayout_10")
self.gridLayout_10.setHorizontalSpacing(10)
self.pushButton_exportDirectory = QPushButton(self.groupBox_export)
self.pushButton_exportDirectory.setObjectName(
u"pushButton_exportDirectory")
self.pushButton_exportDirectory.setMinimumSize(QSize(18, 18))
@ -958,58 +939,60 @@ class Ui_SettingsWindow(object):
self.pushButton_exportDirectory.setFlat(True)
self.pushButton_exportDirectory.setProperty("export", True)
self.horizontalLayout_8.addWidget(self.pushButton_exportDirectory)
self.gridLayout_10.addWidget(
self.pushButton_exportDirectory, 0, 1, 1, 1)
self.gridLayout_8.addWidget(self.frame_13, 0, 0, 1, 1)
self.label_exportDirectory = QLabel(self.groupBox_export)
self.label_exportDirectory.setObjectName(u"label_exportDirectory")
sizePolicy2.setHeightForWidth(
self.label_exportDirectory.sizePolicy().hasHeightForWidth())
self.label_exportDirectory.setSizePolicy(sizePolicy2)
self.label_exportDirectory.setText(u"B:/Downloads")
self.label_exportDirectory.setTextFormat(Qt.AutoText)
self.label_exportDirectory.setScaledContents(True)
self.label_exportDirectory.setAlignment(
self.label_3 = QLabel(self.groupBox_export)
self.label_3.setObjectName(u"label_3")
sizePolicy5.setHeightForWidth(
self.label_3.sizePolicy().hasHeightForWidth())
self.label_3.setSizePolicy(sizePolicy5)
self.label_3.setMinimumSize(QSize(110, 0))
self.label_3.setAlignment(
Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter)
self.label_exportDirectory.setWordWrap(True)
self.label_exportDirectory.setIndent(5)
self.label_exportDirectory.setProperty("path", True)
self.gridLayout_8.addWidget(self.label_exportDirectory, 0, 1, 1, 1)
self.gridLayout_10.addWidget(self.label_3, 0, 0, 1, 1)
self.label_autoSave = QLabel(self.groupBox_export)
self.label_autoSave.setObjectName(u"label_autoSave")
self.label_autoSave.setAlignment(
Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter)
self.gridLayout_8.addWidget(self.label_autoSave, 1, 0, 1, 1)
self.gridLayout_10.addWidget(self.label_autoSave, 1, 0, 1, 2)
self.frame_7 = QFrame(self.groupBox_export)
self.frame_7.setObjectName(u"frame_7")
self.frame_7.setMinimumSize(QSize(0, 30))
self.frame_7.setFrameShape(QFrame.NoFrame)
self.frame_7.setFrameShadow(QFrame.Raised)
self.horizontalLayout_7 = QHBoxLayout(self.frame_7)
self.horizontalLayout_7.setObjectName(u"horizontalLayout_7")
self.horizontalLayout_7.setContentsMargins(5, 0, 0, 0)
self.checkBox_autoSaveInstrumentals = QCheckBox(self.frame_7)
self.checkBox_autoSaveInstrumentals = QCheckBox(self.groupBox_export)
self.checkBox_autoSaveInstrumentals.setObjectName(
u"checkBox_autoSaveInstrumentals")
self.horizontalLayout_7.addWidget(
self.checkBox_autoSaveInstrumentals, 0, Qt.AlignHCenter)
self.gridLayout_10.addWidget(
self.checkBox_autoSaveInstrumentals, 1, 2, 1, 1)
self.checkBox_autoSaveVocals = QCheckBox(self.frame_7)
self.checkBox_autoSaveVocals = QCheckBox(self.groupBox_export)
self.checkBox_autoSaveVocals.setObjectName(u"checkBox_autoSaveVocals")
self.horizontalLayout_7.addWidget(
self.checkBox_autoSaveVocals, 0, Qt.AlignHCenter)
self.gridLayout_10.addWidget(self.checkBox_autoSaveVocals, 1, 3, 1, 1)
self.horizontalLayout_7.setStretch(0, 1)
self.horizontalLayout_7.setStretch(1, 1)
self.label_exportDirectory = QLabel(self.groupBox_export)
self.label_exportDirectory.setObjectName(u"label_exportDirectory")
sizePolicy2.setHeightForWidth(
self.label_exportDirectory.sizePolicy().hasHeightForWidth())
self.label_exportDirectory.setSizePolicy(sizePolicy2)
self.label_exportDirectory.setLineWidth(0)
self.label_exportDirectory.setText(u"B:/Downloads")
self.label_exportDirectory.setTextFormat(Qt.AutoText)
self.label_exportDirectory.setScaledContents(True)
self.label_exportDirectory.setAlignment(
Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter)
self.label_exportDirectory.setWordWrap(True)
self.label_exportDirectory.setIndent(1)
self.label_exportDirectory.setProperty("path", True)
self.gridLayout_8.addWidget(self.frame_7, 1, 1, 1, 1)
self.gridLayout_10.addWidget(self.label_exportDirectory, 0, 2, 1, 2)
self.gridLayout_10.setRowStretch(0, 1)
self.gridLayout_10.setRowStretch(1, 1)
self.horizontalLayout_11.addLayout(self.gridLayout_10)
self.verticalLayout_20.addWidget(self.groupBox_export)
@ -1136,7 +1119,7 @@ class Ui_SettingsWindow(object):
self.retranslateUi(SettingsWindow)
self.stackedWidget.setCurrentIndex(0)
self.stackedWidget.setCurrentIndex(3)
self.comboBox_winSize_stacked.setCurrentIndex(0)
self.comboBox_winSize.setCurrentIndex(0)
self.pushButton_english.setDefault(False)
@ -1241,9 +1224,9 @@ class Ui_SettingsWindow(object):
"SettingsWindow", u"Multithreading (experimental)", None))
self.groupBox_export.setTitle(QCoreApplication.translate(
"SettingsWindow", u"Export Settings ", None))
self.pushButton_exportDirectory.setText("")
self.label_3.setText(QCoreApplication.translate(
"SettingsWindow", u"Export Directory:", None))
self.pushButton_exportDirectory.setText("")
self.label_autoSave.setText(QCoreApplication.translate(
"SettingsWindow", u"Automatically Save:", None))
self.checkBox_autoSaveInstrumentals.setText(

View File

@ -7,6 +7,7 @@ from PySide2.QtGui import Qt
from PySide2 import QtMultimedia
# -Root imports-
from ..resources.resources_manager import (ResourcePaths)
from ..resources import resources
from ..inference import converter_v4
from ..app import CustomApplication
from .. import constants as const

View File

@ -6,6 +6,7 @@ from PySide2 import QtGui
from PySide2.QtGui import Qt
# -Root imports-
from ..resources.resources_manager import (ResourcePaths)
from ..resources import resources
from ..app import CustomApplication
from .. import constants as const
from .design import presetseditorwindow_ui
@ -74,7 +75,7 @@ class PresetsEditorWindow(QtWidgets.QWidget):
Load the images for this window and assign them to their widgets
"""
upload_img = QtGui.QPixmap(ResourcePaths.images.upload)
download_img = QtGui.QPixmap(ResourcePaths.images.download)
download_img = QtGui.QPixmap(":/img/images/download.png")
self.ui.pushButton_export.setIcon(upload_img)
self.ui.pushButton_import.setIcon(download_img)
self.ui.pushButton_export.setIconSize(QtCore.QSize(18, 18))
@ -144,7 +145,6 @@ class PresetsEditorWindow(QtWidgets.QWidget):
# -Set data-
item.setText(label)
item.setData(Qt.UserRole, settings.copy())
# -Update settings window-
self.app.settingsWindow.update_page_seperationSettings()
@ -153,6 +153,20 @@ class PresetsEditorWindow(QtWidgets.QWidget):
Delete selected presets after asking for
confirmation
"""
selected_items = self.ui.listWidget_presets.selectedItems()
# Some paths already selected
msg = QtWidgets.QMessageBox()
msg.setWindowTitle(self.tr('Confirmation'))
msg.setIcon(QtWidgets.QMessageBox.Icon.Warning)
msg.setText(f'You will delete {len(selected_items)} items. Do you wish to continue?')
msg.setStandardButtons(QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No)
msg.setWindowFlag(Qt.WindowStaysOnTopHint)
val = msg.exec_()
if val == QtWidgets.QMessageBox.No:
# Cancel
return
for item in self.ui.listWidget_presets.selectedItems():
row = self.ui.listWidget_presets.row(item)
self.ui.listWidget_presets.takeItem(row)
@ -172,7 +186,7 @@ class PresetsEditorWindow(QtWidgets.QWidget):
self.logger.info('No item selected')
self.logger.indent_backwards()
return
item = selected_items[0]
itemText = item.text().replace(' ', '_')
file_name = f'{self.PRESET_PREFIX}{itemText}.json'
@ -188,7 +202,7 @@ class PresetsEditorWindow(QtWidgets.QWidget):
self.logger.info('Canceled preset export!',)
self.logger.indent_backwards()
return
self.presets_saveDir = os.path.dirname(path)
settings = item.data(Qt.UserRole)
@ -238,7 +252,7 @@ class PresetsEditorWindow(QtWidgets.QWidget):
Save states of the widgets in this window
"""
def get_presets(self) -> dict:
"""
Obtain the presets from the window

View File

@ -233,7 +233,7 @@ class SettingsWindow(QtWidgets.QWidget):
# Clear command
self.pushButton_clearCommand_clicked()
# Load menu (Preferences)
self.menu_loadPage(0)
self.ui.radioButton_separationSettings.click()
self.update_window()
self.logger.indent_backwards()