Mailinglist Archive: yast-commit (396 mails)

< Previous Next >
[yast-commit] r65259 - in /trunk/registration: package/yast2-registration.changes src/clients/inst_suse_register.ycp src/clients/suse_register_auto.ycp src/modules/Register.ycp
Author: jdsn
Date: Fri Aug 5 17:38:33 2011
New Revision: 65259

URL: http://svn.opensuse.org/viewcvs/yast?rev=65259&view=rev
Log:
make use of ButtonBox where possible to make button order depending on desktop
environment (bnc#701264)

Modified:
trunk/registration/package/yast2-registration.changes
trunk/registration/src/clients/inst_suse_register.ycp
trunk/registration/src/clients/suse_register_auto.ycp
trunk/registration/src/modules/Register.ycp

Modified: trunk/registration/package/yast2-registration.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=65259&r1=65258&r2=65259&view=diff
==============================================================================
--- trunk/registration/package/yast2-registration.changes (original)
+++ trunk/registration/package/yast2-registration.changes Fri Aug 5 17:38:33
2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Aug 5 17:26:09 CEST 2011 - jdsn@xxxxxxx
+
+- make use of ButtonBox where possible to make button order
+ depending on desktop environment (bnc#701264)
+
+-------------------------------------------------------------------
Mon Jul 4 15:59:24 CEST 2011 - jdsn@xxxxxxx

- fix typo in registration process (bnc#703222)

Modified: trunk/registration/src/clients/inst_suse_register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=65259&r1=65258&r2=65259&view=diff
==============================================================================
--- trunk/registration/src/clients/inst_suse_register.ycp (original)
+++ trunk/registration/src/clients/inst_suse_register.ycp Fri Aug 5 17:38:33
2011
@@ -372,10 +372,10 @@
`Left( `Label( mi_start_browser )
) ,
`Left( `Label( mi_needinfo ) ) ,
`RichText(`id(`needinfo), ""
),
- `HBox(
-
`PushButton(`id(`start_browser), mi_browser_btn ) ,
+ `ButtonBox(
+
`PushButton(`id(`start_browser), `opt(`okButton), mi_browser_btn ) ,
`HSpacing( 3),
- `PushButton(`id(`cancel),
Label::CancelButton() )
+ `PushButton(`id(`cancel),
`opt(`cancelButton), Label::CancelButton() )
)
))
);
@@ -442,7 +442,7 @@
`VSpacing( 0.5 ),
`Left( `Label( nccc_success_msg ) ),
`Left( `Label( nccc_success_server_added ) ),
- `HBox(
+ `ButtonBox(
`HWeight(1, `PushButton(`id(`ok), Label::OKButton() ) ),
`HSpacing( 3 ),
`HWeight(1, `PushButton(`id(`success_detail), details ) )
@@ -703,8 +703,8 @@
`VSpacing(0.5),
`InputField(`id(`newRegistrationServerCert),
TXT["serverCACertificateLocation"]:"", curRegCert ),
`VSpacing(1),
- `HBox(
- `PushButton(`id(`okButton), Label::OKButton() ),
+ `ButtonBox(
+ `PushButton(`id(`ok), Label::OKButton() ),
`PushButton(`id(`cancel), Label::CancelButton() )
)

@@ -724,7 +724,7 @@
status=false;
break;
}
- else if (ret == `okButton)
+ else if (ret == `ok)
{
curRegURL = (string) UI::QueryWidget(`id(`newRegistrationServer),
`Value);
curRegCert = (string)
UI::QueryWidget(`id(`newRegistrationServerCert), `Value);

Modified: trunk/registration/src/clients/suse_register_auto.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/suse_register_auto.ycp?rev=65259&r1=65258&r2=65259&view=diff
==============================================================================
--- trunk/registration/src/clients/suse_register_auto.ycp (original)
+++ trunk/registration/src/clients/suse_register_auto.ycp Fri Aug 5 17:38:33
2011
@@ -161,7 +161,7 @@
`TextEntry(`id(`value), _("&Value"), entry[2]:"")
),
`HSpacing(1),
- `HBox(
+ `ButtonBox(
`PushButton(`id(`ok), `opt(`default), Label::OKButton()),
`PushButton(`id(`cancel), Label::CancelButton())
)

Modified: trunk/registration/src/modules/Register.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=65259&r1=65258&r2=65259&view=diff
==============================================================================
--- trunk/registration/src/modules/Register.ycp (original)
+++ trunk/registration/src/modules/Register.ycp Fri Aug 5 17:38:33 2011
@@ -651,11 +651,11 @@
`Left( `Label(`opt(`boldFont), trustQuestion)),
`Left( `Label(trustMessage)),
`RichText(sformat("%1",certInfo)),
- `HBox(`PushButton(`id(`trust), _("Trust")), `HSpacing(1.5),
`PushButton(`id(`notrust), _("Reject")) )
+ `ButtonBox(`PushButton(`id(`ok), _("Trust")), `HSpacing(1.5),
`PushButton(`id(`cancel), _("Reject")) )
)));
any uret = UI::UserInput();
UI::CloseDialog();
- if ((symbol)uret == `trust) { trust = true; }
+ if ((symbol)uret == `ok) { trust = true; }
}

// (bnc#377929)

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages