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

List:       kde-commits
Subject:    koffice/kspread/dialogs
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2009-11-09 16:53:18
Message-ID: 1257785598.008906.6721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1046767 by mkruisselbrink:

fix some porting mistakes


 M  +15 -19    DatabaseDialog.cpp  
 M  +2 -2      DatabaseDialog.h  
 M  +1 -1      SubtotalDialog.cpp  


--- trunk/koffice/kspread/dialogs/DatabaseDialog.cpp #1046766:1046767
@@ -54,7 +54,7 @@
 #include <QVariant>
 #include <QWidget>
 #include <QListWidget>
-#include <QTableWidget>
+#include <QTreeWidget>
 
 using namespace KSpread;
 
@@ -184,9 +184,9 @@
   TextLabel11_2->setText( i18n( "Select columns:" ) );
   columnsFrameLayout->addWidget( TextLabel11_2, 0, 0 );
 
-  m_columnView = new QTableWidget( columnsFrame );
+  m_columnView = new QTreeWidget( columnsFrame );
   m_columnView->setColumnCount( 3 );
-  m_columnView->setHorizontalHeaderLabels( QStringList() << i18n( "Column" ) <<  \
i18n( "Table" ) << "Data Type" ); +  m_columnView->setHeaderLabels( QStringList() << \
i18n( "Column" ) <<  i18n( "Table" ) << "Data Type" );  
   columnsFrameLayout->addWidget( m_columnView, 1, 0 );
 
@@ -663,7 +663,7 @@
       for ( int i = 0; i < tableList.size(); ++i )
       {
         QListWidgetItem * item = new QListWidgetItem( tableList[i] );
-        item->setFlags( Qt::ItemIsUserCheckable );
+        item->setFlags( item->flags() | Qt::ItemIsUserCheckable );
         item->setCheckState( Qt::Unchecked );
         m_tableView->addItem( item );
       }
@@ -727,26 +727,22 @@
   }
 
   m_columnView->clear();
-  m_columnView->setSortingEnabled(false);
   QSqlRecord info;
-  int row = 0;
   for (int i = 0; i < (int) tables.size(); ++i)
   {
     info = m_dbConnection.record( tables[i] );
-    m_columnView->setRowCount(row + info.count());
-    for (int j = 0; j < (int) info.count(); ++j, ++row)
+    for (int j = 0; j < (int) info.count(); ++j)
     {
       QString name = info.fieldName(j);
-      QTableWidgetItem * checkItem = new QTableWidgetItem( name );
-      checkItem->setFlags( Qt::ItemIsUserCheckable );
-      checkItem->setCheckState( Qt::Unchecked );
-      m_columnView->setItem(row, 0, checkItem);
-      m_columnView->setItem(row, 1, new QTableWidgetItem( tables[i] ) );
       QSqlField field = info.field(name);
-      m_columnView->setItem(row, 2, new QTableWidgetItem( \
QVariant::typeToName(field.type()) ) ); +      QTreeWidgetItem * checkItem = new \
QTreeWidgetItem( QStringList() << name << tables[i] << \
QVariant::typeToName(field.type())); +
+      checkItem->setFlags( checkItem->flags() | Qt::ItemIsUserCheckable );
+      checkItem->setCheckState( 0, Qt::Unchecked );
+      m_columnView->addTopLevelItem(checkItem);
     }
   }
-  m_columnView->sortItems(1);
+  m_columnView->sortItems(1, Qt::AscendingOrder);
 
   setValid(m_columns, true);
 
@@ -756,12 +752,12 @@
 bool DatabaseDialog::columnsDoNext()
 {
   QStringList columns;
-  for (int row = 0; row < m_columnView->rowCount(); ++row)
+  for (int row = 0; row < m_columnView->topLevelItemCount(); ++row)
   {
-    QTableWidgetItem* item = m_columnView->item(row, 0);
-    if (item->checkState() == Qt::Checked)
+    QTreeWidgetItem* item = m_columnView->topLevelItem(row);
+    if (item->checkState(0) == Qt::Checked)
     {
-      columns.append( m_columnView->item(row, 1)->text() + '.' + item->text());
+      columns.append( item->text(1) + '.' + item->text(0));
     }
   }
 
--- trunk/koffice/kspread/dialogs/DatabaseDialog.h #1046766:1046767
@@ -34,7 +34,7 @@
 class QFrame;
 class QLabel;
 class KLineEdit;
-class QTableWidget;
+class QTreeWidget;
 class QListWidget;
 class QListWidgetItem;
 class QRadioButton;
@@ -96,7 +96,7 @@
   QLabel       * m_SelectTableLabel;
   QListWidget  * m_tableView;
   KPageWidgetItem * m_columns;
-  QTableWidget * m_columnView;
+  QTreeWidget  * m_columnView;
   QLabel       * m_columnsStatus;
   KPageWidgetItem * m_options;
   KComboBox    * m_columns_1;
--- trunk/koffice/kspread/dialogs/SubtotalDialog.cpp #1046766:1046767
@@ -264,7 +264,7 @@
     m_columnBox->insertItem( index++, text );
 
     item = new QListWidgetItem( text );
-    item->setFlags( Qt::ItemIsUserCheckable );
+    item->setFlags( item->flags() | Qt::ItemIsUserCheckable );
     item->setCheckState( Qt::Unchecked );
     m_columnList->addItem( item );
   }


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