Partially port away from KIcon.
This commit is contained in:
parent
a490106e75
commit
066cd120e7
|
@ -39,6 +39,8 @@
|
||||||
#include <kcmdlineargs.h>
|
#include <kcmdlineargs.h>
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
|
|
||||||
|
#include <QIcon>
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationStack& ostack, const QString& name) :
|
ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationStack& ostack, const QString& name) :
|
||||||
|
|
|
@ -84,8 +84,8 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn
|
||||||
setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Details);
|
setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Details);
|
||||||
|
|
||||||
dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
|
dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
|
||||||
detailsWidget().buttonBrowser().setIcon(KIcon("document-open"));
|
detailsWidget().buttonBrowser().setIcon(QIcon::fromTheme("document-open"));
|
||||||
detailsWidget().buttonSave().setIcon(KIcon("document-save"));
|
detailsWidget().buttonSave().setIcon(QIcon::fromTheme("document-save"));
|
||||||
|
|
||||||
setupConnections();
|
setupConnections();
|
||||||
|
|
||||||
|
|
|
@ -19,14 +19,12 @@
|
||||||
|
|
||||||
#include "gui/createpartitiontablewidget.h"
|
#include "gui/createpartitiontablewidget.h"
|
||||||
|
|
||||||
#include <kiconloader.h>
|
|
||||||
|
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
|
||||||
CreatePartitionTableWidget::CreatePartitionTableWidget(QWidget* parent) :
|
CreatePartitionTableWidget::CreatePartitionTableWidget(QWidget* parent) :
|
||||||
QWidget(parent)
|
QWidget(parent)
|
||||||
{
|
{
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
QIcon icon = KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::NoGroup);
|
QIcon icon = QIcon::fromTheme("dialog-warning");
|
||||||
iconLabel().setPixmap(icon.pixmap(32, 32));
|
iconLabel().setPixmap(icon.pixmap(32, 32));
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
// 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
|
// for the details button text but not if using setButtonGuiItem
|
||||||
setButtonText(Details, i18nc("@item:button advanced settings button", "Advanced"));
|
setButtonText(Details, i18nc("@item:button advanced settings button", "Advanced"));
|
||||||
setButtonIcon(Details, KIcon());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SizeDialogBase::setupDialog()
|
void SizeDialogBase::setupDialog()
|
||||||
|
|
|
@ -63,7 +63,7 @@ SmartDialog::SmartDialog(QWidget* parent, Device& d) :
|
||||||
setCaption(i18nc("@title:window", "SMART Properties: <filename>%1</filename>", device().deviceNode()));
|
setCaption(i18nc("@title:window", "SMART Properties: <filename>%1</filename>", device().deviceNode()));
|
||||||
setButtons(Close|User1);
|
setButtons(Close|User1);
|
||||||
setButtonText(User1, i18nc("@action:button", "Save SMART Report"));
|
setButtonText(User1, i18nc("@action:button", "Save SMART Report"));
|
||||||
button(User1)->setIcon(KIcon("document-save"));
|
button(User1)->setIcon(QIcon::fromTheme("document-save"));
|
||||||
|
|
||||||
setupDialog();
|
setupDialog();
|
||||||
setupConnections();
|
setupConnections();
|
||||||
|
|
Loading…
Reference in New Issue