From 494e124ac84b136ad98b9c9d87f7d018bb81a11d Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Sat, 30 Sep 2023 20:38:46 +0100 Subject: [PATCH] Separate path display from title/artist buttons, track add dialog --- app/ui/dlg_SearchDatabase.ui | 68 +++++++++++++++++--------------- app/ui/dlg_search_database_ui.py | 33 +++++++++------- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/app/ui/dlg_SearchDatabase.ui b/app/ui/dlg_SearchDatabase.ui index 1fb0519..455975c 100644 --- a/app/ui/dlg_SearchDatabase.ui +++ b/app/ui/dlg_SearchDatabase.ui @@ -21,49 +21,53 @@ - + - + - - - - 0 - 0 - - - - - 46 - 16777215 - - - - &Note: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - txtNote - - - - - - - - + + + + 0 + 0 + + + + + 46 + 16777215 + + - + &Note: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + txtNote + + + + + + + + + + + + + + diff --git a/app/ui/dlg_search_database_ui.py b/app/ui/dlg_search_database_ui.py index b95447b..2b15dae 100644 --- a/app/ui/dlg_search_database_ui.py +++ b/app/ui/dlg_search_database_ui.py @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'app/ui/dlg_SearchDatabase.ui' # -# Created by: PyQt6 UI code generator 6.5.0 +# Created by: PyQt6 UI code generator 6.5.2 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -20,10 +20,12 @@ class Ui_Dialog(object): self.gridLayout.addWidget(self.label, 0, 0, 1, 1) self.searchString = QtWidgets.QLineEdit(parent=Dialog) self.searchString.setObjectName("searchString") - self.gridLayout.addWidget(self.searchString, 0, 1, 1, 2) + self.gridLayout.addWidget(self.searchString, 0, 1, 1, 1) self.matchList = QtWidgets.QListWidget(parent=Dialog) self.matchList.setObjectName("matchList") - self.gridLayout.addWidget(self.matchList, 1, 0, 1, 3) + self.gridLayout.addWidget(self.matchList, 1, 0, 1, 2) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") self.lblNote = QtWidgets.QLabel(parent=Dialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -33,36 +35,37 @@ class Ui_Dialog(object): self.lblNote.setMaximumSize(QtCore.QSize(46, 16777215)) self.lblNote.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) self.lblNote.setObjectName("lblNote") - self.gridLayout.addWidget(self.lblNote, 2, 0, 1, 2) + self.horizontalLayout.addWidget(self.lblNote) self.txtNote = QtWidgets.QLineEdit(parent=Dialog) self.txtNote.setObjectName("txtNote") - self.gridLayout.addWidget(self.txtNote, 2, 2, 1, 1) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout.addWidget(self.txtNote) + self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 2) self.dbPath = QtWidgets.QLabel(parent=Dialog) self.dbPath.setText("") self.dbPath.setObjectName("dbPath") - self.horizontalLayout.addWidget(self.dbPath) + self.gridLayout.addWidget(self.dbPath, 3, 0, 1, 2) + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.radioTitle = QtWidgets.QRadioButton(parent=Dialog) self.radioTitle.setChecked(True) self.radioTitle.setObjectName("radioTitle") - self.horizontalLayout.addWidget(self.radioTitle) + self.horizontalLayout_2.addWidget(self.radioTitle) self.radioArtist = QtWidgets.QRadioButton(parent=Dialog) self.radioArtist.setObjectName("radioArtist") - self.horizontalLayout.addWidget(self.radioArtist) + self.horizontalLayout_2.addWidget(self.radioArtist) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout.addItem(spacerItem) + self.horizontalLayout_2.addItem(spacerItem) self.btnAdd = QtWidgets.QPushButton(parent=Dialog) self.btnAdd.setDefault(True) self.btnAdd.setObjectName("btnAdd") - self.horizontalLayout.addWidget(self.btnAdd) + self.horizontalLayout_2.addWidget(self.btnAdd) self.btnAddClose = QtWidgets.QPushButton(parent=Dialog) self.btnAddClose.setObjectName("btnAddClose") - self.horizontalLayout.addWidget(self.btnAddClose) + self.horizontalLayout_2.addWidget(self.btnAddClose) self.btnClose = QtWidgets.QPushButton(parent=Dialog) self.btnClose.setObjectName("btnClose") - self.horizontalLayout.addWidget(self.btnClose) - self.gridLayout.addLayout(self.horizontalLayout, 3, 0, 1, 3) + self.horizontalLayout_2.addWidget(self.btnClose) + self.gridLayout.addLayout(self.horizontalLayout_2, 4, 0, 1, 2) self.lblNote.setBuddy(self.txtNote) self.retranslateUi(Dialog)