Mailinglist Archive: yast-commit (939 mails)
| < Previous | Next > |
[yast-commit] r52845 - in /trunk/ldap-server/src: dialogs.ycp wizards.ycp
- From: rhafer@xxxxxxxxxxxxxxxx
- Date: Mon, 03 Nov 2008 15:32:02 -0000
- Message-id: <20081103153202.A6CC62E987@xxxxxxxxxxxxxxxx>
Author: rhafer
Date: Mon Nov 3 16:32:02 2008
New Revision: 52845
URL: http://svn.opensuse.org/viewcvs/yast?rev=52845&view=rev
Log:
Use correct button labels as defined in YaST-Styleguide (bnc#440526)
Modified:
trunk/ldap-server/src/dialogs.ycp
trunk/ldap-server/src/wizards.ycp
Modified: trunk/ldap-server/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=52845&r1=52844&r2=52845&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Mon Nov 3 16:32:02 2008
@@ -139,10 +139,11 @@
string help_page = (string)widget_map[name,"help_page"]:name;
string help_string = HELPS[help_page]:("help page for item
<b>"+help_page+"</b> not available");
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
Wizard::SetContentsButtons( caption, widget, help_string,
- Label::BackButton(), Label::FinishButton() );
+ Label::BackButton(), Label::OKButton() );
+ Wizard::HideBackButton();
- Wizard::DisableBackButton();
if( focus_tree ) UI::SetFocus( `id( `wizardTree ) );
@@ -202,6 +203,7 @@
Wizard::SetContentsButtons( caption, dlg_service_initial,
HELPS["service_dialog"]:"help not found", Label::BackButton(),
Label::NextButton() );
Wizard::HideBackButton();
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
UI::ReplaceWidget(`rp_firewall,
firewall_widget["custom_widget"]:`Empty()
Modified: trunk/ldap-server/src/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=52845&r1=52844&r2=52845&view=diff
==============================================================================
--- trunk/ldap-server/src/wizards.ycp (original)
+++ trunk/ldap-server/src/wizards.ycp Mon Nov 3 16:32:02 2008
@@ -59,6 +59,7 @@
Wizard::SetDesktopIcon("ldap-server");
Wizard::SetContentsButtons(caption, contents, "",
Label::BackButton(), Label::NextButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
map aliases = $[
"startup" : ``( EnableServiceDialog() ),
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
Date: Mon Nov 3 16:32:02 2008
New Revision: 52845
URL: http://svn.opensuse.org/viewcvs/yast?rev=52845&view=rev
Log:
Use correct button labels as defined in YaST-Styleguide (bnc#440526)
Modified:
trunk/ldap-server/src/dialogs.ycp
trunk/ldap-server/src/wizards.ycp
Modified: trunk/ldap-server/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=52845&r1=52844&r2=52845&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Mon Nov 3 16:32:02 2008
@@ -139,10 +139,11 @@
string help_page = (string)widget_map[name,"help_page"]:name;
string help_string = HELPS[help_page]:("help page for item
<b>"+help_page+"</b> not available");
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
Wizard::SetContentsButtons( caption, widget, help_string,
- Label::BackButton(), Label::FinishButton() );
+ Label::BackButton(), Label::OKButton() );
+ Wizard::HideBackButton();
- Wizard::DisableBackButton();
if( focus_tree ) UI::SetFocus( `id( `wizardTree ) );
@@ -202,6 +203,7 @@
Wizard::SetContentsButtons( caption, dlg_service_initial,
HELPS["service_dialog"]:"help not found", Label::BackButton(),
Label::NextButton() );
Wizard::HideBackButton();
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
UI::ReplaceWidget(`rp_firewall,
firewall_widget["custom_widget"]:`Empty()
Modified: trunk/ldap-server/src/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=52845&r1=52844&r2=52845&view=diff
==============================================================================
--- trunk/ldap-server/src/wizards.ycp (original)
+++ trunk/ldap-server/src/wizards.ycp Mon Nov 3 16:32:02 2008
@@ -59,6 +59,7 @@
Wizard::SetDesktopIcon("ldap-server");
Wizard::SetContentsButtons(caption, contents, "",
Label::BackButton(), Label::NextButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
map aliases = $[
"startup" : ``( EnableServiceDialog() ),
--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx
| < Previous | Next > |