July 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39138 - /trunk/autoinstallation/src/modules/AutoinstScripts.ycp
by ug＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: ug Date: Tue Jul 3 13:26:13 2007 New Revision: 39138 URL: http://svn.opensuse.org/viewcvs/yast?rev=39138&view=rev Log: chrooted scripts execution fixed Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp Modified: trunk/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstScripts.ycp Tue Jul 3 13:26:13 2007 @@ -419,11 +419,19 @@ } else if (type == "chroot-scripts") { - tmpdirString = sformat("%1%2", AutoinstConfig::destdir, AutoinstConfig::scripts_dir); - SCR::Execute (.target.mkdir, tmpdirString); + if( !special ) { + tmpdirString = sformat("%1%2", AutoinstConfig::destdir, AutoinstConfig::scripts_dir); + SCR::Execute (.target.mkdir, tmpdirString); + + current_logdir = sformat("%1%2", AutoinstConfig::destdir, AutoinstConfig::logs_dir); + SCR::Execute (.target.mkdir, current_logdir); + } else { + tmpdirString = sformat("%1", AutoinstConfig::scripts_dir); + SCR::Execute (.target.mkdir, tmpdirString); - current_logdir = sformat("%1%2", AutoinstConfig::destdir, AutoinstConfig::logs_dir); - SCR::Execute (.target.mkdir, current_logdir); + current_logdir = sformat("%1", AutoinstConfig::logs_dir); + SCR::Execute (.target.mkdir, current_logdir); + } } else { @@ -479,8 +487,14 @@ { //scriptPath = sformat("%1%2/%3", (special) ? "" : AutoinstConfig::destdir, AutoinstConfig::scripts_dir, scriptName); - // write always to /mnt/.... - scriptPath = sformat("%1%2/%3",AutoinstConfig::destdir, AutoinstConfig::scripts_dir, scriptName); + map toks = URL::Parse(s["location"]:""); + if( toks["scheme"]:"" == "nfs" || !special ) { + scriptPath = sformat("%1%2/%3",AutoinstConfig::destdir, AutoinstConfig::scripts_dir, scriptName); + } else { + scriptPath = sformat("%1/%2",AutoinstConfig::scripts_dir, scriptName); + } + + y2milestone("Writing chroot script into %1", scriptPath); if (s["location"]:""!="") { @@ -491,6 +505,9 @@ } else { SCR::Write(.target.string, scriptPath, s["source"]:"echo Empty script!"); } + if( special && toks["scheme"]:"" == "nfs" ) { + scriptPath = substring (scriptPath, 4); // cut off the /mnt for later execution + } } else { @@ -517,26 +534,25 @@ string executionString = ""; boolean showFeedback = s["feedback"]:false; - if( type == "chroot-scripts" && special ) { - // no AutoinstConfig::destdir in path for chrooted scripts - scriptPath = sformat("%1/%2",AutoinstConfig::scripts_dir, scriptName); - } if (scriptInterpreter == "shell") { string debug = ( s["debug"]:true ? "-x" : "" ); executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); + y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); } else if (scriptInterpreter == "perl") { string debug = ( s["debug"]:true ? "-w" : "" ); executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName); + y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); } else if (scriptInterpreter == "python") { executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName ); + y2milestone("Script Execution command: %1", executionString ); SCR::Execute (.target.bash, executionString); } else @@ -550,7 +566,6 @@ if( size(feedback) > 0 ) { Popup::LongText(type, `RichText(`opt(`plainText), feedback), 50, 20 ); } - y2milestone("Script Execution command: %1", executionString ); } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39137 - /trunk/ncurses/package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: kmachalkova Date: Tue Jul 3 11:32:45 2007 New Revision: 39137 URL: http://svn.opensuse.org/viewcvs/yast?rev=39137&view=rev Log: Merged adrian's changelog fix Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Jul 3 11:32:45 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 21 17:38:48 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- Thu Jun 14 16:41:04 CEST 2007 - kmachalkova(a)suse.cz - Use environment variable Y2NCURSES_COLOR_THEME to set color theme @@ -1334,12 +1339,6 @@ - improvements for package installation dialog ------------------------------------------------------------------- -Thu Nov 14 20:56:17 CET 2002 - ma(a)suse.de - -- V 2.7.2 -- Fixed bug that inhibits logging on big-endian architectures. - -------------------------------------------------------------------- Tue Nov 26 15:36:02 CET 2002 - gs(a)suse.de - V 2.6.24 @@ -1347,13 +1346,19 @@ (preserve newlines) ------------------------------------------------------------------- +Thu Nov 14 20:56:17 CET 2002 - ma(a)suse.de + +- V 2.7.2 +- Fixed bug that inhibits logging on big-endian architectures. + +------------------------------------------------------------------- Thu Nov 14 19:34:31 CET 2002 - ma(a)suse.de - V 2.6.23 - Fixed bug that inhibits logging on big-endian architectures. -------------------------------------------------------------------- +------------------------------------------------------------------ Wed Nov 13 12:35:21 CET 2002 - gs(a)suse.de - V 2.6.22 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39136 - /trunk/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: kmachalkova Date: Tue Jul 3 11:12:30 2007 New Revision: 39136 URL: http://svn.opensuse.org/viewcvs/yast?rev=39136&view=rev Log: changelog update Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jul 3 11:12:30 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jul 3 11:11:39 CEST 2007 - kmachalkova(a)suse.cz + +- ag_udev_persistent added to .spec file + +------------------------------------------------------------------- Mon Jul 2 17:47:46 CEST 2007 - mzugec(a)suse.cz - fixed delete item -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39135 - in /trunk/squidguard/src: complex.ycp dialogs.ycp
by jsuchome＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: jsuchome Date: Tue Jul 3 10:23:19 2007 New Revision: 39135 URL: http://svn.opensuse.org/viewcvs/yast?rev=39135&view=rev Log: added whitelist table Modified: trunk/squidguard/src/complex.ycp trunk/squidguard/src/dialogs.ycp Modified: trunk/squidguard/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/src/complex.ycp?rev=3… ============================================================================== --- trunk/squidguard/src/complex.ycp (original) +++ trunk/squidguard/src/complex.ycp Tue Jul 3 10:23:19 2007 @@ -73,9 +73,24 @@ "whitelist" : $[ // tab header "header" : _("&Whitelist"), + // tab contents description: uses widget names from widget_descr map "contents" : `VBox ( - `HVCenter (`Label ("...... and whitelist")) - ) + "whitelist_table", + `HBox ( + "add_button", + "edit_button", + "delete_button", + `Right ("reset_button") + ) + ), + // widgets that are checked for events + "widget_names" : [ + "whitelist_table", + "add_button", + "edit_button", + "delete_button", + "reset_button" + ], ], ]; @@ -89,16 +104,30 @@ "widget" : `custom, "custom_widget" : `VBox ( // label (above table) - `Left (`Label (_("Blacklisted Addresses"))), + `Left (`Label (_("Forbidden Addresses"))), // table header `Table (`id ("table"), `opt (`notify), `header(_("URL"))) ), - "init" : InitBlacklistTable, - "handle" : HandleInitBlacklistTable, + "init" : InitTable, + "handle" : HandleInitTable, "handle_events" : [ "table" ], "help" : _("Here, configure the blacklist. Use Add, Edit, and Delete to modify list of URLs. Data are saved after pushing Finish button."), ], + "whitelist_table" : $[ + "widget" : `custom, + "custom_widget" : `VBox ( + // label (above table) + `Left (`Label (_("Allowed Addresses"))), + // table header + `Table (`id ("table"), `opt (`notify), `header(_("URL"))) + ), + "init" : InitTable, + "handle" : HandleInitTable, + "handle_events" : [ "table" ], + "help" : _("Here, configure the whitelist. Use Add, Edit, and Delete to modify list of URLs. +Data are saved after pushing Finish button."), + ], "add_button" : $[ "widget" : `push_button, "label" : Label::AddButton (), @@ -124,7 +153,7 @@ "reset_button" : $[ "widget" : `push_button, // push button label - "label" : _("Rese&t"), + "label" : _("R&eset"), "no_help" : true, "handle_events" : [ "reset_button" ], // "handle" : HandleResetButton, Modified: trunk/squidguard/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/src/dialogs.ycp?rev=3… ============================================================================== --- trunk/squidguard/src/dialogs.ycp (original) +++ trunk/squidguard/src/dialogs.ycp Tue Jul 3 10:23:19 2007 @@ -48,11 +48,15 @@ /** * initialize the table with blacklist */ -define void InitBlacklistTable (string id) { +define void InitTable (string id) { - list items = maplist (string url, (list<string>) Squidguard::blacklist, { - return `item (`id (url), url); - }); + list items = []; + if (CWMTab::CurrentTab () == "whitelist") + items = maplist (string url, (list<string>) Squidguard::whitelist, + ``(`item (`id (url), url))); + else + items = maplist (string url, (list<string>) Squidguard::blacklist, + ``(`item (`id (url), url))); UI::ChangeWidget (`id ("table"), `Items, items); UI::ChangeWidget (`id ("edit_button"), `Enabled, size (items) > 0); UI::ChangeWidget (`id ("delete_button"), `Enabled, size (items) > 0); @@ -65,21 +69,18 @@ */ define symbol HandleDeleteButton (string key, map event) { - string current_item = (string) UI::QueryWidget (`id ("table"), `CurrentItem); + string current_item = (string)UI::QueryWidget (`id ("table"), `CurrentItem); if (CWMTab::CurrentTab () == "whitelist") { - Squidguard::whitelist = (list<string>) filter (string url, Squidguard::whitelist, { - return url != current_item; - }); -// InitWhitelistTable ("table"); + Squidguard::whitelist = (list<string>) + filter (string url, Squidguard::whitelist, ``(url != current_item)); } else { - Squidguard::blacklist = (list<string>) filter (string url, Squidguard::blacklist, { - return url != current_item; - }); - InitBlacklistTable ("table"); + Squidguard::blacklist = (list<string>) + filter (string url, Squidguard::blacklist, ``(url != current_item)); } + InitTable ("table"); return nil; } @@ -89,12 +90,64 @@ */ define symbol HandleEditButton (string key, map event) { - string current = (string) UI::QueryWidget (`id ("table"), `CurrentItem); + string current = (string)UI::QueryWidget (`id ("table"), `CurrentItem); + + UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.5), + // textentry label + `TextEntry (`id (`url), _("&Modify URL"), current), + `HBox ( + `PushButton (`id(`ok),`opt(`key_F10, `default), Label::OKButton()), + `PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton()) + ), + `VSpacing (0.5)), `HSpacing (0.5)) + ); + UI::SetFocus (`id (`url)); + any ret = nil; + string url = ""; + repeat + { + ret = UI::UserInput (); + if (ret == `ok) + { + url = (string) UI::QueryWidget (`id(`url), `Value); + if (url == "") + { + ret = `cancel; + break; + } + // check if url is valid + if (!URL::Check (url)) + { + // popup message + Popup::Error (_("The entered URL is not valid.")); + ret = `notnext; + continue; + } + } + } until (ret == `ok || ret == `cancel); + UI::CloseDialog (); + if (ret == `ok && url != current) + { + if (CWMTab::CurrentTab () == "blacklist") + { + Squidguard::blacklist = (list<string>) union ( + filter (string u, Squidguard::blacklist, ``(u != current)), + [ url ]); + } + else + { + Squidguard::whitelist = (list<string>) union ( + filter (string u, Squidguard::whitelist, ``(u != current)), + [ url ]); + } + } + InitTable ("table"); return nil; } // handle table events (double click = edit button) -define symbol HandleInitBlacklistTable (string key, map event) { +define symbol HandleInitTable (string key, map event) { return HandleEditButton ("edit_button", $[]); } @@ -105,9 +158,9 @@ define symbol HandleAddButton (string key, map event) { // popup label - string label = _("Add new blacklist URL"); + string label = _("&Add new blacklist URL"); if (CWMTab::CurrentTab () == "whitelist") - label = _("Add new whitelist URL"); + label = _("&Add new whitelist URL"); UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VBox ( `VSpacing (0.5), @@ -148,15 +201,16 @@ if (CWMTab::CurrentTab () == "blacklist") { // use union to filter out duplicates - Squidguard::blacklist = (list<string>) union (Squidguard::blacklist, [ url ]); - InitBlacklistTable ("table"); + Squidguard::blacklist = + (list<string>) union (Squidguard::blacklist, [ url ]); } else { - Squidguard::whitelist = (list<string>) union (Squidguard::whitelist, [ url ]); -// InitWhitelistTable ("table"); + Squidguard::whitelist = + (list<string>) union (Squidguard::whitelist, [ url ]); } } + InitTable ("table"); return nil; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39134 - /trunk/network/yast2-network.spec.in
by kmachalkova＠svn.opensuse.org 03 Jul '07

