Mercurial > gftp.yaz
changeset 771:d966cf89a820
2006-7-19 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.c - added patch that makes the menus closer to other
GNOME apps (from Alan Horkan <horkana@maths.tcd.ie>) (closes #329826)
| author | masneyb |
|---|---|
| date | Thu, 20 Jul 2006 01:46:43 +0000 |
| parents | eeb471438232 |
| children | 9a6477042520 |
| files | ChangeLog src/gtk/gftp-gtk.c |
| diffstat | 2 files changed, 51 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 20 01:28:53 2006 +0000 +++ b/ChangeLog Thu Jul 20 01:46:43 2006 +0000 @@ -1,4 +1,7 @@ 2006-7-19 Brian Masney <masneyb@gftp.org> + * src/gtk/gftp-gtk.c - added patch that makes the menus closer to other + GNOME apps (from Alan Horkan <horkana@maths.tcd.ie>) (closes #329826) + * src/gtk/transfer.c (remove_file) - fixes for when the viewed file can be removed if an invalid program is specified (closes #330182) @@ -3422,7 +3425,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.442 2006/07/20 01:28:48 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.443 2006/07/20 01:46:42 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/gftp-gtk.c Thu Jul 20 01:28:53 2006 +0000 +++ b/src/gtk/gftp-gtk.c Thu Jul 20 01:46:43 2006 +0000 @@ -243,98 +243,98 @@ static GtkItemFactoryEntry menu_items[] = { {N_("/_FTP"), NULL, 0, 0, MN_("<Branch>")}, {N_("/FTP/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/FTP/Window 1"), NULL, change_setting, GFTP_MENU_ITEM_WIN1, + {N_("/FTP/Window _1"), NULL, change_setting, GFTP_MENU_ITEM_WIN1, MN_("<RadioItem>")}, - {N_("/FTP/Window 2"), NULL, change_setting, GFTP_MENU_ITEM_WIN2, + {N_("/FTP/Window _2"), NULL, change_setting, GFTP_MENU_ITEM_WIN2, MN_("/FTP/Window 1")}, {N_("/FTP/sep"), NULL, 0, 0, MN_("<Separator>")}, - {N_("/FTP/Ascii"), NULL, change_setting, GFTP_MENU_ITEM_ASCII, + {N_("/FTP/_Ascii"), NULL, change_setting, GFTP_MENU_ITEM_ASCII, MN_("<RadioItem>")}, - {N_("/FTP/Binary"), NULL, change_setting, GFTP_MENU_ITEM_BINARY, + {N_("/FTP/_Binary"), NULL, change_setting, GFTP_MENU_ITEM_BINARY, MN_("/FTP/Ascii")}, {N_("/FTP/sep"), NULL, 0, 0, MN_("<Separator>")}, - {N_("/FTP/_Options..."), "<control>O", options_dialog, 0, + {N_("/FTP/_Preferences..."), NULL, options_dialog, 0, MS_(GTK_STOCK_PREFERENCES)}, {N_("/FTP/sep"), NULL, 0, 0, MN_("<Separator>")}, {N_("/FTP/_Quit"), "<control>Q", _gftp_menu_exit, 0, MS_(GTK_STOCK_QUIT)}, {N_("/_Local"), NULL, 0, 0, MN_("<Branch>")}, {N_("/Local/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Local/Open URL..."), "", openurl_dialog, 0, MS_(GTK_STOCK_OPEN)}, - {N_("/Local/Disconnect"), "", gftpui_disconnect, 0, MS_(GTK_STOCK_CLOSE)}, + {N_("/Local/Open _URL..."), "", openurl_dialog, 0, MS_(GTK_STOCK_OPEN)}, + {N_("/Local/_Disconnect"), "", gftpui_disconnect, 0, MS_(GTK_STOCK_CLOSE)}, {N_("/Local/sep"), NULL, 0, 0, MN_("<Separator>")}, {N_("/Local/Change Filespec..."), NULL, change_filespec, 0, MN_(NULL)}, - {N_("/Local/Show selected"), NULL, show_selected, 0, MN_(NULL)}, - {N_("/Local/Select All"), NULL, selectall, 0, MN_(NULL)}, + {N_("/Local/_Show selected"), NULL, show_selected, 0, MN_(NULL)}, + {N_("/Local/Select _All"), NULL, selectall, 0, MN_(NULL)}, {N_("/Local/Select All Files"), NULL, selectallfiles, 0, MN_(NULL)}, {N_("/Local/Deselect All"), NULL, deselectall, 0, MN_(NULL)}, {N_("/Local/sep"), NULL, 0, 0, MN_("<Separator>")}, {N_("/Local/Save Directory Listing..."), NULL, save_directory_listing, 0, MN_(NULL)}, {N_("/Local/Send SITE Command..."), NULL, gftpui_site_dialog, 0, MN_(NULL)}, {N_("/Local/Change Directory"), NULL, gftpui_chdir_dialog, 0, MN_(NULL)}, - {N_("/Local/Chmod..."), NULL, chmod_dialog, 0, MN_(NULL)}, - {N_("/Local/Make Directory..."), NULL, gftpui_mkdir_dialog, 0, MN_(NULL)}, - {N_("/Local/Rename..."), NULL, gftpui_rename_dialog, 0, MN_(NULL)}, + {N_("/Local/_Permissions..."), NULL, chmod_dialog, 0, MN_(NULL)}, + {N_("/Local/_New Folder..."), "<control><shift>N", gftpui_mkdir_dialog, 0, MN_(NULL)}, + {N_("/Local/Re_name..."), "F2", gftpui_rename_dialog, 0, MN_(NULL)}, {N_("/Local/Delete..."), NULL, delete_dialog, 0, MN_(NULL)}, - {N_("/Local/Edit..."), NULL, edit_dialog, 0, MN_(NULL)}, - {N_("/Local/View..."), NULL, view_dialog, 0, MN_(NULL)}, - {N_("/Local/Refresh"), NULL, gftp_gtk_refresh, 0, MS_(GTK_STOCK_REFRESH)}, + {N_("/Local/_Edit..."), NULL, edit_dialog, 0, MN_(NULL)}, + {N_("/Local/_View..."), NULL, view_dialog, 0, MN_(NULL)}, + {N_("/Local/_Refresh"), NULL, gftp_gtk_refresh, 0, MS_(GTK_STOCK_REFRESH)}, {N_("/_Remote"), NULL, 0, 0, MN_("<Branch>")}, {N_("/Remote/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, {N_("/Remote/Open _URL..."), "<control>U", openurl_dialog, 0, MS_(GTK_STOCK_OPEN)}, - {N_("/Remote/Disconnect"), "<control>D", gftpui_disconnect, 0, + {N_("/Remote/_Disconnect"), "<control>D", gftpui_disconnect, 0, MS_(GTK_STOCK_CLOSE)}, {N_("/Remote/sep"), NULL, 0, 0, MN_("<Separator>")}, {N_("/Remote/Change Filespec..."), NULL, change_filespec, 0, MN_(NULL)}, - {N_("/Remote/Show selected"), NULL, show_selected, 0, MN_(NULL)}, - {N_("/Remote/Select All"), NULL, selectall, 0, MN_(NULL)}, + {N_("/Remote/_Show selected"), NULL, show_selected, 0, MN_(NULL)}, + {N_("/Remote/Select _All"), NULL, selectall, 0, MN_(NULL)}, {N_("/Remote/Select All Files"), NULL, selectallfiles, 0, MN_(NULL)}, {N_("/Remote/Deselect All"), NULL, deselectall, 0, MN_(NULL)}, {N_("/Remote/sep"), NULL, 0, 0, MN_("<Separator>")}, {N_("/Remote/Save Directory Listing..."), NULL, save_directory_listing, 0, MN_(NULL)}, {N_("/Remote/Send SITE Command..."), NULL, gftpui_site_dialog, 0, MN_(NULL)}, {N_("/Remote/Change Directory"), NULL, gftpui_chdir_dialog, 0, MN_(NULL)}, - {N_("/Remote/Chmod..."), NULL, chmod_dialog, 0, MN_(NULL)}, - {N_("/Remote/Make Directory..."), NULL, gftpui_mkdir_dialog, 0, MN_(NULL)}, - {N_("/Remote/Rename..."), NULL, gftpui_rename_dialog, 0, MN_(NULL)}, + {N_("/Remote/_Permisssions..."), NULL, chmod_dialog, 0, MN_(NULL)}, + {N_("/Remote/_New Folder..."), NULL, gftpui_mkdir_dialog, 0, MN_(NULL)}, + {N_("/Remote/Re_name..."), NULL, gftpui_rename_dialog, 0, MN_(NULL)}, {N_("/Remote/Delete..."), NULL, delete_dialog, 0, MN_(NULL)}, - {N_("/Remote/Edit..."), NULL, edit_dialog, 0, MN_(NULL)}, - {N_("/Remote/View..."), NULL, view_dialog, 0, MN_(NULL)}, - {N_("/Remote/Refresh"), NULL, gftp_gtk_refresh, 0, MS_(GTK_STOCK_REFRESH)}, + {N_("/Remote/_Edit..."), NULL, edit_dialog, 0, MN_(NULL)}, + {N_("/Remote/_View..."), NULL, view_dialog, 0, MN_(NULL)}, + {N_("/Remote/_Refresh"), NULL, gftp_gtk_refresh, 0, MS_(GTK_STOCK_REFRESH)}, {N_("/_Bookmarks"), NULL, 0, 0, MN_("<Branch>")}, {N_("/Bookmarks/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Bookmarks/Add bookmark"), "<control>B", add_bookmark, 0, + {N_("/Bookmarks/Add _Bookmark"), "<control>B", add_bookmark, 0, MS_(GTK_STOCK_ADD)}, - {N_("/Bookmarks/Edit bookmarks"), NULL, edit_bookmarks, 0, MN_(NULL)}, + {N_("/Bookmarks/Edit Bookmarks"), NULL, edit_bookmarks, 0, MN_(NULL)}, {N_("/Bookmarks/sep"), NULL, 0, 0, MN_("<Separator>")}, - {N_("/_Transfers"), NULL, 0, 0, MN_("<Branch>")}, - {N_("/Transfers/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Transfers/Start Transfer"), NULL, start_transfer, 0, MN_(NULL)}, - {N_("/Transfers/Stop Transfer"), NULL, stop_transfer, 0, + {N_("/_Transfer"), NULL, 0, 0, MN_("<Branch>")}, + {N_("/Transfer/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, + {N_("/Transfer/Start"), NULL, start_transfer, 0, MN_(NULL)}, + {N_("/Transfer/Stop"), NULL, stop_transfer, 0, MS_(GTK_STOCK_STOP)}, - {N_("/Transfers/sep"), NULL, 0, 0, MN_("<Separator>")}, - {N_("/Transfers/Skip Current File"), NULL, skip_transfer, 0, MN_(NULL)}, - {N_("/Transfers/Remove File"), NULL, remove_file_transfer, 0, + {N_("/Transfer/sep"), NULL, 0, 0, MN_("<Separator>")}, + {N_("/Transfer/Skip Current File"), NULL, skip_transfer, 0, MN_(NULL)}, + {N_("/Transfer/Remove File"), NULL, remove_file_transfer, 0, MS_(GTK_STOCK_DELETE)}, - {N_("/Transfers/Move File Up"), NULL, move_transfer_up, 0, + {N_("/Transfer/Move File Up"), NULL, move_transfer_up, 0, MS_(GTK_STOCK_GO_UP)}, - {N_("/Transfers/Move File Down"), NULL, move_transfer_down, 0, + {N_("/Transfer/Move File Down"), NULL, move_transfer_down, 0, MS_(GTK_STOCK_GO_DOWN)}, - {N_("/Transfers/sep"), NULL, 0, 0, MN_("<Separator>")}, - {N_("/Transfers/Retrieve Files"), "<control>R", get_files, 0, MN_(NULL)}, - {N_("/Transfers/Put Files"), "<control>P", put_files, 0, MN_(NULL)}, - {N_("/L_ogging"), NULL, 0, 0, MN_("<Branch>")}, - {N_("/Logging/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Logging/Clear"), NULL, clearlog, 0, MS_(GTK_STOCK_CLEAR)}, - {N_("/Logging/View log"), NULL, viewlog, 0, MN_(NULL)}, - {N_("/Logging/Save log..."), NULL, savelog, 0, MS_(GTK_STOCK_SAVE)}, + {N_("/Transfer/sep"), NULL, 0, 0, MN_("<Separator>")}, + {N_("/Transfer/Retrieve Files"), "<control>R", get_files, 0, MN_(NULL)}, + {N_("/Transfer/Put Files"), "<control>P", put_files, 0, MN_(NULL)}, + {N_("/L_og"), NULL, 0, 0, MN_("<Branch>")}, + {N_("/Log/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, + {N_("/Log/_Clear"), NULL, clearlog, 0, MS_(GTK_STOCK_CLEAR)}, + {N_("/Log/_View"), NULL, viewlog, 0, MN_(NULL)}, + {N_("/Log/_Save..."), NULL, savelog, 0, MS_(GTK_STOCK_SAVE)}, {N_("/Tool_s"), NULL, 0, 0, MN_("<Branch>")}, {N_("/Tools/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Tools/Compare Windows"), NULL, compare_windows, 0, MN_(NULL)}, - {N_("/Tools/Clear Cache"), NULL, clear_cache, 0, MS_(GTK_STOCK_CLEAR)}, + {N_("/Tools/C_ompare Windows"), NULL, compare_windows, 0, MN_(NULL)}, + {N_("/Tools/_Clear Cache"), NULL, clear_cache, 0, MS_(GTK_STOCK_CLEAR)}, {N_("/Help"), NULL, 0, 0, MN_("<Branch>")}, {N_("/Help/tearoff"), NULL, 0, 0, MN_("<Tearoff>")}, - {N_("/Help/About"), NULL, about_dialog, 0, MS_(GTK_STOCK_HELP)} + {N_("/Help/_About"), NULL, about_dialog, 0, MS_(GTK_STOCK_ABOUT)} }; menus = menu_items; @@ -365,7 +365,7 @@ create_item_factory (factory, len, menu_items + i, &window2); i += len; - /* Transfers Menu */ + /* Transfer Menu */ trans_start = i; trans_len = 12; create_item_factory (factory, trans_len, menu_items + i, NULL);