Commit f6312f64 authored by Jean Bréfort's avatar Jean Bréfort

Make gnumeric build against Gtk+-3.0.

parent 1a183237
......@@ -53,6 +53,10 @@
* src/workbook-view.c (wb_view_auto_expr_recalc): use
format_value_layout
2011-08-01 Jean Brefort <jean.brefort@normalesup.org>
* all: make things build against gtk+-3.0.
2011-07-31 Morten Welinder <terra@gnome.org>
* configure.in: Post-release bump.
......
......@@ -5,6 +5,9 @@ Andreas:
[#584380][#651561]
* Clarify the distinction beween open/save and import/export.
Jean:
* Make things build against gtk+-3.0.
--------------------------------------------------------------------------
Gnumeric 1.10.17
......
......@@ -159,7 +159,7 @@ gnumeric_reqs="$libspreadsheet_reqs
pangocairo >= 1.10.0
"
libspreadsheet_gtk_reqs="
gtk+-2.0 >= 2.12.0
gtk+-3.0 >= 3.0.0
"
gnumeric_gtk_reqs="$libspreadsheet_gtk_reqs"
......@@ -271,7 +271,7 @@ fi
AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
dnl disable for in stable release, enable for development series
if test XXX$gnumeric_devel = yes; then
if test $gnumeric_devel = yes; then
CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
if test "x$gnumeric_with_gtk" = xtrue; then
......@@ -1092,6 +1092,7 @@ AC_SUBST(gnumeric_icondir, '${datadir}/pixmaps/gnumeric')
AC_SUBST(gnumeric_localedir, '${prefix}/${DATADIRNAME}/locale')
dnl
AC_SUBST(gnumeric_plugindir, '${gnumeric_libdir}/plugins')
AC_SUBST(gnumeric_externplugindir, '${libdir}/gnumeric/${GNUMERIC_API_VER}/plugins')
AC_SUBST(YYYYMMDD, `date +%Y%m%d`)
......@@ -1106,6 +1107,8 @@ AC_DEFINE(GNM_VERSION_MINOR, gnumeric_version_minor,
[The Minor version number of this release])
AC_DEFINE(GNM_VERSION_EXTRA, "gnumeric_version_extra",
[Extra, possibly empty tag for this release])
AC_DEFINE(GNM_API_VERSION, "GNUMERIC_API_VER",
[The API version number of this release])
AC_OUTPUT([
gnumeric.spec
......
......@@ -12,11 +12,11 @@ Name: libspreadsheet
Description: The spreadsheet internals of Gnumeric (DEVELOPMENT VERSION)
Version: @VERSION@
URL: http://www.gnumeric.org
Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 ${libgoffice}
Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-3.0 ${libgoffice}
Requires.private:
Libs: -L${libdir} -lspreadsheet-${VERSION}
# for now include both the directory and the child, until we rename the includes in svn
Cflags: -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet -I${includedir}/libspreadsheet-@GNUMERIC_API_VER@ -I${gnumeric_libdir}/include
PluginDir=@gnumeric_plugindir@
PluginDir=@gnumeric_externplugindir@
......@@ -711,18 +711,18 @@ odf_apply_style_props (GsfXMLIn *xin, GSList *props, GOStyle *style)
fill_type = OO_FILL_TYPE_NONE;
}
} else if (0 == strcmp (prop->name, "fill-color")) {
GdkColor gdk_color;
GdkRGBA rgba;
gchar const *color = g_value_get_string (&prop->value);
if (gdk_color_parse (color, &gdk_color)) {
style->fill.pattern.back = GO_COLOR_FROM_GDK (gdk_color);
if (gdk_rgba_parse (&rgba, color)) {
style->fill.pattern.back = GO_COLOR_FROM_GDK_RGBA (rgba);
style->fill.auto_back = FALSE;
}
} else if (0 == strcmp (prop->name, "stroke-color")) {
GdkColor gdk_color;
GdkRGBA rgba;
gchar const *color = g_value_get_string (&prop->value);
if (gdk_color_parse (color, &gdk_color)) {
style->line.color = GO_COLOR_FROM_GDK (gdk_color);
style->line.fore = GO_COLOR_FROM_GDK (gdk_color);
if (gdk_rgba_parse (&rgba, color)) {
style->line.color = GO_COLOR_FROM_GDK_RGBA (rgba);
style->line.fore = GO_COLOR_FROM_GDK_RGBA (rgba);
style->line.auto_color = FALSE;
style->line.auto_fore = FALSE;
style->line.pattern = GO_PATTERN_SOLID;
......@@ -3239,15 +3239,15 @@ oo_gradient (GsfXMLIn *xin, xmlChar const **attrs)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "name"))
name = CXML2C (attrs[1]);
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "start-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color))
info->from = GO_COLOR_FROM_GDK (gdk_color);
GdkRGBA rgba;
if (gdk_rgba_parse (&rgba, CXML2C (attrs[1])))
info->from = GO_COLOR_FROM_GDK_RGBA (rgba);
else
oo_warning (xin, _("Unable to parse gradient color: %s"), CXML2C (attrs[1]));
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "end-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color))
info->to = GO_COLOR_FROM_GDK (gdk_color);
GdkRGBA rgba;
if (gdk_rgba_parse (&rgba, CXML2C (attrs[1])))
info->to = GO_COLOR_FROM_GDK_RGBA (rgba);
else
oo_warning (xin, _("Unable to parse gradient color: %s"), CXML2C (attrs[1]));
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "style"))
......@@ -3286,9 +3286,9 @@ oo_hatch (GsfXMLIn *xin, xmlChar const **attrs)
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_DRAW, "color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color))
hatch->fore = GO_COLOR_FROM_GDK (gdk_color);
GdkRGBA rgba;
if (gdk_rgba_parse (&rgba, CXML2C (attrs[1])))
hatch->fore = GO_COLOR_FROM_GDK_RGBA (rgba);
else
oo_warning (xin, _("Unable to parse hatch color: %s"), CXML2C (attrs[1]));
} else if (NULL != oo_attr_distance (xin, attrs, OO_NS_DRAW, "distance", &distance))
......@@ -5235,10 +5235,10 @@ oo_style_prop_table (GsfXMLIn *xin, xmlChar const **attrs)
style->is_rtl = tmp_i;
else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT, "tab-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color)) {
GdkRGBA rgba;
if (gdk_rgba_parse (&rgba, CXML2C (attrs[1]))) {
style->tab_color
= GO_COLOR_FROM_GDK (gdk_color);
= GO_COLOR_FROM_GDK_RGBA (rgba);
style->tab_color_set = TRUE;
} else
oo_warning (xin, _("Unable to parse "
......@@ -5247,10 +5247,10 @@ oo_style_prop_table (GsfXMLIn *xin, xmlChar const **attrs)
} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]),
OO_GNUM_NS_EXT,
"tab-text-color")) {
GdkColor gdk_color;
if (gdk_color_parse (CXML2C (attrs[1]), &gdk_color)) {
GdkRGBA rgba;
if (gdk_rgba_parse (&rgba, CXML2C (attrs[1]))) {
style->tab_text_color
= GO_COLOR_FROM_GDK (gdk_color);
= GO_COLOR_FROM_GDK_RGBA (rgba);
style->tab_text_color_set = TRUE;
} else
oo_warning (xin, _("Unable to parse tab "
......
......@@ -164,9 +164,9 @@ show_python_console (GnmAction const *action, WorkbookControl *wbc)
g_signal_connect_object (
G_OBJECT (sel), "interpreter_changed",
G_CALLBACK (app_interpreter_changed), app->win, 0);
vbox = gtk_vbox_new (FALSE, 0);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
w = gtk_label_new_with_mnemonic (_("E_xecute in:"));
gtk_label_set_mnemonic_widget (GTK_LABEL (w), sel);
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, TRUE, 4);
......@@ -199,7 +199,7 @@ show_python_console (GnmAction const *action, WorkbookControl *wbc)
&enditer,
FALSE);
font_desc = pango_font_description_from_string ("Fixed");
gtk_widget_modify_font (GTK_WIDGET (app->text_view), font_desc);
gtk_widget_override_font (GTK_WIDGET (app->text_view), font_desc);
pango_font_description_free (font_desc);
gtk_text_view_set_editable (GTK_TEXT_VIEW (app->text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (app->text_view),
......@@ -208,7 +208,7 @@ show_python_console (GnmAction const *action, WorkbookControl *wbc)
GTK_WIDGET (app->text_view));
gtk_box_pack_start (GTK_BOX (vbox), sc_win, TRUE, TRUE, 0);
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
cline = gnm_py_command_line_new ();
g_signal_connect (G_OBJECT (cline), "entered",
G_CALLBACK (app_cline_entered), NULL);
......
......@@ -430,6 +430,7 @@ gnumeric-paths.h: Makefile
echo '#define GNUMERIC_LIBDIR "$(gnumeric_libdir)"'; \
echo '#define GNUMERIC_ICONDIR "$(gnumeric_icondir)"'; \
echo '#define GNUMERIC_LOCALEDIR "$(gnumeric_localedir)"'; \
echo '#define GNUMERIC_EXTERNPLUGINDIR "$(gnumeric_externplugindir)"'; \
echo ''; \
echo '#endif /* GNUMERIC_PATHS_H */'; \
) >$@
......
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="Filter">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Advanced Filter</property>
<property name="window_position">mouse</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
......@@ -21,6 +83,7 @@
<child>
<object class="GtkTable" id="input-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
......@@ -32,6 +95,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
......@@ -45,6 +109,7 @@
<child>
<object class="GtkLabel" id="var2-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Criteria range:</property>
<property name="use_underline">True</property>
......@@ -59,6 +124,7 @@
<child>
<object class="GtkLabel" id="var1-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_List range:</property>
<property name="use_underline">True</property>
......@@ -80,6 +146,7 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Input</property>
<property name="justify">center</property>
</object>
......@@ -88,8 +155,9 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dao">
<object class="GtkBox" id="dao">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
......@@ -101,6 +169,7 @@
<child type="tab">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Output</property>
<property name="justify">center</property>
</object>
......@@ -111,12 +180,15 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="warnings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="wrap">True</property>
......@@ -127,63 +199,6 @@
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<action-widgets>
......
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="value">0.050000000000000003</property>
<property name="upper">1</property>
<property name="step_increment">0.01</property>
<property name="page_increment">10</property>
</object>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="ANOVA">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">ANOVA - Single Factor</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
......@@ -26,6 +82,7 @@
<child>
<object class="GtkTable" id="input-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
......@@ -34,6 +91,7 @@
<child>
<object class="GtkLabel" id="var1-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Input range:</property>
<property name="use_underline">True</property>
......@@ -47,6 +105,7 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Grouped by:</property>
<property name="justify">center</property>
......@@ -67,6 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
......@@ -78,14 +138,16 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkRadioButton" id="grouped_by_col">
<property name="label" translatable="yes">_Columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
......@@ -114,6 +176,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">grouped_by_col</property>
......@@ -133,6 +196,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">grouped_by_col</property>
......@@ -163,6 +227,7 @@
<child type="tab">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Input</property>
</object>
<packing>
......@@ -170,11 +235,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
......@@ -182,6 +250,7 @@
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Alpha:</property>
<property name="use_underline">True</property>
......@@ -211,6 +280,8 @@
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
......@@ -222,6 +293,7 @@
<child type="tab">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
</object>
<packing>
......@@ -230,8 +302,9 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dao">
<object class="GtkBox" id="dao">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
......@@ -243,6 +316,7 @@
<child type="tab">
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Output</property>
</object>
<packing>
......@@ -252,12 +326,15 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="warnings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
......@@ -267,63 +344,6 @@
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
</object>
<packing>