Changing library dependency from virtual libgswitchit/libkbdraw to normal libgnomekbd
This commit is contained in:
Sergey V. Udaltsov
parent
0caebda160
commit
ada87a95f2
15 changed files with 1091 additions and 1150 deletions
|
|
@ -30,7 +30,7 @@
|
|||
#include <gconf/gconf-client.h>
|
||||
#include <glade/glade.h>
|
||||
|
||||
#include "libgswitchit/gswitchit-config.h"
|
||||
#include "libgnomekbd/gkbd-keyboard-config.h"
|
||||
|
||||
#include "capplet-util.h"
|
||||
#include "gconf-property-editor.h"
|
||||
|
|
@ -54,153 +54,170 @@ static GSList *current_radio_group = NULL;
|
|||
GSList *
|
||||
xkb_options_get_selected_list (void)
|
||||
{
|
||||
GSList *retval;
|
||||
GSList *retval;
|
||||
|
||||
retval = gconf_client_get_list (xkb_gconf_client,
|
||||
GSWITCHIT_KBD_CONFIG_KEY_OPTIONS,
|
||||
GCONF_VALUE_STRING,
|
||||
NULL);
|
||||
if (retval == NULL)
|
||||
{
|
||||
GSList *cur_option;
|
||||
retval = gconf_client_get_list (xkb_gconf_client,
|
||||
GKBD_KEYBOARD_CONFIG_KEY_OPTIONS,
|
||||
GCONF_VALUE_STRING, NULL);
|
||||
if (retval == NULL) {
|
||||
GSList *cur_option;
|
||||
|
||||
for (cur_option = initial_config.options; cur_option != NULL; cur_option = cur_option->next)
|
||||
retval = g_slist_prepend (retval, g_strdup (cur_option->data));
|
||||
for (cur_option = initial_config.options;
|
||||
cur_option != NULL; cur_option = cur_option->next)
|
||||
retval =
|
||||
g_slist_prepend (retval,
|
||||
g_strdup (cur_option->data));
|
||||
|
||||
retval = g_slist_reverse (retval);
|
||||
}
|
||||
retval = g_slist_reverse (retval);
|
||||
}
|
||||
|
||||
return retval;
|
||||
return retval;
|
||||
}
|
||||
|
||||
static GtkWidget *
|
||||
xkb_options_get_expander (GtkWidget * option_button)
|
||||
{
|
||||
return gtk_widget_get_parent (
|
||||
gtk_widget_get_parent (
|
||||
gtk_widget_get_parent (option_button)));
|
||||
return
|
||||
gtk_widget_get_parent (gtk_widget_get_parent
|
||||
(gtk_widget_get_parent
|
||||
(option_button)));
|
||||
}
|
||||
|
||||
static int
|
||||
xkb_options_expander_selcounter_get (GtkWidget * expander)
|
||||
{
|
||||
return GPOINTER_TO_INT(g_object_get_data (G_OBJECT (expander), SELCOUNTER_PROP));
|
||||
return
|
||||
GPOINTER_TO_INT (g_object_get_data
|
||||
(G_OBJECT (expander), SELCOUNTER_PROP));
|
||||
}
|
||||
|
||||
static void
|
||||
xkb_options_expander_selcounter_add (GtkWidget * expander, int value)
|
||||
{
|
||||
g_object_set_data (G_OBJECT (expander), SELCOUNTER_PROP,
|
||||
GINT_TO_POINTER (xkb_options_expander_selcounter_get (expander) + value));
|
||||
g_object_set_data (G_OBJECT (expander), SELCOUNTER_PROP,
|
||||
GINT_TO_POINTER
|
||||
(xkb_options_expander_selcounter_get (expander)
|
||||
+ value));
|
||||
}
|
||||
|
||||
static void
|
||||
xkb_options_expander_highlight (GtkWidget * expander)
|
||||
{
|
||||
char * utf_group_name = g_object_get_data (G_OBJECT (expander), "utfGroupName");
|
||||
int counter = xkb_options_expander_selcounter_get (expander);
|
||||
if (utf_group_name != NULL) {
|
||||
gchar *titlemarkup = g_strconcat (counter > 0 ? "<span weight=\"bold\">" : "<span>",
|
||||
utf_group_name, "</span>", NULL);
|
||||
gtk_expander_set_label (GTK_EXPANDER (expander), titlemarkup);
|
||||
g_free (titlemarkup);
|
||||
}
|
||||
char *utf_group_name =
|
||||
g_object_get_data (G_OBJECT (expander), "utfGroupName");
|
||||
int counter = xkb_options_expander_selcounter_get (expander);
|
||||
if (utf_group_name != NULL) {
|
||||
gchar *titlemarkup =
|
||||
g_strconcat (counter >
|
||||
0 ? "<span weight=\"bold\">" : "<span>",
|
||||
utf_group_name, "</span>", NULL);
|
||||
gtk_expander_set_label (GTK_EXPANDER (expander),
|
||||
titlemarkup);
|
||||
g_free (titlemarkup);
|
||||
}
|
||||
}
|
||||
|
||||
/* Add optionname from the backend's selection list if it's not
|
||||
already in there. */
|
||||
static void
|
||||
xkb_options_select (gchar *optionname)
|
||||
xkb_options_select (gchar * optionname)
|
||||
{
|
||||
gboolean already_selected = FALSE;
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *option;
|
||||
for (option = options_list ; option != NULL ; option = option->next)
|
||||
if (!strcmp ((gchar*)option->data, optionname))
|
||||
already_selected = TRUE;
|
||||
gboolean already_selected = FALSE;
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *option;
|
||||
for (option = options_list; option != NULL; option = option->next)
|
||||
if (!strcmp ((gchar *) option->data, optionname))
|
||||
already_selected = TRUE;
|
||||
|
||||
if (!already_selected)
|
||||
options_list = g_slist_append (options_list, g_strdup (optionname));
|
||||
xkb_options_set_selected_list (options_list);
|
||||
if (!already_selected)
|
||||
options_list =
|
||||
g_slist_append (options_list, g_strdup (optionname));
|
||||
xkb_options_set_selected_list (options_list);
|
||||
|
||||
clear_xkb_elements_list (options_list);
|
||||
clear_xkb_elements_list (options_list);
|
||||
}
|
||||
|
||||
/* Remove all occurences of optionname from the backend's selection list */
|
||||
static void
|
||||
xkb_options_deselect (gchar *optionname)
|
||||
xkb_options_deselect (gchar * optionname)
|
||||
{
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *nodetmp;
|
||||
GSList *option = options_list;
|
||||
while (option != NULL)
|
||||
{
|
||||
gchar *id = (char *) option->data;
|
||||
if (!strcmp(id, optionname))
|
||||
{
|
||||
nodetmp = option->next;
|
||||
g_free (id);
|
||||
options_list = g_slist_remove_link (options_list, option);
|
||||
g_slist_free_1 (option);
|
||||
option=nodetmp;
|
||||
}
|
||||
else
|
||||
option = option->next;
|
||||
}
|
||||
xkb_options_set_selected_list (options_list);
|
||||
clear_xkb_elements_list (options_list);
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *nodetmp;
|
||||
GSList *option = options_list;
|
||||
while (option != NULL) {
|
||||
gchar *id = (char *) option->data;
|
||||
if (!strcmp (id, optionname)) {
|
||||
nodetmp = option->next;
|
||||
g_free (id);
|
||||
options_list =
|
||||
g_slist_remove_link (options_list, option);
|
||||
g_slist_free_1 (option);
|
||||
option = nodetmp;
|
||||
} else
|
||||
option = option->next;
|
||||
}
|
||||
xkb_options_set_selected_list (options_list);
|
||||
clear_xkb_elements_list (options_list);
|
||||
}
|
||||
|
||||
/* Return true if optionname describes a string already in the backend's
|
||||
list of selected options */
|
||||
static gboolean
|
||||
xkb_options_is_selected (gchar *optionname)
|
||||
xkb_options_is_selected (gchar * optionname)
|
||||
{
|
||||
gboolean retval = FALSE;
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *option;
|
||||
for (option = options_list ; option != NULL ; option = option->next)
|
||||
{
|
||||
if (!strcmp ((gchar*)option->data, optionname))
|
||||
retval = TRUE;
|
||||
}
|
||||
clear_xkb_elements_list (options_list);
|
||||
return retval;
|
||||
gboolean retval = FALSE;
|
||||
GSList *options_list = xkb_options_get_selected_list ();
|
||||
GSList *option;
|
||||
for (option = options_list; option != NULL; option = option->next) {
|
||||
if (!strcmp ((gchar *) option->data, optionname))
|
||||
retval = TRUE;
|
||||
}
|
||||
clear_xkb_elements_list (options_list);
|
||||
return retval;
|
||||
}
|
||||
|
||||
/* Update xkb backend to reflect the new UI state */
|
||||
static void
|
||||
option_toggled_cb (GtkWidget *checkbutton, gpointer data)
|
||||
option_toggled_cb (GtkWidget * checkbutton, gpointer data)
|
||||
{
|
||||
gpointer optionID = g_object_get_data (G_OBJECT (checkbutton), OPTION_ID_PROP);
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)))
|
||||
xkb_options_select (optionID);
|
||||
else
|
||||
xkb_options_deselect (optionID);
|
||||
gpointer optionID =
|
||||
g_object_get_data (G_OBJECT (checkbutton), OPTION_ID_PROP);
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)))
|
||||
xkb_options_select (optionID);
|
||||
else
|
||||
xkb_options_deselect (optionID);
|
||||
}
|
||||
|
||||
/* Update UI state from xkb backend */
|
||||
static void
|
||||
option_update_cb (GConfClient * client,
|
||||
guint cnxn_id, GConfEntry * entry, gpointer data)
|
||||
guint cnxn_id, GConfEntry * entry, gpointer data)
|
||||
{
|
||||
GtkToggleButton *toggle = GTK_TOGGLE_BUTTON (data);
|
||||
GtkWidget *expander = xkb_options_get_expander (GTK_WIDGET (toggle));
|
||||
gboolean old_state = gtk_toggle_button_get_active (toggle);
|
||||
gboolean new_state = xkb_options_is_selected (
|
||||
g_object_get_data (G_OBJECT (toggle), OPTION_ID_PROP));
|
||||
int old_gstate = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (toggle), GCONFSTATE_PROP));
|
||||
int state_diff = new_state - old_gstate;
|
||||
GtkToggleButton *toggle = GTK_TOGGLE_BUTTON (data);
|
||||
GtkWidget *expander =
|
||||
xkb_options_get_expander (GTK_WIDGET (toggle));
|
||||
gboolean old_state = gtk_toggle_button_get_active (toggle);
|
||||
gboolean new_state =
|
||||
xkb_options_is_selected (g_object_get_data
|
||||
(G_OBJECT (toggle), OPTION_ID_PROP));
|
||||
int old_gstate =
|
||||
GPOINTER_TO_INT (g_object_get_data
|
||||
(G_OBJECT (toggle), GCONFSTATE_PROP));
|
||||
int state_diff = new_state - old_gstate;
|
||||
|
||||
if (GTK_WIDGET_TYPE (toggle) == GTK_TYPE_RADIO_BUTTON &&
|
||||
old_state == TRUE && new_state == FALSE)
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (toggle), "NoneRadio")), TRUE);
|
||||
else
|
||||
gtk_toggle_button_set_active (toggle, new_state);
|
||||
if (GTK_WIDGET_TYPE (toggle) == GTK_TYPE_RADIO_BUTTON &&
|
||||
old_state == TRUE && new_state == FALSE)
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
|
||||
(g_object_get_data
|
||||
(G_OBJECT (toggle),
|
||||
"NoneRadio")), TRUE);
|
||||
else
|
||||
gtk_toggle_button_set_active (toggle, new_state);
|
||||
|
||||
g_object_set_data (G_OBJECT (toggle), GCONFSTATE_PROP, GINT_TO_POINTER (new_state));
|
||||
xkb_options_expander_selcounter_add (expander, state_diff);
|
||||
xkb_options_expander_highlight (expander);
|
||||
g_object_set_data (G_OBJECT (toggle), GCONFSTATE_PROP,
|
||||
GINT_TO_POINTER (new_state));
|
||||
xkb_options_expander_selcounter_add (expander, state_diff);
|
||||
xkb_options_expander_highlight (expander);
|
||||
}
|
||||
|
||||
/* Add a check_button or radio_button to control a particular option
|
||||
|
|
@ -208,153 +225,186 @@ option_update_cb (GConfClient * client,
|
|||
the top of this file. */
|
||||
static void
|
||||
xkb_options_add_option (XklConfigRegistry * config_registry,
|
||||
XklConfigItem * config_item,
|
||||
GladeXML * dialog)
|
||||
XklConfigItem * config_item, GladeXML * dialog)
|
||||
{
|
||||
GtkWidget *option_check;
|
||||
gchar *utf_option_name = xci_desc_to_utf8 (config_item);
|
||||
/* Copy this out because we'll load it into the widget with set_data */
|
||||
gchar *full_option_name = g_strdup(
|
||||
gswitchit_kbd_config_merge_items (current1st_level_id, config_item->name));
|
||||
gboolean initial_state;
|
||||
GtkWidget *option_check;
|
||||
gchar *utf_option_name = xci_desc_to_utf8 (config_item);
|
||||
/* Copy this out because we'll load it into the widget with set_data */
|
||||
gchar *full_option_name =
|
||||
g_strdup (gkbd_keyboard_config_merge_items
|
||||
(current1st_level_id, config_item->name));
|
||||
gboolean initial_state;
|
||||
|
||||
if (current_multi_select)
|
||||
option_check = gtk_check_button_new_with_label (utf_option_name);
|
||||
else
|
||||
{
|
||||
if (current_radio_group == NULL)
|
||||
{
|
||||
/* The first radio in a group is to be "Default", meaning none of
|
||||
the below options are to be included in the selected list.
|
||||
This is a HIG-compliant alternative to allowing no
|
||||
selection in the group. */
|
||||
option_check = gtk_radio_button_new_with_label (current_radio_group, _("Default"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (option_check), TRUE);
|
||||
gtk_box_pack_start_defaults (GTK_BOX (current_vbox), option_check);
|
||||
current_radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (option_check));
|
||||
current_none_radio = option_check;
|
||||
}
|
||||
option_check = gtk_radio_button_new_with_label (current_radio_group, utf_option_name);
|
||||
current_radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (option_check));
|
||||
g_object_set_data (G_OBJECT (option_check), "NoneRadio", current_none_radio);
|
||||
}
|
||||
g_free (utf_option_name);
|
||||
if (current_multi_select)
|
||||
option_check =
|
||||
gtk_check_button_new_with_label (utf_option_name);
|
||||
else {
|
||||
if (current_radio_group == NULL) {
|
||||
/* The first radio in a group is to be "Default", meaning none of
|
||||
the below options are to be included in the selected list.
|
||||
This is a HIG-compliant alternative to allowing no
|
||||
selection in the group. */
|
||||
option_check =
|
||||
gtk_radio_button_new_with_label
|
||||
(current_radio_group, _("Default"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
|
||||
(option_check),
|
||||
TRUE);
|
||||
gtk_box_pack_start_defaults (GTK_BOX
|
||||
(current_vbox),
|
||||
option_check);
|
||||
current_radio_group =
|
||||
gtk_radio_button_get_group (GTK_RADIO_BUTTON
|
||||
(option_check));
|
||||
current_none_radio = option_check;
|
||||
}
|
||||
option_check =
|
||||
gtk_radio_button_new_with_label (current_radio_group,
|
||||
utf_option_name);
|
||||
current_radio_group =
|
||||
gtk_radio_button_get_group (GTK_RADIO_BUTTON
|
||||
(option_check));
|
||||
g_object_set_data (G_OBJECT (option_check), "NoneRadio",
|
||||
current_none_radio);
|
||||
}
|
||||
g_free (utf_option_name);
|
||||
|
||||
initial_state = xkb_options_is_selected (full_option_name);
|
||||
initial_state = xkb_options_is_selected (full_option_name);
|
||||
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (option_check), initial_state);
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (option_check),
|
||||
initial_state);
|
||||
|
||||
g_object_set_data_full (G_OBJECT (option_check), OPTION_ID_PROP, full_option_name, g_free);
|
||||
g_object_set_data_full (G_OBJECT (option_check), OPTION_ID_PROP,
|
||||
full_option_name, g_free);
|
||||
|
||||
g_signal_connect (G_OBJECT (option_check), "toggled", G_CALLBACK (option_toggled_cb), NULL);
|
||||
g_signal_connect (G_OBJECT (option_check), "toggled",
|
||||
G_CALLBACK (option_toggled_cb), NULL);
|
||||
|
||||
gconf_client_notify_add (xkb_gconf_client,
|
||||
GSWITCHIT_KBD_CONFIG_KEY_OPTIONS,
|
||||
(GConfClientNotifyFunc)
|
||||
option_update_cb, option_check, NULL, NULL);
|
||||
gconf_client_notify_add (xkb_gconf_client,
|
||||
GKBD_KEYBOARD_CONFIG_KEY_OPTIONS,
|
||||
(GConfClientNotifyFunc)
|
||||
option_update_cb, option_check, NULL,
|
||||
NULL);
|
||||
|
||||
gtk_box_pack_start_defaults (GTK_BOX (current_vbox), option_check);
|
||||
gtk_box_pack_start_defaults (GTK_BOX (current_vbox), option_check);
|
||||
|
||||
xkb_options_expander_selcounter_add (xkb_options_get_expander (option_check), initial_state);
|
||||
g_object_set_data (G_OBJECT (option_check), GCONFSTATE_PROP, GINT_TO_POINTER (initial_state));
|
||||
xkb_options_expander_selcounter_add (xkb_options_get_expander
|
||||
(option_check),
|
||||
initial_state);
|
||||
g_object_set_data (G_OBJECT (option_check), GCONFSTATE_PROP,
|
||||
GINT_TO_POINTER (initial_state));
|
||||
}
|
||||
|
||||
/* Add a group of options: create title and layout widgets and then
|
||||
add widgets for all the options in the group. */
|
||||
static void
|
||||
xkb_options_add_group (XklConfigRegistry * config_registry,
|
||||
XklConfigItem * config_item,
|
||||
GladeXML * dialog)
|
||||
XklConfigItem * config_item, GladeXML * dialog)
|
||||
{
|
||||
GtkWidget *expander, *align, *vbox;
|
||||
gboolean allow_multiple_selection = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (config_item),
|
||||
XCI_PROP_ALLOW_MULTIPLE_SELECTION));
|
||||
GtkWidget *expander, *align, *vbox;
|
||||
gboolean allow_multiple_selection =
|
||||
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (config_item),
|
||||
XCI_PROP_ALLOW_MULTIPLE_SELECTION));
|
||||
|
||||
GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
GSList *expanders_list =
|
||||
g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
|
||||
gchar *utf_group_name = xci_desc_to_utf8 (config_item);
|
||||
gchar *titlemarkup = g_strconcat ("<span>", utf_group_name, "</span>", NULL);
|
||||
gchar *utf_group_name = xci_desc_to_utf8 (config_item);
|
||||
gchar *titlemarkup =
|
||||
g_strconcat ("<span>", utf_group_name, "</span>", NULL);
|
||||
|
||||
expander = gtk_expander_new (titlemarkup);
|
||||
gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
|
||||
g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utf_group_name, g_free);
|
||||
expander = gtk_expander_new (titlemarkup);
|
||||
gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
|
||||
g_object_set_data_full (G_OBJECT (expander), "utfGroupName",
|
||||
utf_group_name, g_free);
|
||||
|
||||
g_free (titlemarkup);
|
||||
align = gtk_alignment_new (0, 0, 1, 1);
|
||||
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
|
||||
vbox = gtk_vbox_new (TRUE, 6);
|
||||
gtk_container_add (GTK_CONTAINER (align), vbox);
|
||||
gtk_container_add (GTK_CONTAINER (expander), align);
|
||||
current_vbox = vbox;
|
||||
g_free (titlemarkup);
|
||||
align = gtk_alignment_new (0, 0, 1, 1);
|
||||
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
|
||||
vbox = gtk_vbox_new (TRUE, 6);
|
||||
gtk_container_add (GTK_CONTAINER (align), vbox);
|
||||
gtk_container_add (GTK_CONTAINER (expander), align);
|
||||
current_vbox = vbox;
|
||||
|
||||
current_multi_select = (gboolean) allow_multiple_selection;
|
||||
current_radio_group = NULL;
|
||||
current_multi_select = (gboolean) allow_multiple_selection;
|
||||
current_radio_group = NULL;
|
||||
|
||||
current1st_level_id = config_item->name;
|
||||
xkl_config_registry_foreach_option (config_registry, config_item->name,
|
||||
(ConfigItemProcessFunc)xkb_options_add_option,
|
||||
dialog);
|
||||
current1st_level_id = config_item->name;
|
||||
xkl_config_registry_foreach_option (config_registry,
|
||||
config_item->name,
|
||||
(ConfigItemProcessFunc)
|
||||
xkb_options_add_option,
|
||||
dialog);
|
||||
|
||||
xkb_options_expander_highlight (expander);
|
||||
xkb_options_expander_highlight (expander);
|
||||
|
||||
expanders_list = g_slist_append (expanders_list, expander);
|
||||
g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP, expanders_list);
|
||||
expanders_list = g_slist_append (expanders_list, expander);
|
||||
g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP,
|
||||
expanders_list);
|
||||
}
|
||||
|
||||
static gint
|
||||
xkb_options_expanders_compare (GtkWidget * expander1, GtkWidget * expander2)
|
||||
xkb_options_expanders_compare (GtkWidget * expander1,
|
||||
GtkWidget * expander2)
|
||||
{
|
||||
const gchar *t1 = gtk_expander_get_label (GTK_EXPANDER (expander1));
|
||||
const gchar *t2 = gtk_expander_get_label (GTK_EXPANDER (expander2));
|
||||
return g_utf8_collate (t1, t2);
|
||||
const gchar *t1 =
|
||||
gtk_expander_get_label (GTK_EXPANDER (expander1));
|
||||
const gchar *t2 =
|
||||
gtk_expander_get_label (GTK_EXPANDER (expander2));
|
||||
return g_utf8_collate (t1, t2);
|
||||
}
|
||||
|
||||
/* Create widgets to represent the options made available by the backend */
|
||||
void
|
||||
xkb_options_load_options (GladeXML * dialog)
|
||||
{
|
||||
GtkWidget *opts_vbox = WID ("options_vbox");
|
||||
GSList * expanders_list;
|
||||
GtkWidget * expander;
|
||||
GtkWidget *opts_vbox = WID ("options_vbox");
|
||||
GSList *expanders_list;
|
||||
GtkWidget *expander;
|
||||
|
||||
/* fill the list */
|
||||
xkl_config_registry_foreach_option_group (config_registry,
|
||||
(ConfigItemProcessFunc)xkb_options_add_group,
|
||||
dialog);
|
||||
/* sort it */
|
||||
expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
expanders_list = g_slist_sort (expanders_list, (GCompareFunc)xkb_options_expanders_compare);
|
||||
while (expanders_list)
|
||||
{
|
||||
expander = GTK_WIDGET (expanders_list->data);
|
||||
gtk_box_pack_start (GTK_BOX (opts_vbox), expander, FALSE, FALSE, 0);
|
||||
expanders_list = expanders_list->next;
|
||||
}
|
||||
/* fill the list */
|
||||
xkl_config_registry_foreach_option_group (config_registry,
|
||||
(ConfigItemProcessFunc)
|
||||
xkb_options_add_group,
|
||||
dialog);
|
||||
/* sort it */
|
||||
expanders_list =
|
||||
g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
expanders_list =
|
||||
g_slist_sort (expanders_list,
|
||||
(GCompareFunc) xkb_options_expanders_compare);
|
||||
while (expanders_list) {
|
||||
expander = GTK_WIDGET (expanders_list->data);
|
||||
gtk_box_pack_start (GTK_BOX (opts_vbox), expander, FALSE,
|
||||
FALSE, 0);
|
||||
expanders_list = expanders_list->next;
|
||||
}
|
||||
|
||||
/* just cleanup */
|
||||
expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP, NULL);
|
||||
g_slist_free (expanders_list);
|
||||
/* just cleanup */
|
||||
expanders_list =
|
||||
g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
|
||||
g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP, NULL);
|
||||
g_slist_free (expanders_list);
|
||||
|
||||
gtk_widget_show_all (opts_vbox);
|
||||
gtk_widget_show_all (opts_vbox);
|
||||
}
|
||||
|
||||
/* Respond to a change in the xkb gconf settings */
|
||||
static void
|
||||
xkb_options_update (GConfClient * client,
|
||||
guint cnxn_id, GConfEntry * entry, GladeXML * dialog)
|
||||
guint cnxn_id, GConfEntry * entry, GladeXML * dialog)
|
||||
{
|
||||
/* Updating options is handled by gconf notifies for each widget
|
||||
This is here to avoid calling it N_OPTIONS times for each gconf
|
||||
change.*/
|
||||
enable_disable_restoring (dialog);
|
||||
/* Updating options is handled by gconf notifies for each widget
|
||||
This is here to avoid calling it N_OPTIONS times for each gconf
|
||||
change. */
|
||||
enable_disable_restoring (dialog);
|
||||
}
|
||||
|
||||
void
|
||||
xkb_options_register_gconf_listener (GladeXML * dialog)
|
||||
{
|
||||
gconf_client_notify_add (xkb_gconf_client,
|
||||
GSWITCHIT_KBD_CONFIG_KEY_OPTIONS,
|
||||
(GConfClientNotifyFunc)
|
||||
xkb_options_update, dialog, NULL, NULL);
|
||||
gconf_client_notify_add (xkb_gconf_client,
|
||||
GKBD_KEYBOARD_CONFIG_KEY_OPTIONS,
|
||||
(GConfClientNotifyFunc)
|
||||
xkb_options_update, dialog, NULL, NULL);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue