[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.A351AA60C4 () git ! kde ! org
[Download RAW message or body]

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

Port away from KDialog

M  +6    -8    kdeui/dialogs/knewpassworddialog.cpp
M  +2    -2    kdeui/dialogs/knewpassworddialog.h
M  +42   -2    kdeui/dialogs/knewpassworddialog.ui

http://commits.kde.org/kdelibs/20884256d967c9885f3cfd23eb7a955992ffe817

diff --git a/kdeui/dialogs/knewpassworddialog.cpp b/kdeui/dialogs/knewpassworddialog.cpp
index 868de26..1a96312 100644
--- a/kdeui/dialogs/knewpassworddialog.cpp
+++ b/kdeui/dialogs/knewpassworddialog.cpp
@@ -24,6 +24,7 @@
 
 #include <QApplication>
 #include <QProgressBar>
+#include <QPushButton>
 #include <QtCore/QRegExp>
 #include <QtCore/QSize>
 #include <QtCore/QString>
@@ -64,10 +65,7 @@ public:
 
 void KNewPasswordDialog::KNewPasswordDialogPrivate::init()
 {
-    q->setButtons( Ok | Cancel );
-    q->setDefaultButton( Ok );
-
-    ui.setupUi( q->mainWidget() );
+    ui.setupUi( q );
 
     ui.labelIcon->setPixmap( KDE::icon("dialog-password").pixmap(96, 96) );
     ui.labelMatch->setHidden(true);
@@ -155,9 +153,9 @@ void KNewPasswordDialog::KNewPasswordDialogPrivate::_k_textChanged()
     const int minPasswordLength = q->minimumPasswordLength();
 
     if ( ui.linePassword->text().length() < minPasswordLength) {
-        q->enableButtonOk(false);
+        ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     } else {
-        q->enableButtonOk( match );
+        ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(match);
     }
 
     if ( match && !q->allowEmptyPasswords() && ui.linePassword->text().isEmpty()) {
@@ -191,7 +189,7 @@ void KNewPasswordDialog::KNewPasswordDialogPrivate::_k_textChanged()
  */
 
 KNewPasswordDialog::KNewPasswordDialog( QWidget *parent)
-    : KDialog(parent), d(new KNewPasswordDialogPrivate(this))
+    : QDialog(parent), d(new KNewPasswordDialogPrivate(this))
 {
     d->init();
 }
@@ -268,7 +266,7 @@ void KNewPasswordDialog::accept()
     }
     d->pass = pwd;
     emit newPassword( d->pass );
-    KDialog::accept();
+    QDialog::accept();
 }
 
 
diff --git a/kdeui/dialogs/knewpassworddialog.h b/kdeui/dialogs/knewpassworddialog.h
index ffafa9b..8546e88 100644
--- a/kdeui/dialogs/knewpassworddialog.h
+++ b/kdeui/dialogs/knewpassworddialog.h
@@ -24,8 +24,8 @@
 
 // ### KDE 5: remove
 #include <QLineEdit>
+#include <QDialog>
 
-#include <kdialog.h>
 #include <kdeui_export.h>
 
 class QWidget;
@@ -67,7 +67,7 @@ class QWidget;
  */
 
 class KDEUI_EXPORT KNewPasswordDialog
-    : public KDialog
+    : public QDialog
 {
     Q_OBJECT
 
diff --git a/kdeui/dialogs/knewpassworddialog.ui b/kdeui/dialogs/knewpassworddialog.ui
index 98f4b8f..51e980c 100644
--- a/kdeui/dialogs/knewpassworddialog.ui
+++ b/kdeui/dialogs/knewpassworddialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>KNewPasswordDialog</class>
- <widget class="QWidget" name="KNewPasswordDialog">
+ <widget class="QDialog" name="KNewPasswordDialog">
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -118,6 +118,13 @@
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -133,5 +140,38 @@
   </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>KNewPasswordDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>140</x>
+     <y>237</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>141</x>
+     <y>205</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>KNewPasswordDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>229</x>
+     <y>244</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>255</x>
+     <y>209</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

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