applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: Remove keyboard model selection

Browse source 
Seeing as all the keyboards should be using the same low-level
keycode set, when using evdev.
This commit is contained in:
Bastien Nocera 2011-01-27 15:50:41 +00:00
parent 7bca4a0a05
commit cef84c5171
6 changed files with 1 additions and 576 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
panels/region/Makefile.am
View file

@ -21,7 +21,6 @@ libregion_la_SOURCES = \
gnome-region-panel-lang.c \
gnome-region-panel-lang.h \
gnome-region-panel-xkb.c \
gnome-region-panel-xkbmc.c \
gnome-region-panel-xkblt.c \
gnome-region-panel-xkbltadd.c \
gnome-region-panel-xkbot.c \

141
panels/region/gnome-region-panel-model-chooser.ui
View file

@ -1,141 +0,0 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="xkb_model_chooser">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Choose a Keyboard Model</property>
<property name="modal">True</property>
<property name="default_width">450</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="xkb_model_chooser_pane">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="vendors_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Vendors:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="vendors_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="vendors_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Models:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="models_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
</object>
</child>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnOk">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-6">cancelbutton1</action-widget>
<action-widget response="-5">btnOk</action-widget>
</action-widgets>
</object>
</interface>

57
panels/region/gnome-region-panel-xkb.c
View file

@ -47,57 +47,6 @@ xci_desc_to_utf8 (XklConfigItem * ci)
return sd[0] == 0 ? g_strdup (ci->name) : g_strdup (sd);
}
static void
set_model_text (GtkWidget * picker, gchar * model)
{
XklConfigItem *ci = xkl_config_item_new ();
if (model == NULL) {
model = initial_config.model;
if (model == NULL)
model = "";
}
g_snprintf (ci->name, sizeof (ci->name), "%s", model);
if (xkl_config_registry_find_model (config_registry, ci)) {
char *d;
d = xci_desc_to_utf8 (ci);
gtk_button_set_label (GTK_BUTTON (picker), d);
g_free (d);
} else {
gtk_button_set_label (GTK_BUTTON (picker), _("Unknown"));
}
g_object_unref (G_OBJECT (ci));
}
static void
model_key_changed (GSettings * settings, const gchar * key,
GtkBuilder * dialog)
{
if (!strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_MODEL)) {
gchar *value =
g_settings_get_string (xkb_keyboard_settings,
GKBD_KEYBOARD_CONFIG_KEY_MODEL);
set_model_text (WID ("xkb_model_pick"), value);
if (value != NULL)
g_free (value);
enable_disable_restoring (dialog);
}
}
static void
setup_model_entry (GtkBuilder * dialog)
{
model_key_changed (xkb_keyboard_settings,
GKBD_KEYBOARD_CONFIG_KEY_MODEL, dialog);
g_signal_connect (xkb_keyboard_settings, "changed",
G_CALLBACK (model_key_changed), dialog);
}
static void
cleanup_xkb_tabs (GtkBuilder * dialog,
GObject *where_the_object_wa)
@ -179,8 +128,6 @@ setup_xkb_tabs (GtkBuilder * dialog)
gkbd_keyboard_config_init (&initial_config, engine);
gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
setup_model_entry (dialog);
g_settings_bind (xkb_desktop_settings,
GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
WID ("chk_separate_group_per_window"), "active",
@ -222,10 +169,6 @@ setup_xkb_tabs (GtkBuilder * dialog)
G_CALLBACK (xkb_options_popup_dialog),
dialog);
g_signal_connect_swapped (G_OBJECT (WID ("xkb_model_pick")),
"clicked", G_CALLBACK (choose_model),
dialog);
xkb_layouts_register_conf_listener (dialog);
xkb_options_register_conf_listener (dialog);

2
panels/region/gnome-region-panel-xkb.h
View file

@ -60,8 +60,6 @@ extern void enable_disable_restoring (GtkBuilder * dialog);
extern void preview_toggled (GtkBuilder * dialog, GtkWidget * button);
extern void choose_model (GtkBuilder * dialog);
extern void xkb_layout_choose (GtkBuilder * dialog);
extern gchar **xkb_layouts_get_selected_list (void);

336
panels/region/gnome-region-panel-xkbmc.c
View file

