andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Add HiDPI support.

This commit is contained in:
Andrius Štikonas 2015-04-09 23:26:40 +03:00
parent d761cd090f
commit 9d135978ad
13 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/configureoptionsdialog.cpp
View File

@ -51,18 +51,18 @@ ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationS
KPageWidgetItem* item = NULL;
item = addPage(&generalPageWidget(), i18nc("@title:tab general application settings", "General"), QString(), i18n("General Settings"));
item->setIcon(KIconLoader().loadIcon(QLatin1String("partitionmanager"), KIconLoader::Desktop));
item->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(IconSize(KIconLoader::Desktop)));
connect(&generalPageWidget().comboDefaultFileSystem(), SIGNAL(activated(int)), SLOT(onComboDefaultFileSystemActivated(int)));
connect(generalPageWidget().radioButton, &QRadioButton::toggled, this, &ConfigureOptionsDialog::onShredSourceActivated);
item = addPage(&fileSystemColorsPageWidget(), i18nc("@title:tab", "File System Colors"), QString(), i18n("File System Color Settings"));
item->setIcon(KIconLoader().loadIcon(QLatin1String("format-fill-color"), KIconLoader::Desktop));
item->setIcon(QIcon::fromTheme(QStringLiteral("format-fill-color")).pixmap(IconSize(KIconLoader::Desktop)));
if (QCoreApplication::arguments().contains(QLatin1String("--advconfig")))
{
item = addPage(&advancedPageWidget(), i18nc("@title:tab advanced application settings", "Advanced"), QString(), i18n("Advanced Settings"));
item->setIcon(KIconLoader().loadIcon(QLatin1String("configure"), KIconLoader::Desktop));
item->setIcon(QIcon::fromTheme(QStringLiteral("configure")).pixmap(IconSize(KIconLoader::Desktop)));
connect(&advancedPageWidget().comboBackend(), SIGNAL(activated(int)), SLOT(onComboBackendActivated(int)));
}

7
src/gui/applyprogressdialog.cpp
View File

@ -46,6 +46,7 @@
#include <KIO/CopyJob>
#include <KJobUiDelegate>
#include <KLocalizedString>
#include <KIconLoader>
#include <KMessageBox>
#include <KSharedConfig>
@ -91,13 +92,13 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn
cancelButton = dialogButtonBox->addButton( QDialogButtonBox::Cancel );
detailsButton = new QPushButton;
detailsButton->setText(i18n("&Details") + QStringLiteral(" >>"));
detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")));
detailsButton->setIcon(QIcon::fromTheme(QStringLiteral("help-about")).pixmap(IconSize(KIconLoader::Toolbar)));
dialogButtonBox->addButton(detailsButton, QDialogButtonBox::ActionRole);
mainLayout->addWidget(dialogButtonBox);
dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")));
detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")));
detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(IconSize(KIconLoader::Toolbar)));
detailsWidget().buttonSave().setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar)));
setupConnections();

6
src/gui/devicepropsdialog.cpp
View File

@ -30,7 +30,7 @@
#include <KLocalizedString>
#include <KSharedConfig>
#include <KConfigGroup>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <QDialogButtonBox>
#include <QPointer>
@ -124,12 +124,12 @@ void DevicePropsDialog::setupDialog()
if (device().smartStatus().status())
{
dialogWidget().smartStatusText().setText(i18nc("@label SMART disk status", "good"));
dialogWidget().smartStatusIcon().setPixmap(KIconLoader().loadIcon(QLatin1String("dialog-ok"), KIconLoader::Small));
dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small)));
}
else
{
dialogWidget().smartStatusText().setText(i18nc("@label SMART disk status", "BAD"));
dialogWidget().smartStatusIcon().setPixmap(KIconLoader().loadIcon(QLatin1String("dialog-warning"), KIconLoader::Small));
dialogWidget().smartStatusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small)));
}
}
else

6
src/gui/filesystemsupportdialog.cpp
View File

@ -24,7 +24,7 @@
#include <QDialogButtonBox>
#include <QDialog>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KLocalizedString>
#include <KConfigGroup>
#include <KSharedConfig>
@ -65,8 +65,8 @@ QSize FileSystemSupportDialog::sizeHint() const
void FileSystemSupportDialog::setupDialog()
{
QIcon yes = QIcon(KIconLoader().loadIcon(QLatin1String("dialog-ok"), KIconLoader::Toolbar));
QIcon no = QIcon(KIconLoader().loadIcon(QLatin1String("dialog-error"), KIconLoader::Toolbar));
QIcon yes = QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Toolbar));
QIcon no = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(IconSize(KIconLoader::Toolbar));
dialogWidget().tree().clear();

