Attachment 161220 Details for Bug 296945

New patch #2, with timeout

296945.diff (text/x-diff), 2.60 KB, created by Duncan Mac-Vicar on 2007-08-31 11:41:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Duncan Mac-Vicar

Created: 2007-08-31 11:41:57 UTC

Size: 2.60 KB

patch

obsolete

>Index: src/modules/PackageCallbacks.ycp
>===================================================================
>--- src/modules/PackageCallbacks.ycp	(revision 40639)
>+++ src/modules/PackageCallbacks.ycp	(working copy)
>@@ -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.mng";
>+    global integer _tick_movie_x = 10;
>+    global integer _tick_movie_y = 2;
>     global string _package_name = "";
>     global integer _package_size = 0;
>     global boolean _deleting_package = false;
>@@ -2084,7 +2086,18 @@
> 	    // huh, the popup is already there?
> 	    UI::CloseDialog();
> 	}
>-
>+        
>+        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::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,12 +2152,20 @@
> 	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::ReplaceWidget (`id(`progress_widget), progressw );
> 
>-		UI::ChangeWidget (`id(`progress_widget), `Value, label);
>-
> 		if (tick_progress)
> 		{
> 		    NextTick();

Actions: View

Attachments on bug 296945: 155633 | 160958 | 161201 | 161202 | 161204 | 161220 | 161221 | 161245 | 161246 | 161247 | 161248 | 161249 | 161255 | 161537