Author: rhafer
Date: Mon Nov 3 16:32:11 2008
New Revision: 52847
URL: http://svn.opensuse.org/viewcvs/yast?rev=52847&view=rev
Log:
Use ButtonBox where possible to order Buttons correctly (bnc#440526)
Modified:
trunk/ldap-server/src/LdapDatabase.ycp
trunk/ldap-server/src/widgets.ycp
Modified: trunk/ldap-server/src/LdapDatabase.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=52847&r1=52846&r2=52847&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapDatabase.ycp (original)
+++ trunk/ldap-server/src/LdapDatabase.ycp Mon Nov 3 16:32:11 2008
@@ -706,8 +706,7 @@
`ComboBox( `id(`cb_access), _("Define the Access Level"), access_itemlist)
),
`HBox(
- `PushButton( `id( `pb_ok), Label::OKButton() ),
- `PushButton( `id( `cancel), Label::CancelButton() )
+ Wizard::CancelOKButtonBox()
)
)
)
@@ -737,7 +736,7 @@
while(true) {
ret = (symbol)UI::UserInput();
y2milestone("Input event: %1", ret);
- if ( ret == `pb_ok )
+ if ( ret == `ok )
{
symbol type = (symbol)UI::QueryWidget( `id( `cb_who ), `Value );
res["type"] = type;
@@ -875,8 +874,7 @@
),
`VSpacing(1),
`HBox(
- `PushButton( `id( `pb_ok), Label::OKButton() ),
- `PushButton( `id( `cancel), Label::CancelButton() )
+ Wizard::CancelOKButtonBox()
)
)
)
@@ -964,7 +962,7 @@
ret = (symbol)UI::UserInput();
y2milestone("Input event: %1", ret);
selected = (integer)UI::QueryWidget( `id( `tab_access ), `CurrentItem );
- if ( ret == `pb_ok )
+ if ( ret == `ok )
{
map what = $[];
what["what"] = UI::QueryWidget( `id( `cb_what ), `Value );
Modified: trunk/ldap-server/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=52847&r1=52846&r2=52847&view=diff
==============================================================================
--- trunk/ldap-server/src/widgets.ycp (original)
+++ trunk/ldap-server/src/widgets.ycp Mon Nov 3 16:32:11 2008
@@ -306,20 +306,17 @@
`Password( `id( `te_valid_rootpw ), _("&Validate Password") ),
`HSpacing( 0.5 ),
`ComboBox( `id( `cb_cryptmethod ), _("Password &Encryption"), enc_types ),
- `HBox(
- `PushButton( `id( `pb_ok ), Label::OKButton() ),
- `PushButton( `id( `pb_cancel ), Label::CancelButton() )
- )
+ Wizard::CancelOKButtonBox()
);
UI::OpenDialog( `opt(`decorated), content );
while ( true )
{
any ret = UI::UserInput();
- if (ret == `pb_cancel )
+ if (ret == `cancel )
{
break;
}
- else if ( ret == `pb_ok )
+ else if ( ret == `ok )
{
string pw = (string)UI::QueryWidget( `te_rootpw, `Value );
string verifypw = (string)UI::QueryWidget( `te_valid_rootpw, `Value );
@@ -368,10 +365,7 @@
`Left(
`CheckBox( `id( `cb_idx_substr ), _("Substring") )
),
- `HBox(
- `PushButton( `id( `pb_ok ), Label::OKButton() ),
- `PushButton( `id( `pb_cancel ), Label::CancelButton() )
- )
+ Wizard::CancelOKButtonBox()
);
map