Author: jsuchome Date: Fri Jun 24 10:12:59 2011 New Revision: 64573 URL: http://svn.opensuse.org/viewcvs/yast?rev=64573&view=rev Log: - Use ButtonBox widget when appropriate (bnc#701260) - 2.21.6 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ldap_browser.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jun 24 10:12:59 2011 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jun 24 10:12:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 24 10:11:46 CEST 2011 - jsuchome@suse.cz + +- Use ButtonBox widget when appropriate (bnc#701260) +- 2.21.6 + +------------------------------------------------------------------- Tue Jun 7 11:55:14 CEST 2011 - jsuchome@suse.cz - make SSSD switch more prominent (fate#310820) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jun 24 10:12:59 2011 @@ -1193,7 +1193,7 @@ Retry connection without TLS/SSL? "))), - `HBox ( + `ButtonBox ( `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) ) @@ -1313,7 +1313,7 @@ GetFirstServer (server), GetFirstPort (server))), // label (%1 is admin DN - string) `Label (sformat (_("Administrator: %1"), GetBindDN ())), - `HBox( + `ButtonBox ( `PushButton (`id(`ok),`opt(`key_F10, `default), Label::OKButton()), // button label Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Fri Jun 24 10:12:59 2011 @@ -44,16 +44,17 @@ `ReplacePoint (`id (`reptree), `Tree (`id(`tree), root_dn, [])), `HSpacing () ), - `HBox ( + textmode ? `HBox ( `HSpacing (1.5), `PushButton (`id (`ok), `opt (`key_F10), Label::OKButton()), - `PushButton(`id (`cancel),`opt (`key_F9),Label::CancelButton()), - // pushbutton label - textmode ? - // button label - `Right (`PushButton (`id (`open), `opt (`key_F6),_("&Open"))): - `Empty (), + `PushButton (`id (`cancel),`opt (`key_F9),Label::CancelButton()), + // button label + `Right (`PushButton (`id (`open), `opt (`key_F6),_("&Open"))), `HSpacing (1.5) + ) : + `ButtonBox ( + `PushButton (`id (`ok), `opt (`key_F10), Label::OKButton()), + `PushButton(`id (`cancel),`opt (`key_F9),Label::CancelButton()) ), `VSpacing (0.2) )); @@ -308,11 +309,14 @@ `VBox( `HSpacing (hsize > 50 ? hsize : 50), `ReplacePoint (`id(`rp), values), - `HBox( + single ? `ButtonBox ( + `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), + `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()), + `PushButton(`id(`help),`opt (`key_F2), Label::HelpButton()) + ) : `ButtonBox ( `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()), `PushButton(`id(`help),`opt (`key_F2), Label::HelpButton()), - (single)? `Empty() : add_button ) ), @@ -419,7 +423,7 @@ `InputField (`id (`cn), `opt (`hstretch), // textentry label, do not translate "cn" _("&Name of New Module (\"cn\" Value)")), - `HBox( + `ButtonBox( `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) ) @@ -507,7 +511,7 @@ // textentry label `InputField (`id (`val), `opt (`hstretch), _("Attribute &Value")), `VSpacing(0.5), - `HBox( + `ButtonBox( `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton()), `PushButton(`id(`help),`opt (`key_F2), Label::HelpButton()) Modified: trunk/ldap-client/src/ldap_browser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.ycp?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/src/ldap_browser.ycp (original) +++ trunk/ldap-client/src/ldap_browser.ycp Fri Jun 24 10:12:59 2011 @@ -350,7 +350,7 @@ `Left (`CheckBox (`id ("ldap_tls"), `opt (`notify), _("L&DAP TLS"), configuration["ldap_tls"]:false) ), - `HBox( + `ButtonBox( `PushButton (`id(`ok),`opt(`key_F10, `default), Label::OKButton()), // button label `PushButton (`id(`anon), `opt(`key_F6), _("A&nonymous Access")), @@ -403,7 +403,7 @@ `InputField (`id (`new), // InputField label _("Enter the name of the new LDAP connection")), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), `opt(`default), Label::OKButton ()), `PushButton (`id(`cancel), Label::CancelButton ()) ) Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=64573&r1=64572&r2=64573&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Jun 24 10:12:59 2011 @@ -139,7 +139,7 @@ // multiselection box label _("LDAP &Servers Provided by SLP"), items) ), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), `PushButton (`id(`cancel), Label::CancelButton()) ) @@ -403,7 +403,7 @@ // InputField label `InputField (`id (`url), `opt (`hstretch), _("CA Certificate URL for Download")), - `HBox ( + `ButtonBox ( `PushButton(`id(`ok),`opt(`default,`key_F10), Label::OKButton()), `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) ) @@ -1196,7 +1196,7 @@ // pushbutton label `PushButton (`id (`br_suf), _("Change Suffix")) )), - `HBox ( + `ButtonBox ( `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org