[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:51:51
Message-ID: 1257785511.147370.6205.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1046764 by mkruisselbrink:
continue de-qt3-ifying
M +6 -6 ConsolidateDialog.cpp
M +2 -3 ConsolidateDialog.h
M +39 -41 DatabaseDialog.cpp
M +7 -7 DatabaseDialog.h
--- trunk/koffice/kspread/dialogs/ConsolidateDialog.cpp #1046763:1046764
@@ -37,7 +37,7 @@
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
-#include <Q3ListBox>
+#include <QListWidget>
//KDE Includes
#include <kcombobox.h>
@@ -107,7 +107,7 @@
grid1->addWidget(tmpQLabel, 2, 0, Qt::AlignTop);
tmpQLabel->setText( i18n("&Entered references:") );
- m_pRefs = new Q3ListBox( page );
+ m_pRefs = new QListWidget( page );
grid1->addWidget( m_pRefs, 2, 1);
tmpQLabel->setBuddy(m_pRefs);
@@ -612,11 +612,11 @@
void ConsolidateDialog::slotRemove()
{
- int i = m_pRefs->currentItem();
+ int i = m_pRefs->currentRow();
if ( i < 0 )
return;
- m_pRefs->removeItem( i );
+ delete m_pRefs->takeItem( i );
if ( m_pRefs->count() == 0 )
enableButton( Ok, false );
@@ -628,7 +628,7 @@
int c = m_pRefs->count();
for( int i = 0; i < c; i++ )
- list.append( m_pRefs->text( i ) );
+ list.append( m_pRefs->item( i )->text() );
return list;
}
@@ -659,7 +659,7 @@
if ( !txt.isEmpty() )
{
- m_pRefs->insertItem( txt );
+ m_pRefs->addItem( txt );
enableButton( Ok, true );
}
}
--- trunk/koffice/kspread/dialogs/ConsolidateDialog.h #1046763:1046764
@@ -30,14 +30,13 @@
#define KSPREAD_CONSOLIDATE_DIALOG
#include <QStringList>
-//Added by qt3to4:
#include <kdialog.h>
class KLineEdit;
class QPushButton;
class KComboBox;
class QCheckBox;
-class Q3ListBox;
+class QListWidget;
namespace KSpread
{
@@ -67,7 +66,7 @@
protected:
Selection* m_selection;
KLineEdit* m_pRef;
- Q3ListBox* m_pRefs;
+ QListWidget* m_pRefs;
KComboBox* m_pFunction;
QPushButton* m_pAdd;
QPushButton* m_pRemove;
--- trunk/koffice/kspread/dialogs/DatabaseDialog.cpp #1046763:1046764
@@ -33,7 +33,6 @@
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <k3listview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <knumvalidator.h>
@@ -54,6 +53,8 @@
#include <qsqlrecord.h>
#include <QVariant>
#include <QWidget>
+#include <QListWidget>
+#include <QTableWidget>
using namespace KSpread;
@@ -166,9 +167,7 @@
m_SelectTableLabel->setText( i18n( "Select tables:" ) );
tablesFrameLayout->addWidget( m_SelectTableLabel, 1, 0 );
- m_tableView = new K3ListView( tablesFrame );
- m_tableView->addColumn( i18n( "Table" ) );
- m_tableView->setRootIsDecorated( false );
+ m_tableView = new QListWidget( tablesFrame );
tablesFrameLayout->addWidget( m_tableView, 2, 0 );
tablesFrameLayout->setRowStretch(4, 1);
@@ -185,11 +184,9 @@
TextLabel11_2->setText( i18n( "Select columns:" ) );
columnsFrameLayout->addWidget( TextLabel11_2, 0, 0 );
- m_columnView = new K3ListView( columnsFrame );
- m_columnView->addColumn( i18n( "Column" ) );
- m_columnView->addColumn( i18n( "Table" ) );
- m_columnView->addColumn( i18n( "Data Type" ) );
- m_columnView->setRootIsDecorated( false );
+ m_columnView = new QTableWidget( columnsFrame );
+ m_columnView->setColumnCount( 3 );
+ m_columnView->setHorizontalHeaderLabels( QStringList() << i18n( "Column" ) << \
i18n( "Table" ) << "Data Type" );
columnsFrameLayout->addWidget( m_columnView, 1, 0 );
@@ -354,9 +351,9 @@
connect( m_driver, SIGNAL( activated(int) ), this, SLOT( \
databaseDriverChanged(int) ) ); connect( m_host, SIGNAL( textChanged(const QString \
&) ), this, SLOT( databaseHostChanged(const QString &) ) ); connect( m_databaseName, \
SIGNAL( textChanged(const QString &) ), this, SLOT( databaseNameChanged(const QString \
&) ) );
- connect( m_tableView, SIGNAL( contextMenuRequested( Q3ListViewItem *, const QPoint \
&, int ) ),
- this, SLOT( popupTableViewMenu(Q3ListViewItem *, const QPoint &, int ) ) \
);
- connect( m_tableView, SIGNAL( clicked( Q3ListViewItem * ) ), this, SLOT( \
tableViewClicked( Q3ListViewItem * ) ) ); + /*connect( m_tableView, SIGNAL( \
contextMenuRequested( Q3ListViewItem *, const QPoint &, int ) ), + this, \
SLOT( popupTableViewMenu(Q3ListViewItem *, const QPoint &, int ) ) );*/ + connect( \
m_tableView, SIGNAL( itemClicked( QListWidgetItem * ) ), this, SLOT( \
tableViewClicked( QListWidgetItem * ) ) );
QStringList str = QSqlDatabase::drivers();
m_driver->insertItems( 0, QSqlDatabase::drivers() );
@@ -665,10 +662,10 @@
for ( int i = 0; i < tableList.size(); ++i )
{
- Q3CheckListItem * item = new Q3CheckListItem( m_tableView, tableList[i],
- Q3CheckListItem::CheckBox );
- item->setOn(false);
- m_tableView->insertItem( item );
+ QListWidgetItem * item = new QListWidgetItem( tableList[i] );
+ item->setFlags( Qt::ItemIsUserCheckable );
+ item->setCheckState( Qt::Unchecked );
+ m_tableView->addItem( item );
}
m_tableView->setEnabled( true );
@@ -713,12 +710,12 @@
QStringList tables;
{
- Q3ListViewItem * item = (Q3CheckListItem *) m_tableView->firstChild();
- for (; item; item = item->nextSibling())
+ for (int i = 0; i < m_tableView->count(); ++i)
{
- if (((Q3CheckListItem * ) item)->isOn())
+ QListWidgetItem* item = m_tableView->item(i);
+ if (item->checkState() == Qt::Checked)
{
- tables.append(((Q3CheckListItem * ) item)->text());
+ tables.append(item->text());
}
}
}
@@ -730,25 +727,26 @@
}
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] );
- for (int j = 0; j < (int) info.count(); ++j)
+ m_columnView->setRowCount(row + info.count());
+ for (int j = 0; j < (int) info.count(); ++j, ++row)
{
QString name = info.fieldName(j);
- Q3CheckListItem * checkItem = new Q3CheckListItem( m_columnView, name,
- Q3CheckListItem::CheckBox );
- checkItem->setOn(false);
- m_columnView->insertItem( checkItem );
- checkItem->setText( 1, tables[i] );
+ 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);
- checkItem->setText( 2, QVariant::typeToName(field.type()) );
+ m_columnView->setItem(row, 2, new QTableWidgetItem( \
QVariant::typeToName(field.type()) ) ); }
}
- m_columnView->setSorting(1, true);
- m_columnView->sort();
- m_columnView->setSorting( -1 );
+ m_columnView->sortItems(1);
setValid(m_columns, true);
@@ -758,11 +756,12 @@
bool DatabaseDialog::columnsDoNext()
{
QStringList columns;
- for (Q3ListViewItem * item = m_columnView->firstChild(); item; item = \
item->nextSibling()) + for (int row = 0; row < m_columnView->rowCount(); ++row)
{
- if (((Q3CheckListItem * ) item)->isOn())
+ QTableWidgetItem* item = m_columnView->item(row, 0);
+ if (item->checkState() == Qt::Checked)
{
- columns.append( item->text(1) + '.' + ((Q3CheckListItem * ) item)->text());
+ columns.append( m_columnView->item(row, 1)->text() + '.' + item->text());
}
}
@@ -953,18 +952,17 @@
query += "\nFROM ";
- Q3ListViewItem * item = (Q3CheckListItem *) m_tableView->firstChild();
bool b = false;
- while ( item )
+ for (int i = 0; i < m_tableView->count(); ++i)
{
- if (((Q3CheckListItem * ) item)->isOn())
+ QListWidgetItem* item = m_tableView->item(i);
+ if (item->checkState() == Qt::Checked)
{
if ( b )
query += ", ";
b = true;
- query += ((Q3CheckListItem * ) item)->text();
+ query += item->text();
}
- item = item->nextSibling();
}
if ( ( !m_operatorValue_1->text().isEmpty() )
@@ -1092,12 +1090,12 @@
setValid(m_database, false);
}
-void DatabaseDialog::popupTableViewMenu( Q3ListViewItem *, const QPoint &, int )
+/*void DatabaseDialog::popupTableViewMenu( Q3ListViewItem *, const QPoint &, int )
{
// TODO: popup menu with "Select All", "Inverse selection", "remove selection"
-}
+}*/
-void DatabaseDialog::tableViewClicked( Q3ListViewItem * )
+void DatabaseDialog::tableViewClicked( QListWidgetItem * )
{
// if ( item )
// {
--- trunk/koffice/kspread/dialogs/DatabaseDialog.h #1046763:1046764
@@ -23,7 +23,6 @@
#define KSPREAD_DATABASE_DIALOG
#include <QRect>
-//Added by qt3to4:
#include <QFrame>
#include <QLabel>
@@ -35,11 +34,12 @@
class QFrame;
class QLabel;
class KLineEdit;
-class Q3ListViewItem;
+class QTableWidget;
+class QListWidget;
+class QListWidgetItem;
class QRadioButton;
class KTextEdit;
-class K3ListView;
class KPageWidgetItem;
class KPushButton;
@@ -66,8 +66,8 @@
void databaseNameChanged( const QString & s );
void databaseHostChanged( const QString & s );
void databaseDriverChanged( int );
- void popupTableViewMenu( Q3ListViewItem *, const QPoint &, int );
- void tableViewClicked( Q3ListViewItem * );
+ //void popupTableViewMenu( QListWidgetItem *, const QPoint &, int );
+ void tableViewClicked( QListWidgetItem * );
void accept();
protected:
@@ -94,9 +94,9 @@
KPushButton * m_connectButton;
QLabel * m_tableStatus;
QLabel * m_SelectTableLabel;
- K3ListView * m_tableView;
+ QListWidget * m_tableView;
KPageWidgetItem * m_columns;
- K3ListView * m_columnView;
+ QTableWidget * m_columnView;
QLabel * m_columnsStatus;
KPageWidgetItem * m_options;
KComboBox * m_columns_1;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic