[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konqueror/Applications/16.12] /: Use QDialogButtonBox
From:       Pino Toscano <pino () kde ! org>
Date:       2016-12-10 7:35:49
Message-ID: E1cFcCD-0007Cf-Hz () code ! kde ! org
[Download RAW message or body]

Git commit f70c8f3aa7f969240db16cf3138d5932cc9a4083 by Pino Toscano.
Committed on 10/12/2016 at 07:35.
Pushed by pino into branch 'Applications/16.12'.

Use QDialogButtonBox

... instead of creating standard buttons manually

M  +5    -13   plugins/searchbar/WebShortcutWidget.cpp
M  +4    -9    settings/konqhtml/pluginopts.cpp

https://commits.kde.org/konqueror/f70c8f3aa7f969240db16cf3138d5932cc9a4083

diff --git a/plugins/searchbar/WebShortcutWidget.cpp b/plugins/searchbar/WebShortcutWidget.cpp
index a1dfe363a..6ca5059d4 100644
--- a/plugins/searchbar/WebShortcutWidget.cpp
+++ b/plugins/searchbar/WebShortcutWidget.cpp
@@ -25,6 +25,7 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QFormLayout>
+#include <QDialogButtonBox>
 
 #include <KGlobalSettings>
 
@@ -68,19 +69,10 @@ WebShortcutWidget::WebShortcutWidget(QWidget *parent)
     m_wsLineEdit->setFont(smallFont);
     formLayout->addRow(shortcutsLabel, m_wsLineEdit);
 
-    QHBoxLayout *buttonLayout = new QHBoxLayout();
-    mainLayout->addLayout(buttonLayout);
-    buttonLayout->addStretch();
-    QPushButton *okButton = new QPushButton(this);
-    KGuiItem::assign(okButton, KStandardGuiItem::ok());
-    okButton->setDefault(true);
-    buttonLayout->addWidget(okButton);
-    connect(okButton, &QAbstractButton::clicked, this, &WebShortcutWidget::okClicked);
-
-    QPushButton *cancelButton = new QPushButton(i18n("Cancel"), this);
-    KGuiItem::assign(cancelButton, KStandardGuiItem::cancel());
-    buttonLayout->addWidget(cancelButton);
-    connect(cancelButton, &QAbstractButton::clicked, this, &WebShortcutWidget::cancelClicked);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    mainLayout->addWidget(buttonBox);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &WebShortcutWidget::okClicked);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &WebShortcutWidget::cancelClicked);
 
     resize(minimumSizeHint());
 
diff --git a/settings/konqhtml/pluginopts.cpp b/settings/konqhtml/pluginopts.cpp
index 343327c76..7873ec383 100644
--- a/settings/konqhtml/pluginopts.cpp
+++ b/settings/konqhtml/pluginopts.cpp
@@ -24,6 +24,7 @@
 #include <QLabel>
 #include <QSlider>
 #include <QTreeWidget>
+#include <QDialogButtonBox>
 
 // KDE
 #include <kprocess.h>
@@ -635,15 +636,9 @@ PluginDomainDialog::PluginDomainDialog(QWidget *parent) :
     thisLayout->addWidget(hrule);
     thisLayout->addSpacing(6);
 
-    QBoxLayout *hl = new QHBoxLayout(this);
-    hl->setMargin(0);
-    hl->addStretch(10);
-
-    QPushButton *closePB = new QPushButton;
-    KGuiItem::assign(closePB, KStandardGuiItem::close());
-    connect(closePB, SIGNAL(clicked()), SLOT(slotClose()));
-    hl->addWidget(closePB);
-    thisLayout->addLayout(hl);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
+    connect(buttonBox, SIGNAL(rejected()), SLOT(slotClose()));
+    thisLayout->addWidget(buttonBox);
 }
 
 PluginDomainDialog::~PluginDomainDialog()
[prev in list] [next in list] [prev in thread] [next in thread]