From 6e286af342965384c9849c43233843bcaf69476f Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 7 Feb 2015 05:57:13 -1000 Subject: [PATCH] Port KeyBindingEditorDialog from KDialog to QDialog --- src/EditProfileDialog.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp index 25fb44f5..62b72f36 100644 --- a/src/EditProfileDialog.cpp +++ b/src/EditProfileDialog.cpp @@ -43,7 +43,6 @@ // KDE #include -#include #include #include #include @@ -880,15 +879,18 @@ void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator) Q_ASSERT(translator); - QWeakPointer dialog = new KDialog(this); + QDialog dialog(this); + QDialogButtonBox *buttonBox = new QDialogButtonBox(&dialog); + buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept())); + connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject())); if (isNewTranslator) - dialog.data()->setWindowTitle(i18n("New Key Binding List")); + dialog.setWindowTitle(i18n("New Key Binding List")); else - dialog.data()->setWindowTitle(i18n("Edit Key Binding List")); + dialog.setWindowTitle(i18n("Edit Key Binding List")); KeyBindingEditor* editor = new KeyBindingEditor; - dialog.data()->setMainWidget(editor); if (translator) editor->setup(translator); @@ -896,7 +898,12 @@ void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator) if (isNewTranslator) editor->setDescription(i18n("New Key Binding List")); - if (dialog.data()->exec() == QDialog::Accepted) { + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(editor); + layout->addWidget(buttonBox); + dialog.setLayout(layout); + + if (dialog.exec() == QDialog::Accepted) { KeyboardTranslator* newTranslator = new KeyboardTranslator(*editor->translator()); if (isNewTranslator) @@ -913,7 +920,6 @@ void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator) updateTempProfileProperty(Profile::KeyBindings, newTranslator->name()); } } - delete dialog.data(); } void EditProfileDialog::newKeyBinding() {