new version of the layout chooser

svn path=/trunk/; revision=7426

capplets/keyboard/ChangeLog

@@ -1,3 +1,10 @@
+2007-03-27  Sergey Udaltsov <svu@gnome.org>
+
+	* gnome-keyboard-properties-xkb.h, gnome-keyboard-properties-xkbpv.c,
+	gnome-keyboard-properties.glade, gnome-keyboard-properties-xkbltadd.c:
+	new version of the layout chooser, comboboxentry-based. Fully
+	functional (I hope).
+
 2007-03-21  Sergey Udaltsov <svu@gnome.org>
 
 	* gnome-keyboard-properties-xkblt.c, Makefile.am,

capplets/keyboard/gnome-keyboard-properties-xkb.h

@@ -84,7 +84,7 @@ extern GtkWidget *xkb_layout_preview_create_widget (GladeXML *
 
 extern void xkb_layout_preview_update (GladeXML * chooser_dialog);
 
-extern gchar *xkb_layout_chooser_get_selected_id (GladeXML *
+extern const gchar *xkb_layout_chooser_get_selected_id (GladeXML *
 							chooser_dialog);
 
 G_END_DECLS

capplets/keyboard/gnome-keyboard-properties-xkbltadd.c

@@ -25,6 +25,8 @@
 #  include <config.h>
 #endif
 
+#include <string.h>
+
 #include <gnome.h>
 #include <glade/glade.h>
 
@@ -36,174 +38,256 @@
 
 #define GROUP_SWITCHERS_GROUP "grp"
 #define DEFAULT_GROUP_SWITCH "grp:alts_toggle"
+#define DEFAULT_VARIANT_ID "__default__"
 
-#define AVAIL_LAYOUT_TREE_COL_DESCRIPTION 0
+#define COMBO_BOX_MODEL_COL_DESCRIPTION 0
-#define AVAIL_LAYOUT_TREE_COL_ID 1
+#define COMBO_BOX_MODEL_COL_ID 1
-
+#define COMBO_BOX_MODEL_COL_SORTING 2
-static GtkTreeIter current1st_level_iter;
-static const char *current1st_level_id;
 
 static void
-add_variant_to_available_layouts_tree (XklConfigRegistry * config_registry,
+ xkb_layout_chooser_available_layouts_fill (GladeXML * chooser_dialog);
-				       XklConfigItem * config_item,
+
-				       GladeXML * chooser_dialog)
+static void
+ xkb_layout_chooser_available_variants_fill (GladeXML * chooser_dialog);
+
+static void
+xkb_layout_chooser_add_variant_to_available_variants (XklConfigRegistry *
+						      config_registry,
+						      XklConfigItem *
+						      config_item,
+						      GladeXML *
+						      chooser_dialog)
 {
-	GtkWidget *layouts_tree = CWID ("xkb_layouts_available");
+	GtkWidget *cbe = CWID ("xkb_variants_available");
 	GtkTreeIter iter;
+	GtkTreeModel *model =
+	    gtk_combo_box_get_model (GTK_COMBO_BOX (cbe));
 	GtkTreeStore *tree_store =
-	    GTK_TREE_STORE (gtk_tree_view_get_model
+	    GTK_TREE_STORE (gtk_tree_model_sort_get_model
-			    (GTK_TREE_VIEW (layouts_tree)));
+			    (GTK_TREE_MODEL_SORT (model)));
-	const gchar *full_layout_name =
+
-	    gkbd_keyboard_config_merge_items (current1st_level_id,
+	gtk_tree_store_append (tree_store, &iter, NULL);
-					      config_item->name);
+	if (config_item != NULL) {
 		char *utf_variant_name = xci_desc_to_utf8 (config_item);
 
-	gtk_tree_store_append (tree_store, &iter, &current1st_level_iter);
 		gtk_tree_store_set (tree_store, &iter,
-			    AVAIL_LAYOUT_TREE_COL_DESCRIPTION,
+				    COMBO_BOX_MODEL_COL_DESCRIPTION,
-			    utf_variant_name, AVAIL_LAYOUT_TREE_COL_ID,
+				    utf_variant_name,
-			    full_layout_name, -1);
+				    COMBO_BOX_MODEL_COL_ID,
+				    config_item->name,
+				    COMBO_BOX_MODEL_COL_SORTING,
+				    utf_variant_name, -1);
 		g_free (utf_variant_name);
+	} else {
+		gtk_tree_store_set (tree_store, &iter,
+				    COMBO_BOX_MODEL_COL_DESCRIPTION,
+				    _("default"), COMBO_BOX_MODEL_COL_ID,
+				    DEFAULT_VARIANT_ID,
+				    COMBO_BOX_MODEL_COL_SORTING, "_", -1);
+		gtk_tree_store_append (tree_store, &iter, NULL);
+		gtk_tree_store_set (tree_store, &iter,
+				    COMBO_BOX_MODEL_COL_DESCRIPTION,
+				    "***", COMBO_BOX_MODEL_COL_ID,
+				    DEFAULT_VARIANT_ID,
+				    COMBO_BOX_MODEL_COL_SORTING, "__", -1);
+	}
 }
 
 static void
-add_layout_to_available_layouts_tree (XklConfigRegistry * config_registry,
+xkb_layout_chooser_add_layout_to_available_layouts (XklConfigRegistry *
-				      XklConfigItem * config_item,
+						    config_registry,
-				      GladeXML * chooser_dialog)
+						    XklConfigItem *
+						    config_item,
+						    GladeXML *
+						    chooser_dialog)
 {
-	GtkWidget *layouts_tree = CWID ("xkb_layouts_available");
+	GtkWidget *cbe = CWID ("xkb_layouts_available");
 	GtkTreeStore *tree_store =
-	    GTK_TREE_STORE (gtk_tree_view_get_model
+	    GTK_TREE_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (cbe)));
-			    (GTK_TREE_VIEW (layouts_tree)));
-	char *utf_layout_name = xci_desc_to_utf8 (config_item);
 
