Author: aschnell Date: Wed Aug 5 17:36:26 2009 New Revision: 58287 URL: http://svn.opensuse.org/viewcvs/yast?rev=58287&view=rev Log: - consistent summary Modified: trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/include/ep-summary.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lib.ycp?rev=58287&r1=58286&r2=58287&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Wed Aug 5 17:36:26 2009 @@ -410,4 +410,21 @@ return `BarGraph(bits, labels); } + + + string CompleteSummary() + { + string part_summary = Storage::ChangeText(); + if (isempty(part_summary)) + part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>")); + else + part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary; + + string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>")); + if (StorageSettings::GetModified()) + config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary(); + + return part_summary + config_summary; + } + } Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-main.ycp?rev=58287&r1=58286&r2=58287&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Wed Aug 5 17:36:26 2009 @@ -32,6 +32,7 @@ import "Region"; import "ProductFeatures"; import "Directory"; + import "HTML"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/raid_lib.ycp"; @@ -305,21 +306,14 @@ symbol SummaryDialog() { symbol ret = `none; - string summary = Storage::ChangeText() + - ( StorageSettings::GetModified() ? - StorageSettings::Summary() : - ""); - - y2milestone("Summary of changes: %1", summary); Wizard::CreateDialog(); Wizard::SetContentsButtons(caption + _(": Summary"), - `VBox(`RichText( `id(`summary), _("Creating summary ..."))), + `VBox(`RichText(CompleteSummary())), SummaryDialogHelptext(), Label::BackButton(), Label::FinishButton()); Wizard::SetDesktopIcon("disk"); - UI::ChangeWidget(`id(`summary), `Value, _("<h1>Changes in Partitioning</h1>") + summary); while (true) { @@ -327,6 +321,7 @@ if (ret == `next || ret == `back) break; + if( ret == `abort && ReallyQuit( Label::AbortButton() )) { ret =`abort; Modified: trunk/storage/storage/src/include/ep-summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-summary.ycp?rev=58287&r1=58286&r2=58287&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-summary.ycp (original) +++ trunk/storage/storage/src/include/ep-summary.ycp Wed Aug 5 17:36:26 2009 @@ -10,27 +10,14 @@ textdomain "storage"; - import "HTML"; - - void CreateSummaryPanel(any user_data) { - string part_summary = Storage::ChangeText(); - if (isempty(part_summary)) - part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>")); - else - part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary; - - string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>")); - if (StorageSettings::GetModified()) - config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary(); - UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( // dialog heading `IconAndHeading(_("Installation Summary"), StorageIcons::summary_icon), - `RichText(`id(`summary), part_summary + config_summary) + `RichText(CompleteSummary()) )) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org