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

List:       kde-commits
Subject:    extragear/office/datakiosk/src
From:       Adam Treat <treat () kde ! org>
Date:       2005-12-12 15:01:48
Message-ID: 1134399708.966506.22356.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 487922 by treat:

* Don't jump around when selection changes

 M  +17 -3     advancedsearchdialog.cpp  
 M  +2 -0      advancedsearchdialog.h  
 M  +2 -2      datatable.cpp  
 M  +1 -1      datatable.h  
 M  +2 -3      datatableview.cpp  
 M  +4 -1      searchmanager.cpp  
 M  +5 -1      searchwidget.cpp  


--- trunk/extragear/office/datakiosk/src/advancedsearchdialog.cpp #487921:487922
@@ -24,6 +24,7 @@
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qvgroupbox.h>
+#include <qscrollview.h>
 #include <qradiobutton.h>
 #include <qhbuttongroup.h>
 
@@ -63,9 +64,13 @@
     m_matchAllButton = new QRadioButton( i18n( "Match all of the following" ), group );
     m_matchAnyButton = new QRadioButton( i18n( "Match any of the following" ), group );
 
-    m_criteria = new QVBox( criteriaGroupBox );
+    m_scroll = new QScrollView( criteriaGroupBox );
+    m_scroll->setResizePolicy( QScrollView::AutoOneFit );
+    m_criteria = new QVBox( m_scroll->viewport() );
     m_criteria->setSpacing( 5 );
-    m_advanced = new QVBox( criteriaGroupBox );
+    m_scroll->addChild( m_criteria );
+    m_advanced = new QVBox( m_scroll->viewport() );
+    m_scroll->addChild( m_advanced );
 
     QWidget *buttons = new QWidget( criteriaGroupBox );
     QBoxLayout *l = new QHBoxLayout( buttons, 0, 5 );
@@ -88,12 +93,14 @@
     m_subsearch = new QVBox( m_subSearchGroupBox );
     m_listBox = new KListBox( m_subsearch );
     m_listBox->setSelectionMode( QListBox::Multi );
+    QStringList temp;
     DataSearchList searchList = m_searchWidget->searchList();
     DataSearchList::ConstIterator it = searchList.begin();
     for ( ; it != searchList.end(); ++it )
     {
-        m_listBox->insertItem( ( *it ).name() );
+        temp.append( ( *it ).name() );
     }
+    m_listBox->insertStringList( temp );
     m_subSearchGroupBox->hide();
 
     m_dataTableNameLineEdit->setFocus();
@@ -104,6 +111,7 @@
 
         m_advancedLines.append( new AdvancedLine( m_advanced, m_searchWidget, m_dataTables ) );
         m_advanced->hide();
+        m_scroll->removeChild( m_advanced );
     }
     else
     {
@@ -156,6 +164,7 @@
 
             m_advancedLines.append( new AdvancedLine( m_advanced, m_searchWidget, m_dataTables ) );
             m_advanced->hide();
+            m_scroll->removeChild( m_advanced );
         }
     }
 
@@ -292,12 +301,17 @@
     {
         setButtonText( User2, "Basic Mode" );
         m_criteria->hide();
+        m_scroll->removeChild( m_criteria );
+        m_scroll->addChild( m_advanced );
         m_advanced->show();
+
     }
     else
     {
         setButtonText( User2, "SQL Mode" );
         m_advanced->hide();
+        m_scroll->removeChild( m_advanced );
+        m_scroll->addChild( m_criteria );
         m_criteria->show();
     }
     updateButtons();
--- trunk/extragear/office/datakiosk/src/advancedsearchdialog.h #487921:487922
@@ -26,6 +26,7 @@
 class QCheckBox;
 class QGroupBox;
 class QVGroupBox;
+class QScrollView;
 class QRadioButton;
 class SearchLine;
 class SearchWidget;
@@ -72,6 +73,7 @@
 
     QVGroupBox *m_subSearchGroupBox;
     QVBox *m_subsearch;
+    QScrollView *m_scroll;
     QVBox *m_criteria;
     QVBox *m_advanced;
     SearchWidget *m_searchWidget;
--- trunk/extragear/office/datakiosk/src/datatable.cpp #487921:487922
@@ -546,7 +546,7 @@
     return parentName().isEmpty();
 }
 
-void DataTable::slotUpdate()
+void DataTable::slotUpdateSelection()
 {
     if ( !m_updatesAllowed )
         return ;
@@ -840,7 +840,7 @@
     addTab( m_tableView, i18n( "View Table" ) );
     addTab( m_tableEdit, SmallIconSet( "edit" ), i18n( "Edit Record" ) );
     QObject::connect( m_tableView, SIGNAL( selectionChanged() ),
-                      this, SLOT( slotUpdate() ) );
+                      this, SLOT( slotUpdateSelection() ) );
     QObject::connect( m_tableEdit, SIGNAL( primeInsert( QSqlRecord * ) ),
                       this, SLOT( slotFilterToBuffer( QSqlRecord * ) ) );
     QObject::connect( m_tableEdit, SIGNAL( insertAborted() ),
--- trunk/extragear/office/datakiosk/src/datatable.h #487921:487922
@@ -176,7 +176,7 @@
 
 public slots:
     void setParentName( const QString &name );
-    void slotUpdate();
+    void slotUpdateSelection();
     void slotSelectFirstRow();
     void slotDetailFromMaster( QSqlRecord * record );
     void slotValueFromChild( const QString &key, const QVariant &value );
--- trunk/extragear/office/datakiosk/src/datatableview.cpp #487921:487922
@@ -276,10 +276,9 @@
     context->exec( ev->globalPos() );
 }
 
-void DataTableView::contentsMouseMoveEvent( QMouseEvent *ev )
+void DataTableView::contentsMouseMoveEvent( QMouseEvent */*ev*/ )
 {
-    QDataTable::contentsMouseMoveEvent( ev );
-    slotSelectRow( rowAt( ev->pos().y() ) );
+    //do nothing
 }
 
 #include "datatableview.moc"
--- trunk/extragear/office/datakiosk/src/searchmanager.cpp #487921:487922
@@ -28,11 +28,14 @@
 {
     makeVBoxMainWidget();
     m_listBox = new KListBox( mainWidget() );
+    QStringList temp;
     DataSearchList::ConstIterator it = m_searchList.begin();
     for ( ; it != m_searchList.end(); ++it )
     {
-        m_listBox->insertItem( ( *it ).name() );
+        temp.append( ( *it ).name() );
     }
+    temp.sort();
+    m_listBox->insertStringList( temp );
     enableButton( User1, false );
     enableButton( User2, false );
     connect( m_listBox, SIGNAL( selectionChanged() ),
--- trunk/extragear/office/datakiosk/src/searchwidget.cpp #487921:487922
@@ -598,12 +598,16 @@
     m_searchList = searchList;
     m_searchCombo->clear();
     m_searchCombo->insertItem( s_default );
+
+    QStringList temp;
     DataSearchList::ConstIterator it = searchList.begin();
     for ( ; it != searchList.end(); ++it )
     {
         if ( ( *it ).isVisible() )
-            m_searchCombo->insertItem( ( *it ).name() );
+            temp.append( ( *it ).name() );
     }
+    temp.sort();
+    m_searchCombo->insertStringList( temp );
 }
 
 void SearchWidget::clear()
[prev in list] [next in list] [prev in thread] [next in thread]