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

List:       kde-commits
Subject:    [kdelibs/frameworks] kdeui/dialogs: Port away from KDialog
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2012-12-13 17:14:00
Message-ID: 20121213171400.EDC2AA60E1 () git ! kde ! org
[Download RAW message or body]

Git commit 4642d6600af77de5c1ef47af56de94d2988911dc by Kevin Ottens.
Committed on 13/12/2012 at 12:41.
Pushed by ervin into branch 'frameworks'.

Port away from KDialog

M  +10   -8    kdeui/dialogs/kaboutkdedialog_p.cpp
M  +2    -2    kdeui/dialogs/kaboutkdedialog_p.h

http://commits.kde.org/kdelibs/4642d6600af77de5c1ef47af56de94d2988911dc

diff --git a/kdeui/dialogs/kaboutkdedialog_p.cpp \
b/kdeui/dialogs/kaboutkdedialog_p.cpp index 87805ec..3be9b5c 100644
--- a/kdeui/dialogs/kaboutkdedialog_p.cpp
+++ b/kdeui/dialogs/kaboutkdedialog_p.cpp
@@ -21,6 +21,7 @@
 
 #include "kaboutkdedialog_p.h"
 
+#include <QDialogButtonBox>
 #include <QFrame>
 #include <QLabel>
 #include <QLayout>
@@ -36,11 +37,10 @@ namespace KDEPrivate {
 
 
 KAboutKdeDialog::KAboutKdeDialog(QWidget *parent)
-  : KDialog(parent),
+  : QDialog(parent),
     d( 0 )
 {
-    setPlainCaption(i18n("About KDE"));
-    setButtons(KDialog::Close);
+    setWindowTitle(i18n("About KDE"));
 
     KTitleWidget *titleWidget = new KTitleWidget(this);
     titleWidget->setText(i18n("<html><font size=\"5\">KDE - Be Free!</font><br \
/><b>Platform Version %1</b></html>", @@ -143,15 +143,17 @@ \
KAboutKdeDialog::KAboutKdeDialog(QWidget *parent)  midLayout->addWidget(image);
     midLayout->addWidget(tabWidget);
 
+    QDialogButtonBox *buttonBox = new QDialogButtonBox;
+    buttonBox->setStandardButtons(QDialogButtonBox::Close);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(titleWidget);
     mainLayout->addLayout(midLayout);
-    mainLayout->setMargin(0);
-
-    QWidget *mainWidget = new QWidget;
-    mainWidget->setLayout(mainLayout);
+    mainLayout->addWidget(buttonBox);
 
-    setMainWidget(mainWidget);
+    setLayout(mainLayout);
 }
 
 }
diff --git a/kdeui/dialogs/kaboutkdedialog_p.h b/kdeui/dialogs/kaboutkdedialog_p.h
index 45faf62..894dff8 100644
--- a/kdeui/dialogs/kaboutkdedialog_p.h
+++ b/kdeui/dialogs/kaboutkdedialog_p.h
@@ -22,7 +22,7 @@
 #ifndef KABOUT_KDE_DIALOG_H
 #define KABOUT_KDE_DIALOG_H
 
-#include <kdialog.h>
+#include <QDialog>
 
 namespace KDEPrivate {
 
@@ -40,7 +40,7 @@ namespace KDEPrivate {
  * @internal
  */
 
-class KAboutKdeDialog : public KDialog
+class KAboutKdeDialog : public QDialog
 {
     Q_OBJECT
 


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

Configure | About | News | Add a list | Sponsored by KoreLogic