Partially port away from KIcon.

This commit is contained in:
Andrius Štikonas 2014-05-17 02:27:42 +01:00
parent a490106e75
commit 066cd120e7
5 changed files with 6 additions and 7 deletions

View File

@ -39,6 +39,8 @@
#include <kcmdlineargs.h>
#include <KLocalizedString>
#include <QIcon>
#include <config.h>
ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationStack& ostack, const QString& name) :

View File

@ -84,8 +84,8 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn
setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Details);
dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
detailsWidget().buttonBrowser().setIcon(KIcon("document-open"));
detailsWidget().buttonSave().setIcon(KIcon("document-save"));
detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme("document-open"));
detailsWidget().buttonSave().setIcon(QIcon::fromTheme("document-save"));
setupConnections();

View File

@ -19,14 +19,12 @@
#include "gui/createpartitiontablewidget.h"
#include <kiconloader.h>
#include <QIcon>
CreatePartitionTableWidget::CreatePartitionTableWidget(QWidget* parent) :
QWidget(parent)
{
setupUi(this);
QIcon icon = KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::NoGroup);
QIcon icon = QIcon::fromTheme("dialog-warning");
iconLabel().setPixmap(icon.pixmap(32, 32));
}

View File

@ -55,7 +55,6 @@ SizeDialogBase::SizeDialogBase(QWidget* parent, Device& d, Partition& part, qint
// Cannot use KGuiItem() for the details button due to a KDialog bug -- it has special handling
// for the details button text but not if using setButtonGuiItem
setButtonText(Details, i18nc("@item:button advanced settings button", "Advanced"));
setButtonIcon(Details, KIcon());
}
void SizeDialogBase::setupDialog()

View File

@ -63,7 +63,7 @@ SmartDialog::SmartDialog(QWidget* parent, Device& d) :
setCaption(i18nc("@title:window", "SMART Properties: <filename>%1</filename>", device().deviceNode()));
setButtons(Close|User1);
setButtonText(User1, i18nc("@action:button", "Save SMART Report"));
button(User1)->setIcon(KIcon("document-save"));
button(User1)->setIcon(QIcon::fromTheme("document-save"));
setupDialog();
setupConnections();