Author: locilka Date: Mon Dec 3 16:46:30 2007 New Revision: 42613 URL: http://svn.opensuse.org/viewcvs/yast?rev=42613&view=rev Log: - yast2.rpm always depends on the $current version of yast2-core. - Updated Progress with icons to rather use Image-Dimm support if available. - Added new Icon YCP module to provide basic acces to icon files. - Popup::ConfirmAbort now uses Icons. - 2.16.16 Modified: trunk/yast2/VERSION trunk/yast2/library/modules/Popup.ycp trunk/yast2/library/wizard/src/Progress.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=42613&r1=42612&r2=42613&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Dec 3 16:46:30 2007 @@ -1 +1 @@ -2.16.15 +2.16.16 Modified: trunk/yast2/library/modules/Popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Popup.ycp?rev=42613&r1=42612&r2=42613&view=diff ============================================================================== --- trunk/yast2/library/modules/Popup.ycp (original) +++ trunk/yast2/library/modules/Popup.ycp Mon Dec 3 16:46:30 2007 @@ -25,6 +25,7 @@ import "Mode"; import "Directory"; import "String"; +import "Icon"; boolean feedback_open = false; @@ -656,6 +657,8 @@ string abort_button = _("&Abort Installation"); // Button that will continue with the installation string continue_button = _("&Continue Installation"); + // Dialog icon + string icon_name = "warning"; if ( severity == `painless ) { @@ -675,6 +678,7 @@ Linux will not be installed. Your hard disk will remain untouched."); } + // icon_name = "info"; } else if ( severity == `incomplete ) { @@ -702,8 +706,16 @@ string message = abort_label + "\n\n" + what_will_happen; - boolean ret = AnyQuestion (NoHeadline (), message, abort_button, - continue_button, `focus_no); + term button_box = AnyQuestionButtonBox (abort_button, continue_button, `focus_no); + UI::OpenDialog ( + `opt (`decorated), + popupLayoutInternal (NoHeadline(), message, Icon::IconPath (icon_name), button_box) + ); + + any user_ret = UI::UserInput(); + UI::CloseDialog(); + + boolean ret = (user_ret == `yes); y2debug("ConfirmAbort returned: %1", ret); Modified: trunk/yast2/library/wizard/src/Progress.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Progress.ycp?rev=42613&r1=42612&r2=42613&view=diff ============================================================================== --- trunk/yast2/library/wizard/src/Progress.ycp (original) +++ trunk/yast2/library/wizard/src/Progress.ycp Mon Dec 3 16:46:30 2007 @@ -77,6 +77,10 @@ map display_info = UI::GetDisplayInfo(); boolean can_display_images = (display_info["HasImageSupport"]:false == true); + // native UI support to dimm images + // `opt (`disabled) for `Image () + // boolean has_dimm_image_support = (display_info["HasDimmImageSupport"]:false == true); + boolean has_dimm_image_support = (display_info["HasImageSupport"]:false == true); /** * Sets progress bar state: @@ -197,8 +201,15 @@ while (i < number_of_stages) { i = i + 1; - one_icon = NormalizeIconPath (global_invisible_icons_definition[i]:nil, false); - ret = add (ret, `ReplacePoint (`id (IconId (i)), `Image (one_icon, "[_]"))); + + + if (has_dimm_image_support) { + one_icon = NormalizeIconPath (global_visible_icons_definition[i]:nil, false); + ret = add (ret, `Image (`id (IconId (i)), `opt (`disabled), one_icon, "[X]")); + } else { + one_icon = NormalizeIconPath (global_invisible_icons_definition[i]:nil, false); + ret = add (ret, `ReplacePoint (`id (IconId (i)), `Image (one_icon, "[_]"))); + } ret = add (ret, `HSpacing (2)); } @@ -367,8 +378,12 @@ string icon_id = IconId (last_highlighted_icon); if (UI::WidgetExists (`id (icon_id))) { - string one_icon = NormalizeIconPath (global_visible_icons_definition[current_step]:nil, true); - UI::ReplaceWidget (`id (icon_id), `Image (one_icon, "[x]")); + if (has_dimm_image_support) { + UI::ChangeWidget (`id (icon_id), `Enabled, true); + } else { + string one_icon = NormalizeIconPath (global_visible_icons_definition[current_step]:nil, true); + UI::ReplaceWidget (`id (icon_id), `Image (one_icon, "[x]")); + } } } } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=42613&r1=42612&r2=42613&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Dec 3 16:46:30 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Dec 3 16:43:50 CET 2007 - locilka@suse.cz + +- yast2.rpm always depends on the $current version of yast2-core. +- Updated Progress with icons to rather use Image-Dimm support + if available. +- Added new Icon YCP module to provide basic acces to icon files. +- Popup::ConfirmAbort now uses Icons. +- 2.16.16 + +------------------------------------------------------------------- Mon Dec 3 14:24:02 CET 2007 - ug@suse.de - XMLToYCPString added to convert an XML string to Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=42613&r1=42612&r2=42613&view=diff ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Mon Dec 3 16:46:30 2007 @@ -4,8 +4,11 @@ Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite yast2-perl-bindings -# SCR::RegisterNewAgents() -Requires: yast2-core >= 2.16.10 + +# With each yast2-core rebuild, change the 'Requires' +# Suggested by Coolo +Requires: yast2-core >= %(echo `rpm -q --queryformat '%{VERSION}' yast2-core`) + # Pkg::PkgAvailable() and Pkg::PkgInstalled() Requires: yast2-pkg-bindings >= 2.15.47 Requires: yast2_ui yast2_theme -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org