December 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63022 - /tags/stable-2_20_10/network/
by mzugec＠svn2.opensuse.org 22 Dec '10

22 Dec '10

Author: mzugec Date: Thu Dec 23 00:33:13 2010 New Revision: 63022 URL: http://svn.opensuse.org/viewcvs/yast?rev=63022&view=rev Log: Created tag stable-2_20_10 for network Added: tags/stable-2_20_10/network/ - copied from r63021, trunk/network/ -- 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] r63021 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/lan/hardware.ycp src/modules/LanItems.ycp
by mzugec＠svn2.opensuse.org 22 Dec '10

22 Dec '10

Author: mzugec Date: Thu Dec 23 00:32:50 2010 New Revision: 63021 URL: http://svn.opensuse.org/viewcvs/yast?rev=63021&view=rev Log: ifcfg-ethX.Y style config files for VLAN(fate#309240) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=63021&r1=630… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Dec 23 00:32:50 2010 @@ -1 +1 @@ -2.20.9 +2.20.10 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 Thu Dec 23 00:32:50 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 23 00:32:23 CET 2010 - mzugec(a)suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) +- 2.20.10 + +------------------------------------------------------------------- Mon Dec 20 11:37:02 CET 2010 - mzugec(a)suse.cz - fate#306855: FCoE boot support Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Thu Dec 23 00:32:50 2010 @@ -126,6 +126,7 @@ void InitVLANSlave(string key) { settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; + settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0"); list items = []; // unconfigured devices @@ -143,10 +144,21 @@ items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); }); }); - UI::ChangeWidget(`id(key), `Items, items); + UI::ChangeWidget(`id(`vlan_eth), `Items, items); + UI::ChangeWidget(`id(`vlan_id), `Value, settings["VLAN_ID"]:0); } +symbol HandleVLANSlave(string key, map event){ + if (event["EventReason"]:""=="ValueChanged"){ + string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value)); + NetworkInterfaces::Name = configname; + LanItems::Items[LanItems::current, "ifcfg"]= configname; + UI::ChangeWidget(`id("IFCFGID"), `Value, configname); + } + return nil; +} + /** * Default function to store the value of ETHERDEVICE devices box. @@ -155,7 +167,8 @@ */ void StoreVLANSlave(string key, map event) { - settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `Value); + settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(`vlan_eth), `Value); + settings["VLAN_ID"] = UI::QueryWidget (`id(`vlan_id), `Value); } @@ -733,11 +746,15 @@ "help": help["bridge_ports"]:"", ], "ETHERDEVICE": $[ - "widget": `combobox, - "label": _("Real Interface for &VLAN"), - "items" : [ ], + "widget": `custom, + "custom_widget": + `HBox( + `ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface for &VLAN"), []), + `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0, 9999, 0) + ), "opt": [`hstretch], "init": InitVLANSlave, + "handle": HandleVLANSlave, "store": StoreVLANSlave, "help": help["etherdevice"]:"", ], @@ -1005,7 +1022,7 @@ // interface types. It will work in some cases, like // overriding eth to wlan but not in others where we would // need to change the contents of the dialog. #30890. - "IFCFGTYPE", + LanItems::type!="vlan" ? "IFCFGTYPE" : `Empty(), `HSpacing(1.5), `MinWidth(30, "IFCFGID"), `HSpacing(0.5), @@ -1260,6 +1277,9 @@ if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; +y2internal("%1, %2", LanItems::vlan_id, (integer)settings["VLAN_ID"]:0); + LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0); +y2internal("%1", LanItems::vlan_id); } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; } else if (contains(["tun", "tap"], LanItems::type)){ Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Thu Dec 23 00:32:50 2010 @@ -530,6 +530,10 @@ y2milestone("interface without hwinfo, proposing STARTMODE=auto"); LanItems::startmode="auto"; } + if (LanItems::type=="vlan"){ + string vlanid=(string) UI::QueryWidget(`id(`num), `Value); + NetworkInterfaces::Current["VLAN_ID"] = vlanid; + } } string driver = (string) UI::QueryWidget(`modul, `Value); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Thu Dec 23 00:32:50 2010 @@ -85,6 +85,7 @@ // VLAN option global string vlan_etherdevice=""; +global string vlan_id=""; // interfaces attached to bridge (list delimited by ' ') global string bridge_ports=""; @@ -832,6 +833,7 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); + vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); bond_slaves=[]; foreach(any key, any value, devmap, @@ -1063,7 +1065,9 @@ newdev["NAME"] = description; // L3: bnc#585458 // if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; - if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; + // exception for VLAN + // because of ethX.Y +// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type && type!="vlan") newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1092,6 +1096,7 @@ if (type=="vlan"){ newdev["ETHERDEVICE"]=vlan_etherdevice; + newdev["VLAN_ID"]=vlan_id; } if (type=="br"){ newdev["BRIDGE_PORTS"]=bridge_ports; @@ -1158,6 +1163,7 @@ } NetworkInterfaces::Name = Items[current, "ifcfg"]:""; NetworkInterfaces::Current = newdev; +y2internal("%1", newdev); if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]=""; } else { -- 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] r63020 - /tags/stable-2_20_7/yast2/
by mzugec＠svn2.opensuse.org 22 Dec '10

