[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] src/kdefrontend/datasources: Ported DatabaseManagerDialog from KDialog to QDialog.
From: Alexander Semke <null () kde ! org>
Date: 2017-10-31 16:06:06
Message-ID: E1e9Z3G-0007mJ-JO () code ! kde ! org
[Download RAW message or body]
Git commit de08403e20a47c31a11f77c7f65cbfa72bc209e1 by Alexander Semke.
Committed on 31/10/2017 at 16:05.
Pushed by asemke into branch 'master'.
Ported DatabaseManagerDialog from KDialog to QDialog.
M +13 -6 src/kdefrontend/datasources/DatabaseManagerDialog.cpp
M +2 -2 src/kdefrontend/datasources/DatabaseManagerDialog.h
M +1 -0 src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp
https://commits.kde.org/labplot/de08403e20a47c31a11f77c7f65cbfa72bc209e1
diff --git a/src/kdefrontend/datasources/DatabaseManagerDialog.cpp \
b/src/kdefrontend/datasources/DatabaseManagerDialog.cpp index 85a37c1e..65bfc03f 100644
--- a/src/kdefrontend/datasources/DatabaseManagerDialog.cpp
+++ b/src/kdefrontend/datasources/DatabaseManagerDialog.cpp
@@ -29,29 +29,36 @@
#include "DatabaseManagerDialog.h"
#include "DatabaseManagerWidget.h"
-#include <QTimer>
#include <KLocale>
#include <KSharedConfig>
#include <KWindowConfig>
+#include <QDialogButtonBox>
+#include <QTimer>
+
/*!
\class DatabaseManagerDialog
\brief dialog for managing database connections
\ingroup kdefrontend
*/
-DatabaseManagerDialog::DatabaseManagerDialog(QWidget* parent, const QString& conn) : KDialog(parent),
+DatabaseManagerDialog::DatabaseManagerDialog(QWidget* parent, const QString& conn) : QDialog(parent),
mainWidget(new DatabaseManagerWidget(this, conn)), m_changed(false) {
- setMainWidget(mainWidget);
-
setWindowIcon(QIcon::fromTheme("network-server-database"));
setWindowTitle(i18n("SQL Database Connections"));
- setButtons(KDialog::Ok | KDialog::Cancel);
+ QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+
+ QVBoxLayout* layout = new QVBoxLayout(this);
+ layout->addWidget(mainWidget);
+ layout->addWidget(buttonBox);
connect(mainWidget, SIGNAL(changed()), this, SLOT(changed()));
- connect(this, SIGNAL(okClicked()), this, SLOT(save()));
+ connect(buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(save()));
+ connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close()));
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
QTimer::singleShot(0, this, &DatabaseManagerDialog::loadSettings);
}
diff --git a/src/kdefrontend/datasources/DatabaseManagerDialog.h \
b/src/kdefrontend/datasources/DatabaseManagerDialog.h index 3a8ca880..e13adb44 100644
--- a/src/kdefrontend/datasources/DatabaseManagerDialog.h
+++ b/src/kdefrontend/datasources/DatabaseManagerDialog.h
@@ -29,11 +29,11 @@
#ifndef DATABASEMANAGERDIALOG_H
#define DATABASEMANAGERDIALOG_H
-#include <KDialog>
+#include <QDialog>
class DatabaseManagerWidget;
-class DatabaseManagerDialog : public KDialog {
+class DatabaseManagerDialog : public QDialog {
Q_OBJECT
public:
diff --git a/src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp \
b/src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp index 347dd975..05fb799c 100644
--- a/src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp
+++ b/src/kdefrontend/datasources/ImportSQLDatabaseWidget.cpp
@@ -33,6 +33,7 @@
#include "backend/datasources/filters/AbstractFileFilter.h"
#include "backend/lib/macros.h"
+#include <KConfigGroup>
#include <KGlobal>
#include <KLocale>
#include <KMessageBox>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic