? capplets/mouse/gnome-settings-mouse.desktop
? capplets/sound/gnome-settings-sound.desktop
Index: capplets/keybindings/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/ChangeLog,v
retrieving revision 1.73
diff -u -r1.73 ChangeLog
--- a/capplets/keybindings/ChangeLog	16 Apr 2004 14:44:28 -0000	1.73
+++ b/capplets/keybindings/ChangeLog	10 May 2004 02:23:27 -0000
@@ -1,3 +1,13 @@
+2004-05-09  Michael Terry <mike@mterry.name>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=99529
+	* eggcellrendererkeys.c (convert_keysym_state_to_string) : use 
+	  Alt + F1 syntax instead of <Alt>F1 syntax.
+	* gnome-keybinding-properties.c : remove functions dealing with
+	  the keyboard theme
+	* gnome-keybinding-properties.glade : remove keyboard theme option
+	  box and keyboard shortcut label
+
 2004-04-16  Jody Goldberg <jody@gnome.org>
 
 	From paolo borelli :
Index: capplets/keybindings/eggcellrendererkeys.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/eggcellrendererkeys.c,v
retrieving revision 1.14
diff -u -r1.14 eggcellrendererkeys.c
--- a/capplets/keybindings/eggcellrendererkeys.c	15 Apr 2004 18:32:22 -0000	1.14
+++ b/capplets/keybindings/eggcellrendererkeys.c	10 May 2004 02:23:27 -0000
@@ -1,5 +1,6 @@
 #include <config.h>
 #include <libintl.h>
+#include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
@@ -18,7 +19,7 @@
 
 #define EGG_CELL_RENDERER_TEXT_PATH "egg-cell-renderer-text"
 
-#define TOOLTIP_TEXT _("<New accelerator...>")
+#define TOOLTIP_TEXT _("New accelerator...")
 
 static void             egg_cell_renderer_keys_finalize      (GObject             *object);
 static void             egg_cell_renderer_keys_init          (EggCellRendererKeys *cell_keys);
@@ -238,10 +239,37 @@
 				guint		       keycode,
                                 EggVirtualModifierType mask)
 {
-  if (keysym == 0 && keycode == 0)
+  if (keysym == 0 && keycode == 0) {
     return g_strdup (_("Disabled"));
-  else
-    return egg_virtual_accelerator_name (keysym, keycode, mask);
+  } else {
+    gchar *name = egg_virtual_accelerator_name (keysym, keycode, mask);
+    gchar *new_name, *p;
+    size_t size = strlen (name);
+    gint num_delimiters = 0;
+    gint i;
+    
+    for (i = 0; i < size; i++)
+      if (name[i] == '>')
+        num_delimiters++;
+    
+    /* size + 1 null char + 1 we add for each delimiter */
+    p = new_name = g_new (gchar, size + 1 + num_delimiters);
+    
+    for (i = 0; i < size; i++) {
+      if (name[i] != '<') {
+    	if (name[i] == '>') {
+    	  p = g_stpcpy (p, " + ");
+    	} else {
+    	  p[0] = name[i];
+    	  p++;
+    	}
+      }
+    }
+    p[0] = '\0';
+    g_free (name);
+    
+    return new_name;
+  }
 }
 
 static void
Index: capplets/keybindings/gnome-keybinding-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/gnome-keybinding-properties.c,v
retrieving revision 1.45
diff -u -r1.45 gnome-keybinding-properties.c
--- a/capplets/keybindings/gnome-keybinding-properties.c	16 Apr 2004 14:44:28 -0000	1.45
+++ b/capplets/keybindings/gnome-keybinding-properties.c	10 May 2004 02:23:27 -0000
@@ -18,7 +18,6 @@
 #include "activate-settings-daemon.h"
 
 #define LABEL_DATA "gnome-keybinding-properties-label"
-#define KEY_THEME_KEY "/desktop/gnome/interface/gtk_key_theme"
 #define MAX_ELEMENTS_BEFORE_SCROLLING 10
 
 #if defined(__powerpc__) && defined (__linux__)
@@ -175,48 +174,6 @@
   return submodel;
 }
 