-	gtk_tree_store_append (tree_store, &current1st_level_iter, NULL);
+	char *utf_layout_name = xci_desc_to_utf8 (config_item);
-	gtk_tree_store_set (tree_store, &current1st_level_iter,
+	GtkTreeIter iter;
-			    AVAIL_LAYOUT_TREE_COL_DESCRIPTION,
+
-			    utf_layout_name, AVAIL_LAYOUT_TREE_COL_ID,
+	gtk_tree_store_append (tree_store, &iter, NULL);
+	gtk_tree_store_set (tree_store, &iter,
+			    COMBO_BOX_MODEL_COL_DESCRIPTION,
+			    utf_layout_name, COMBO_BOX_MODEL_COL_ID,
 			    config_item->name, -1);
 	g_free (utf_layout_name);
-
-	current1st_level_id = config_item->name;
-
-	xkl_config_registry_foreach_layout_variant (config_registry,
-						    config_item->name,
-						    (ConfigItemProcessFunc)
-						    add_variant_to_available_layouts_tree,
-						    chooser_dialog);
 }
 
 static void
 xkb_layout_chooser_enable_disable_buttons (GladeXML * chooser_dialog)
 {
-	GtkWidget *available_layouts_tree = CWID ("xkb_layouts_available");
+	GtkWidget *cbel = CWID ("xkb_layouts_available");
-	GtkTreeSelection *selection =
+	GtkWidget *cbev = CWID ("xkb_variants_available");
-	    gtk_tree_view_get_selection (GTK_TREE_VIEW
+	gboolean enable_ok =
-					 (available_layouts_tree));
+	    (gtk_combo_box_get_active (GTK_COMBO_BOX (cbel)) != -1)
-	const int n_selected_available_layouts =
+	    && (gtk_combo_box_get_active (GTK_COMBO_BOX (cbev)) != -1);
-	    gtk_tree_selection_count_selected_rows (selection);
 
 	gtk_dialog_set_response_sensitive (GTK_DIALOG
 					   (CWID ("xkb_layout_chooser")),
-					   GTK_RESPONSE_OK,
+					   GTK_RESPONSE_OK, enable_ok);
-					   n_selected_available_layouts >
-					   0);
 }
 
 static void
-xkb_layout_chooser_selection_changed (GladeXML * chooser_dialog)
+xkb_layout_chooser_available_variant_changed (GladeXML * chooser_dialog)
 {
 	xkb_layout_preview_update (chooser_dialog);
 	xkb_layout_chooser_enable_disable_buttons (chooser_dialog);
 }
 
 static void
