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

List:       kde-commits
Subject:    kdeutils/ark
From:       Georg Robbers <Georg.Robbers () urz ! uni-hd ! de>
Date:       2004-06-01 16:33:21
Message-ID: 20040601163321.8F8DE126E4 () office ! kde ! org
[Download RAW message or body]

CVS commit by robbers: 

QDialog -> KDialogBase


  M +18 -52    selectDlg.cpp   1.13
  M +4 -7      selectDlg.h   1.10


--- kdeutils/ark/selectDlg.h  #1.9:1.10
@@ -1,6 +1,4 @@
 /*
 
- $Id$
-
  ark -- archiver for the KDE project
 
@@ -31,9 +29,9 @@
 class QWidget;
 class QString;
-class QDialog;
-class QLineEdit;
+class KLineEdit;
 class KPushButton;
+class KDialogBase;
 
-class SelectDlg : public QDialog {
+class SelectDlg : public KDialogBase {
         Q_OBJECT
 public:
@@ -43,10 +41,9 @@ public:
 
 private:
-        QLineEdit *m_regExp;
+        KLineEdit *m_regExp;
         KPushButton *m_ok;
 
 private slots:
         void regExpChanged(const QString& _exp);
-        void saveConfig();
 };
 

--- kdeutils/ark/selectDlg.cpp  #1.12:1.13
@@ -1,4 +1,3 @@
 /*
-$Id$
 
  ark -- archiver for the KDE project
@@ -27,8 +26,6 @@ $Id$
 // Qt includes
 #include <qlabel.h>
-#include <qlayout.h>
+#include <qvbox.h>
 #include <qregexp.h>
-#include <qdialog.h>
-#include <qlineedit.h>
 #include <qpushbutton.h>
 
@@ -37,65 +34,31 @@ $Id$
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
+#include <kdialogbase.h>
+#include <klineedit.h>
 
 // ark includes
 #include "selectDlg.h"
-#include "selectDlg.moc"
 
 SelectDlg::SelectDlg( QWidget *_parent, const char *_name )
-    : QDialog( _parent, _name, true )
+    : KDialogBase( _parent, _name, true, i18n("Selection"),
+                   KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok )
 {
-    setCaption( i18n("Selection") );
-    QVBoxLayout *mainLayout = new QVBoxLayout( this, 10 );
-
-    /**
-    * Tar command horizontal layout
-    */
-    QHBoxLayout *hbl1 = new QHBoxLayout();
-    mainLayout->addLayout( hbl1 );
-
-    QLabel *l1 = new QLabel( i18n("Select files:"), this );
-    l1->setFixedSize( l1->sizeHint() );
-    hbl1->addWidget( l1 );
-
-    m_ok = new KPushButton( KStdGuiItem::ok(), this );
-
-    m_regExp = new QLineEdit( this );
-    m_regExp->setFixedSize( m_regExp->sizeHint() );
-    hbl1->addWidget( m_regExp );
-    connect( m_regExp, SIGNAL(textChanged(const QString&)), SLOT(regExpChanged(const QString&)) );
+    QHBox * box = makeHBoxMainWidget();
 
-    QHBoxLayout *hbl = new QHBoxLayout();
-    mainLayout->addStretch( 1 );
-    mainLayout->addLayout( hbl );
+    QLabel *l1 = new QLabel( i18n("Select files:"), box );
 
-    hbl->addStretch( 1 );
-    m_ok->setFixedSize( m_ok->sizeHint() );
-    m_ok->setDefault(true);
-    connect( m_ok, SIGNAL( clicked() ), SLOT( saveConfig() ) );
-    hbl->addWidget( m_ok );
+    m_regExp = new KLineEdit( box );
+    m_regExp->setMinimumWidth( fontMetrics().maxWidth() * 6 );
 
-    KPushButton *cancel = new KPushButton( KStdGuiItem::cancel() , this );
-    cancel->setFixedSize( cancel->sizeHint() );
-    connect( cancel, SIGNAL( clicked() ), SLOT( reject() ) );
-    hbl->addWidget( cancel );
+    connect( m_regExp, SIGNAL( textChanged( const QString& ) ),
+                       SLOT( regExpChanged( const QString& ) ) );
 
-    mainLayout->activate();
-    setFixedSize( sizeHint() );
     m_regExp->setFocus();
 }
 
-
-void SelectDlg::saveConfig()
-{
-    accept();
-}
-
-void SelectDlg::regExpChanged(const QString& _exp)
+void SelectDlg::regExpChanged( const QString& _exp )
 {
-    QRegExp reg_exp(_exp, true, true);
-    if(reg_exp.isValid())
-        m_ok->setEnabled(true);
-    else
-        m_ok->setEnabled(false);
+    QRegExp reg_exp( _exp, true, true );
+    enableButtonOK( reg_exp.isValid() );
 }
 
@@ -104,2 +67,5 @@ QString SelectDlg::getRegExp() const
     return m_regExp->text();
 }
+
+#include "selectDlg.moc"
+


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