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

List:       kde-commits
Subject:    kdeutils/kregexpeditor
From:       Jesper Pedersen <blackie () blackie ! dk>
Date:       2003-10-18 21:07:08
[Download RAW message or body]

CVS commit by blackie: 

Ohhh well, here I am, sick in bed at a Hotel far away from home, just trying
to get well for yet another week of training people in Qt....
Then I suddenly remembers from last week that verifying on the fly did not
work in my child KRegExpEditor. And what a father would I be to just lay in
bed when my child was sick....
KRegExpEditor disease fixed, now I better get back bug fixing my flu - It
would indeed be nice if GDB could help me with that.


  M +4 -1      kregexpeditorprivate.cpp   1.28
  M +5 -1      verifybuttons.cpp   1.11
  M +0 -1      verifybuttons.h   1.8


--- kdeutils/kregexpeditor/kregexpeditorprivate.cpp  #1.27:1.28
@@ -357,4 +357,7 @@ void KRegExpEditorPrivate::setAutoVerify
 {
     _autoVerify = on;
+    if ( !_autoVerify )
+        _verifier->clearRegexp();
+    else
     doVerify();
 }

--- kdeutils/kregexpeditor/verifybuttons.cpp  #1.10:1.11
@@ -55,5 +55,4 @@ VerifyButtons::VerifyButtons( QWidget* p
                                    "(The window below the graphical editor window)."));
     layout->addWidget( _verify );
-    connect( _autoVerify, SIGNAL( toggled( bool ) ), this, SLOT( updateVerifyButton( bool ) ) );
     connect( _verify, SIGNAL( clicked() ), this, SIGNAL( verify() ) );
 
@@ -108,4 +107,5 @@ VerifyButtons::VerifyButtons( QWidget* p
     RegExpConverter* converter = new QtRegExpConverter();
     _converters.append( qMakePair( converter, static_cast<QAction*>( 0 ) ) );
+    QString qtConverterName = converter->name();
 
     // Emacs
@@ -122,4 +122,5 @@ VerifyButtons::VerifyButtons( QWidget* p
     autoVerify->setOn( true );
     connect( autoVerify, SIGNAL( toggled( bool ) ), this, SLOT( updateVerifyButton( bool ) ) );
+    connect( autoVerify, SIGNAL( toggled( bool ) ), this, SIGNAL( autoVerify( bool ) ) );
     autoVerify->addTo( _configMenu );
     autoVerify->setToolTip( i18n( "Toggle on-the-fly verification of regular expression" ) );
@@ -143,4 +144,7 @@ VerifyButtons::VerifyButtons( QWidget* p
     connect( grp, SIGNAL( selected( QAction* ) ), this, SLOT( slotChangeSyntax( QAction* ) ) );
     _configMenu->setItemEnabled( _languageId, false );
+
+    // Select the Qt converter by default
+    setSyntax( qtConverterName );
 }
 

--- kdeutils/kregexpeditor/verifybuttons.h  #1.7:1.8
@@ -63,5 +63,4 @@ protected slots:
 
 private:
-    QToolButton* _autoVerify;
     QToolButton* _verify;
     QLabel* _matches;


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