-sort_tree_content (GtkWidget * tree_view)
+xkb_layout_chooser_available_layout_changed (GladeXML * chooser_dialog)
 {
-	GtkTreeModel *tree_model =
+	xkb_layout_chooser_available_variants_fill (chooser_dialog);
-	    gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
+	xkb_layout_chooser_available_variant_changed (chooser_dialog);
-	GtkTreeModel *sorted_tree_model;
-	/* replace the store with the sorted version */
-	sorted_tree_model =
-	    gtk_tree_model_sort_new_with_model (tree_model);
-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
-					      (sorted_tree_model), 0,
-					      GTK_SORT_ASCENDING);
-	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
-				 sorted_tree_model);
 }
 
 static void
-xkb_layouts_fill_available_tree (GladeXML * chooser_dialog)
+xkb_layout_chooser_sort_combo_box (GtkWidget * combo_box, int sort_column)
 {
-	GtkTreeStore *tree_store =
+	GtkTreeModel *model =
-	    gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+	    gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
-	GtkWidget *tree_view = CWID ("xkb_layouts_available");
+	/* replace the store with the sorted version */
-	GtkCellRenderer *renderer =
+	GtkTreeModel *sorted_model =
-	    GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
+	    gtk_tree_model_sort_new_with_model (model);
-	GtkTreeViewColumn *column =
+	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
-	    gtk_tree_view_column_new_with_attributes (NULL,
+					      (sorted_model),
-						      renderer,
+					      sort_column,
-						      "text",
+					      GTK_SORT_ASCENDING);
-						      AVAIL_LAYOUT_TREE_COL_DESCRIPTION,
+	gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), sorted_model);
-						      NULL);
+}
-	GtkTreeSelection *selection =
-	    gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
 
-	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+static gboolean
-				 GTK_TREE_MODEL (tree_store));
+xkl_layout_chooser_separate_default_variant (GtkTreeModel * model,
-	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+					     GtkTreeIter * iter,
+					     GladeXML * chooser_dialog)
+{
+	GtkTreePath *path = gtk_tree_model_get_path (model, iter);
+	gint *idxs = gtk_tree_path_get_indices (path);
+	gint idx = idxs[0];
+	gtk_tree_path_free (path);
+	return idx == 1;
+}
+
+static void
+xkb_layout_chooser_available_variants_fill (GladeXML * chooser_dialog)
+{
+	GtkWidget *cbel = CWID ("xkb_layouts_available");
+	GtkWidget *cbev = CWID ("xkb_variants_available");
+	GtkTreeModel *model =
+	    gtk_combo_box_get_model (GTK_COMBO_BOX (cbev));
+	gint selected_layout_idx;
+
+	if (model == NULL) {
+		model =
+		    GTK_TREE_MODEL (gtk_tree_store_new
+				    (3, G_TYPE_STRING, G_TYPE_STRING,
+				     G_TYPE_STRING));
+
+		gtk_combo_box_set_model (GTK_COMBO_BOX (cbev),
+					 GTK_TREE_MODEL (model));
+
+		gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY
+						     (cbev),
+						     COMBO_BOX_MODEL_COL_DESCRIPTION);
+
+		xkb_layout_chooser_sort_combo_box (cbev,
+						   COMBO_BOX_MODEL_COL_SORTING);
+
+		g_signal_connect_swapped (G_OBJECT (cbev), "changed",
+					  G_CALLBACK
+					  (xkb_layout_chooser_available_variant_changed),
+					  chooser_dialog);
+		gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (cbev),
+						      (GtkTreeViewRowSeparatorFunc)
+						      xkl_layout_chooser_separate_default_variant,
+						      chooser_dialog,
+						      NULL);
+	} else {
+		model =
+		    gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT
+						   (model));
+		gtk_tree_store_clear (GTK_TREE_STORE (model));
+	}
+
+	selected_layout_idx =
+	    gtk_combo_box_get_active (GTK_COMBO_BOX (cbel));
+
+	if (selected_layout_idx != -1) {
+		GtkTreeModel *lm =
+		    gtk_combo_box_get_model (GTK_COMBO_BOX (cbel));
+		GtkTreeIter iter;
+		GValue val;
+
+		memset (&val, 0, sizeof (val));
+
+		gtk_tree_model_iter_nth_child (lm, &iter, NULL,
+					       selected_layout_idx);
+		gtk_tree_model_get_value (lm, &iter,
+					  COMBO_BOX_MODEL_COL_ID, &val);
+
+		xkl_config_registry_foreach_layout_variant
+		    (config_registry, g_value_get_string (&val),
+		     (ConfigItemProcessFunc)
+		     xkb_layout_chooser_add_variant_to_available_variants,
+		     chooser_dialog);
+
+		xkb_layout_chooser_add_variant_to_available_variants
+		    (config_registry, NULL, chooser_dialog);
+
+		g_value_unset (&val);
+
+		/* set default variant as selected */
+		gtk_combo_box_set_active (GTK_COMBO_BOX (cbev), 0);
+	}
+}
+
+static void
+xkb_layout_chooser_available_layouts_fill (GladeXML * chooser_dialog)
+{
+	GtkWidget *cbe = CWID ("xkb_layouts_available");
+
+	GtkTreeStore *model =
+	    gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+
+	gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
+				 GTK_TREE_MODEL (model));
+
+	gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (cbe),
+					     COMBO_BOX_MODEL_COL_DESCRIPTION);
 
 	xkl_config_registry_foreach_layout (config_registry,
 					    (ConfigItemProcessFunc)
-					    add_layout_to_available_layouts_tree,
+					    xkb_layout_chooser_add_layout_to_available_layouts,
 					    chooser_dialog);
 
