GNOME.org
 

mnemonics patch

This adds mnemonics to things in the preferences dialog and the
bookmarks dialog.  Mixed in there somewhere I added an atk relation
between the location entry and its label.



? nautilus-mnemonics.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5241
diff -u -r1.5241 ChangeLog
--- ChangeLog	24 Apr 2002 14:40:35 -0000	1.5241
+++ ChangeLog	25 Apr 2002 00:15:35 -0000
@@ -1,3 +1,11 @@
+2002-04-24  Dave Camp  <dave@ximian.com>
+
+	* libnautilus-private/nautilus-global-preferences.c:
+	* src/nautilus-bookmarks-window.c: (create_bookmarks_window):
+	* src/nautilus-preferences-dialog.c: Added mnemonics.
+	* src/nautilus-location-bar.c: (nautilus_location_bar_init): Added
+	a relation between the Location label and entry.
+
 2002-04-24  Jody Goldberg <jody@gnome.org>
 
 	* src/file-manager/fm-list-model.c
Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.197
diff -u -r1.197 nautilus-global-preferences.c
--- libnautilus-private/nautilus-global-preferences.c	20 Apr 2002 21:11:26 -0000	1.197
+++ libnautilus-private/nautilus-global-preferences.c	25 Apr 2002 00:15:40 -0000
@@ -134,11 +134,11 @@
 
 static EelEnumerationEntry click_policy_enum_entries[] = {
 	{ "single",
-	  N_("Activate items with a single click"),
+	  N_("Activate items with a _single click"),
 	  NAUTILUS_CLICK_POLICY_SINGLE
 	},
 	{ "double",
-	  N_("Activate items with a double click"),
+	  N_("Activate items with a _double click"),
 	  NAUTILUS_CLICK_POLICY_DOUBLE
 	},
 	{ NULL }
@@ -146,15 +146,15 @@
 
 static EelEnumerationEntry executable_text_activation_enum_entries[] = {
 	{ "launch",
-	  N_("Execute files when they are clicked"),
+	  N_("E_xecute files when they are clicked"),
 	  NAUTILUS_EXECUTABLE_TEXT_LAUNCH
 	},
 	{ "display",
-	  N_("Display files when they are clicked"),
+	  N_("Display _files when they are clicked"),
 	  NAUTILUS_EXECUTABLE_TEXT_DISPLAY
 	},
 	{ "ask",
-	  N_("Ask each time"),
+	  N_("_Ask each time"),
 	  NAUTILUS_EXECUTABLE_TEXT_ASK
 	},
 	{ NULL }
Index: src/nautilus-bookmarks-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmarks-window.c,v
retrieving revision 1.63
diff -u -r1.63 nautilus-bookmarks-window.c
--- src/nautilus-bookmarks-window.c	7 Mar 2002 19:36:03 -0000	1.63
+++ src/nautilus-bookmarks-window.c	25 Apr 2002 00:15:40 -0000
@@ -204,7 +204,7 @@
 	gtk_widget_show (vbox3);
 	gtk_box_pack_start (GTK_BOX (right_side), vbox3, FALSE, FALSE, 0);
 
-	name_label = gtk_label_new (_("Name"));
+	name_label = gtk_label_new_with_mnemonic (_("_Name"));
 	gtk_widget_show (name_label);
 	gtk_box_pack_start (GTK_BOX (vbox3), name_label, FALSE, FALSE, 0);
 
@@ -213,11 +213,13 @@
 	gtk_box_pack_start (GTK_BOX (vbox3), name_field, FALSE, FALSE, 0);
 	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE);
 	
+	gtk_label_set_mnemonic_widget (GTK_LABEL (name_label), name_field);
+
 	vbox4 = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (vbox4);
 	gtk_box_pack_start (GTK_BOX (right_side), vbox4, FALSE, FALSE, 0);
 
-	url_label = gtk_label_new (_("Location"));
+	url_label = gtk_label_new_with_mnemonic (_("_Location"));
 	gtk_widget_show (url_label);
 	gtk_box_pack_start (GTK_BOX (vbox4), url_label, FALSE, FALSE, 0);
 
@@ -225,6 +227,8 @@
 	gtk_widget_show (uri_field);
 	gtk_box_pack_start (GTK_BOX (vbox4), uri_field, FALSE, FALSE, 0);	
 	nautilus_undo_editable_set_undo_key (GTK_EDITABLE (uri_field), TRUE);
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (url_label), uri_field);
 
 	hbox2 = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox2);