-static void
-menu_item_activate (GtkWidget *menu_item,
-		    gpointer   unused)
-{
-  gchar *key_theme;
-  gchar *current_key_theme;
-  GConfClient *client;
-  GError *error = NULL;
-
-  client = gconf_client_get_default ();
-
-  key_theme = g_object_get_data (G_OBJECT (menu_item), LABEL_DATA);
-  g_return_if_fail (key_theme != NULL);
-
-  current_key_theme = gconf_client_get_string (client, KEY_THEME_KEY, &error);
-  if (current_key_theme && strcmp (current_key_theme, key_theme))
-    {
-      gconf_client_set_string (client, KEY_THEME_KEY, key_theme, NULL);
-    }
-}
-
-static GtkWidget *
-make_key_theme_menu_item (const gchar *key_theme)
-{
-  GtkWidget *retval;
-
-  if (!strcmp (key_theme, "Default"))
-    {
-      retval = gtk_menu_item_new_with_label (_("GNOME Default"));
-      g_object_set_data_full (G_OBJECT (retval), LABEL_DATA, g_strdup ("Default"), g_free);
-    }
-  else
-    {
-      retval = gtk_menu_item_new_with_label (key_theme);
-      g_object_set_data_full (G_OBJECT (retval), LABEL_DATA, g_strdup (key_theme), g_free);
-    }
-  g_signal_connect (G_OBJECT (retval), "activate", G_CALLBACK (menu_item_activate), NULL);
-  gtk_widget_show (retval);
-
-  return retval;
-}
-
 static GladeXML *
 create_dialog (void)
 {
@@ -615,48 +572,6 @@
   reload_key_entries (wm_common_get_current_window_manager(), user_data);
 }
 
-static void
-key_theme_changed (GConfClient *client,
-		   guint        cnxn_id,
-		   GConfEntry  *entry,
-		   gpointer     user_data)
-{
-  GtkWidget *omenu = (GtkWidget *) user_data;
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  GConfValue *value;
-  const gchar *new_key_theme;
-  GList *list;
-  gint i = 0;
-
-  menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (omenu));
-  value = gconf_entry_get_value (entry);
-
-  g_return_if_fail (value != NULL);
-
-  new_key_theme = gconf_value_get_string (value);
-
-  for (list = GTK_MENU_SHELL (menu)->children; list; list = list->next, i++)
-    {
-      gchar *text;
-
-      menu_item = GTK_WIDGET (list->data);
-      text = g_object_get_data (G_OBJECT (menu_item), LABEL_DATA);
-      if (! strcmp (text, new_key_theme))
-	{
-	  if (gtk_option_menu_get_history (GTK_OPTION_MENU (omenu)) != i)
-	    gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), i);
-	  return;
-	}
-    }
-
-  /* We didn't find our theme.  Add it to our list. */
-  menu_item = make_key_theme_menu_item (new_key_theme);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);  
-  gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), i);
-}
-
-
 static gboolean
 cb_check_for_uniqueness (GtkTreeModel *model,
 			 GtkTreePath  *path,
@@ -833,49 +748,6 @@
     }
 }
 
