gtkhtml r8804 - branches/mbarnes-composer/components/editor
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkhtml r8804 - branches/mbarnes-composer/components/editor
- Date: Tue, 1 Apr 2008 13:15:39 +0100 (BST)
Author: mbarnes
Date: Tue Apr 1 13:15:39 2008
New Revision: 8804
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8804&view=rev
Log:
Glade tweaks.
Modified:
branches/mbarnes-composer/components/editor/gtkhtml-editor.glade
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 Tue Apr 1 13:15:39 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 Wed Mar 12 16:34:34 2008 -->
+<!--Generated with glade3 3.4.1 on Tue Apr 1 08:13:39 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>
@@ -615,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>
@@ -681,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>
@@ -857,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>
@@ -901,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>
@@ -1009,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>
@@ -1055,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>
@@ -1123,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>
@@ -1156,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>
@@ -1403,113 +1403,110 @@
<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>
+ <property name="xalign">1</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="gtkhtml_editor_table_properties_width_changed_cb" object="table-properties-window"/>
</widget>
<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">
+ <widget class="GtkComboBox" id="table-properties-alignment-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="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="items" translatable="yes">Left
+Center
+Right</property>
+ <signal name="changed" handler="gtkhtml_editor_table_properties_alignment_changed_cb" object="table-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>
@@ -1517,17 +1514,15 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="table-properties-alignment-combo-box">
+ <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="items" translatable="yes">Left
-Center
-Right</property>
- <signal name="changed" handler="gtkhtml_editor_table_properties_alignment_changed_cb" object="table-properties-window"/>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Alignment:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">table-properties-alignment-combo-box</property>
</widget>
<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>
@@ -1535,95 +1530,100 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="table-properties-width-check-button">
+ <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="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">_Spacing:</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="GtkSpinButton" id="table-properties-width-spin-button">
- <property name="width_request">100</property>
+ <widget class="GtkLabel" id="table-properties-padding-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">_Padding:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">table-properties-padding-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">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="table-properties-width-combo-box">
+ <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="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">_Border:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">table-properties-border-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">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-spacing-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="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="GtkLabel" id="table-properties-padding-units-label">
+ <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="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_padding_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">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>
@@ -1669,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>
@@ -1816,46 +1816,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>
- <signal name="changed" handler="gtkhtml_editor_page_properties_background_color_changed_cb" object="page-properties-window"/>
+ <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>
- <signal name="changed" handler="gtkhtml_editor_page_properties_link_color_changed_cb" object="page-properties-window"/>
+ <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>
- <signal name="changed" handler="gtkhtml_editor_page_properties_text_color_changed_cb" object="page-properties-window"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1873,29 +1856,46 @@
</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>
+ <signal name="changed" handler="gtkhtml_editor_page_properties_text_color_changed_cb" object="page-properties-window"/>
+ </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>
+ <signal name="changed" handler="gtkhtml_editor_page_properties_link_color_changed_cb" object="page-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>
</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>
+ <signal name="changed" handler="gtkhtml_editor_page_properties_background_color_changed_cb" object="page-properties-window"/>
</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>
@@ -1943,63 +1943,63 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="page-properties-template-combo-box">
+ <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="items" translatable="yes">None
-Perforated Paper
-Blue Ink
-Paper
-Ribbon
-Midnight
-Confidential
-Draft
-Graph Paper</property>
- <signal name="changed" handler="gtkhtml_editor_page_properties_template_changed_cb" object="page-properties-window"/>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">T_emplate:</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>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="page-properties-custom-file-chooser">
- <property name="width_request">200</property>
+ <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>
- <signal name="selection_changed" handler="gtkhtml_editor_page_properties_custom_file_changed_cb" object="page-properties-window"/>
+ <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-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>
+ <signal name="selection_changed" handler="gtkhtml_editor_page_properties_custom_file_changed_cb" object="page-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>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="page-properties-template-label">
+ <widget class="GtkComboBox" id="page-properties-template-combo-box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">T_emplate:</property>
- <property name="use_underline">True</property>
+ <property name="items" translatable="yes">None
+Perforated Paper
+Blue Ink
+Paper
+Ribbon
+Midnight
+Confidential
+Draft
+Graph Paper</property>
+ <signal name="changed" handler="gtkhtml_editor_page_properties_template_changed_cb" object="page-properties-window"/>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
</widget>
@@ -2098,72 +2098,43 @@
<placeholder/>
</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>
- <child>
- <widget class="GtkImage" id="cell-properties-table-image">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="icon_name">stock_select-table</property>
- </widget>
- <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>
- </widget>
- <packing>
- <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="GtkImage" id="cell-properties-column-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-column</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="left_attach">3</property>
- <property name="right_attach">4</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"></property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-cell-radio-button">
+ <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="label" translatable="yes">C_ell</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">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>
@@ -2191,44 +2162,73 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-row-radio-button">
+ <widget class="GtkRadioButton" id="cell-properties-cell-radio-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Row</property>
+ <property name="label" translatable="yes">C_ell</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <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">4</property>
- <property name="right_attach">5</property>
+ <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="GtkRadioButton" id="cell-properties-column-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">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-column</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="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-row-image">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">stock_select-row</property>
+ </widget>
+ <packing>
+ <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="GtkImage" id="cell-properties-table-image">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">stock_select-table</property>
+ </widget>
+ <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-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>
@@ -2278,32 +2278,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>
@@ -2323,63 +2355,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>
@@ -2441,49 +2441,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>
@@ -2505,50 +2505,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>
@@ -2594,31 +2594,17 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="cell-properties-color-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="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">
- <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>
@@ -2636,17 +2622,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>
@@ -2739,31 +2739,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>
@@ -2780,17 +2766,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>
@@ -2847,31 +2847,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="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">_Width:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-width-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="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-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">0</property>
- <property name="label" translatable="yes">px</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-alignment-label">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Alignment:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-alignment-combo-box</property>
</widget>
<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>
@@ -2879,210 +2893,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>
@@ -3090,32 +3104,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>
@@ -3161,15 +3161,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>
@@ -3188,19 +3192,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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
