From 4106ed78fd078ef81963a169be680badb9c9dc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 22 Mar 2020 01:09:50 +0000 Subject: [PATCH] Port away from deprecated IconSize method in the remaining dialogs. --- src/gui/applyprogressdialog.cpp | 14 +++++++------- src/gui/devicepropsdialog.cpp | 4 ++-- src/gui/filesystemsupportdialog.cpp | 4 ++-- src/gui/listdevices.cpp | 2 +- src/gui/listoperations.cpp | 2 +- src/gui/partitionmanagerwidget.cpp | 4 ++-- src/gui/smartdialog.cpp | 4 ++-- src/gui/treelog.cpp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index 4d30dd4..a3f7412 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -93,13 +93,13 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn cancelButton = dialogButtonBox->addButton(QDialogButtonBox::Cancel); detailsButton = new QPushButton; detailsButton->setText(xi18nc("@action:button", "&Details") + QStringLiteral(" >>")); - detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(IconSize(KIconLoader::Toolbar))); + detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); dialogButtonBox->addButton(detailsButton, QDialogButtonBox::ActionRole); mainLayout->addWidget(dialogButtonBox); dialogWidget().treeTasks().setColumnWidth(0, width() * 8 / 10); - detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(IconSize(KIconLoader::Toolbar))); - detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar))); + detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); + detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar))); setupConnections(); @@ -297,7 +297,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) QTreeWidgetItem* child = new QTreeWidgetItem(); child->setText(0, job->description()); - child->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + child->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); child->setText(1, QTime(0, 0).toString(timeFormat())); item->addChild(child); dialogWidget().treeTasks().scrollToBottom(); @@ -309,7 +309,7 @@ void ApplyProgressDialog::onJobStarted(Job* job, Operation* op) void ApplyProgressDialog::onJobFinished(Job* job, Operation* op) { if (currentJobItem()) - currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + currentJobItem()->setIcon(0, QIcon::fromTheme(job->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); setCurrentJobItem(nullptr); @@ -324,7 +324,7 @@ void ApplyProgressDialog::onOpFinished(int num, Operation* op) { if (currentOpItem()) { currentOpItem()->setText(0, opDesc(num, *op)); - currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon()).pixmap(IconSize(KIconLoader::Small))); + currentOpItem()->setIcon(0, QIcon::fromTheme(op->statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } setCurrentOpItem(nullptr); @@ -357,7 +357,7 @@ QString ApplyProgressDialog::opDesc(int num, const Operation& op) const void ApplyProgressDialog::addTaskOutput(int num, const Operation& op) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(op.statusIcon()).pixmap(IconSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(op.statusIcon()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); item->setText(0, opDesc(num, op)); item->setText(1, QTime(0, 0).toString(timeFormat())); diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index 883d11b..8f42dea 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -116,10 +116,10 @@ void DevicePropsDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } else { dialogWidget().smartStatusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } } else { dialogWidget().smartStatusText().setText(xi18nc("@label", "(unknown)")); diff --git a/src/gui/filesystemsupportdialog.cpp b/src/gui/filesystemsupportdialog.cpp index 487b534..eeabe1e 100644 --- a/src/gui/filesystemsupportdialog.cpp +++ b/src/gui/filesystemsupportdialog.cpp @@ -66,8 +66,8 @@ QSize FileSystemSupportDialog::sizeHint() const void FileSystemSupportDialog::setupDialog() { - QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Toolbar)); - QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(IconSize(KIconLoader::Toolbar)); + QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); + QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Toolbar)); dialogWidget().tree().clear(); diff --git a/src/gui/listdevices.cpp b/src/gui/listdevices.cpp index c068f0d..a2ed8c4 100644 --- a/src/gui/listdevices.cpp +++ b/src/gui/listdevices.cpp @@ -29,7 +29,7 @@ class ListDeviceWidgetItem : public QListWidgetItem { public: ListDeviceWidgetItem(const Device& d) : - QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(IconSize(KIconLoader::Desktop)), d.prettyName()), + QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop)), d.prettyName()), deviceNode(d.deviceNode()) { setToolTip(d.prettyName()); setSizeHint(QSize(0, 32)); diff --git a/src/gui/listoperations.cpp b/src/gui/listoperations.cpp index 77362ed..bea6dca 100644 --- a/src/gui/listoperations.cpp +++ b/src/gui/listoperations.cpp @@ -41,7 +41,7 @@ void ListOperations::updateOperations(const OperationStack::Operations& ops) listOperations().clear(); for (const auto &op : ops) { - QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(IconSize(KIconLoader::Small)), op->description()); + QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small)), op->description()); item->setToolTip(op->description()); listOperations().addItem(item); } diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index 7c6252e..dbf0135 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -217,7 +217,7 @@ static QTreeWidgetItem* createTreeWidgetItem(const Partition& p) item->setText(i, p.mountPoint()); if (p.isMounted()) - item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(IconSize(KIconLoader::Panel))); + item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Panel))); i++; item->setText(i++, p.fileSystem().label()); @@ -258,7 +258,7 @@ void PartitionManagerWidget::updatePartitions() deviceItem->setFont(0, font); deviceItem->setText(0, selectedDevice()->prettyName()); - deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(IconSize(KIconLoader::Desktop))); + deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(KIconLoader::global()->currentSize(KIconLoader::Desktop))); deviceItem->setSizeHint(0, QSize(0, 32)); diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index 78c6c64..d4a48e0 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -89,10 +89,10 @@ void SmartDialog::setupDialog() if (device().smartStatus().isValid()) { if (device().smartStatus().status()) { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "good")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } else { dialogWidget().statusText().setText(xi18nc("@label SMART disk status", "BAD")); - dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small))); + dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); } dialogWidget().modelName().setText(device().smartStatus().modelName()); diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index 9cd0f6d..e0e593b 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -153,7 +153,7 @@ void TreeLog::onNewLogMessage(Log::Level logLevel, const QString& s) if (static_cast(logLevel) >= Config::minLogLevel()) { QTreeWidgetItem* item = new QTreeWidgetItem(); - item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)]).pixmap(IconSize(KIconLoader::Small))); + item->setIcon(0, QIcon::fromTheme(icons[static_cast(logLevel)]).pixmap(KIconLoader::global()->currentSize(KIconLoader::Small))); item->setText(1, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss"))); item->setText(2, s);