Changeset 4911

Timestamp:

Feb 3, 2008, 5:10:03 PM (14 years ago)

Author:

charles

Message:

(gtk) #677: hig tweaks

Location:

trunk/gtk

Files:

• actions.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• makemeta-ui.c (modified) (1 diff)
• ui.h (modified) (5 diffs)

trunk/gtk/actions.c

@@ -102 +102 @@
   { "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
   { "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
-  { "open-torrent", GTK_STOCK_OPEN,
-    NULL, NULL, N_("Open Torrent"), G_CALLBACK(action_cb) },
+  { "open-torrent-toolbar", GTK_STOCK_OPEN, N_("_Open"), NULL,
+    N_("Open an existing torrent"),
+    G_CALLBACK(action_cb) },
+  { "open-torrent-menu", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",
+    N_("Open an existing torrent"),
+    G_CALLBACK(action_cb) },
   { "start-torrent", GTK_STOCK_MEDIA_PLAY,
     N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
@@ -113 +117 @@
   { "remove-torrent", GTK_STOCK_REMOVE,
     N_("_Remove"), "<control>Delete", NULL, G_CALLBACK(action_cb) },
-  { "create-torrent", GTK_STOCK_NEW,
-    N_("Create _New Torrent"), NULL, NULL, G_CALLBACK(action_cb) },
-  { "close", GTK_STOCK_CLOSE,
-    N_("_Close"), "<control>W", NULL, G_CALLBACK(action_cb) },
+  { "new-torrent", GTK_STOCK_NEW, N_("_New..."), NULL,
+    N_("Create a new torrent"),
+    G_CALLBACK(action_cb) },
+  { "close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+    N_("Close main window"),
+    G_CALLBACK(action_cb) },
   { "quit", GTK_STOCK_QUIT,
     N_("_Quit"), "<control>Q", NULL, G_CALLBACK(action_cb) },

trunk/gtk/main.c

@@ -979 +979 @@
         gtk_tree_selection_selected_foreach( s, updateTrackerForeach, data->wind );
     }
-    else if (!strcmp (action_name, "create-torrent"))
+    else if (!strcmp (action_name, "new-torrent"))
     {
         GtkWidget * w = make_meta_ui( GTK_WINDOW( data->wind ),

trunk/gtk/makemeta-ui.c

@@ -233 +233 @@
     ui->handle = handle;
 
-    d = gtk_dialog_new_with_buttons( _("Create New Torrent"),
+    d = gtk_dialog_new_with_buttons( _("New Torrent"),
                                      parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,

trunk/gtk/ui.h

@@ -3 +3 @@
 "  <menubar name='main-window-menu'>\n"
 "    <menu action='torrent-menu'>\n"
-"      <menuitem action='open-torrent'/>\n"
-"      <menuitem action='create-torrent'/>\n"
+"      <menuitem action='open-torrent-menu'/>\n"
+"      <menuitem action='new-torrent'/>\n"
 "      <separator/>\n"
 "      <menuitem action='start-torrent'/>\n"
@@ -24 +24 @@
 "    <menu action='view-menu'>\n"
 "      <menuitem action='minimal-view'/>\n"
+"      <separator/>\n"
 "      <menuitem action='show-toolbar'/>\n"
 "      <menuitem action='show-filter-bar'/>\n"
@@ -33 +34 @@
 "      <menuitem action='sort-by-state'/>\n"
 "      <menuitem action='sort-by-tracker'/>\n"
+"      <separator/>\n"
 "      <menuitem action='sort-reversed'/>\n"
 "    </menu>\n"
@@ -44 +46 @@
 "\n"
 "  <toolbar name='main-window-toolbar'>\n"
-"    <toolitem action='open-torrent'/>\n"
+"    <toolitem action='open-torrent-toolbar'/>\n"
 "    <toolitem action='start-torrent'/>\n"
 "    <toolitem action='pause-torrent'/>\n"
@@ -64 +66 @@
 "\n"
 "  <popup name='icon-popup'>\n"
-"    <menuitem action='open-torrent'/>\n"
+"    <menuitem action='open-torrent-menu'/>\n"
 "    <separator/>\n"
 "    <menuitem action='toggle-main-window'/>\n"