4
src/gui/listdevices.cpp
View File

@ -22,13 +22,13 @@
#include "util/globallog.h"
#include "util/capacity.h"
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
class ListDeviceWidgetItem : public QListWidgetItem
{
public:
ListDeviceWidgetItem(const Device& d) :
QListWidgetItem(QIcon(KIconLoader().loadIcon(d.iconName(), KIconLoader::Desktop)), d.prettyName()),
QListWidgetItem(QIcon::fromTheme(d.iconName()).pixmap(IconSize(KIconLoader::Desktop)), d.prettyName()),
deviceNode(d.deviceNode())
{
setToolTip(d.prettyName());

4
src/gui/listoperations.cpp
View File

@ -22,7 +22,7 @@
#include "util/globallog.h"
#include "util/capacity.h"
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
/** Creates a new ListOperations instance.
@param parent the parent widget
@ -41,7 +41,7 @@ void ListOperations::updateOperations(const OperationStack::Operations& ops)
foreach (const Operation* op, ops)
{
QListWidgetItem* item = new QListWidgetItem(QIcon(KIconLoader().loadIcon(op->iconName(), KIconLoader::Small)), op->description());
QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(IconSize(KIconLoader::Small)), op->description());
item->setToolTip(op->description());
listOperations().addItem(item);
}

40
src/gui/mainwindow.cpp
View File

@ -186,21 +186,21 @@ void MainWindow::setupActions()
undoOperation->setToolTip(i18nc("@info:tooltip", "Undo the last operation"));
undoOperation->setStatusTip(i18nc("@info:status", "Remove the last operation from the list."));
undoOperation->setShortcut(Qt::CTRL | Qt::Key_Z);
undoOperation->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-undo"), KIconLoader::Toolbar)));
undoOperation->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* clearAllOperations = actionCollection()->addAction(QStringLiteral("clearAllOperations"), this, SLOT(onClearAllOperations()));
clearAllOperations->setEnabled(false);
clearAllOperations->setText(i18nc("@action:inmenu clear the list of operations", "Clear"));
clearAllOperations->setToolTip(i18nc("@info:tooltip", "Clear all operations"));
clearAllOperations->setStatusTip(i18nc("@info:status", "Empty the list of pending operations."));
clearAllOperations->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("dialog-cancel"), KIconLoader::Toolbar)));
clearAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-cancel")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* applyAllOperations = actionCollection()->addAction(QStringLiteral("applyAllOperations"), this, SLOT(onApplyAllOperations()));
applyAllOperations->setEnabled(false);
applyAllOperations->setText(i18nc("@action:inmenu apply all operations", "Apply"));
applyAllOperations->setToolTip(i18nc("@info:tooltip", "Apply all operations"));
applyAllOperations->setStatusTip(i18nc("@info:status", "Apply the pending operations in the list."));
applyAllOperations->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("dialog-ok-apply"), KIconLoader::Toolbar)));
applyAllOperations->setIcon(QIcon::fromTheme(QStringLiteral("dialog-ok-apply")).pixmap(IconSize(KIconLoader::Toolbar)));
// Device actions
QAction* refreshDevices = actionCollection()->addAction(QStringLiteral("refreshDevices"), this, SLOT(onRefreshDevices()));
@ -208,7 +208,7 @@ void MainWindow::setupActions()
refreshDevices->setToolTip(i18nc("@info:tooltip", "Refresh all devices"));
refreshDevices->setStatusTip(i18nc("@info:status", "Renew the devices list."));
refreshDevices->setShortcut(Qt::Key_F5);
refreshDevices->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("view-refresh"), KIconLoader::Toolbar)));
refreshDevices->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* createNewPartitionTable = actionCollection()->addAction(QStringLiteral("createNewPartitionTable"), this, SLOT(onCreateNewPartitionTable()));
createNewPartitionTable->setEnabled(false);
@ -216,21 +216,21 @@ void MainWindow::setupActions()
createNewPartitionTable->setToolTip(i18nc("@info:tooltip", "Create a new partition table"));
createNewPartitionTable->setStatusTip(i18nc("@info:status", "Create a new and empty partition table on a device."));
createNewPartitionTable->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N);
createNewPartitionTable->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-clear"), KIconLoader::Toolbar)));
createNewPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* exportPartitionTable = actionCollection()->addAction(QStringLiteral("exportPartitionTable"), this, SLOT(onExportPartitionTable()));
exportPartitionTable->setEnabled(false);
exportPartitionTable->setText(i18nc("@action:inmenu", "Export Partition Table"));
exportPartitionTable->setToolTip(i18nc("@info:tooltip", "Export a partition table"));
exportPartitionTable->setStatusTip(i18nc("@info:status", "Export the device's partition table to a text file."));
exportPartitionTable->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-export"), KIconLoader::Toolbar)));
exportPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* importPartitionTable = actionCollection()->addAction(QStringLiteral("importPartitionTable"), this, SLOT(onImportPartitionTable()));
importPartitionTable->setEnabled(false);
importPartitionTable->setText(i18nc("@action:inmenu", "Import Partition Table"));
importPartitionTable->setToolTip(i18nc("@info:tooltip", "Import a partition table"));
importPartitionTable->setStatusTip(i18nc("@info:status", "Import a partition table from a text file."));
importPartitionTable->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-import"), KIconLoader::Toolbar)));
importPartitionTable->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* smartStatusDevice = actionCollection()->addAction(QStringLiteral("smartStatusDevice"), this, SLOT(onSmartStatusDevice()));
smartStatusDevice->setEnabled(false);
@ -243,7 +243,7 @@ void MainWindow::setupActions()
propertiesDevice->setText(i18nc("@action:inmenu", "Properties"));
propertiesDevice->setToolTip(i18nc("@info:tooltip", "Show device properties dialog"));
propertiesDevice->setStatusTip(i18nc("@info:status", "View and modify device properties"));
propertiesDevice->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-properties"), KIconLoader::Toolbar)));
propertiesDevice->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(IconSize(KIconLoader::Toolbar)));
// Partition actions
QAction* newPartition = actionCollection()->addAction(QStringLiteral("newPartition"), &pmWidget(), SLOT(onNewPartition()));
@ -252,7 +252,7 @@ void MainWindow::setupActions()
newPartition->setToolTip(i18nc("@info:tooltip", "New partition"));
newPartition->setStatusTip(i18nc("@info:status", "Create a new partition."));
newPartition->setShortcut(Qt::CTRL | Qt::Key_N);
newPartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-new"), KIconLoader::Toolbar)));
newPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-new")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* resizePartition = actionCollection()->addAction(QStringLiteral("resizePartition"), &pmWidget(), SLOT(onResizePartition()));
resizePartition->setEnabled(false);
@ -260,7 +260,7 @@ void MainWindow::setupActions()
resizePartition->setToolTip(i18nc("@info:tooltip", "Resize or move partition"));
resizePartition->setStatusTip(i18nc("@info:status", "Shrink, grow or move an existing partition."));
resizePartition->setShortcut(Qt::CTRL | Qt::Key_R);
resizePartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("arrow-right-double"), KIconLoader::Toolbar)));
resizePartition->setIcon(QIcon::fromTheme(QStringLiteral("arrow-right-double")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* deletePartition = actionCollection()->addAction(QStringLiteral("deletePartition"), &pmWidget(), SLOT(onDeletePartition()));
deletePartition->setEnabled(false);
@ -268,7 +268,7 @@ void MainWindow::setupActions()
deletePartition->setToolTip(i18nc("@info:tooltip", "Delete partition"));
deletePartition->setStatusTip(i18nc("@info:status", "Delete a partition."));
deletePartition->setShortcut(Qt::Key_Delete);
deletePartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-delete"), KIconLoader::Toolbar)));
deletePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* shredPartition = actionCollection()->addAction(QStringLiteral("shredPartition"), &pmWidget(), SLOT(onShredPartition()));
shredPartition->setEnabled(false);
@ -276,7 +276,7 @@ void MainWindow::setupActions()
shredPartition->setToolTip(i18nc("@info:tooltip", "Shred partition"));
shredPartition->setStatusTip(i18nc("@info:status", "Shred a partition so that its contents cannot be restored."));
shredPartition->setShortcut(Qt::SHIFT | Qt::Key_Delete);
shredPartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-delete-shred"), KIconLoader::Toolbar)));
shredPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* copyPartition = actionCollection()->addAction(QStringLiteral("copyPartition"), &pmWidget(), SLOT(onCopyPartition()));
copyPartition->setEnabled(false);
@ -284,7 +284,7 @@ void MainWindow::setupActions()
copyPartition->setToolTip(i18nc("@info:tooltip", "Copy partition"));
copyPartition->setStatusTip(i18nc("@info:status", "Copy an existing partition."));
copyPartition->setShortcut(Qt::CTRL | Qt::Key_C);
copyPartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-copy"), KIconLoader::Toolbar)));
copyPartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* pastePartition = actionCollection()->addAction(QStringLiteral("pastePartition"), &pmWidget(), SLOT(onPastePartition()));
pastePartition->setEnabled(false);
@ -292,7 +292,7 @@ void MainWindow::setupActions()
pastePartition->setToolTip(i18nc("@info:tooltip", "Paste partition"));
pastePartition->setStatusTip(i18nc("@info:status", "Paste a copied partition."));
pastePartition->setShortcut(Qt::CTRL | Qt::Key_V);
pastePartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-paste"), KIconLoader::Toolbar)));
pastePartition->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* editMountPoint = actionCollection()->addAction(QStringLiteral("editMountPoint"), &pmWidget(), SLOT(onEditMountPoint()));
editMountPoint->setEnabled(false);
@ -311,28 +311,28 @@ void MainWindow::setupActions()
checkPartition->setText(i18nc("@action:inmenu", "Check"));
checkPartition->setToolTip(i18nc("@info:tooltip", "Check partition"));
checkPartition->setStatusTip(i18nc("@info:status", "Check a filesystem on a partition for errors."));
checkPartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("flag"), KIconLoader::Toolbar)));
checkPartition->setIcon(QIcon::fromTheme(QStringLiteral("flag")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* propertiesPartition = actionCollection()->addAction(QStringLiteral("propertiesPartition"), &pmWidget(), SLOT(onPropertiesPartition()));
propertiesPartition->setEnabled(false);
propertiesPartition->setText(i18nc("@action:inmenu", "Properties"));
propertiesPartition->setToolTip(i18nc("@info:tooltip", "Show partition properties dialog"));
propertiesPartition->setStatusTip(i18nc("@info:status", "View and modify partition properties (label, partition flags, etc.)"));
propertiesPartition->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-properties"), KIconLoader::Toolbar)));
propertiesPartition->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* backup = actionCollection()->addAction(QStringLiteral("backupPartition"), &pmWidget(), SLOT(onBackupPartition()));
backup->setEnabled(false);
backup->setText(i18nc("@action:inmenu", "Backup"));
backup->setToolTip(i18nc("@info:tooltip", "Backup partition"));
backup->setStatusTip(i18nc("@info:status", "Backup a partition to an image file."));
backup->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-export"), KIconLoader::Toolbar)));
backup->setIcon(QIcon::fromTheme(QStringLiteral("document-export")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* restore = actionCollection()->addAction(QStringLiteral("restorePartition"), &pmWidget(), SLOT(onRestorePartition()));
restore->setEnabled(false);
restore->setText(i18nc("@action:inmenu", "Restore"));
restore->setToolTip(i18nc("@info:tooltip", "Restore partition"));
restore->setStatusTip(i18nc("@info:status", "Restore a partition from an image file."));
restore->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-import"), KIconLoader::Toolbar)));
restore->setIcon(QIcon::fromTheme(QStringLiteral("document-import")).pixmap(IconSize(KIconLoader::Toolbar)));
// View actions
QAction* fileSystemSupport = actionCollection()->addAction(QStringLiteral("fileSystemSupport"), this, SLOT(onFileSystemSupport()));
@ -353,13 +353,13 @@ void MainWindow::setupActions()
clearLog->setText(i18nc("@action:inmenu", "Clear Log"));
clearLog->setToolTip(i18nc("@info:tooltip", "Clear the log output"));
clearLog->setStatusTip(i18nc("@info:status", "Clear the log output panel."));
clearLog->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("edit-clear-list"), KIconLoader::Toolbar)));
clearLog->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")).pixmap(IconSize(KIconLoader::Toolbar)));
QAction* saveLog = actionCollection()->addAction(QStringLiteral("saveLog"), &treeLog(), SLOT(onSaveLog()));
saveLog->setText(i18nc("@action:inmenu", "Save Log"));
saveLog->setToolTip(i18nc("@info:tooltip", "Save the log output"));
saveLog->setStatusTip(i18nc("@info:status", "Save the log output to a file."));
saveLog->setIcon(QIcon(KIconLoader().loadIcon(QStringLiteral("document-save"), KIconLoader::Toolbar)));
saveLog->setIcon(QIcon::fromTheme(QStringLiteral("document-save")).pixmap(IconSize(KIconLoader::Toolbar)));
}
void MainWindow::setupConnections()

7
src/gui/partitionmanagerwidget.cpp
View File

@ -53,7 +53,7 @@
#include <QPointer>
#include <QReadLocker>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KLocalizedString>
#include <KMessageBox>
@ -213,7 +213,7 @@ static QTreeWidgetItem* createTreeWidgetItem(const Partition& p)
item->setText(i, p.mountPoint());
if (p.isMounted())
item->setIcon(i, QIcon(KIconLoader().loadIcon(QLatin1String("object-locked"), KIconLoader::Small)));
item->setIcon(i, QIcon::fromTheme(QStringLiteral("object-locked")).pixmap(IconSize(KIconLoader::Panel)));
i++;
item->setText(i++, p.fileSystem().label());
@ -251,7 +251,8 @@ void PartitionManagerWidget::updatePartitions()
deviceItem->setFont(0, font);
deviceItem->setText(0, selectedDevice()->prettyName());
deviceItem->setIcon(0, QIcon(KIconLoader().loadIcon(selectedDevice()->iconName(), KIconLoader::Desktop)));
deviceItem->setIcon(0, QIcon::fromTheme(selectedDevice()->iconName()).pixmap(IconSize(KIconLoader::Desktop)));
deviceItem->setSizeHint(0, QSize(0, 32));
treePartitions().addTopLevelItem(deviceItem);

6
src/gui/smartdialog.cpp
View File

@ -38,7 +38,7 @@
#include <KConfigGroup>
#include <KFormat>
#include <KLocalizedString>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KIO/CopyJob>
#include <KJobUiDelegate>
#include <KMessageBox>
@ -89,12 +89,12 @@ void SmartDialog::setupDialog()
if (device().smartStatus().status())
{
dialogWidget().statusText().setText(i18nc("@label SMART disk status", "good"));
dialogWidget().statusIcon().setVisible(false);
dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-ok")).pixmap(IconSize(KIconLoader::Small)));
}
else
{
dialogWidget().statusText().setText(i18nc("@label SMART disk status", "BAD"));
dialogWidget().statusIcon().setPixmap(KIconLoader().loadIcon(QLatin1String("dialog-warning"), KIconLoader::Small));
dialogWidget().statusIcon().setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(IconSize(KIconLoader::Small)));
}
dialogWidget().modelName().setText(device().smartStatus().modelName());

4
src/gui/treelog.cpp
View File

@ -32,7 +32,7 @@
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KIO/CopyJob>
#include <KJobUiDelegate>
#include <KLocalizedString>
@ -167,7 +167,7 @@ void TreeLog::onNewLogMessage(Log::Level logLevel, const QString& s)
{
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setIcon(0, QIcon(KIconLoader().loadIcon(icons[logLevel], KIconLoader::Small)));
item->setIcon(0, QIcon::fromTheme(icons[logLevel]).pixmap(IconSize(KIconLoader::Small)));
item->setText(1, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd hh:mm:ss")));
item->setText(2, s);

4
src/jobs/job.cpp
View File

@ -29,7 +29,7 @@
#include <QIcon>
#include <QTime>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KLocalizedString>
Job::Job() :
@ -217,7 +217,7 @@ QIcon Job::statusIcon() const
if (status() < 0 || static_cast<quint32>(status()) >= sizeof(icons) / sizeof(icons[0]))
return QIcon();
return QIcon(KIconLoader().loadIcon(icons[status()], KIconLoader::Small));
return QIcon::fromTheme(icons[status()]).pixmap(IconSize(KIconLoader::Small));
}
/** @return the Job's current status text */

1
src/main.cpp
View File

@ -57,6 +57,7 @@ int Q_DECL_IMPORT main(int argc, char* argv[])
aboutData->addCredit(i18n("Hugo Pereira Da Costa"), i18nc("@info:credit", "Partition Widget Design"), QStringLiteral("hugo@oxygen-icons.org"));
KAboutData::setApplicationData(*aboutData);
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
QCommandLineParser parser;
parser.setApplicationDescription( aboutData->shortDescription() );

4
src/ops/operation.cpp
View File

@ -28,7 +28,7 @@
#include <QIcon>
#include <QString>
#include <KIconThemes/KIconLoader>
#include <KIconLoader>
#include <KLocalizedString>
Operation::Operation() :
@ -113,7 +113,7 @@ QIcon Operation::statusIcon() const
if (status() == StatusNone)
return QIcon();
return QIcon(KIconLoader().loadIcon(icons[status()], KIconLoader::Small));
return QIcon::fromTheme(icons[status()]).pixmap(IconSize(KIconLoader::Small));
}
void Operation::addJob(Job* job)