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

List:       kde-commits
Subject:    KDE/kdeutils/okteta/program/oktetakakao/controllers/view
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2008-04-30 20:58:38
Message-ID: 1209589118.081940.15010.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802842 by kossebau:

fixed: right tab order finally with operation box not last, achieved by explicit \
setup of all widgets in the tab order

 M  +22 -20    libfinddialog/kabstractfinddialog.cpp  
 M  +4 -3      libfinddialog/kabstractfinddialog.h  
 M  +6 -7      replace/kreplacedialog.cpp  
 M  +6 -1      search/ksearchdialog.cpp  


--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/libfinddialog/kabstractfinddialog.cpp \
#802841:802842 @@ -44,7 +44,10 @@
     setButtons( Ok | Cancel );
     setDefaultButton( Ok );
     enableButtonOk( false );
+}
 
+void KAbstractFindDialog::setupFindBox()
+{
     QWidget *page = new QWidget( this );
     setMainWidget( page );
 
@@ -72,7 +75,22 @@
     findBoxLayout->addWidget( bytesLabel );
     findBoxLayout->addWidget( SearchDataEdit );
     findBox->setLayout( findBoxLayout );
+}
 
+void KAbstractFindDialog::setupOperationBox( QGroupBox *operationBox )
+{
+    QVBoxLayout *pageLayout = static_cast<QVBoxLayout *>( mainWidget()->layout() );
+
+    // operation box
+    if( operationBox )
+        pageLayout->addWidget( operationBox );
+}
+
+void KAbstractFindDialog::setupCheckBoxes( QCheckBox *optionCheckBox )
+{
+    QWidget *page = mainWidget();
+    QVBoxLayout *pageLayout = static_cast<QVBoxLayout *>( mainWidget()->layout() );
+
     // options
     QGroupBox *optionsBox = new QGroupBox( i18nc("@title:group","Options"), page );
     pageLayout->addWidget( optionsBox );
@@ -98,35 +116,19 @@
     optionsBoxLayout->addWidget( AtCursorCheckBox, 2, 0 );
     optionsBoxLayout->addWidget( BackwardsCheckBox, 0, 1 );
     optionsBoxLayout->addWidget( SelectedCheckBox, 1, 1 );
+    if( optionCheckBox )
+        optionsBoxLayout->addWidget( optionCheckBox, 2, 1 );
 
-//     setTabOrder( SearchDataFormatComboBox, SearchDataEdit );
-
-//     setTabOrder( LastTabWidget, CaseSensitiveCheckBox );
     setTabOrder( CaseSensitiveCheckBox, WholeWordsCheckBox );
     setTabOrder( WholeWordsCheckBox, AtCursorCheckBox );
     setTabOrder( AtCursorCheckBox, BackwardsCheckBox );
     setTabOrder( BackwardsCheckBox, SelectedCheckBox );
+//     if( optionCheckBox )
+//         setTabOrder( SelectedCheckBox, optionCheckBox );
 
     onSearchDataFormatChanged( SearchDataEdit->format() );
 }
 
-void KAbstractFindDialog::setOperationBox( QGroupBox *operationBox )
-{
-    QVBoxLayout *pageLayout = static_cast<QVBoxLayout *>( mainWidget()->layout() );
-    pageLayout->insertWidget( 1, operationBox );
-}
-
-void KAbstractFindDialog::setExtraOption( QCheckBox *optionCheckBox )
-{
-    if( optionCheckBox )
-    {
-        QGridLayout *optionsBoxLayout = static_cast<QGridLayout *>( \
                BackwardsCheckBox->parentWidget()->layout() );
-        optionsBoxLayout->addWidget( optionCheckBox, 2, 1 );
-        setTabOrder( SelectedCheckBox, optionCheckBox );
-    }
-}
-
-
 bool KAbstractFindDialog::fromCursor()            const { return \
AtCursorCheckBox->isChecked(); }  bool KAbstractFindDialog::inSelection()           \
const { return SelectedCheckBox->isChecked(); }  bool \
KAbstractFindDialog::ignoreCase()            const { return \
                !CaseSensitiveCheckBox->isChecked(); }
--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/libfinddialog/kabstractfinddialog.h \
#802841:802842 @@ -61,11 +61,12 @@
     virtual void showEvent( QShowEvent *e );
 
   protected:
-    void setOperationBox( QGroupBox *OperationBox );
-    void setExtraOption( QCheckBox* OptionCheckBox );
+    void setupFindBox();
+    void setupOperationBox( QGroupBox *operationBox = 0 );
+    void setupCheckBoxes( QCheckBox *optionCheckBox = 0 );
 
   private Q_SLOTS:
-    void onSearchDataChanged( const QByteArray &Data );
+    void onSearchDataChanged( const QByteArray &ata );
     void onSearchDataFormatChanged( int Format );
 
   private:
--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/replace/kreplacedialog.cpp \
#802841:802842 @@ -1,7 +1,7 @@
 /*
     This file is part of the Okteta Kakao module, part of the KDE project.
 
-    Copyright 2006-2007 Friedrich W. H. Kossebau <kossebau@kde.org>
+    Copyright 2006-2008 Friedrich W. H. Kossebau <kossebau@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -50,6 +50,8 @@
                             "the replacement bytes.")) );
     setModal( true );
 
+    setupFindBox();
+
     // replace term
     QGroupBox *ReplaceBox = new QGroupBox( i18nc("@title:group","Replace by"), \
mainWidget() );  
@@ -68,16 +70,13 @@
     ReplaceBoxLayout->addWidget( ReplaceDataEdit );
 
     ReplaceBox->setLayout( ReplaceBoxLayout );
+    setupOperationBox( ReplaceBox );
 
-//     setTabOrder( LastTabWidget, ReplaceDataFormatComboBox );
-//     setTabOrder( ReplaceDataFormatComboBox, ReplaceDataEdit );
-
-    setOperationBox( ReplaceBox );
-
     //
     PromptCheckBox = new QCheckBox( i18nc("@option:check","&Prompt on replace") );
     PromptCheckBox->setWhatsThis( i18nc("@info:whatsthis","Ask before replacing each \
                match found.") );
-    setExtraOption( PromptCheckBox );
+
+    setupCheckBoxes( PromptCheckBox );
 }
 
 
--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/search/ksearchdialog.cpp \
#802841:802842 @@ -1,7 +1,7 @@
 /*
     This file is part of the Okteta Kakao module, part of the KDE project.
 
-    Copyright 2006-2007 Friedrich W. H. Kossebau <kossebau@kde.org>
+    Copyright 2006-2008 Friedrich W. H. Kossebau <kossebau@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -37,6 +37,11 @@
                             "If you press the <interface>Find</interface> button, "
                             "the bytes you entered above are searched for within "
                             "the byte array.")) );
+
+    setupFindBox();
+    setupOperationBox();
+    setupCheckBoxes();
+
     setModal( false );
 }
 


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