Changeset 4240

Timestamp:

Dec 20, 2007, 2:56:47 AM (14 years ago)

Author:

charles

Message:

(gtk) add the up/down/yin-yang icons and session stats to toolbar. add toggling of toolbar and/or statusbar.

Location:

trunk/gtk

Files:

• actions.c (modified) (4 diffs)
• status-bar-icons.h (added)
• tr_prefs.c (modified) (1 diff)
• tr_prefs.h (modified) (1 diff)
• tr_window.c (modified) (6 diffs)
• ui.h (modified) (1 diff)

trunk/gtk/actions.c

@@ -21 +21 @@
 #include "lock.h"
 #include "logo.h"
+#include "status-bar-icons.h"
 
 #define UNUSED G_GNUC_UNUSED
@@ -102 +103 @@
     N_("_Minimal View"), "<alt>M", NULL, G_CALLBACK(toggle_pref_cb), FALSE },
   { "sort-reversed", NULL,
-    N_("_Reverse Sort Order"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE }
+    N_("_Reverse Sort Order"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
+  { "show-status-bar", NULL,
+    N_("Show _Status Bar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE },
+  { "show-toolbar", NULL,
+    N_("Show _Toolbar"), NULL, NULL, G_CALLBACK(toggle_pref_cb), FALSE }
 };
 
@@ -169 +174 @@
 {
     { tr_icon_logo, "transmission-logo" },
-    { tr_icon_lock, "transmission-lock" }
+    { tr_icon_lock, "transmission-lock" },
+    { tr_arrow_down, "tr-arrow-down" },
+    { tr_arrow_up, "tr-arrow-up" },
+    { tr_yin_yang, "tr-yin-yang" }
 };
 
@@ -236 +244 @@
 
   match = pref_string_get( PREF_KEY_SORT_MODE );
-  for( i=0, n=G_N_ELEMENTS(sort_radio_entries), active=-1; active==-1 && i<n; ++i ) {
-      if( !strcmp( sort_radio_entries[i].name, match ) ) {
-          g_message( "found %s in index %d", match, i );
+  for( i=0, n=G_N_ELEMENTS(sort_radio_entries), active=-1; active==-1 && i<n; ++i )
+      if( !strcmp( sort_radio_entries[i].name, match ) )
           active = i;
-      }
-  }
 
   gtk_action_group_add_radio_actions( action_group,

trunk/gtk/tr_prefs.c

@@ -30 +30 @@
     cf_check_older_configs( );
 
+    pref_flag_set_default   ( PREF_KEY_STATUS_BAR, TRUE );
+    pref_flag_set_default   ( PREF_KEY_TOOLBAR, TRUE );
+
     pref_flag_set_default   ( PREF_KEY_DL_LIMIT_ENABLED, FALSE );
     pref_int_set_default    ( PREF_KEY_DL_LIMIT, 100 );

trunk/gtk/tr_prefs.h

@@ -39 +39 @@
 #define PREF_KEY_SORT_REVERSED     "sort-reversed"
 #define PREF_KEY_MINIMAL_VIEW      "minimal-view"
+#define PREF_KEY_STATUS_BAR        "show-status-bar"
+#define PREF_KEY_TOOLBAR           "show-toolbar"
 
 void tr_prefs_init_global( void );

trunk/gtk/tr_window.c

@@ -53 +53 @@
     GtkWidget * scroll;
     GtkWidget * view;
+    GtkWidget * toolbar;
     GtkWidget * status;
     GtkWidget * ul_lb;
     GtkWidget * dl_lb;
+    GtkWidget * stats_lb;
     GtkTreeSelection  * selection;
     GtkCellRenderer   * renderer;
@@ -145 +147 @@
 prefsChanged( TrCore * core UNUSED, const char * key, gpointer wind )
 {
+    PrivateData * p = get_private_data( GTK_WINDOW( wind ) );
+
     if( !strcmp( key, PREF_KEY_MINIMAL_VIEW ) )
     {
-       PrivateData * p = get_private_data( GTK_WINDOW( wind ) );
        g_object_set( p->renderer, "minimal", pref_flag_get( key ), NULL );
        gtk_tree_view_column_queue_resize( p->column );
+    }
+    else if( !strcmp( key, PREF_KEY_STATUS_BAR ) )
+    {
+        const gboolean isEnabled = pref_flag_get( key );
+        g_object_set( p->status, "visible", isEnabled, NULL );
+    }
+    else if( !strcmp( key, PREF_KEY_TOOLBAR ) )
+    {
+        const gboolean isEnabled = pref_flag_get( key );
+        g_object_set( p->toolbar, "visible", isEnabled, NULL );
     }
 }
@@ -189 +202 @@
 
     /* toolbar */
-    w = action_get_widget( "/main-window-toolbar" );
+    w = p->toolbar = action_get_widget( "/main-window-toolbar" );
     gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); 
+
+    /* statusbar */
+    h = p->status = gtk_hbox_new( FALSE, GUI_PAD );
+    gtk_container_set_border_width( GTK_CONTAINER(h), GUI_PAD );
+     
+    w = p->ul_lb = gtk_label_new( NULL );
+    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
+    w = gtk_image_new_from_stock( "tr-arrow-up", (GtkIconSize)-1 );
+    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
+    w = gtk_alignment_new( 0.0f, 0.0f, 0.0f, 0.0f );
+    gtk_widget_set_usize( w, GUI_PAD, 0u );
+    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
+    w = p->dl_lb = gtk_label_new( NULL );
+    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
+    w = gtk_image_new_from_stock( "tr-arrow-down", (GtkIconSize)-1 );
+    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
+
+    w = gtk_image_new_from_stock( "tr-yin-yang", (GtkIconSize)-1 );
+    gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
+    w = p->stats_lb = gtk_label_new( NULL );
+    gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
+
+    gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
 
     /* workarea */
@@ -204 +240 @@
     gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); 
 
-    /* statusbar */
-    h = gtk_hbox_new( FALSE, 0 );
-    w = p->ul_lb = gtk_label_new( NULL );
-    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
-    w = gtk_vseparator_new( );
-    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
-    w = p->dl_lb = gtk_label_new( NULL );
-    gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
-    gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
-
     /* show all but the window */
     gtk_widget_show_all( vbox );
@@ -219 +245 @@
     /* listen for prefs changes that affect the window */
     prefsChanged( core, PREF_KEY_MINIMAL_VIEW, self );
+    prefsChanged( core, PREF_KEY_STATUS_BAR, self );
+    prefsChanged( core, PREF_KEY_TOOLBAR, self );
     p->core = core;
     p->pref_handler_id = g_signal_connect( core, "prefs-changed",
@@ -230 +258 @@
 {
     PrivateData * p = get_private_data( self );
-    char speedStr[32];
-    char buf[64];
-
-    tr_strlspeed( speedStr, downspeed, sizeof(speedStr) );
-    g_snprintf( buf, sizeof(buf), _("Down: %s"), speedStr );
-    gtk_label_set_text( GTK_LABEL(p->dl_lb), buf );
-
-    tr_strlspeed( speedStr, upspeed, sizeof(speedStr) );
-    g_snprintf( buf, sizeof(buf), _("Up: %s"), speedStr );
-    gtk_label_set_text( GTK_LABEL(p->ul_lb), buf );
+    char up[32], down[32], buf[64];
+    struct tr_session_stats stats;
+    tr_handle * handle = tr_core_handle( p->core );
+
+    tr_strlspeed( buf, downspeed, sizeof( buf ) );
+    gtk_label_set_text( GTK_LABEL( p->dl_lb ), buf );
+
+    tr_strlspeed( buf, upspeed, sizeof( buf ) );
+    gtk_label_set_text( GTK_LABEL( p->ul_lb ), buf );
+
+    tr_getCumulativeSessionStats( handle, &stats );
+    tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
+    tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
+    g_snprintf( buf, sizeof( buf ), _( "Down: %s  Up: %s" ), down, up );
+    gtk_label_set_text( GTK_LABEL( p->stats_lb ), buf );
 }
 

trunk/gtk/ui.h

@@ -16 +16 @@
 "    </menu>\n"
 "    <menu action='view-menu'>\n"
+"      <menuitem action='minimal-view'/>\n"
+"      <separator/>\n"
+"      <menu action='sort-menu'>\n"
+"          <menuitem action='sort-by-activity'/>\n"
+"          <menuitem action='sort-by-name'/>\n"
+"          <menuitem action='sort-by-progress'/>\n"
+"          <menuitem action='sort-by-state'/>\n"
+"          <menuitem action='sort-by-tracker'/>\n"
+"          <separator/>\n"
+"          <menuitem action='sort-reversed'/>\n"
+"      </menu>\n"
+"      <separator/>\n"
 "      <menuitem action='show-torrent-details'/>\n"
 "      <separator/>\n"
-"      <menuitem action='minimal-view'/>\n"
+"      <menuitem action='show-toolbar'/>\n"
+"      <menuitem action='show-status-bar'/>\n"
 "      <separator/>\n"
-"      <menuitem action='sort-by-activity'/>\n"
-"      <menuitem action='sort-by-name'/>\n"
-"      <menuitem action='sort-by-progress'/>\n"
-"      <menuitem action='sort-by-state'/>\n"
-"      <menuitem action='sort-by-tracker'/>\n"
-"      <menuitem action='sort-reversed'/>\n"
 "    </menu>\n"
 "    <menu action='edit-menu'>\n"