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

List:       kde-commits
Subject:    [kooka/frameworks] kooka: Port to QDialog
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-16 6:21:03
Message-ID: E1XeeQp-0006eo-L6 () scm ! kde ! org
[Download RAW message or body]

Git commit efb32b6581e64a86384c68f38b145f5adb4ffaf6 by Montel Laurent.
Committed on 16/10/2014 at 05:58.
Pushed by mlaurent into branch 'frameworks'.

Port to QDialog

M  +24   -9    kooka/newscanparams.cpp
M  +4    -3    kooka/newscanparams.h

http://commits.kde.org/kooka/efb32b6581e64a86384c68f38b145f5adb4ffaf6

diff --git a/kooka/newscanparams.cpp b/kooka/newscanparams.cpp
index 70c4b58..8f437e6 100644
--- a/kooka/newscanparams.cpp
+++ b/kooka/newscanparams.cpp
@@ -26,38 +26,53 @@
 #include <klocale.h>
 #include <QDebug>
 #include <kvbox.h>
+#include <KConfigGroup>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 NewScanParams::NewScanParams(QWidget *parent,
                              const QString &name, const QString &desc, bool renaming)
-    : KDialog(parent)
+    : QDialog(parent)
 {
     setObjectName("NewScanParams");
 
     setModal(true);
-    setButtons(KDialog::Ok | KDialog::Cancel);
-    showButtonSeparator(true);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    mOkButton = buttonBox->button(QDialogButtonBox::Ok);
+    mOkButton->setDefault(true);
+    mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     KVBox *vb = new KVBox(this);
-    vb->setMargin(KDialog::marginHint());
-    vb->setSpacing(KDialog::spacingHint());
-    setMainWidget(vb);
+//TODO PORT QT5     vb->setMargin(QDialog::marginHint());
+//TODO PORT QT5     vb->setSpacing(QDialog::spacingHint());
+    mainLayout->addWidget(vb);
+    mainLayout->addWidget(buttonBox);
 
     if (renaming) {
-        setCaption(i18n("Edit Scan Parameters"));
+        setWindowTitle(i18n("Edit Scan Parameters"));
         new QLabel(i18n("Change the name and/or description of the scan parameter set."), vb);
     } else {
-        setCaption(i18n("Save Scan Parameters"));
+        setWindowTitle(i18n("Save Scan Parameters"));
         new QLabel(i18n("Enter a name and description for the new scan parameter set."), vb);
     }
     new QLabel("", vb);
 
     QLabel *l = new QLabel(i18n("Set name:"), vb);
+    mainLayout->addWidget(l);
     mNameEdit = new QLineEdit(name, vb);
+    mainLayout->addWidget(mNameEdit);
     connect(mNameEdit, SIGNAL(textChanged(const QString &)), SLOT(slotTextChanged()));
     l->setBuddy(mNameEdit);
 
     l = new QLabel(i18n("Description:"), vb);
+    mainLayout->addWidget(l);
     mDescEdit = new QLineEdit(desc, vb);
+    mainLayout->addWidget(mDescEdit);
     connect(mDescEdit, SIGNAL(textChanged(const QString &)), SLOT(slotTextChanged()));
     l->setBuddy(mDescEdit);
 
@@ -69,7 +84,7 @@ void NewScanParams::slotTextChanged()
 {
     bool ok = !mNameEdit->text().trimmed().isEmpty() &&
               !mDescEdit->text().trimmed().isEmpty();
-    enableButtonOk(ok);
+    mOkButton->setEnabled(ok);
 }
 
 QString NewScanParams::getName() const
diff --git a/kooka/newscanparams.h b/kooka/newscanparams.h
index 4b22b54..0ce90ee 100644
--- a/kooka/newscanparams.h
+++ b/kooka/newscanparams.h
@@ -20,16 +20,16 @@
 #ifndef NEWSCANPARAMS_H
 #define NEWSCANPARAMS_H
 
-#include <kdialog.h>
+#include <QDialog>
 
 class QLineEdit;
-
+class QPushButton;
 /**
  *  A dialogue to allow the user to enter a name and description for
  *  a set of saved scan parameters.
  */
 
-class NewScanParams : public KDialog
+class NewScanParams : public QDialog
 {
     Q_OBJECT
 
@@ -45,6 +45,7 @@ protected slots:
 private:
     QLineEdit *mNameEdit;
     QLineEdit *mDescEdit;
+    QPushButton *mOkButton;
 };
 
 #endif                          // NEWSCANPARAMS_H

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