Index: src/nautilus-location-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-location-bar.c,v
retrieving revision 1.84
diff -u -r1.84 nautilus-location-bar.c
--- src/nautilus-location-bar.c	25 Mar 2002 06:28:40 -0000	1.84
+++ src/nautilus-location-bar.c	25 Apr 2002 00:15:41 -0000
@@ -35,6 +35,7 @@
 
 #include "nautilus-window-private.h"
 #include "nautilus-window.h"
+#include <eel/eel-accessibility.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
@@ -746,6 +747,8 @@
 				 G_CALLBACK (editable_event_after_callback), bar, 0);
 
 	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+
+	eel_accessibility_set_up_label_widget_relation (label, entry);
 
 	gtk_container_add (GTK_CONTAINER (bar), hbox);
 
Index: src/nautilus-preferences-dialog.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-preferences-dialog.c,v
retrieving revision 1.31
diff -u -r1.31 nautilus-preferences-dialog.c
--- src/nautilus-preferences-dialog.c	23 Apr 2002 20:20:23 -0000	1.31
+++ src/nautilus-preferences-dialog.c	25 Apr 2002 00:15:41 -0000
@@ -53,7 +53,7 @@
 static EelPreferencesItemDescription appearance_items[] = {
 	{ N_("Fonts"),
 	  NAUTILUS_PREFERENCES_DEFAULT_FONT,
-	  N_("Default font:"),
+	  N_("_Default font:"),
 	  EEL_PREFERENCE_ITEM_FONT,
 	},
 	{ N_("Nautilus Themes"),
@@ -71,27 +71,27 @@
 static EelPreferencesItemDescription windows_items[] = {
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW,
-	  N_("Open each file or folder in a separate window"),
+	  N_("_Open each file or folder in a separate window"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_START_WITH_TOOLBAR,
-	  N_("Display toolbar in new windows"),
+	  N_("Display _toolbar in new windows"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR,
-	  N_("Display location bar in new windows"),
+	  N_("Display _location bar in new windows"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR,
-	  N_("Display status bar in new windows"),
+	  N_("Display _status bar in new windows"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Opening New Windows"),
 	  NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
-	  N_("Display sidebar in new windows"),
+	  N_("Display side_bar in new windows"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -100,22 +100,22 @@
 static EelPreferencesItemDescription desktop_and_trash_items[] = {
 	{ N_("Desktop"),
 	  NAUTILUS_PREFERENCES_SHOW_DESKTOP,
-	  N_("Use Nautilus to draw the desktop"),
+	  N_("Use Nautilus to draw the _desktop"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
         { N_("Desktop"),
 	  NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
-	  N_("Use your home folder as the desktop"),
+	  N_("Use your _home folder as the desktop"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Trash Behavior"),
 	  NAUTILUS_PREFERENCES_CONFIRM_TRASH,
-	  N_("Ask before emptying the Trash or deleting files"),
+	  N_("_Ask before emptying the Trash or deleting files"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Trash Behavior"),
 	  NAUTILUS_PREFERENCES_ENABLE_DELETE,
-	  N_("Include a Delete command that bypasses Trash"),
+	  N_("_Include a Delete command that bypasses Trash"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -134,22 +134,22 @@
 	},
 	{ N_("Show/Hide Options"),
 	  NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
-	  N_("Show hidden files (file names start with \".\")"),
+	  N_("Show _hidden files (file names start with \".\")"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Show/Hide Options"),
 	  NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-	  N_("Show backup files (file names end with \"~\")"),
+	  N_("Show _backup files (file names end with \"~\")"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Show/Hide Options"),
 	  NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS,
-	  N_("Show special flags in Properties window"),
+	  N_("Show special flags in _Properties window"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Sorting Order"),
 	  NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST,
-	  N_("Always list folders before files"),
+	  N_("Always _list folders before files"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -173,41 +173,41 @@
 static EelPreferencesItemDescription view_preferences_items[] = {
 	{ N_("Default View"),
 	  NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
-	  N_("View new folders using:"),
+	  N_("_View new folders using:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 
 	/* Icon View Defaults */
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT,
-	  N_("Arrange Items:"),
+	  N_("_Arrange Items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER,
-	  N_("Sort in reversed order"),
+	  N_("_Sort in reversed order"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_FONT,
-	  N_("Font:"),
+	  N_("_Font:"),
 	  EEL_PREFERENCE_ITEM_FONT
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
-	  N_("Default zoom level:"),
+	  N_("Default _zoom level:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU,
 	  NULL, 0, 1
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT,
-	  N_("Use tighter layout"),
+	  N_("Use _tighter layout"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN,
 	  NULL, 0, 1
 	},
 	{ N_("Icon View Defaults"),
 	  NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE,
-	  N_("Font size at default zoom level:"),
+	  N_("Font size at _default zoom level:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU,
 	  NULL, 0, 1
 	},
@@ -215,22 +215,22 @@
 	/* List View Defaults */
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER,
-	  N_("Arrange Items:"),
+	  N_("Arrange _Items:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU
 	},
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER,
-	  N_("Sort in reversed order"),
+	  N_("Sort in _reversed order"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_FONT,
-	  N_("Font:"),
+	  N_("Fo_nt:"),
 	  EEL_PREFERENCE_ITEM_FONT
 	},
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
-	  N_("Default zoom level:"),
+	  N_("Default zoo_m level:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU,
 	  NULL, 0, 1
 	},
@@ -242,7 +242,7 @@
 	},
 	{ N_("List View Defaults"),
 	  NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE,
-	  N_("Font size at default zoom level:"),
+	  N_("Font size at default zoom _level:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU,
 	  NULL, 0, 1
 	},
@@ -263,48 +263,48 @@
 static EelPreferencesItemDescription navigation_items[] = {
 	{ N_("Home"),
 	  NAUTILUS_PREFERENCES_HOME_URI,
-	  N_("Location:"),
+	  N_("_Location:"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_STRING
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_USE_PROXY,
-	  N_("Use HTTP Proxy"),
+	  N_("Use _HTTP Proxy"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_PROXY_HOST,
-	  N_("Location:"),
+	  N_("L_ocation:"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_STRING
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_PROXY_PORT,
-	  N_("Port:"),
+	  N_("_Port:"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_INTEGER
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_PROXY_USE_AUTH,
-	  N_("Proxy requires a username and password:"),
+	  N_("Proxy _requires a username and password:"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN,
 	  NAUTILUS_PREFERENCES_HTTP_USE_PROXY,
 	  EEL_PREFERENCE_ITEM_SHOW
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_PROXY_AUTH_USERNAME,
-	  N_("Username:"),
+	  N_("_Username:"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_STRING,
 	  NAUTILUS_PREFERENCES_HTTP_USE_PROXY,
 	  EEL_PREFERENCE_ITEM_SHOW
 	},
 	{ N_("HTTP Proxy Settings"),
 	  NAUTILUS_PREFERENCES_HTTP_USE_AUTH_PASSWORD,
-	  N_("Password:"),
+	  N_("Pass_word:"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_PASSWORD_STRING,
 	  NAUTILUS_PREFERENCES_HTTP_USE_PROXY,
 	  EEL_PREFERENCE_ITEM_SHOW
 	},
 	{ N_("Built-in Bookmarks"),
 	  NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS,
-	  N_("Don't include the built-in bookmarks in the Bookmarks menu"),
+	  N_("_Don't include the built-in bookmarks in the Bookmarks menu"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -328,7 +328,7 @@
 	},
 	{ N_("Show Thumbnails for Image Files"),
 	  NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
-	  N_("Don't make thumbnails for files larger than:"),
+	  N_("_Don't make thumbnails for files larger than:"),
 	  EEL_PREFERENCE_ITEM_ENUMERATION_MENU_INTEGER
 	},
 	{ N_("Preview Sound Files"),
@@ -358,7 +358,7 @@
 	},
 	{ N_("Tree"),
 	  NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
-	  N_("Show only folders (no files) in the tree"),
+	  N_("_Show only folders (no files) in the tree"),
 	  EEL_PREFERENCE_ITEM_BOOLEAN
 	},
 	{ NULL }
@@ -367,12 +367,12 @@
 static EelPreferencesItemDescription news_panel_items[] = {
 	{ N_("Maximum items per site"),
 	  NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS,
-	  N_("Maximum number of items displayed per site"),
+	  N_("_Maximum number of items displayed per site"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_INTEGER
 	},
 	{ N_("Update Minutes"),
 	  NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL,
-	  N_("Update frequency in minutes"),
+	  N_("_Update frequency in minutes"),
 	  EEL_PREFERENCE_ITEM_EDITABLE_INTEGER
 
 	},
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]