[yast-commit] r40704 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/PackageCallbacks.ycp
Author: lslezak Date: Mon Sep 3 14:22:00 2007 New Revision: 40704 URL: http://svn.opensuse.org/viewcvs/yast?rev=40704&view=rev Log: - better busy indicator for tick callback (#296945) - 2.15.73 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40704&r1=40703&r2=40704&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Mon Sep 3 14:22:00 2007 @@ -1 +1 @@ -2.15.72 +2.15.73 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40704&r1=40703&r2=40704&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Sep 3 14:22:00 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 3 14:07:53 CEST 2007 - lslezak@suse.cz + +- better busy indicator for tick callback (#296945) +- 2.15.73 + +------------------------------------------------------------------- Mon Sep 3 10:41:35 CEST 2007 - lslezak@suse.cz - try HTTP scheme when registering an FTP update source fails due Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCallbacks.ycp?rev=40704&r1=40703&r2=40704&view=diff ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Mon Sep 3 14:22:00 2007 @@ -32,7 +32,9 @@ global boolean _package_popup = false; global boolean _script_popup = false; global boolean _scan_popup = false; - + global string _tick_movie = "/usr/share/YaST2/theme/current/animations/ticks-loop3.mng"; + global integer _tick_movie_x = 7; + global integer _tick_movie_y = 1; global string _package_name = ""; global integer _package_size = 0; global boolean _deleting_package = false; @@ -2085,6 +2087,17 @@ UI::CloseDialog(); } + term progressw = `Empty(); + if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false ) + { + progressw = `HVCenter(`MinSize( _tick_movie_x, _tick_movie_y, `ReplacePoint(`id(`rp_progress), `Image(`id (`progress_widget), `opt(`animated), _tick_movie, "progress_widget" )))); + } + else + { + string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw); + progressw = `Label(label); + } + UI::OpenDialog( `HBox( `HSpacing(1), @@ -2094,9 +2107,9 @@ (in_percent) ? `ProgressBar (`id (`progress_widget), task, 100, val_percent) : `VBox( `Label(task), - `Label(`id(`progress_widget), (tick_progress) ? tick_labels[current_tick]:"/" : val_raw) + progressw ), - `VSpacing(0.5), + `VSpacing(0.2), `PushButton (`id (`abort), Label::AbortButton ()), `VSpacing(0.5) ), @@ -2139,11 +2152,19 @@ if (IsProgressPopup()) { if (tick_progress || val_progress) - { - string label = (tick_progress) ? tick_labels[current_tick]:"/" - : sformat("%1: %2", progress_task, val_raw); + { + term progressw = `Empty(); + if ( UI::GetDisplayInfo()["HasAnimationSupport"]:false ) + { + progressw = `HVCenter(`MinSize( _tick_movie_x, _tick_movie_y, `Image(`id (`progress_widget), `opt(`animated), _tick_movie, "progress_widget" ))); + } + else + { + string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw); + progressw = `Label(label); + } - UI::ChangeWidget (`id(`progress_widget), `Value, label); + UI::ReplaceWidget (`id(`rp_progress), progressw ); if (tick_progress) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
lslezak@svn.opensuse.org