@ -1,336 +0,0 @@
/* gnome-region-panel-xkbmc.c
* Copyright (C) 2003-2007 Sergey V. Udaltsov
*
* Written by: Sergey V. Udaltsov <svu@gnome.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
#include "gnome-region-panel-xkb.h"
static gchar *current_model_name = NULL;
static gchar *current_vendor_name = NULL;
static void fill_models_list (GtkBuilder * chooser_dialog);
static gboolean fill_vendors_list (GtkBuilder * chooser_dialog);
static GtkTreePath *
gtk_list_store_find_entry (GtkListStore * list_store,
GtkTreeIter * iter, gchar * name, int column_id)
{
GtkTreePath *path;
char *current_name = NULL;
if (gtk_tree_model_get_iter_first
(GTK_TREE_MODEL (list_store), iter)) {
do {
gtk_tree_model_get (GTK_TREE_MODEL
(list_store), iter, column_id,
&current_name, -1);
if (!g_ascii_strcasecmp (name, current_name)) {
path =
gtk_tree_model_get_path
(GTK_TREE_MODEL (list_store), iter);
return path;
}
g_free (current_name);
} while (gtk_tree_model_iter_next
(GTK_TREE_MODEL (list_store), iter));
}
return NULL;
}
static void
add_vendor_to_list (XklConfigRegistry * config_registry,
XklConfigItem * config_item,
GtkTreeView * vendors_list)
{
GtkTreeIter iter;
GtkTreePath *found_existing;
GtkListStore *list_store;
gchar *vendor_name =
(gchar *) g_object_get_data (G_OBJECT (config_item),
XCI_PROP_VENDOR);
if (vendor_name == NULL)
return;
list_store =
GTK_LIST_STORE (gtk_tree_view_get_model (vendors_list));
if (!g_ascii_strcasecmp (config_item->name, current_model_name)) {
current_vendor_name = g_strdup (vendor_name);
}
found_existing =
gtk_list_store_find_entry (list_store, &iter, vendor_name, 0);
/* This vendor is already there */
if (found_existing != NULL) {
gtk_tree_path_free (found_existing);
return;
}
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, vendor_name, -1);
}
static void
add_model_to_list (XklConfigRegistry * config_registry,
XklConfigItem * config_item, GtkTreeView * models_list)
{
GtkTreeIter iter;
GtkListStore *list_store =
GTK_LIST_STORE (gtk_tree_view_get_model (models_list));
char *utf_model_name;
if (current_vendor_name != NULL) {
gchar *vendor_name =
(gchar *) g_object_get_data (G_OBJECT (config_item),
XCI_PROP_VENDOR);
if (vendor_name == NULL)
return;
if (g_ascii_strcasecmp (vendor_name, current_vendor_name))
return;
}
utf_model_name = xci_desc_to_utf8 (config_item);
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
0, utf_model_name, 1, config_item->name, -1);
g_free (utf_model_name);
}
static void
xkb_model_chooser_change_vendor_sel (GtkTreeSelection * selection,
GtkBuilder * chooser_dialog)
{
GtkTreeIter iter;
GtkTreeModel *list_store = NULL;
if (gtk_tree_selection_get_selected
(selection, &list_store, &iter)) {
gchar *vendor_name = NULL;
gtk_tree_model_get (list_store, &iter,
0, &vendor_name, -1);
current_vendor_name = vendor_name;
fill_models_list (chooser_dialog);
g_free (vendor_name);
} else {
current_vendor_name = NULL;
fill_models_list (chooser_dialog);
}
}
static void
xkb_model_chooser_change_model_sel (GtkTreeSelection * selection,
GtkBuilder * chooser_dialog)
{
gboolean anysel =
gtk_tree_selection_get_selected (selection, NULL, NULL);
gtk_dialog_set_response_sensitive (GTK_DIALOG
(CWID ("xkb_model_chooser")),
GTK_RESPONSE_OK, anysel);
}
static void
prepare_vendors_list (GtkBuilder * chooser_dialog)
{
GtkWidget *vendors_list = CWID ("vendors_list");
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
GtkTreeViewColumn *vendor_col =
gtk_tree_view_column_new_with_attributes (_("Vendors"),
renderer,
"text", 0,
NULL);
gtk_tree_view_column_set_visible (vendor_col, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (vendors_list),
vendor_col);
}
static gboolean
fill_vendors_list (GtkBuilder * chooser_dialog)
{
GtkWidget *vendors_list = CWID ("vendors_list");
GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING);
GtkTreeIter iter;
GtkTreePath *path;
gtk_tree_view_set_model (GTK_TREE_VIEW (vendors_list),
GTK_TREE_MODEL (list_store));
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
(list_store), 0,
GTK_SORT_ASCENDING);
current_vendor_name = NULL;
xkl_config_registry_foreach_model (config_registry,
(ConfigItemProcessFunc)
add_vendor_to_list,
vendors_list);
if (current_vendor_name != NULL) {
path = gtk_list_store_find_entry (list_store,
&iter,
current_vendor_name, 0);
if (path != NULL) {
gtk_tree_selection_select_iter
(gtk_tree_view_get_selection
(GTK_TREE_VIEW (vendors_list)), &iter);
gtk_tree_view_scroll_to_cell
(GTK_TREE_VIEW (vendors_list),
path, NULL, TRUE, 0.5, 0);
gtk_tree_path_free (path);
}
fill_models_list (chooser_dialog);
g_free (current_vendor_name);
} else {
fill_models_list (chooser_dialog);
}
g_signal_connect (G_OBJECT
(gtk_tree_view_get_selection
(GTK_TREE_VIEW (vendors_list))), "changed",
G_CALLBACK (xkb_model_chooser_change_vendor_sel),
chooser_dialog);
return gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store),
&iter);
}
static void
prepare_models_list (GtkBuilder * chooser_dialog)
{
GtkWidget *models_list = CWID ("models_list");
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
GtkTreeViewColumn *description_col =
gtk_tree_view_column_new_with_attributes (_("Models"),
renderer,
"text", 0,
NULL);
gtk_tree_view_column_set_visible (description_col, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (models_list),
description_col);
}
static void
fill_models_list (GtkBuilder * chooser_dialog)
{
GtkWidget *models_list = CWID ("models_list");
GtkTreeIter iter;
GtkTreePath *path;
GtkListStore *list_store =
gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
(list_store), 0,
GTK_SORT_ASCENDING);
gtk_tree_view_set_model (GTK_TREE_VIEW (models_list),
GTK_TREE_MODEL (list_store));
xkl_config_registry_foreach_model (config_registry,
(ConfigItemProcessFunc)
add_model_to_list, models_list);
if (current_model_name != NULL) {
path = gtk_list_store_find_entry (list_store,
&iter,
current_model_name, 1);
if (path != NULL) {
gtk_tree_selection_select_iter
(gtk_tree_view_get_selection
(GTK_TREE_VIEW (models_list)), &iter);
gtk_tree_view_scroll_to_cell
(GTK_TREE_VIEW (models_list),
path, NULL, TRUE, 0.5, 0);
gtk_tree_path_free (path);
}
}
g_signal_connect (G_OBJECT
(gtk_tree_view_get_selection
(GTK_TREE_VIEW (models_list))), "changed",
G_CALLBACK (xkb_model_chooser_change_model_sel),
chooser_dialog);
}
static void
xkb_model_chooser_response (GtkDialog * dialog,
gint response, GtkBuilder * chooser_dialog)
{
if (response == GTK_RESPONSE_OK) {
GtkWidget *models_list = CWID ("models_list");
GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW
(models_list));
GtkTreeIter iter;
GtkTreeModel *list_store = NULL;
if (gtk_tree_selection_get_selected
(selection, &list_store, &iter)) {
gchar *model_name = NULL;
gtk_tree_model_get (list_store, &iter,
1, &model_name, -1);
g_settings_set_string (xkb_keyboard_settings, GKBD_KEYBOARD_CONFIG_KEY_MODEL, model_name);
g_free (model_name);
}
}
gtk_widget_destroy (GTK_WIDGET (dialog));
}
void
choose_model (GtkBuilder * dialog)
{
GtkBuilder *chooser_dialog;
GtkWidget *chooser;
chooser_dialog = gtk_builder_new ();
gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
"/gnome-region-panel-model-chooser.ui",
NULL);
chooser = CWID ("xkb_model_chooser");
gtk_window_set_transient_for (GTK_WINDOW (chooser),
GTK_WINDOW (gtk_widget_get_toplevel (WID ("region_notebook"))));
current_model_name = g_settings_get_string (xkb_keyboard_settings, GKBD_KEYBOARD_CONFIG_KEY_MODEL);
prepare_vendors_list (chooser_dialog);
prepare_models_list (chooser_dialog);
if (!fill_vendors_list (chooser_dialog)) {
gtk_widget_hide (CWID ("vendors_label"));
gtk_widget_hide (CWID ("vendors_scrolledwindow"));
current_vendor_name = NULL;
fill_models_list (chooser_dialog);
}
g_signal_connect (G_OBJECT (chooser),
"response",
G_CALLBACK (xkb_model_chooser_response),
chooser_dialog);
gtk_widget_show (chooser);
g_free (current_model_name);
}

40
panels/region/gnome-region-panel.ui
View file

@ -381,45 +381,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="xkb_models_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Keyboard _model:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_model_pick</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="xkb_model_pick">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
<placeholder/>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox2">