[yast-commit] r50454 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/DnsServerUI.ycp src/Makefile.am src/dialog-main.ycp src/dialogs.ycp src/widgets.ycp

Author: locilka Date: Thu Aug 28 15:05:07 2008 New Revision: 50454 URL: http://svn.opensuse.org/viewcvs/yast?rev=50454&view=rev Log: - Dropped dead code (widgets.ycp). - 2.17.7 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServerUI.ycp trunk/dns-server/src/Makefile.am trunk/dns-server/src/dialog-main.ycp trunk/dns-server/src/dialogs.ycp trunk/dns-server/src/widgets.ycp Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Thu Aug 28 15:05:07 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-server.changes?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Thu Aug 28 15:05:07 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 28 15:04:26 CEST 2008 - locilka@suse.cz + +- Dropped dead code (widgets.ycp). +- 2.17.7 + +------------------------------------------------------------------- Wed Aug 20 14:12:59 CEST 2008 - sschober@suse.de - fixed rnc file for autoyast Modified: trunk/dns-server/src/DnsServerUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServerUI.ycp?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/src/DnsServerUI.ycp (original) +++ trunk/dns-server/src/DnsServerUI.ycp Thu Aug 28 15:05:07 2008 @@ -61,12 +61,12 @@ */ global map popups = InitPopups (); - include "dns-server/widgets.ycp"; +// include "dns-server/widgets.ycp"; /** * Map of widgets for CWM */ - global map widgets = InitWidgets (); +// global map widgets = InitWidgets (); include "dns-server/dialogs.ycp"; include "dns-server/dialog-main.ycp"; Modified: trunk/dns-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/Makefile.am?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/src/Makefile.am (original) +++ trunk/dns-server/src/Makefile.am Thu Aug 28 15:05:07 2008 @@ -15,7 +15,6 @@ wizards.ycp \ dialogs.ycp \ misc.ycp \ - widgets.ycp \ options.ycp \ dialog-masterzone.ycp \ dialog-main.ycp \ Modified: trunk/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-main.ycp?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/src/dialog-main.ycp (original) +++ trunk/dns-server/src/dialog-main.ycp Thu Aug 28 15:05:07 2008 @@ -1864,6 +1864,28 @@ ], ]; + /** + * Ask for exit without saving + * @return event that should be handled, nil if user canceled the exit + */ + global define boolean confirmAbort () ``{ + return Popup::YesNo ( + // Yes-No popup +_("All changes will be lost. +Really leave the DNS server configuration without saving?")); + } + + /** + * Check whether settings were changed and if yes, ask for exit + * without saving + * @return event that should be handled, nil if user canceled the exit + */ + global define boolean confirmAbortIfChanged () ``{ + if (! DnsServer::WasModified ()) + return true; + return confirmAbort (); + } + global map functions = $[ `abort : confirmAbort, ]; Modified: trunk/dns-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialogs.ycp?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/src/dialogs.ycp (original) +++ trunk/dns-server/src/dialogs.ycp Thu Aug 28 15:05:07 2008 @@ -21,6 +21,7 @@ import "SuSEFirewall"; import "Punycode"; import "DnsServer"; + import "Confirm"; /** * Ask user if exit without saving Modified: trunk/dns-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/widgets.ycp?rev=50454&r1=50453&r2=50454&view=diff ============================================================================== --- trunk/dns-server/src/widgets.ycp (original) +++ trunk/dns-server/src/widgets.ycp Thu Aug 28 15:05:07 2008 @@ -10,6 +10,9 @@ { + // dead source code + // not in use anymore + textdomain "dns-server"; import "Label"; @@ -739,11 +742,9 @@ string new = nil; UI::OpenDialog (`VBox ( `InputField (`id (`address), `opt (`hstretch), _("&Name Server")), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::OKButton ()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton ()) ) )); any ret = nil; @@ -862,11 +863,9 @@ `InputField (`id (`address), `opt (`hstretch), _("&Mail Relay")), // int field `IntField (`id (`priority), _("&Priority"), 0, 100, 10), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::OKButton ()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton ()) ) )); any ret = nil; @@ -1120,11 +1119,9 @@ UI::OpenDialog (`VBox ( // text entry `InputField (`id (`address), `opt (`hstretch), _("Address of &Master")), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::OKButton ()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton ()) ) )); any ret = nil; @@ -1396,27 +1393,5 @@ ]; } - /** - * Ask for exit without saving - * @return event that should be handled, nil if user canceled the exit - */ - global define boolean confirmAbort () ``{ - return Popup::YesNo ( - // Yes-No popup -_("All changes will be lost. -Really leave the DNS server configuration without saving?")); - } - - /** - * Check whether settings were changed and if yes, ask for exit - * without saving - * @return event that should be handled, nil if user canceled the exit - */ - global define boolean confirmAbortIfChanged () ``{ - if (! DnsServer::WasModified ()) - return true; - return confirmAbort (); - } - /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org