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

List:       kde-commits
Subject:    [picmi] src/gui: Port to QDialog
From:       Jakob Gruber <jakob.gruber () gmail ! com>
Date:       2015-07-15 13:42:36
Message-ID: E1ZFMxI-0006mw-Dk () scm ! kde ! org
[Download RAW message or body]

Git commit acb39a68a4a5f7474c8b191613d71898cd6d3cd8 by Jakob Gruber, on behalf of Montel Laurent.
Committed on 15/07/2015 at 09:23.
Pushed by gruber into branch 'master'.

Port to QDialog

M  +2    -2    src/gui/mainwindow.cpp
M  +23   -7    src/gui/selectboardwindow.cpp
M  +2    -2    src/gui/selectboardwindow.h

http://commits.kde.org/picmi/acb39a68a4a5f7474c8b191613d71898cd6d3cd8

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 04097ad..867208f 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -25,10 +25,10 @@
 #include <QPushButton>
 #include <kactioncollection.h>
 #include <klocalizedstring.h>
-#include <kmenubar.h>
+#include <qmenubar.h>
 #include <kmessagebox.h>
 #include <kstandardgameaction.h>
-#include <kstatusbar.h>
+#include <qstatusbar.h>
 #include <ktogglefullscreenaction.h>
 
 #include "selectboardwindow.h"
diff --git a/src/gui/selectboardwindow.cpp b/src/gui/selectboardwindow.cpp
index 16f6c35..fd074e6 100644
--- a/src/gui/selectboardwindow.cpp
+++ b/src/gui/selectboardwindow.cpp
@@ -22,6 +22,10 @@
 #include <KLocalizedString>
 #include <qpushbutton.h>
 #include <qalgorithms.h>
+#include <KConfigGroup>
+#include <QVBoxLayout>
+#include <QDialogButtonBox>
+
 
 #include "src/logic/elapsedtime.h"
 #include "src/logic/levelloader.h"
@@ -157,13 +161,25 @@ void LevelTableModel::sort(int column, Qt::SortOrder order) {
 }
 
 SelectBoardWindow::SelectBoardWindow(QWidget *parent)
-    : KDialog(parent)
+    : QDialog(parent)
 {
     setModal(true);
-    setCaption(i18n("Level Selection"));
-
+    setWindowTitle(i18n("Level Selection"));
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    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(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    mainLayout->addWidget(buttonBox);
+
+    QWidget *mainWidget = new QWidget(this);
     ui = new Ui::LevelSelectUi;
-    ui->setupUi(mainWidget());
+    ui->setupUi(mainWidget);
+    mainLayout->addWidget(mainWidget);
+    mainLayout->addWidget(buttonBox);
 
     m_levels = LevelLoader::load();
     m_model = QSharedPointer<LevelTableModel>(new LevelTableModel(m_levels));
@@ -188,7 +204,7 @@ SelectBoardWindow::SelectBoardWindow(QWidget *parent)
     ui->tableView->resizeRowsToContents();
 
     if (m_levels.empty()) {
-        button(KDialog::Ok)->setEnabled(false);
+        okButton->setEnabled(false);
     } else {
         resetSelection();
         connect(ui->tableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
@@ -203,12 +219,12 @@ SelectBoardWindow::SelectBoardWindow(QWidget *parent)
 
 void SelectBoardWindow::showEvent(QShowEvent *event) {
     updateDetails(selectedBoard());
-    KDialog::showEvent(event);
+    QDialog::showEvent(event);
 }
 
 void SelectBoardWindow::resizeEvent(QResizeEvent *event) {
     updateDetails(selectedBoard());
-    KDialog::resizeEvent(event);
+    QDialog::resizeEvent(event);
 }
 
 SelectBoardWindow::~SelectBoardWindow() {
diff --git a/src/gui/selectboardwindow.h b/src/gui/selectboardwindow.h
index 6532ca2..8e94750 100644
--- a/src/gui/selectboardwindow.h
+++ b/src/gui/selectboardwindow.h
@@ -18,7 +18,7 @@
 #ifndef SELECTBOARD_H
 #define SELECTBOARD_H
 
-#include <kdialog.h>
+#include <QDialog>
 #include <QSharedPointer>
 
 #include "ui_selectboardwindow.h"
@@ -26,7 +26,7 @@
 class Level;
 class LevelTableModel;
 
-class SelectBoardWindow : public KDialog
+class SelectBoardWindow : public QDialog
 {
     Q_OBJECT
 public:

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