(gtk) #677: hig tweaks
This commit is contained in:
parent
1ed9e15ee0
commit
d5ecdefc2c
|
@ -101,8 +101,12 @@ static GtkActionEntry entries[] =
|
||||||
{ "sort-menu", NULL, N_("_Sort Torrents By"), NULL, NULL, NULL },
|
{ "sort-menu", NULL, N_("_Sort Torrents By"), NULL, NULL, NULL },
|
||||||
{ "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
|
{ "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
|
||||||
{ "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
|
{ "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
|
||||||
{ "open-torrent", GTK_STOCK_OPEN,
|
{ "open-torrent-toolbar", GTK_STOCK_OPEN, N_("_Open"), NULL,
|
||||||
NULL, NULL, N_("Open Torrent"), G_CALLBACK(action_cb) },
|
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,
|
{ "start-torrent", GTK_STOCK_MEDIA_PLAY,
|
||||||
N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
|
N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "show-stats", NULL, N_("_Statistics"), NULL, NULL, G_CALLBACK(action_cb) },
|
{ "show-stats", NULL, N_("_Statistics"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
|
@ -112,10 +116,12 @@ static GtkActionEntry entries[] =
|
||||||
N_("_Pause"), "<control>P", NULL, G_CALLBACK(action_cb) },
|
N_("_Pause"), "<control>P", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "remove-torrent", GTK_STOCK_REMOVE,
|
{ "remove-torrent", GTK_STOCK_REMOVE,
|
||||||
N_("_Remove"), "<control>Delete", NULL, G_CALLBACK(action_cb) },
|
N_("_Remove"), "<control>Delete", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "create-torrent", GTK_STOCK_NEW,
|
{ "new-torrent", GTK_STOCK_NEW, N_("_New..."), NULL,
|
||||||
N_("Create _New Torrent"), NULL, NULL, G_CALLBACK(action_cb) },
|
N_("Create a new torrent"),
|
||||||
{ "close", GTK_STOCK_CLOSE,
|
G_CALLBACK(action_cb) },
|
||||||
N_("_Close"), "<control>W", NULL, G_CALLBACK(action_cb) },
|
{ "close", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
|
||||||
|
N_("Close main window"),
|
||||||
|
G_CALLBACK(action_cb) },
|
||||||
{ "quit", GTK_STOCK_QUIT,
|
{ "quit", GTK_STOCK_QUIT,
|
||||||
N_("_Quit"), "<control>Q", NULL, G_CALLBACK(action_cb) },
|
N_("_Quit"), "<control>Q", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "select-all", GTK_STOCK_SELECT_ALL,
|
{ "select-all", GTK_STOCK_SELECT_ALL,
|
||||||
|
|
|
@ -978,7 +978,7 @@ doAction ( const char * action_name, gpointer user_data )
|
||||||
GtkTreeSelection * s = tr_window_get_selection(data->wind);
|
GtkTreeSelection * s = tr_window_get_selection(data->wind);
|
||||||
gtk_tree_selection_selected_foreach( s, updateTrackerForeach, data->wind );
|
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 ),
|
GtkWidget * w = make_meta_ui( GTK_WINDOW( data->wind ),
|
||||||
tr_core_handle( data->core ) );
|
tr_core_handle( data->core ) );
|
||||||
|
|
|
@ -232,7 +232,7 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle )
|
||||||
MakeMetaUI * ui = g_new0 ( MakeMetaUI, 1 );
|
MakeMetaUI * ui = g_new0 ( MakeMetaUI, 1 );
|
||||||
ui->handle = handle;
|
ui->handle = handle;
|
||||||
|
|
||||||
d = gtk_dialog_new_with_buttons( _("Create New Torrent"),
|
d = gtk_dialog_new_with_buttons( _("New Torrent"),
|
||||||
parent,
|
parent,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||||
|
|
10
gtk/ui.h
10
gtk/ui.h
|
@ -2,8 +2,8 @@ const char * fallback_ui_file =
|
||||||
"<ui>\n"
|
"<ui>\n"
|
||||||
" <menubar name='main-window-menu'>\n"
|
" <menubar name='main-window-menu'>\n"
|
||||||
" <menu action='torrent-menu'>\n"
|
" <menu action='torrent-menu'>\n"
|
||||||
" <menuitem action='open-torrent'/>\n"
|
" <menuitem action='open-torrent-menu'/>\n"
|
||||||
" <menuitem action='create-torrent'/>\n"
|
" <menuitem action='new-torrent'/>\n"
|
||||||
" <separator/>\n"
|
" <separator/>\n"
|
||||||
" <menuitem action='start-torrent'/>\n"
|
" <menuitem action='start-torrent'/>\n"
|
||||||
" <menuitem action='update-tracker'/>\n"
|
" <menuitem action='update-tracker'/>\n"
|
||||||
|
@ -23,6 +23,7 @@ const char * fallback_ui_file =
|
||||||
" </menu>\n"
|
" </menu>\n"
|
||||||
" <menu action='view-menu'>\n"
|
" <menu action='view-menu'>\n"
|
||||||
" <menuitem action='minimal-view'/>\n"
|
" <menuitem action='minimal-view'/>\n"
|
||||||
|
" <separator/>\n"
|
||||||
" <menuitem action='show-toolbar'/>\n"
|
" <menuitem action='show-toolbar'/>\n"
|
||||||
" <menuitem action='show-filter-bar'/>\n"
|
" <menuitem action='show-filter-bar'/>\n"
|
||||||
" <menuitem action='show-status-bar'/>\n"
|
" <menuitem action='show-status-bar'/>\n"
|
||||||
|
@ -32,6 +33,7 @@ const char * fallback_ui_file =
|
||||||
" <menuitem action='sort-by-progress'/>\n"
|
" <menuitem action='sort-by-progress'/>\n"
|
||||||
" <menuitem action='sort-by-state'/>\n"
|
" <menuitem action='sort-by-state'/>\n"
|
||||||
" <menuitem action='sort-by-tracker'/>\n"
|
" <menuitem action='sort-by-tracker'/>\n"
|
||||||
|
" <separator/>\n"
|
||||||
" <menuitem action='sort-reversed'/>\n"
|
" <menuitem action='sort-reversed'/>\n"
|
||||||
" </menu>\n"
|
" </menu>\n"
|
||||||
" <menu action='help-menu'>\n"
|
" <menu action='help-menu'>\n"
|
||||||
|
@ -43,7 +45,7 @@ const char * fallback_ui_file =
|
||||||
" </menubar>\n"
|
" </menubar>\n"
|
||||||
"\n"
|
"\n"
|
||||||
" <toolbar name='main-window-toolbar'>\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='start-torrent'/>\n"
|
||||||
" <toolitem action='pause-torrent'/>\n"
|
" <toolitem action='pause-torrent'/>\n"
|
||||||
" <toolitem action='remove-torrent'/>\n"
|
" <toolitem action='remove-torrent'/>\n"
|
||||||
|
@ -63,7 +65,7 @@ const char * fallback_ui_file =
|
||||||
" </popup>\n"
|
" </popup>\n"
|
||||||
"\n"
|
"\n"
|
||||||
" <popup name='icon-popup'>\n"
|
" <popup name='icon-popup'>\n"
|
||||||
" <menuitem action='open-torrent'/>\n"
|
" <menuitem action='open-torrent-menu'/>\n"
|
||||||
" <separator/>\n"
|
" <separator/>\n"
|
||||||
" <menuitem action='toggle-main-window'/>\n"
|
" <menuitem action='toggle-main-window'/>\n"
|
||||||
" <menuitem action='toggle-message-log'/>\n"
|
" <menuitem action='toggle-message-log'/>\n"
|
||||||
|
|
Loading…
Reference in New Issue