gtkhtml r8782 - branches/mbarnes-composer/components/editor
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkhtml r8782 - branches/mbarnes-composer/components/editor
- Date: Wed, 12 Mar 2008 15:10:02 +0000 (GMT)
Author: mbarnes
Date: Wed Mar 12 15:10:02 2008
New Revision: 8782
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8782&view=rev
Log:
Clean up emoticon insertion. Support all "face" icons from G-I-T, even if
they're not all listed in the Insert menu.
Remove broken Help buttons. Someone needs to write docs first.
Modified:
branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
branches/mbarnes-composer/components/editor/gtkhtml-editor.c
branches/mbarnes-composer/components/editor/gtkhtml-editor.glade
branches/mbarnes-composer/components/editor/gtkhtml-editor.ui
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c Wed Mar 12 15:10:02 2008
@@ -214,20 +214,23 @@
}
static void
-insert_smiley_icon (GtkhtmlEditor *editor,
- const gchar *icon_name,
- const gchar *alt)
+insert_emoticon (GtkhtmlEditor *editor,
+ GtkAction *action,
+ const gchar *alt)
{
GtkHTML *html;
HTMLObject *image;
GtkIconInfo *icon_info;
const gchar *filename;
+ gchar *icon_name;
gchar *uri = NULL;
html = gtkhtml_editor_get_html (editor);
+ g_object_get (action, "icon-name", &icon_name, NULL);
icon_info = gtk_icon_theme_lookup_icon (
gtk_icon_theme_get_default (), icon_name, 16, 0);
+ g_free (icon_name);
g_return_if_fail (icon_info != NULL);
filename = gtk_icon_info_get_filename (icon_info);
@@ -725,80 +728,122 @@
}
static void
-action_insert_smiley_1_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_angel_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-smile", ":-)");
+ insert_emoticon (editor, action, "O:-)");
}
static void
-action_insert_smiley_2_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_cool_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-wink", ";-)");
+ insert_emoticon (editor, action, "B-)");
}
static void
-action_insert_smiley_3_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_crying_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "stock_smiley-3", "=)");
+ insert_emoticon (editor, action, ":'(");
}
static void
-action_insert_smiley_4_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_devilish_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-smile-big", ":-D");
+ insert_emoticon (editor, action, ">:-)");
}
static void
-action_insert_smiley_5_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_embarrassed_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-surprise", ":-O");
+ insert_emoticon (editor, action, ":\"-)");
}
static void
-action_insert_smiley_6_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_kiss_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-sad", ":-(");
+ insert_emoticon (editor, action, ":-*");
}
static void
-action_insert_smiley_8_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_monkey_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "face-plain", ":-|");
+ insert_emoticon (editor, action, ":-(|)");
}
static void
-action_insert_smiley_9_cb (GtkAction *action,
+action_insert_face_plain_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-|");
+}
+
+static void
+action_insert_face_raspberry_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-P");
+}
+
+static void
+action_insert_face_sad_cb (GtkAction *action,
GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "stock_smiley-9", ":-/");
+ insert_emoticon (editor, action, ":-(");
}
static void
-action_insert_smiley_10_cb (GtkAction *action,
- GtkhtmlEditor *editor)
+action_insert_face_smile_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-)");
+}
+
+static void
+action_insert_face_smile_big_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-D");
+}
+
+static void
+action_insert_face_smirk_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-!");
+}
+
+static void
+action_insert_face_surprise_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "stock_smiley-10", ":-P");
+ insert_emoticon (editor, action, ":-O");
}
static void
-action_insert_smiley_11_cb (GtkAction *action,
+action_insert_face_wink_cb (GtkAction *action,
GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "stock_smiley-11", ":~(");
+ insert_emoticon (editor, action, ";-)");
+}
+
+static void
+action_insert_smiley_9_cb (GtkAction *action,
+ GtkhtmlEditor *editor)
+{
+ insert_emoticon (editor, action, ":-/");
}
static void
action_insert_smiley_26_cb (GtkAction *action,
GtkhtmlEditor *editor)
{
- insert_smiley_icon (editor, "stock_smiley-26", ":-Q");
+ insert_emoticon (editor, action, ":-Q");
}
static void
@@ -1287,75 +1332,117 @@
NULL,
G_CALLBACK (action_insert_html_file_cb) },
- { "insert-smiley-1",
- "face-smile",
- N_("_Smile"),
+ { "insert-face-angel",
+ "face-angel",
+ N_("_Angel"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_1_cb) },
+ G_CALLBACK (action_insert_face_angel_cb) },
- { "insert-smiley-2",
- "face-wink",
- N_("_Wink"),
+ { "insert-face-cool",
+ "face-cool",
+ N_("_Cool"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_2_cb) },
+ G_CALLBACK (action_insert_face_cool_cb) },
- { "insert-smiley-3",
- "stock_smiley-3",
- N_("Su_rprised"),
+ { "insert-face-crying",
+ "face-crying",
+ N_("Cr_ying"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_3_cb) },
+ G_CALLBACK (action_insert_face_crying_cb) },
- { "insert-smiley-4",
- "face-smile-big",
- N_("_Laughing"),
+ { "insert-face-devilish",
+ "face-devilish",
+ N_("_Devilish"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_4_cb) },
+ G_CALLBACK (action_insert_face_devilish_cb) },
- { "insert-smiley-5",
- "face-surprise",
- N_("Oh _No!"),
+ { "insert-face-embarrassed",
+ "face-embarrassed",
+ N_("_Embarrassed"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_5_cb) },
+ G_CALLBACK (action_insert_face_embarrassed_cb) },
- { "insert-smiley-6",
- "face-sad",
- N_("_Frown"),
+ { "insert-face-kiss",
+ "face-kiss",
+ N_("_Kiss"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_kiss_cb) },
+
+ { "insert-face-monkey",
+ "face-monkey",
+ N_("_Monkey"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_6_cb) },
+ G_CALLBACK (action_insert_face_monkey_cb) },
- { "insert-smiley-8",
+ { "insert-face-plain",
"face-plain",
N_("_Indifferent"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_8_cb) },
+ G_CALLBACK (action_insert_face_plain_cb) },
- { "insert-smiley-9",
- "stock_smiley-9",
- N_("_Undecided"),
+ { "insert-face-raspberry",
+ "face-raspberry",
+ N_("_Tongue"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_9_cb) },
+ G_CALLBACK (action_insert_face_raspberry_cb) },
- { "insert-smiley-10",
- "stock_smiley-10",
- N_("Ton_gue"),
+ { "insert-face-sad",
+ "face-sad",
+ N_("_Frown"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_10_cb) },
+ G_CALLBACK (action_insert_face_sad_cb) },
- { "insert-smiley-11",
- "stock_smiley-11",
- N_("Cr_ying"),
+ { "insert-face-smile",
+ "face-smile",
+ N_("_Smile"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_smile_cb) },
+
+ { "insert-face-smile-big",
+ "face-smile-big",
+ N_("_Laughing"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_smile_big_cb) },
+
+ { "insert-face-smirk",
+ "face-smirk",
+ N_("Smi_rk"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_smirk_cb) },
+
+ { "insert-face-surprise",
+ "face-surprise",
+ N_("Sur_prised"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_surprise_cb) },
+
+ { "insert-face-wink",
+ "face-wink",
+ N_("_Wink"),
+ NULL,
+ NULL,
+ G_CALLBACK (action_insert_face_wink_cb) },
+
+ { "insert-smiley-9",
+ "stock_smiley-9",
+ N_("_Undecided"),
NULL,
NULL,
- G_CALLBACK (action_insert_smiley_11_cb) },
+ G_CALLBACK (action_insert_smiley_9_cb) },
{ "insert-smiley-26",
"stock_smiley-26",
@@ -1485,16 +1572,16 @@
NULL,
NULL },
- { "insert-menu",
+ { "insert-face-menu",
NULL,
- N_("_Insert"),
+ N_("_Emoticon"),
NULL,
NULL,
NULL },
- { "insert-smiley-menu",
+ { "insert-menu",
NULL,
- N_("Emoti_con"),
+ N_("_Insert"),
NULL,
NULL,
NULL },
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c Wed Mar 12 15:10:02 2008
@@ -255,8 +255,6 @@
tool_item = gtk_tool_item_new ();
widget = gtkhtml_color_combo_new ();
- gtkhtml_color_combo_set_default_label (
- GTKHTML_COLOR_COMBO (widget), _("Automatic"));
gtk_container_add (GTK_CONTAINER (tool_item), widget);
gtk_toolbar_insert (GTK_TOOLBAR (priv->edit_toolbar), tool_item, -1);
priv->color_combo_box = g_object_ref (widget);
@@ -283,7 +281,10 @@
priv->palette = gtkhtml_color_palette_new ();
priv->text_color = gtkhtml_color_state_new ();
- gtkhtml_color_state_set_palette (priv->text_color, priv->palette);
+ gtkhtml_color_state_set_default_label (
+ priv->text_color, _("Automatic"));
+ gtkhtml_color_state_set_palette (
+ priv->text_color, priv->palette);
/* Text color widgets share state. */
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.c Wed Mar 12 15:10:02 2008
@@ -499,7 +499,7 @@
g_signal_connect_swapped (
editor->priv->text_color, "notify::current-color",
- editor_text_color_changed_cb, editor);
+ G_CALLBACK (editor_text_color_changed_cb), editor);
gtkhtml_editor_set_html_mode (editor, TRUE);
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.glade
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.glade (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.glade Wed Mar 12 15:10:02 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Tue Feb 26 22:42:32 2008 -->
+<!--Generated with glade3 3.4.1 on Wed Mar 12 11:02:50 2008 -->
<glade-interface>
<requires lib="gtkhtml-editor"/>
<widget class="GtkWindow" id="text-properties-window">
@@ -32,52 +32,56 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget 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>
- <packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="text-properties-italic-image">
+ <widget 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="stock">gtk-italic</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>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-underline-image">
+ <widget 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="stock">gtk-underline</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>
<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>
</packing>
</child>
<child>
- <widget class="GtkImage" id="text-properties-strikethrough-image">
+ <widget 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="stock">gtk-strikethrough</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>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
+ <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>
</packing>
</child>
@@ -98,56 +102,52 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-italic-button">
+ <widget class="GtkImage" id="text-properties-strikethrough-image">
<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>
+ <property name="stock">gtk-strikethrough</property>
</widget>
<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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-underline-button">
+ <widget class="GtkImage" id="text-properties-underline-image">
<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>
+ <property name="stock">gtk-underline</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="text-properties-strikethrough-button">
+ <widget class="GtkImage" id="text-properties-italic-image">
<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>
+ <property name="stock">gtk-italic</property>
</widget>
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -162,30 +162,29 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkhtmlComboBox" id="text-properties-size-combo-box">
+ <widget 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>
<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">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="text-properties-alignment">
+ <widget 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>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">Si_ze:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_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>
</packing>
</child>
<child>
@@ -201,29 +200,30 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="text-properties-size-label">
+ <widget 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>
- <property name="label" translatable="yes">Si_ze:</property>
- <property name="use_underline">True</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<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="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="text-properties-color-combo">
+ <widget 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>
- <property name="default_label">Automatic</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -237,17 +237,7 @@
<widget 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>
- <child>
- <widget class="GtkButton" id="text-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="text-properties-ok-button">
<property name="visible">True</property>
@@ -437,17 +427,7 @@
<widget 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>
- <child>
- <widget class="GtkButton" id="paragraph-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="paragraph-properties-ok-button">
<property name="visible">True</property>
@@ -635,54 +615,42 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="replace-alignment">
+ <widget 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>
- <child>
- <placeholder/>
- </child>
</widget>
<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="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="replace-case-sensitive">
+ <widget 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>
- <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>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="replace-backwards">
+ <widget class="GtkLabel" id="replace-with-label">
<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="xalign">1</property>
+ <property name="label" translatable="yes">_With:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="mnemonic_widget">replace-with-entry</property>
</widget>
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -701,43 +669,55 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="replace-with-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_With:</property>
+ <property name="label" translatable="yes">Search _backwards</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">replace-with-entry</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="replace-entry">
+ <widget 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>
<packing>
- <property name="left_attach">1</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="replace-with-entry">
+ <widget class="GtkAlignment" id="replace-alignment">
<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>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -877,33 +857,31 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkButton" id="link-properties-test-button">
+ <widget class="GtkLabel" id="link-properties-url-label">
<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="xalign">1</property>
+ <property name="label" translatable="yes">_URL:</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
+ <property name="mnemonic_widget">link-properties-url-entry</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="link-properties-description-entry">
+ <widget class="GtkLabel" id="link-properties-description-label">
<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"/>
+ <property name="label" translatable="yes">_Description:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">link-properties-description-entry</property>
</widget>
<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>
</packing>
</child>
@@ -921,31 +899,33 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="link-properties-description-label">
+ <widget 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>
- <property name="label" translatable="yes">_Description:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">link-properties-description-entry</property>
+ <signal name="changed" handler="gtkhtml_editor_link_properties_description_changed_cb" object="link-properties-window"/>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="link-properties-url-label">
+ <widget 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="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>
+ <property name="response_id">0</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -958,20 +938,6 @@
<property name="spacing">6</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="link-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="link-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1043,33 +1009,30 @@
<placeholder/>
</child>
<child>
- <widget class="GtkComboBox" id="rule-properties-width-combo-box">
+ <widget 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="items" translatable="yes">px
-%</property>
- <signal name="changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="rule-properties-size-spin-button">
+ <widget 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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_rule_properties_size_changed_cb" object="rule-properties-window"/>
+ <signal name="value_changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
</widget>
<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>
</packing>
</child>
@@ -1089,29 +1052,32 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="rule-properties-width-spin-button">
- <property name="width_request">100</property>
+ <widget 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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
+ <signal name="value_changed" handler="gtkhtml_editor_rule_properties_size_changed_cb" object="rule-properties-window"/>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="rule-properties-width-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
+ <property name="items" translatable="yes">px
+%</property>
+ <signal name="changed" handler="gtkhtml_editor_rule_properties_width_changed_cb" object="rule-properties-window"/>
</widget>
<packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
@@ -1157,20 +1123,15 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="rule-properties-shaded-check-button">
+ <widget class="GtkLabel" id="rule-properties-alignment-label">
<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="xalign">1</property>
+ <property name="label" translatable="yes">_Alignment:</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>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -1190,15 +1151,20 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="rule-properties-alignment-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_Alignment:</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>
<packing>
- <property name="x_options"></property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1223,20 +1189,6 @@
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="rule-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="rule-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1451,115 +1403,94 @@
<placeholder/>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-border-spin-button">
+ <widget class="GtkLabel" id="table-properties-border-units-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_border_changed_cb" object="table-properties-window"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-padding-spin-button">
+ <widget class="GtkLabel" id="table-properties-padding-units-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_padding_changed_cb" object="table-properties-window"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-spacing-spin-button">
+ <widget class="GtkLabel" id="table-properties-spacing-units-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_spacing_changed_cb" object="table-properties-window"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-border-label">
+ <widget 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="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>
+ <property name="items" translatable="yes">px
+%</property>
+ <signal name="changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
</widget>
<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="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-padding-label">
+ <widget 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="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>
+ <property name="adjustment">1 1 100 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
</widget>
<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="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-spacing-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_Spacing:</property>
+ <property name="label" translatable="yes">_Width:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">table-properties-spacing-spin-button</property>
- </widget>
- <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>
- </packing>
- </child>
- <child>
- <widget 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>
+ <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>
<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>
</packing>
@@ -1583,95 +1514,116 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="table-properties-width-check-button">
+ <widget class="GtkLabel" id="table-properties-alignment-label">
<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"/>
+ <property name="label" translatable="yes">_Alignment:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">table-properties-alignment-combo-box</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="table-properties-width-spin-button">
- <property name="width_request">100</property>
+ <widget class="GtkLabel" id="table-properties-spacing-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
+ <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>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="table-properties-width-combo-box">
+ <widget 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="items" translatable="yes">px
-%</property>
- <signal name="changed" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
+ <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>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-spacing-units-label">
+ <widget 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">0</property>
- <property name="label" translatable="yes">px</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>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options"></property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-padding-units-label">
+ <widget 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="xalign">0</property>
- <property name="label" translatable="yes">px</property>
+ <property name="adjustment">0 0 32767 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_table_properties_spacing_changed_cb" object="table-properties-window"/>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget 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 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_table_properties_padding_changed_cb" object="table-properties-window"/>
+ </widget>
+ <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="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-border-units-label">
+ <widget 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="xalign">0</property>
- <property name="label" translatable="yes">px</property>
+ <property name="adjustment">0 0 32767 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_table_properties_border_changed_cb" object="table-properties-window"/>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
+ <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="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -1717,58 +1669,58 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkhtmlColorCombo" id="table-properties-color-combo">
+ <widget 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="default_color">#000000000000</property>
- <property name="default_label">Transparent</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Co_lor:</property>
+ <property name="use_underline">True</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="table-properties-image-button">
+ <widget 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>
- <signal name="selection_changed" handler="gtkhtml_editor_table_properties_image_changed_cb" object="table-properties-window"/>
+ <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>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-image-label">
+ <widget 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>
- <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>
+ <signal name="selection_changed" handler="gtkhtml_editor_table_properties_image_changed_cb" object="table-properties-window"/>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="table-properties-color-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">Co_lor:</property>
- <property name="use_underline">True</property>
+ <property name="default_color">#000000000000</property>
+ <property name="default_label">Transparent</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
@@ -1792,20 +1744,6 @@
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="table-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="table-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1877,43 +1815,29 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-background-color-combo">
+ <widget 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="default_color">#000000000000</property>
- <property name="default_label">Automatic</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Text:</property>
+ <property name="use_underline">True</property>
</widget>
<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">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-link-color-combo">
+ <widget 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="default_color">#000000000000</property>
- <property name="default_label">_Automatic</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Link:</property>
+ <property name="use_underline">True</property>
</widget>
<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>
- </packing>
- </child>
- <child>
- <widget 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>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1931,29 +1855,43 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-link-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_Link:</property>
- <property name="use_underline">True</property>
+ <property name="default_color">#000000000000</property>
+ <property name="default_label">_Automatic</property>
+ </widget>
+ <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">
+ <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>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-text-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_Text:</property>
- <property name="use_underline">True</property>
+ <property name="default_color">#000000000000</property>
+ <property name="default_label">Automatic</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
</widget>
@@ -2001,16 +1939,29 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkFileChooserButton" id="page-properties-custom-file-chooser">
- <property name="width_request">200</property>
+ <widget 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>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
<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>
</packing>
</child>
<child>
@@ -2033,29 +1984,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-custom-label">
+ <widget 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>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">C_ustom:</property>
- <property name="use_underline">True</property>
</widget>
<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>
- </packing>
- </child>
- <child>
- <widget 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>
- <packing>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -2079,20 +2017,6 @@
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="page-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="page-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2168,54 +2092,66 @@
<placeholder/>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-cell-image">
+ <widget 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="icon_name">stock_select-cell</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>
<packing>
- <property name="x_options"></property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-table-image">
+ <widget 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="icon_name">stock_select-table</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget 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>
+ <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>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options"></property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="cell-properties-column-image">
+ <widget 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="icon_name">stock_select-column</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>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <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"></property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2239,66 +2175,54 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-table-radio-button">
+ <widget class="GtkImage" id="cell-properties-column-image">
<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"/>
+ <property name="icon_name">stock_select-column</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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">GTK_FILL</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-row-radio-button">
+ <widget class="GtkImage" id="cell-properties-row-image">
<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"/>
+ <property name="icon_name">stock_select-row</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-column-radio-button">
+ <widget class="GtkImage" id="cell-properties-table-image">
<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"/>
+ <property name="icon_name">stock_select-table</property>
</widget>
<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="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -2348,32 +2272,64 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-horizontal-label">
+ <widget 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="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>
+ <property name="spacing">12</property>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-vertical-label">
+ <widget 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="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>
+ <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>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2393,63 +2349,31 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cell-properties-vertical-combo-box">
+ <widget 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="items" translatable="yes">Top
-Middle
-Bottom</property>
- <signal name="changed" handler="gtkhtml_editor_cell_properties_vertical_changed_cb" object="cell-properties-window"/>
+ <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>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="cell-properties-alignment-hbox">
+ <widget 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="spacing">12</property>
- <child>
- <widget 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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget 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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <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>
<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>
</packing>
@@ -2511,49 +2435,49 @@
<placeholder/>
</child>
<child>
- <widget class="GtkCheckButton" id="cell-properties-width-check-button">
+ <widget 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="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"/>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ <signal name="change_value" handler="gtkhtml_editor_cell_properties_column_span_changed_cb" object="cell-properties-window"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-width-spin-button">
- <property name="width_request">100</property>
+ <widget class="GtkSpinButton" id="cell-properties-row-span-spin-button">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
+ <signal name="change_value" handler="gtkhtml_editor_cell_properties_row_span_changed_cb" object="cell-properties-window"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cell-properties-width-combo-box">
+ <widget class="GtkLabel" id="cell-properties-column-span-label">
<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"/>
+ <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>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <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>
</packing>
@@ -2575,50 +2499,50 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="cell-properties-column-span-label">
+ <widget 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="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>
+ <property name="items" translatable="yes">px
+%</property>
+ <signal name="changed" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
</widget>
<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="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-row-span-spin-button">
+ <widget 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 10</property>
- <signal name="change_value" handler="gtkhtml_editor_cell_properties_row_span_changed_cb" object="cell-properties-window"/>
+ <signal name="value_changed" handler="gtkhtml_editor_cell_properties_width_changed_cb" object="cell-properties-window"/>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="cell-properties-column-span-spin-button">
+ <widget 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="adjustment">0 0 100 1 10 10</property>
- <signal name="change_value" handler="gtkhtml_editor_cell_properties_column_span_changed_cb" object="cell-properties-window"/>
+ <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>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2664,31 +2588,17 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget 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>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="cell-properties-image-label">
+ <widget 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="label" translatable="yes">I_mage:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cell-properties-image-file-chooser</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>
<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>
</packing>
</child>
@@ -2706,17 +2616,31 @@
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="cell-properties-image-file-chooser">
+ <widget 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="title" translatable="yes">Select An Image</property>
- <signal name="file_set" handler="gtkhtml_editor_cell_properties_image_file_set_cb" object="cell-properties-window"/>
+ <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>
<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>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2741,20 +2665,6 @@
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="cell-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="cell-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2823,31 +2733,17 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget 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>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="image-properties-description-label">
+ <widget 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>
- <property name="label" translatable="yes">_Description:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-description-entry</property>
+ <signal name="changed" handler="gtkhtml_editor_image_properties_description_changed_cb" object="image-properties-window"/>
</widget>
<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>
</packing>
</child>
@@ -2864,17 +2760,31 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="image-properties-description-entry">
+ <widget class="GtkLabel" id="image-properties-description-label">
<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"/>
+ <property name="label" translatable="yes">_Description:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-description-entry</property>
</widget>
<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>
+ </packing>
+ </child>
+ <child>
+ <widget 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>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2931,31 +2841,45 @@
<placeholder/>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-border-spin-button">
+ <widget 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>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="image-properties-height-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_border_changed_cb" object="image-properties-window"/>
+ <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>
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-border-units-label">
+ <widget 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">0</property>
- <property name="label" translatable="yes">px</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>
<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>
@@ -2963,210 +2887,210 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-y-padding-spin-button">
+ <widget 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 100 1 10 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
+ <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
</widget>
<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="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-y-padding-units-label">
+ <widget 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="xalign">0</property>
- <property name="label" translatable="yes">px</property>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-x-padding-units-label">
+ <widget 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="xalign">0</property>
- <property name="label" translatable="yes">px</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>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-x-padding-spin-button">
+ <widget class="GtkComboBox" id="image-properties-height-combo-box">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
+ <property name="items" translatable="yes">px
+%
+follow</property>
+ <signal name="changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-border-label">
+ <widget 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="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>
+ <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>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-y-padding-label">
+ <widget 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">_Y-Padding:</property>
+ <property name="label" translatable="yes">_X-Padding:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-y-padding-spin-button</property>
+ <property name="mnemonic_widget">image-properties-x-padding-spin-button</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-x-padding-label">
+ <widget 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">_X-Padding:</property>
+ <property name="label" translatable="yes">_Y-Padding:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-x-padding-spin-button</property>
+ <property name="mnemonic_widget">image-properties-y-padding-spin-button</property>
</widget>
<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>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-alignment-combo-box">
+ <widget 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="items" translatable="yes">Top
-Middle
-Bottom</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_alignment_changed_cb" object="image-properties-window"/>
+ <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>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-height-combo-box">
+ <widget 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="items" translatable="yes">px
-%
-follow</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
</widget>
<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="left_attach">5</property>
+ <property name="right_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="image-properties-width-combo-box">
+ <widget 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="items" translatable="yes">px
-%
-follow</property>
- <signal name="changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"></property>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-height-spin-button">
- <property name="width_request">100</property>
+ <widget class="GtkLabel" id="image-properties-y-padding-units-label">
<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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-width-spin-button">
- <property name="width_request">100</property>
+ <widget 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 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_size_changed_cb" object="image-properties-window"/>
+ <signal name="value_changed" handler="gtkhtml_editor_image_properties_padding_changed_cb" object="image-properties-window"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-alignment-label">
+ <widget 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">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>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">px</property>
</widget>
<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>
@@ -3174,32 +3098,18 @@
</packing>
</child>
<child>
- <widget 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>
- <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>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="image-properties-width-label">
+ <widget 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="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>
+ <property name="adjustment">0 0 100 1 10 10</property>
+ <signal name="value_changed" handler="gtkhtml_editor_image_properties_border_changed_cb" object="image-properties-window"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <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>
</packing>
</child>
@@ -3245,15 +3155,19 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="image-properties-url-label">
+ <widget 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="xalign">1</property>
- <property name="label" translatable="yes">_URL:</property>
+ <property name="label" translatable="yes">_Test URL...</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-url-entry</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="gtkhtml_editor_image_properties_url_button_clicked_cb" object="image-properties-window"/>
</widget>
<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>
</packing>
@@ -3272,19 +3186,15 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="image-properties-url-button">
+ <widget class="GtkLabel" id="image-properties-url-label">
<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="xalign">1</property>
+ <property name="label" translatable="yes">_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"/>
+ <property name="mnemonic_widget">image-properties-url-entry</property>
</widget>
<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>
</packing>
@@ -3310,20 +3220,6 @@
<property name="spacing">12</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="image-properties-help-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">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
<widget class="GtkButton" id="image-properties-close-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.ui
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.ui (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.ui Wed Mar 12 15:10:02 2008
@@ -31,17 +31,16 @@
<menuitem action='insert-table'/>
<menuitem action='insert-text-file'/>
<menuitem action='insert-html-file'/>
- <menu action='insert-smiley-menu'>
- <menuitem action='insert-smiley-1'/>
- <menuitem action='insert-smiley-2'/>
- <menuitem action='insert-smiley-3'/>
- <menuitem action='insert-smiley-4'/>
- <menuitem action='insert-smiley-5'/>
- <menuitem action='insert-smiley-6'/>
- <menuitem action='insert-smiley-8'/>
+ <menu action='insert-face-menu'>
+ <menuitem action='insert-face-smile'/>
+ <menuitem action='insert-face-surprise'/>
+ <menuitem action='insert-face-wink'/>
+ <menuitem action='insert-face-sad'/>
+ <menuitem action='insert-face-smile-big'/>
+ <menuitem action='insert-face-plain'/>
<menuitem action='insert-smiley-9'/>
- <menuitem action='insert-smiley-10'/>
- <menuitem action='insert-smiley-11'/>
+ <menuitem action='insert-face-raspberry'/>
+ <menuitem action='insert-face-crying'/>
<menuitem action='insert-smiley-26'/>
</menu>
</menu>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
