Changeset 2304

Timestamp:

Jul 8, 2007, 5:51:55 AM (16 years ago)

Author:

charles

Message:

minor tweaks to make the gtk+ client resemble the os x one more closely

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• tr_torrent.c (modified) (2 diffs)
• tr_window.c (modified) (5 diffs)
• util.c (modified) (2 diffs)

trunk/gtk/actions.c

@@ -60 +60 @@
   { "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
   { "priority-menu", NULL, N_("_Priority"), NULL, NULL, NULL },
-  { "add-torrent", GTK_STOCK_ADD,
-    N_("_Add"), "<control>A", NULL, G_CALLBACK(action_cb) },
+  { "add-torrent", GTK_STOCK_OPEN, NULL, NULL,  NULL, G_CALLBACK(action_cb) },
   { "start-torrent", GTK_STOCK_EXECUTE,
     N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },

trunk/gtk/tr_torrent.c

@@ -625 +625 @@
             else {
                 char * timestr = readabletime(eta);
-                top = g_strdup_printf( _("Finishing in %s (%.1f%%)"), timestr, prog );
+                top = g_strdup_printf( _("%s remaining (%.1f%%)"), timestr, prog );
                 g_free(timestr);
             }
@@ -639 +639 @@
         case TR_STATUS_SEED:
             top = g_strdup_printf(
-                ngettext( "Seeding, uploading to %d of %d peer",
-                          "Seeding, uploading to %d of %d peers", tpeers ),
+                ngettext( "Seeding to %d of %d peer",
+                          "Seeding to %d of %d peers", tpeers ),
                           upeers, tpeers );
             break;

trunk/gtk/tr_window.c

@@ -43 +43 @@
     GtkWidget * view;
     GtkWidget * status;
+    GtkWidget * ul_lb;
+    GtkWidget * dl_lb;
     GtkTreeSelection * selection;
     GtkCellRenderer * namerend;
@@ -111 +113 @@
     }
 
-    str = g_markup_printf_escaped( "<big>%s (%s)</big>\n<small>%s\n%s</small>",
+    str = g_markup_printf_escaped( "<b>%s (%s)</b>\n<small>%s\n%s</small>",
                                    name, mb, top,
                                    ( NULL == bottom ? "" : bottom ) );
@@ -246 +248 @@
 {
     PrivateData * p = g_new( PrivateData, 1 );
-    GtkWidget *vbox, *w, *self;
+    GtkWidget *vbox, *w, *self, *h;
 
     /* make the window */
@@ -276 +278 @@
     gtk_container_set_focus_child( GTK_CONTAINER( vbox ), w );
 
+    /* spacer */
+    w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
+    gtk_widget_set_usize (w, 0u, 6u);
+    gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 ); 
+
+
     /* statusbar */
-    w = p->status = gtk_statusbar_new ();
-    gtk_statusbar_push( GTK_STATUSBAR(w), 0, "" );
-    gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
+    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 */
@@ -291 +304 @@
 {
     PrivateData * p = get_private_data( self );
-    GtkStatusbar * status = GTK_STATUSBAR( p->status );
-
-    /* update the status bar */
-    char * downstr = readablespeed ( downspeed );
-    char * upstr   = readablespeed ( upspeed );
-    char * str     = g_strdup_printf( _("     Total DL: %s     Total UL: %s"),
-                                      downstr, upstr );
-    g_free( downstr );
-    g_free( upstr );
-    gtk_statusbar_pop( status, 0 );
-    gtk_statusbar_push( status, 0, str );
-    g_free( str );
+    char *tmp1, *tmp2;
+
+    tmp1 = readablespeed( downspeed );
+    tmp2 = g_strdup_printf( _("Total DL: %s"), tmp1 );
+    gtk_label_set_text( GTK_LABEL(p->dl_lb), tmp2 );
+    g_free( tmp2 );
+    g_free( tmp1 );
+
+    tmp1 = readablespeed( upspeed );
+    tmp2 = g_strdup_printf( _("Total UL: %s"), tmp1 );
+    gtk_label_set_text( GTK_LABEL(p->ul_lb), tmp2 );
+    g_free( tmp2 );
+    g_free( tmp1 );
 }
 

trunk/gtk/util.c

@@ -110 +110 @@
 #define HOURS(s)                ((s) / 60 / 60 % 24)
 #define DAYS(s)                 ((s) / 60 / 60 / 24 % 7)
-#define WEEKS(s)                ((s) / 60 / 60 / 24 / 7)
 
 char *
@@ -116 +115 @@
   if(60 > secs)
     return g_strdup_printf(_("%i %s"),
-      SECONDS(secs), ngettext("second", "seconds", SECONDS(secs)));
+      SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
   else if(60 * 60 > secs)
     return g_strdup_printf(_("%i %s %i %s"),
-      MINUTES(secs), ngettext("minute", "minutes", MINUTES(secs)),
-      SECONDS(secs), ngettext("second", "seconds", SECONDS(secs)));
+      MINUTES(secs), ngettext("min", "mins", MINUTES(secs)),
+      SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
   else if(60 * 60 * 24 > secs)
     return g_strdup_printf(_("%i %s %i %s"),
-      HOURS(secs),   ngettext("hour", "hours", HOURS(secs)),
-      MINUTES(secs), ngettext("minute", "minutes", MINUTES(secs)));
-  else if(60 * 60 * 24 * 7 > secs)
+      HOURS(secs),   ngettext("hr", "hrs", HOURS(secs)),
+      MINUTES(secs), ngettext("min", "mins", MINUTES(secs)));
+  else
     return g_strdup_printf(_("%i %s %i %s"),
       DAYS(secs),    ngettext("day", "days", DAYS(secs)),
-      HOURS(secs),   ngettext("hour", "hours", HOURS(secs)));
-  else
-    return g_strdup_printf(_("%i %s %i %s"),
-      WEEKS(secs),   ngettext("week", "weeks", WEEKS(secs)),
-      DAYS(secs),    ngettext("hour", "hours", DAYS(secs)));
+      HOURS(secs),   ngettext("hr", "hrs", HOURS(secs)));
 }