03 Jul '07

Author: kmachalkova Date: Tue Jul 3 10:04:20 2007 New Revision: 39134 URL: http://svn.opensuse.org/viewcvs/yast?rev=39134&view=rev Log: Added ag_udev_persistent to spec.in to make pkg build :) Modified: trunk/network/yast2-network.spec.in Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Tue Jul 3 10:04:20 2007 @@ -69,6 +69,7 @@ @moduledir@/*.ybc @desktopdir@/*.desktop @scrconfdir@/*.scr +@agentdir@/ag_udev_persistent %doc @docdir@ @schemadir@/autoyast/rnc/networking.rnc @schemadir@/autoyast/rnc/host.rnc -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39133 - in /trunk/storage: libstorage/src/Md.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: fehr Date: Mon Jul 2 19:36:57 2007 New Revision: 39133 URL: http://svn.opensuse.org/viewcvs/yast?rev=39133&view=rev Log: create 1.0 md superblocks with a bitmap by default (#282807) Modified: trunk/storage/libstorage/src/Md.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Mon Jul 2 19:36:57 2007 @@ -311,7 +311,10 @@ string cmd = "ls -l --full-time " + dnames + "; "; cmd += "modprobe " + pName() + "; mdadm --create " + device() + - " --run --level=" + pName(); + " --run --level=" + pName() + " -e 1.0"; + if (pName() == "raid1" || pName() == "raid5" || pName() == "raid6" || + pName() == "raid10") + cmd += " -b internal"; if( chunk>0 ) cmd += " --chunk=" + decString(chunk); if( md_parity!=PAR_NONE ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jul 2 19:36:57 2007 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Jul 2 18:46:38 CEST 2007 - fehr(a)suse.de +Mon Jul 2 19:36:31 CEST 2007 - fehr(a)suse.de - prevent some rpmlint warnings +- create 1.0 md superblocks with a bitmap by default (#282807) ------------------------------------------------------------------- Mon Jul 2 18:08:11 CEST 2007 - fehr(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39132 - in /trunk/storage: package/yast2-storage.changes yast2-storage.spec.in
by fehr＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: fehr Date: Mon Jul 2 18:51:09 2007 New Revision: 39132 URL: http://svn.opensuse.org/viewcvs/yast?rev=39132&view=rev Log: prevent some rpmlint warnings Modified: trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jul 2 18:51:09 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jul 2 18:46:38 CEST 2007 - fehr(a)suse.de + +- prevent some rpmlint warnings + +------------------------------------------------------------------- Mon Jul 2 18:08:11 CEST 2007 - fehr(a)suse.de - make sure util-linux-crypto gets installed and boot.crypto is Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Jul 2 18:51:09 2007 @@ -32,6 +32,7 @@ @INSTALL@ rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2StorageCallbacks.la +rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2StorageCallbacks.so @CLEAN@ @@ -75,7 +76,6 @@ # libstorage ycp callbacks @plugindir@/libpy2StorageCallbacks.so.* -@plugindir@/libpy2StorageCallbacks.so # disk %dir @desktopdir@ @@ -114,7 +114,7 @@ %files lib %defattr(-,root,root) -%{_libdir}/liby2storage.so* +%{_libdir}/liby2storage.so.* %post lib /sbin/ldconfig @@ -130,6 +130,7 @@ %files devel %defattr(-,root,root) %{_libdir}/liby2storage.la +%{_libdir}/liby2storage.so @includedir@ %doc @docdir@/examples %doc @docdir@/libstorage -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39131 - /branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:41:50 2007 New Revision: 39131 URL: http://svn.opensuse.org/viewcvs/yast?rev=39131&view=rev Log: change log Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Mon Jul 2 18:41:50 2007 @@ -305,3 +305,16 @@ * Added YSelectionBox::shrinkable() and setShrinkable() as a replacement for YWidgetOpt.shrinkable + +2007-07-02 18:30 sh(a)suse.de + +* Ported simple YSelectionWidgets (major rewrite): + - YSelectionBox + - YComboBox + - YMultiSelectionBox + + Most (almost all?) of the selection handling went to the YSelectionWidget + base class. The concrete UI implementations have to implement 2 pure virtual + functions each - see the respective header files. See the YQ sample + implementations for more details. + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39130 - in /branches/tmp/sh/mod-ui: core/libyui/doc/examples/MultiSelectionBox3.ycp core/libyui/src/YCPPropertyHandler.cc core/libyui/src/YCPPropertyHandler.h qt/src/YQMultiSelectionBox.cc
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:36:40 2007 New Revision: 39130 URL: http://svn.opensuse.org/viewcvs/yast?rev=39130&view=rev Log: fixed MultiSelBox selection Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/MultiSelectionBox3.ycp Mon Jul 2 18:36:40 2007 @@ -17,6 +17,8 @@ `PushButton( `opt(`default), "&OK") ) ); + UI::ChangeWidget(`toppings, `SelectedItems, [`sausage, `onions] ); + UI::UserInput(); list selected_items = (list) UI::QueryWidget( `id(`toppings), `SelectedItems ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc Mon Jul 2 18:36:40 2007 @@ -72,7 +72,7 @@ } else if ( propertyName == YUIProperty_SelectedItems ) { - // if ( trySetMultiSelectionBoxSelecteditems( widget, val ) ) return true; + if ( trySetMultiSelectionBoxSelectedItems( widget, val ) ) return true; } y2error( "Can't handle property %s::%s - not changing anything", @@ -289,7 +289,46 @@ } +bool +YCPPropertyHandler::trySetMultiSelectionBoxSelectedItems( YWidget * widget, const YCPValue & val ) +{ + YMultiSelectionBox * multiSelBox = dynamic_cast<YMultiSelectionBox *> (widget); + + if ( ! multiSelBox ) + return false; + + if ( ! val->isList() ) + { + string msg = "Expected a list of item IDs"; + YUI_THROW( YUIBadPropertyArgException( YProperty( YUIProperty_SelectedItems, + YOtherProperty ), + widget, msg ) ); + + } + + YCPList itemIdList = val->asList(); + multiSelBox->deselectAllItems(); + + for ( int i=0; i < itemIdList.size(); i++ ) + { + YCPItem * item = findItem( multiSelBox, itemIdList->value( i ) ); + + if ( ! item ) + { + y2error( "%s \"%s\" has no item with ID %s", + multiSelBox->widgetClass(), + multiSelBox->debugLabel().c_str(), + itemIdList->value(i)->toString().c_str() ); + } + else + { + multiSelBox->selectItem( item ); + } + } + + return true; +} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h Mon Jul 2 18:36:40 2007 @@ -86,7 +86,7 @@ static bool trySetComboBoxValue ( YWidget * widget, const YCPValue & val ); 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 trySetMultiSelectionBoxSelectedItems ( YWidget * widget, const YCPValue & val ); /** * All trySet..() functions try to dynamic_cast 'widget' to the expected Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Mon Jul 2 18:36:40 2007 @@ -113,7 +113,19 @@ YMultiSelectionBox::deselectAllItems(); _qt_listView->blockSignals( true ); - _qt_listView->clearSelection(); + + QListViewItemIterator it( _qt_listView ); + + while ( *it ) + { + YQMultiSelectionBoxItem * item = dynamic_cast<YQMultiSelectionBoxItem *> (*it); + + if ( item ) + item->setOn( false ); + + ++it; + } + _qt_listView->blockSignals( false ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39129 - in /branches/tmp/sh/mod-ui/core/libyui/src: YCPPropertyHandler.cc YCPPropertyHandler.h
by sh-sh-sh＠svn.opensuse.org 02 Jul '07