22 Dec '10

Author: mzugec Date: Wed Dec 22 19:00:07 2010 New Revision: 63020 URL: http://svn.opensuse.org/viewcvs/yast?rev=63020&view=rev Log: Created tag stable-2_20_7 for yast2 Added: tags/stable-2_20_7/yast2/ (props changed) - copied from r63019, trunk/yast2/ -- 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] r63019 - in /trunk/yast2: VERSION library/network/src/NetworkInterfaces.ycp package/yast2.changes
by mzugec＠svn2.opensuse.org 22 Dec '10

22 Dec '10

Author: mzugec Date: Wed Dec 22 18:59:36 2010 New Revision: 63019 URL: http://svn.opensuse.org/viewcvs/yast?rev=63019&view=rev Log: ifcfg-ethX.Y style config files for VLAN(fate#309240) Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63019&r1=63018… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Dec 22 18:59:36 2010 @@ -1 +1 @@ -2.20.6 +2.20.7 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Wed Dec 22 18:59:36 2010 @@ -182,6 +182,8 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); + // test if this is VLAN (ethX.vlanid) + if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Dec 22 18:59:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 22 18:58:19 CET 2010 - mzugec(a)suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) +- 2.20.7 + +------------------------------------------------------------------- Mon Dec 20 11:27:17 CET 2010 - mzugec(a)suse.cz - fate#306855: FCoE boot support -- 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] r63018 - /trunk/ycp-ui-bindings/examples/Tree-Checkbox.ycp
by tgoettlicher＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: tgoettlicher Date: Mon Dec 20 17:02:25 2010 New Revision: 63018 URL: http://svn.opensuse.org/viewcvs/yast?rev=63018&view=rev Log: added example Added: trunk/ycp-ui-bindings/examples/Tree-Checkbox.ycp Added: trunk/ycp-ui-bindings/examples/Tree-Checkbox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Tree-Ch… ============================================================================== --- trunk/ycp-ui-bindings/examples/Tree-Checkbox.ycp (added) +++ trunk/ycp-ui-bindings/examples/Tree-Checkbox.ycp Mon Dec 20 17:02:25 2010 @@ -0,0 +1,34 @@ +// Tree with icons +{ + UI::OpenDialog( + `VBox( + `Heading( "YaST2 Mini Control Center" ), + `Tree(`id(`mod), `opt(`multiSelection ), + "Modules", + [ + `item(`id( "country" ), `icon( "yast-yast-language.png" ), "Localization", true, + [ + `item(`id( "keyboard" ), `icon( "yast-keyboard.png" ), "Keyboard" ), + `item(`id( "timezone" ), `icon( "yast-timezone.png" ), "Time zone" ) + ] + ), + `item(`id( "mouse" ), `icon( "yast-mouse.png" ), "Mouse" ), + `item(`id( "lan" ), `icon( "yast-lan.png" ), "Network" ), + `item(`id( `xmas ), `icon( "yast-software.png" ), "Merry X-Mas" ), + `item(`id( `newyear ), `icon( "yast-software.png" ), "Happy New Year" ) + ] ), + `PushButton(`id(`ok), `opt(`default), "&OK") + ) + ); + + UI::ChangeWidget(`mod, `SelectedItems, [`xmas, `newyear ] ); + + any id = nil; + + repeat + { + id = UI::TimeoutUserInput(300); + list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems ); + y2warning( "Selected items: %1", selected_items ); + } until (id == `ok); +} -- 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] r63017 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTree.cc src/YQTree.h src/YQWidgetFactory.cc src/YQWidgetFactory.h yast2-qt.spec.in
by tgoettlicher＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: tgoettlicher Date: Mon Dec 20 17:01:47 2010 New Revision: 63017 URL: http://svn.opensuse.org/viewcvs/yast?rev=63017&view=rev Log: - Added support for check boxes in tree widgets Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/src/YQTree.h trunk/qt/src/YQWidgetFactory.cc trunk/qt/src/YQWidgetFactory.h trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63017&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Dec 20 17:01:47 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Dec 20 17:01:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 20 16:52:53 CET 2010 - tgoettlicher(a)suse.de + +- Added support for check boxes in tree widgets +- V 2.19.5 + +------------------------------------------------------------------- Mon Nov 22 09:40:58 CET 2010 - tgoettlicher(a)suse.de - disables native dialogs (bnc #642270) Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63017&r1=63… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Mon Dec 20 17:01:47 2010 @@ -63,9 +63,9 @@ #define VERBOSE_TREE_ITEMS 0 -YQTree::YQTree( YWidget * parent, const string & label ) +YQTree::YQTree( YWidget * parent, const string & label, bool multiSelectionMode ) : QFrame( (QWidget *) parent->widgetRep() ) - , YTree( parent, label ) + , YTree( parent, label, multiSelectionMode ) { QVBoxLayout* layout = new QVBoxLayout( this ); setLayout( layout ); @@ -98,6 +98,9 @@ connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ), this, SLOT ( slotSelectionChanged () ) ); + connect( _qt_treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem *, int ) ), + this, SLOT ( slotSelectionChanged () ) ); + connect( _qt_treeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ), this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); @@ -189,12 +192,16 @@ _qt_treeWidget->setCurrentItem( item ); item->setSelected( true ); + if ( hasMultiSelection() ) + item->setCheckState( 0, Qt::Checked ); + if ( item->parent() ) openBranch( (YQTreeItem *) item->parent() ); YTree::selectItem( item->origItem(), true ); // yuiDebug() << "selected item: \"" << item->origItem()->label() << "\"" << endl; + } } @@ -250,14 +257,35 @@ void YQTree::slotSelectionChanged( ) { - QList<QTreeWidgetItem *> items = _qt_treeWidget->selectedItems (); - - if ( ! items.empty() ) + if ( hasMultiSelection() ) { - QTreeWidgetItem *qItem = items.first(); - selectItem( dynamic_cast<YQTreeItem *> (qItem) ); + QTreeWidgetItemIterator it( _qt_treeWidget); + while (*it) + { + YQTreeItem * treeItem = dynamic_cast<YQTreeItem *> (*it); + + if ( treeItem ) + { + if ( treeItem->checkState(0) == Qt::Checked ) + treeItem->origItem()->setSelected( true ); + else + treeItem->origItem()->setSelected( false ); + } + ++it; + } + } + else + { + QList<QTreeWidgetItem *> items = _qt_treeWidget->selectedItems (); + + if ( ! items.empty() ) + { + QTreeWidgetItem *qItem = items.first(); + selectItem( dynamic_cast<YQTreeItem *> (qItem) ); + } } + if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); } @@ -337,6 +365,7 @@ #if VERBOSE_TREE_ITEMS yuiDebug() << "Creating toplevel tree item \"" << orig->label() << "\"" << endl; #endif + } @@ -353,6 +382,9 @@ << endl; #endif + + + } @@ -382,6 +414,9 @@ else setData( 0, Qt::DecorationRole, icon ); } + + if ( tree->hasMultiSelection() ) + setCheckState(0,Qt::Unchecked); } Modified: trunk/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.h?rev=63017&r1=630… ============================================================================== --- trunk/qt/src/YQTree.h (original) +++ trunk/qt/src/YQTree.h Mon Dec 20 17:01:47 2010 @@ -60,7 +60,7 @@ /** * Constructor. **/ - YQTree( YWidget * parent, const string & label ); + YQTree( YWidget * parent, const string & label, bool multiSelection ); /** * Destructor. Modified: trunk/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.cc?rev=63… ============================================================================== --- trunk/qt/src/YQWidgetFactory.cc (original) +++ trunk/qt/src/YQWidgetFactory.cc Mon Dec 20 17:01:47 2010 @@ -199,9 +199,9 @@ YQTree * -YQWidgetFactory::createTree( YWidget * parent, const string & label ) +YQWidgetFactory::createTree( YWidget * parent, const string & label, bool multiselection ) { - YQTree * tree = new YQTree( parent, label ); + YQTree * tree = new YQTree( parent, label, multiselection ); YUI_CHECK_NEW( tree ); return tree; Modified: trunk/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWidgetFactory.h?rev=630… ============================================================================== --- trunk/qt/src/YQWidgetFactory.h (original) +++ trunk/qt/src/YQWidgetFactory.h Mon Dec 20 17:01:47 2010 @@ -112,7 +112,7 @@ virtual YQRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false ); virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); - virtual YQTree * createTree ( YWidget * parent, const string & label ); + virtual YQTree * createTree ( YWidget * parent, const string & label, bool multiselection = false ); virtual YQTable * createTable ( YWidget * parent, YTableHeader * header, bool multiSelection = false ); virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); virtual YQRichText * createRichText ( YWidget * parent, const string & text = string(), bool plainTextMode = false ); Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=63017&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Mon Dec 20 17:01:47 2010 @@ -20,8 +20,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.18.8 -Requires: yast2-libyui >= 2.18.8 +BuildRequires: yast2-libyui-devel >= 2.19.2 +Requires: yast2-libyui >= 2.19.2 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- 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] r63016 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPDialogParser.cc src/YCPPropertyHandler.cc src/YCPPropertyHandler.h yast2-ycp-ui-bindings.spec.in
by tgoettlicher＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: tgoettlicher Date: Mon Dec 20 16:59:59 2010 New Revision: 63016 URL: http://svn.opensuse.org/viewcvs/yast?rev=63016&view=rev Log: - Added support for check boxes in tree widgets Modified: trunk/ycp-ui-bindings/VERSION 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=6301… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Mon Dec 20 16:59:59 2010 @@ -1 +1 @@ -2.18.5 +2.19.1 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-yc… ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Mon Dec 20 16:59:59 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 20 16:51:52 CET 2010 - tgoettlicher(a)suse.de + +- Added support for check boxes in tree widgets +- V 2.19.1 + +------------------------------------------------------------------- Wed Feb 10 17:25:22 CET 2010 - tgoettlicher(a)suse.de - added license headers Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Mon Dec 20 16:59:59 2010 @@ -2139,6 +2139,7 @@ * and opening subtrees. If the UI cannot handle this, all * subtrees will always be open. * + * @option multiSelection user can select multiple items at once * @option immediate make `notify trigger immediately when the selected item changes * @usage `Tree( `id( `treeID ), "treeLabel", [ "top1", "top2", "top3" ] ); * @examples Tree1.ycp @@ -2180,16 +2181,18 @@ } bool immediate = 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_multiSelection ) multiSelection = true; else logUnknownOption( term, optList->value(o) ); } string label = term->value ( argnr )->asString()->value(); - YTree * tree = YUI::widgetFactory()->createTree( parent, label ); + YTree * tree = YUI::widgetFactory()->createTree( parent, label, multiSelection ); if ( numArgs > 1 ) { Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyH… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Mon Dec 20 16:59:59 2010 @@ -138,6 +138,7 @@ { if ( trySetMultiSelectionBoxSelectedItems( widget, val ) ) return true; if ( trySetTableSelectedItems( widget, val ) ) return true; + if ( trySetTreeSelectedItems( widget, val ) ) return true; } y2error( "Can't handle property %s::%s - not changing anything", @@ -207,6 +208,7 @@ { val = tryGetMultiSelectionBoxSelectedItems( widget ); if ( ! val.isNull() ) return val; val = tryGetTableSelectedItems( widget ); if ( ! val.isNull() ) return val; + val = tryGetTreeSelectedItems( widget ); if ( ! val.isNull() ) return val; } else if ( propertyName == YUIProperty_OpenItems ) { @@ -684,6 +686,13 @@ bool +YCPPropertyHandler::trySetTreeSelectedItems( YWidget * widget, const YCPValue & val ) +{ + return trySetSelectionWidgetSelectedItems<YTree, YCPTreeItem>( widget, val ); +} + + +bool YCPPropertyHandler::trySetMultiSelectionBoxCurrentItem( YWidget * widget, const YCPValue & val ) { YMultiSelectionBox * multiSelBox = dynamic_cast<YMultiSelectionBox *> (widget); @@ -1003,6 +1012,13 @@ return tryGetSelectionWidgetSelectedItems<YTable, YCPTableItem>( widget ); } +YCPValue +YCPPropertyHandler::tryGetTreeSelectedItems( YWidget * widget ) +{ + return tryGetSelectionWidgetSelectedItems<YTree, YCPTreeItem>( widget ); +} + + YCPValue YCPPropertyHandler::tryGetMultiSelectionBoxCurrentItem( YWidget * widget ) Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyH… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.h (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.h Mon Dec 20 16:59:59 2010 @@ -126,6 +126,7 @@ 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 trySetTreeSelectedItems ( 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 ); @@ -146,6 +147,7 @@ static YCPValue tryGetRadioButtonGroupCurrentButton ( YWidget * widget ); static YCPValue tryGetMultiSelectionBoxSelectedItems( YWidget * widget ); static YCPValue tryGetTableSelectedItems ( YWidget * widget ); + static YCPValue tryGetTreeSelectedItems ( 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-bin… ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Mon Dec 20 16:59:59 2010 @@ -21,8 +21,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.18.7 -BuildRequires: yast2-libyui-devel >= 2.18.7 +Requires: yast2-libyui >= 2.19.2 +BuildRequires: yast2-libyui-devel >= 2.19.2 # libyui ImplPtr BuildRequires: boost-devel -- 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] r63015 - in /trunk/libyui: VERSION package/yast2-libyui.changes src/YDialogSpy.cc src/YTree.cc src/YTree.h src/YWidgetFactory.h
by tgoettlicher＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: tgoettlicher Date: Mon Dec 20 16:58:33 2010 New Revision: 63015 URL: http://svn.opensuse.org/viewcvs/yast?rev=63015&view=rev Log: - Added support for check boxes in tree widgets Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YDialogSpy.cc trunk/libyui/src/YTree.cc trunk/libyui/src/YTree.h trunk/libyui/src/YWidgetFactory.h Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=63015&r1=6301… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Mon Dec 20 16:58:33 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Mon Dec 20 16:58:33 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 20 16:44:56 CET 2010 - tgoettlicher(a)suse.de + +- Added support for check boxes in tree widgets +- V 2.19.2 + +------------------------------------------------------------------- Fri Apr 9 17:29:14 CEST 2010 - tgoettlicher(a)suse.de - Fixed endless loop in layout algorithm (bnc #558699) Modified: trunk/libyui/src/YDialogSpy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YDialogSpy.cc?rev=630… ============================================================================== --- trunk/libyui/src/YDialogSpy.cc (original) +++ trunk/libyui/src/YDialogSpy.cc Mon Dec 20 16:58:33 2010 @@ -155,7 +155,7 @@ YAlignment * minSize = fac->createMinSize( vbox, TREE_WIDTH, TREE_HEIGHT ); minSize->setWeight( YD_VERT, TREE_VWEIGHT ); - priv->widgetTree = fac->createTree( minSize, "Widget &Tree" ); + priv->widgetTree = fac->createTree( minSize, "Widget &Tree", false ); priv->widgetTree->setNotify( true ); YWidgetTreeItem * rootItem = new YWidgetTreeItem( targetDialog, true ); Modified: trunk/libyui/src/YTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YTree.cc?rev=63015&r1… ============================================================================== --- trunk/libyui/src/YTree.cc (original) +++ trunk/libyui/src/YTree.cc Mon Dec 20 16:58:33 2010 @@ -57,11 +57,9 @@ }; - - -YTree::YTree( YWidget * parent, const string & label ) +YTree::YTree( YWidget * parent, const string & label, bool multiSelection ) : YSelectionWidget( parent, label, - true ) // enforceSingleSelection + ! multiSelection ) , priv( new YTreePrivate() ) { YUI_CHECK_NEW( priv ); @@ -117,6 +115,7 @@ * @property map<ItemID> OpenItems Map of IDs of all open items - can only be queried, not set * @property string Label Caption above the tree * @property string IconPath Base path for icons + * @property bool MultiSelection Flag: User can select multiple items (read-only) */ propSet.add( YProperty( YUIProperty_Value, YOtherProperty ) ); propSet.add( YProperty( YUIProperty_CurrentItem, YOtherProperty ) ); @@ -125,7 +124,10 @@ propSet.add( YProperty( YUIProperty_OpenItems, YOtherProperty ) ); propSet.add( YProperty( YUIProperty_Label, YStringProperty ) ); propSet.add( YProperty( YUIProperty_IconPath, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_SelectedItems, YOtherProperty ) ); + propSet.add( YProperty( YUIProperty_MultiSelection, YBoolProperty, true ) ); // read-only propSet.add( YWidget::propertySet() ); + } return propSet; @@ -142,8 +144,10 @@ else if ( propertyName == YUIProperty_CurrentBranch ) return false; // Needs special handling else if ( propertyName == YUIProperty_Items ) return false; // Needs special handling else if ( propertyName == YUIProperty_OpenItems ) return false; // Needs special handling + else if ( propertyName == YUIProperty_SelectedItems ) return false; // Needs special handling else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); else if ( propertyName == YUIProperty_IconPath ) setIconBasePath( val.stringVal() ); + else { return YWidget::setProperty( propertyName, val ); @@ -165,9 +169,16 @@ else if ( propertyName == YUIProperty_OpenItems ) return YPropertyValue( YOtherProperty ); else if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); else if ( propertyName == YUIProperty_IconPath ) return YPropertyValue( iconBasePath() ); + else if ( propertyName == YUIProperty_SelectedItems ) return YPropertyValue( YOtherProperty ); else { return YWidget::getProperty( propertyName ); } } +bool +YTree::hasMultiSelection() const +{ + return ! YSelectionWidget::enforceSingleSelection(); +} + Modified: trunk/libyui/src/YTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YTree.h?rev=63015&r1=… ============================================================================== --- trunk/libyui/src/YTree.h (original) +++ trunk/libyui/src/YTree.h Mon Dec 20 16:58:33 2010 @@ -62,14 +62,20 @@ * (*) Not all UIs (in particular not text-based UIs) support displaying icons, * so an icon should never be an exclusive means to display any kind of * information. + + * 'multiSelection' indicates whether or not the user can select multiple + * items at the same time. This can only be set in the constructor. **/ + + class YTree : public YSelectionWidget { protected: /** * Constructor. **/ - YTree( YWidget * parent, const string & label ); +// YTree( YWidget * parent, const string & label, bool multiSelection = false ); + YTree( YWidget * parent, const string & label, bool multiSelection); public: /** @@ -165,6 +171,14 @@ **/ const char * userInputProperty() { return YUIProperty_CurrentItem; } + + /** + * Return 'true' if the user can select multiple items at the same time + **/ + bool hasMultiSelection() const; + + + private: ImplPtr<YTreePrivate> priv; Modified: trunk/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWidgetFactory.h?rev=… ============================================================================== --- trunk/libyui/src/YWidgetFactory.h (original) +++ trunk/libyui/src/YWidgetFactory.h Mon Dec 20 16:58:33 2010 @@ -122,7 +122,7 @@ virtual YRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false ) = 0; virtual YComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ) = 0; virtual YSelectionBox * createSelectionBox ( YWidget * parent, const string & label ) = 0; - virtual YTree * createTree ( YWidget * parent, const string & label ) = 0; + virtual YTree * createTree ( YWidget * parent, const string & label, bool multiselection = false ) = 0; virtual YTable * createTable ( YWidget * parent, YTableHeader * header_disown, bool multiSelection = false ) = 0; virtual YProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ) = 0; virtual YRichText * createRichText ( YWidget * parent, const string & text = string(), bool plainTextMode = false ) = 0; -- 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] r63014 - /tags/stable-2_20_9/network/
by mzugec＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: mzugec Date: Mon Dec 20 11:37:33 2010 New Revision: 63014 URL: http://svn.opensuse.org/viewcvs/yast?rev=63014&view=rev Log: Created tag stable-2_20_9 for network Added: tags/stable-2_20_9/network/ - copied from r63013, trunk/network/ -- 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] r63013 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mzugec＠svn2.opensuse.org 20 Dec '10

