Author: locilka Date: Fri Dec 12 15:39:04 2008 New Revision: 54092 URL: http://svn.opensuse.org/viewcvs/yast?rev=54092&view=rev Log: - Fixed appearance of buttons and their handling (e.g., confirmation when aborting the configuration) in the Add-Ons overview/installation dialogs (bnc #449773). - 2.17.12 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on_auto.ycp trunk/add-on/src/add-on_proposal.ycp trunk/add-on/src/inst_add-on.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Dec 12 15:39:04 2008 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Dec 12 15:39:04 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Dec 12 15:35:36 CET 2008 - locilka@suse.cz + +- Fixed appearance of buttons and their handling (e.g., + confirmation when aborting the configuration) in the Add-Ons + overview/installation dialogs (bnc #449773). +- 2.17.12 + +------------------------------------------------------------------- Tue Nov 18 12:45:49 CET 2008 - locilka@suse.cz - Listing only type=="addon" products (bnc #441984). Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Dec 12 15:39:04 2008 @@ -794,7 +794,9 @@ } -void Redraw (boolean enable_back, boolean enable_next, string back_button, string next_button) { +void Redraw (boolean enable_back, boolean enable_next, boolean enable_abort, + string back_button, string next_button, string abort_button) { + y2milestone ("Called Redraw()"); // main screen heading string title = _("Add-On Product Installation"); @@ -824,6 +826,7 @@ media ); }); + term contents = `VBox ( `Table ( `id (`summary), @@ -844,17 +847,18 @@ ) ); - // bugzilla #305788 - Wizard::RestoreBackButton(); - Wizard::RestoreAbortButton(); - Wizard::RestoreNextButton(); - Wizard::SetContentsButtons (title, contents, help, back_button, next_button); + Wizard::SetAbortButton (`abort, abort_button); - if (! enable_back) Wizard::DisableBackButton(); + // Disable next button according to settings if (! enable_next) Wizard::DisableNextButton(); - Wizard::SetTitleIcon("vendor"); + // If back or abort buttons should not be enabled, hide them + // -> [Cancel] [OK] dialog + if (! enable_back) Wizard::HideBackButton(); + if (! enable_abort) Wizard::HideAbortButton(); + + Wizard::SetTitleIcon("yast-addon"); // disable delete button if no items listed // bug #203809 @@ -900,7 +904,13 @@ // in the installation workflow - back/ next buttons // in the installation proposal - cancel / accept buttons // -symbol RunAddOnMainDialog (boolean enable_back, boolean enable_next, string back_button, string next_button) { +// bugzilla #449773 +// added enable_abort, abort_button +// +symbol RunAddOnMainDialog (boolean enable_back, boolean enable_next, boolean enable_abort, + string back_button, string next_button, string abort_button, + boolean confirm_abort) { + symbol ret = nil; boolean not_enough_memory = (Stage::initial() && HasInsufficientMemory()); @@ -930,7 +940,7 @@ } // Show Add-Ons table - Redraw (enable_back, enable_next, back_button, next_button); + Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); // store the initial settings, only once WorkflowManager::SetBaseWorkflow (false); @@ -943,13 +953,23 @@ if (ret == `first_time) { ret = `add; } else { - ret = (symbol) Wizard::UserInput(); + ret = (symbol) UI::UserInput(); } // aborting - if (ret == `abort || ret == `cancel) { - if (Popup::ConfirmAbort (`incomplete)) - break; + if (ret == `abort || ret == `cancel) { + // User should confirm that + if (confirm_abort == true) { + if (Popup::ConfirmAbort (`incomplete)) { + ret = `abort; + break; + } else { + ret = nil; + } + // Running system + } else { + break; + } // removing add-on } else if (ret == `delete) { @@ -973,7 +993,7 @@ UI::CloseDialog(); - Redraw (enable_back, enable_next, back_button, next_button); + Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); // adding new add-on } else if (ret == `add) { @@ -987,7 +1007,7 @@ // Use new wizard window for adding new Add-On. // Do not use "Steps" dialog. Wizard::OpenNextBackDialog(); - Wizard::SetTitleIcon("vendor"); + Wizard::SetTitleIcon("yast-addon"); symbol ret = RunWizard (); Wizard::CloseDialog(); @@ -1000,7 +1020,7 @@ some_addon_changed = true; } - Redraw (enable_back, enable_next, back_button, next_button); + Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); // bugzilla #293428 // Release all sources after adding a new one @@ -1026,6 +1046,11 @@ // Release all sources after all Add-Ons are added and merged y2milestone ("Releasing all sources..."); Pkg::SourceReleaseAll(); + + // bugzilla #305788 + Wizard::RestoreBackButton(); + Wizard::RestoreAbortButton(); + Wizard::RestoreNextButton(); return ret; } @@ -1073,6 +1098,8 @@ true ); + Wizard::SetTitleIcon ("yast-addon"); + Wizard::HideBackButton(); Wizard::SetAbortButton (`abort, Label::CancelButton()); Wizard::SetNextButton (`next, Label::OKButton()); Modified: trunk/add-on/src/add-on_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on_auto.ycp?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/src/add-on_auto.ycp (original) +++ trunk/add-on/src/add-on_auto.ycp Fri Dec 12 15:39:04 2008 @@ -96,7 +96,11 @@ Wizard::CreateDialog (); AutoinstSoftware::pmInit (); PackageCallbacksInit::InitPackageCallbacks (); - ret = RunAddOnMainDialog (true, true, Label::BackButton(), Label::OKButton()); + ret = RunAddOnMainDialog ( + false, true, true, + Label::BackButton(), Label::OKButton(), Label::CancelButton(), + false + ); UI::CloseDialog (); return ret; } Modified: trunk/add-on/src/add-on_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on_proposal.ycp?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/src/add-on_proposal.ycp (original) +++ trunk/add-on/src/add-on_proposal.ycp Fri Dec 12 15:39:04 2008 @@ -50,7 +50,11 @@ else if ( func == "AskUser" ) { Wizard::CreateDialog(); - symbol result = RunAddOnMainDialog (true, true, Label::CancelButton(), Label::OKButton()); + symbol result = RunAddOnMainDialog ( + false, true, true, + Label::BackButton(), Label::OKButton(), Label::CancelButton(), + false + ); UI::CloseDialog(); // Fill return map Modified: trunk/add-on/src/inst_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_add-on.ycp?rev=54092&r1=54091&r2=54092&view=diff ============================================================================== --- trunk/add-on/src/inst_add-on.ycp (original) +++ trunk/add-on/src/inst_add-on.ycp Fri Dec 12 15:39:04 2008 @@ -33,8 +33,9 @@ PackageCallbacksInit::SetMediaCallbacks(); symbol ret = RunAddOnMainDialog ( - GetInstArgs::enable_back(), GetInstArgs::enable_next(), - Label::BackButton(), Label::NextButton() + GetInstArgs::enable_back(), GetInstArgs::enable_next(), true, + Label::BackButton(), Label::NextButton(), Label::AbortButton(), + true ); if (ret == `next) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org