File yast2-gtk-r40421.patch of Package yast2-gtk

Overview Repositories Revisions Requests Users Attributes Meta

File yast2-gtk-r40421.patch of Package yast2-gtk (Revision 4f0a1d2784088223edacfd4dbd32602f)

Currently displaying revision 4f0a1d2784088223edacfd4dbd32602f , Show latest

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40420)
+++ ChangeLog	(revision 40421)
@@ -1,5 +1,10 @@
 2007-08-22  Michael Meeks  <michael.meeks@novell.com>
 
+	* src/YGProgressBar.cc (YGProgressBar): implement pulse
+	mode when maxprogress == 0
+
+	* tests/ProgressPulse.ycp: add test.
+
 	* configure.in.in, src/Makefile: create and use PYUI_LIBS,
 	to adapt likewise.
 
Index: src/YGProgressBar.cc
===================================================================
--- src/YGProgressBar.cc	(revision 40420)
+++ src/YGProgressBar.cc	(revision 40421)
@@ -11,6 +11,7 @@
 
 class YGProgressBar : public YProgressBar, public YGLabeledWidget
 {
+    bool m_pulse;
 public:
 	YGProgressBar (const YWidgetOpt &opt, YGWidget *parent,
 	               const YCPString& label,
@@ -18,7 +19,9 @@
 	: YProgressBar (opt, label, maxprogress, progress)
 	, YGLabeledWidget (this, parent, label, YD_VERT, true,
 	                   GTK_TYPE_PROGRESS_BAR, NULL)
-	{ }
+	{
+        m_pulse = maxprogress->value() <= 0;
+    }
 	// NOTE: its label widget is positionated at the vertical, because its label
 	// may change often and so will its size, which will look odd (we may want
 	// to make the label widget to only grow).
@@ -29,9 +32,13 @@
 	virtual void setProgress (const YCPInteger& newProgress)
 	{
 		IMPL
-		float fraction = (float) newProgress->value() / maxProgress->value();
-		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (getWidget()), fraction);
-		YProgressBar::setProgress (newProgress);
+        if (m_pulse)
+            gtk_progress_bar_pulse (GTK_PROGRESS_BAR (getWidget()));
+        else {
+            float fraction = (float) newProgress->value() / maxProgress->value();
+            gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (getWidget()), fraction);
+        }
+        YProgressBar::setProgress (newProgress);
 	}
 
 	YGWIDGET_IMPL_COMMON
Index: tests/ProgressPulse.ycp
===================================================================
--- tests/ProgressPulse.ycp	(revision 0)
+++ tests/ProgressPulse.ycp	(revision 40421)
@@ -0,0 +1,30 @@
+// Simple ProgressBar example
+{
+    integer max_progress = 0;
+    integer progress = 0;
+    
+    UI::OpenDialog(
+		   `VBox(
+			 `ProgressBar(`id(`pr), "Sample progress bar", max_progress, progress ),
+			 `PushButton(`id(`next), "Next"),
+			 `Right(`PushButton(`id(`close), "&Close" ) )
+			 )
+		   );
+ 
+    
+    while ( progress < 20 ) 
+    {
+	symbol button = (symbol) UI::UserInput();
+
+	if ( button == `next )
+	{
+	    progress = progress + 1;
+	    UI::ChangeWidget(`id(`pr), `Value, progress);
+	    UI::ChangeWidget(`id(`pr), `Label, sformat("Progress %1 of %2", progress, max_progress ));
+	}
+	else if ( button == `close )
+	    break;
+    }
+    
+    UI::CloseDialog();
+}

Places

File yast2-gtk-r40421.patch of Package yast2-gtk (Revision 4f0a1d2784088223edacfd4dbd32602f)

Places