-	sort_tree_content (tree_view);
+	xkb_layout_chooser_sort_combo_box (cbe,
-	g_signal_connect_swapped (G_OBJECT (selection), "changed",
+					   COMBO_BOX_MODEL_COL_DESCRIPTION);
+
+	g_signal_connect_swapped (G_OBJECT (cbe), "changed",
 				  G_CALLBACK
-				  (xkb_layout_chooser_selection_changed),
+				  (xkb_layout_chooser_available_layout_changed),
 				  chooser_dialog);
 }
 
-static void
+void
-xkb_layout_chooser_response (GtkDialog * dialog,
+xkl_layout_chooser_add_default_switcher_if_necessary (GSList *
-			     gint response, GladeXML * chooser_dialog)
+						      layouts_list)
 {
-	GdkRectangle rect;
-
-	if (response == GTK_RESPONSE_OK) {
-		GtkTreeSelection *selection =
-		    gtk_tree_view_get_selection (GTK_TREE_VIEW
-						 (CWID
-						  ("xkb_layouts_available")));
-		GtkTreeIter selected_iter;
-		GtkTreeModel *model;
-		if (gtk_tree_selection_get_selected
-		    (selection, &model, &selected_iter)) {
-			gchar *id;
-			GSList *layouts_list =
-			    xkb_layouts_get_selected_list ();
-			gtk_tree_model_get (model, &selected_iter,
-					    AVAIL_LAYOUT_TREE_COL_ID, &id,
-					    -1);
-			layouts_list = g_slist_append (layouts_list, id);
-			xkb_layouts_set_selected_list (layouts_list);
 	/* process default switcher */
 	if (g_slist_length (layouts_list) >= 2) {
-				GSList *options_list =
+		GSList *options_list = xkb_options_get_selected_list ();
-				    xkb_options_get_selected_list ();
 		gboolean any_switcher = False;
 		GSList *option = options_list;
 		while (option != NULL) {
 			char *g, *o;
-					if (gkbd_keyboard_config_split_items (option->data, &g, &o)) {
+			if (gkbd_keyboard_config_split_items
+			    (option->data, &g, &o)) {
 				if (!g_ascii_strcasecmp
-						    (g,
+				    (g, GROUP_SWITCHERS_GROUP)) {
-						     GROUP_SWITCHERS_GROUP))
+					any_switcher = True;
-						{
-							any_switcher =
-							    True;
 					break;
 				}
 			}
@@ -223,14 +307,38 @@ xkb_layout_chooser_response (GtkDialog * dialog,
 				     DEFAULT_GROUP_SWITCH);
 				options_list =
 				    g_slist_append
-						    (options_list,
+				    (options_list, g_strdup (id));
-						     g_strdup (id));
 				xkb_options_set_selected_list
 				    (options_list);
 			}
 		}
 		clear_xkb_elements_list (options_list);
 	}
+}
+
+static void
+xkb_layout_chooser_response (GtkDialog * dialog,
+			     gint response, GladeXML * chooser_dialog)
+{
+	GdkRectangle rect;
+
+	if (response == GTK_RESPONSE_OK) {
+		gchar *selected_id = (gchar *)
+		    xkb_layout_chooser_get_selected_id (chooser_dialog);
+
+		if (selected_id != NULL) {
+			GSList *layouts_list =
+			    xkb_layouts_get_selected_list ();
+
+			selected_id = g_strdup (selected_id);
+
+			layouts_list =
+			    g_slist_append (layouts_list, selected_id);
+			xkb_layouts_set_selected_list (layouts_list);
+
+			xkl_layout_chooser_add_default_switcher_if_necessary
+			    (layouts_list);
+
 			clear_xkb_elements_list (layouts_list);
 		}
 	}
@@ -241,6 +349,7 @@ xkb_layout_chooser_response (GtkDialog * dialog,
 	gkbd_preview_save_position (&rect);
 }
 
+
 void
 xkb_layout_choose (GladeXML * dialog)
 {
@@ -256,8 +365,8 @@ xkb_layout_choose (GladeXML * dialog)
 				      GTK_WINDOW (WID
 						  ("keyboard_dialog")));
 
-	xkb_layouts_fill_available_tree (chooser_dialog);
+	xkb_layout_chooser_available_layouts_fill (chooser_dialog);
-	xkb_layout_chooser_selection_changed (chooser_dialog);
+	xkb_layout_chooser_available_layout_changed (chooser_dialog);
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
 	if (!strcmp (xkl_engine_get_backend_name (engine), "XKB")) {
@@ -293,21 +402,47 @@ xkb_layout_choose (GladeXML * dialog)
 	gtk_widget_destroy (chooser);
 }
 
-gchar *
+const gchar *
 xkb_layout_chooser_get_selected_id (GladeXML * chooser_dialog)
 {
-	GtkWidget *available_layouts_tree = CWID ("xkb_layouts_available");
+	GtkWidget *cbel = CWID ("xkb_layouts_available");
-	GtkTreeSelection *selection =
+	GtkWidget *cbev = CWID ("xkb_variants_available");
-	    gtk_tree_view_get_selection (GTK_TREE_VIEW
+	GtkTreeModel *lm = gtk_combo_box_get_model (GTK_COMBO_BOX (cbel));
-					 (available_layouts_tree));
+	GtkTreeModel *vm = gtk_combo_box_get_model (GTK_COMBO_BOX (cbev));
-	GtkTreeIter selected_iter;
+	gint lidx = gtk_combo_box_get_active (GTK_COMBO_BOX (cbel));
-	GtkTreeModel *model;
+	gint vidx = gtk_combo_box_get_active (GTK_COMBO_BOX (cbev));
-	if (gtk_tree_selection_get_selected (selection, &model,
+
-					     &selected_iter)) {
+	GtkTreeIter iter;
-		gchar *id;
+	GValue lval, vval;
-		gtk_tree_model_get (model, &selected_iter,
+	const gchar *lname, *vname;
-				    AVAIL_LAYOUT_TREE_COL_ID, &id, -1);
+
-		return id;
+	static gchar retval[2 * XKL_MAX_CI_NAME_LENGTH];
-	}
+
+	if (lidx == -1 || vidx == -1)
 		return NULL;
+
+	memset (&lval, 0, sizeof (lval));
+	memset (&vval, 0, sizeof (vval));
+
+	gtk_tree_model_iter_nth_child (lm, &iter, NULL, lidx);
+	gtk_tree_model_get_value (lm, &iter,
+				  COMBO_BOX_MODEL_COL_ID, &lval);
+
+	gtk_tree_model_iter_nth_child (vm, &iter, NULL, vidx);
+	gtk_tree_model_get_value (vm, &iter,
+				  COMBO_BOX_MODEL_COL_ID, &vval);
+
+	lname = g_value_get_string (&lval);
+	vname = g_value_get_string (&vval);
+
+	g_snprintf (retval, sizeof (retval),
+		    strcmp (vname,
+			    DEFAULT_VARIANT_ID) ?
+		    gkbd_keyboard_config_merge_items (lname,
+						      vname) : lname);
+
+	g_value_unset (&lval);
+	g_value_unset (&vval);
+
+	return retval;
 }

capplets/keyboard/gnome-keyboard-properties-xkbpv.c

@@ -74,7 +74,8 @@ xkb_layout_preview_update (GladeXML * chooser_dialog)
 	GtkWidget *chooser = CWID ("xkb_layout_chooser");
 	GtkWidget *kbdraw =
 	    GTK_WIDGET (g_object_get_data (G_OBJECT (chooser), "kbdraw"));
-	gchar *id = xkb_layout_chooser_get_selected_id (chooser_dialog);
+	const gchar *id =
+	    xkb_layout_chooser_get_selected_id (chooser_dialog);
 
 	if (kbdraw != NULL && id != NULL) {
 		XklConfigRec *data;