Author: sh-sh-sh Date: Tue Jul 15 19:18:58 2008 New Revision: 49134 URL: http://svn.opensuse.org/viewcvs/yast?rev=49134&view=rev Log: multi selection table Added: trunk/ycp-ui-bindings/examples/Table6-multiSel.ycp Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/examples/Events.ycp trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPDialogParser.cc trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc trunk/ycp-ui-bindings/src/YCPPropertyHandler.h trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Tue Jul 15 19:18:58 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/ycp-ui-bindings/examples/Events.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Events.ycp?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/examples/Events.ycp (original) +++ trunk/ycp-ui-bindings/examples/Events.ycp Tue Jul 15 19:18:58 2008 @@ -102,7 +102,7 @@ ] ); - term drink = `Table(`id(`drink), `opt(`notify, `immediate), `header( "Drink", "Contents" ), + term drink = `Table(`id(`drink), `opt(`notify, `immediate, `multiSelection), `header( "Drink", "Contents" ), [ `item(`id(`coke), "Coca Cola", "Caffeine" ), `item(`id(`sprite), "Sprite", "" ), Added: trunk/ycp-ui-bindings/examples/Table6-multiSel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Table6-multiSel.ycp?rev=49134&view=auto ============================================================================== --- trunk/ycp-ui-bindings/examples/Table6-multiSel.ycp (added) +++ trunk/ycp-ui-bindings/examples/Table6-multiSel.ycp Tue Jul 15 19:18:58 2008 @@ -0,0 +1,27 @@ +{ + UI::OpenDialog( + `VBox( + `Heading("Today's menu"), + `MinSize( 30, 10, + `Table(`id(`menu), + `opt(`multiSelection), + `header("Name", "Price"), + [ + `item(`id(1), "Chili", 6), + `item(`id(2), "Salami Baguette", nil), + `item(`id(3), "Spaghetti", 8), + `item(`id(4), "Steak Sandwich", 12) + ] + ) + ), + `PushButton("&OK") + ) + ); + UI::UserInput(); + + any sel = UI::QueryWidget(`menu, `SelectedItems ); + UI::CloseDialog(); + + y2milestone( "Selected: %1", sel ); +} + Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Tue Jul 15 19:18:58 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 15 19:13:25 CEST 2008 - sh@suse.de + +- Implemented fate #303492: Multi selection for table widget +- V 2.17.2 + +------------------------------------------------------------------- Fri May 16 12:32:24 CEST 2008 - sh@suse.de - Handle nonexistent widgets in UI::SetFocus() more gracefully Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogParser.cc?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Tue Jul 15 19:18:58 2008 @@ -1934,7 +1934,6 @@ * * Note: The Qt version of the Wizard widget also provides a built-in tree with * an API that is (sometimes) easier to use. - * **/ YWidget * @@ -1989,13 +1988,17 @@ * @optarg list items the items contained in the selection box * @option immediate make `notify trigger immediately when the selected item changes * @option keepSorting keep the insertion order - don't let the user sort manually by clicking + * @option multiSelection user can select multiple items (rows) at once (shift-click, ctrl-click) * @usage `Table( `header( "Game", "Highscore" ), [ `item( `id(1), "xkobo", "1708" ) ] ) * @examples Table1.ycp Table2.ycp Table3.ycp Table4.ycp Table5.ycp * * @description * - * The Table widget is a selection list with multiple columns. The user can - * select exactly one row (with all its columns) from that list. + * The Table widget is a selection list with multiple columns. By default, the user can + * select exactly one row (with all its columns) from that list. With + * `opt(`multiSelection), the user can select one or more rows (with all their + * columns) from that list (In that case, use the `SelectedItems property, not + * `Value). * * Each cell (each column within each row) has a label text and an optional * icon. @@ -2077,17 +2080,19 @@ bool immediate = false; bool keepSorting = false; + bool multiSelection = false; for ( int o=0; o < optList->size(); o++ ) { - if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate ) immediate = true; - else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_keepSorting ) keepSorting = true; + if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate ) immediate = true; + else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_keepSorting ) keepSorting = true; + else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_multiSelection ) multiSelection = true; else logUnknownOption( term, optList->value(o) ); } YCPTerm headerTerm = term->value( argnr )->asTerm(); - YTable * table = YUI::widgetFactory()->createTable( parent, parseTableHeader( headerTerm ) ); + YTable * table = YUI::widgetFactory()->createTable( parent, parseTableHeader( headerTerm ), multiSelection ); if ( keepSorting ) table->setKeepSorting( true ); Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Tue Jul 15 19:18:58 2008 @@ -116,6 +116,7 @@ else if ( propertyName == YUIProperty_SelectedItems ) { if ( trySetMultiSelectionBoxSelectedItems( widget, val ) ) return true; + if ( trySetTableSelectedItems( widget, val ) ) return true; } y2error( "Can't handle property %s::%s - not changing anything", @@ -184,6 +185,7 @@ else if ( propertyName == YUIProperty_SelectedItems ) { val = tryGetMultiSelectionBoxSelectedItems( widget ); if ( ! val.isNull() ) return val; + val = tryGetTableSelectedItems( widget ); if ( ! val.isNull() ) return val; } else if ( propertyName == YUIProperty_OpenItems ) { @@ -604,8 +606,8 @@ } -bool -YCPPropertyHandler::trySetMultiSelectionBoxSelectedItems( YWidget * widget, const YCPValue & val ) +template +bool trySetSelectionWidgetSelectedItems( YWidget * widget, const YCPValue & val ) { YMultiSelectionBox * multiSelBox = dynamic_cast (widget); @@ -647,6 +649,20 @@ bool +YCPPropertyHandler::trySetMultiSelectionBoxSelectedItems( YWidget * widget, const YCPValue & val ) +{ + return trySetSelectionWidgetSelectedItems( widget, val ); +} + + +bool +YCPPropertyHandler::trySetTableSelectedItems( YWidget * widget, const YCPValue & val ) +{ + return trySetSelectionWidgetSelectedItems( widget, val ); +} + + +bool YCPPropertyHandler::trySetMultiSelectionBoxCurrentItem( YWidget * widget, const YCPValue & val ) { YMultiSelectionBox * multiSelBox = dynamic_cast (widget); @@ -819,7 +835,8 @@ } -template YCPValue tryGetSelectionWidgetValue( YWidget * widget ) +template +YCPValue tryGetSelectionWidgetValue( YWidget * widget ) { Widget_t * selWidget = dynamic_cast (widget); @@ -920,29 +937,29 @@ } -YCPValue -YCPPropertyHandler::tryGetMultiSelectionBoxSelectedItems( YWidget * widget ) +template +YCPValue tryGetSelectionWidgetSelectedItems( YWidget * widget ) { - YMultiSelectionBox * multiSelBox = dynamic_cast (widget); + Widget_t * selWidget = dynamic_cast (widget); - if ( ! multiSelBox ) + if ( ! selWidget ) return YCPNull(); YCPList selectedItemsList; - YItemCollection selectedItems = multiSelBox->selectedItems(); + YItemCollection selectedItems = selWidget->selectedItems(); for ( YItemIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) { - const YCPItem * item = dynamic_cast (*it); + const Item_t * item = dynamic_cast (*it); if ( item ) { if ( item->hasId() ) selectedItemsList->add( item->id() ); else - y2error( "Item has no ID: %s", item->label()->value().c_str() ); + y2error( "Item has no ID: %s", (*it)->label().c_str() ); } else y2error( "Wrong item type (not a YCPItem): %s", (*it)->label().c_str() ); @@ -953,6 +970,20 @@ YCPValue +YCPPropertyHandler::tryGetMultiSelectionBoxSelectedItems( YWidget * widget ) +{ + return tryGetSelectionWidgetSelectedItems( widget ); +} + + +YCPValue +YCPPropertyHandler::tryGetTableSelectedItems( YWidget * widget ) +{ + return tryGetSelectionWidgetSelectedItems( widget ); +} + + +YCPValue YCPPropertyHandler::tryGetMultiSelectionBoxCurrentItem( YWidget * widget ) { YMultiSelectionBox * multiSelBox = dynamic_cast (widget); Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyHandler.h?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.h (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.h Tue Jul 15 19:18:58 2008 @@ -105,6 +105,7 @@ static bool trySetSelectionWidgetItems ( YWidget * widget, const YCPValue & val ); static bool trySetRadioButtonGroupCurrentButton ( YWidget * widget, const YCPValue & val ); static bool trySetMultiSelectionBoxSelectedItems ( YWidget * widget, const YCPValue & val ); + static bool trySetTableSelectedItems ( YWidget * widget, const YCPValue & val ); static bool trySetMultiSelectionBoxCurrentItem ( YWidget * widget, const YCPValue & val ); static bool trySetMultiProgressMeterValues ( YWidget * widget, const YCPValue & val ); static bool trySetBarGraphValues ( YWidget * widget, const YCPValue & val ); @@ -124,6 +125,7 @@ static YCPValue tryGetComboBoxValue ( YWidget * widget ); static YCPValue tryGetRadioButtonGroupCurrentButton ( YWidget * widget ); static YCPValue tryGetMultiSelectionBoxSelectedItems( YWidget * widget ); + static YCPValue tryGetTableSelectedItems ( YWidget * widget ); static YCPValue tryGetMultiSelectionBoxCurrentItem ( YWidget * widget ); static YCPValue tryGetTreeOpenItems ( YWidget * widget ); static YCPValue tryGetTreeCurrentBranch ( YWidget * widget ); Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in?rev=49134&r1=49133&r2=49134&view=diff ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Tue Jul 15 19:18:58 2008 @@ -20,8 +20,8 @@ BuildRequires: libxcrypt-devel # YUIOpt_repoMgr value -Requires: yast2-libyui >= 2.16.47 -BuildRequires: yast2-libyui-devel >= 2.16.47 +Requires: yast2-libyui >= 2.17.5 +BuildRequires: yast2-libyui-devel >= 2.17.5 # libyui ImplPtr BuildRequires: boost-devel -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org