Author: lslezak Date: Wed Sep 10 07:31:18 2008 New Revision: 50919 URL: http://svn.opensuse.org/viewcvs/yast?rev=50919&view=rev Log: - fixed UI definition in MediaChange callback (incorrectly defined ButtonBox widget) (bnc#424349) - 2.17.21 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=50919&r1=50918&r2=50919&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Sep 10 07:31:18 2008 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacks.ycp?rev=50919&r1=50918&r2=50919&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Wed Sep 10 07:31:18 2008 @@ -581,7 +581,7 @@ else { term button_box = `ButtonBox ( `PushButton (`id(`abort), `opt (`cancelButton), Label::AbortButton()), - `PushButton (`id(`retry), `opt (`commonButton), Label::RetryButton()), + `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), `PushButton (`id(`ignore), `opt (`okButton), Label::IgnoreButton()) ); @@ -792,18 +792,18 @@ // -------------------------------------- // build up button box - term button_box = `ButtonBox (`PushButton (`id(`retry), `opt(`default, `commonButton), Label::RetryButton())); + term button_box = `ButtonBox (`PushButton (`id(`retry), `opt(`default, `okButton), Label::RetryButton())); if (current == -1) // wrong media id, offer "Ignore" { - button_box = add (button_box, `PushButton(`id(`ignore), `opt (`okButton), Label::IgnoreButton())); + button_box = add (button_box, `PushButton(`id(`ignore), `opt (`customButton), Label::IgnoreButton())); } button_box = add (button_box, `PushButton (`id(`cancel), `opt (`cancelButton), Label::AbortButton())); // push button label during media change popup, user can skip // this media (CD) so no packages from this media will be installed - button_box = add (button_box, `PushButton (`id(`skip), `opt(`commonButton), _("&Skip"))); + button_box = add (button_box, `PushButton (`id(`skip), `opt(`customButton), _("&Skip"))); if (offer_eject_button) { @@ -817,14 +817,17 @@ list<term> cds = detected_cd_devices; // display a menu button if there are more CD devices - term eject_button = - (size(cds) > 1) ? - // menu button label - used for more then one device - `MenuButton(_("&Eject"), cds) - // push button label - in the media change popup, user can eject the CD/DVD - : `PushButton (`id(`eject), _("&Eject")); + if (size(cds) > 1) + { + // menu button label - used for more then one device + button_box = `HBox(button_box, `MenuButton(_("&Eject"), cds)); + } + else + { + // push button label - in the media change popup, user can eject the CD/DVD + button_box = add(button_box, `PushButton (`id(`eject), `opt(`customButton), _("&Eject"))); + } - button_box = add(button_box, eject_button); boolean auto_eject = (boolean)GetConfig("automatic_eject"); if (auto_eject == nil) @@ -908,6 +911,8 @@ return "S"; } + y2internal("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true)); + if ( showLongInfo ) { UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); @@ -1820,7 +1825,7 @@ might be missing or out of date.")), `ButtonBox ( `PushButton (`id(`continue), `opt (`default, `okButton), Label::ContinueButton()), - `PushButton (`id(`skip), `opt (`commonButton), _("Skip Refresh")) + `PushButton (`id(`skip), `opt (`customButton), _("Skip Refresh")) ) ) ) @@ -2326,7 +2331,7 @@ term button_box = `ButtonBox ( `PushButton (`id (`abort), `opt (`cancelButton), Label::AbortButton()), - `PushButton (`id (`retry), `opt (`commonButton), Label::RetryButton()), + `PushButton (`id (`retry), `opt (`customButton), Label::RetryButton()), `PushButton (`id (`ignore), `opt (`okButton), Label::IgnoreButton()) ); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=50919&r1=50918&r2=50919&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Sep 10 07:31:18 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Sep 10 07:24:35 CEST 2008 - lslezak@suse.cz + +- fixed UI definition in MediaChange callback (incorrectly defined + ButtonBox widget) (bnc#424349) +- 2.17.21 + +------------------------------------------------------------------- Tue Sep 9 15:38:57 CEST 2008 - locilka@suse.cz - .barexml SCR agent dropped (bnc #424263). -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org