[gtkhtml] Bug 582505 – Use GtkBuilder instead of libglade
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtkhtml] Bug 582505 – Use GtkBuilder instead of libglade
- Date: Mon, 29 Jun 2009 15:04:05 +0000 (UTC)
commit 7b4440c7ff786834ad943ccb21ef2d4d02c739e8
Author: Denis Pauk <pauk denis gmail com>
Date: Mon Jun 29 11:03:27 2009 -0400
Bug 582505 â?? Use GtkBuilder instead of libglade
acconfig.h | 9 -
components/editor/Makefile.am | 10 +-
...html-editor.glade => gtkhtml-editor-builder.ui} | 1887 ++++++++++++--------
...gtkhtml-editor.ui => gtkhtml-editor-manager.ui} | 0
components/editor/gtkhtml-editor-private.c | 43 +-
components/editor/gtkhtml-editor-private.h | 3 +-
components/editor/gtkhtml-editor.c | 18 +-
components/editor/gtkhtml-editor.h | 1 +
components/editor/gtkhtml-editor.xml | 28 -
configure.ac | 3 +-
gtkhtml.spec.in | 3 +-
gtkhtml/Makefile.am | 1 -
gtkhtml/dllmain.c | 3 -
gtkhtml/gtkhtml-private.h | 4 -
po/POTFILES.in | 2 +-
po/POTFILES.skip | 4 -
16 files changed, 1137 insertions(+), 882 deletions(-)
---
diff --git a/acconfig.h b/acconfig.h
index dff0025..1ab486c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -23,12 +23,3 @@
#undef GTKHTML_RELEASE
#undef GTKHTML_RELEASE_STRING
#undef HAVE_OLD_SOUP
-
- BOTTOM@
-/* This is from libglade */
-
-#ifdef DEBUG
-# define debug(stmnt) stmnt
-#else
-# define debug(stmnt) /* nothing */
-#endif
diff --git a/components/editor/Makefile.am b/components/editor/Makefile.am
index eaff600..1d45486 100644
--- a/components/editor/Makefile.am
+++ b/components/editor/Makefile.am
@@ -96,8 +96,8 @@ pkgconfig_DATA = gtkhtml-editor.pc
uidir = $(gtkhtml_data)
ui_DATA = \
- gtkhtml-editor.glade \
- gtkhtml-editor.ui
+ gtkhtml-editor-builder.ui \
+ gtkhtml-editor-manager.ui
EXTRA_DIST = \
ChangeLog \
@@ -109,12 +109,6 @@ EXTRA_DIST = \
CLEANFILES = \
$(BUILT_SOURCES)
-MAINTAINERCLEANFILES = \
- gtkhtml-editor.glade.bak \
- gtkhtml-editor.gladep.bak
-
-EXTRA_DIST += gtkhtml-editor.xml
-
if GLADE_CATALOG
gladecatalog_DATA = gtkhtml-editor.xml
diff --git a/components/editor/gtkhtml-editor.glade b/components/editor/gtkhtml-editor-builder.ui
similarity index 74%
rename from components/editor/gtkhtml-editor.glade
rename to components/editor/gtkhtml-editor-builder.ui
index 71d4966..fe8cd70 100644
--- a/components/editor/gtkhtml-editor.glade
+++ b/components/editor/gtkhtml-editor-builder.ui
@@ -1,30 +1,341 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<?xml version="1.0"?>
<!--Generated with glade3 3.4.5 on Wed Dec 31 00:39:22 2008 -->
-<glade-interface>
- <requires lib="gtkhtml-editor"/>
- <widget class="GtkWindow" id="text-properties-window">
+<interface>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment10">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment11">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment12">
+ <property name="upper">10000</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment13">
+ <property name="upper">10000</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment14">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment15">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment16">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">32767</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">32767</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">100</property>
+ <property name="lower">1</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">1</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">32767</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">32767</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">32767</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment9">
+ <property name="upper">100</property>
+ <property name="lower">0</property>
+ <property name="page_increment">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_size">0</property>
+ <property name="value">0</property>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">px</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model10">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">px</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">follow</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model11">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Top</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Middle</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model2">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Center</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model3">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">px</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model4">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Center</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model5">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Perforated Paper</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Blue Ink</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Paper</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Ribbon</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Midnight</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Confidential</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Draft</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Graph Paper</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model6">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Top</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Middle</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model7">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Center</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model8">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">px</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="model9">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">px</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">%</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">follow</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkWindow" id="text-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Text Properties</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="text-properties-vbox">
+ <object class="GtkVBox" id="text-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="text-properties-inner-hbox">
+ <object class="GtkHBox" id="text-properties-inner-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkTable" id="text-properties-table-left">
+ <object class="GtkTable" id="text-properties-table-left">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">4</property>
@@ -32,129 +343,125 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="text-properties-strikethrough-button">
+ <object class="GtkCheckButton" id="text-properties-strikethrough-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Strikethrough</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-underline-button">
+ <object class="GtkCheckButton" id="text-properties-underline-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Underline</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-italic-button">
+ <object class="GtkCheckButton" id="text-properties-italic-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Italic</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-bold-button">
+ <object class="GtkCheckButton" id="text-properties-bold-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Bold</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-strikethrough-image">
+ <object class="GtkImage" id="text-properties-strikethrough-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-strikethrough</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-underline-image">
+ <object class="GtkImage" id="text-properties-underline-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-underline</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-italic-image">
+ <object class="GtkImage" id="text-properties-italic-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-italic</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-bold-image">
+ <object class="GtkImage" id="text-properties-bold-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="stock">gtk-bold</property>
- </widget>
+ </object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkTable" id="text-properties-table-right">
+ <object class="GtkTable" id="text-properties-table-right">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
@@ -162,11 +469,11 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkhtmlColorCombo" id="text-properties-color-combo">
+ <object class="GtkhtmlColorCombo" id="text-properties-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_label">Automatic</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -174,39 +481,39 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="text-properties-size-label">
+ <object class="GtkLabel" id="text-properties-size-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Si_ze:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="text-properties-color-label">
+ <object class="GtkLabel" id="text-properties-color-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Color:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="text-properties-alignment">
+ <object class="GtkAlignment" id="text-properties-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
@@ -214,46 +521,45 @@
</packing>
</child>
<child>
- <widget class="GtkhtmlComboBox" id="text-properties-size-combo-box">
+ <object class="GtkhtmlComboBox" id="text-properties-size-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkHButtonBox" id="text-properties-button-box">
+ <object class="GtkHButtonBox" id="text-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="text-properties-ok-button">
+ <object class="GtkButton" id="text-properties-ok-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="text-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="text-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -261,189 +567,185 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="paragraph-properties-window">
+ </object>
+ <object class="GtkWindow" id="paragraph-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Paragraph Properties</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="paragraph-properties-vbox">
+ <object class="GtkVBox" id="paragraph-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="paragraph-properties-general-vbox">
+ <object class="GtkVBox" id="paragraph-properties-general-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="paragraph-properties-general-label">
+ <object class="GtkLabel" id="paragraph-properties-general-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>General</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="paragraph-properties-general-alignment">
+ <object class="GtkAlignment" id="paragraph-properties-general-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="paragraph-properties-general-hbox">
+ <object class="GtkHBox" id="paragraph-properties-general-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="paragraph-properties-general-style-label">
+ <object class="GtkLabel" id="paragraph-properties-general-style-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Style:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlComboBox" id="paragraph-properties-style-combo-box">
+ <object class="GtkhtmlComboBox" id="paragraph-properties-style-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </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>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkVBox" id="paragraph-properties-alignment-vbox">
+ <object class="GtkVBox" id="paragraph-properties-alignment-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="paragraph-properties-alignment-label">
+ <object class="GtkLabel" id="paragraph-properties-alignment-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Alignment</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="paragraph-properties-alignment-alignment">
+ <object class="GtkAlignment" id="paragraph-properties-alignment-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHButtonBox" id="paragraph-properties-alignment-button-box">
+ <object class="GtkHButtonBox" id="paragraph-properties-alignment-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkToggleButton" id="paragraph-properties-left-button">
+ <object class="GtkToggleButton" id="paragraph-properties-left-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-justify-left</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkToggleButton" id="paragraph-properties-center-button">
+ <object class="GtkToggleButton" id="paragraph-properties-center-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-justify-center</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkToggleButton" id="paragraph-properties-right-button">
+ <object class="GtkToggleButton" id="paragraph-properties-right-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-justify-right</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</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="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="paragraph-properties-button-box">
+ <object class="GtkHButtonBox" id="paragraph-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="paragraph-properties-ok-button">
+ <object class="GtkButton" id="paragraph-properties-ok-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="paragraph-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="paragraph-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -451,122 +753,118 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="find-window">
+ </object>
+ <object class="GtkWindow" id="find-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Find</property>
<property name="resizable">False</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">gtk-find</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="find-vbox">
+ <object class="GtkVBox" id="find-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="find-inner-vbox">
+ <object class="GtkVBox" id="find-inner-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkEntry" id="find-entry">
+ <object class="GtkEntry" id="find-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="activates_default">True</property>
- <signal name="changed" handler="gtkhtml_editor_find_entry_changed_cb" object="find-window"/>
- <signal name="activate" handler="gtkhtml_editor_find_entry_activate_cb" object="find-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_find_entry_changed_cb" name="changed" object="find-window"/>
+ <signal handler="gtkhtml_editor_find_entry_activate_cb" name="activate" object="find-window"/>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="find-hbox">
+ <object class="GtkHBox" id="find-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="find-backwards">
+ <object class="GtkCheckButton" id="find-backwards">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Search _backwards</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_find_backwards_toggled_cb" object="find-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_find_backwards_toggled_cb" name="toggled" object="find-window"/>
+ </object>
</child>
<child>
- <widget class="GtkCheckButton" id="find-case-sensitive">
+ <object class="GtkCheckButton" id="find-case-sensitive">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Case _sensitive</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_find_case_sensitive_toggled_cb" object="find-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_find_case_sensitive_toggled_cb" name="toggled" object="find-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="find-regular-expression">
+ <object class="GtkCheckButton" id="find-regular-expression">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Regular expression</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_find_regular_expression_toggled_cb" object="find-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_find_regular_expression_toggled_cb" name="toggled" object="find-window"/>
+ </object>
<packing>
<property name="position">2</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="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="find-button-box">
+ <object class="GtkHButtonBox" id="find-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="find-close-button">
+ <object class="GtkButton" id="find-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
- <signal name="clicked" handler="gtk_widget_hide" object="find-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="find-window"/>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="find-button">
+ <object class="GtkButton" id="find-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -575,13 +873,12 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-find</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -589,25 +886,25 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="replace-window">
+ </object>
+ <object class="GtkWindow" id="replace-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Replace</property>
<property name="resizable">False</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="replace-vbox">
+ <object class="GtkVBox" id="replace-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="extension_events">GDK_EXTENSION_EVENTS_ALL</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkTable" id="replace-table">
+ <object class="GtkTable" id="replace-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
@@ -615,11 +912,11 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="replace-with-entry">
+ <object class="GtkEntry" id="replace-with-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
@@ -628,124 +925,121 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="replace-entry">
+ <object class="GtkEntry" id="replace-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="replace-with-label">
+ <object class="GtkLabel" id="replace-with-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_With:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">replace-with-entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="replace-label">
+ <object class="GtkLabel" id="replace-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">R_eplace:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">replace-entry</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="replace-backwards">
+ <object class="GtkCheckButton" id="replace-backwards">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Search _backwards</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="replace-case-sensitive">
+ <object class="GtkCheckButton" id="replace-case-sensitive">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Case _sensitive</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="replace-alignment">
+ <object class="GtkAlignment" id="replace-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="replace-button-box">
+ <object class="GtkHButtonBox" id="replace-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="replace-close-button">
+ <object class="GtkButton" id="replace-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
- <signal name="clicked" handler="gtk_widget_hide" object="replace-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="replace-window"/>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="replace-button">
+ <object class="GtkButton" id="replace-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -754,13 +1048,12 @@
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-find-and-replace</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -768,88 +1061,84 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="replace-confirmation-window">
+ </object>
+ <object class="GtkWindow" id="replace-confirmation-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Replace Confirmation</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">gtk-find-and-replace</property>
- <signal name="delete_event" handler="gtkhtml_editor_replace_confirmation_delete_event_cb"/>
+ <signal handler="gtkhtml_editor_replace_confirmation_delete_event_cb" name="delete_event"/>
<child>
- <widget class="GtkHButtonBox" id="replace-confirmation-button-box">
+ <object class="GtkHButtonBox" id="replace-confirmation-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkButton" id="replace-confirmation-replace-all-button">
+ <object class="GtkButton" id="replace-confirmation-replace-all-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkButton" id="replace-confirmation-next-button">
+ <object class="GtkButton" id="replace-confirmation-next-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="replace-confirmation-close-button">
+ <object class="GtkButton" id="replace-confirmation-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="replace-confirmation-replace-button">
+ <object class="GtkButton" id="replace-confirmation-replace-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="link-properties-window">
+ </object>
+ <object class="GtkWindow" id="link-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Link Properties</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="destroy_with_parent">True</property>
- <signal name="show" handler="gtkhtml_editor_link_properties_show_window_cb"/>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtkhtml_editor_link_properties_show_window_cb" name="show"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="link-properties-vbox">
+ <object class="GtkVBox" id="link-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkTable" id="link-properties-table">
+ <object class="GtkTable" id="link-properties-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -857,102 +1146,100 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="link-properties-url-label">
+ <object class="GtkLabel" id="link-properties-url-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_URL:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">link-properties-url-entry</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="link-properties-description-label">
+ <object class="GtkLabel" id="link-properties-description-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Description:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">link-properties-description-entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="link-properties-url-entry">
+ <object class="GtkEntry" id="link-properties-url-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="gtkhtml_editor_link_properties_url_changed_cb" object="link-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_link_properties_url_changed_cb" name="changed" object="link-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="link-properties-description-entry">
+ <object class="GtkEntry" id="link-properties-description-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="gtkhtml_editor_link_properties_description_changed_cb" object="link-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_link_properties_description_changed_cb" name="changed" object="link-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkButton" id="link-properties-test-button">
+ <object class="GtkButton" id="link-properties-test-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkHButtonBox" id="link-properties-button-box">
+ <object class="GtkHButtonBox" id="link-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="link-properties-close-button">
+ <object class="GtkButton" id="link-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="link-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="link-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -960,10 +1247,10 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="rule-properties-window">
+ </object>
+ <object class="GtkWindow" id="rule-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Rule Properties</property>
@@ -971,34 +1258,34 @@
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="show" handler="gtkhtml_editor_rule_properties_show_window_cb"/>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtkhtml_editor_rule_properties_show_window_cb" name="show"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="rule-properties-vbox">
+ <object class="GtkVBox" id="rule-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="rule-properties-size-vbox">
+ <object class="GtkVBox" id="rule-properties-size-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="rule-properties-size-header">
+ <object class="GtkLabel" id="rule-properties-size-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Size</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="rule-properties-size-alignment">
+ <object class="GtkAlignment" id="rule-properties-size-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="rule-properties-size-table">
+ <object class="GtkTable" id="rule-properties-size-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -1009,113 +1296,118 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="rule-properties-width-label">
+ <object class="GtkLabel" id="rule-properties-width-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="rule-properties-width-spin-button">
+ <object class="GtkSpinButton" id="rule-properties-width-spin-button">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment1</property>
+ <signal handler="gtkhtml_editor_rule_properties_width_changed_cb" name="value_changed" object="rule-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="rule-properties-size-label">
+ <object class="GtkLabel" id="rule-properties-size-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Size:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="rule-properties-size-spin-button">
+ <object class="GtkSpinButton" id="rule-properties-size-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_rule_properties_size_changed_cb" object="rule-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment2</property>
+ <signal handler="gtkhtml_editor_rule_properties_size_changed_cb" name="value_changed" object="rule-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="rule-properties-width-combo-box">
+ <object class="GtkComboBox" id="rule-properties-width-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">px
-%</property>
- <signal name="changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_rule_properties_width_changed_cb" name="changed" object="rule-properties-window"/>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="rule-properties-style-vbox">
+ <object class="GtkVBox" id="rule-properties-style-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="rule-properties-style-header">
+ <object class="GtkLabel" id="rule-properties-style-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Style</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="rule-properties-style-alignment">
+ <object class="GtkAlignment" id="rule-properties-style-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="rule-properties-style-table">
+ <object class="GtkTable" id="rule-properties-style-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -1123,59 +1415,62 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="rule-properties-alignment-label">
+ <object class="GtkLabel" id="rule-properties-alignment-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Alignment:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="rule-properties-alignment-combo-box">
+ <object class="GtkComboBox" id="rule-properties-alignment-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Left
-Center
-Right</property>
- <signal name="changed" handler="gtkhtml_editor_rule_properties_alignment_changed_cb" object="rule-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_rule_properties_alignment_changed_cb" name="changed" object="rule-properties-window"/>
+ <property name="model">model2</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="rule-properties-shaded-check-button">
+ <object class="GtkCheckButton" id="rule-properties-shaded-check-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">S_haded</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_rule_properties_shaded_toggled_cb" object="rule-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_rule_properties_shaded_toggled_cb" name="toggled" object="rule-properties-window"/>
+ </object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1183,27 +1478,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="rule-properties-button-box">
+ <object class="GtkHButtonBox" id="rule-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="rule-properties-close-button">
+ <object class="GtkButton" id="rule-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="rule-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="rule-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1211,10 +1505,10 @@ Right</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="table-properties-window">
+ </object>
+ <object class="GtkWindow" id="table-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Table Properties</property>
@@ -1222,61 +1516,61 @@ Right</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
- <signal name="show" handler="gtkhtml_editor_table_properties_show_window_cb"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="gtkhtml_editor_table_properties_show_window_cb" name="show"/>
<child>
- <widget class="GtkVBox" id="table-properties-vbox">
+ <object class="GtkVBox" id="table-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="table-properties-general-vbox">
+ <object class="GtkVBox" id="table-properties-general-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="table-properties-general-header">
+ <object class="GtkLabel" id="table-properties-general-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>General</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="table-properties-general-alignment">
+ <object class="GtkAlignment" id="table-properties-general-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="table-properties-general-hbox">
+ <object class="GtkHBox" id="table-properties-general-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="table-properties-rows-hbox">
+ <object class="GtkHBox" id="table-properties-rows-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="table-properties-rows-image">
+ <object class="GtkImage" id="table-properties-rows-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-row</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-rows-label">
+ <object class="GtkLabel" id="table-properties-rows-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Rows:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-rows-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1284,43 +1578,43 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-rows-spin-button">
+ <object class="GtkSpinButton" id="table-properties-rows-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">1 1 32767 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_rows_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment3</property>
+ <signal handler="gtkhtml_editor_table_properties_rows_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkHBox" id="table-properties-cols-hbox">
+ <object class="GtkHBox" id="table-properties-cols-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="table-properties-cols-image">
+ <object class="GtkImage" id="table-properties-cols-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-column</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-cols-label">
+ <object class="GtkLabel" id="table-properties-cols-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">C_olumns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-cols-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1328,56 +1622,56 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-cols-spin-button">
+ <object class="GtkSpinButton" id="table-properties-cols-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">1 1 32767 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_cols_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment4</property>
+ <signal handler="gtkhtml_editor_table_properties_cols_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="table-properties-layout-vbox">
+ <object class="GtkVBox" id="table-properties-layout-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="table-properties-layout-header">
+ <object class="GtkLabel" id="table-properties-layout-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Layout</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="table-properties-layout-alignment">
+ <object class="GtkAlignment" id="table-properties-layout-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table-properties-layout-left-table">
+ <object class="GtkTable" id="table-properties-layout-left-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
@@ -1403,238 +1697,246 @@ Right</property>
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-border-units-label">
+ <object class="GtkLabel" id="table-properties-border-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-padding-units-label">
+ <object class="GtkLabel" id="table-properties-padding-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-spacing-units-label">
+ <object class="GtkLabel" id="table-properties-spacing-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="table-properties-width-combo-box">
+ <object class="GtkComboBox" id="table-properties-width-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">px
-%</property>
- <signal name="changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_table_properties_width_changed_cb" name="changed" object="table-properties-window"/>
+ <property name="model">model3</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-width-spin-button">
+ <object class="GtkSpinButton" id="table-properties-width-spin-button">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">1 1 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment5</property>
+ <signal handler="gtkhtml_editor_table_properties_width_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="table-properties-width-check-button">
+ <object class="GtkCheckButton" id="table-properties-width-check-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_table_properties_width_changed_cb" name="toggled" object="table-properties-window"/>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="table-properties-alignment-combo-box">
+ <object class="GtkComboBox" id="table-properties-alignment-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Left
-Center
-Right</property>
- <signal name="changed" handler="gtkhtml_editor_table_properties_alignment_changed_cb" object="table-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_table_properties_alignment_changed_cb" name="changed" object="table-properties-window"/>
+ <property name="model">model4</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-alignment-label">
+ <object class="GtkLabel" id="table-properties-alignment-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-alignment-combo-box</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-spacing-label">
+ <object class="GtkLabel" id="table-properties-spacing-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Spacing:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-spacing-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-padding-label">
+ <object class="GtkLabel" id="table-properties-padding-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Padding:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-padding-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-border-label">
+ <object class="GtkLabel" id="table-properties-border-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Border:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-border-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-spacing-spin-button">
+ <object class="GtkSpinButton" id="table-properties-spacing-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 32767 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_spacing_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment6</property>
+ <signal handler="gtkhtml_editor_table_properties_spacing_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-padding-spin-button">
+ <object class="GtkSpinButton" id="table-properties-padding-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 32767 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_padding_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment7</property>
+ <signal handler="gtkhtml_editor_table_properties_padding_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-border-spin-button">
+ <object class="GtkSpinButton" id="table-properties-border-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 32767 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_border_changed_cb" object="table-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment8</property>
+ <signal handler="gtkhtml_editor_table_properties_border_changed_cb" name="value_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1642,26 +1944,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="table-properties-background-vbox">
+ <object class="GtkVBox" id="table-properties-background-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="table-properties-background-header">
+ <object class="GtkLabel" id="table-properties-background-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Background</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="table-properties-background-alignment">
+ <object class="GtkAlignment" id="table-properties-background-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table-properties-background-table">
+ <object class="GtkTable" id="table-properties-background-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -1669,70 +1971,70 @@ Right</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="table-properties-color-label">
+ <object class="GtkLabel" id="table-properties-color-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Co_lor:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-image-label">
+ <object class="GtkLabel" id="table-properties-image-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Image:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table-properties-image-button</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="table-properties-image-button">
+ <object class="GtkFileChooserButton" id="table-properties-image-button">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="selection_changed" handler="gtkhtml_editor_table_properties_image_changed_cb" object="table-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_table_properties_image_changed_cb" name="selection_changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="table-properties-color-combo">
+ <object class="GtkhtmlColorCombo" id="table-properties-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Transparent</property>
<property name="default_transparent">True</property>
- <signal name="changed" handler="gtkhtml_editor_table_properties_color_changed_cb" object="table-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_table_properties_color_changed_cb" name="changed" object="table-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1740,27 +2042,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="table-properties-button-box">
+ <object class="GtkHButtonBox" id="table-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="table-properties-close-button">
+ <object class="GtkButton" id="table-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="table-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="table-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1768,10 +2069,10 @@ Right</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="page-properties-window">
+ </object>
+ <object class="GtkWindow" id="page-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Page Properties</property>
@@ -1779,38 +2080,38 @@ Right</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="realize" handler="gtkhtml_editor_page_properties_window_realized_cb"/>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <signal handler="gtkhtml_editor_page_properties_window_realized_cb" name="realize"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
<child>
- <widget class="GtkVBox" id="page-properties-vbox">
+ <object class="GtkVBox" id="page-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="page-properties-colors-vbox">
+ <object class="GtkVBox" id="page-properties-colors-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="page-properties-colors-header">
+ <object class="GtkLabel" id="page-properties-colors-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Colors</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="page-properties-colors-alignment">
+ <object class="GtkAlignment" id="page-properties-colors-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="page-properties-colors-table">
+ <object class="GtkTable" id="page-properties-colors-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
@@ -1818,25 +2119,25 @@ Right</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="page-properties-text-label">
+ <object class="GtkLabel" id="page-properties-text-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Text:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-link-label">
+ <object class="GtkLabel" id="page-properties-link-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Link:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -1844,13 +2145,13 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-background-label">
+ <object class="GtkLabel" id="page-properties-background-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Background:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -1858,26 +2159,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-text-color-combo">
+ <object class="GtkhtmlColorCombo" id="page-properties-text-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Automatic</property>
- <signal name="changed" handler="gtkhtml_editor_page_properties_text_color_changed_cb" object="page-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_page_properties_text_color_changed_cb" name="changed" object="page-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-link-color-combo">
+ <object class="GtkhtmlColorCombo" id="page-properties-link-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">_Automatic</property>
- <signal name="changed" handler="gtkhtml_editor_page_properties_link_color_changed_cb" object="page-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_page_properties_link_color_changed_cb" name="changed" object="page-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1886,13 +2187,13 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-background-color-combo">
+ <object class="GtkhtmlColorCombo" id="page-properties-background-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Automatic</property>
- <signal name="changed" handler="gtkhtml_editor_page_properties_background_color_changed_cb" object="page-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_page_properties_background_color_changed_cb" name="changed" object="page-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1900,44 +2201,44 @@ Right</property>
<property name="bottom_attach">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="page-properties-background-vbox">
+ <object class="GtkVBox" id="page-properties-background-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="page-properties-background-header">
+ <object class="GtkLabel" id="page-properties-background-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Background Image</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="page-properties-background-alignment">
+ <object class="GtkAlignment" id="page-properties-background-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="page-properties-backgrond-table">
+ <object class="GtkTable" id="page-properties-backgrond-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -1945,25 +2246,25 @@ Right</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="page-properties-template-label">
+ <object class="GtkLabel" id="page-properties-template-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">T_emplate:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-custom-label">
+ <object class="GtkLabel" id="page-properties-custom-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">C_ustom:</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -1971,12 +2272,12 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="page-properties-custom-file-chooser">
+ <object class="GtkFileChooserButton" id="page-properties-custom-file-chooser">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="selection_changed" handler="gtkhtml_editor_page_properties_custom_file_changed_cb" object="page-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_page_properties_custom_file_changed_cb" name="selection_changed" object="page-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -1985,33 +2286,31 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="page-properties-template-combo-box">
+ <object class="GtkComboBox" id="page-properties-template-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">None
-Perforated Paper
-Blue Ink
-Paper
-Ribbon
-Midnight
-Confidential
-Draft
-Graph Paper</property>
- <signal name="changed" handler="gtkhtml_editor_page_properties_template_changed_cb" object="page-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_page_properties_template_changed_cb" name="changed" object="page-properties-window"/>
+ <property name="model">model5</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2019,27 +2318,26 @@ Graph Paper</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="page-properties-button-box">
+ <object class="GtkHButtonBox" id="page-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="page-properties-close-button">
+ <object class="GtkButton" id="page-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="page-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="page-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2047,10 +2345,10 @@ Graph Paper</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="cell-properties-window">
+ </object>
+ <object class="GtkWindow" id="cell-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">1</property>
<property name="title" translatable="yes">Cell Properties</property>
@@ -2058,35 +2356,35 @@ Graph Paper</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
- <signal name="show" handler="gtkhtml_editor_cell_properties_show_window_cb"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="gtkhtml_editor_cell_properties_show_window_cb" name="show"/>
<child>
- <widget class="GtkVBox" id="cell-properties-vbox">
+ <object class="GtkVBox" id="cell-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="cell-properties-scope-vbox">
+ <object class="GtkVBox" id="cell-properties-scope-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="cell-properties-scope-header">
+ <object class="GtkLabel" id="cell-properties-scope-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Scope</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="cell-properties-scope-alignment">
+ <object class="GtkAlignment" id="cell-properties-scope-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="cell-properties-scope-table">
+ <object class="GtkTable" id="cell-properties-scope-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -2100,176 +2398,172 @@ Graph Paper</property>
<placeholder/>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-column-radio-button">
+ <object class="GtkRadioButton" id="cell-properties-column-radio-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Col_umn</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">cell-properties-cell-radio-button</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_scope_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_scope_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-row-radio-button">
+ <object class="GtkRadioButton" id="cell-properties-row-radio-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Row</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">cell-properties-cell-radio-button</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_scope_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_scope_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-table-radio-button">
+ <object class="GtkRadioButton" id="cell-properties-table-radio-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Table</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">cell-properties-cell-radio-button</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_scope_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_scope_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-cell-radio-button">
+ <object class="GtkRadioButton" id="cell-properties-cell-radio-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">C_ell</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_scope_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_scope_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-column-image">
+ <object class="GtkImage" id="cell-properties-column-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-column</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-row-image">
+ <object class="GtkImage" id="cell-properties-row-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-row</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-table-image">
+ <object class="GtkImage" id="cell-properties-table-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-table</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-cell-image">
+ <object class="GtkImage" id="cell-properties-cell-image">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="icon_name">stock_select-cell</property>
- </widget>
+ </object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</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="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="cell-properties-alignment-vbox">
+ <object class="GtkVBox" id="cell-properties-alignment-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="cell-properties-alignment-header">
+ <object class="GtkLabel" id="cell-properties-alignment-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Alignment &amp; Behavior</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="cell-properties-alignment-alignment">
+ <object class="GtkAlignment" id="cell-properties-alignment-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="cell-properties-alignment-table">
+ <object class="GtkTable" id="cell-properties-alignment-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -2280,120 +2574,126 @@ Graph Paper</property>
<placeholder/>
</child>
<child>
- <widget class="GtkHBox" id="cell-properties-alignment-hbox">
+ <object class="GtkHBox" id="cell-properties-alignment-hbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkCheckButton" id="cell-properties-wrap-text-check-button">
+ <object class="GtkCheckButton" id="cell-properties-wrap-text-check-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Wrap Text</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_wrap_text_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_wrap_text_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cell-properties-header-style-check-button">
+ <object class="GtkCheckButton" id="cell-properties-header-style-check-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Hea_der Style</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_header_style_toggled_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_header_style_toggled_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cell-properties-vertical-combo-box">
+ <object class="GtkComboBox" id="cell-properties-vertical-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Top
-Middle
-Bottom</property>
- <signal name="changed" handler="gtkhtml_editor_cell_properties_vertical_changed_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_vertical_changed_cb" name="changed" object="cell-properties-window"/>
+ <property name="model">model6</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer6"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cell-properties-horizontal-combo-box">
+ <object class="GtkComboBox" id="cell-properties-horizontal-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Left
-Center
-Right</property>
- <signal name="changed" handler="gtkhtml_editor_cell_properties_horizontal_changed_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_horizontal_changed_cb" name="changed" object="cell-properties-window"/>
+ <property name="model">model7</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer7"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-vertical-label">
+ <object class="GtkLabel" id="cell-properties-vertical-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Vertical:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-vertical-combo-box</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-horizontal-label">
+ <object class="GtkLabel" id="cell-properties-horizontal-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Horizontal:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-horizontal-combo-box</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2401,26 +2701,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="cell-properties-layout-vbox">
+ <object class="GtkVBox" id="cell-properties-layout-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="cell-properties-layout-header">
+ <object class="GtkLabel" id="cell-properties-layout-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Layout</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="cell-properties-layout-alignment">
+ <object class="GtkAlignment" id="cell-properties-layout-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="cell-properties-layout-table">
+ <object class="GtkTable" id="cell-properties-layout-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -2443,125 +2743,129 @@ Right</property>
<placeholder/>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-column-span-spin-button">
+ <object class="GtkSpinButton" id="cell-properties-column-span-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="change_value" handler="gtkhtml_editor_cell_properties_column_span_changed_cb" object="cell-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment9</property>
+ <signal handler="gtkhtml_editor_cell_properties_column_span_changed_cb" name="change_value" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-row-span-spin-button">
+ <object class="GtkSpinButton" id="cell-properties-row-span-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="change_value" handler="gtkhtml_editor_cell_properties_row_span_changed_cb" object="cell-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment10</property>
+ <signal handler="gtkhtml_editor_cell_properties_row_span_changed_cb" name="change_value" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-column-span-label">
+ <object class="GtkLabel" id="cell-properties-column-span-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Column Span:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-column-span-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-row-span-label">
+ <object class="GtkLabel" id="cell-properties-row-span-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Row Span:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-row-span-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cell-properties-width-combo-box">
+ <object class="GtkComboBox" id="cell-properties-width-combo-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">px
-%</property>
- <signal name="changed" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_width_changed_cb" name="changed" object="cell-properties-window"/>
+ <property name="model">model8</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer8"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-width-spin-button">
+ <object class="GtkSpinButton" id="cell-properties-width-spin-button">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment11</property>
+ <signal handler="gtkhtml_editor_cell_properties_width_changed_cb" name="value_changed" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="cell-properties-width-check-button">
+ <object class="GtkCheckButton" id="cell-properties-width-check-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Width:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_width_changed_cb" name="toggled" object="cell-properties-window"/>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2569,26 +2873,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="cell-properties-background-vbox">
+ <object class="GtkVBox" id="cell-properties-background-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="cell-properties-background-header">
+ <object class="GtkLabel" id="cell-properties-background-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Background</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="cell-properties-background-alignment">
+ <object class="GtkAlignment" id="cell-properties-background-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="cell-properties-background-table">
+ <object class="GtkTable" id="cell-properties-background-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -2596,72 +2900,72 @@ Right</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkFileChooserButton" id="cell-properties-image-file-chooser">
+ <object class="GtkFileChooserButton" id="cell-properties-image-file-chooser">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="title" translatable="yes">Select An Image</property>
- <signal name="file_set" handler="gtkhtml_editor_cell_properties_image_file_set_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_image_file_set_cb" name="file_set" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="cell-properties-color-combo">
+ <object class="GtkhtmlColorCombo" id="cell-properties-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Transparent</property>
<property name="default_transparent">True</property>
- <signal name="changed" handler="gtkhtml_editor_cell_properties_color_changed_cb" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_cell_properties_color_changed_cb" name="changed" object="cell-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-image-label">
+ <object class="GtkLabel" id="cell-properties-image-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">I_mage:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-image-file-chooser</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-color-label">
+ <object class="GtkLabel" id="cell-properties-color-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">C_olor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cell-properties-color-combo</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2669,27 +2973,26 @@ Right</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="cell-properties-button-box">
+ <object class="GtkHButtonBox" id="cell-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="cell-properties-close-button">
+ <object class="GtkButton" id="cell-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="cell-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="cell-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2697,10 +3000,10 @@ Right</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="image-properties-window">
+ </object>
+ <object class="GtkWindow" id="image-properties-window">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Image Properties</property>
@@ -2708,34 +3011,34 @@ Right</property>
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
- <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
- <signal name="show" handler="gtkhtml_editor_image_properties_show_window_cb"/>
+ <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="gtkhtml_editor_image_properties_show_window_cb" name="show"/>
<child>
- <widget class="GtkVBox" id="image-properties-vbox">
+ <object class="GtkVBox" id="image-properties-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="image-properties-general-vbox">
+ <object class="GtkVBox" id="image-properties-general-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="image-properties-general-header">
+ <object class="GtkLabel" id="image-properties-general-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>General</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="image-properties-general-alignment">
+ <object class="GtkAlignment" id="image-properties-general-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="image-properties-general-table">
+ <object class="GtkTable" id="image-properties-general-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
@@ -2743,95 +3046,95 @@ Right</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="image-properties-description-entry">
+ <object class="GtkEntry" id="image-properties-description-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_description_changed_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_description_changed_cb" name="changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="image-properties-source-file-chooser">
+ <object class="GtkFileChooserButton" id="image-properties-source-file-chooser">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="file_set" handler="gtkhtml_editor_image_properties_source_file_set_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_source_file_set_cb" name="file_set" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-description-label">
+ <object class="GtkLabel" id="image-properties-description-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Description:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-description-entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-source-label">
+ <object class="GtkLabel" id="image-properties-source-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Source:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-source-file-chooser</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="image-properties-layout-vbox">
+ <object class="GtkVBox" id="image-properties-layout-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="image-properties-layout-header">
+ <object class="GtkLabel" id="image-properties-layout-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Layout</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="image-properties-layout-alignment">
+ <object class="GtkAlignment" id="image-properties-layout-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="image-properties-layout-table">
+ <object class="GtkTable" id="image-properties-layout-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">3</property>
@@ -2851,286 +3154,298 @@ Right</property>
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-width-label">
+ <object class="GtkLabel" id="image-properties-width-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-width-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-height-label">
+ <object class="GtkLabel" id="image-properties-height-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Height:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-height-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-alignment-label">
+ <object class="GtkLabel" id="image-properties-alignment-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-alignment-combo-box</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-width-spin-button">
+ <object class="GtkSpinButton" id="image-properties-width-spin-button">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 10000 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment12</property>
+ <signal handler="gtkhtml_editor_image_properties_size_changed_cb" name="value_changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-height-spin-button">
+ <object class="GtkSpinButton" id="image-properties-height-spin-button">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 10000 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment13</property>
+ <signal handler="gtkhtml_editor_image_properties_size_changed_cb" name="value_changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-width-combo-box">
+ <object class="GtkComboBox" id="image-properties-width-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">px
-%
-follow</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_size_changed_cb" name="changed" object="image-properties-window"/>
+ <property name="model">model9</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer9"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-height-combo-box">
+ <object class="GtkComboBox" id="image-properties-height-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">px
-%
-follow</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_size_changed_cb" name="changed" object="image-properties-window"/>
+ <property name="model">model10</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer10"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-alignment-combo-box">
+ <object class="GtkComboBox" id="image-properties-alignment-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">Top
-Middle
-Bottom</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_alignment_changed_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_alignment_changed_cb" name="changed" object="image-properties-window"/>
+ <property name="model">model11</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer11"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-x-padding-label">
+ <object class="GtkLabel" id="image-properties-x-padding-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_X-Padding:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-x-padding-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-y-padding-label">
+ <object class="GtkLabel" id="image-properties-y-padding-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Y-Padding:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-y-padding-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-border-label">
+ <object class="GtkLabel" id="image-properties-border-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Border:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-border-spin-button</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">4</property>
<property name="right_attach">5</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-x-padding-spin-button">
+ <object class="GtkSpinButton" id="image-properties-x-padding-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment14</property>
+ <signal handler="gtkhtml_editor_image_properties_padding_changed_cb" name="value_changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-x-padding-units-label">
+ <object class="GtkLabel" id="image-properties-x-padding-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-y-padding-units-label">
+ <object class="GtkLabel" id="image-properties-y-padding-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-y-padding-spin-button">
+ <object class="GtkSpinButton" id="image-properties-y-padding-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment15</property>
+ <signal handler="gtkhtml_editor_image_properties_padding_changed_cb" name="value_changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-border-units-label">
+ <object class="GtkLabel" id="image-properties-border-units-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">px</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">6</property>
<property name="right_attach">7</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-border-spin-button">
+ <object class="GtkSpinButton" id="image-properties-border-spin-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 0</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_border_changed_cb" object="image-properties-window"/>
- </widget>
+ <property name="adjustment">adjustment16</property>
+ <signal handler="gtkhtml_editor_image_properties_border_changed_cb" name="value_changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">5</property>
<property name="right_attach">6</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3138,84 +3453,83 @@ Bottom</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="image-properties-link-vbox">
+ <object class="GtkVBox" id="image-properties-link-vbox">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="image-properties-link-header">
+ <object class="GtkLabel" id="image-properties-link-header">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>Link</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkAlignment" id="image-properties-link-alignment">
+ <object class="GtkAlignment" id="image-properties-link-alignment">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="image-properties-link-table">
+ <object class="GtkTable" id="image-properties-link-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkButton" id="image-properties-url-button">
+ <object class="GtkButton" id="image-properties-url-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">_Test URL...</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtkhtml_editor_image_properties_url_button_clicked_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_url_button_clicked_cb" name="clicked" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="image-properties-url-entry">
+ <object class="GtkEntry" id="image-properties-url-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_url_entry_changed_cb" object="image-properties-window"/>
- </widget>
+ <signal handler="gtkhtml_editor_image_properties_url_entry_changed_cb" name="changed" object="image-properties-window"/>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-url-label">
+ <object class="GtkLabel" id="image-properties-url-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_URL:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">image-properties-url-entry</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3223,27 +3537,26 @@ Bottom</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="image-properties-button-box">
+ <object class="GtkHButtonBox" id="image-properties-button-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="image-properties-close-button">
+ <object class="GtkButton" id="image-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="gtk_widget_hide" object="image-properties-window"/>
- </widget>
+ <signal handler="gtk_widget_hide" name="clicked" object="image-properties-window"/>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3251,7 +3564,7 @@ Bottom</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+</interface>
diff --git a/components/editor/gtkhtml-editor.ui b/components/editor/gtkhtml-editor-manager.ui
similarity index 100%
rename from components/editor/gtkhtml-editor.ui
rename to components/editor/gtkhtml-editor-manager.ui
diff --git a/components/editor/gtkhtml-editor-private.c b/components/editor/gtkhtml-editor-private.c
index 1ca54de..14b8509 100644
--- a/components/editor/gtkhtml-editor-private.c
+++ b/components/editor/gtkhtml-editor-private.c
@@ -22,9 +22,6 @@
#include <stdlib.h>
-#include <glade/glade.h>
-#include <glade/glade-build.h>
-
/* Regular expressions */
#define CTL "\\x00-\\x1f\\x7f"
#define SEP "\\x09\\x20\\(\\)<>@,;:\\\\\"/\\[\\]\\?=\\{\\}"
@@ -187,40 +184,32 @@ gtkhtml_editor_private_init (GtkhtmlEditor *editor)
priv->spell_suggestion_menus =
g_hash_table_new (g_direct_hash, g_direct_equal);
- filename = gtkhtml_editor_find_data_file ("gtkhtml-editor.ui");
- gtk_ui_manager_add_ui_from_file (priv->manager, filename, &error);
+ filename = gtkhtml_editor_find_data_file ("gtkhtml-editor-manager.ui");
+
+ if (!gtk_ui_manager_add_ui_from_file (priv->manager, filename, &error)) {
+ g_critical ("Couldn't load builder file: %s\n", error->message);
+ g_clear_error (&error);
+ }
+
g_free (filename);
- if (error != NULL) {
- /* Henceforth, bad things start happening. */
- g_critical ("%s", error->message);
+ filename = gtkhtml_editor_find_data_file ("gtkhtml-editor-builder.ui");
+
+ priv->builder = gtk_builder_new ();
+ if (!gtk_builder_add_from_file (priv->builder, filename, &error)) {
+ g_critical ("Couldn't load builder file: %s\n", error->message);
g_clear_error (&error);
}
+ g_free (filename);
+
gtkhtml_editor_actions_init (editor);
gtk_window_add_accel_group (
GTK_WINDOW (editor),
gtk_ui_manager_get_accel_group (priv->manager));
- glade_register_widget (
- GTKHTML_TYPE_COLOR_COMBO,
- glade_standard_build_widget, NULL, NULL);
-
- glade_register_widget (
- GTKHTML_TYPE_COLOR_SWATCH,
- glade_standard_build_widget, NULL, NULL);
-
- glade_register_widget (
- GTKHTML_TYPE_COMBO_BOX,
- glade_standard_build_widget, NULL, NULL);
-
- glade_provide ("gtkhtml-editor");
-
- filename = gtkhtml_editor_find_data_file ("gtkhtml-editor.glade");
- priv->glade_xml = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
- glade_xml_signal_autoconnect (priv->glade_xml);
- g_free (filename);
+ gtk_builder_connect_signals (priv->builder, NULL);
/* Construct main window widgets. */
@@ -389,7 +378,7 @@ gtkhtml_editor_private_dispose (GtkhtmlEditor *editor)
DISPOSE (priv->language_actions);
DISPOSE (priv->spell_check_actions);
DISPOSE (priv->suggestion_actions);
- DISPOSE (priv->glade_xml);
+ DISPOSE (priv->builder);
DISPOSE (priv->html_painter);
DISPOSE (priv->plain_painter);
diff --git a/components/editor/gtkhtml-editor-private.h b/components/editor/gtkhtml-editor-private.h
index 8d0436f..df3cb6b 100644
--- a/components/editor/gtkhtml-editor-private.h
+++ b/components/editor/gtkhtml-editor-private.h
@@ -23,7 +23,6 @@
#include <gtkhtml-editor.h>
-#include <glade/glade.h>
#include <glib/gi18n-lib.h>
/* Custom Widgets */
@@ -109,7 +108,7 @@ struct _GtkhtmlEditorPrivate {
GtkActionGroup *language_actions;
GtkActionGroup *spell_check_actions;
GtkActionGroup *suggestion_actions;
- GladeXML *glade_xml;
+ GtkBuilder *builder;
/*** Rendering ***/
diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
index 48ab7a3..aca15f9 100644
--- a/components/editor/gtkhtml-editor.c
+++ b/components/editor/gtkhtml-editor.c
@@ -961,6 +961,14 @@ gtkhtml_editor_get_html (GtkhtmlEditor *editor)
return GTK_HTML (editor->priv->edit_area);
}
+GtkBuilder *
+gtkhtml_editor_get_builder (GtkhtmlEditor *editor)
+{
+ g_return_val_if_fail (GTKHTML_IS_EDITOR (editor), NULL);
+
+ return editor->priv->builder;
+}
+
GtkUIManager *
gtkhtml_editor_get_ui_manager (GtkhtmlEditor *editor)
{
@@ -1027,15 +1035,17 @@ GtkWidget *
gtkhtml_editor_get_widget (GtkhtmlEditor *editor,
const gchar *widget_name)
{
- GtkWidget *widget;
+ GtkBuilder *builder;
+ GObject *object;
g_return_val_if_fail (GTKHTML_IS_EDITOR (editor), NULL);
g_return_val_if_fail (widget_name != NULL, NULL);
- widget = glade_xml_get_widget (editor->priv->glade_xml, widget_name);
- g_return_val_if_fail (widget != NULL, NULL);
+ builder = gtkhtml_editor_get_builder (editor);
+ object = gtk_builder_get_object (builder, widget_name);
+ g_return_val_if_fail (GTK_IS_WIDGET (object), NULL);
- return widget;
+ return GTK_WIDGET (object);
}
GtkWidget *
diff --git a/components/editor/gtkhtml-editor.h b/components/editor/gtkhtml-editor.h
index ee4f5df..57f8831 100644
--- a/components/editor/gtkhtml-editor.h
+++ b/components/editor/gtkhtml-editor.h
@@ -89,6 +89,7 @@ struct _GtkhtmlEditorClass {
GType gtkhtml_editor_get_type (void);
GtkWidget * gtkhtml_editor_new (void);
GtkHTML * gtkhtml_editor_get_html (GtkhtmlEditor *editor);
+GtkBuilder * gtkhtml_editor_get_builder (GtkhtmlEditor *editor);
GtkUIManager * gtkhtml_editor_get_ui_manager (GtkhtmlEditor *editor);
GtkAction * gtkhtml_editor_get_action (GtkhtmlEditor *editor,
const gchar *action_name);
diff --git a/configure.ac b/configure.ac
index 6b49dbd..895e730 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,6 @@ PACKAGE=gtkhtml
m4_define([gtk_minimum_version], [2.16.0])
m4_define([gail_minimum_version], [1.1.0])
m4_define([gnome_icon_theme_minimum_version], [2.22.0])
-m4_define([libglade_minimum_version], [2.0.0])
GTKHTML_API_VERSION=3.14
AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
@@ -135,7 +134,7 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version libglade-2.0 >= libglade_minimum_version enchant gconf-2.0 iso-codes"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes"
PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
diff --git a/gtkhtml.spec.in b/gtkhtml.spec.in
index 67d10cc..00e66cc 100644
--- a/gtkhtml.spec.in
+++ b/gtkhtml.spec.in
@@ -15,7 +15,6 @@ Requires: gal >= 0.7.99.5
Requires: pspell
Requires: GConf >= 0.9
Requires: libghttp >= 1.0
-Requires: libglade
%description
This is GtkHTML, a lightweight HTML rendering/printing/editing engine.
@@ -91,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gtkhtml
%{_datadir}/gtkhtml/keybindingsrc.*
%{_datadir}/gtkhtml/*.idl
-%{_datadir}/gtkhtml/*.glade
+%{_datadir}/gtkhtml/*.ui
%{_datadir}/gtkhtml/icons
%{_datadir}/oaf/*.oaf
%{_datadir}/locale/*/LC_MESSAGES/*.mo
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index f9de6fa..f925058 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -15,7 +15,6 @@ endif
INCLUDES = \
-I$(top_srcdir) \
-I$(srcdir) \
- -I$(includedir) \
$(GTKHTML_CFLAGS) \
$(SOUP_CFLAGS) \
$(I18N_LIB_CFLAGS) \
diff --git a/gtkhtml/dllmain.c b/gtkhtml/dllmain.c
index 453fdeb..02af04a 100644
--- a/gtkhtml/dllmain.c
+++ b/gtkhtml/dllmain.c
@@ -34,7 +34,6 @@ static const gchar *datadir;
static const gchar *sysconfdir;
static const gchar *icondir;
static const gchar *gtkhtml_datadir;
-static const gchar *glade_datadir;
static gpointer hmodule;
G_LOCK_DEFINE_STATIC (mutex);
@@ -75,7 +74,6 @@ setup (void)
sysconfdir = replace_prefix (prefix, SYSCONFDIR);
icondir = replace_prefix (prefix, ICONDIR);
gtkhtml_datadir = replace_prefix (prefix, GTKHTML_DATADIR);
- glade_datadir = replace_prefix (prefix, GLADE_DATADIR);
G_UNLOCK (mutex);
}
@@ -127,4 +125,3 @@ GETTER (datadir)
GETTER (sysconfdir)
GETTER (icondir)
GETTER (gtkhtml_datadir)
-GETTER (glade_datadir)
diff --git a/gtkhtml/gtkhtml-private.h b/gtkhtml/gtkhtml-private.h
index 9133de8..9dd3a23 100644
--- a/gtkhtml/gtkhtml-private.h
+++ b/gtkhtml/gtkhtml-private.h
@@ -103,7 +103,6 @@ gchar *gtk_html_filename_from_uri (const gchar *uri);
const gchar *_get_icondir (void) G_GNUC_CONST;
const gchar *_get_gtkhtml_datadir (void) G_GNUC_CONST;
const gchar *_get_localedir (void) G_GNUC_CONST;
-const gchar *_get_glade_datadir (void) G_GNUC_CONST;
const gchar *_get_prefix (void) G_GNUC_CONST;
const gchar *_get_sysconfdir (void) G_GNUC_CONST;
const gchar *_get_datadir (void) G_GNUC_CONST;
@@ -118,9 +117,6 @@ const gchar *_get_libdir (void) G_GNUC_CONST;
#undef GNOMELOCALEDIR
#define GNOMELOCALEDIR _get_localedir ()
-#undef GLADE_DATADIR
-#define GLADE_DATADIR _get_glade_datadir ()
-
#undef PREFIX
#define PREFIX _get_prefix ()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 287c222..f680874 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,7 @@ components/editor/gtkhtml-face-chooser.c
components/editor/gtkhtml-editor-actions.c
components/editor/gtkhtml-editor-private.c
components/editor/gtkhtml-editor.c
-components/editor/gtkhtml-editor.glade
+[type: gettext/glade]components/editor/gtkhtml-editor-builder.ui
components/editor/gtkhtml-face-chooser.c
components/editor/gtkhtml-spell-checker.c
components/editor/gtkhtml-spell-dialog.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e11e216..e0b1028 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,3 @@
-capplet/gnome-bindings-prop.c
-capplet/gtkhtml-capplet.glade
-capplet/gtkhtml-properties.desktop.in
-capplet/main.c
components/html-editor/GNOME_GtkHTML_Editor-emacs.xml
components/html-editor/GNOME_GtkHTML_Editor.xml
src/html-component.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
