Changeset 3352


Ignore:
Timestamp:
Oct 10, 2007, 6:20:52 PM (15 years ago)
Author:
charles
Message:

more HIG correctness

Location:
trunk/gtk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r3350 r3352  
    6363static GtkActionEntry entries[] =
    6464{
    65   { "file-menu", NULL, N_("_File"), NULL, NULL, NULL },
     65  { "torrent-menu", NULL, N_("_Torrent"), NULL, NULL, NULL },
    6666  { "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
    6767  { "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
     
    7070  { "start-torrent", GTK_STOCK_MEDIA_PLAY,
    7171    N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
    72   { "recheck-torrent", GTK_STOCK_REFRESH,
    73     N_("Re_check"), NULL, NULL, G_CALLBACK(action_cb) },
     72  { "verify-torrent", NULL,
     73    N_("_Verify Local Files"), NULL, NULL, G_CALLBACK(action_cb) },
    7474  { "pause-torrent", GTK_STOCK_MEDIA_PAUSE,
    7575    N_("_Pause"), "<control>P", NULL, G_CALLBACK(action_cb) },
     
    8585    N_("Select _All"), "<control>A", NULL, G_CALLBACK(action_cb) },
    8686  { "unselect-all", NULL,
    87     N_("_Deselect All"), "<control>U", NULL, G_CALLBACK(action_cb) },
     87    N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
    8888  { "edit-preferences", GTK_STOCK_PREFERENCES,
    89     N_("Edit _Preferences"), NULL, NULL, G_CALLBACK(action_cb) },
    90   { "show-torrent-inspector", GTK_STOCK_INFO,
    91     N_("_Torrent Info"), NULL, NULL, G_CALLBACK(action_cb) },
     89    NULL, NULL, NULL, G_CALLBACK(action_cb) },
     90  { "show-torrent-properties", GTK_STOCK_PROPERTIES,
     91    NULL, "<alt>Return", NULL, G_CALLBACK(action_cb) },
    9292  { "show-about-dialog", GTK_STOCK_ABOUT,
    9393    N_("_About Transmission"), NULL, NULL, G_CALLBACK(action_cb) },
    94   { "update-tracker", GTK_STOCK_REFRESH,
    95     N_("Update Tracker"), NULL, NULL, G_CALLBACK(action_cb) }
     94  { "update-tracker", GTK_STOCK_NETWORK,
     95    N_("Ask Tracker for More Peers"), NULL, NULL, G_CALLBACK(action_cb) }
    9696};
    9797
  • trunk/gtk/dialogs.c

    r3333 r3352  
    116116makeaddwind( GtkWindow * parent, TrCore * core )
    117117{
    118   GtkWidget *wind = gtk_file_chooser_dialog_new(_("Add a Torrent"), parent,
     118  GtkWidget *wind = gtk_file_chooser_dialog_new(_("Open Torrent"), parent,
    119119    GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
    120120    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  • trunk/gtk/main.c

    r3350 r3352  
    202202    action_sensitize( "start-torrent", (status & TR_STATUS_INACTIVE) != 0);
    203203    action_sensitize( "remove-torrent", status != 0);
    204     action_sensitize( "recheck-torrent", status != 0);
    205     action_sensitize( "show-torrent-inspector", status != 0);
     204    action_sensitize( "verify-torrent", status != 0);
     205    action_sensitize( "show-torrent-properties", status != 0);
    206206
    207207    status = 0;
     
    994994        changed |= gtk_tree_selection_count_selected_rows( s ) != 0;
    995995    }
    996     else if (!strcmp (action_name, "recheck-torrent"))
     996    else if (!strcmp (action_name, "verify-torrent"))
    997997    {
    998998        GtkTreeSelection * s = tr_window_get_selection(data->wind);
     
    10001000        changed |= gtk_tree_selection_count_selected_rows( s ) != 0;
    10011001    }
    1002     else if (!strcmp (action_name, "show-torrent-inspector"))
     1002    else if (!strcmp (action_name, "show-torrent-properties"))
    10031003    {
    10041004        GtkTreeSelection * s = tr_window_get_selection(data->wind);
  • trunk/gtk/makemeta-ui.c

    r3350 r3352  
    251251        g_snprintf( name, sizeof(name), "%s:", _("_File"));
    252252
    253         w = gtk_file_chooser_dialog_new (_("File or Directory to Add to the New Torrent"),
    254                                          NULL,
    255                                          GTK_FILE_CHOOSER_ACTION_OPEN,
    256                                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
    257                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
    258                                          NULL);
     253        w = gtk_file_chooser_dialog_new ( NULL,
     254                                          NULL,
     255                                          GTK_FILE_CHOOSER_ACTION_OPEN,
     256                                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
     257                                          GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
     258                                          NULL );
    259259        g_signal_connect( w, "map", G_CALLBACK(file_chooser_shown_cb), rb_dir );
    260260        w = gtk_file_chooser_button_new_with_dialog( w );
  • trunk/gtk/msgwin.c

    r3206 r3352  
    230230
    231231  win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
    232   gtk_window_set_title( GTK_WINDOW( win ), "Transmission Debug Window" );
     232  gtk_window_set_title( GTK_WINDOW( win ), _( "Debug Window" ) );
    233233  gtk_window_set_default_size( GTK_WINDOW( win ), 600, 400 );
    234234  gtk_window_set_role( GTK_WINDOW( win ), "debug-window" );
  • trunk/gtk/torrent-inspector.c

    r3350 r3352  
    15981598
    15991599  /* create the dialog */
    1600   pch = _( "Torrent Info" );
     1600  size = readablesize( info->totalSize );
     1601  pch = g_strdup_printf( _( "Properties for %s (%s)" ), info->name, size );
    16011602  d = gtk_dialog_new_with_buttons (pch, parent, 0,
    16021603                                   GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
     
    16051606  g_signal_connect (d, "response", G_CALLBACK (response_cb), gtor);
    16061607  g_object_weak_ref (G_OBJECT(gtor), torrent_destroyed, d);
    1607 
    1608 
    1609   /* add label with file name and size */
    1610   size = readablesize( info->totalSize );
    1611   pch = g_markup_printf_escaped( "<b><big>%s</big>\n%s</b>", info->name, size );
    1612   w = gtk_label_new (NULL);
    1613   gtk_label_set_markup (GTK_LABEL(w), pch);
    1614   gtk_label_set_justify (GTK_LABEL(w), GTK_JUSTIFY_CENTER);
    1615   gtk_misc_set_alignment (GTK_MISC(w), 0.5f, 0.5f);
    1616   gtk_box_pack_start (GTK_BOX(GTK_DIALOG(d)->vbox), w, 0, 0, GUI_PAD);
    1617   g_free (pch);
    1618   g_free (size);
     1608  g_free( pch );
     1609  g_free( size );
    16191610
    16201611  /* add the notebook */
  • trunk/gtk/tr_torrent.c

    r3206 r3352  
    560560        case TR_STATUS_CHECK_WAIT:
    561561            prog = st->recheckProgress * 100.0; /* [0...100] */
    562             top = g_strdup_printf( _("Waiting to check existing files (checked %.1f%%)"), prog );
     562            top = g_strdup_printf( _("Waiting to verify local files (%.1f%% tested)"), prog );
    563563            break;
    564564
    565565        case TR_STATUS_CHECK:
    566566            prog = st->recheckProgress * 100.0; /* [0...100] */
    567             top = g_strdup_printf( _("Checking existing files (checked %.1f%%)"), prog );
     567            top = g_strdup_printf( _("Verifying local files (%.1f%% tested)"), prog );
    568568            break;
    569569
  • trunk/gtk/tr_window.c

    r2856 r3352  
    174174                     gpointer            user_data  UNUSED )
    175175{
    176     action_activate( "show-torrent-inspector" );
     176    action_activate( "show-torrent-properties" );
    177177}
    178178
  • trunk/gtk/ui.h

    r3350 r3352  
    22"<ui>\n"
    33"  <menubar name='main-window-menu'>\n"
    4 "    <menu action='file-menu'>\n"
     4"    <menu action='torrent-menu'>\n"
    55"      <menuitem action='add-torrent'/>\n"
    66"      <menuitem action='start-torrent'/>\n"
    77"      <menuitem action='update-tracker'/>\n"
    88"      <menuitem action='pause-torrent'/>\n"
    9 "      <menuitem action='recheck-torrent'/>\n"
     9"      <menuitem action='verify-torrent'/>\n"
    1010"      <menuitem action='remove-torrent'/>\n"
     11"      <menuitem action='show-torrent-properties'/>\n"
    1112"      <separator/>\n"
    1213"      <menuitem action='create-torrent'/>\n"
     
    1920"      <menuitem action='unselect-all'/>\n"
    2021"      <separator/>\n"
    21 "      <menuitem action='show-torrent-inspector'/>\n"
    2222"      <menuitem action='edit-preferences'/>\n"
    2323"    </menu>\n"
     
    3535"    <toolitem action='remove-torrent'/>\n"
    3636"    <separator/>\n"
    37 "    <toolitem action='show-torrent-inspector'/>\n"
     37"    <toolitem action='show-torrent-properties'/>\n"
    3838"  </toolbar>\n"
    3939"\n"
    4040"  <popup name='main-window-popup'>\n"
    41 "    <menuitem action='show-torrent-inspector'/>\n"
     41"    <menuitem action='show-torrent-properties'/>\n"
    4242"    <separator/>\n"
    4343"    <menuitem action='start-torrent'/>\n"
    4444"    <menuitem action='pause-torrent'/>\n"
    45 "    <menuitem action='recheck-torrent'/>\n"
     45"    <menuitem action='verify-torrent'/>\n"
    4646"    <separator/>\n"
    4747"    <menuitem action='remove-torrent'/>\n"
Note: See TracChangeset for help on using the changeset viewer.