ekiga r6610 - in trunk: . lib/gui src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Thu Aug 14 12:16:17 2008
New Revision: 6610
URL: http://svn.gnome.org/viewvc/ekiga?rev=6610&view=rev

Log:
Applied patch from Fabrice Alphonso to fix missing accessibility for
top-level elements. Added new shortcuts. Thanks.


Modified:
   trunk/ChangeLog
   trunk/lib/gui/gmmenuaddon.c
   trunk/src/gui/main.cpp

Modified: trunk/lib/gui/gmmenuaddon.c
==============================================================================
--- trunk/lib/gui/gmmenuaddon.c	(original)
+++ trunk/lib/gui/gmmenuaddon.c	Thu Aug 14 12:16:17 2008
@@ -343,7 +343,7 @@
 
       if (menu [i].accel && accel)
 	{
-        if (menu [i].accel == GDK_F1)
+/*        if ((menu [i].accel == GDK_F1) || (menu [i].accel == GDK_F11))
           gtk_widget_add_accelerator (menu [i].widget, "activate", 
                                       accel, menu [i].accel, 
                                       0, GTK_ACCEL_VISIBLE);
@@ -351,6 +351,25 @@
           gtk_widget_add_accelerator (menu [i].widget, "activate", 
                                       accel, menu [i].accel, 
                                       GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+*/
+	  switch (menu [i].accel) {
+		case GDK_F1:
+		case GDK_F11:
+		case GDK_Escape:
+		case GDK_h:
+		case GDK_t:
+		case GDK_m:
+		case GDK_p:
+          		gtk_widget_add_accelerator (menu [i].widget, "activate",
+                                      accel, menu [i].accel,
+                                      0, GTK_ACCEL_VISIBLE);
+			break;
+		default:
+          		gtk_widget_add_accelerator (menu [i].widget, "activate",
+                                      accel, menu [i].accel,
+                                      GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+			break;
+	  }		
 	}
 
       if (menu [i].func) {

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Thu Aug 14 12:16:17 2008
@@ -1688,37 +1688,37 @@
   
   static MenuEntry gnomemeeting_menu [] =
     {
-      GTK_MENU_NEW (_("C_hat")),
+      GTK_MENU_NEW (_("_Chat")),
 
       GTK_MENU_ENTRY("connect", _("Ca_ll"), _("Place a new call"), 
 		     GM_STOCK_PHONE_PICK_UP_16, 'o',
 		     GTK_SIGNAL_FUNC (place_call_cb), main_window, TRUE),
       GTK_MENU_ENTRY("disconnect", _("_Hang up"),
 		     _("Terminate the current call"), 
-		     GM_STOCK_PHONE_HANG_UP_16, 'd',
+ 		     GM_STOCK_PHONE_HANG_UP_16, GDK_Escape,
 		     GTK_SIGNAL_FUNC (hangup_call_cb), main_window, FALSE),
 
       GTK_MENU_SEPARATOR,
 
-      GTK_MENU_ENTRY("add_contact", _("_Add Contact"), _("Add a contact to the roster"),
-		     GTK_STOCK_ADD, 'a', 
+      GTK_MENU_ENTRY("add_contact", _("A_dd Contact"), _("Add a contact to the roster"),
+		     GTK_STOCK_ADD, 'n', 
 		     GTK_SIGNAL_FUNC (pull_trigger_cb), local_cluster_trigger, true),
 
       GTK_MENU_THEME_ENTRY("address_book", _("_Find Contacts"),
 			   _("Find contacts"),
-			   GTK_STOCK_FIND, 'F',
+ 			   GTK_STOCK_FIND, 'f',
 			   GTK_SIGNAL_FUNC (show_widget_cb),
 			   (gpointer) addressbook_window, TRUE),
 
       GTK_MENU_SEPARATOR,
 
-      GTK_MENU_ENTRY("hold_call", _("_Hold Call"), _("Hold the current call"),
-		     NULL, 'g', 
+      GTK_MENU_ENTRY("hold_call", _("H_old Call"), _("Hold the current call"),
+		     NULL, GDK_h, 
 		     GTK_SIGNAL_FUNC (hold_current_call_cb), main_window,
 		     FALSE),
       GTK_MENU_ENTRY("transfer_call", _("_Transfer Call"),
 		     _("Transfer the current call"),
-		     NULL, 't', 
+ 		     NULL, GDK_t, 
 		     GTK_SIGNAL_FUNC (transfer_current_call_cb), main_window, 
 		     FALSE),
 
@@ -1726,12 +1726,12 @@
 
       GTK_MENU_ENTRY("suspend_audio", _("Suspend _Audio"),
 		     _("Suspend or resume the audio transmission"),
-		     NULL, 0,
+		     NULL, GDK_m,
 		     GTK_SIGNAL_FUNC (toggle_audio_stream_pause_cb),
 		     main_window, FALSE),
       GTK_MENU_ENTRY("suspend_video", _("Suspend _Video"),
 		     _("Suspend or resume the video transmission"),
-		     NULL, 0, 
+		     NULL, GDK_p, 
 		     GTK_SIGNAL_FUNC (toggle_video_stream_pause_cb),
 		     main_window, FALSE),
 
@@ -1750,7 +1750,7 @@
 
       GTK_MENU_NEW (_("_Edit")),
 
-      GTK_MENU_ENTRY("configuration_assistant", _("Configuration Assistant"),
+      GTK_MENU_ENTRY("configuration_assistant", _("_Configuration Assistant"),
 		     _("Run the configuration assistant"),
 		     NULL, 0, 
 		     G_CALLBACK (show_assistant_window_cb),
@@ -1766,7 +1766,7 @@
 
       GTK_MENU_ENTRY("preferences", NULL,
 		     _("Change your preferences"), 
-		     GTK_STOCK_PREFERENCES, 'P',
+		     GTK_STOCK_PREFERENCES, 0,
 		     G_CALLBACK (show_prefs_window_cb),
 		     NULL, TRUE),
 
@@ -1790,35 +1790,35 @@
 
       GTK_MENU_SEPARATOR,
 
-      GTK_MENU_TOGGLE_ENTRY("callpanel", _("Show Call Panel"), _("Show the call panel"),
-                            NULL, 'C', 
+      GTK_MENU_TOGGLE_ENTRY("callpanel", _("_Show Call Panel"), _("Show the call panel"),
+                            NULL, 'J', 
                             GTK_SIGNAL_FUNC (toggle_menu_changed_cb),
                             (gpointer) USER_INTERFACE_KEY "main_window/show_call_panel", 
                             show_call_panel, TRUE),
 
       GTK_MENU_SEPARATOR,
 
-      GTK_MENU_RADIO_ENTRY("local_video", _("Local Video"),
+      GTK_MENU_RADIO_ENTRY("local_video", _("_Local Video"),
 			   _("Local video image"),
-			   NULL, 0, 
+			   NULL, '1', 
 			   GTK_SIGNAL_FUNC (display_changed_cb),
 			   (gpointer) VIDEO_DISPLAY_KEY "video_view",
 			   TRUE, FALSE),
-      GTK_MENU_RADIO_ENTRY("remote_video", _("Remote Video"),
+      GTK_MENU_RADIO_ENTRY("remote_video", _("_Remote Video"),
 			   _("Remote video image"),
-			   NULL, 0, 
+			   NULL, '2', 
 			   GTK_SIGNAL_FUNC (display_changed_cb), 
 			   (gpointer) VIDEO_DISPLAY_KEY "video_view",
 			   FALSE, FALSE),
-      GTK_MENU_RADIO_ENTRY("both_incrusted", _("Picture-in-Picture"),
+      GTK_MENU_RADIO_ENTRY("both_incrusted", _("_Picture-in-Picture"),
 			   _("Both video images"),
-			   NULL, 0, 
+			   NULL, '3', 
 			   GTK_SIGNAL_FUNC (display_changed_cb), 
 			   (gpointer) VIDEO_DISPLAY_KEY "video_view",
 			   FALSE, FALSE),
-      GTK_MENU_RADIO_ENTRY("both_incrusted_window", _("Picture-in-Picture in Separate Window"),
+      GTK_MENU_RADIO_ENTRY("both_incrusted_window", _("Picture-in-Picture in Separate _Window"),
 			   _("Both video images"),
-			   NULL, 0, 
+			   NULL, '4', 
 			   GTK_SIGNAL_FUNC (display_changed_cb), 
 			   (gpointer) VIDEO_DISPLAY_KEY "video_view",
 			   FALSE, FALSE),
@@ -1833,11 +1833,11 @@
 		     GTK_SIGNAL_FUNC (zoom_out_changed_cb),
 		     (gpointer) VIDEO_DISPLAY_KEY "zoom", FALSE),
       GTK_MENU_ENTRY("normal_size", NULL, _("Normal size"), 
-		     GTK_STOCK_ZOOM_100, '=',
+		     GTK_STOCK_ZOOM_100, '0',
 		     GTK_SIGNAL_FUNC (zoom_normal_changed_cb),
 		     (gpointer) VIDEO_DISPLAY_KEY "zoom", FALSE),
-      GTK_MENU_ENTRY("fullscreen", _("Fullscreen"), _("Switch to fullscreen"), 
-		     GTK_STOCK_ZOOM_IN, 'f', 
+      GTK_MENU_ENTRY("fullscreen", _("_Fullscreen"), _("Switch to fullscreen"), 
+		     GTK_STOCK_ZOOM_IN, GDK_F11, 
 		     GTK_SIGNAL_FUNC (fullscreen_changed_cb),
 		     (gpointer) main_window, FALSE),