Author: locilka Date: Thu Aug 28 13:02:06 2008 New Revision: 50435 URL: http://svn.opensuse.org/viewcvs/yast?rev=50435&view=rev Log: Some more libs Modified: trunk/yast2/library/cwm/src/CWM.ycp trunk/yast2/library/desktop/src/menu.ycp trunk/yast2/library/gpg/src/GPGWidgets.ycp trunk/yast2/library/log/src/ALog.ycp trunk/yast2/library/modules/ValueBrowser.ycp trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/NetworkPopup.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/cwm/src/CWM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWM.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/cwm/src/CWM.ycp (original) +++ trunk/yast2/library/cwm/src/CWM.ycp Thu Aug 28 13:02:06 2008 @@ -399,14 +399,9 @@ * @return the term (HBox) */ global define term OkCancelBox () ``{ - return `HBox ( - `HStretch (), - `PushButton (`id (`_tp_ok), `opt (`key_F10, `default), - Label::OKButton ()), - `HSpacing (1), - `PushButton (`id (`_tp_cancel), `opt (`key_F9), - Label::CancelButton ()), - `HStretch () + return `ButtonBox ( + `PushButton (`id (`_tp_ok), `opt (`key_F10, `default, `okButton), Label::OKButton ()), + `PushButton (`id (`_tp_cancel), `opt (`key_F9, `cancelButton), Label::CancelButton ()) ); } Modified: trunk/yast2/library/desktop/src/menu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/src/menu.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/desktop/src/menu.ycp (original) +++ trunk/yast2/library/desktop/src/menu.ycp Thu Aug 28 13:02:06 2008 @@ -75,11 +75,9 @@ ), `VSpacing(1.0), - `HBox( - `HSpacing(2), - `Left(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())), - `Right(`PushButton(`id(`quit), `opt(`key_F9), Label::QuitButton())), - `HSpacing(2) + `ButtonBox ( + `PushButton(`id(`help), `opt(`key_F1, `helpButton), Label::HelpButton()), + `PushButton(`id(`quit), `opt(`key_F9, `cancelButton), Label::QuitButton()) ), `VSpacing(1) )); Modified: trunk/yast2/library/gpg/src/GPGWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/gpg/src/GPGWidgets.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/gpg/src/GPGWidgets.ycp (original) +++ trunk/yast2/library/gpg/src/GPGWidgets.ycp Thu Aug 28 13:02:06 2008 @@ -318,10 +318,9 @@ `Heading(_("Enter Passphrase")), "ask_passphrase", `VSpacing(0.5), - `HBox( - `PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `okButton, `key_F10), Label::OKButton()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); Modified: trunk/yast2/library/log/src/ALog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/ALog.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/log/src/ALog.ycp (original) +++ trunk/yast2/library/log/src/ALog.ycp Thu Aug 28 13:02:06 2008 @@ -55,8 +55,10 @@ // TODO more lines? term d = `VBox( `InputField (`id (`val), label, ""), - `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ()) - ); + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `key_F10, `okButton), Label::OKButton ()) + ) + ); UI::OpenDialog (d); any ui = nil; do { Modified: trunk/yast2/library/modules/ValueBrowser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/ValueBrowser.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/modules/ValueBrowser.ycp (original) +++ trunk/yast2/library/modules/ValueBrowser.ycp Thu Aug 28 13:02:06 2008 @@ -145,7 +145,9 @@ `VBox ( // translators: Tree header `Tree (`opt (`hstretch, `vstretch), _("&Variable"), [ items ]), - `PushButton (Label::OKButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::OKButton()) + ) ) ); UI::UserInput (); Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Aug 28 13:02:06 2008 @@ -778,11 +778,9 @@ string help = CWM::MergeHelps (w); term contents = `VBox ( "firewall_ifaces", - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::OKButton ()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton ()) ) ); contents = CWM::PrepareDialog (contents, w); Modified: trunk/yast2/library/network/src/NetworkPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkPopup.ycp?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkPopup.ycp (original) +++ trunk/yast2/library/network/src/NetworkPopup.ycp Thu Aug 28 13:02:06 2008 @@ -69,11 +69,9 @@ `Table(`id(`items), `header(_("Device Type"),_("Device Name"),_("IP Address"),_("Device ID")), Items), `VSpacing(10) ), - `HBox ( - `PushButton (`id(`ok), `opt(`default, `key_F10), - Label::OKButton()), - `PushButton (`id(`cancel), `opt(`key_F9), - Label::CancelButton()) + `ButtonBox ( + `PushButton (`id(`ok), `opt(`default, `key_F10, `okButton), Label::OKButton()), + `PushButton (`id(`cancel), `opt(`key_F9, `cancelButton), Label::CancelButton()) ) )); UI::ChangeWidget(`id(`items), `CurrentItem, selected); @@ -116,11 +114,9 @@ `SelectionBox (`id (`items), title, Items), `VSpacing(10) ), - `HBox ( - `PushButton (`id(`ok), `opt(`default, `key_F10), - Label::OKButton()), - `PushButton (`id(`cancel), `opt(`key_F9), - Label::CancelButton()) + `ButtonBox ( + `PushButton (`id(`ok), `opt(`default, `key_F10, `okButton), Label::OKButton()), + `PushButton (`id(`cancel), `opt(`key_F9, `cancelButton), Label::CancelButton()) ) )); UI::SetFocus (`id (`items)); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=50435&r1=50434&r2=50435&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Aug 28 13:02:06 2008 @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Aug 28 11:55:05 CEST 2008 - locilka@suse.cz -- Adapted Popup and Confirm libraries to use new YButtonBox widget - (FATE #303446). +- Adapted Popup, Confirm, CWM, ALog, GPGWidgets, NetworkPopup, + libraries to use new YButtonBox widget (FATE #303446). - Adjusted RPM dependencies. ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org