20 Dec '10

Author: mzugec Date: Mon Dec 20 11:37:24 2010 New Revision: 63013 URL: http://svn.opensuse.org/viewcvs/yast?rev=63013&view=rev Log: fate#306855: FCoE boot support Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=63013&r1=630… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Dec 20 11:37:24 2010 @@ -1 +1 @@ -2.20.8 +2.20.9 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 Mon Dec 20 11:37:24 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 20 11:37:02 CET 2010 - mzugec(a)suse.cz + +- fate#306855: FCoE boot support +- 2.20.9 + +------------------------------------------------------------------- Fri Dec 17 10:57:38 CET 2010 - mzugec(a)suse.cz - L3: don't propose bridge for vbox (bnc#648044) Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Dec 20 11:37:24 2010 @@ -266,6 +266,20 @@ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); } break; + case 3: // FCoE case - create VLAN configuration + map<string,any> cmd = (map<string,any>) SCR::Execute(.target.bash_output, + "ls -la /sys/block/*|grep target|grep eth|cut -d'>' -f2|cut -d'/' -f5|uniq"); + y2internal("cmd %1", cmd); + if (cmd["exit"]:-1==0){ + string ifcfg = splitstring(cmd["stdout"]:"", "\n")[0]:""; + y2internal("ifcfg: %1", ifcfg); + string config=sformat("BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\" +ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", splitstring(ifcfg, ".")[0]:""); + y2internal("config: %1", config); + string config_file=sformat("/etc/sysconfig/network/ifcfg-%1", ifcfg); + y2internal("filename: %1", config_file); + SCR::Write(.target.string, config_file, config); + } else y2error("Command failed."); case 2: network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0