[gnome-panel] [panel] Port to GtkBuilder
- From: Vincent Untz <vuntz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-panel] [panel] Port to GtkBuilder
- Date: Tue, 11 Aug 2009 14:41:59 +0000 (UTC)
commit a2d5e1d5ded37047abe4349ca147b564f66f2b20
Author: Vincent Untz <vuntz gnome org>
Date: Tue Aug 11 16:39:24 2009 +0200
[panel] Port to GtkBuilder
configure.in | 3 +-
gnome-panel/Makefile.am | 18 +-
gnome-panel/libpanel-util/Makefile.am | 3 +-
gnome-panel/libpanel-util/panel-gtk.h | 36 ++
gnome-panel/panel-properties-dialog.c | 103 +++--
...ies-dialog.glade => panel-properties-dialog.ui} | 444 +++++++++++---------
gnome-panel/panel-run-dialog.c | 61 ++--
...{panel-run-dialog.glade => panel-run-dialog.ui} | 166 ++++----
po/POTFILES.in | 4 +-
9 files changed, 476 insertions(+), 362 deletions(-)
---
diff --git a/configure.in b/configure.in
index f972c0e..4360d22 100644
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,6 @@ GDK_PIXBUF_REQUIRED=2.7.1
PANGO_REQUIRED=1.15.4
GLIB_REQUIRED=2.18.0
GTK_REQUIRED=2.15.1
-LIBGLADE_REQUIRED=2.5.0
LIBGNOME_REQUIRED=2.13.0
LIBGNOMEUI_REQUIRED=2.5.4
LIBBONOBOUI_REQUIRED=2.1.1
@@ -71,7 +70,7 @@ GWEATHER_REQUIRED=2.24.1
dnl pkg-config dependency checks
-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
+PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 3ccd4b6..b72f231 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = \
-I$(top_builddir)/gnome-panel/libpanel-util \
-DPANEL_DEBUG \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
+ -DBUILDERDIR=\""$(uidir)"\" \
-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\" \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS) \
@@ -174,18 +174,18 @@ gnome_desktop_item_edit_LDADD = \
$(PANEL_LIBS) \
$(X_LIBS)
-gladedir = $(datadir)/gnome-panel/glade
-glade_DATA = \
- panel-properties-dialog.glade \
- panel-run-dialog.glade
+uidir = $(datadir)/gnome-panel/ui
+ui_DATA = \
+ panel-properties-dialog.ui \
+ panel-run-dialog.ui
EXTRA_DIST = \
- $(glade_DATA) \
+ $(ui_DATA) \
nothing.cP \
nothing.h \
$(schemas_in_files) \
panel-compatibility.schemas \
- $(ui_DATA) \
+ $(xmlui_DATA) \
panel-marshal.list \
gnome-panelrc \
$(entries_DATA) \
@@ -233,8 +233,8 @@ panel-typebuiltins.h: @REBUILD@ $(panel_enum_headers)
--eprod "GType @enum_name _get_type (void);\n" \
$(panel_enum_headers) > $@
-uidir = $(datadir)/gnome-2.0/ui
-ui_DATA = GNOME_Panel_Popup.xml
+xmluidir = $(datadir)/gnome-2.0/ui
+xmlui_DATA = GNOME_Panel_Popup.xml
rcdir = $(datadir)
rc_DATA = gnome-panelrc
diff --git a/gnome-panel/libpanel-util/Makefile.am b/gnome-panel/libpanel-util/Makefile.am
index d13b72c..38beeb5 100644
--- a/gnome-panel/libpanel-util/Makefile.am
+++ b/gnome-panel/libpanel-util/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
-I$(top_builddir)/gnome-panel/libpanel-util \
-DPANEL_DEBUG \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
+ -DBUILDERDIR=\""$(uidir)"\" \
-DICONDIR=\""$(datadir)/gnome-panel/pixmaps"\" \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS) \
@@ -28,6 +28,7 @@ libpanel_util_la_SOURCES= \
panel-error.h \
panel-glib.c \
panel-glib.h \
+ panel-gtk.h \
panel-keyfile.c \
panel-keyfile.h \
panel-launch.c \
diff --git a/gnome-panel/libpanel-util/panel-gtk.h b/gnome-panel/libpanel-util/panel-gtk.h
new file mode 100644
index 0000000..e293420
--- /dev/null
+++ b/gnome-panel/libpanel-util/panel-gtk.h
@@ -0,0 +1,36 @@
+/*
+ * panel-gtk.h: various small extensions to gtk+
+ *
+ * Copyright (C) 2009 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Authors:
+ * Vincent Untz <vuntz gnome org>
+ */
+
+#ifndef PANEL_GTK_H
+#define PANEL_GTK_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define PANEL_GTK_BUILDER_GET(builder, name) GTK_WIDGET (gtk_builder_get_object (builder, name))
+
+G_END_DECLS
+
+#endif /* PANEL_GTK_H */
diff --git a/gnome-panel/panel-properties-dialog.c b/gnome-panel/panel-properties-dialog.c
index 5efd7b8..7c7a7cc 100644
--- a/gnome-panel/panel-properties-dialog.c
+++ b/gnome-panel/panel-properties-dialog.c
@@ -27,12 +27,12 @@
#include "panel-properties-dialog.h"
#include <string.h>
-#include <glade/glade-xml.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-icon-entry.h>
#include <libpanel-util/panel-error.h>
#include <libpanel-util/panel-glib.h>
+#include <libpanel-util/panel-gtk.h>
#include <libpanel-util/panel-show.h>
#include "nothing.h"
@@ -155,7 +155,7 @@ panel_properties_dialog_orientation_changed (PanelPropertiesDialog *dialog,
static void
panel_properties_dialog_setup_orientation_combo (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
PanelOrientation orientation;
GtkListStore *model;
@@ -163,9 +163,9 @@ panel_properties_dialog_setup_orientation_combo (PanelPropertiesDialog *dialog,
GtkCellRenderer *renderer;
int i;
- dialog->orientation_combo = glade_xml_get_widget (gui, "orientation_combo");
+ dialog->orientation_combo = PANEL_GTK_BUILDER_GET (gui, "orientation_combo");
g_return_if_fail (dialog->orientation_combo != NULL);
- dialog->orientation_label = glade_xml_get_widget (gui, "orientation_label");
+ dialog->orientation_label = PANEL_GTK_BUILDER_GET (gui, "orientation_label");
g_return_if_fail (dialog->orientation_label != NULL);
orientation = panel_profile_get_toplevel_orientation (dialog->toplevel);
@@ -215,15 +215,15 @@ panel_properties_dialog_size_changed (PanelPropertiesDialog *dialog,
static void
panel_properties_dialog_setup_size_spin (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
- dialog->size_widgets = glade_xml_get_widget (gui, "size_widgets");
+ dialog->size_widgets = PANEL_GTK_BUILDER_GET (gui, "size_widgets");
g_return_if_fail (dialog->size_widgets != NULL);
- dialog->size_spin = glade_xml_get_widget (gui, "size_spin");
+ dialog->size_spin = PANEL_GTK_BUILDER_GET (gui, "size_spin");
g_return_if_fail (dialog->size_spin != NULL);
- dialog->size_label = glade_xml_get_widget (gui, "size_label");
+ dialog->size_label = PANEL_GTK_BUILDER_GET (gui, "size_label");
g_return_if_fail (dialog->size_label != NULL);
- dialog->size_label_pixels = glade_xml_get_widget (gui, "size_label_pixels");
+ dialog->size_label_pixels = PANEL_GTK_BUILDER_GET (gui, "size_label_pixels");
g_return_if_fail (dialog->size_label_pixels != NULL);
gtk_spin_button_set_range (GTK_SPIN_BUTTON (dialog->size_spin),
@@ -275,17 +275,20 @@ panel_properties_dialog_icon_changed (PanelPropertiesDialog *dialog,
static void
panel_properties_dialog_setup_icon_entry (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
char *custom_icon;
- dialog->icon_align = glade_xml_get_widget (gui, "icon_align");
+ dialog->icon_align = PANEL_GTK_BUILDER_GET (gui, "icon_align");
g_return_if_fail (dialog->icon_align != NULL);
- dialog->icon_entry = glade_xml_get_widget (gui, "icon_entry");
- g_return_if_fail (dialog->icon_entry != NULL);
+ dialog->icon_entry = gnome_icon_entry_new ("panel-drawer-icon",
+ _("Browse icons"));
+ gtk_widget_show (dialog->icon_entry);
+ gtk_container_add (GTK_CONTAINER (dialog->icon_align),
+ dialog->icon_entry);
- dialog->icon_label = glade_xml_get_widget (gui, "icon_label");
+ dialog->icon_label = PANEL_GTK_BUILDER_GET (gui, "icon_label");
g_return_if_fail (dialog->icon_label != NULL);
dialog->icon_theme_dir = NULL;
@@ -337,9 +340,9 @@ panel_properties_dialog_setup_icon_entry (PanelPropertiesDialog *dialog,
} \
static void \
panel_properties_dialog_setup_##n (PanelPropertiesDialog *dialog, \
- GladeXML *gui) \
+ GtkBuilder *gui) \
{ \
- dialog->n = glade_xml_get_widget (gui, wid); \
+ dialog->n = PANEL_GTK_BUILDER_GET (gui, wid); \
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->n), \
panel_profile_get_toplevel_##p (dialog->toplevel)); \
g_signal_connect_swapped (dialog->n, "toggled", \
@@ -369,13 +372,13 @@ panel_properties_dialog_color_changed (PanelPropertiesDialog *dialog,
static void
panel_properties_dialog_setup_color_button (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
PanelColor color;
- dialog->color_button = glade_xml_get_widget (gui, "color_button");
+ dialog->color_button = PANEL_GTK_BUILDER_GET (gui, "color_button");
g_return_if_fail (dialog->color_button != NULL);
- dialog->color_label = glade_xml_get_widget (gui, "color_label");
+ dialog->color_label = PANEL_GTK_BUILDER_GET (gui, "color_label");
g_return_if_fail (dialog->color_label != NULL);
panel_profile_get_background_color (dialog->toplevel, &color);
@@ -441,13 +444,13 @@ panel_properties_dialog_chooser_preview_update (GtkFileChooser *file_chooser,
static void
panel_properties_dialog_setup_image_chooser (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
GtkFileFilter *filter;
GtkWidget *chooser_preview;
char *image;
- dialog->image_chooser = glade_xml_get_widget (gui, "image_chooser");
+ dialog->image_chooser = PANEL_GTK_BUILDER_GET (gui, "image_chooser");
filter = gtk_file_filter_new ();
gtk_file_filter_add_pixbuf_formats (filter);
@@ -503,16 +506,16 @@ panel_properties_dialog_opacity_changed (PanelPropertiesDialog *dialog)
static void
panel_properties_dialog_setup_opacity_scale (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
guint16 opacity;
gdouble percentage;
- dialog->opacity_scale = glade_xml_get_widget (gui, "opacity_scale");
+ dialog->opacity_scale = PANEL_GTK_BUILDER_GET (gui, "opacity_scale");
g_return_if_fail (dialog->opacity_scale != NULL);
- dialog->opacity_label = glade_xml_get_widget (gui, "opacity_label");
+ dialog->opacity_label = PANEL_GTK_BUILDER_GET (gui, "opacity_label");
g_return_if_fail (dialog->opacity_label != NULL);
- dialog->opacity_legend = glade_xml_get_widget (gui, "opacity_legend");
+ dialog->opacity_legend = PANEL_GTK_BUILDER_GET (gui, "opacity_legend");
g_return_if_fail (dialog->opacity_legend != NULL);
opacity = panel_profile_get_background_opacity (dialog->toplevel);
@@ -568,16 +571,16 @@ panel_properties_dialog_background_toggled (PanelPropertiesDialog *dialog,
static void
panel_properties_dialog_setup_background_radios (PanelPropertiesDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
PanelBackgroundType background_type;
GtkWidget *active_radio;
- dialog->default_radio = glade_xml_get_widget (gui, "default_radio");
- dialog->color_radio = glade_xml_get_widget (gui, "color_radio");
- dialog->image_radio = glade_xml_get_widget (gui, "image_radio");
- dialog->color_widgets = glade_xml_get_widget (gui, "color_widgets");
- dialog->image_widgets = glade_xml_get_widget (gui, "image_widgets");
+ dialog->default_radio = PANEL_GTK_BUILDER_GET (gui, "default_radio");
+ dialog->color_radio = PANEL_GTK_BUILDER_GET (gui, "color_radio");
+ dialog->image_radio = PANEL_GTK_BUILDER_GET (gui, "image_radio");
+ dialog->color_widgets = PANEL_GTK_BUILDER_GET (gui, "color_widgets");
+ dialog->image_widgets = PANEL_GTK_BUILDER_GET (gui, "image_widgets");
background_type = panel_profile_get_background_type (dialog->toplevel);
switch (background_type) {
@@ -954,7 +957,7 @@ panel_properties_dialog_update_for_attached (PanelPropertiesDialog *dialog,
static PanelPropertiesDialog *
panel_properties_dialog_new (PanelToplevel *toplevel,
- GladeXML *gui)
+ GtkBuilder *gui)
{
PanelPropertiesDialog *dialog;
@@ -967,7 +970,7 @@ panel_properties_dialog_new (PanelToplevel *toplevel,
dialog->toplevel = toplevel;
- dialog->properties_dialog = glade_xml_get_widget (gui, "panel_properties_dialog");
+ dialog->properties_dialog = PANEL_GTK_BUILDER_GET (gui, "panel_properties_dialog");
g_signal_connect_swapped (dialog->properties_dialog, "response",
G_CALLBACK (panel_properties_dialog_response), dialog);
g_signal_connect_swapped (dialog->properties_dialog, "destroy",
@@ -976,11 +979,11 @@ panel_properties_dialog_new (PanelToplevel *toplevel,
gtk_window_set_screen (GTK_WINDOW (dialog->properties_dialog),
gtk_window_get_screen (GTK_WINDOW (toplevel)));
- dialog->writability_warn_general = glade_xml_get_widget (gui, "writability_warn_general");
- dialog->writability_warn_background = glade_xml_get_widget (gui, "writability_warn_background");
+ dialog->writability_warn_general = PANEL_GTK_BUILDER_GET (gui, "writability_warn_general");
+ dialog->writability_warn_background = PANEL_GTK_BUILDER_GET (gui, "writability_warn_background");
- dialog->general_vbox = glade_xml_get_widget (gui, "general_vbox");
- dialog->general_table = glade_xml_get_widget (gui, "general_table");
+ dialog->general_vbox = PANEL_GTK_BUILDER_GET (gui, "general_vbox");
+ dialog->general_table = PANEL_GTK_BUILDER_GET (gui, "general_table");
panel_properties_dialog_setup_orientation_combo (dialog, gui);
panel_properties_dialog_setup_size_spin (dialog, gui);
@@ -1024,7 +1027,7 @@ panel_properties_dialog_new (PanelToplevel *toplevel,
g_signal_connect (dialog->properties_dialog, "event",
G_CALLBACK (config_event),
- glade_xml_get_widget (gui, "notebook"));
+ PANEL_GTK_BUILDER_GET (gui, "notebook"));
gtk_widget_show (dialog->properties_dialog);
@@ -1035,7 +1038,8 @@ void
panel_properties_dialog_present (PanelToplevel *toplevel)
{
PanelPropertiesDialog *dialog;
- GladeXML *gui;
+ GtkBuilder *gui;
+ GError *error;
if (!panel_properties_dialog_quark)
panel_properties_dialog_quark =
@@ -1049,19 +1053,28 @@ panel_properties_dialog_present (PanelToplevel *toplevel)
return;
}
- gui = glade_xml_new (GLADEDIR "/panel-properties-dialog.glade",
- "panel_properties_dialog",
- NULL);
- if (gui == NULL) {
+ gui = gtk_builder_new ();
+
+ error = NULL;
+ gtk_builder_add_from_file (gui,
+ BUILDERDIR "/panel-properties-dialog.ui",
+ &error);
+
+ if (error) {
char *secondary;
- secondary = g_strdup_printf (_("Unable to load file '%s'."),
- GLADEDIR"/panel-properties-dialog.glade");
+
+ secondary = g_strdup_printf (_("Unable to load file '%s': %s."),
+ BUILDERDIR"/panel-properties-dialog.ui",
+ error->message);
panel_error_dialog (GTK_WINDOW (toplevel),
gtk_window_get_screen (GTK_WINDOW (toplevel)),
"cannot_display_properties_dialog", TRUE,
_("Could not display properties dialog"),
secondary);
g_free (secondary);
+ g_error_free (error);
+ g_object_unref (gui);
+
return;
}
diff --git a/gnome-panel/panel-properties-dialog.glade b/gnome-panel/panel-properties-dialog.ui
similarity index 72%
rename from gnome-panel/panel-properties-dialog.glade
rename to gnome-panel/panel-properties-dialog.ui
index b607e5e..7db8b1f 100644
--- a/gnome-panel/panel-properties-dialog.glade
+++ b/gnome-panel/panel-properties-dialog.ui
@@ -1,69 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
- <requires lib="gnome"/>
- <widget class="GtkDialog" id="panel_properties_dialog">
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="panel_properties_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Panel Properties</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</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="notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">5</property>
<child>
- <widget class="GtkVBox" id="general_vbox">
+ <object class="GtkVBox" id="general_vbox">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="writability_warn_general">
+ <object class="GtkHBox" id="writability_warn_general">
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-dialog-warning</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="label" translatable="yes">Some of these properties are locked down</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkTable" id="general_table">
+ <object class="GtkTable" id="general_table">
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="icon_align">
+ <object class="GtkAlignment" id="icon_align">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
<child>
- <widget class="GnomeIconEntry" id="icon_entry">
- <property name="visible">True</property>
- <property name="max_saved">10</property>
- </widget>
+ <placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -74,14 +78,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="icon_label">
+ <object class="GtkLabel" id="icon_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">_Icon:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -90,30 +94,33 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="size_widgets">
+ <object class="GtkHBox" id="size_widgets">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkSpinButton" id="size_spin">
+ <object class="GtkSpinButton" id="size_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">12 12 120 1 12 0</property>
+ <property name="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="size_label_pixels">
+ <object class="GtkLabel" id="size_label_pixels">
<property name="visible">True</property>
<property name="label" translatable="yes">pixels</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -124,13 +131,13 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="size_label">
+ <object class="GtkLabel" id="size_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">size_spin</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -139,9 +146,9 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="orientation_combo">
+ <object class="GtkComboBox" id="orientation_combo">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -150,32 +157,32 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="orientation_label">
+ <object class="GtkLabel" id="orientation_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Orientation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">orientation_combo</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="expand_toggle">
+ <object class="GtkCheckButton" id="expand_toggle">
+ <property name="label" translatable="yes">E_xpand</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">E_xpand</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -183,14 +190,14 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="autohide_toggle">
+ <object class="GtkCheckButton" id="autohide_toggle">
+ <property name="label" translatable="yes">_Autohide</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Autohide</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -198,112 +205,119 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="hidebuttons_toggle">
+ <object class="GtkCheckButton" id="hidebuttons_toggle">
+ <property name="label" translatable="yes">Show hide _buttons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show hide _buttons</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="arrows_toggle">
+ <object class="GtkCheckButton" id="arrows_toggle">
+ <property name="label" translatable="yes">Arro_ws on hide buttons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Arro_ws on hide buttons</property>
+ <property name="receives_default">False</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">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
- <property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label4">
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">General</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
- <property name="tab_expand">False</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="writability_warn_background">
+ <object class="GtkHBox" id="writability_warn_background">
<child>
- <widget class="GtkImage" id="image2">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-dialog-warning</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label20">
+ <object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="label" translatable="yes">Some of these properties are locked down</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkRadioButton" id="default_radio">
+ <object class="GtkRadioButton" id="default_radio">
+ <property name="label" translatable="yes">_None (use system theme)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_None (use system theme)</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -311,56 +325,57 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="color_radio">
+ <object class="GtkRadioButton" id="color_radio">
+ <property name="label" translatable="yes">Solid c_olor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Solid c_olor</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">default_radio</property>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="color_widgets">
+ <object class="GtkHBox" id="color_widgets">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label18">
+ <object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table3">
+ <object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkColorButton" id="color_button">
+ <object class="GtkColorButton" id="color_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<property name="title" translatable="yes">Pick a color</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -369,13 +384,13 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="opacity_label">
+ <object class="GtkLabel" id="opacity_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">S_tyle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">opacity_scale</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -384,15 +399,15 @@
</packing>
</child>
<child>
- <widget class="GtkHScale" id="opacity_scale">
+ <object class="GtkHScale" id="opacity_scale">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">33.75 0 100 5 10 0</property>
+ <property name="adjustment">adjustment1</property>
<property name="draw_value">False</property>
<accessibility>
- <atkrelation target="opacity_label" type="labelled-by"/>
+ <relation type="labelled-by" target="opacity_label"/>
</accessibility>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -401,30 +416,30 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="color_label">
+ <object class="GtkLabel" id="color_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Co_lor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">color_button</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="opacity_legend">
+ <object class="GtkHBox" id="opacity_legend">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label16">
+ <object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"><small>Transparent</small></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -432,20 +447,21 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label15">
+ <object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"><small>Opaque</small></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -454,189 +470,193 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="image_radio">
+ <object class="GtkRadioButton" id="image_radio">
+ <property name="label" translatable="yes">Background _image:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Background _image:</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">default_radio</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="image_widgets">
+ <object class="GtkHBox" id="image_widgets">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="image_chooser">
+ <object class="GtkFileChooserButton" id="image_chooser">
<property name="visible">True</property>
<property name="title" translatable="yes">Select background</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
- <property name="tab_expand">False</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label5">
+ <child type="tab">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Background</property>
- </widget>
+ </object>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
- <property name="tab_expand">False</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>
<child>
- <widget class="GtkButton" id="helpbutton1">
+ <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="label">gtk-help</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-11</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="closebutton1">
+ <object class="GtkButton" id="closebutton1">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-7</property>
- </widget>
+ </object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</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>
- <widget class="GtkDialog" id="image_details_dialog">
- <property name="visible">True</property>
+ <action-widgets>
+ <action-widget response="-11">helpbutton1</action-widget>
+ <action-widget response="-7">closebutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="image_details_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Image Background Details</property>
<property name="resizable">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GnomePixmapEntry" id="image_entry">
- <property name="visible">True</property>
- <property name="max_saved">10</property>
- <child internal-child="entry">
- <widget class="GtkEntry" id="combo-entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="tile_radio">
+ <object class="GtkRadioButton" id="tile_radio">
+ <property name="label" translatable="yes">_Tile</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Tile</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="scale_radio">
+ <object class="GtkRadioButton" id="scale_radio">
+ <property name="label" translatable="yes">_Scale</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Scale</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">tile_radio</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -644,42 +664,42 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="stretch_radio">
+ <object class="GtkRadioButton" id="stretch_radio">
+ <property name="label" translatable="yes">St_retch</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">St_retch</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
<property name="group">tile_radio</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="rotate_toggle">
+ <object class="GtkCheckButton" id="rotate_toggle">
+ <property name="label" translatable="yes">Rotate image when panel is _vertical</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Rotate image when panel is _vertical</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -687,39 +707,63 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="helpbutton2">
+ <object class="GtkButton" id="helpbutton2">
+ <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="label">gtk-help</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-11</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="closebutton2">
+ <object class="GtkButton" id="closebutton2">
+ <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="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-7</property>
- </widget>
+ </object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</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="-11">helpbutton2</action-widget>
+ <action-widget response="-7">closebutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="value">33.75</property>
+ <property name="upper">100</property>
+ <property name="step_increment">5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="value">12</property>
+ <property name="lower">12</property>
+ <property name="upper">120</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
+</interface>
diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
index 975f91e..32733c2 100644
--- a/gnome-panel/panel-run-dialog.c
+++ b/gnome-panel/panel-run-dialog.c
@@ -40,7 +40,6 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gdk/gdkkeysyms.h>
-#include <glade/glade-xml.h>
#include <gconf/gconf-client.h>
#include <gmenu-tree.h>
@@ -49,6 +48,7 @@
#include <libpanel-util/panel-error.h>
#include <libpanel-util/panel-glib.h>
+#include <libpanel-util/panel-gtk.h>
#include <libpanel-util/panel-keyfile.h>
#include <libpanel-util/panel-show.h>
@@ -1122,14 +1122,14 @@ program_list_selection_activated (GtkTreeView *view,
static void
panel_run_dialog_setup_program_list (PanelRunDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
GtkTreeSelection *selection;
- dialog->program_list = glade_xml_get_widget (gui, "program_list");
- dialog->program_list_box = glade_xml_get_widget (gui, "program_list_box");
- dialog->program_label = glade_xml_get_widget (gui, "program_label");
- dialog->main_box = glade_xml_get_widget (gui, "main_box");
+ dialog->program_list = PANEL_GTK_BUILDER_GET (gui, "program_list");
+ dialog->program_list_box = PANEL_GTK_BUILDER_GET (gui, "program_list_box");
+ dialog->program_label = PANEL_GTK_BUILDER_GET (gui, "program_label");
+ dialog->main_box = PANEL_GTK_BUILDER_GET (gui, "main_box");
/* Ref the box so it doesn't get destroyed when it is
* removed from the visible area of the dialog box.
@@ -1197,12 +1197,12 @@ list_expander_toggled (GtkExpander *expander,
static void
panel_run_dialog_setup_list_expander (PanelRunDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
GConfClient *client;
const char *key;
- dialog->list_expander = glade_xml_get_widget (gui, "list_expander");
+ dialog->list_expander = PANEL_GTK_BUILDER_GET (gui, "list_expander");
if (panel_profile_get_enable_program_list ()) {
gtk_expander_set_expanded (GTK_EXPANDER (dialog->list_expander),
@@ -1273,9 +1273,9 @@ file_button_clicked (GtkButton *button,
static void
panel_run_dialog_setup_file_button (PanelRunDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
- dialog->file_button = glade_xml_get_widget (gui, "file_button");
+ dialog->file_button = PANEL_GTK_BUILDER_GET (gui, "file_button");
g_signal_connect (dialog->file_button, "clicked",
G_CALLBACK (file_button_clicked),
@@ -1734,13 +1734,13 @@ entry_drag_data_received (GtkEditable *entry,
static void
panel_run_dialog_setup_entry (PanelRunDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
GdkScreen *screen;
int width_request;
GtkWidget *entry;
- dialog->combobox = glade_xml_get_widget (gui, "comboboxentry");
+ dialog->combobox = PANEL_GTK_BUILDER_GET (gui, "comboboxentry");
entry = gtk_bin_get_child (GTK_BIN (dialog->combobox));
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
@@ -1906,9 +1906,9 @@ panel_run_dialog_screen_changed (GtkWidget *widget,
static void
panel_run_dialog_setup_pixmap (PanelRunDialog *dialog,
- GladeXML *gui)
+ GtkBuilder *gui)
{
- dialog->pixmap = glade_xml_get_widget (gui, "icon_pixmap");
+ dialog->pixmap = PANEL_GTK_BUILDER_GET (gui, "icon_pixmap");
g_signal_connect (dialog->pixmap, "style-set",
G_CALLBACK (panel_run_dialog_style_set),
@@ -1923,15 +1923,15 @@ panel_run_dialog_setup_pixmap (PanelRunDialog *dialog,
}
static PanelRunDialog *
-panel_run_dialog_new (GdkScreen *screen,
- GladeXML *gui,
+panel_run_dialog_new (GdkScreen *screen,
+ GtkBuilder *gui,
guint32 activate_time)
{
PanelRunDialog *dialog;
dialog = g_new0 (PanelRunDialog, 1);
- dialog->run_dialog = glade_xml_get_widget (gui, "panel_run_dialog");
+ dialog->run_dialog = PANEL_GTK_BUILDER_GET (gui, "panel_run_dialog");
g_signal_connect_swapped (dialog->run_dialog, "response",
G_CALLBACK (panel_run_dialog_response), dialog);
@@ -1939,8 +1939,8 @@ panel_run_dialog_new (GdkScreen *screen,
g_signal_connect_swapped (dialog->run_dialog, "destroy",
G_CALLBACK (panel_run_dialog_destroy), dialog);
- dialog->run_button = glade_xml_get_widget (gui, "run_button");
- dialog->terminal_checkbox = glade_xml_get_widget (gui, "terminal_checkbox");
+ dialog->run_button = PANEL_GTK_BUILDER_GET (gui, "run_button");
+ dialog->terminal_checkbox = PANEL_GTK_BUILDER_GET (gui, "terminal_checkbox");
panel_run_dialog_setup_pixmap (dialog, gui);
panel_run_dialog_setup_entry (dialog, gui);
@@ -1990,7 +1990,8 @@ void
panel_run_dialog_present (GdkScreen *screen,
guint32 activate_time)
{
- GladeXML *gui;
+ GtkBuilder *gui;
+ GError *error;
if (panel_lockdown_get_disable_command_line ())
return;
@@ -2003,19 +2004,27 @@ panel_run_dialog_present (GdkScreen *screen,
return;
}
- gui = glade_xml_new (GLADEDIR "/panel-run-dialog.glade",
- "panel_run_dialog",
- NULL);
- if (!gui) {
+ gui = gtk_builder_new ();
+
+ error = NULL;
+ gtk_builder_add_from_file (gui,
+ BUILDERDIR "/panel-run-dialog.ui",
+ &error);
+
+ if (error) {
char *secondary;
- secondary = g_strdup_printf (_("Unable to load file '%s'."),
- GLADEDIR"/panel-run-dialog.glade");
+ secondary = g_strdup_printf (_("Unable to load file '%s': %s."),
+ BUILDERDIR"/panel-run-dialog.ui",
+ error->message);
panel_error_dialog (NULL, screen, "cannot_display_run_dialog",
TRUE,
_("Could not display run dialog"),
secondary);
g_free (secondary);
+ g_error_free (error);
+ g_object_unref (gui);
+
return;
}
diff --git a/gnome-panel/panel-run-dialog.glade b/gnome-panel/panel-run-dialog.ui
similarity index 68%
rename from gnome-panel/panel-run-dialog.glade
rename to gnome-panel/panel-run-dialog.ui
index 8398abd..7ee0ab8 100644
--- a/gnome-panel/panel-run-dialog.glade
+++ b/gnome-panel/panel-run-dialog.ui
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.16 -->
+<interface>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="panel_run_dialog">
+ <object class="GtkDialog" id="panel_run_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Run Application</property>
<property name="resizable">False</property>
@@ -10,37 +10,41 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</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="GtkVBox" id="main_box">
+ <object class="GtkVBox" id="main_box">
<property name="visible">True</property>
<property name="border_width">5</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="entry_box">
+ <object class="GtkHBox" id="entry_box">
<property name="visible">True</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkImage" id="icon_pixmap">
+ <object class="GtkImage" id="icon_pixmap">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-missing-image</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">Command icon</atkproperty>
- <atkproperty name="AtkObject::accessible-description" translatable="yes">The icon of the command to be run.</atkproperty>
- </accessibility>
- </widget>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="icon_pixmap-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Command icon</property>
+ <property name="AtkObject::accessible-description" translatable="yes">The icon of the command to be run.</property>
+ </object>
+ </child>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -49,103 +53,111 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkComboBoxEntry" id="comboboxentry">
+ <object class="GtkComboBoxEntry" id="comboboxentry">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkCheckButton" id="terminal_checkbox">
+ <object class="GtkCheckButton" id="terminal_checkbox">
<property name="label" translatable="yes">Run in _terminal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-description" translatable="yes">Select this box to run the command in a terminal window.</atkproperty>
- </accessibility>
- </widget>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="terminal_checkbox-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Select this box to run the command in a terminal window.</property>
+ </object>
+ </child>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="file_button">
+ <object class="GtkButton" id="file_button">
<property name="label" translatable="yes">Run with _file...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-description" translatable="yes">Click this button to browse for a file whose name to append to the command string.</atkproperty>
- </accessibility>
- </widget>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="file_button-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Click this button to browse for a file whose name to append to the command string.</property>
+ </object>
+ </child>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkExpander" id="list_expander">
+ <object class="GtkExpander" id="list_expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="expanded">True</property>
<child>
- <widget class="GtkVBox" id="program_list_box">
+ <object class="GtkVBox" id="program_list_box">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</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">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="program_list">
+ <object class="GtkTreeView" id="program_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">List of known applications</atkproperty>
- </accessibility>
- </widget>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="program_list-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">List of known applications</property>
+ </object>
+ </child>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="program_label">
+ <object class="GtkLabel" id="program_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -153,51 +165,46 @@
<property name="label" translatable="yes">Select an application to view its description.</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label3">
+ <child type="label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Show list of known _applications</property>
<property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</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">end</property>
<child>
- <widget class="GtkButton" id="help_button">
+ <object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
- <property name="response_id">-11</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>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -205,15 +212,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</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>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -221,31 +227,32 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="run_button">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="run_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-description" translatable="yes">Click this button to run the selected application or the command in the command entry field.</atkproperty>
- </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="run_button-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Click this button to run the selected application or the command in the command entry field.</property>
+ </object>
+ </child>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="stock">gtk-execute</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -253,38 +260,43 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Run</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</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="-11">help_button</action-widget>
+ <action-widget response="-6">cancel_button</action-widget>
+ <action-widget response="-5">run_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3dc1c3b..da97a46 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -65,10 +65,10 @@ gnome-panel/panel-menu-items.c
gnome-panel/panel-object.schemas.in
gnome-panel/panel-profile.c
gnome-panel/panel-properties-dialog.c
-gnome-panel/panel-properties-dialog.glade
+gnome-panel/panel-properties-dialog.ui
gnome-panel/panel-recent.c
gnome-panel/panel-run-dialog.c
-gnome-panel/panel-run-dialog.glade
+gnome-panel/panel-run-dialog.ui
gnome-panel/panel-separator.c
gnome-panel/panel-shell.c
gnome-panel/panel-stock-icons.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
