From bf7ae9d692abfe99a00677b8e5210bba4d55b0f7 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 28 Jan 2015 13:45:42 +0100 Subject: [PATCH] Port to QDialog --- .../potentialphishingdetaildialog.cpp | 26 ++++++++++++++----- .../potentialphishingdetaildialog.h | 4 +-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/editor/potentialphishingemail/potentialphishingdetaildialog.cpp b/editor/potentialphishingemail/potentialphishingdetaildialog.cpp index ffbdab308..080fa2171 100644 --- a/editor/potentialphishingemail/potentialphishingdetaildialog.cpp +++ b/editor/potentialphishingemail/potentialphishingdetaildialog.cpp @@ -24,14 +24,25 @@ #include #include #include +#include +#include +#include +#include PotentialPhishingDetailDialog::PotentialPhishingDetailDialog(QWidget *parent) - : KDialog(parent) + : QDialog(parent) { - setCaption(i18n("Details")); - setButtons(Ok | Cancel); - setDefaultButton(Ok); + setWindowTitle(i18n("Details")); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject())); + okButton->setDefault(true); + QVBoxLayout *topLayout = new QVBoxLayout; + setLayout(topLayout); + setModal(true); QWidget *mainWidget = new QWidget(this); QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); @@ -43,8 +54,10 @@ PotentialPhishingDetailDialog::PotentialPhishingDetailDialog(QWidget *parent) mListWidget->setObjectName(QLatin1String("list_widget")); mainLayout->addWidget(mListWidget); - connect(this, SIGNAL(okClicked()), this, SLOT(slotSave())); - setMainWidget(mainWidget); + mainLayout->addWidget(buttonBox); + + connect(okButton, SIGNAL(clicked()), this, SLOT(slotSave())); + topLayout->addWidget(mainWidget); readConfig(); } @@ -102,3 +115,4 @@ void PotentialPhishingDetailDialog::slotSave() } accept(); } + diff --git a/editor/potentialphishingemail/potentialphishingdetaildialog.h b/editor/potentialphishingemail/potentialphishingdetaildialog.h index 6989a171c..910f72e5c 100644 --- a/editor/potentialphishingemail/potentialphishingdetaildialog.h +++ b/editor/potentialphishingemail/potentialphishingdetaildialog.h @@ -21,9 +21,9 @@ #ifndef POTENTIALPHISHINGDETAILDIALOG_H #define POTENTIALPHISHINGDETAILDIALOG_H -#include +#include class QListWidget; -class PotentialPhishingDetailDialog : public KDialog +class PotentialPhishingDetailDialog : public QDialog { Q_OBJECT public: