Author: locilka Date: Mon Jul 14 14:08:08 2008 New Revision: 49043 URL: http://svn.opensuse.org/viewcvs/yast?rev=49043&view=rev Log: - InputFields instead of TextEntries. - [OK] instead of [Finish] in Single Step Dialogs. - [Cancel] instead of [Abort]. Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-installwizard.ycp trunk/dns-server/src/dialog-main.ycp trunk/dns-server/src/dialog-masterzone.ycp trunk/dns-server/src/dialogs.ycp trunk/dns-server/src/options.ycp trunk/dns-server/src/widgets.ycp 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=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Mon Jul 14 14:08:08 2008 @@ -2,6 +2,9 @@ Mon Jul 14 13:42:44 CEST 2008 - locilka@suse.cz - Removed unneeded dependency on DNS module (yast2-network). +- InputFields instead of TextEntries. +- [OK] instead of [Finish] in Single Step Dialogs. +- [Cancel] instead of [Abort]. ------------------------------------------------------------------- Mon Jun 9 17:03:19 CEST 2008 - mzugec@suse.cz Modified: trunk/dns-server/src/dialog-installwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-installwizard.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/dialog-installwizard.ycp (original) +++ trunk/dns-server/src/dialog-installwizard.ycp Mon Jul 14 14:08:08 2008 @@ -36,7 +36,7 @@ ); SetDNSSErverIcon(); Wizard::SetAbortButton ( `abort, Label::CancelButton() ); - Wizard::HideBackButton (); + Wizard::DisableBackButton (); InitExpertForwardersPage ("forwarders"); map event = $[]; Modified: trunk/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-main.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/dialog-main.ycp (original) +++ trunk/dns-server/src/dialog-main.ycp Mon Jul 14 14:08:08 2008 @@ -224,7 +224,7 @@ `HBox ( `HWeight ( 9, // Textentry for DNS-Forwarders adding IP - `TextEntry ( `id ( "forwarders_new_ip_address" ), `opt ( `hstretch ), _("IP A&ddress"), "" ) + `InputField ( `id ( "forwarders_new_ip_address" ), `opt ( `hstretch ), _("IP A&ddress"), "" ) ), `HWeight ( 2, `Bottom ( `PushButton ( `id ( "forwarders_add_ip_address" ), `opt ( `hstretch ), Label::AddButton() ) ) @@ -614,7 +614,7 @@ ), `HWeight ( 5, // Textentry for setting the basic-option value - `TextEntry ( `id ( "basic_option_value" ), _("&Value"), "" ) + `InputField ( `id ( "basic_option_value" ), `opt (`hstretch), _("&Value"), "" ) ) ) ) @@ -924,7 +924,7 @@ `VBox ( `VWeight ( 25, `HBox ( - `TextEntry ( `id ( "logfile_path" ), Label::FileName() ), + `InputField ( `id ( "logfile_path" ), `opt (`hstretch), Label::FileName() ), `VBox ( `VStretch (), // Pushbutton - browse filesystem for logfile @@ -1091,11 +1091,11 @@ `HBox ( `HWeight ( 3, // Textentry - adding ACL-optiopn - name - `TextEntry ( `id ( "new_acl_name" ), `opt ( `hstretch ), _("&Name") ) + `InputField ( `id ( "new_acl_name" ), `opt ( `hstretch ), _("&Name") ) ), `HWeight ( 5, // Textentry - adding ACL-optiopn - value - `TextEntry ( `id ( "new_acl_value" ), `opt ( `hstretch ), _("&Value") ) + `InputField ( `id ( "new_acl_value" ), `opt ( `hstretch ), _("&Value") ) ) ) ) @@ -1338,7 +1338,7 @@ //`VSpacing ( 0.5 ), `HBox ( // Textentry - DNS adding zone - Name - `TextEntry ( `id ( "new_zone_name" ), `opt ( `hstretch ), _("Name"), "example.com" ), + `InputField ( `id ( "new_zone_name" ), `opt ( `hstretch ), _("Name"), "example.com" ), // Combobox - DNS adding zone - Type `ComboBox ( `id ( "new_zone_type" ), _("Type") , [ // Combobox - DNS adding zone - Type Master Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Mon Jul 14 14:08:08 2008 @@ -337,7 +337,7 @@ `HBox ( `HWeight ( 7, // Textentry - adding nameserver - `TextEntry ( `id ( "add_name_server" ), _("&Name Server to Add") ) + `InputField ( `id ( "add_name_server" ), `opt (`hstretch), _("&Name Server to Add") ) ), `HWeight ( 2, `VBox ( @@ -508,7 +508,7 @@ `HWeight ( 7, `HBox ( // Textentry - addind mail server - Name - `TextEntry ( `id ( "add_mail_server" ), _("&Address") ), + `InputField ( `id ( "add_mail_server" ), `opt (`hstretch), _("&Address") ), // IntField - adding mail server - Priority `IntField ( `id ( "add_priority" ), _("&Priority"), 0, 65535, 0 ) ) @@ -727,7 +727,7 @@ `HWeight ( 50, `VBox ( // Textentry - setting Serial for zone - `TextEntry ( `id ( "zone_settings_serial" ), `opt ( `hstretch ), _("Seri&al"), "" ), + `InputField ( `id ( "zone_settings_serial" ), `opt ( `hstretch ), _("Seri&al"), "" ), `VSpacing ( 1 ), `HBox ( // Textentry - setting TTL for zone @@ -938,11 +938,11 @@ `HWeight ( 9, `HBox ( // Textentry - zone settings - Record Name - `TextEntry ( `id ( "add_record_name" ), _("&Record Key") ), + `InputField ( `id ( "add_record_name" ), `opt (`hstretch), _("&Record Key") ), // Combobox - zone settings - Record Type `ComboBox ( `id ( "add_record_type" ), _("T&ype"), add_records ), // Textentry - zone settings - Record Value - `TextEntry ( `id ( "add_record_val" ), _("Val&ue") ) + `InputField ( `id ( "add_record_val" ), `opt (`hstretch), _("Val&ue") ) ) ), `HWeight ( 2, @@ -1545,7 +1545,7 @@ `HBox ( // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), - `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", + `HSquash ( `InputField ( `id ( "current_zone" ), `opt ( `disabled, `hstretch ), "", Punycode::DecodeDomainName(zone_name) ) ), `HStretch () @@ -1575,7 +1575,9 @@ // FIXME: Only one help is used for all tabs. Maybe would be better to change the help for every single tab. Wizard::SetContentsButtons ( caption, contents, HELPS[ help_identificators[current_tab]:"" ]:"", - Label::CancelButton (), Label::OKButton () ); + Label::BackButton (), Label::OKButton () ); + Wizard::DisableBackButton(); + Wizard::SetAbortButton (`go_back, Label::CancelButton()); InitMasterZoneTab ( current_tab ); map event = nil; @@ -1591,11 +1593,13 @@ else continue; } - if (ret == `back) + if (ret == `go_back) { + ret = `back; break; } - else if ( ret == `cancel || ret == `abort) { + // close the whole dialog + else if ( ret == `cancel) { if ( ReallyAbort() ) return `abort; else @@ -1681,14 +1685,14 @@ `HBox ( // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), - `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", + `HSquash ( `InputField ( `id ( "current_zone" ), `opt ( `disabled, `hstretch ), "", Punycode::DecodeDomainName(zone_name) ) ), `HStretch () ), `VSpacing ( 1 ), // TRANSLATORS: Text entry - `Left (`TextEntry (`id ("master"), _("&Master DNS Server IP"))), + `Left (`InputField (`id ("master"), `opt (`hstretch), _("&Master DNS Server IP"))), `VSpacing (2), `Left (`CheckBox (`id ("enable_zone_transport"), `opt (`notify), // check box @@ -1853,7 +1857,7 @@ `HBox ( // Label - connected with Textentry which shows current edited zone `HSquash ( `Label ( _("Settings for Zone") ) ), - `HSquash ( `TextEntry ( `id ( "current_zone" ), `opt ( `disabled ), "", + `HSquash ( `InputField ( `id ( "current_zone" ), `opt ( `disabled, `hstretch ), "", Punycode::DecodeDomainName(zone_name) ) ), `HStretch () @@ -1863,7 +1867,7 @@ `HBox ( `HWeight (7, // Textentry - adding forwarder - `TextEntry ( `id("new_forwarder"), _("New &Forwarder IP Address")) + `InputField ( `id("new_forwarder"), `opt (`hstretch), _("New &Forwarder IP Address")) ), `HWeight (2, `VBox ( Modified: trunk/dns-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialogs.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/dialogs.ycp (original) +++ trunk/dns-server/src/dialogs.ycp Mon Jul 14 14:08:08 2008 @@ -80,240 +80,6 @@ return ret ? `next : `abort; } -/** - * Run main dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runMainDialog () ``{ - y2milestone ("Running main dialog"); - - list > w = CWM::CreateWidgets (["start", "chroot", "zones", "advanced_mbutton", "log_button"], - DnsServerUI::widgets); - term contents = `HBox (`HSpacing (1), `VBox ( - `VSpacing (1), - `Left ("start"), - `VSpacing (1), - `Left ("chroot"), - `VSpacing (1), - "zones", - `VSpacing (1) - ), `HSpacing (1)); - - // dialog caption - string caption = _("DNS Server Configuration"); - - string help = CWM::MergeHelps (w); - contents = CWM::PrepareDialog (contents, w); - Wizard::SetContentsButtons (caption, contents, help, - Label::BackButton (), Label::OKButton ()); - Wizard::HideBackButton(); - Wizard::SetAbortButton(`abort, Label::CancelButton() ); - - return CWM::Run (w, - $[`abort : ReallyExit ]); -} -*/ - -/** - * Run global options dialog - * @return symbol for wizard sequencer - */ -/** define symbol runGlobalOptionsDialog () ``{ - y2milestone ("Running global options dialog"); - - list<string> w = ["global_table"]; - - term contents = `HBox (`HSpacing (1), `VBox ( - `VSpacing (1), - "global_table", - `VSpacing (1) - ), `HSpacing (1)); - - // dialog caption - string caption = _("Global DNS Server Options"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run firewall settings dialog - * @return symbol for wizard sequencer - */ -/** define symbol runFirewallDialog () ``{ - y2milestone ("Running firewall settings dialog"); - - if (! SuSEFirewall::IsStarted()) - { - // message popup - Popup::Message (_("Firewall is not configured.")); - return `back; - } - - list<string> w = ["interface_classes", "adapt_firewall"]; - - term contents = `HBox (`HStretch (), `VBox ( - `VStretch (), - "interface_classes", - `VStretch (), - `Left ("adapt_firewall"), - `VStretch () - ), `HStretch ()); - - // dialog caption - string caption = _("Firewall Settings"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run synaimc DNS settings dialog - * @return symbol for wizard sequencer - */ -/** define symbol runDDNSDialog () ``{ - y2milestone ("Running TSIG keys management dialog"); - - list<string> w = ["ddns_keys"]; - - term contents = `HBox (`HSpacing (2), `VBox ( - `VSpacing (1), - "ddns_keys", - `VSpacing (1) - ), `HSpacing (2)); - - // dialog caption - string caption = _("TSIG Key Management"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run dialog for new zone selection - * @return symbol for wizard sequencer - */ -/** define symbol runNewZoneDialog () ``{ - y2milestone ("Running new zone type dialog"); - - list<string> w = ["zone_type", "zone_direction"]; - - term contents = `HBox (`HStretch (), `VBox ( - `VStretch (), - "zone_type", - `VStretch (), - "zone_direction", - `VStretch () - ), `HStretch ()); - - // dialog caption - string caption = _("DNS Server Configuration"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::NextButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run master zone edit dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runMasterZoneDialog () ``{ - y2milestone ("Running master zone editation dialog"); - - list<string> w = [ "zone_name", "allow_ddns", "master_table", "soa_button"]; - term contents = `HBox (`HSpacing (1), `VBox ( - `VSpacing (1), - `HBox (`HSpacing (2), "zone_name", `HSpacing (2)), - `VSpacing (1), - `HBox (`HSpacing (2), "allow_ddns", `HSpacing (2)), - `VSpacing (1), - "master_table", - `VSpacing (1) - ), `HSpacing (1)); - // dialog caption - string caption = _("DNS Master Zone Configuration"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run SOA record edit dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runSoaDialog () ``{ - y2milestone ("Running SOA editation dialog"); - - list<string> w = [ "soa" ]; - term contents = `HBox (`HSpacing (1), `VBox ( - `VSpacing (1), - "soa", - `VSpacing (1) - ), `HSpacing (1)); - // dialog caption - string caption = _("SOA Record Configuration"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run slave or stub zone edit dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runSlaveStubZoneDialog (symbol type) ``{ - y2milestone ("Running slave/stub zone editation dialog: %1", type); - - list<string> w = [ "zone_name", "zone_masters" ]; - term contents = `HBox (`HSpacing (1), `VBox ( - `VSpacing (1), - `HBox (`HSpacing (2), "zone_name", `HSpacing (2)), - `VSpacing (1), - `HBox (`HSpacing (2), "zone_masters", `HSpacing (2)), - `VSpacing (1) - ), `HSpacing (1)); - // dialog caption - string caption = _("DNS Slave Zone Configuration"); - if (type == `stub) - // dialog caption - caption = _("DNS Stub Zone Configuration"); - - return CWM::ShowAndRun (w, DnsServerUI::widgets, - contents, caption, Label::BackButton (), Label::OKButton (), - $[`abort : ReallyAbortAlways]); -} -*/ - -/** - * Run slave zone edit dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runSlaveZoneDialog () ``{ - return runSlaveStubZoneDialog (`slave); -} -*/ - -/** - * Run stub zone edit dialog - * @return symbol for wizard sequencer - */ -/** global define symbol runStubZoneDialog () ``{ - return runSlaveStubZoneDialog (`stub); -} -*/ - define symbol runZoneTypeSwitch () ``{ string type = current_zone["type"]:"master"; string name = current_zone["zone"]:"unknown"; @@ -334,12 +100,5 @@ } } -/** define symbol runZoneStore () ``{ - DnsServer::StoreCurrentZone (current_zone); - DnsServer::StoreZone (); - return `next; -} -*/ - /* EOF */ } Modified: trunk/dns-server/src/options.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/options.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/options.ycp (original) +++ trunk/dns-server/src/options.ycp Mon Jul 14 14:08:08 2008 @@ -169,10 +169,10 @@ "widget" : `custom, "custom_widget" :`HBox (`HSpacing (1), `VBox ( `HSpacing (50), - `TextEntry (`id (`key), Label::HostName()), + `InputField (`id (`key), `opt (`hstretch), Label::HostName()), `VSpacing (2), // text entry - `TextEntry (`id (`value), _("&IP Addresses")), + `InputField (`id (`value), `opt (`hstretch), _("&IP Addresses")), `VSpacing (1) ), `HSpacing (1)), ], @@ -201,10 +201,10 @@ "custom_widget" : `HBox (`HSpacing (1), `VBox ( `HSpacing (30), // text entry - `TextEntry (`id (`key), _("&Alias")), + `InputField (`id (`key), `opt (`hstretch), _("&Alias")), `VSpacing (1), // text entry - `TextEntry (`id (`value), _("&Base Host Name")), + `InputField (`id (`value), `opt (`hstretch), _("&Base Host Name")), `VSpacing (1) ), `HSpacing (1)), ], @@ -233,10 +233,10 @@ "custom_widget" : `HBox (`HSpacing (1), `VBox ( `HSpacing (30), // text entry - `TextEntry (`id (`key), _("&IP Address")), + `InputField (`id (`key), `opt (`hstretch), _("&IP Address")), `VSpacing (1), // text entry - `TextEntry (`id (`value), Label::HostName()), + `InputField (`id (`value), `opt (`hstretch), Label::HostName()), `VSpacing (1) ), `HSpacing (1)), ], @@ -264,10 +264,10 @@ "custom_widget" : `HBox (`HSpacing (1), `VBox ( `HSpacing (30), // text entry - `TextEntry (`id (`key), _("&Domain")), + `InputField (`id (`key), `opt (`hstretch), _("&Domain")), `VSpacing (1), // text entry - `TextEntry (`id (`value), _("&Name Server")), + `InputField (`id (`value), `opt (`hstretch), _("&Name Server")), `VSpacing (1) ), `HSpacing (1)), ], @@ -356,10 +356,10 @@ "custom_widget" : `HBox (`HSpacing (1), `VBox ( `HSpacing (30), // text entry - `TextEntry (`id (`key), _("&Domain Name")), + `InputField (`id (`key), `opt (`hstretch), _("&Domain Name")), `VSpacing (1), // text entry - `TextEntry (`id (`value), _("&Mail Relay")), + `InputField (`id (`value), `opt (`hstretch), _("&Mail Relay")), `VSpacing (1), // int field `IntField (`id (`prio), _("&Priority"), 0, 100, 0), Modified: trunk/dns-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/widgets.ycp?rev=49043&r1=49042&r2=49043&view=diff ============================================================================== --- trunk/dns-server/src/widgets.ycp (original) +++ trunk/dns-server/src/widgets.ycp Mon Jul 14 14:08:08 2008 @@ -329,32 +329,32 @@ `VBox ( `VWeight (1, // text entry - `TextEntry (`id ("ttl"), _("$TT&L"))), + `InputField (`id ("ttl"), `opt (`hstretch), _("$TT&L"))), `VWeight (2, `VStretch ()), `VWeight (1, // text entry - `TextEntry (`id ("server"), _("Primary &Source"))), + `InputField (`id ("server"), `opt (`hstretch), _("Primary &Source"))), `VWeight (1, // text entry - `TextEntry (`id ("mail"), _("&Administrator's Mail"))) + `InputField (`id ("mail"), `opt (`hstretch), _("&Administrator's Mail"))) ), `HSpacing (1), `VBox ( `VWeight (1, // text entry - `TextEntry (`id ("serial"), _("Serial"))), + `InputField (`id ("serial"), `opt (`hstretch), _("Serial"))), `VWeight (1, // text entry - `TextEntry (`id ("refresh"), _("Re&fresh"))), + `InputField (`id ("refresh"), `opt (`hstretch), _("Re&fresh"))), `VWeight (1, // text entry - `TextEntry (`id ("retry"), _("Re&try"))), + `InputField (`id ("retry"), `opt (`hstretch), _("Re&try"))), `VWeight (1, // text entry - `TextEntry (`id ("expiry"), _("E&xpiration"))), + `InputField (`id ("expiry"), `opt (`hstretch), _("E&xpiration"))), `VWeight (1, // text entry - `TextEntry (`id ("minimum"), _("Mi&nimum"))) + `InputField (`id ("minimum"), `opt (`hstretch), _("Mi&nimum"))) ) ) ), @@ -738,7 +738,7 @@ { string new = nil; UI::OpenDialog (`VBox ( - `TextEntry (`id (`address), _("&Name Server")), + `InputField (`id (`address), `opt (`hstretch), _("&Name Server")), `HBox ( `HStretch (), `PushButton (`id (`ok), Label::OKButton ()), @@ -859,7 +859,7 @@ string new = nil; UI::OpenDialog (`VBox ( // text entry - `TextEntry (`id (`address), _("&Mail Relay")), + `InputField (`id (`address), `opt (`hstretch), _("&Mail Relay")), // int field `IntField (`id (`priority), _("&Priority"), 0, 100, 10), `HBox ( @@ -1119,7 +1119,7 @@ string new = nil; UI::OpenDialog (`VBox ( // text entry - `TextEntry (`id (`address), _("Address of &Master")), + `InputField (`id (`address), `opt (`hstretch), _("Address of &Master")), `HBox ( `HStretch (), `PushButton (`id (`ok), Label::OKButton ()), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org