Author: coolo
Date: Thu Jan 17 13:31:51 2008
New Revision: 43709
URL: http://svn.opensuse.org/viewcvs/yast?rev=43709&view=rev
Log:
fix semantics of MSB
Modified:
trunk/qt/src/YQMultiSelectionBox.cc
trunk/qt/src/YQMultiSelectionBox.h
Modified: trunk/qt/src/YQMultiSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiSelectionBox.cc?rev=43709&r1=43708&r2=43709&view=diff
==============================================================================
--- trunk/qt/src/YQMultiSelectionBox.cc (original)
+++ trunk/qt/src/YQMultiSelectionBox.cc Thu Jan 17 13:31:51 2008
@@ -21,6 +21,7 @@
#include <QLabel>
#include <QVBoxLayout>
#include <QHeaderView>
+#include <QDebug>
#define y2log_component "qt-ui"
#include
@@ -60,8 +61,8 @@
_qt_listView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
_qt_listView->setHeaderLabel(""); // QListView doesn't have one single column by default!
- _qt_listView->sortItems( 0, Qt::AscendingOrder );
- //FIXME _qt_listView->header()->setStretchEnabled( true );
+ _qt_listView->setSortingEnabled( false );
+
_qt_listView->header()->hide();
_qt_listView->setRootIsDecorated ( false );
_caption->setBuddy( _qt_listView );
@@ -73,6 +74,9 @@
connect( this, SIGNAL( valueChanged() ),
this, SLOT ( slotValueChanged() ) );
+
+ connect( _qt_listView, SIGNAL( itemChanged( QTreeWidgetItem*, int ) ),
+ this, SLOT ( slotItemChanged( QTreeWidgetItem*, int ) ) );
}
@@ -102,14 +106,12 @@
// Take care of the item's check box
- if ( yItem->selected() )
- msbItem->setCheckState(0, Qt::Checked);
-
+ msbItem->setCheckState(0, yItem->selected() ? Qt::Checked : Qt::Unchecked );
// Take care of the QListView's keyboard focus
if ( ! _qt_listView->currentItem() )
- msbItem->setSelected(true);
+ _qt_listView->setCurrentItem( msbItem );
}
@@ -119,7 +121,7 @@
YQMultiSelectionBoxItem * msbItem = findItem( yItem );
if ( msbItem )
- msbItem->setCheckState( 1, selected ? Qt::Checked : Qt::Unchecked );
+ msbItem->setCheckState( 0, selected ? Qt::Checked : Qt::Unchecked );
}
@@ -136,7 +138,7 @@
YQMultiSelectionBoxItem * item = dynamic_cast (*it);
if ( item )
- item->setCheckState(0, Qt::Checked);
+ item->setCheckState(0, Qt::Unchecked);
++it;
}
@@ -212,7 +214,7 @@
YQMultiSelectionBoxItem * msbItem = findItem( yItem );
if ( msbItem )
- msbItem->setSelected(true);
+ _qt_listView->setCurrentItem( msbItem );
// This does NOT change the item's check box!
// (see explanations in YQMultiSelectionBox::currentItem() avove)
@@ -290,12 +292,14 @@
void
-YQMultiSelectionBox::sendValueChanged()
+YQMultiSelectionBox::slotItemChanged ( QTreeWidgetItem * _item, int )
{
+ YQMultiSelectionBoxItem * item = dynamic_cast (_item);
+ bool selected = item->checkState( 0 );
+ item->yItem()->setSelected( selected );
emit valueChanged();
}
-
YQMultiSelectionBoxItem *
YQMultiSelectionBox::findItem( YItem * wantedItem )
{
@@ -316,9 +320,6 @@
}
-
-
-
int YQMultiSelectionBoxItem::_item_count = 0;
@@ -332,34 +333,9 @@
{
YUI_CHECK_PTR( yItem );
setFlags( Qt::ItemIsUserCheckable | Qt::ItemIsEnabled );
- setCheckState( 0, Qt::Unchecked );
setText(0, fromUTF8( yItem->label() ));
+ setCheckState( 0, Qt::Unchecked );
_serial = _item_count++;
}
-void
-YQMultiSelectionBoxItem::stateChange( bool newState )
-{
- _yItem->setSelected( newState );
- _multiSelectionBox->sendValueChanged();
- //QTreeWidgetItem::stateChange( newState );
- // FIXME checked or selected state?
- QTreeWidgetItem::setCheckState( 0, newState ? Qt::Checked : Qt::Unchecked );
-}
-
-
-QString
-YQMultiSelectionBoxItem::key( int, bool ) const
-{
- /*
- * Return a sort key that depends on creation (i.e. insertion) order.
- */
-
- static QString sortKey;
- sortKey.sprintf( "%010d", INT_MAX - _serial );
-
- return sortKey;
-}
-
-
#include "YQMultiSelectionBox.moc"
Modified: trunk/qt/src/YQMultiSelectionBox.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiSelectionBox.h?rev=43709&r1=43708&r2=43709&view=diff
==============================================================================
--- trunk/qt/src/YQMultiSelectionBox.h (original)
+++ trunk/qt/src/YQMultiSelectionBox.h Thu Jan 17 13:31:51 2008
@@ -130,11 +130,6 @@
**/
virtual bool setKeyboardFocus();
- /**
- * Sends a ValueChanged signal.
- **/
- void sendValueChanged();
-
signals:
/**
@@ -154,6 +149,7 @@
**/
void slotValueChanged();
+ void slotItemChanged( QTreeWidgetItem*, int );
protected:
/**
@@ -191,23 +187,6 @@
protected:
- /**
- * Called when the on/off state changes.
- * Triggers a 'valueChanged' event in the associated YQMultiSelectionBox.
- *
- * Reimplemented from QChecklistItem.
- **/
- void stateChange( bool newState );
-
- /**
- * Returns the sort key for any column.
- * In this case, maintain item creation order.
- *
- * Reimplemented from QTreeWidgetItem
- **/
- virtual QString key ( int column,
- bool ascending ) const;
-
//
// Data members
//
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
