Changeset 5097

Timestamp:

Feb 23, 2008, 5:02:42 PM (14 years ago)

Author:

charles

Message:

(gtk) experimental: use native gtk progress bars

File:

• trunk/gtk/torrent-cell-renderer.c (modified) (11 diffs)

trunk/gtk/torrent-cell-renderer.c

@@ -14 +14 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkcellrendererprogress.h>
 #include <glib/gi18n.h>
 #include <libtransmission/transmission.h>
@@ -30 +31 @@
     P_SHOW_UNAVAILABLE,
     P_GRADIENT,
+    P_NATIVE_PROGRESS,
     P_COLOR_VERIFIED,
     P_COLOR_VERIFIED_2,
@@ -252 +254 @@
     GtkCellRenderer * text_renderer;
     GtkCellRenderer * text_renderer_err;
+    GtkCellRenderer * progress_renderer;
     int bar_height;
     gboolean minimal;
     gboolean show_unavailable;
     gboolean gradient;
+    gboolean use_native_progress;
     GdkColor color_paused[2];
     GdkColor color_verified[2];
@@ -539 +543 @@
             ? p->text_renderer_err
             : p->text_renderer;
+        const gboolean isActive = torStat->status != TR_STATUS_STOPPED;
 
         g_object_get( self, "xpad", &xpad, "ypad", &ypad, NULL );
@@ -547 +552 @@
         my_bg.width -= xpad*2;
         my_cell = my_expose = my_bg;
+
+        g_object_set( text_renderer, "sensitive", isActive, NULL );
+        g_object_set( p->progress_renderer, "sensitive", isActive, NULL );
 
         /* above the progressbar */
@@ -631 +639 @@
         /* the progressbar */
         my_cell.height = p->bar_height;
-        drawRegularBar( self, info, torStat, window, widget, &my_cell );
+        if( p->use_native_progress )
+        {
+            const double havePercent = ( torStat->haveValid + torStat->haveUnchecked )
+                                                              / (double)info->totalSize;
+            g_object_set( p->progress_renderer, "value", (int)(havePercent*100.0), 
+                                                "text", "",
+                                                NULL );
+            gtk_cell_renderer_render( p->progress_renderer,
+                                      window, widget,
+                                      &my_cell, &my_cell, &my_cell, flags );
+ 
+        }
+        else
+        {
+            drawRegularBar( self, info, torStat, window, widget, &my_cell );
+        }
         my_bg.y     += my_cell.height;
         my_cell.y   += my_cell.height;
@@ -699 +722 @@
         case P_MINIMAL:     p->minimal  = g_value_get_boolean( v ); break;
         case P_GRADIENT:    p->gradient = g_value_get_boolean( v ); break;
+        case P_NATIVE_PROGRESS: p->use_native_progress = g_value_get_boolean( v ); break;
         case P_SHOW_UNAVAILABLE:
                             p->show_unavailable = g_value_get_boolean( v ); break;
@@ -747 +771 @@
         case P_MINIMAL:     g_value_set_boolean( v, p->minimal ); break;
         case P_GRADIENT:    g_value_set_boolean( v, p->gradient ); break;
+        case P_NATIVE_PROGRESS: g_value_set_boolean( v, p->use_native_progress ); break;
         case P_SHOW_UNAVAILABLE:
                             g_value_set_boolean( v, p->show_unavailable ); break;
@@ -765 +790 @@
         g_object_unref( G_OBJECT( r->priv->text_renderer ) );
         g_object_unref( G_OBJECT( r->priv->text_renderer_err ) );
+        g_object_unref( G_OBJECT( r->priv->progress_renderer ) );
         r->priv = NULL;
     }
@@ -803 +829 @@
     g_object_class_install_property( gobject_class, P_GRADIENT,
         g_param_spec_boolean( "gradient", NULL, "Render Progress as a Gradient",
+                              TRUE, G_PARAM_READWRITE ) );
+
+    g_object_class_install_property( gobject_class, P_NATIVE_PROGRESS,
+        g_param_spec_boolean( "use-native-progress", NULL, "Use Native GtkProgressBars",
                               TRUE, G_PARAM_READWRITE ) );
 
@@ -879 +909 @@
     p->text_renderer = gtk_cell_renderer_text_new( );
     p->text_renderer_err = gtk_cell_renderer_text_new(  );
+    p->progress_renderer = gtk_cell_renderer_progress_new(  );
     g_object_set( p->text_renderer_err, "foreground", "red", NULL );
     tr_object_ref_sink( p->text_renderer );
     tr_object_ref_sink( p->text_renderer_err );
+    tr_object_ref_sink( p->progress_renderer );
 
     p->gradient = TRUE;
     p->show_unavailable = TRUE;
+    p->use_native_progress = TRUE;
     p->bar_height = DEFAULT_BAR_HEIGHT;