[Xfce4-commits] r30271 - xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings
Nick Schermer
nick at xfce.org
Sat Jul 11 12:31:45 CEST 2009
Author: nick
Date: 2009-07-11 10:31:45 +0000 (Sat, 11 Jul 2009)
New Revision: 30271
Modified:
xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am
xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/main.c
xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/mouse-dialog.glade
Log:
Port mouse dialog to Gtkbuilder and 4ui.
Modified: xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am 2009-07-11 09:42:25 UTC (rev 30270)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/Makefile.am 2009-07-11 10:31:45 UTC (rev 30271)
@@ -17,9 +17,8 @@
xfce4_mouse_settings_CFLAGS = \
$(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GLADE_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(XFCONF_CFLAGS) \
$(XI_CFLAGS) \
$(XFCONF_CFLAGS)
@@ -30,9 +29,8 @@
xfce4_mouse_settings_LDADD = \
$(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(GLADE_LIBS) \
- $(LIBXFCEGUI4_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
$(XFCONF_LIBS) \
$(XI_LIBS)
Modified: xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/main.c
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/main.c 2009-07-11 09:42:25 UTC (rev 30270)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/main.c 2009-07-11 10:31:45 UTC (rev 30271)
@@ -42,11 +42,10 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#include <glade/glade.h>
#include <xfconf/xfconf.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "mouse-dialog_glade.h"
@@ -298,13 +297,13 @@
static void
mouse_settings_themes_selection_changed (GtkTreeSelection *selection,
- GladeXML *gxml)
+ GtkBuilder *builder)
{
GtkTreeModel *model;
GtkTreeIter iter;
gboolean has_selection;
gchar *path, *name;
- GtkWidget *image;
+ GObject *image;
has_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
if (G_LIKELY (has_selection))
@@ -314,7 +313,7 @@
COLUMN_THEME_NAME, &name, -1);
/* update the preview widget */
- image = glade_xml_get_widget (gxml, "mouse-theme-preview");
+ image = gtk_builder_get_object (builder, "mouse-theme-preview");
mouse_settings_themes_preview_image (path, GTK_IMAGE (image));
/* write configuration (not during a lock) */
@@ -366,7 +365,7 @@
static void
-mouse_settings_themes_populate_store (GladeXML *gxml)
+mouse_settings_themes_populate_store (GtkBuilder *builder)
{
const gchar *path;
gchar **basedirs;
@@ -387,7 +386,7 @@
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- GtkWidget *treeview;
+ GObject *treeview;
GtkTreeSelection *selection;
gchar *comment_escaped;
@@ -527,11 +526,9 @@
g_free (active_theme);
/* set the treeview store */
- treeview = glade_xml_get_widget (gxml, "mouse-theme-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-theme-treeview");
gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
-#if GTK_CHECK_VERSION (2, 12, 0)
gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), COLUMN_THEME_COMMENT);
-#endif
/* setup the columns */
renderer = gtk_cell_renderer_pixbuf_new ();
@@ -546,7 +543,7 @@
/* setup selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (mouse_settings_themes_selection_changed), gxml);
+ g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (mouse_settings_themes_selection_changed), builder);
/* select the active theme in the treeview */
gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), active_path, NULL, FALSE);
@@ -566,7 +563,7 @@
static void
mouse_settings_device_selection_changed (GtkTreeSelection *selection,
- GladeXML *gxml)
+ GtkBuilder *builder)
{
gint nbuttons;
Display *xdisplay;
@@ -580,7 +577,7 @@
gint id_4 = 0, id_5 = 0;
gdouble acceleration = -1.00;
gint threshold = -1;
- GtkWidget *widget;
+ GObject *object;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean has_selection;
@@ -663,22 +660,22 @@
}
/* update button order */
- widget = glade_xml_get_widget (gxml, id_1 > id_3 ? "mouse-left-handed" : "mouse-right-handed");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+ object = gtk_builder_get_object (builder, id_1 > id_3 ? "mouse-left-handed" : "mouse-right-handed");
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), TRUE);
- widget = glade_xml_get_widget (gxml, "mouse-reverse-scrolling");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), !!(id_5 < id_4));
- gtk_widget_set_sensitive (widget, nbuttons >= 5);
+ object = gtk_builder_get_object (builder, "mouse-reverse-scrolling");
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (object), !!(id_5 < id_4));
+ gtk_widget_set_sensitive (GTK_WIDGET (object), nbuttons >= 5);
/* update acceleration scale */
- widget = glade_xml_get_widget (gxml, "mouse-acceleration-scale");
- gtk_range_set_value (GTK_RANGE (widget), acceleration);
- gtk_widget_set_sensitive (GTK_WIDGET (widget), acceleration != -1);
+ object = gtk_builder_get_object (builder, "mouse-acceleration-scale");
+ gtk_range_set_value (GTK_RANGE (object), acceleration);
+ gtk_widget_set_sensitive (GTK_WIDGET (object), acceleration != -1);
/* update threshold scale */
- widget = glade_xml_get_widget (gxml, "mouse-threshold-scale");
- gtk_range_set_value (GTK_RANGE (widget), threshold);
- gtk_widget_set_sensitive (GTK_WIDGET (widget), threshold != -1);
+ object = gtk_builder_get_object (builder, "mouse-threshold-scale");
+ gtk_range_set_value (GTK_RANGE (object), threshold);
+ gtk_widget_set_sensitive (GTK_WIDGET (object), threshold != -1);
/* flush and remove the x error trap */
gdk_flush ();
@@ -691,29 +688,27 @@
static void
-mouse_settings_device_save (GladeXML *gxml)
+mouse_settings_device_save (GtkBuilder *builder)
{
- GtkWidget *treeview;
+ GObject *treeview;
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean has_selection;
gchar *name;
- GtkWidget *widget;
+ GObject *object;
gchar property_name[512];
gboolean righthanded;
gint threshold;
gdouble acceleration;
gboolean reverse_scrolling;
- g_return_if_fail (GLADE_IS_XML (gxml));
-
/* leave when locked */
if (locked > 0)
return;
/* get the treeview */
- treeview = glade_xml_get_widget (gxml, "mouse-devices-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-devices-treeview");
/* get the selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -727,31 +722,31 @@
if (G_LIKELY (name))
{
/* store the button order */
- widget = glade_xml_get_widget (gxml, "mouse-right-handed");
+ object = gtk_builder_get_object (builder, "mouse-right-handed");
g_snprintf (property_name, sizeof (property_name), "/%s/RightHanded", name);
- righthanded = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ righthanded = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object));
if (!xfconf_channel_has_property (pointers_channel, property_name)
|| xfconf_channel_get_bool (pointers_channel, property_name, TRUE) != righthanded)
xfconf_channel_set_bool (pointers_channel, property_name, righthanded);
/* store reverse scrolling */
- widget = glade_xml_get_widget (gxml, "mouse-reverse-scrolling");
+ object = gtk_builder_get_object (builder, "mouse-reverse-scrolling");
g_snprintf (property_name, sizeof (property_name), "/%s/ReverseScrolling", name);
- reverse_scrolling = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ reverse_scrolling = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object));
if (xfconf_channel_get_bool (pointers_channel, property_name, FALSE) != reverse_scrolling)
xfconf_channel_set_bool (pointers_channel, property_name, reverse_scrolling);
/* store the threshold */
- widget = glade_xml_get_widget (gxml, "mouse-threshold-scale");
+ object = gtk_builder_get_object (builder, "mouse-threshold-scale");
g_snprintf (property_name, sizeof (property_name), "/%s/Threshold", name);
- threshold = gtk_range_get_value (GTK_RANGE (widget));
+ threshold = gtk_range_get_value (GTK_RANGE (object));
if (xfconf_channel_get_int (pointers_channel, property_name, -1) != threshold)
xfconf_channel_set_int (pointers_channel, property_name, threshold);
/* store the acceleration */
- widget = glade_xml_get_widget (gxml, "mouse-acceleration-scale");
+ object = gtk_builder_get_object (builder, "mouse-acceleration-scale");
g_snprintf (property_name, sizeof (property_name), "/%s/Acceleration", name);
- acceleration = gtk_range_get_value (GTK_RANGE (widget));
+ acceleration = gtk_range_get_value (GTK_RANGE (object));
if (xfconf_channel_get_double (pointers_channel, property_name, -1) != acceleration)
xfconf_channel_set_double (pointers_channel, property_name, acceleration);
@@ -767,9 +762,9 @@
mouse_settings_device_name_edited (GtkCellRendererText *renderer,
gchar *path,
gchar *new_name,
- GladeXML *gxml)
+ GtkBuilder *builder)
{
- GtkWidget *treeview;
+ GObject *treeview;
GtkTreeSelection *selection;
gboolean has_selection;
GtkTreeModel *model;
@@ -783,7 +778,7 @@
return;
/* get the treeview's selection */
- treeview = glade_xml_get_widget (gxml, "mouse-devices-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-devices-treeview");
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
/* get the selected item */
@@ -843,8 +838,8 @@
static void
-mouse_settings_device_populate_store (GladeXML *gxml,
- gboolean create_store)
+mouse_settings_device_populate_store (GtkBuilder *builder,
+ gboolean create_store)
{
Display *xdisplay;
XDeviceInfo *device_list, *device_info;
@@ -855,7 +850,7 @@
XAnyClassPtr ptr;
GtkTreeIter iter;
GtkListStore *store;
- GtkWidget *treeview;
+ GObject *treeview;
GtkTreePath *path = NULL;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
@@ -872,7 +867,7 @@
gdk_error_trap_push ();
/* get the treeview */
- treeview = glade_xml_get_widget (gxml, "mouse-devices-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-devices-treeview");
/* create or get the store */
if (G_LIKELY (create_store))
@@ -998,12 +993,12 @@
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes ("", renderer, "markup", COLUMN_DEVICE_DISPLAY_NAME, NULL);
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, "editable", TRUE, NULL);
- g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (mouse_settings_device_name_edited), gxml);
+ g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (mouse_settings_device_name_edited), builder);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
/* setup tree selection */
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
- g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (mouse_settings_device_selection_changed), gxml);
+ g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (mouse_settings_device_selection_changed), builder);
}
/* select the mouse in the tree */
@@ -1028,21 +1023,20 @@
static gboolean
mouse_settings_device_update_sliders (gpointer user_data)
{
- GladeXML *gxml = GLADE_XML (user_data);
- GtkWidget *treeview;
- GtkWidget *button;
+ GtkBuilder *builder = GTK_BUILDER (user_data);
+ GObject *treeview, *button;
GDK_THREADS_ENTER ();
/* get the treeview */
- treeview = glade_xml_get_widget (gxml, "mouse-devices-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-devices-treeview");
/* update */
- mouse_settings_device_selection_changed (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), gxml);
+ mouse_settings_device_selection_changed (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), builder);
/* make the button sensitive again */
- button = glade_xml_get_widget (gxml, "mouse-reset");
- gtk_widget_set_sensitive (button, TRUE);
+ button = gtk_builder_get_object (builder, "mouse-reset");
+ gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
GDK_THREADS_LEAVE ();
@@ -1061,10 +1055,10 @@
static void
-mouse_settings_device_reset (GtkWidget *button,
- GladeXML *gxml)
+mouse_settings_device_reset (GtkWidget *button,
+ GtkBuilder *builder)
{
- GtkWidget *treeview;
+ GObject *treeview;
GtkTreeSelection *selection;
gchar *name, *property_name;
gboolean has_selection;
@@ -1076,7 +1070,7 @@
return;
/* get the treeview */
- treeview = glade_xml_get_widget (gxml, "mouse-devices-treeview");
+ treeview = gtk_builder_get_object (builder, "mouse-devices-treeview");
/* get the selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -1104,7 +1098,7 @@
/* update the sliders in 500ms */
timeout_id = g_timeout_add_full (G_PRIORITY_LOW, 500, mouse_settings_device_update_sliders,
- gxml, mouse_settings_device_list_changed_timeout_destroyed);
+ builder, mouse_settings_device_list_changed_timeout_destroyed);
}
/* cleanup */
@@ -1127,7 +1121,7 @@
if (event->type == device_presence_event_type
&& (dpn_event->devchange == DeviceAdded
|| dpn_event->devchange == DeviceRemoved))
- mouse_settings_device_populate_store (GLADE_XML (user_data), FALSE);
+ mouse_settings_device_populate_store (GTK_BUILDER (user_data), FALSE);
return GDK_FILTER_CONTINUE;
}
@@ -1135,7 +1129,7 @@
static void
-mouse_settings_create_event_filter (GladeXML *gxml)
+mouse_settings_create_event_filter (GtkBuilder *builder)
{
Display *xdisplay;
XEventClass event_class;
@@ -1158,7 +1152,7 @@
gdk_error_trap_pop ();
/* add an event filter */
- gdk_window_add_filter (NULL, mouse_settings_event_filter, gxml);
+ gdk_window_add_filter (NULL, mouse_settings_event_filter, builder);
}
#endif
@@ -1167,13 +1161,12 @@
gint
main (gint argc, gchar **argv)
{
- GtkWidget *dialog;
+ GObject *dialog;
GtkWidget *plug;
- GtkWidget *plug_child;
- GladeXML *gxml;
+ GObject *plug_child;
+ GtkBuilder *builder;
GError *error = NULL;
- GtkAdjustment *adjustment;
- GtkWidget *widget;
+ GObject *object;
XExtensionVersion *version = NULL;
/* setup translation domain */
@@ -1204,7 +1197,7 @@
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
- g_print ("%s\n", "Copyright (c) 2004-2008");
+ g_print ("%s\n", "Copyright (c) 2004-2009");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
@@ -1221,16 +1214,20 @@
return EXIT_FAILURE;
}
-
+
/* check for Xi 1.4 */
version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
{
g_critical ("XI is not present or too old.");
-
+
return EXIT_FAILURE;
}
+ /* hook to make sure the libxfce4ui library is linked */
+ if (xfce_titled_dialog_get_type () == 0)
+ return EXIT_FAILURE;
+
/* open the xsettings and pointers channel */
xsettings_channel = xfconf_channel_new ("xsettings");
pointers_channel = xfconf_channel_new ("pointers");
@@ -1238,8 +1235,9 @@
if (G_LIKELY (pointers_channel && xsettings_channel))
{
/* load the glade xml file */
- gxml = glade_xml_new_from_buffer (mouse_dialog_glade, mouse_dialog_glade_length, NULL, NULL);
- if (G_LIKELY (gxml))
+ builder = gtk_builder_new ();
+ if (gtk_builder_add_from_string (builder, mouse_dialog_glade,
+ mouse_dialog_glade_length, &error) != 0)
{
/* lock */
locked++;
@@ -1248,68 +1246,65 @@
display = gdk_display_get_default ();
/* populate the devices treeview */
- mouse_settings_device_populate_store (gxml, TRUE);
+ mouse_settings_device_populate_store (builder, TRUE);
/* connect signals */
- widget = glade_xml_get_widget (gxml, "mouse-acceleration-scale");
- g_signal_connect_swapped (G_OBJECT (widget), "value-changed", G_CALLBACK (mouse_settings_device_save), gxml);
+ object = gtk_builder_get_object (builder, "mouse-acceleration-scale");
+ g_signal_connect_swapped (G_OBJECT (object), "value-changed", G_CALLBACK (mouse_settings_device_save), builder);
- widget = glade_xml_get_widget (gxml, "mouse-threshold-scale");
- g_signal_connect_swapped (G_OBJECT (widget), "value-changed", G_CALLBACK (mouse_settings_device_save), gxml);
+ object = gtk_builder_get_object (builder, "mouse-threshold-scale");
+ g_signal_connect_swapped (G_OBJECT (object), "value-changed", G_CALLBACK (mouse_settings_device_save), builder);
- widget = glade_xml_get_widget (gxml, "mouse-left-handed");
- g_signal_connect_swapped (G_OBJECT (widget), "toggled", G_CALLBACK (mouse_settings_device_save), gxml);
+ object = gtk_builder_get_object (builder, "mouse-left-handed");
+ g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK (mouse_settings_device_save), builder);
- widget = glade_xml_get_widget (gxml, "mouse-right-handed");
- g_signal_connect_swapped (G_OBJECT (widget), "toggled", G_CALLBACK (mouse_settings_device_save), gxml);
+ object = gtk_builder_get_object (builder, "mouse-right-handed");
+ g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK (mouse_settings_device_save), builder);
- widget = glade_xml_get_widget (gxml, "mouse-reverse-scrolling");
- g_signal_connect_swapped (G_OBJECT (widget), "toggled", G_CALLBACK (mouse_settings_device_save), gxml);
+ object = gtk_builder_get_object (builder, "mouse-reverse-scrolling");
+ g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK (mouse_settings_device_save), builder);
- widget = glade_xml_get_widget (gxml, "mouse-reset");
- g_signal_connect (G_OBJECT (widget), "clicked", G_CALLBACK (mouse_settings_device_reset), gxml);
+ object = gtk_builder_get_object (builder, "mouse-reset");
+ g_signal_connect (G_OBJECT (object), "clicked", G_CALLBACK (mouse_settings_device_reset), builder);
#ifdef HAVE_XCURSOR
/* populate the themes treeview */
- mouse_settings_themes_populate_store (gxml);
+ mouse_settings_themes_populate_store (builder);
/* connect the cursor size in the cursor tab */
- widget = glade_xml_get_widget (gxml, "mouse-cursor-size");
- xfconf_g_property_bind (xsettings_channel, "/Gtk/CursorThemeSize", G_TYPE_INT, G_OBJECT (widget), "value");
+ object = gtk_builder_get_object (builder, "mouse-cursor-size");
+ xfconf_g_property_bind (xsettings_channel, "/Gtk/CursorThemeSize", G_TYPE_INT, G_OBJECT (object), "value");
#else
/* hide the themes tab */
- widget = glade_xml_get_widget (gxml, "mouse-themes-hbox");
- gtk_widget_hide (widget);
+ object = gtk_builder_get_object (builder, "mouse-themes-hbox");
+ gtk_widget_hide (GTK_WIDGET (object));
#endif /* !HAVE_XCURSOR */
/* connect sliders in the gtk tab */
- adjustment = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "mouse-dnd-threshold")));
- xfconf_g_property_bind (xsettings_channel, "/Net/DndDragThreshold", G_TYPE_INT, G_OBJECT (adjustment), "value");
+ object = gtk_builder_get_object (builder, "mouse-dnd-threshold");
+ xfconf_g_property_bind (xsettings_channel, "/Net/DndDragThreshold", G_TYPE_INT, G_OBJECT (object), "value");
- adjustment = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "mouse-double-click-time")));
- xfconf_g_property_bind (xsettings_channel, "/Net/DoubleClickTime", G_TYPE_INT, G_OBJECT (adjustment), "value");
+ object = gtk_builder_get_object (builder, "mouse-double-click-time");
+ xfconf_g_property_bind (xsettings_channel, "/Net/DoubleClickTime", G_TYPE_INT, G_OBJECT (object), "value");
- adjustment = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (gxml, "mouse-double-click-distance")));
- xfconf_g_property_bind (xsettings_channel, "/Net/DoubleClickDistance", G_TYPE_INT, G_OBJECT (adjustment), "value");
+ object = gtk_builder_get_object (builder, "mouse-double-click-distance");
+ xfconf_g_property_bind (xsettings_channel, "/Net/DoubleClickDistance", G_TYPE_INT, G_OBJECT (object), "value");
#ifdef HAS_DEVICE_HOTPLUGGING
/* create the event filter for device monitoring */
- mouse_settings_create_event_filter (gxml);
+ mouse_settings_create_event_filter (builder);
#endif
if (G_UNLIKELY (opt_socket_id == 0))
{
/* get the dialog */
- dialog = glade_xml_get_widget (gxml, "mouse-dialog");
+ dialog = gtk_builder_get_object (builder, "mouse-dialog");
/* unlock */
locked--;
/* show the dialog */
gtk_dialog_run (GTK_DIALOG (dialog));
-
- /* destroy the dialog */
- gtk_widget_destroy (GTK_WIDGET (dialog));
}
else
{
@@ -1322,9 +1317,9 @@
gdk_notify_startup_complete ();
/* Get plug child widget */
- plug_child = glade_xml_get_widget (gxml, "plug-child");
- gtk_widget_reparent (plug_child, plug);
- gtk_widget_show (plug_child);
+ plug_child = gtk_builder_get_object (builder, "plug-child");
+ gtk_widget_reparent (GTK_WIDGET (plug_child), plug);
+ gtk_widget_show (GTK_WIDGET (plug_child));
/* Unlock */
locked--;
@@ -1332,11 +1327,16 @@
/* Enter main loop */
gtk_main ();
}
-
- /* release the glade xml */
- g_object_unref (G_OBJECT (gxml));
}
+ else
+ {
+ g_error ("Failed to load the glade file: %s.", error->message);
+ g_error_free (error);
+ }
+ /* release the glade xml */
+ g_object_unref (G_OBJECT (builder));
+
/* release the channels */
g_object_unref (G_OBJECT (xsettings_channel));
g_object_unref (G_OBJECT (pointers_channel));
Modified: xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/mouse-dialog.glade
===================================================================
--- xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/mouse-dialog.glade 2009-07-11 09:42:25 UTC (rev 30270)
+++ xfce4-settings/branches/migration-to-4ui/dialogs/mouse-settings/mouse-dialog.glade 2009-07-11 10:31:45 UTC (rev 30271)
@@ -1,576 +1,654 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Nov 16 16:10:50 2008 -->
-<glade-interface>
- <requires lib="xfce4"/>
- <widget class="XfceTitledDialog" id="mouse-dialog">
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-requires libxfce4ui 4.5 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkAdjustment" id="mouse-acceleration">
+ <property name="value">2</property>
+ <property name="lower">0.10000000000000001</property>
+ <property name="upper">10</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="mouse-threshold">
+ <property name="value">4</property>
+ <property name="lower">1</property>
+ <property name="upper">30</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ <property name="page_size">5</property>
+ </object>
+ <object class="GtkAdjustment" id="mouse-dnd-threshold">
+ <property name="value">8</property>
+ <property name="lower">1</property>
+ <property name="upper">50</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="mouse-double-click-time">
+ <property name="value">250</property>
+ <property name="lower">100</property>
+ <property name="upper">2000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">100</property>
+ <property name="page_size">100</property>
+ </object>
+ <object class="GtkAdjustment" id="mouse-double-click-distance">
+ <property name="value">4</property>
+ <property name="upper">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ <property name="page_size">5</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="value">24</property>
+ <property name="lower">16</property>
+ <property name="upper">48</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">11</property>
+ </object>
+ <object class="XfceTitledDialog" id="mouse-dialog">
<property name="title" translatable="yes">Mouse</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="icon_name">preferences-desktop-peripherals</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Configure pointer device behavior and appearance</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkNotebook" id="plug-child">
+ <object class="GtkNotebook" id="plug-child">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <object 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="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="mouse-devices-treeview">
+ <object class="GtkTreeView" id="mouse-devices-treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="mouse-right-handed">
+ <object class="GtkRadioButton" id="mouse-right-handed">
+ <property name="label" translatable="yes">_Right handed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Right handed</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkRadioButton" id="mouse-left-handed">
+ <object class="GtkRadioButton" id="mouse-left-handed">
+ <property name="label" translatable="yes">_Left handed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Left handed</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">mouse-right-handed</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="mouse-reverse-scrolling">
+ <object class="GtkCheckButton" id="mouse-reverse-scrolling">
+ <property name="label" translatable="yes">Re_verse scroll direction</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">When selected, the scroll wheel will work in the opposite direction</property>
- <property name="label" translatable="yes">Re_verse scroll direction</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When selected, the scroll wheel will work in the opposite direction</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label4">
+ <child type="label">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Button Order</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Button Order</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="mouse-acceleration-label">
+ <object class="GtkLabel" id="mouse-acceleration-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Acceleration:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mouse-acceleration-scale</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkHScale" id="mouse-acceleration-scale">
+ <object class="GtkHScale" id="mouse-acceleration-scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The factor at which the pointer's speed will increase as the mouse is moved</property>
- <property name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">2 0.10000000000000001 10 0.10000000000000001 1 1</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- </widget>
+ <property name="tooltip_text" translatable="yes">The factor at which the pointer's speed will increase as the mouse is moved</property>
+ <property name="update_policy">delayed</property>
+ <property name="adjustment">mouse-acceleration</property>
+ <property name="value_pos">right</property>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="mouse-threshold-label">
+ <object class="GtkLabel" id="mouse-threshold-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">T_hreshold:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mouse-threshold-scale</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="mouse-threshold-scale">
+ <object class="GtkHScale" id="mouse-threshold-scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The number of pixels the pointer must move in a short time before it starts accelerating</property>
- <property name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">4 1 30 1 5 5</property>
+ <property name="tooltip_text" translatable="yes">The number of pixels the pointer must move in a short time before it starts accelerating</property>
+ <property name="update_policy">delayed</property>
+ <property name="adjustment">mouse-threshold</property>
<property name="digits">0</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- </widget>
+ <property name="value_pos">right</property>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkButton" id="mouse-reset">
+ <object class="GtkButton" id="mouse-reset">
+ <property name="label" translatable="yes">Re_set to Defaults</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Set the acceleration and threshold for the selected device to the default values</property>
- <property name="label" translatable="yes">Re_set to Defaults</property>
+ <property name="tooltip_text" translatable="yes">Set the acceleration and threshold for the selected device to the default values</property>
+ <property name="image">image1</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label5">
+ <child type="label">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Feedback</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Feedback</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1">
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">De_vices</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="mouse-dnd-label">
+ <object class="GtkLabel" id="mouse-dnd-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">T_hreshold:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">mouse-dnd-threshold</property>
- </widget>
+ <property name="mnemonic_widget">mouse-dnd-widget</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkHScale" id="mouse-dnd-threshold">
+ <object class="GtkHScale" id="mouse-dnd-widget">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The number of pixels the pointer must move before a drag operation will start</property>
- <property name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">8 1 50 1 10 10</property>
+ <property name="tooltip_text" translatable="yes">The number of pixels the pointer must move before a drag operation will start</property>
+ <property name="update_policy">delayed</property>
+ <property name="adjustment">mouse-dnd-threshold</property>
<property name="digits">0</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- </widget>
+ <property name="value_pos">right</property>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label6">
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Drag and Drop</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Drag and Drop</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="mouse-double-click-time-label">
+ <object class="GtkLabel" id="mouse-double-click-time-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Ti_me:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">mouse-double-click-time</property>
- </widget>
+ <property name="mnemonic_widget">mouse-double-click-time-widget</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkHScale" id="mouse-double-click-time">
+ <object class="GtkHScale" id="mouse-double-click-time-widget">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click</property>
- <property name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">250 100 2000 10 100 100</property>
+ <property name="tooltip_text" translatable="yes">Two mouse clicks in less than this length of time (in milliseconds) will be considered a double click</property>
+ <property name="update_policy">delayed</property>
+ <property name="adjustment">mouse-double-click-time</property>
<property name="digits">0</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- </widget>
+ <property name="value_pos">right</property>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="mouse-double-click-distance-label">
+ <object class="GtkLabel" id="mouse-double-click-distance-label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Distance:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">mouse-double-click-distance</property>
- </widget>
+ <property name="mnemonic_widget">mouse-double-click-distance-widget</property>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHScale" id="mouse-double-click-distance">
+ <object class="GtkHScale" id="mouse-double-click-distance-widget">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click</property>
- <property name="update_policy">GTK_UPDATE_DELAYED</property>
- <property name="adjustment">4 0 20 1 5 5</property>
+ <property name="tooltip_text" translatable="yes">The mouse pointer cannot move farther than this distance between two clicks for them to be considered a double click</property>
+ <property name="update_policy">delayed</property>
+ <property name="adjustment">mouse-double-click-distance</property>
<property name="digits">0</property>
- <property name="value_pos">GTK_POS_RIGHT</property>
- </widget>
+ <property name="value_pos">right</property>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label8">
+ <child type="label">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Double Click</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Double Click</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">_Behavior</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="mouse-themes-hbox">
+ <object class="GtkHBox" id="mouse-themes-hbox">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <object 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_ETCHED_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">etched-in</property>
<child>
- <widget class="GtkTreeView" id="mouse-theme-treeview">
+ <object class="GtkTreeView" id="mouse-theme-treeview">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox9">
+ <object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label21">
+ <object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="label" translatable="yes">Cursor _Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mouse-cursor-size</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="mouse-cursor-size">
+ <object class="GtkSpinButton" id="mouse-cursor-size">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">24 16 48 1 11 0</property>
+ <property name="adjustment">adjustment6</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label20">
+ <child type="label">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Size</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Size</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame6">
+ <object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkImage" id="mouse-theme-preview">
+ <object class="GtkImage" id="mouse-theme-preview">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label22">
+ <child type="label">
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Preview</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ <property name="label" translatable="yes">Preview</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label3">
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">_Theme</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button1">
+ <object class="GtkButton" id="button1">
+ <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="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="0">button1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ </object>
+</interface>
More information about the Xfce4-commits
mailing list