[libgnomekbd] Use GtkBuilder to replace deprecated libglade
- From: Sergey V. Udaltsov <svu src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgnomekbd] Use GtkBuilder to replace deprecated libglade
- Date: Tue, 12 May 2009 18:38:05 -0400 (EDT)
commit d29dc9b82e96f40350c490c905c81044aa4d456c
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date: Tue May 12 02:46:29 2009 +0200
Use GtkBuilder to replace deprecated libglade
Also fixes up some forgotten usages of libgnome in capplet/Makefile.am
GNOME Bug #582256
---
capplet/Makefile.am | 17 +-
capplet/gkbd-indicator-plugins-add.c | 30 ++-
capplet/gkbd-indicator-plugins-capplet.c | 64 +++--
capplet/gkbd-indicator-plugins-capplet.h | 10 +-
capplet/gkbd-indicator-plugins.glade | 532 ------------------------------
capplet/gkbd-indicator-plugins.ui | 255 ++++++++++++++
capplet/gkbd-indicator-plugins_add.ui | 142 ++++++++
configure.in | 7 -
po/POTFILES.in | 3 +-
9 files changed, 470 insertions(+), 590 deletions(-)
diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index d6257f2..703a651 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -1,7 +1,8 @@
bin_PROGRAMS = gkbd-indicator-plugins-capplet
-gladedir="$(pkgdatadir)/glade"
-glade_DATA = gkbd-indicator-plugins.glade
+uidir="$(pkgdatadir)/ui"
+ui_DATA = gkbd-indicator-plugins.ui \
+ gkbd-indicator-plugins_add.ui
@INTLTOOL_DESKTOP_RULE@
@@ -12,15 +13,13 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
gkbd_indicator_plugins_capplet_CFLAGS = \
-I$(top_srcdir) -Wall -Werror \
$(GCONF_CFLAGS) \
- $(LIBGLADE_CFLAGS) \
- $(LIBGNOME_CFLAGS) \
- $(LIBGNOMEUI_CFLAGS) \
+ $(GTK_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) \
-I$(top_srcdir)/intl \
-DSYS_PLUGIN_DIR=\"$(libdir)/gnomekbd/\" \
-DG_LOG_DOMAIN=\"GnomeKbdIndicatorPluginsCapplet\" \
-DPREFIX=\"$(prefix)\" \
- -DGLADEDIR=\"$(gladedir)\" \
+ -DUIDIR=\"$(uidir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
@@ -35,15 +34,13 @@ gkbd_indicator_plugins_capplet_LDFLAGS = -export-dynamic
gkbd_indicator_plugins_capplet_LDADD = \
$(DBUS_LIBS) \
$(GCONF_LIBS) \
- $(LIBGNOME_LIBS) \
- $(LIBGNOMEUI_LIBS) \
- $(LIBGLADE_LIBS) \
+ $(GTK_LIBS) \
$(LIBXKLAVIER_LIBS) \
$(top_builddir)/libgnomekbd/libgnomekbd.la \
$(top_builddir)/libgnomekbd/libgnomekbdui.la
EXTRA_DIST = gkbd-indicator-plugins-capplet.desktop.in.in \
- $(glade_DATA) \
+ $(ui_DATA) \
$(pixmap_DATA)
DISTCLEANFILES = $(desktop_DATA)
diff --git a/capplet/gkbd-indicator-plugins-add.c b/capplet/gkbd-indicator-plugins-add.c
index 444b6c9..e9ff8df 100644
--- a/capplet/gkbd-indicator-plugins-add.c
+++ b/capplet/gkbd-indicator-plugins-add.c
@@ -24,8 +24,8 @@
#include <string.h>
#include <sys/stat.h>
+#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#include <glade/glade.h>
#include <glib/gi18n.h>
#include <libxklavier/xklavier.h>
@@ -130,10 +130,9 @@ void
CappletEnablePlugin (GtkWidget * btnAdd, GkbdIndicatorPluginsCapplet * gipc)
{
/* default domain! */
- GladeXML *data = glade_xml_new (GLADEDIR "/gkbd-indicator-plugins.glade",
- "gkbd_indicator_plugins_add", NULL);
- GtkWidget *popup =
- glade_xml_get_widget (data, "gkbd_indicator_plugins_add");
+ GtkBuilder *builder;
+ GError *error = NULL;
+ GtkWidget *popup;
GtkWidget *availablePluginsList;
GtkTreeModel *availablePluginsModel;
GtkCellRenderer *renderer =
@@ -145,7 +144,22 @@ CappletEnablePlugin (GtkWidget * btnAdd, GkbdIndicatorPluginsCapplet * gipc)
NULL);
GtkTreeSelection *selection;
gint response;
- availablePluginsList = glade_xml_get_widget (data, "allPlugins");
+
+ builder = gtk_builder_new ();
+
+ if (!gtk_builder_add_from_file (builder,
+ UIDIR "/gkbd-indicator-plugins_add.ui",
+ &error)) {
+ g_warning ("Could not load builder file: %s", error->message);
+ g_error_free(error);
+ return;
+ }
+
+ popup = GTK_WIDGET (gtk_builder_get_object (builder,
+ "gkbd_indicator_plugins_add"));
+
+ availablePluginsList = GTK_WIDGET (gtk_builder_get_object (builder,
+ "allPlugins"));
availablePluginsModel =
GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING));
gtk_tree_view_set_model (GTK_TREE_VIEW (availablePluginsList),
@@ -160,10 +174,10 @@ CappletEnablePlugin (GtkWidget * btnAdd, GkbdIndicatorPluginsCapplet * gipc)
(CappletAvailablePluginsSelectionChanged), gipc);
g_object_set_data (G_OBJECT (gipc->capplet),
"gkbd_indicator_plugins_add.btnOK",
- glade_xml_get_widget (data, "btnOK"));
+ GTK_WIDGET (gtk_builder_get_object (builder, "btnOK")));
g_object_set_data (G_OBJECT (gipc->capplet),
"gkbd_indicator_plugins_add.lblDescription",
- glade_xml_get_widget (data, "lblDescription"));
+ GTK_WIDGET (gtk_builder_get_object (builder, "lblDescription")));
CappletAvailablePluginsSelectionChanged (selection, gipc);
response = gtk_dialog_run (GTK_DIALOG (popup));
g_object_set_data (G_OBJECT (gipc->capplet),
diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c
index 050dbb3..1f2b1de 100644
--- a/capplet/gkbd-indicator-plugins-capplet.c
+++ b/capplet/gkbd-indicator-plugins-capplet.c
@@ -24,9 +24,9 @@
#include <string.h>
#include <sys/stat.h>
+#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
-#include <glade/glade.h>
static GkbdKeyboardConfig initialSysKbdConfig;
static GMainLoop *loop;
@@ -35,7 +35,7 @@ extern void
CappletFillActivePluginList (GkbdIndicatorPluginsCapplet * gipc)
{
GtkWidget *activePlugins =
- CappletGetGladeWidget (gipc, "activePlugins");
+ CappletGetUiWidget (gipc, "activePlugins");
GtkListStore *activePluginsModel =
GTK_LIST_STORE (gtk_tree_view_get_model
(GTK_TREE_VIEW (activePlugins)));
@@ -68,7 +68,7 @@ static char *
CappletGetSelectedActivePluginPath (GkbdIndicatorPluginsCapplet * gipc)
{
GtkTreeView *pluginsList =
- GTK_TREE_VIEW (CappletGetGladeWidget (gipc, "activePlugins"));
+ GTK_TREE_VIEW (CappletGetUiWidget (gipc, "activePlugins"));
return CappletGetSelectedPluginPath (pluginsList, gipc);
}
@@ -99,7 +99,7 @@ CappletActivePluginsSelectionChanged (GtkTreeSelection *
GkbdIndicatorPluginsCapplet * gipc)
{
GtkWidget *activePlugins =
- CappletGetGladeWidget (gipc, "activePlugins");
+ CappletGetUiWidget (gipc, "activePlugins");
GtkTreeModel *model =
gtk_tree_view_get_model (GTK_TREE_VIEW (activePlugins));
GtkTreeIter selectedIter;
@@ -107,13 +107,11 @@ CappletActivePluginsSelectionChanged (GtkTreeSelection *
gboolean isFirstSelected = FALSE;
gboolean isLastSelected = FALSE;
gboolean hasConfigurationUi = FALSE;
- GtkWidget *btnRemove = CappletGetGladeWidget (gipc, "btnRemove");
- GtkWidget *btnUp = CappletGetGladeWidget (gipc, "btnUp");
- GtkWidget *btnDown = CappletGetGladeWidget (gipc, "btnDown");
- GtkWidget *btnProperties =
- CappletGetGladeWidget (gipc, "btnProperties");
- GtkWidget *lblDescription =
- CappletGetGladeWidget (gipc, "lblDescription");
+ GtkWidget *btnRemove = CappletGetUiWidget (gipc, "btnRemove");
+ GtkWidget *btnUp = CappletGetUiWidget (gipc, "btnUp");
+ GtkWidget *btnDown = CappletGetUiWidget (gipc, "btnDown");
+ GtkWidget *btnProperties = CappletGetUiWidget (gipc, "btnProperties");
+ GtkWidget *lblDescription = CappletGetUiWidget (gipc, "lblDescription");
gtk_label_set_text (GTK_LABEL (lblDescription),
g_strconcat ("<small><i>",
@@ -275,7 +273,9 @@ CappletResponse (GtkDialog * dialog, gint response)
static void
CappletSetup (GkbdIndicatorPluginsCapplet * gipc)
{
- GladeXML *data;
+ GtkBuilder *builder;
+ GError *error = NULL;
+ GtkWidget *button;
GtkWidget *capplet;
GtkWidget *activePlugins;
GtkTreeModel *activePluginsModel;
@@ -286,45 +286,57 @@ CappletSetup (GkbdIndicatorPluginsCapplet * gipc)
"text", 0,
NULL);
GtkTreeSelection *selection;
- glade_gnome_init ();
+ builder = gtk_builder_new ();
gtk_window_set_default_icon_name ("input-keyboard");
/* default domain! */
- data =
- glade_xml_new (GLADEDIR "/gkbd-indicator-plugins.glade",
- "gkbd_indicator_plugins", NULL);
+ if (!gtk_builder_add_from_file (builder,
+ UIDIR "/gkbd-indicator-plugins.ui",
+ &error)) {
+ g_warning ("Could not load builder file: %s", error->message);
+ g_error_free(error);
+ return;
+ }
+
gipc->capplet = capplet =
- glade_xml_get_widget (data, "gkbd_indicator_plugins");
+ GTK_WIDGET (gtk_builder_get_object (builder, "gkbd_indicator_plugins"));
+
+ gtk_builder_connect_signals (builder, NULL);
- g_object_set_data (G_OBJECT (capplet), "gladeData", data);
+ g_object_set_data (G_OBJECT (capplet), "uiData", builder);
g_signal_connect_swapped (GTK_OBJECT (capplet),
"destroy", G_CALLBACK (g_object_unref),
- data);
+ builder);
g_signal_connect_swapped (G_OBJECT (capplet), "unrealize",
G_CALLBACK (g_main_loop_quit), loop);
g_signal_connect (GTK_OBJECT (capplet),
"response", G_CALLBACK (CappletResponse), NULL);
- glade_xml_signal_connect_data (data, "on_btnUp_clicked",
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "btnUp"));
+ g_signal_connect (button, "clicked",
G_CALLBACK
(CappletPromotePlugin), gipc);
- glade_xml_signal_connect_data (data,
- "on_btnDown_clicked",
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "btnDown"));
+ g_signal_connect (button,
+ "clicked",
G_CALLBACK
(CappletDemotePlugin), gipc);
- glade_xml_signal_connect_data (data, "on_btnAdd_clicked",
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "btnAdd"));
+ g_signal_connect (button, "clicked",
G_CALLBACK
(CappletEnablePlugin), gipc);
- glade_xml_signal_connect_data (data, "on_btnRemove_clicked",
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "btnRemove"));
+ g_signal_connect (button, "clicked",
G_CALLBACK
(CappletDisablePlugin), gipc);
- glade_xml_signal_connect_data (data, "on_btnProperties_clicked",
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "btnProperties"));
+ g_signal_connect (button, "clicked",
G_CALLBACK
(CappletConfigurePlugin), gipc);
- activePlugins = CappletGetGladeWidget (gipc, "activePlugins");
+ activePlugins = CappletGetUiWidget (gipc, "activePlugins");
activePluginsModel =
GTK_TREE_MODEL (gtk_list_store_new
(2, G_TYPE_STRING, G_TYPE_STRING));
diff --git a/capplet/gkbd-indicator-plugins-capplet.h b/capplet/gkbd-indicator-plugins-capplet.h
index 2e2ebc5..1efa317 100644
--- a/capplet/gkbd-indicator-plugins-capplet.h
+++ b/capplet/gkbd-indicator-plugins-capplet.h
@@ -22,7 +22,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-#include <glade/glade-xml.h>
#include "libgnomekbd/gkbd-desktop-config.h"
#include "libgnomekbd/gkbd-indicator-config.h"
@@ -46,11 +45,10 @@ typedef struct _GkbdIndicatorPluginsCapplet {
#define NAME_COLUMN 0
#define FULLPATH_COLUMN 1
-#define CappletGetGladeWidget( gipc, name ) \
- glade_xml_get_widget( \
- GLADE_XML( g_object_get_data( G_OBJECT( (gipc)->capplet ), \
- "gladeData" ) ), \
- name )
+#define CappletGetUiWidget( gipc, name ) \
+ GTK_WIDGET ( gtk_builder_get_object ( \
+ GTK_BUILDER( g_object_get_data( G_OBJECT( (gipc)->capplet ), "uiData" ) ), \
+ name ) )
extern void CappletFillActivePluginList (GkbdIndicatorPluginsCapplet *
gipc);
diff --git a/capplet/gkbd-indicator-plugins.glade b/capplet/gkbd-indicator-plugins.glade
deleted file mode 100644
index 9d3d2d1..0000000
--- a/capplet/gkbd-indicator-plugins.glade
+++ /dev/null
@@ -1,532 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkDialog" id="gkbd_indicator_plugins">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Keyboard Indicator Plugins</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="btnClose">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Close the dialog</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-7</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnHelp">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Active _plugins:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">activePlugins</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="activePlugins">
- <property name="width_request">160</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">The list of active plugins</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnAdd">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Activate more plugins</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnAdd_clicked" last_modification_time="Tue, 29 Jul 2003 23:37:15 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnRemove">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Deactivate selected plugin</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnRemove_clicked" last_modification_time="Tue, 29 Jul 2003 23:37:02 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnUp">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Increase the plugin priority</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnUp_clicked" last_modification_time="Tue, 29 Jul 2003 23:36:45 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnDown">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Decrease the plugin priority</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnDown_clicked" last_modification_time="Tue, 29 Jul 2003 23:36:30 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnProperties">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure the selected plugin</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-properties</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnProperties_clicked" last_modification_time="Tue, 29 Jul 2003 23:36:16 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lblDescription">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="gkbd_indicator_plugins_add">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Add Plugin</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="helpbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnOK">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Available plugins:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">allPlugins</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="allPlugins">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lblDescription">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
diff --git a/capplet/gkbd-indicator-plugins.ui b/capplet/gkbd-indicator-plugins.ui
new file mode 100644
index 0000000..54e02c3
--- /dev/null
+++ b/capplet/gkbd-indicator-plugins.ui
@@ -0,0 +1,255 @@
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="gkbd_indicator_plugins">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Keyboard Indicator Plugins</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Active _plugins:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">activePlugins</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="scrolledwindow1">
+ <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="activePlugins">
+ <property name="width_request">160</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">The list of active plugins</property>
+ <property name="headers_visible">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnAdd">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Activate more plugins</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="btnRemove">
+ <property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Deactivate selected plugin</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>
+ <child>
+ <object class="GtkButton" id="btnUp">
+ <property name="label">gtk-go-up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Increase the plugin priority</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnDown">
+ <property name="label">gtk-go-down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Decrease the plugin priority</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnProperties">
+ <property name="label">gtk-properties</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Configure the selected plugin</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lblDescription">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">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="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="btnClose">
+ <property name="label">gtk-close</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="tooltip_text" translatable="yes">Close the dialog</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="btnHelp">
+ <property name="label">gtk-help</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="-7">btnClose</action-widget>
+ <action-widget response="-11">btnHelp</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/capplet/gkbd-indicator-plugins_add.ui b/capplet/gkbd-indicator-plugins_add.ui
new file mode 100644
index 0000000..dcfa3cc
--- /dev/null
+++ b/capplet/gkbd-indicator-plugins_add.ui
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="gkbd_indicator_plugins_add">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Add Plugin</property>
+ <property name="modal">True</property>
+ <property name="destroy_with_parent">True</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="spacing">2</property>
+ <child>
+ <object class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Available plugins:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">allPlugins</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="scrolledwindow2">
+ <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="allPlugins">
+ <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="lblDescription">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</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="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">1</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">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="-11">helpbutton1</action-widget>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">btnOK</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/configure.in b/configure.in
index 121c976..a4d7f68 100644
--- a/configure.in
+++ b/configure.in
@@ -20,13 +20,11 @@ DBUS_GLIB_REQUIRED=0.34
GCONF_REQUIRED=2.14.0
GDK_REQUIRED=2.13
GTK_REQUIRED=2.13
-LIBGLADE_REQUIRED=2.6.0
LIBXKLAVIER_REQUIRED=3.2
AC_SUBST([DBUS_REQUIRED])
AC_SUBST([DBUS_GLIB_REQUIRED])
AC_SUBST([GCONF_REQUIRED])
-AC_SUBST([LIBGLADE_REQUIRED])
AC_SUBST([GDK_REQUIRED])
AC_SUBST([GTK_REQUIRED])
AC_SUBST([LIBXKLAVIER_REQUIRED])
@@ -93,11 +91,6 @@ XLIB_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
AC_SUBST(XLIB_CFLAGS)
AC_SUBST(XLIB_LIBS)
-PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
-
-AC_SUBST(LIBGLADE_CFLAGS)
-AC_SUBST(LIBGLADE_LIBS)
-
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
if test x"$GCONFTOOL" = xno; then
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91d415e..319cbc5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,8 @@ libgnomekbd/gkbd-indicator-config.c
libgnomekbd/gkbd-keyboard-config.c
libgnomekbd/gkbd-desktop-config.c
libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in
-capplet/gkbd-indicator-plugins.glade
+[type: gettext/glade]capplet/gkbd-indicator-plugins.ui
+[type: gettext/glade]capplet/gkbd-indicator-plugins_add.ui
capplet/gkbd-indicator-plugins-capplet.c
capplet/gkbd-indicator-plugins-capplet.desktop.in.in
capplet/gkbd-indicator-plugins-add.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
