Changeset 7106

Timestamp:

Nov 13, 2008, 4:10:04 AM (12 years ago)

Author:

charles

Message:

(gtk) #1453: follow Gnome HIG; the "details" dialog should be a "properties" dialog

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• details.c (modified) (1 diff)
• file-list.c (modified) (3 diffs)
• main.c (modified) (2 diffs)
• tr-window.c (modified) (1 diff)
• ui.h (modified) (2 diffs)

trunk/gtk/actions.c

@@ -153 +153 @@
     { "edit-preferences",     GTK_STOCK_PREFERENCES, NULL,
       NULL,            NULL,                   G_CALLBACK( action_cb ) },
-    { "show-torrent-details", GTK_STOCK_INFO,
-      N_( "_Details" ), "<alt>Return", N_( "Torrent details" ), G_CALLBACK(
-          action_cb ) },
+    { "show-torrent-properties", GTK_STOCK_PROPERTIES,
+      NULL, "<alt>Return", N_( "Torrent properties" ), G_CALLBACK( action_cb ) },
     { "open-torrent-folder",  GTK_STOCK_OPEN,
       N_( "_Open Folder" ), NULL, NULL, G_CALLBACK( action_cb ) },

trunk/gtk/details.c

@@ -1478 +1478 @@
     GtkWidget *     d, *n, *w;
     tr_torrent *    tor = tr_torrent_handle ( gtor );
-    char            sizeStr[64];
     char            title[512];
     const tr_info * info = tr_torrent_info ( gtor );
 
     /* create the dialog */
-    tr_strlsize( sizeStr, info->totalSize, sizeof( sizeStr ) );
-    /* %1$s is torrent name
-       %2$s its file size */
-    g_snprintf( title, sizeof( title ), _(
-                    "Details for %1$s (%2$s)" ), info->name, sizeStr );
+    g_snprintf( title, sizeof( title ), _( "%s Properties" ), info->name );
     d = gtk_dialog_new_with_buttons ( title, parent, 0,
                                       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

trunk/gtk/file-list.c

@@ -795 +795 @@
                                                 "expand", TRUE,
                                                 /* Translators: this is a column
-                                                   header in Files tab, Details
+                                                   header in Files tab, Properties
                                                    dialog;
                                                    Don't include the prefix
@@ -817 +817 @@
 
     rend = gtk_cell_renderer_progress_new( );
-    /* Translators: this is a column header in Files tab, Details dialog;
+    /* Translators: this is a column header in Files tab, Properties dialog;
        Don't include the prefix "filedetails|" in the translation. */
     col = gtk_tree_view_column_new_with_attributes( Q_( "filedetails|Progress" ), rend, NULL );
@@ -826 +826 @@
     /* add "enabled" column */
     rend = gtk_cell_renderer_toggle_new( );
-    /* Translators: this is a column header in Files tab, Details dialog;
+    /* Translators: this is a column header in Files tab, Properties dialog;
        Don't include the prefix "filedetails|" in the translation.
        The items for this column are checkboxes (yes/no) */

trunk/gtk/main.c

@@ -221 +221 @@
     action_sensitize( "verify-torrent", counts.totalCount != 0 );
     action_sensitize( "open-torrent-folder", counts.totalCount == 1 );
-    action_sensitize( "show-torrent-details", counts.totalCount == 1 );
+    action_sensitize( "show-torrent-properties", counts.totalCount == 1 );
 
     canUpdate = 0;
@@ -1485 +1485 @@
         gtk_tree_selection_selected_foreach( s, openFolderForeach, data );
     }
-    else if( !strcmp ( action_name, "show-torrent-details" ) )
+    else if( !strcmp ( action_name, "show-torrent-properties" ) )
     {
         GtkTreeSelection * s = tr_window_get_selection( data->wind );

trunk/gtk/tr-window.c

@@ -129 +129 @@
                     gpointer            user_data UNUSED )
 {
-    action_activate( "show-torrent-details" );
+    action_activate( "show-torrent-properties" );
 }
 

trunk/gtk/ui.h

@@ -6 +6 @@
     "      <menuitem action='new-torrent'/>\n"
     "      <separator/>\n"
-    "      <menuitem action='show-torrent-details'/>\n"
+    "      <menuitem action='show-torrent-properties'/>\n"
     "      <menuitem action='open-torrent-folder'/>\n"
     "      <separator/>\n"
@@ -56 +56 @@
     "    <toolitem action='remove-torrent'/>\n"
     "    <separator/>\n"
-    "    <toolitem action='show-torrent-details'/>\n"
+    "    <toolitem action='show-torrent-properties'/>\n"
     "  </toolbar>\n"
     "\n"
     "  <popup name='main-window-popup'>\n"
-    "    <menuitem action='show-torrent-details'/>\n"
+    "    <menuitem action='show-torrent-properties'/>\n"
     "    <menuitem action='open-torrent-folder'/>\n"
     "    <separator/>\n"