April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56606 - /tags/stable-2_17_88/network/
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:08:55 2009 New Revision: 56606 URL: http://svn.opensuse.org/viewcvs/yast?rev=56606&view=rev Log: Created tag stable-2_17_88 for SLE-11-SP1-Stash/network Added: tags/stable-2_17_88/network/ - copied from r56605, branches/tmp/SLE-11-SP1-Stash/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] r56605 - /tags/stable-2_17_88/SLE-11-SP1-Stash/
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:08:51 2009 New Revision: 56605 URL: http://svn.opensuse.org/viewcvs/yast?rev=56605&view=rev Log: Created tag stable-2_17_88 for SLE-11-SP1-Stash/ Added: tags/stable-2_17_88/SLE-11-SP1-Stash/ -- 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] r56604 - /tags/stable-2_17_88/
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:08:49 2009 New Revision: 56604 URL: http://svn.opensuse.org/viewcvs/yast?rev=56604&view=rev Log: Created tag stable-2_17_88 Added: tags/stable-2_17_88/ -- 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] r56603 - in /branches/tmp/SLE-11-SP1-Stash/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:08:32 2009 New Revision: 56603 URL: http://svn.opensuse.org/viewcvs/yast?rev=56603&view=rev Log: fixed additional addresses with bonding (bnc#420074) Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Thu Apr 2 23:08:32 2009 @@ -1 +1 @@ -2.17.87 +2.17.88 Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Thu Apr 2 23:08:32 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 2 23:07:49 CEST 2009 - mzugec(a)suse.de + +- fixed additional addresses with bonding (bnc#420074) +- 2.17.88 + +------------------------------------------------------------------- Thu Mar 26 12:37:55 CET 2009 - mzugec(a)suse.cz - tun/tap device - don't remove default gw (bnc#483233) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/… ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/lan/address.ycp Thu Apr 2 23:08:32 2009 @@ -153,7 +153,11 @@ */ void InitSlave(string key) { -// UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]); + settings["SLAVES"] = LanItems::bond_slaves; + UI::ChangeWidget(`id("BONDSLAVE"), `SelectedItems, settings["SLAVES"]:[]); + + settings["BONDOPTION"] = LanItems::bond_option; + list items = createUnconfigured(settings["SLAVES"]:[]); map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { @@ -177,6 +181,9 @@ void StoreSlave(string key, map event) { settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems); + settings["BONDOPTION"] = UI::QueryWidget (`id("BONDOPTION"), `Value); + LanItems::bond_slaves = settings["SLAVES"]:[]; + LanItems::bond_option = settings["BONDOPTION"]:""; } @@ -601,6 +608,17 @@ "store": StoreVLANSlave, "help": help["etherdevice"]:"", ], +/* + "BONDSLAVES": $[ + "widget": `multi_selection_box, + "label": _("Bond &Slaves"), + "opt": [`shrinkable], + "items" : [ ], + "init": InitSlave, + "store": StoreSlave, + "help": help["bondslave"]:"", + ], +*/ "BONDSLAVE": $[ "widget": `multi_selection_box, "label": _("Bond &Slaves"), @@ -617,8 +635,8 @@ "label": _("&Bond Driver Options"), "opt": [`hstretch, `editable], "help": _("<p>Select the bond driver options, and edit it if necessary. </p>"), - "items": [["mode=balance-rr"], ["mode=active-backup"], ["mode=balance-xor"], - ["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"], ["mode=balance-alb"]], + "items" : [["mode=balance-rr"], ["mode=active-backup"], ["mode=balance-xor"], + ["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"], ["mode=balance-alb"]] ], "BOOTPROTO": $[ @@ -884,29 +902,7 @@ "AD_ADDRESSES", frame2 ); - - if (LanItems::type == "bond") - { - settings["SLAVES"] = LanItems::bond_slaves; - settings["BONDOPTION"] = LanItems::bond_option; - - //fill up the drop list and make the default value first - - wd["BONDOPTION", "items"] = filter(list<string> v, wd["BONDOPTION", "items"]:[], - { - return v[0]:"" != LanItems::bond_option; - }); - wd["BONDOPTION", "items"] = prepend(wd["BONDOPTION", "items"]:[], [LanItems::bond_option]); - - - address_contents = `VBox( - `Left(label), - just_address_contents, - `MarginBox(1, 0, `Frame( "", `VBox("BONDSLAVE", "BONDOPTION"))), - frame2 - ); - } - else if (LanItems::type == "br") + if (LanItems::type == "br") { address_contents = `VBox( `Left(label), @@ -975,6 +971,10 @@ "header" : _("&Hardware"), "contents" : `VBox( "HWDIALOG" ) ], + "bond_slaves" : $[ + "header" : _("&Bond Slaves"), + "contents" : `VBox( "BONDSLAVE", "BONDOPTION" ) + ], "t3" : $[ "header" : _("&Wireless"), "contents" : `Empty (), @@ -988,7 +988,7 @@ ]; if (contains(["vlan", "br"], LanItems::type)) wd_content["tab_order"]= ["t_general", "t_addr"]; if (contains(["tun", "tap"], LanItems::type)) wd_content["tab_order"]= ["t_addr"]; - + if (LanItems::type == "bond") wd_content["tab_order"]=add(wd_content["tab_order"]:[], "bond_slaves"); hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ @@ -1077,11 +1077,7 @@ } } - if (LanItems::type == "bond") - { - LanItems::bond_option = settings["BONDOPTION"]:""; - LanItems::bond_slaves = (list<string>)settings["SLAVES"]:[]; - } else if (LanItems::type == "vlan"){ + if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; -- 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] r56602 - /tags/stable-2_18_25/network/
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:06:44 2009 New Revision: 56602 URL: http://svn.opensuse.org/viewcvs/yast?rev=56602&view=rev Log: Created tag stable-2_18_25 for network Added: tags/stable-2_18_25/network/ - copied from r56601, 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] r56601 - /tags/stable-2_18_25/
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:06:40 2009 New Revision: 56601 URL: http://svn.opensuse.org/viewcvs/yast?rev=56601&view=rev Log: Created tag stable-2_18_25 Added: tags/stable-2_18_25/ -- 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] r56600 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mzugec Date: Thu Apr 2 23:05:31 2009 New Revision: 56600 URL: http://svn.opensuse.org/viewcvs/yast?rev=56600&view=rev Log: fixed additional addresses with bonding (bnc#420074) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=56600&r1=565… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Apr 2 23:05:31 2009 @@ -1 +1 @@ -2.18.24 +2.18.25 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 Apr 2 23:05:31 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 2 23:04:11 CEST 2009 - mzugec(a)suse.de + +- fixed additional addresses with bonding (bnc#420074) +- 2.18.25 + +------------------------------------------------------------------- Thu Apr 2 11:46:07 CEST 2009 - kmachalkova(a)suse.cz - Show "Really abort" pop-up dialog only when data are modified (in 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 Apr 2 23:05:31 2009 @@ -153,7 +153,11 @@ */ void InitSlave(string key) { -// UI::ChangeWidget(`id(key), `SelectedItems, settings["SLAVES"]:[]); + settings["SLAVES"] = LanItems::bond_slaves; + UI::ChangeWidget(`id("BONDSLAVE"), `SelectedItems, settings["SLAVES"]:[]); + + settings["BONDOPTION"] = LanItems::bond_option; + list items = createUnconfigured(settings["SLAVES"]:[]); map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { @@ -177,6 +181,9 @@ void StoreSlave(string key, map event) { settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems); + settings["BONDOPTION"] = UI::QueryWidget (`id("BONDOPTION"), `Value); + LanItems::bond_slaves = settings["SLAVES"]:[]; + LanItems::bond_option = settings["BONDOPTION"]:""; } @@ -601,6 +608,17 @@ "store": StoreVLANSlave, "help": help["etherdevice"]:"", ], +/* + "BONDSLAVES": $[ + "widget": `multi_selection_box, + "label": _("Bond &Slaves"), + "opt": [`shrinkable], + "items" : [ ], + "init": InitSlave, + "store": StoreSlave, + "help": help["bondslave"]:"", + ], +*/ "BONDSLAVE": $[ "widget": `multi_selection_box, "label": _("Bond &Slaves"), @@ -617,8 +635,8 @@ "label": _("&Bond Driver Options"), "opt": [`hstretch, `editable], "help": _("<p>Select the bond driver options, and edit it if necessary. </p>"), - "items": [["mode=balance-rr"], ["mode=active-backup"], ["mode=balance-xor"], - ["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"], ["mode=balance-alb"]], + "items" : [["mode=balance-rr"], ["mode=active-backup"], ["mode=balance-xor"], + ["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"], ["mode=balance-alb"]] ], "BOOTPROTO": $[ @@ -884,29 +902,7 @@ "AD_ADDRESSES", frame2 ); - - if (LanItems::type == "bond") - { - settings["SLAVES"] = LanItems::bond_slaves; - settings["BONDOPTION"] = LanItems::bond_option; - - //fill up the drop list and make the default value first - - wd["BONDOPTION", "items"] = filter(list<string> v, wd["BONDOPTION", "items"]:[], - { - return v[0]:"" != LanItems::bond_option; - }); - wd["BONDOPTION", "items"] = prepend(wd["BONDOPTION", "items"]:[], [LanItems::bond_option]); - - - address_contents = `VBox( - `Left(label), - just_address_contents, - `MarginBox(1, 0, `Frame( "", `VBox("BONDSLAVE", "BONDOPTION"))), - frame2 - ); - } - else if (LanItems::type == "br") + if (LanItems::type == "br") { address_contents = `VBox( `Left(label), @@ -975,6 +971,10 @@ "header" : _("&Hardware"), "contents" : `VBox( "HWDIALOG" ) ], + "bond_slaves" : $[ + "header" : _("&Bond Slaves"), + "contents" : `VBox( "BONDSLAVE", "BONDOPTION" ) + ], "t3" : $[ "header" : _("&Wireless"), "contents" : `Empty (), @@ -988,7 +988,7 @@ ]; if (contains(["vlan", "br"], LanItems::type)) wd_content["tab_order"]= ["t_general", "t_addr"]; if (contains(["tun", "tap"], LanItems::type)) wd_content["tab_order"]= ["t_addr"]; - + if (LanItems::type == "bond") wd_content["tab_order"]=add(wd_content["tab_order"]:[], "bond_slaves"); hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ @@ -1077,11 +1077,7 @@ } } - if (LanItems::type == "bond") - { - LanItems::bond_option = settings["BONDOPTION"]:""; - LanItems::bond_slaves = (list<string>)settings["SLAVES"]:[]; - } else if (LanItems::type == "vlan"){ + if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; -- 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] r56599 - /trunk/libyui/src/YPushButton.cc
by mkudlvasr＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mkudlvasr Date: Thu Apr 2 18:42:24 2009 New Revision: 56599 URL: http://svn.opensuse.org/viewcvs/yast?rev=56599&view=rev Log: YPushButton::setFunctionKey - guess button role only if button role is not guessed already. Previously this function was rewritting button role even if the role was set explicitely. YPushButton::setRole - add guess for function key simmilar to setFunctionKey behaviour. Modified: trunk/libyui/src/YPushButton.cc Modified: trunk/libyui/src/YPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YPushButton.cc?rev=56… ============================================================================== --- trunk/libyui/src/YPushButton.cc (original) +++ trunk/libyui/src/YPushButton.cc Thu Apr 2 18:42:24 2009 @@ -129,39 +129,63 @@ priv->role = YHelpButton; } - +/* setRole can try to guess function key, but only if there isn't a selected + function key already +*/ void YPushButton::setRole( YButtonRole role ) { - priv->role = role; + priv->role = role; + int old_function_key = functionKey(); + if (!hasFunctionKey()) // otherwise function key was already determined + { + switch (priv->role) + { + case YOKButton: YWidget::setFunctionKey( 10 ); break; + case YCancelButton: YWidget::setFunctionKey( 9 ); break; + case YApplyButton: YWidget::setFunctionKey( 10 ); break; + case YHelpButton: YWidget::setFunctionKey( 1 ); break; + default: break; + } + if ( functionKey() != old_function_key ) + { + yuiMilestone() << "Guessing function key F" << functionKey() + << " for " << this + << " from button role " << priv->role + << endl; + } + } } - YButtonRole YPushButton::role() const { return priv->role; } - +/* setFunctionKey (besides setting the function key) should try to guess button + role, but only if button role is not yet determined. +*/ void YPushButton::setFunctionKey( int fkey_no ) { YWidget::setFunctionKey( fkey_no ); YButtonRole oldRole = priv->role; - switch ( functionKey() ) // base class method might have changed it - { - case 10: priv->role = YOKButton; break; - case 9: priv->role = YCancelButton; break; - case 1: priv->role = YHelpButton; break; - default: break; - } - - if ( priv->role != oldRole ) - { - yuiMilestone() << "Guessing button role " << priv->role - << " for " << this - << " from function key F" << functionKey() - << endl; - } + if (priv->role == YCustomButton) // otherwise role was already determined + { + switch ( functionKey() ) // base class method might have changed it + { + case 10: priv->role = YOKButton; break; + case 9: priv->role = YCancelButton; break; + case 1: priv->role = YHelpButton; break; + default: break; + } + if ( priv->role != oldRole ) + { + yuiMilestone() << "Guessing button role " << priv->role + << " for " << this + << " from function key F" << functionKey() + << endl; + } + } } -- 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] r56598 - /trunk/gtk/tests/ButtonOrder.ycp
by mkudlvasr＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mkudlvasr Date: Thu Apr 2 18:36:28 2009 New Revision: 56598 URL: http://svn.opensuse.org/viewcvs/yast?rev=56598&view=rev Log: Changes to test case. Connected to bnc#479874 Modified: trunk/gtk/tests/ButtonOrder.ycp Modified: trunk/gtk/tests/ButtonOrder.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/ButtonOrder.ycp?rev=56… ============================================================================== --- trunk/gtk/tests/ButtonOrder.ycp (original) +++ trunk/gtk/tests/ButtonOrder.ycp Thu Apr 2 18:36:28 2009 @@ -1,24 +1,38 @@ +/* + +This example was made to test behaviour of button ordering (initially due to bnc#479874). + + */ + { import "Label"; UI::OpenDialog( `VBox( + `Label ("`PushButton (`id (`cancel), `opt(`cancelButton, `key_F9, `default), Label::BackButton()),"), + `Label ("`PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::InstallButton ())"), `ButtonBox ( `PushButton (`id (`cancel), `opt(`cancelButton, `key_F9, `default), Label::BackButton()), `PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::InstallButton ()) ) ) ); - UI::UserInput(); + any ret = UI::UserInput(); + if (ret == `cancel) y2milestone ("Cancel pressed"); + if (ret == `ok) y2milestone ("Ok pressed"); UI::CloseDialog(); UI::OpenDialog( `VBox( + `Label ("`PushButton (`id (`cancel), `opt(`cancelButton, `key_F10, `default), Label::BackButton()),"), + `Label ("`PushButton (`id (`ok), `opt (`okButton, `key_F9), Label::InstallButton ())"), `ButtonBox ( `PushButton (`id (`cancel), `opt(`cancelButton, `key_F10, `default), Label::BackButton()), `PushButton (`id (`ok), `opt (`okButton, `key_F9), Label::InstallButton ()) ) ) ); - UI::UserInput(); + ret = UI::UserInput(); + if (ret == `cancel) y2milestone ("Cancel pressed"); + if (ret == `ok) y2milestone ("Ok pressed"); UI::CloseDialog(); -- 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] r56597 - /trunk/ycp-ui-bindings/src/YCPDialogParser.cc
by mkudlvasr＠svn.opensuse.org 02 Apr '09

02 Apr '09

Author: mkudlvasr Date: Thu Apr 2 18:35:18 2009 New Revision: 56597 URL: http://svn.opensuse.org/viewcvs/yast?rev=56597&view=rev Log: The second "else if ( sym == YUIOpt_cancelButton)" is never reached. Clearly a typo, should be "YUIOpt_allpyButton" Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc 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 Thu Apr 2 18:35:18 2009 @@ -1428,7 +1428,7 @@ if ( sym == YUIOpt_default ) isDefaultButton = true; else if ( sym == YUIOpt_okButton ) role = YOKButton; else if ( sym == YUIOpt_cancelButton) role = YCancelButton; - else if ( sym == YUIOpt_cancelButton) role = YApplyButton; + else if ( sym == YUIOpt_applyButton) role = YApplyButton; else if ( sym == YUIOpt_helpButton ) role = YHelpButton; else if ( sym == YUIOpt_customButton) opt.customButton.setValue( true ); else logUnknownOption( term, optList->value(o) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0