Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-05-29 08:43:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-05-26 10:28:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-05-29 08:43:36.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 26 09:45:24 UTC 2014 - [email protected] + +- bnc#868256 + - network service selection turned into combo box + - showing only those services that are actually available +- 3.1.59 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.58.tar.bz2 New: ---- yast2-network-3.1.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.iaSR0R/_old 2014-05-29 08:43:37.000000000 +0200 +++ /var/tmp/diff_new_pack.iaSR0R/_new 2014-05-29 08:43:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.58 +Version: 3.1.59 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.58.tar.bz2 -> yast2-network-3.1.59.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.58/package/yast2-network.changes new/yast2-network-3.1.59/package/yast2-network.changes --- old/yast2-network-3.1.58/package/yast2-network.changes 2014-05-23 17:38:49.000000000 +0200 +++ new/yast2-network-3.1.59/package/yast2-network.changes 2014-05-26 17:53:47.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 26 09:45:24 UTC 2014 - [email protected] + +- bnc#868256 + - network service selection turned into combo box + - showing only those services that are actually available +- 3.1.59 + +------------------------------------------------------------------- Fri May 23 16:51:27 CEST 2014 - [email protected] - Fixed service name for remote administration (display-manager) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.58/package/yast2-network.spec new/yast2-network-3.1.59/package/yast2-network.spec --- old/yast2-network-3.1.58/package/yast2-network.spec 2014-05-23 17:38:49.000000000 +0200 +++ new/yast2-network-3.1.59/package/yast2-network.spec 2014-05-26 17:53:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.58 +Version: 3.1.59 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.58/src/include/network/lan/help.rb new/yast2-network-3.1.59/src/include/network/lan/help.rb --- old/yast2-network-3.1.58/src/include/network/lan/help.rb 2014-05-23 17:38:49.000000000 +0200 +++ new/yast2-network-3.1.59/src/include/network/lan/help.rb 2014-05-26 17:53:47.000000000 +0200 @@ -55,10 +55,9 @@ "for switching among wired and wireless networks.</p>\n" ) + # Network setup method help - # NetworkManager and ifup are programs + # NetworkManager and wicked are programs _( - "<p>Use the <b>Traditional Method with <tt>ifup</tt></b>\n" + - "if you do not run a desktop environment (GNOME or KDE)\n" + + "<p>Use <b>wicked</b> if you do not run a desktop environment\n" + "or need to use multiple interfaces at the same time.</p>\n" ), "overview" => _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.58/src/include/network/widgets.rb new/yast2-network-3.1.59/src/include/network/widgets.rb --- old/yast2-network-3.1.58/src/include/network/widgets.rb 2014-05-23 17:38:49.000000000 +0200 +++ new/yast2-network-3.1.59/src/include/network/widgets.rb 2014-05-26 17:53:47.000000000 +0200 @@ -291,24 +291,33 @@ # Initialize the NetworkManager widget # @param [String] key id of the widget def ManagedInit(key) - value = "managed" if NetworkService.is_network_manager - value = "ifup" if NetworkService.is_netconfig - value = "wicked" if NetworkService.is_wicked - - UI.ChangeWidget( - Id("managed"), - :Enabled, - NetworkService.is_backend_available(:network_manager)) - UI.ChangeWidget( - Id("ifup"), - :Enabled, - NetworkService.is_backend_available(:netconfig)) - UI.ChangeWidget( - Id("wicked"), - :Enabled, - NetworkService.is_backend_available(:wicked)) + items = [] + if NetworkService.is_backend_available(:network_manager) + items << Item( + Id("managed"), + # the user can control the network with the NetworkManager program + _("NetworkManager Service"), + NetworkService.is_network_manager + ) + end + if NetworkService.is_backend_available(:netconfig) + items << Item( + Id("ifup"), + # ifup is a program name + _("Traditional ifup"), + NetworkService.is_netconfig + ) + end + if NetworkService.is_backend_available(:wicked) + items << Item( + Id("wicked"), + # wicked is network configuration backend like netconfig + _("Wicked Service"), + NetworkService.is_wicked + ) + end - UI.ChangeWidget(Id(key), :CurrentButton, value) + UI.ChangeWidget(Id(:managed), :Items, items) nil end @@ -317,7 +326,7 @@ # @param [String] key id of the widget # @param [Hash] event the event being handled def ManagedStore(key, event) - new_backend = UI.QueryWidget(Id(key), :CurrentButton) + new_backend = UI.QueryWidget(Id(:managed), :Value) case new_backend when "ifup" @@ -347,32 +356,20 @@ def managed_widget { - "widget" => :radio_buttons, - # radio button group label, method of setup - "label" => _("Network Setup Method"), - "items" => [ - # radio button label - # the user can control the network with the NetworkManager - # program - [ - "managed", - _("&User Controlled with NetworkManager") - ], - # radio button label - # ifup is a program name - [ - "ifup", - _("&Traditional Method with ifup") - ], - # radio button label - # wicked is network configuration backend like netconfig - [ - "wicked", - _("Controlled by &wicked") - ], - ], + "widget" => :custom, + "custom_widget" => Frame( + _("General Network Settings"), + Left( + ComboBox( + Id(:managed), + Opt(:hstretch), + _("Network Setup Method"), + [] + ) + ) + ), "opt" => [], - "help" => Ops.get_string(@help, "managed", ""), + "help" => @help["managed"] || "", "init" => fun_ref(method(:ManagedInit), "void (string)"), "store" => fun_ref(method(:ManagedStore), "void (string, map)") } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
