Author: mzugec Date: Mon May 24 17:06:54 2010 New Revision: 62060 URL: http://svn.opensuse.org/viewcvs/yast?rev=62060&view=rev Log: make add/edit route popup consistent (bnc#583136) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62060&r1=62059&r2=62060&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 24 17:06:54 2010 @@ -1 +1 @@ -2.19.29 +2.19.30 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62060&r1=62059&r2=62060&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 24 17:06:54 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz + +- make add/edit route popup consistent (bnc#583136) +- 2.19.30 + +------------------------------------------------------------------- Mon May 17 15:12:05 CEST 2010 - mzugec@suse.cz - updated documentation URL (bnc#590742) Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp?rev=62060&r1=62059&r2=62060&view=diff ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Mon May 24 17:06:54 2010 @@ -41,19 +41,16 @@ UI::OpenDialog(`opt(`decorated),`VBox( `HSpacing(1), `VBox( - /* TextEntry label */ `HBox( `InputField(`id(`destination), `opt(`hstretch), _("&Destination"), entry[1]:""), - `ComboBox(`id(`device), `opt(`editable, `hstretch), _("De&vice"), devs) + `InputField(`id(`genmask), `opt(`hstretch), _("Ge&nmask"), entry[3]:"") ), `HBox( - /* TextEntry label */ - `TextEntry(`id(`gateway), _("&Gateway"), entry[2]:""), - /* TextEntry label */ - `TextEntry(`id(`netmask), _("&Netmask"), entry[3]:"") + `InputField(`id(`gateway), `opt(`hstretch), _("&Gateway"), entry[2]:""), + `ComboBox(`id(`device), `opt(`editable, `hstretch), _("De&vice"), devs) ), /* ComboBox label */ - `TextEntry (`id(`options), Label::Options (), entry[5]:"") + `InputField(`id(`options), `opt(`hstretch), Label::Options (), entry[5]:"") ), `HSpacing(1), `HBox( @@ -71,7 +68,7 @@ } UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-"); UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-"); - UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-"); + UI::ChangeWidget(`id(`genmask), `ValidChars, Netmask::ValidChars + "-"); if(entry == `empty()) UI::SetFocus(`id(`destination)); @@ -106,11 +103,11 @@ continue; } route = add(route, val); - val = (string) UI::QueryWidget(`id(`netmask), `Value); + val = (string) UI::QueryWidget(`id(`genmask), `Value); if(val != "-" && val != "0.0.0.0" && !Netmask::Check(val)) { /* Popup::Error text */ Popup::Error(_("Subnetmask is invalid.")); - UI::SetFocus(`id(`netmask)); + UI::SetFocus(`id(`genmask)); continue; } route = add(route, val); @@ -338,7 +335,7 @@ /* Table header 2/4 */ _("Gateway"), /* Table header 3/4 */ - _("Netmask"), + _("Genmask"), /* Table header 4/4 */ _("Device"), /* Table header 5/4 */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org