02 Jul '07

Author: sh-sh-sh Date: Mon Jul 2 18:20:33 2007 New Revision: 39129 URL: http://svn.opensuse.org/viewcvs/yast?rev=39129&view=rev Log: get MultiSelBox SelItems Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.cc Mon Jul 2 18:20:33 2007 @@ -29,16 +29,18 @@ #include <ycp/y2log.h> #include "YCPPropertyHandler.h" + #include "YCPDialogParser.h" +#include "YCPItem.h" #include "YCPItemParser.h" #include "YCPValueWidgetID.h" #include "YCheckBox.h" -#include "YSelectionBox.h" #include "YComboBox.h" -#include "YRadioButtonGroup.h" +#include "YMultiSelectionBox.h" #include "YRadioButton.h" -#include "YCPItem.h" +#include "YRadioButtonGroup.h" +#include "YSelectionBox.h" #include "YUISymbols.h" @@ -66,7 +68,11 @@ } else if ( propertyName == YUIProperty_CurrentButton ) { - if ( trySetRadioButtonGroupCurrentButton( widget, val ) ) return true; + if ( trySetRadioButtonGroupCurrentButton( widget, val ) ) return true; + } + else if ( propertyName == YUIProperty_SelectedItems ) + { + // if ( trySetMultiSelectionBoxSelecteditems( widget, val ) ) return true; } y2error( "Can't handle property %s::%s - not changing anything", @@ -98,13 +104,16 @@ { val = tryGetRadioButtonGroupCurrentButton( widget ); if ( ! val.isNull() ) return val; } + else if ( propertyName == YUIProperty_SelectedItems ) + { + val = tryGetMultiSelectionBoxSelectedItems( widget ); if ( ! val.isNull() ) return val; + } // FIXME: TO DO: // FIXME: TO DO: // FIXME: TO DO: - // tryGetMultiSelectionBoxSelectedItems // tryGetSelectionWidgetItems y2error( "Can't handle property %s::%s - returning 'nil'", @@ -383,3 +392,35 @@ return YCPVoid(); } + + +YCPValue +YCPPropertyHandler::tryGetMultiSelectionBoxSelectedItems( YWidget * widget ) +{ + YMultiSelectionBox * multiSelBox = dynamic_cast<YMultiSelectionBox *> (widget); + + if ( ! multiSelBox ) + return YCPNull(); + + YCPList selectedItemsList; + YConstItemCollection selectedItems = multiSelBox->selectedItems(); + + for ( YConstItemConstIterator it = selectedItems.begin(); + it != selectedItems.end(); + ++it ) + { + const YCPItem * item = dynamic_cast<const YCPItem *> (*it); + + if ( item ) + { + if ( item->hasId() ) + selectedItemsList->add( item->id() ); + else + y2error( "Item has no ID: %s", item->label()->value().c_str() ); + } + else + y2error( "Wrong item type (not a YCPItem): %s", (*it)->label().c_str() ); + } + + return selectedItemsList; +} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPPropertyHandler.h Mon Jul 2 18:20:33 2007 @@ -86,6 +86,7 @@ static bool trySetComboBoxValue ( YWidget * widget, const YCPValue & val ); static bool trySetSelectionWidgetItems ( YWidget * widget, const YCPValue & val ); static bool trySetRadioButtonGroupCurrentButton ( YWidget * widget, const YCPValue & val ); + // static bool trySetMultiSelectionBoxSelecteditems ( YWidget * widget, const YCPValue & val ); /** * All trySet..() functions try to dynamic_cast 'widget' to the expected @@ -97,6 +98,7 @@ static YCPValue tryGetComboBoxValue ( YWidget * widget ); static YCPValue tryGetSelectionBoxValue ( YWidget * widget ); static YCPValue tryGetRadioButtonGroupCurrentButton ( YWidget * widget ); + static YCPValue tryGetMultiSelectionBoxSelectedItems( YWidget * widget ); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0