Changeset 12827

Timestamp:

Sep 1, 2011, 10:49:35 PM (12 years ago)

Author:

jordan

Message:

(trunk) Roll back the right-to-left progressbar behavior added in #4281 -- it confused too many people.

Location:

trunk

Files:

• gtk/torrent-cell-renderer.c (modified) (2 diffs)
• qt/torrent-delegate.cc (modified) (1 diff)

trunk/gtk/torrent-cell-renderer.c

@@ -660 +660 @@
     g_object_set( p->icon_renderer, "pixbuf", icon, "sensitive", sensitive, NULL );
     gtr_cell_renderer_render( p->icon_renderer, window, widget, &icon_area, flags );
-    g_object_set( p->progress_renderer, "value", (int)(percentDone*100.0), "text", NULL,
-        "sensitive", sensitive,
-#if GTK_CHECK_VERSION( 3,0,0 )
-        "inverted", seed,
-#else
-        "orientation", (seed ? GTK_PROGRESS_RIGHT_TO_LEFT : GTK_PROGRESS_LEFT_TO_RIGHT),
-#endif
-        NULL );
+    g_object_set( p->progress_renderer, "value", (int)(percentDone*100.0), "text", NULL, "sensitive", sensitive, NULL );
     gtr_cell_renderer_render( p->progress_renderer, window, widget, &prog_area, flags );
     g_object_set( p->text_renderer, "text", gstr_stat->str, "scale", SMALL_SCALE, "ellipsize", PANGO_ELLIPSIZE_END, FOREGROUND_COLOR_KEY, &text_color, NULL );
@@ -781 +774 @@
     g_object_set( p->text_renderer, "text", gstr_prog->str, "scale", SMALL_SCALE, "weight", PANGO_WEIGHT_NORMAL, NULL );
     gtr_cell_renderer_render( p->text_renderer, window, widget, &prog_area, flags );
-    g_object_set( p->progress_renderer, "value", (int)(percentDone*100.0), "text", "", "sensitive", sensitive,
-#if GTK_CHECK_VERSION( 3,0,0 )
-        "inverted", seed,
-#else
-        "orientation", (seed ? GTK_PROGRESS_RIGHT_TO_LEFT : GTK_PROGRESS_LEFT_TO_RIGHT),
-#endif
-        NULL );
+    g_object_set( p->progress_renderer, "value", (int)(percentDone*100.0), "text", "", "sensitive", sensitive, NULL );
     gtr_cell_renderer_render( p->progress_renderer, window, widget, &prct_area, flags );
     g_object_set( p->text_renderer, "text", gstr_stat->str, FOREGROUND_COLOR_KEY, &text_color, NULL );

trunk/qt/torrent-delegate.cc

@@ -331 +331 @@
         const int scaledProgress = invertedRatio * (myProgressBarStyle->maximum - myProgressBarStyle->minimum);
         myProgressBarStyle->progress = myProgressBarStyle->minimum + scaledProgress;
-        myProgressBarStyle->direction = (option.direction == Qt::RightToLeft ? Qt::LeftToRight : Qt::RightToLeft);
     }
     else