Author: kmachalkova
Date: Tue Nov 11 17:24:40 2008
New Revision: 53181
URL: http://svn.opensuse.org/viewcvs/yast?rev=53181&view=rev
Log:
^..^ \9
(oo)_____/
WW WW piggy
Showing the pop-up in the right tab and only once
(related to #441746)
Modified:
trunk/network/src/lan/complex.ycp
trunk/network/src/lan/dhcp.ycp
trunk/network/src/routines/routines.ycp
trunk/network/src/services/routing.ycp
Modified: trunk/network/src/lan/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=53181&r1=53180&r2=53181&view=diff
==============================================================================
--- trunk/network/src/lan/complex.ycp (original)
+++ trunk/network/src/lan/complex.ycp Tue Nov 11 17:24:40 2008
@@ -239,6 +239,8 @@
*/
}
+boolean shown = false;
+
void initOverview (string key) ``{
list<term> term_items = maplist (map i, (list >)LanItems::Overview(), {
@@ -250,8 +252,14 @@
});
UI::ChangeWidget (`id (`_hw_items), `Items, term_items);
- if (!disableItemsIfNM([`_hw_items, `_hw_sum, `add, `edit, `delete], true))
+ if (!shown)
+ {
+ disableItemsIfNM([`_hw_items, `_hw_sum, `add, `edit, `delete], true);
+ shown = true;
+ }
+ else
enableDisableButtons();
+
y2milestone("LanItems %1", LanItems::Items);
}
Modified: trunk/network/src/lan/dhcp.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/dhcp.ycp?rev=53181&r1=53180&r2=53181&view=diff
==============================================================================
--- trunk/network/src/lan/dhcp.ycp (original)
+++ trunk/network/src/lan/dhcp.ycp Tue Nov 11 17:24:40 2008
@@ -31,6 +31,7 @@
UI::ChangeWidget(`id(`hostname), `Value, NetworkConfig::DHCP["DHCLIENT_HOSTNAME_OPTION"]:"");
UI::ChangeWidget(`id(`no_defaultroute), `Value, NetworkConfig::DHCP["DHCLIENT_SET_DEFAULT_ROUTE"]:true);
+ disableItemsIfNM([ `broadcast, `clientid, `hostname, `no_defaultroute ], false);
}
void storeDhclientOptions(string key, map event) {
Modified: trunk/network/src/routines/routines.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=53181&r1=53180&r2=53181&view=diff
==============================================================================
--- trunk/network/src/routines/routines.ycp (original)
+++ trunk/network/src/routines/routines.ycp Tue Nov 11 17:24:40 2008
@@ -820,10 +820,14 @@
foreach(symbol w, items, {
UI::ChangeWidget(w, `Enabled, false);
});
- if (show_popup) Popup::Warning( _("Network is currently controlled by NetworkManager and its settings
+ if (show_popup)
+ {
+ Popup::Warning( _("Network is currently controlled by NetworkManager and its settings
cannot be edited by YaST.\n
To edit the settings, use NetworkManager connection editor, or
switch the network setup method to Traditional method with ifup."));
+ UI::FakeUserInput ($["ID": "global"]);
+ }
} else disable=false;
return disable;
}
Modified: trunk/network/src/services/routing.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp?rev=53181&r1=53180&r2=53181&view=diff
==============================================================================
--- trunk/network/src/services/routing.ycp (original)
+++ trunk/network/src/services/routing.ycp Tue Nov 11 17:24:40 2008
@@ -187,7 +187,7 @@
// fixed bug #73739 - if dhcp is used, dont set default gw statically
// if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, false);
- disableItemsIfNM([ `gw, `table, `add, `edit, `delete ], true);
+ disableItemsIfNM([ `gw, `table, `add, `edit, `delete ], false);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
