From f62b13957c705aed43cb146f0ca5efcc751e8f92 Mon Sep 17 00:00:00 2001 From: Warchamp7 Date: Wed, 9 Apr 2025 18:25:08 -0700 Subject: [PATCH] frontend: Remove unused item delegate parameters --- frontend/data/themes/Yami.obt | 4 ++ frontend/data/themes/Yami_Light.ovt | 4 ++ frontend/dialogs/OBSMissingFiles.cpp | 3 +- .../utility/MissingFilesPathItemDelegate.cpp | 47 ++++++++----------- .../utility/MissingFilesPathItemDelegate.hpp | 4 +- 5 files changed, 29 insertions(+), 33 deletions(-) diff --git a/frontend/data/themes/Yami.obt b/frontend/data/themes/Yami.obt index b33c87af0..695191baf 100644 --- a/frontend/data/themes/Yami.obt +++ b/frontend/data/themes/Yami.obt @@ -350,6 +350,10 @@ qproperty-icon: url(theme:Dark/save.svg); } +.icon-close { + qproperty-icon: url(theme:Dark/close.svg); +} + /* Media icons */ .icon-media-play { diff --git a/frontend/data/themes/Yami_Light.ovt b/frontend/data/themes/Yami_Light.ovt index 4d31b3e31..a1d5a2594 100644 --- a/frontend/data/themes/Yami_Light.ovt +++ b/frontend/data/themes/Yami_Light.ovt @@ -118,6 +118,10 @@ QPushButton#sourceFiltersButton { qproperty-icon: url(theme:Light/revert.svg); } +.icon-close { + qproperty-icon: url(theme:Light/close.svg); +} + QToolBarExtension { qproperty-icon: url(theme:Light/dots-vert.svg); } diff --git a/frontend/dialogs/OBSMissingFiles.cpp b/frontend/dialogs/OBSMissingFiles.cpp index b1d6551b9..029945301 100644 --- a/frontend/dialogs/OBSMissingFiles.cpp +++ b/frontend/dialogs/OBSMissingFiles.cpp @@ -35,8 +35,7 @@ OBSMissingFiles::OBSMissingFiles(obs_missing_files_t *files, QWidget *parent) ui->setupUi(this); ui->tableView->setModel(filesModel); - ui->tableView->setItemDelegateForColumn(MissingFilesColumn::NewPath, - new MissingFilesPathItemDelegate(true, "")); + ui->tableView->setItemDelegateForColumn(MissingFilesColumn::NewPath, new MissingFilesPathItemDelegate()); ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeMode::ResizeToContents); ui->tableView->horizontalHeader()->setMaximumSectionSize(width() / 4); ui->tableView->horizontalHeader()->setSectionResizeMode(MissingFilesColumn::NewPath, diff --git a/frontend/utility/MissingFilesPathItemDelegate.cpp b/frontend/utility/MissingFilesPathItemDelegate.cpp index 8bba2b0c8..298557628 100644 --- a/frontend/utility/MissingFilesPathItemDelegate.cpp +++ b/frontend/utility/MissingFilesPathItemDelegate.cpp @@ -28,12 +28,7 @@ enum MissingFilesRole { EntryStateRole = Qt::UserRole, NewPathsToProcessRole }; -MissingFilesPathItemDelegate::MissingFilesPathItemDelegate(bool isOutput, const QString &defaultPath) - : QStyledItemDelegate(), - isOutput(isOutput), - defaultPath(defaultPath) -{ -} +MissingFilesPathItemDelegate::MissingFilesPathItemDelegate() : QStyledItemDelegate() {} QWidget *MissingFilesPathItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex &) const @@ -68,15 +63,15 @@ QWidget *MissingFilesPathItemDelegate::createEditor(QWidget *parent, const QStyl container->connect(browseButton, &QToolButton::clicked, browseCallback); - // The "clear" button is not shown in input cells - if (isOutput) { - QToolButton *clearButton = new QToolButton(); - clearButton->setText("X"); - clearButton->setSizePolicy(buttonSizePolicy); - layout->addWidget(clearButton); + QToolButton *clearButton = new QToolButton(); + QIcon icon; + icon.addFile(QString::fromUtf8(":/res/images/close.svg"), QSize(), QIcon::Mode::Normal, QIcon::State::Off); + clearButton->setIcon(icon); + clearButton->setProperty("class", "icon-close"); + clearButton->setSizePolicy(buttonSizePolicy); + layout->addWidget(clearButton); - container->connect(clearButton, &QToolButton::clicked, clearCallback); - } + container->connect(clearButton, &QToolButton::clicked, clearCallback); container->setLayout(layout); container->setFocusProxy(text); @@ -105,10 +100,7 @@ void MissingFilesPathItemDelegate::setModelData(QWidget *editor, QAbstractItemMo QVariant pathListProp = editor->property(PATH_LIST_PROP); if (pathListProp.isValid()) { QStringList list = editor->property(PATH_LIST_PROP).toStringList(); - if (isOutput) { - model->setData(index, list); - } else - model->setData(index, list, MissingFilesRole::NewPathsToProcessRole); + model->setData(index, list); } else { QLineEdit *lineEdit = editor->findChild(); model->setData(index, lineEdit->text(), 0); @@ -137,22 +129,21 @@ void MissingFilesPathItemDelegate::handleBrowse(QWidget *container) QString currentPath = text->text(); if (currentPath.isEmpty() || currentPath.compare(QTStr("MissingFiles.Clear")) == 0) - currentPath = defaultPath; + currentPath = ""; bool isSet = false; - if (isOutput) { - QString newPath = - QFileDialog::getOpenFileName(container, QTStr("MissingFiles.SelectFile"), currentPath, nullptr); + + QString newPath = + QFileDialog::getOpenFileName(container, QTStr("MissingFiles.SelectFile"), currentPath, nullptr); #ifdef __APPLE__ - // TODO: Revisit when QTBUG-42661 is fixed - container->window()->raise(); + // TODO: Revisit when QTBUG-42661 is fixed + container->window()->raise(); #endif - if (!newPath.isEmpty()) { - container->setProperty(PATH_LIST_PROP, QStringList() << newPath); - isSet = true; - } + if (!newPath.isEmpty()) { + container->setProperty(PATH_LIST_PROP, QStringList() << newPath); + isSet = true; } if (isSet) diff --git a/frontend/utility/MissingFilesPathItemDelegate.hpp b/frontend/utility/MissingFilesPathItemDelegate.hpp index c1a602944..912169c36 100644 --- a/frontend/utility/MissingFilesPathItemDelegate.hpp +++ b/frontend/utility/MissingFilesPathItemDelegate.hpp @@ -23,7 +23,7 @@ class MissingFilesPathItemDelegate : public QStyledItemDelegate { Q_OBJECT public: - MissingFilesPathItemDelegate(bool isOutput, const QString &defaultPath); + MissingFilesPathItemDelegate(); virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex &index) const override; @@ -37,8 +37,6 @@ protected: void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const override; private: - bool isOutput; - QString defaultPath; const char *PATH_LIST_PROP = "pathList"; void handleBrowse(QWidget *container);