From 10f3ca3f50ad25ecf493e46154e92a2888ae84f1 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 21 Jun 2005 15:09:34 +0000 Subject: [PATCH] 2005-06-21 Robert Love * gnome/applet/applet.c: use menu mnemonics. * gnome/applet/menu-items.c: (ditto) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@730 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ gnome/applet/applet.c | 17 ++++++++--------- gnome/applet/menu-items.c | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8b4563e6a..0c4c81ffb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-21 Robert Love + + * gnome/applet/applet.c: use menu mnemonics. + * gnome/applet/menu-items.c: (ditto) + 2005-06-21 Robert Love * applet/applet-dbus-devices.c: mark non-static functions static. diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 39f5b69c0b..98537df33a 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -161,7 +161,7 @@ static GObject *nmwa_constructor (GType type, guint n_props, GObjectConstructPar void nmwa_about_cb (NMWirelessApplet *applet) -{ +{ GdkPixbuf *pixbuf; char *file; GtkWidget *about_dialog; @@ -223,7 +223,6 @@ void nmwa_about_cb (NMWirelessApplet *applet) #endif } - typedef struct DialogCBData { char *msg; @@ -1330,7 +1329,7 @@ static void nmwa_menu_add_custom_essid_item (GtkWidget *menu, NMWirelessApplet * GtkWidget *label; menu_item = gtk_menu_item_new (); - label = gtk_label_new (_("Connect to Other Wireless Network...")); + label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network...")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_container_add (GTK_CONTAINER (menu_item), label); gtk_widget_show_all (menu_item); @@ -1351,7 +1350,7 @@ static void nmwa_menu_add_create_network_item (GtkWidget *menu, NMWirelessApplet GtkWidget *label; menu_item = gtk_menu_item_new (); - label = gtk_label_new (_("Create New Wireless Network...")); + label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network...")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_container_add (GTK_CONTAINER (menu_item), label); gtk_widget_show_all (menu_item); @@ -1766,12 +1765,12 @@ static void nmwa_context_menu_update (NMWirelessApplet *applet) if (applet->wireless_enabled) { - applet->stop_wireless_item = gtk_image_menu_item_new_with_label (_("Stop All Wireless Devices")); + applet->stop_wireless_item = gtk_image_menu_item_new_with_mnemonic (_("_Stop All Wireless Devices")); image = gtk_image_new_from_stock (GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); } else { - applet->stop_wireless_item = gtk_image_menu_item_new_with_label (_("Start All Wireless Devices")); + applet->stop_wireless_item = gtk_image_menu_item_new_with_mnemonic (_("_Start All Wireless Devices")); image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU); } g_signal_connect (G_OBJECT (applet->stop_wireless_item), "activate", G_CALLBACK (nmwa_set_wireless_enabled_cb), applet); @@ -1802,7 +1801,7 @@ static GtkWidget *nmwa_context_menu_create (NMWirelessApplet *applet) /* Construct the wireless scanning submenu */ applet->scan_method = nmwa_gconf_get_wireless_scan_method (applet); - applet->scanning_item = gtk_menu_item_new_with_label (_("Wireless Network Discovery")); + applet->scanning_item = gtk_menu_item_new_with_mnemonic (_("_Wireless Network Discovery")); applet->scanning_menu = gtk_menu_new (); scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Always Search"))); @@ -1838,14 +1837,14 @@ static GtkWidget *nmwa_context_menu_create (NMWirelessApplet *applet) nmwa_menu_add_separator_item (menu); - menu_item = gtk_image_menu_item_new_with_label (_("Help")); + menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Help")); /* g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (nmwa_help_cb), applet); */ image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE); - menu_item = gtk_image_menu_item_new_with_label (_("About")); + menu_item = gtk_image_menu_item_new_with_mnemonic (_("_About")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (nmwa_about_cb), applet); image = gtk_image_new_from_stock (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image); diff --git a/gnome/applet/menu-items.c b/gnome/applet/menu-items.c index 47595909c2..6689591aa3 100644 --- a/gnome/applet/menu-items.c +++ b/gnome/applet/menu-items.c @@ -85,9 +85,9 @@ void wired_menu_item_update (NMWiredMenuItem *item, NetworkDevice *dev, const gi if (n_devices > 1) text = g_strdup_printf (_("Wired Network (%s)"), dev_name); else - text = g_strdup (_("Wired Network")); + text = g_strdup (_("_Wired Network")); - gtk_label_set_text (GTK_LABEL (item->label), text); + gtk_label_set_text_with_mnemonic (GTK_LABEL (item->label), text); /* Only dim the item if the device supports carrier detection AND * we know it doesn't have a link.