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

Remove libglade dependency on gnome-keyboard-properties

Browse source
This commit is contained in:
Robert Ancell 2009-07-30 13:25:37 +10:00
parent 872a2f0da7
commit d224c36f6e
17 changed files with 2524 additions and 2174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
capplets/keyboard/Makefile.am
View file

@ -19,8 +19,12 @@ gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
@INTLTOOL_DESKTOP_RULE@ @INTLTOOL_DESKTOP_RULE@
Gladedir = $(pkgdatadir)/glade uidir = $(pkgdatadir)/ui
Glade_DATA = gnome-keyboard-properties.glade dist_ui_DATA = gnome-keyboard-properties-a11y-notifications.ui \
gnome-keyboard-properties-dialog.ui \
gnome-keyboard-properties-layout-chooser.ui \
gnome-keyboard-properties-model-chooser.ui \
gnome-keyboard-properties-options-dialog.ui
desktopdir = $(datadir)/applications desktopdir = $(datadir)/applications
Desktop_in_files = keyboard.desktop.in Desktop_in_files = keyboard.desktop.in
@ -31,8 +35,8 @@ INCLUDES = \
$(LIBGNOMEKBDUI_CFLAGS) \ $(LIBGNOMEKBDUI_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" -DGNOMECC_UI_DIR="\"$(uidir)\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) EXTRA_DIST = $(ui_DATA)
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk

516
capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui Normal file
View file

@ -0,0 +1,516 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="a11y_notifications_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Keyboard Accessibility Audio Feedback</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox46">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkVBox" id="vbox47">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox48">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="feature_state_change_beep">
<property name="label" translatable="yes">Beep when _accessibility features are turned on or off</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="togglekeys_enable">
<property name="label" translatable="yes">Beep when a _toggle key is pressed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="system_bell_box">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label500">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Visual cues for sounds&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox99">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="label99">
<property name="visible">True</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox99">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="visual_bell_enable">
<property name="label" translatable="yes">Show _visual feedback for the alert sound</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<child>
<object class="GtkLabel" id="label98">
<property name="visible">True</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox98">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="visual_bell_titlebar">
<property name="label" translatable="yes">Flash _window titlebar</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="visual_bell_fullscreen">
<property name="label" translatable="yes">Flash entire _screen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">visual_bell_titlebar</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="slowkeys_notifications_box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Slow Keys&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkLabel" id="label53">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox52">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="slowkeys_beep_press">
<property name="label" translatable="yes">Beep when a key is pr_essed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="slowkeys_beep_accept">
<property name="label" translatable="yes">Beep when key is _accepted</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="slowkeys_beep_reject">
<property name="label" translatable="yes">Beep when key is _rejected</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="bouncekeys_notifications_box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Bounce Keys&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox22">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkLabel" id="label55">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox54">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="bouncekeys_beep_reject">
<property name="label" translatable="yes">Beep when a key is reje_cted</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="stickykeys_notifications_box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Sticky Keys&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox50">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="stickykeys_modifier_beep">
<property name="label" translatable="yes">Beep when a _modifier key is pressed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button11">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="button12">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="-11">button11</action-widget>
<action-widget response="-7">button12</action-widget>
</action-widgets>
</object>
</interface>

29
capplets/keyboard/gnome-keyboard-properties-a11y.c
View file

@ -30,12 +30,14 @@
#include "capplet-util.h" #include "capplet-util.h"
#define CONFIG_ROOT "/desktop/gnome/accessibility/keyboard" #define CONFIG_ROOT "/desktop/gnome/accessibility/keyboard"
#define NWID(s) glade_xml_get_widget (notifications_dialog, s) #undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
#define NWID(s) GTK_WIDGET (gtk_builder_get_object (notifications_dialog, s))
static GladeXML *notifications_dialog = NULL; static GtkBuilder *notifications_dialog = NULL;
static void static void
stickykeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog) stickykeys_enable_toggled_cb (GtkWidget *w, GtkBuilder *dialog)
{ {
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)); gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
@ -45,7 +47,7 @@ stickykeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog)
} }
static void static void
slowkeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog) slowkeys_enable_toggled_cb (GtkWidget *w, GtkBuilder *dialog)
{ {
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)); gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
@ -55,7 +57,7 @@ slowkeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog)
} }
static void static void
bouncekeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog) bouncekeys_enable_toggled_cb (GtkWidget *w, GtkBuilder *dialog)
{ {
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)); gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
@ -65,7 +67,7 @@ bouncekeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog)
} }
static void static void
visual_bell_enable_toggled_cb (GtkWidget *w, GladeXML *dialog) visual_bell_enable_toggled_cb (GtkWidget *w, GtkBuilder *dialog)
{ {
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)); gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
@ -124,13 +126,14 @@ a11y_notifications_dialog_response_cb (GtkWidget *w, gint response)
} }
} }
static void static void
notifications_button_clicked_cb (GtkWidget *button, GladeXML *dialog) notifications_button_clicked_cb (GtkWidget *button, GtkBuilder *dialog)
{ {
GtkWidget *w; GtkWidget *w;
notifications_dialog = glade_xml_new (GNOMECC_GLADE_DIR notifications_dialog = gtk_builder_new ();
"/gnome-keyboard-properties.glade", gtk_builder_add_from_file (notifications_dialog, GNOMECC_UI_DIR
"a11y_notifications_dialog", NULL); "/gnome-keyboard-properties-a11y-notifications.ui",
NULL);
stickykeys_enable_toggled_cb (WID ("stickykeys_enable"), dialog); stickykeys_enable_toggled_cb (WID ("stickykeys_enable"), dialog);
slowkeys_enable_toggled_cb (WID ("slowkeys_enable"), dialog); slowkeys_enable_toggled_cb (WID ("slowkeys_enable"), dialog);
@ -199,7 +202,7 @@ notifications_button_clicked_cb (GtkWidget *button, GladeXML *dialog)
} }
static void static void
mousekeys_enable_toggled_cb (GtkWidget *w, GladeXML *dialog) mousekeys_enable_toggled_cb (GtkWidget *w, GtkBuilder *dialog)
{ {
gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)); gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w));
gtk_widget_set_sensitive (WID ("mousekeys_table"), active); gtk_widget_set_sensitive (WID ("mousekeys_table"), active);
@ -243,7 +246,7 @@ mousekeys_accel_time_from_widget (GConfPropertyEditor *peditor, const GConfValue
} }
void void
setup_a11y_tabs (GladeXML *dialog, GConfChangeSet *changeset) setup_a11y_tabs (GtkBuilder *dialog, GConfChangeSet *changeset)
{ {
GConfClient *client; GConfClient *client;
GtkWidget *w; GtkWidget *w;

3
capplets/keyboard/gnome-keyboard-properties-a11y.h
View file

@ -26,8 +26,7 @@
#include <gconf/gconf-changeset.h> #include <gconf/gconf-changeset.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glade/glade.h>
extern void setup_a11y_tabs (GladeXML * dialog, GConfChangeSet * changeset); extern void setup_a11y_tabs (GtkBuilder * dialog, GConfChangeSet * changeset);
#endif /* __GNOME_KEYBOARD_PROPERTY_A11Y_H */ #endif /* __GNOME_KEYBOARD_PROPERTY_A11Y_H */

3361
capplets/keyboard/gnome-keyboard-properties.glade → capplets/keyboard/gnome-keyboard-properties-dialog.ui
View file

File diff suppressed because it is too large Load diff

315
capplets/keyboard/gnome-keyboard-properties-layout-chooser.ui Normal file
View file

@ -0,0 +1,315 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="xkb_layout_chooser">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Choose a Layout</property>
<property name="default_width">670</property>
<property name="default_height">350</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox40">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkNotebook" id="choosers_nb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="top_padding">3</property>
<property name="bottom_padding">3</property>
<property name="left_padding">3</property>
<property name="right_padding">6</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkComboBox" id="xkb_country_variants_available">
<property name="visible">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="xkb_countries_available">
<property name="visible">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Variants:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_country_variants_available</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Country:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_countries_available</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="label" translatable="yes">By _country</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="top_padding">3</property>
<property name="bottom_padding">3</property>
<property name="left_padding">3</property>
<property name="right_padding">3</property>
<child>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkComboBox" id="xkb_language_variants_available">
<property name="visible">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="xkb_languages_available">
<property name="visible">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Variants:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_country_variants_available</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">xkb_countries_available</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes">By _language</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vboxPreview">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Preview:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="previewFrame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbtnBox">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="btnPrint">
<property name="label">gtk-print</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>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelbutton2">
<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">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnOk1">
<property name="label">gtk-add</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">2</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="1">btnPrint</action-widget>
<action-widget response="-6">cancelbutton2</action-widget>
<action-widget response="-5">btnOk1</action-widget>
</action-widgets>
</object>
</interface>

142
capplets/keyboard/gnome-keyboard-properties-model-chooser.ui Normal file
View file

@ -0,0 +1,142 @@
<?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>
<property name="has_separator">False</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>

94
capplets/keyboard/gnome-keyboard-properties-options-dialog.ui Normal file
View file

@ -0,0 +1,94 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="xkb_options_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Keyboard Layout Options</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">550</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkScrolledWindow" id="options_scroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">out</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkVBox" id="options_vbox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button3">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="button2">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="-11">button3</action-widget>
<action-widget response="-7">button2</action-widget>
</action-widgets>
</object>
</interface>

18
capplets/keyboard/gnome-keyboard-properties-xkb.c
View file

@ -28,7 +28,6 @@
#include <string.h> #include <string.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "capplet-util.h" #include "capplet-util.h"
@ -38,6 +37,9 @@
#include <libgnomekbd/gkbd-desktop-config.h> #include <libgnomekbd/gkbd-desktop-config.h>
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
XklEngine *engine; XklEngine *engine;
XklConfigRegistry *config_registry; XklConfigRegistry *config_registry;
@ -87,7 +89,7 @@ set_model_text (GtkWidget * picker, GConfValue * value)
static void static void
model_key_changed (GConfClient * client, model_key_changed (GConfClient * client,
guint cnxn_id, GConfEntry * entry, GladeXML * dialog) guint cnxn_id, GConfEntry * entry, GtkBuilder * dialog)
{ {
set_model_text (WID ("xkb_model_pick"), set_model_text (WID ("xkb_model_pick"),
gconf_entry_get_value (entry)); gconf_entry_get_value (entry));
@ -96,7 +98,7 @@ model_key_changed (GConfClient * client,
} }
static void static void
setup_model_entry (GladeXML * dialog) setup_model_entry (GtkBuilder * dialog)
{ {
GConfValue *value; GConfValue *value;
@ -113,7 +115,7 @@ setup_model_entry (GladeXML * dialog)
} }
static void static void
cleanup_xkb_tabs (GladeXML * dialog) cleanup_xkb_tabs (GtkBuilder * dialog)
{ {
gkbd_desktop_config_term (&desktop_config); gkbd_desktop_config_term (&desktop_config);
gkbd_keyboard_config_term (&initial_config); gkbd_keyboard_config_term (&initial_config);
@ -126,7 +128,7 @@ cleanup_xkb_tabs (GladeXML * dialog)
} }
static void static void
reset_to_defaults (GtkWidget * button, GladeXML * dialog) reset_to_defaults (GtkWidget * button, GtkBuilder * dialog)
{ {
GkbdKeyboardConfig empty_kbd_config; GkbdKeyboardConfig empty_kbd_config;
@ -142,7 +144,7 @@ static void
chk_separate_group_per_window_toggled (GConfPropertyEditor * peditor, chk_separate_group_per_window_toggled (GConfPropertyEditor * peditor,
const gchar * key, const gchar * key,
const GConfValue * value, const GConfValue * value,
GladeXML * dialog) GtkBuilder * dialog)
{ {
xkb_layouts_enable_disable_default (dialog, value xkb_layouts_enable_disable_default (dialog, value
&& &&
@ -150,7 +152,7 @@ chk_separate_group_per_window_toggled (GConfPropertyEditor * peditor,
} }
void void
setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset) setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset)
{ {
GObject *peditor; GObject *peditor;
xkb_gconf_client = gconf_client_get_default (); xkb_gconf_client = gconf_client_get_default ();
@ -215,7 +217,7 @@ setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
} }
void void
enable_disable_restoring (GladeXML * dialog) enable_disable_restoring (GtkBuilder * dialog)
{ {
GkbdKeyboardConfig gswic; GkbdKeyboardConfig gswic;
gboolean enable; gboolean enable;

34
capplets/keyboard/gnome-keyboard-properties-xkb.h
View file

@ -29,28 +29,28 @@
#include "libgnomekbd/gkbd-keyboard-config.h" #include "libgnomekbd/gkbd-keyboard-config.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define CWID(s) glade_xml_get_widget (chooser_dialog, s) #define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s))
extern XklEngine *engine; extern XklEngine *engine;
extern XklConfigRegistry *config_registry; extern XklConfigRegistry *config_registry;
extern GConfClient *xkb_gconf_client; extern GConfClient *xkb_gconf_client;
extern GkbdKeyboardConfig initial_config; extern GkbdKeyboardConfig initial_config;
extern void setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset); extern void setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset);
extern void xkb_layouts_fill_selected_tree (GladeXML * dialog); extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
extern void xkb_layouts_register_buttons_handlers (GladeXML * dialog); extern void xkb_layouts_register_buttons_handlers (GtkBuilder * dialog);
extern void xkb_layouts_register_gconf_listener (GladeXML * dialog); extern void xkb_layouts_register_gconf_listener (GtkBuilder * dialog);
extern void xkb_options_register_gconf_listener (GladeXML * dialog); extern void xkb_options_register_gconf_listener (GtkBuilder * dialog);
extern void xkb_layouts_prepare_selected_tree (GladeXML * dialog, extern void xkb_layouts_prepare_selected_tree (GtkBuilder * dialog,
GConfChangeSet * changeset); GConfChangeSet * changeset);
extern void xkb_options_load_options (GladeXML * dialog); extern void xkb_options_load_options (GtkBuilder * dialog);
extern void xkb_options_popup_dialog (GladeXML * dialog); extern void xkb_options_popup_dialog (GtkBuilder * dialog);
extern void clear_xkb_elements_list (GSList * list); extern void clear_xkb_elements_list (GSList * list);
@ -58,15 +58,15 @@ extern char *xci_desc_to_utf8 (XklConfigItem * ci);
extern gchar *xkb_layout_description_utf8 (const gchar * visible); extern gchar *xkb_layout_description_utf8 (const gchar * visible);
extern void enable_disable_restoring (GladeXML * dialog); extern void enable_disable_restoring (GtkBuilder * dialog);
extern void preview_toggled (GladeXML * dialog, GtkWidget * button); extern void preview_toggled (GtkBuilder * dialog, GtkWidget * button);
extern void choose_model (GladeXML * dialog); extern void choose_model (GtkBuilder * dialog);
extern void xkb_layout_choose (GladeXML * dialog); extern void xkb_layout_choose (GtkBuilder * dialog);
extern void xkb_layouts_enable_disable_default (GladeXML * dialog, extern void xkb_layouts_enable_disable_default (GtkBuilder * dialog,
gboolean enable); gboolean enable);
extern GSList *xkb_layouts_get_selected_list (void); extern GSList *xkb_layouts_get_selected_list (void);
@ -83,15 +83,15 @@ extern GSList *xkb_options_get_selected_list (void);
GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, \ GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, \
GCONF_VALUE_STRING, (list), NULL) GCONF_VALUE_STRING, (list), NULL)
extern GtkWidget *xkb_layout_preview_create_widget (GladeXML * extern GtkWidget *xkb_layout_preview_create_widget (GtkBuilder *
chooser_dialog); chooser_dialog);
extern void xkb_layout_preview_update (GladeXML * chooser_dialog); extern void xkb_layout_preview_update (GtkBuilder * chooser_dialog);
extern void xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw, extern void xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw,
const gchar * id); const gchar * id);
extern gchar *xkb_layout_chooser_get_selected_id (GladeXML * extern gchar *xkb_layout_chooser_get_selected_id (GtkBuilder *
chooser_dialog); chooser_dialog);
G_END_DECLS G_END_DECLS

34
capplets/keyboard/gnome-keyboard-properties-xkblt.c
View file

@ -26,7 +26,6 @@
#endif #endif
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <libgnomekbd/gkbd-desktop-config.h> #include <libgnomekbd/gkbd-desktop-config.h>
@ -40,6 +39,9 @@
#define SEL_LAYOUT_TREE_COL_DEFAULT 1 #define SEL_LAYOUT_TREE_COL_DEFAULT 1
#define SEL_LAYOUT_TREE_COL_ID 2 #define SEL_LAYOUT_TREE_COL_ID 2
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
static int idx2select = -1; static int idx2select = -1;
static int max_selected_layouts = -1; static int max_selected_layouts = -1;
static int default_group = -1; static int default_group = -1;
@ -61,7 +63,7 @@ clear_xkb_elements_list (GSList * list)
} }
static gint static gint
find_selected_layout_idx (GladeXML * dialog) find_selected_layout_idx (GtkBuilder * dialog)
{ {
GtkTreeSelection *selection = GtkTreeSelection *selection =
gtk_tree_view_get_selection (GTK_TREE_VIEW gtk_tree_view_get_selection (GTK_TREE_VIEW
@ -122,7 +124,7 @@ save_default_group (int default_group)
static void static void
def_group_in_ui_changed (GtkCellRendererToggle * cell_renderer, def_group_in_ui_changed (GtkCellRendererToggle * cell_renderer,
gchar * path, GladeXML * dialog) gchar * path, GtkBuilder * dialog)
{ {
GtkTreePath *chpath = gtk_tree_path_new_from_string (path); GtkTreePath *chpath = gtk_tree_path_new_from_string (path);
int new_default_group = -1; int new_default_group = -1;
@ -141,7 +143,7 @@ def_group_in_ui_changed (GtkCellRendererToggle * cell_renderer,
static void static void
def_group_in_gconf_changed (GConfClient * client, def_group_in_gconf_changed (GConfClient * client,
guint cnxn_id, guint cnxn_id,
GConfEntry * entry, GladeXML * dialog) GConfEntry * entry, GtkBuilder * dialog)
{ {
GConfValue *value = gconf_entry_get_value (entry); GConfValue *value = gconf_entry_get_value (entry);
@ -177,7 +179,7 @@ def_group_in_gconf_changed (GConfClient * client,
} }
static void static void
xkb_layouts_enable_disable_buttons (GladeXML * dialog) xkb_layouts_enable_disable_buttons (GtkBuilder * dialog)
{ {
GtkWidget *add_layout_btn = WID ("xkb_layouts_add"); GtkWidget *add_layout_btn = WID ("xkb_layouts_add");
GtkWidget *print_layout_btn = WID ("xkb_layouts_print"); GtkWidget *print_layout_btn = WID ("xkb_layouts_print");
@ -225,7 +227,7 @@ xkb_layouts_create_default_layout_column ()
} }
void void
xkb_layouts_enable_disable_default (GladeXML * dialog, gboolean enable) xkb_layouts_enable_disable_default (GtkBuilder * dialog, gboolean enable)
{ {
GtkWidget *tree_view = WID ("xkb_layouts_selected"); GtkWidget *tree_view = WID ("xkb_layouts_selected");
@ -252,7 +254,7 @@ xkb_layouts_enable_disable_default (GladeXML * dialog, gboolean enable)
static void static void
xkb_layouts_dnd_data_get (GtkWidget * widget, GdkDragContext * dc, xkb_layouts_dnd_data_get (GtkWidget * widget, GdkDragContext * dc,
GtkSelectionData * selection_data, guint info, GtkSelectionData * selection_data, guint info,
guint t, GladeXML * dialog) guint t, GtkBuilder * dialog)
{ {
/* Storing the value into selection - /* Storing the value into selection -
* while it is actually not used * while it is actually not used
@ -267,7 +269,7 @@ static void
xkb_layouts_dnd_data_received (GtkWidget * widget, GdkDragContext * dc, xkb_layouts_dnd_data_received (GtkWidget * widget, GdkDragContext * dc,
gint x, gint y, gint x, gint y,
GtkSelectionData * selection_data, GtkSelectionData * selection_data,
guint info, guint t, GladeXML * dialog) guint info, guint t, GtkBuilder * dialog)
{ {
gint sidx = find_selected_layout_idx (dialog); gint sidx = find_selected_layout_idx (dialog);
GtkWidget *tree_view = WID ("xkb_layouts_selected"); GtkWidget *tree_view = WID ("xkb_layouts_selected");
@ -310,7 +312,7 @@ xkb_layouts_dnd_data_received (GtkWidget * widget, GdkDragContext * dc,
} }
void void
xkb_layouts_prepare_selected_tree (GladeXML * dialog, xkb_layouts_prepare_selected_tree (GtkBuilder * dialog,
GConfChangeSet * changeset) GConfChangeSet * changeset)
{ {
GtkListStore *list_store = GtkListStore *list_store =
@ -388,7 +390,7 @@ xkb_layout_description_utf8 (const gchar * visible)
} }
void void
xkb_layouts_fill_selected_tree (GladeXML * dialog) xkb_layouts_fill_selected_tree (GtkBuilder * dialog)
{ {
GConfEntry *gce; GConfEntry *gce;
GError *err = NULL; GError *err = NULL;
@ -452,13 +454,13 @@ xkb_layouts_fill_selected_tree (GladeXML * dialog)
} }
static void static void
add_selected_layout (GtkWidget * button, GladeXML * dialog) add_selected_layout (GtkWidget * button, GtkBuilder * dialog)
{ {
xkb_layout_choose (dialog); xkb_layout_choose (dialog);
} }
static void static void
print_selected_layout (GtkWidget * button, GladeXML * dialog) print_selected_layout (GtkWidget * button, GtkBuilder * dialog)
{ {
gint idx = find_selected_layout_idx (dialog); gint idx = find_selected_layout_idx (dialog);
@ -484,7 +486,7 @@ print_selected_layout (GtkWidget * button, GladeXML * dialog)
} }
static void static void
remove_selected_layout (GtkWidget * button, GladeXML * dialog) remove_selected_layout (GtkWidget * button, GtkBuilder * dialog)
{ {
gint idx = find_selected_layout_idx (dialog); gint idx = find_selected_layout_idx (dialog);
@ -511,7 +513,7 @@ remove_selected_layout (GtkWidget * button, GladeXML * dialog)
} }
void void
xkb_layouts_register_buttons_handlers (GladeXML * dialog) xkb_layouts_register_buttons_handlers (GtkBuilder * dialog)
{ {
g_signal_connect (G_OBJECT (WID ("xkb_layouts_add")), "clicked", g_signal_connect (G_OBJECT (WID ("xkb_layouts_add")), "clicked",
G_CALLBACK (add_selected_layout), dialog); G_CALLBACK (add_selected_layout), dialog);
@ -524,14 +526,14 @@ xkb_layouts_register_buttons_handlers (GladeXML * dialog)
static void static void
xkb_layouts_update_list (GConfClient * client, xkb_layouts_update_list (GConfClient * client,
guint cnxn_id, GConfEntry * entry, guint cnxn_id, GConfEntry * entry,
GladeXML * dialog) GtkBuilder * dialog)
{ {
xkb_layouts_fill_selected_tree (dialog); xkb_layouts_fill_selected_tree (dialog);
enable_disable_restoring (dialog); enable_disable_restoring (dialog);
} }
void void
xkb_layouts_register_gconf_listener (GladeXML * dialog) xkb_layouts_register_gconf_listener (GtkBuilder * dialog)
{ {
gconf_client_notify_add (xkb_gconf_client, gconf_client_notify_add (xkb_gconf_client,
GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,

45
capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
View file

@ -27,14 +27,15 @@
#include <string.h> #include <string.h>
#include <glade/glade.h>
#include <libgnomekbd/gkbd-keyboard-drawing.h> #include <libgnomekbd/gkbd-keyboard-drawing.h>
#include <libgnomekbd/gkbd-util.h> #include <libgnomekbd/gkbd-util.h>
#include "capplet-util.h" #include "capplet-util.h"
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
#define GROUP_SWITCHERS_GROUP "grp" #define GROUP_SWITCHERS_GROUP "grp"
#define DEFAULT_GROUP_SWITCH "grp:alts_toggle" #define DEFAULT_GROUP_SWITCH "grp:alts_toggle"
#define DEFAULT_VARIANT_ID "__default__" #define DEFAULT_VARIANT_ID "__default__"
@ -62,7 +63,7 @@ static void
xkb_layout_chooser_available_layouts_fill (GladeXML * chooser_dialog, xkb_layout_chooser_available_layouts_fill (GtkBuilder * chooser_dialog,
const gchar cblid[], const gchar cblid[],
const gchar cbvid[], const gchar cbvid[],
LayoutIterFunc layout_iterator, LayoutIterFunc layout_iterator,
@ -78,7 +79,7 @@ static void
xkb_layout_chooser_available_language_variants_fill (GladeXML * xkb_layout_chooser_available_language_variants_fill (GtkBuilder *
chooser_dialog); chooser_dialog);
static void static void
@ -89,7 +90,7 @@ static void
xkb_layout_chooser_available_country_variants_fill (GladeXML * xkb_layout_chooser_available_country_variants_fill (GtkBuilder *
chooser_dialog); chooser_dialog);
static void static void
@ -178,7 +179,7 @@ xkb_layout_chooser_add_country_to_available_countries (XklConfigRegistry *
} }
static void static void
xkb_layout_chooser_enable_disable_buttons (GladeXML * chooser_dialog) xkb_layout_chooser_enable_disable_buttons (GtkBuilder * chooser_dialog)
{ {
GtkWidget *cbv = GtkWidget *cbv =
CWID (gtk_notebook_get_current_page CWID (gtk_notebook_get_current_page
@ -198,14 +199,14 @@ xkb_layout_chooser_enable_disable_buttons (GladeXML * chooser_dialog)
} }
static void static void
xkb_layout_chooser_available_variant_changed (GladeXML * chooser_dialog) xkb_layout_chooser_available_variant_changed (GtkBuilder * chooser_dialog)
{ {
xkb_layout_preview_update (chooser_dialog); xkb_layout_preview_update (chooser_dialog);
xkb_layout_chooser_enable_disable_buttons (chooser_dialog); xkb_layout_chooser_enable_disable_buttons (chooser_dialog);
} }
static void static void
xkb_layout_chooser_available_language_changed (GladeXML * chooser_dialog) xkb_layout_chooser_available_language_changed (GtkBuilder * chooser_dialog)
{ {
xkb_layout_chooser_available_language_variants_fill xkb_layout_chooser_available_language_variants_fill
(chooser_dialog); (chooser_dialog);
@ -213,7 +214,7 @@ xkb_layout_chooser_available_language_changed (GladeXML * chooser_dialog)
} }
static void static void
xkb_layout_chooser_available_country_changed (GladeXML * chooser_dialog) xkb_layout_chooser_available_country_changed (GtkBuilder * chooser_dialog)
{ {
xkb_layout_chooser_available_country_variants_fill xkb_layout_chooser_available_country_variants_fill
(chooser_dialog); (chooser_dialog);
@ -222,13 +223,13 @@ xkb_layout_chooser_available_country_changed (GladeXML * chooser_dialog)
static void static void
xkb_layout_chooser_page_changed (GtkWidget * notebook, GtkWidget * page, xkb_layout_chooser_page_changed (GtkWidget * notebook, GtkWidget * page,
gint page_num, GladeXML * chooser_dialog) gint page_num, GtkBuilder * chooser_dialog)
{ {
xkb_layout_chooser_available_variant_changed (chooser_dialog); xkb_layout_chooser_available_variant_changed (chooser_dialog);
} }
static void static void
xkb_layout_chooser_available_language_variants_fill (GladeXML * xkb_layout_chooser_available_language_variants_fill (GtkBuilder *
chooser_dialog) chooser_dialog)
{ {
GtkWidget *cbl = CWID ("xkb_languages_available"); GtkWidget *cbl = CWID ("xkb_languages_available");
@ -271,7 +272,7 @@ xkb_layout_chooser_available_language_variants_fill (GladeXML *
} }
static void static void
xkb_layout_chooser_available_country_variants_fill (GladeXML * xkb_layout_chooser_available_country_variants_fill (GtkBuilder *
chooser_dialog) chooser_dialog)
{ {
GtkWidget *cbl = CWID ("xkb_countries_available"); GtkWidget *cbl = CWID ("xkb_countries_available");
@ -313,7 +314,7 @@ xkb_layout_chooser_available_country_variants_fill (GladeXML *
} }
static void static void
xkb_layout_chooser_available_layouts_fill (GladeXML * xkb_layout_chooser_available_layouts_fill (GtkBuilder *
chooser_dialog, chooser_dialog,
const gchar cblid[], const gchar cblid[],
const gchar cbvid[], const gchar cbvid[],
@ -410,7 +411,7 @@ xkl_layout_chooser_add_default_switcher_if_necessary (GSList *
} }
static void static void
xkb_layout_chooser_print (GladeXML * chooser_dialog) xkb_layout_chooser_print (GtkBuilder * chooser_dialog)
{ {
GtkWidget *chooser = CWID ("xkb_layout_chooser"); GtkWidget *chooser = CWID ("xkb_layout_chooser");
GtkWidget *kbdraw = GtkWidget *kbdraw =
@ -428,7 +429,7 @@ xkb_layout_chooser_print (GladeXML * chooser_dialog)
static void static void
xkb_layout_chooser_response (GtkDialog * dialog, xkb_layout_chooser_response (GtkDialog * dialog,
gint response, GladeXML * chooser_dialog) gint response, GtkBuilder * chooser_dialog)
{ {
GdkRectangle rect; GdkRectangle rect;
@ -465,12 +466,14 @@ xkb_layout_chooser_response (GtkDialog * dialog,
} }
void void
xkb_layout_choose (GladeXML * dialog) xkb_layout_choose (GtkBuilder * dialog)
{ {
GladeXML *chooser_dialog = GtkBuilder *chooser_dialog;
glade_xml_new (GNOMECC_GLADE_DIR
"/gnome-keyboard-properties.glade", chooser_dialog = gtk_builder_new ();
"xkb_layout_chooser", NULL); gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
"/gnome-keyboard-properties-layout-chooser.ui",
NULL);
GtkWidget *chooser = CWID ("xkb_layout_chooser"); GtkWidget *chooser = CWID ("xkb_layout_chooser");
GtkWidget *lang_chooser = CWID ("xkb_languages_available"); GtkWidget *lang_chooser = CWID ("xkb_languages_available");
GtkWidget *notebook = CWID ("choosers_nb"); GtkWidget *notebook = CWID ("choosers_nb");
@ -566,7 +569,7 @@ xkb_layout_choose (GladeXML * dialog)
} }
gchar * gchar *
xkb_layout_chooser_get_selected_id (GladeXML * chooser_dialog) xkb_layout_chooser_get_selected_id (GtkBuilder * chooser_dialog)
{ {
GtkWidget *cbv = GtkWidget *cbv =
CWID (gtk_notebook_get_current_page CWID (gtk_notebook_get_current_page

37
capplets/keyboard/gnome-keyboard-properties-xkbmc.c
View file

@ -27,19 +27,21 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "capplet-util.h" #include "capplet-util.h"
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
static gchar *current_model_name = NULL; static gchar *current_model_name = NULL;
static gchar *current_vendor_name = NULL; static gchar *current_vendor_name = NULL;
static void fill_models_list (GladeXML * chooser_dialog); static void fill_models_list (GtkBuilder * chooser_dialog);
static gboolean fill_vendors_list (GladeXML * chooser_dialog); static gboolean fill_vendors_list (GtkBuilder * chooser_dialog);
static GtkTreePath * static GtkTreePath *
gtk_list_store_find_entry (GtkListStore * list_store, gtk_list_store_find_entry (GtkListStore * list_store,
@ -129,7 +131,7 @@ add_model_to_list (XklConfigRegistry * config_registry,
static void static void
xkb_model_chooser_change_vendor_sel (GtkTreeSelection * selection, xkb_model_chooser_change_vendor_sel (GtkTreeSelection * selection,
GladeXML * chooser_dialog) GtkBuilder * chooser_dialog)
{ {
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *list_store = NULL; GtkTreeModel *list_store = NULL;
@ -151,7 +153,7 @@ xkb_model_chooser_change_vendor_sel (GtkTreeSelection * selection,
static void static void
xkb_model_chooser_change_model_sel (GtkTreeSelection * selection, xkb_model_chooser_change_model_sel (GtkTreeSelection * selection,
GladeXML * chooser_dialog) GtkBuilder * chooser_dialog)
{ {
gboolean anysel = gboolean anysel =
gtk_tree_selection_get_selected (selection, NULL, NULL); gtk_tree_selection_get_selected (selection, NULL, NULL);
@ -161,7 +163,7 @@ xkb_model_chooser_change_model_sel (GtkTreeSelection * selection,
} }
static void static void
prepare_vendors_list (GladeXML * chooser_dialog) prepare_vendors_list (GtkBuilder * chooser_dialog)
{ {
GtkWidget *vendors_list = CWID ("vendors_list"); GtkWidget *vendors_list = CWID ("vendors_list");
GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
@ -176,7 +178,7 @@ prepare_vendors_list (GladeXML * chooser_dialog)
} }
static gboolean static gboolean
fill_vendors_list (GladeXML * chooser_dialog) fill_vendors_list (GtkBuilder * chooser_dialog)
{ {
GtkWidget *vendors_list = CWID ("vendors_list"); GtkWidget *vendors_list = CWID ("vendors_list");
GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING); GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING);
@ -227,7 +229,7 @@ fill_vendors_list (GladeXML * chooser_dialog)
} }
static void static void
prepare_models_list (GladeXML * chooser_dialog) prepare_models_list (GtkBuilder * chooser_dialog)
{ {
GtkWidget *models_list = CWID ("models_list"); GtkWidget *models_list = CWID ("models_list");
GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
@ -242,7 +244,7 @@ prepare_models_list (GladeXML * chooser_dialog)
} }
static void static void
fill_models_list (GladeXML * chooser_dialog) fill_models_list (GtkBuilder * chooser_dialog)
{ {
GtkWidget *models_list = CWID ("models_list"); GtkWidget *models_list = CWID ("models_list");
GtkTreeIter iter; GtkTreeIter iter;
@ -286,7 +288,7 @@ fill_models_list (GladeXML * chooser_dialog)
static void static void
xkb_model_chooser_response (GtkDialog * dialog, xkb_model_chooser_response (GtkDialog * dialog,
gint response, GladeXML * chooser_dialog) gint response, GtkBuilder * chooser_dialog)
{ {
if (response == GTK_RESPONSE_OK) { if (response == GTK_RESPONSE_OK) {
GtkWidget *models_list = CWID ("models_list"); GtkWidget *models_list = CWID ("models_list");
@ -310,13 +312,16 @@ xkb_model_chooser_response (GtkDialog * dialog,
} }
void void
choose_model (GladeXML * dialog) choose_model (GtkBuilder * dialog)
{ {
GladeXML *chooser_dialog = GtkBuilder *chooser_dialog;
glade_xml_new (GNOMECC_GLADE_DIR GtkWidget *chooser;
"/gnome-keyboard-properties.glade",
"xkb_model_chooser", NULL); chooser_dialog = gtk_builder_new ();
GtkWidget *chooser = CWID ("xkb_model_chooser"); gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
"/gnome-keyboard-properties-model-chooser.ui",
NULL);
chooser = CWID ("xkb_model_chooser");
gtk_window_set_transient_for (GTK_WINDOW (chooser), gtk_window_set_transient_for (GTK_WINDOW (chooser),
GTK_WINDOW (WID GTK_WINDOW (WID
("keyboard_dialog"))); ("keyboard_dialog")));

26
capplets/keyboard/gnome-keyboard-properties-xkbot.c
View file

@ -29,13 +29,15 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <string.h> #include <string.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h>
#include "capplet-util.h" #include "capplet-util.h"
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
static GladeXML *chooser_dialog = NULL; #undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
static GtkBuilder *chooser_dialog = NULL;
static const char *current1st_level_id = NULL; static const char *current1st_level_id = NULL;
static GSList *option_checks_list = NULL; static GSList *option_checks_list = NULL;
static GtkWidget *current_none_radio = NULL; static GtkWidget *current_none_radio = NULL;
@ -211,7 +213,7 @@ option_toggled_cb (GtkWidget * checkbutton, gpointer data)
the top of this file. */ the top of this file. */
static void static void
xkb_options_add_option (XklConfigRegistry * config_registry, xkb_options_add_option (XklConfigRegistry * config_registry,
XklConfigItem * config_item, GladeXML * dialog) XklConfigItem * config_item, GtkBuilder * dialog)
{ {
GtkWidget *option_check; GtkWidget *option_check;
gchar *utf_option_name = xci_desc_to_utf8 (config_item); gchar *utf_option_name = xci_desc_to_utf8 (config_item);
@ -302,7 +304,7 @@ xkb_option_checks_compare (GtkWidget * chk1, GtkWidget * chk2)
add widgets for all the options in the group. */ add widgets for all the options in the group. */
static void static void
xkb_options_add_group (XklConfigRegistry * config_registry, xkb_options_add_group (XklConfigRegistry * config_registry,
XklConfigItem * config_item, GladeXML * dialog) XklConfigItem * config_item, GtkBuilder * dialog)
{ {
GtkWidget *align, *vbox, *option_check; GtkWidget *align, *vbox, *option_check;
gboolean allow_multiple_selection = gboolean allow_multiple_selection =
@ -379,7 +381,7 @@ xkb_options_expanders_compare (GtkWidget * expander1,
/* Create widgets to represent the options made available by the backend */ /* Create widgets to represent the options made available by the backend */
void void
xkb_options_load_options (GladeXML * dialog) xkb_options_load_options (GtkBuilder * dialog)
{ {
GtkWidget *opts_vbox = WID ("options_vbox"); GtkWidget *opts_vbox = WID ("options_vbox");
GSList *expanders_list; GSList *expanders_list;
@ -439,14 +441,14 @@ chooser_response_cb (GtkDialog * dialog, gint response, gpointer data)
/* Create popup dialog */ /* Create popup dialog */
void void
xkb_options_popup_dialog (GladeXML * dialog) xkb_options_popup_dialog (GtkBuilder * dialog)
{ {
GtkWidget *chooser; GtkWidget *chooser;
chooser_dialog = chooser_dialog = gtk_builder_new ();
glade_xml_new (GNOMECC_GLADE_DIR gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
"/gnome-keyboard-properties.glade", "/gnome-keyboard-properties-options-dialog.ui",
"xkb_options_dialog", NULL); NULL);
chooser = CWID ("xkb_options_dialog"); chooser = CWID ("xkb_options_dialog");
gtk_window_set_transient_for (GTK_WINDOW (chooser), gtk_window_set_transient_for (GTK_WINDOW (chooser),
@ -476,7 +478,7 @@ xkb_options_update_option_counters (XklConfigRegistry * config_registry,
/* Respond to a change in the xkb gconf settings */ /* Respond to a change in the xkb gconf settings */
static void static void
xkb_options_update (GConfClient * client, xkb_options_update (GConfClient * client,
guint cnxn_id, GConfEntry * entry, GladeXML * dialog) guint cnxn_id, GConfEntry * entry, GtkBuilder * dialog)
{ {
/* Updating options is handled by gconf notifies for each widget /* Updating options is handled by gconf notifies for each widget
This is here to avoid calling it N_OPTIONS times for each gconf This is here to avoid calling it N_OPTIONS times for each gconf
@ -507,7 +509,7 @@ xkb_options_update (GConfClient * client,
} }
void void
xkb_options_register_gconf_listener (GladeXML * dialog) xkb_options_register_gconf_listener (GtkBuilder * dialog)
{ {
gconf_client_notify_add (xkb_gconf_client, gconf_client_notify_add (xkb_gconf_client,
GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, GKBD_KEYBOARD_CONFIG_KEY_OPTIONS,

6
capplets/keyboard/gnome-keyboard-properties-xkbpv.c
View file

@ -25,8 +25,6 @@
# include <config.h> # include <config.h>
#endif #endif
#include <glade/glade.h>
#include <libgnomekbd/gkbd-keyboard-drawing.h> #include <libgnomekbd/gkbd-keyboard-drawing.h>
#include "capplet-util.h" #include "capplet-util.h"
@ -57,7 +55,7 @@ static GkbdKeyboardDrawingGroupLevel *pGroupsLevels[] = {
}; };
GtkWidget * GtkWidget *
xkb_layout_preview_create_widget (GladeXML * chooserDialog) xkb_layout_preview_create_widget (GtkBuilder * chooserDialog)
{ {
GtkWidget *kbdraw = gkbd_keyboard_drawing_new (); GtkWidget *kbdraw = gkbd_keyboard_drawing_new ();
@ -67,7 +65,7 @@ xkb_layout_preview_create_widget (GladeXML * chooserDialog)
} }
void void
xkb_layout_preview_update (GladeXML * chooser_dialog) xkb_layout_preview_update (GtkBuilder * chooser_dialog)
{ {
#ifdef HAVE_X11_EXTENSIONS_XKB_H #ifdef HAVE_X11_EXTENSIONS_XKB_H
GtkWidget *chooser = CWID ("xkb_layout_chooser"); GtkWidget *chooser = CWID ("xkb_layout_chooser");

20
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -29,7 +29,6 @@
#endif #endif
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h>
#include "capplet-util.h" #include "capplet-util.h"
#include "gconf-property-editor.h" #include "gconf-property-editor.h"
@ -39,22 +38,25 @@
#include "gnome-keyboard-properties-a11y.h" #include "gnome-keyboard-properties-a11y.h"
#include "gnome-keyboard-properties-xkb.h" #include "gnome-keyboard-properties-xkb.h"
#undef WID
#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
enum { enum {
RESPONSE_APPLY = 1, RESPONSE_APPLY = 1,
RESPONSE_CLOSE RESPONSE_CLOSE
}; };
static GladeXML * static GtkBuilder *
create_dialog (void) create_dialog (void)
{ {
GladeXML *dialog; GtkBuilder *dialog;
GtkSizeGroup *size_group; GtkSizeGroup *size_group;
GtkWidget *image; GtkWidget *image;
dialog = dialog = gtk_builder_new ();
glade_xml_new (GNOMECC_GLADE_DIR gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR
"/gnome-keyboard-properties.glade", "/gnome-keyboard-properties-dialog.ui",
"keyboard_dialog", NULL); NULL);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget (size_group, WID ("repeat_slow_label")); gtk_size_group_add_widget (size_group, WID ("repeat_slow_label"));
@ -120,7 +122,7 @@ dialog_response (GtkWidget * widget,
} }
static void static void
setup_dialog (GladeXML * dialog, GConfChangeSet * changeset) setup_dialog (GtkBuilder * dialog, GConfChangeSet * changeset)
{ {
GObject *peditor; GObject *peditor;
gchar *monitor; gchar *monitor;
@ -193,7 +195,7 @@ main (int argc, char **argv)
{ {
GConfClient *client; GConfClient *client;
GConfChangeSet *changeset; GConfChangeSet *changeset;
GladeXML *dialog; GtkBuilder *dialog;
GOptionContext *context; GOptionContext *context;
static gboolean apply_only = FALSE; static gboolean apply_only = FALSE;

6
po/POTFILES.in
View file

@ -49,7 +49,11 @@ capplets/keybindings/gnome-keybinding-properties.c
[type: gettext/glade]capplets/keybindings/gnome-keybinding-properties.ui [type: gettext/glade]capplets/keybindings/gnome-keybinding-properties.ui
capplets/keybindings/keybinding.desktop.in.in capplets/keybindings/keybinding.desktop.in.in
capplets/keyboard/gnome-keyboard-properties.c capplets/keyboard/gnome-keyboard-properties.c
capplets/keyboard/gnome-keyboard-properties.glade capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui
capplets/keyboard/gnome-keyboard-properties-dialog.ui
capplets/keyboard/gnome-keyboard-properties-layout-chooser.ui
capplets/keyboard/gnome-keyboard-properties-model-chooser.ui
capplets/keyboard/gnome-keyboard-properties-options-dialog.ui
capplets/keyboard/gnome-keyboard-properties-xkb.c capplets/keyboard/gnome-keyboard-properties-xkb.c
capplets/keyboard/gnome-keyboard-properties-xkbltadd.c capplets/keyboard/gnome-keyboard-properties-xkbltadd.c
capplets/keyboard/gnome-keyboard-properties-xkblt.c capplets/keyboard/gnome-keyboard-properties-xkblt.c