Author: tgoettlicher Date: Wed Aug 6 14:37:05 2008 New Revision: 49766 URL: http://svn.opensuse.org/viewcvs/yast?rev=49766&view=rev Log: Fixed bnc #413516: HideBackButton() always hides back button in wizard Modified: trunk/yast2/library/wizard/src/Wizard.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.ycp?rev=49766&r1=49765&r2=49766&view=diff ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Wed Aug 6 14:37:05 2008 @@ -785,47 +785,6 @@ Wizard::SetContents("", `Empty(), "", false, false); } - - /** - * Set contents and Buttons of wizard dialog - * - * Additionally set its title, help_text and buttons labels. Enables both back and next button. - * - * @params - * - * @param title title of window - * @param contents contents of dialog - * @param help_text help text - * @param back_label label of back button - * @param next_label label of next button - **/ - global void SetContentsButtons( string title, - term contents, - string help_text, - string back_label, - string next_label ) - { - UI::PostponeShortcutCheck (); - - if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) - { - UI::WizardCommand(`SetNextButtonLabel( next_label ) ); - Wizard::SetContents( title, contents, help_text, true, true ); - } - else - { - // Set button labels first to avoid geometry problems: SetContents() - // calls ReplaceWidget() wich triggers a re-layout. - - if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); - if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); - Wizard::SetContents( title, contents, help_text, true, true ); - } - SetHelpText( help_text ); - UI::CheckShortcuts (); - } - - /** * Set the dialog's "Next" button with a new label and a new ID * @@ -991,6 +950,53 @@ } + + /** + * Set contents and Buttons of wizard dialog + * + * Additionally set its title, help_text and buttons labels. Enables both back and next button. + * + * @params + * + * @param title title of window + * @param contents contents of dialog + * @param help_text help text + * @param back_label label of back button + * @param next_label label of next button + **/ + global void SetContentsButtons( string title, + term contents, + string help_text, + string back_label, + string next_label ) + { + + + UI::PostponeShortcutCheck (); + + Wizard::RestoreBackButton(); + Wizard::RestoreNextButton(); + + if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) + { + UI::WizardCommand(`SetNextButtonLabel( next_label ) ); + Wizard::SetContents( title, contents, help_text, true, true ); + } + else + { + // Set button labels first to avoid geometry problems: SetContents() + // calls ReplaceWidget() wich triggers a re-layout. + + if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); + if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); + Wizard::SetContents( title, contents, help_text, true, true ); + } + SetHelpText( help_text ); + UI::CheckShortcuts (); + + } + + /** * Sets the wizard 'title' icon to the specified icon from the standard icon * directory. Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=49766&r1=49765&r2=49766&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Aug 6 14:37:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher@suse.de + +- Fixed bnc #413516: HideBackButton() always hides back button + in wizard + +------------------------------------------------------------------- Wed Aug 6 10:34:07 CEST 2008 - locilka@suse.cz - Converting old built-in allowed services configuration in -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org