-static void
-theme_changed_func (gpointer  uri,
-		    GladeXML *dialog)
-{
-  GConfClient *client;
-  GtkWidget *omenu;
-  GtkWidget *menu;
-  GtkWidget *menu_item;
-  GConfEntry *entry;
-  GList *key_theme_list;
-  GList *list;
-
-  client = gconf_client_get_default ();
-  key_theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2_KEYBINDING);
-
-  omenu = WID ("key_theme_omenu");
-  menu = gtk_menu_new ();
-  for (list = key_theme_list; list; list = list->next)
-    {
-      GnomeThemeInfo *info = list->data;
-
-      if (! info->has_keybinding)
-	continue;
-
-      menu_item = make_key_theme_menu_item (info->name);
-      if (!strcmp (info->name, "Default"))
-      /* Put default first, always */
-        gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item);
-      else
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-    }
-
-  gtk_widget_show (menu);
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-
-  /* Initialize the option menu */
-  entry = gconf_client_get_entry (client,
-				  KEY_THEME_KEY,
-				  NULL, TRUE, NULL);
-
-  key_theme_changed (client, 0, entry, omenu);
-}
-
 
 typedef struct
 {
@@ -945,50 +817,12 @@
 setup_dialog (GladeXML *dialog)
 {
   GConfClient *client;
-  GList *key_theme_list;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   GtkWidget *widget;
-  gboolean found_keys = FALSE;
-  GList *list;
 
   client = gconf_client_get_default ();
 
-  key_theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2_KEYBINDING);
-
-  for (list = key_theme_list; list; list = list->next)
-    {
-      GnomeThemeInfo *info = list->data;
-      if (info->has_keybinding)
-	{
-	  found_keys = TRUE;
-	  break;
-	}
-
-    }
-  if (! found_keys)
-    {
-      GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, 0,
-						      GTK_MESSAGE_ERROR,
-						      GTK_BUTTONS_OK,
-						      _("Unable to find any keyboard themes.  This means your GTK+ "
-							"installation has been incompletely installed."));
-      gtk_dialog_run (GTK_DIALOG (msg_dialog));
-      gtk_widget_destroy (msg_dialog);
-
-    }
-  else
-    {
-      theme_changed_func (NULL, dialog);
-      gnome_theme_info_register_theme_change ((GFunc) theme_changed_func, dialog);
-      gconf_client_add_dir (client, "/desktop/gnome/interface", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-      gconf_client_notify_add (client,
-			       KEY_THEME_KEY,
-			       (GConfClientNotifyFunc) &key_theme_changed,
-			       WID ("key_theme_omenu"), NULL, NULL);
-    }
-
-
   g_signal_connect (GTK_TREE_VIEW (WID ("shortcut_treeview")),
 		    "button_press_event",
 		    G_CALLBACK (start_editing_cb), dialog),
Index: capplets/keybindings/gnome-keybinding-properties.glade
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/gnome-keybinding-properties.glade,v
retrieving revision 1.16
diff -u -r1.16 gnome-keybinding-properties.glade
--- a/capplets/keybindings/gnome-keybinding-properties.glade	31 Mar 2004 22:29:29 -0000	1.16
+++ b/capplets/keybindings/gnome-keybinding-properties.glade	10 May 2004 02:23:27 -0000
@@ -65,90 +65,12 @@
 	  <property name="spacing">12</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="shortcut_hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label8">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Text editing shortcuts:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">key_theme_omenu</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkOptionMenu" id="key_theme_omenu">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">-1</property>
-		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_description" translatable="yes">Click for a list of keyboard navigation schemes.</atkproperty>
-		  </accessibility>
-
-		  <child>
-		    <widget class="GtkMenu" id="menu1">
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkVBox" id="shortcuts_vbox">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Desktop shortcuts:</property>
-		  <property name="use_underline">True</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">shortcut_treeview</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkScrolledWindow" id="actions_swindow">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
@@ -162,7 +84,7 @@
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="headers_visible">True</property>
-		      <property name="rules_hint">False</property>
+		      <property name="rules_hint">True</property>
 		      <property name="reorderable">False</property>
 		      <property name="enable_search">True</property>
 		    </widget>
@@ -202,7 +124,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label12">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">To edit a shortcut, click on the corresponding row and type a new accelerator, or press backspace to clear.</property>
+		      <property name="label" translatable="yes">To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear.</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_FILL</property>
Index: schemas/apps_gnome_settings_daemon_keybindings.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/schemas/apps_gnome_settings_daemon_keybindings.schemas.in,v
retrieving revision 1.2
diff -u -r1.2 apps_gnome_settings_daemon_keybindings.schemas.in
--- a/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	14 Jan 2004 00:22:54 -0000	1.2
+++ b/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	10 May 2004 02:23:28 -0000
@@ -55,8 +55,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Log Out</short>
-                <long>Log Out's shortcut.</long>
+                <short>Log out</short>
+                <long>Log out's shortcut.</long>
             </locale>
         </schema>
 
@@ -79,8 +79,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Home Folder</short>
-                <long>My Home Folder's shortcut.</long>
+                <short>Home folder</short>
+                <long>Home folder's shortcut.</long>
             </locale>
         </schema>
 
@@ -127,8 +127,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Lock Screen</short>
-                <long>Lock Screen's shortcut.</long>
+                <short>Lock screen</short>
+                <long>Lock screen's shortcut.</long>
             </locale>
         </schema>
 
@@ -139,8 +139,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Launch Help Browser</short>
-                <long>Launch Help Browser's shortcut.</long>
+                <short>Launch help browser</short>
+                <long>Launch help browser's shortcut.</long>
             </locale>
         </schema>
 
@@ -151,8 +151,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Launch Web Browser</short>
-                <long>Launch Web Browser's shortcut.</long>
+                <short>Launch web browser</short>
+                <long>Launch web browser's shortcut.</long>
             </locale>
         </schema>
 
@@ -187,8 +187,8 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Play (or Play/Pause)</short>
-                <long>Play (or Play/Pause) key's shortcut.</long>
+                <short>Play (or play/pause)</short>
+                <long>Play (or play/pause) key's shortcut.</long>
             </locale>
         </schema>
 
@@ -223,7 +223,7 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Skip to Previous track</short>
+                <short>Skip to previous track</short>
                 <long>Previous track key's shortcut.</long>
             </locale>
         </schema>
@@ -235,7 +235,7 @@
             <type>string</type>
             <default></default>
             <locale name="C">
-                <short>Skip to Next track</short>
+                <short>Skip to next track</short>
                 <long>Next track key's shortcut.</long>
             </locale>
         </schema>
