gtkhtml r8783 - branches/mbarnes-composer/components/editor
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: gtkhtml r8783 - branches/mbarnes-composer/components/editor
- Date: Wed, 12 Mar 2008 20:52:36 +0000 (GMT)
Author: mbarnes
Date: Wed Mar 12 20:52:36 2008
New Revision: 8783
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8783&view=rev
Log:
Implement the Page Properties dialog.
Modified:
branches/mbarnes-composer/components/editor/Makefile.am
branches/mbarnes-composer/components/editor/gtkhtml-color-combo.c
branches/mbarnes-composer/components/editor/gtkhtml-color-combo.h
branches/mbarnes-composer/components/editor/gtkhtml-color-state.c
branches/mbarnes-composer/components/editor/gtkhtml-color-state.h
branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h
branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
branches/mbarnes-composer/components/editor/gtkhtml-editor-signals.c
branches/mbarnes-composer/components/editor/gtkhtml-editor-widgets.h
branches/mbarnes-composer/components/editor/gtkhtml-editor.c
branches/mbarnes-composer/components/editor/gtkhtml-editor.glade
Modified: branches/mbarnes-composer/components/editor/Makefile.am
==============================================================================
--- branches/mbarnes-composer/components/editor/Makefile.am (original)
+++ branches/mbarnes-composer/components/editor/Makefile.am Wed Mar 12 20:52:36 2008
@@ -1,5 +1,7 @@
### Process this file with automake to produce Makefile.in
+gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
+
bin_PROGRAMS = gtkhtml-editor-test
lib_LTLIBRARIES = libgtkhtml-editor.la
@@ -10,6 +12,7 @@
-I$(top_srcdir)/components/editor \
-DG_LOG_DOMAIN=\"gtkhtml-editor\" \
-DLOCALEDIR=\""$(datadir)/locale/"\" \
+ -DICONDIR=\""$(gtkhtml_data)/icons"\" \
-DHAVE_CONFIG_H
BUILT_SOURCES = \
@@ -78,7 +81,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gtkhtml-editor.pc
-uidir = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
+uidir = $(gtkhtml_data)
ui_DATA = \
gtkhtml-editor.glade \
gtkhtml-editor.ui
Modified: branches/mbarnes-composer/components/editor/gtkhtml-color-combo.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-color-combo.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-color-combo.c Wed Mar 12 20:52:36 2008
@@ -1013,13 +1013,14 @@
g_signal_emit (combo, signals[POPDOWN], 0);
}
-void
+gboolean
gtkhtml_color_combo_get_current_color (GtkhtmlColorCombo *combo,
GdkColor *color)
{
- g_return_if_fail (GTKHTML_IS_COLOR_COMBO (combo));
+ g_return_val_if_fail (GTKHTML_IS_COLOR_COMBO (combo), FALSE);
- gtkhtml_color_state_get_current_color (combo->priv->state, color);
+ return gtkhtml_color_state_get_current_color (
+ combo->priv->state, color);
}
void
Modified: branches/mbarnes-composer/components/editor/gtkhtml-color-combo.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-color-combo.h (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-color-combo.h Wed Mar 12 20:52:36 2008
@@ -69,7 +69,7 @@
const gchar *default_label);
void gtkhtml_color_combo_popup (GtkhtmlColorCombo *combo);
void gtkhtml_color_combo_popdown (GtkhtmlColorCombo *combo);
-void gtkhtml_color_combo_get_current_color
+gboolean gtkhtml_color_combo_get_current_color
(GtkhtmlColorCombo *combo,
GdkColor *color);
void gtkhtml_color_combo_set_current_color
Modified: branches/mbarnes-composer/components/editor/gtkhtml-color-state.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-color-state.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-color-state.c Wed Mar 12 20:52:36 2008
@@ -290,21 +290,23 @@
"default-label", default_label);
}
-void
+gboolean
gtkhtml_color_state_get_current_color (GtkhtmlColorState *state,
GdkColor *color)
{
- g_return_if_fail (GTKHTML_IS_COLOR_STATE (state));
- g_return_if_fail (color != NULL);
+ g_return_val_if_fail (GTKHTML_IS_COLOR_STATE (state), FALSE);
+ g_return_val_if_fail (color != NULL, FALSE);
if (state->priv->current_color != NULL) {
color->red = state->priv->current_color->red;
color->green = state->priv->current_color->green;
color->blue = state->priv->current_color->blue;
+ return TRUE;
} else {
color->red = state->priv->default_color->red;
color->green = state->priv->default_color->green;
color->blue = state->priv->default_color->blue;
+ return FALSE;
}
}
Modified: branches/mbarnes-composer/components/editor/gtkhtml-color-state.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-color-state.h (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-color-state.h Wed Mar 12 20:52:36 2008
@@ -69,7 +69,7 @@
GtkhtmlColorState *
gtkhtml_color_state_new_default (GdkColor *default_color,
const gchar *default_label);
-void gtkhtml_color_state_get_current_color
+gboolean gtkhtml_color_state_get_current_color
(GtkhtmlColorState *state,
GdkColor *color);
void gtkhtml_color_state_set_current_color
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c Wed Mar 12 20:52:36 2008
@@ -79,6 +79,15 @@
* "style-list-roman" (radio)
* "style-normal" (radio)
* "style-preformat" (radio)
+ * "template-none" (radio)
+ * "template-1" (radio)
+ * "template-2" (radio)
+ * "template-3" (radio)
+ * "template-4" (radio)
+ * "template-5" (radio)
+ * "template-6" (radio)
+ * "template-7" (radio)
+ * "template-8" (radio)
* "test-url"
* "undo"
* "unindent"
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h Wed Mar 12 20:52:36 2008
@@ -140,6 +140,8 @@
GTKHTML_EDITOR_ACTION ((editor), "style-h6")
#define GTKHTML_EDITOR_ACTION_STYLE_NORMAL(editor) \
GTKHTML_EDITOR_ACTION ((editor), "style-normal")
+#define GTKHTML_EDITOR_ACTION_TEMPLATE_NONE(editor) \
+ GTKHTML_EDITOR_ACTION ((editor), "template-none")
#define GTKHTML_EDITOR_ACTION_TEST_URL(editor) \
GTKHTML_EDITOR_ACTION ((editor), "test-url")
#define GTKHTML_EDITOR_ACTION_UNDERLINE(editor) \
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c Wed Mar 12 20:52:36 2008
@@ -292,10 +292,6 @@
gtkhtml_color_combo_set_state (
GTKHTML_COLOR_COMBO (widget), priv->text_color);
- widget = WIDGET (PAGE_PROPERTIES_TEXT_COLOR_COMBO);
- gtkhtml_color_combo_set_state (
- GTKHTML_COLOR_COMBO (widget), priv->text_color);
-
widget = WIDGET (TEXT_PROPERTIES_COLOR_COMBO);
gtkhtml_color_combo_set_state (
GTKHTML_COLOR_COMBO (widget), priv->text_color);
@@ -324,8 +320,8 @@
{
GtkhtmlEditorPrivate *priv = editor->priv;
- /* Disconnect signal handlers from the text color
- * state object since the object may live on. */
+ /* Disconnect signal handlers from the color
+ * state object since it may live on. */
if (priv->text_color != NULL) {
g_signal_handlers_disconnect_matched (
priv->text_color, G_SIGNAL_MATCH_DATA,
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-signals.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-signals.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-signals.c Wed Mar 12 20:52:36 2008
@@ -38,6 +38,8 @@
SIZE_UNIT_FOLLOW
};
+/* Dialogs are transient windows for the main editor window. So
+ * given a dialog window we can extract the main editor window. */
static GtkhtmlEditor *
extract_gtkhtml_editor (GtkWidget *window)
{
@@ -1170,6 +1172,313 @@
}
/*****************************************************************************
+ * Page Properties Window
+ *****************************************************************************/
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_background_color_changed_cb (GtkWidget *window,
+ GtkhtmlColorCombo *combo))
+{
+ const HTMLColorId color_id = HTMLBgColor;
+ GtkhtmlEditor *editor;
+ GdkColor color;
+ GtkHTML *html;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+
+ if (!gtkhtml_color_combo_get_current_color (combo, &color))
+ color = html_colorset_get_color (
+ html->engine->defaultSettings->color_set,
+ color_id)->color;
+
+ html_colorset_set_color (
+ html->engine->settings->color_set, &color, color_id);
+ html_object_change_set_down (
+ html->engine->clue, HTML_CHANGE_RECALC_PI);
+
+ gtk_widget_queue_draw (GTK_WIDGET (html));
+
+ g_object_unref (editor);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_custom_file_changed_cb (GtkWidget *window,
+ GtkFileChooser *file_chooser))
+{
+ GtkhtmlEditor *editor;
+ GtkHTML *html;
+ gchar *filename;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+
+ if (html->engine->bgPixmapPtr != NULL) {
+ html_image_factory_unregister (
+ html->engine->image_factory,
+ html->engine->bgPixmapPtr, NULL);
+ html->engine->bgPixmapPtr = NULL;
+ }
+
+ filename = gtk_file_chooser_get_filename (file_chooser);
+ if (filename != NULL && *filename != '\0') {
+ gchar *uri;
+
+ uri = gtk_html_filename_to_uri (filename);
+ html->engine->bgPixmapPtr = html_image_factory_register (
+ html->engine->image_factory, NULL, uri, TRUE);
+ g_free (uri);
+ }
+ g_free (filename);
+
+ gtk_widget_queue_draw (GTK_WIDGET (html));
+
+ g_object_unref (editor);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_link_color_changed_cb (GtkWidget *window,
+ GtkhtmlColorCombo *combo))
+{
+ const HTMLColorId color_id = HTMLLinkColor;
+ GtkhtmlEditor *editor;
+ GdkColor color;
+ GtkHTML *html;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+
+ if (!gtkhtml_color_combo_get_current_color (combo, &color))
+ color = html_colorset_get_color (
+ html->engine->defaultSettings->color_set,
+ color_id)->color;
+
+ html_colorset_set_color (
+ html->engine->settings->color_set, &color, color_id);
+ html_object_change_set_down (
+ html->engine->clue, HTML_CHANGE_RECALC_PI);
+
+ gtk_widget_queue_draw (GTK_WIDGET (html));
+
+ g_object_unref (editor);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_template_changed_cb (GtkWidget *window,
+ GtkComboBox *combo_box))
+{
+ GtkhtmlEditor *editor;
+ GtkHTML *html;
+ GtkWidget *widget;
+ gchar *filename;
+
+ /* Template Parameters */
+ const gchar *basename;
+ GdkColor text_color;
+ GdkColor link_color;
+ GdkColor bgnd_color;
+ gint left_margin = 10;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+
+ switch (gtk_combo_box_get_active (combo_box)) {
+ case 0:
+ basename = NULL;
+ text_color = html_colorset_get_color_allocated (
+ html->engine->settings->color_set,
+ html->engine->painter,
+ HTMLTextColor)->color;
+ link_color = html_colorset_get_color_allocated (
+ html->engine->settings->color_set,
+ html->engine->painter,
+ HTMLLinkColor)->color;
+ bgnd_color = html_colorset_get_color_allocated (
+ html->engine->settings->color_set,
+ html->engine->painter,
+ HTMLBgColor)->color;
+ break;
+
+ case 1:
+ basename = "paper.png";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x0;
+ link_color.red = 0x0;
+ link_color.green = 0x3380;
+ link_color.blue = 0x6680;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ left_margin = 30;
+ break;
+
+ case 2:
+ basename = "texture.png";
+ text_color.red = 0x1FFF;
+ text_color.green = 0x1FFF;
+ text_color.blue = 0x8FFF;
+ link_color.red = 0x0;
+ link_color.green = 0x0;
+ link_color.blue = 0xFFFF;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ break;
+
+ case 3:
+ basename = "rect.png";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x0;
+ link_color.red = 0x0;
+ link_color.green = 0x0;
+ link_color.blue = 0xFFFF;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ break;
+
+ case 4:
+ basename = "ribbon.jpg";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x0;
+ link_color.red = 0x9900;
+ link_color.green = 0x3300;
+ link_color.blue = 0x6600;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ left_margin = 70;
+ break;
+
+ case 5:
+ basename = "midnight-stars.jpg";
+ text_color.red = 0xFFFF;
+ text_color.green = 0xFFFF;
+ text_color.blue = 0xFFFF;
+ link_color.red = 0xFFFF;
+ link_color.green = 0x9900;
+ link_color.blue = 0x0;
+ bgnd_color.red = 0x0;
+ bgnd_color.green = 0x0;
+ bgnd_color.blue = 0x0;
+ break;
+
+ case 6:
+ basename = "confidential-stamp.jpg";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x0;
+ link_color.red = 0x0;
+ link_color.green = 0x0;
+ link_color.blue = 0xFFFF;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ break;
+
+ case 7:
+ basename = "draft-stamp.jpg";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x0;
+ link_color.red = 0x0;
+ link_color.green = 0x0;
+ link_color.blue = 0xFFFF;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ break;
+
+ case 8:
+ basename = "draft-paper.png";
+ text_color.red = 0x0;
+ text_color.green = 0x0;
+ text_color.blue = 0x8000;
+ link_color.red = 0xE300;
+ link_color.green = 0x2100;
+ link_color.blue = 0x2300;
+ bgnd_color.red = 0xFFFF;
+ bgnd_color.green = 0xFFFF;
+ bgnd_color.blue = 0xFFFF;
+ break;
+
+ default:
+ g_return_if_reached ();
+ }
+
+ widget = WIDGET (PAGE_PROPERTIES_CUSTOM_FILE_CHOOSER);
+ if (basename != NULL)
+ filename = g_build_filename (ICONDIR, basename, NULL);
+ else
+ filename = g_strdup ("");
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename);
+ g_free (filename);
+
+ widget = WIDGET (PAGE_PROPERTIES_TEXT_COLOR_COMBO);
+ gtkhtml_color_combo_set_current_color (
+ GTKHTML_COLOR_COMBO (widget), &text_color);
+
+ widget = WIDGET (PAGE_PROPERTIES_LINK_COLOR_COMBO);
+ gtkhtml_color_combo_set_current_color (
+ GTKHTML_COLOR_COMBO (widget), &link_color);
+
+ widget = WIDGET (PAGE_PROPERTIES_BACKGROUND_COLOR_COMBO);
+ gtkhtml_color_combo_set_current_color (
+ GTKHTML_COLOR_COMBO (widget), &bgnd_color);
+
+ html->engine->leftBorder = left_margin;
+ g_object_unref (editor);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_text_color_changed_cb (GtkWidget *window,
+ GtkhtmlColorCombo *combo))
+{
+ const HTMLColorId color_id = HTMLTextColor;
+ GtkhtmlEditor *editor;
+ GdkColor color;
+ GtkHTML *html;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+
+ if (!gtkhtml_color_combo_get_current_color (combo, &color))
+ color = html_colorset_get_color (
+ html->engine->defaultSettings->color_set,
+ color_id)->color;
+
+ gtkhtml_color_state_set_default_color (
+ editor->priv->text_color, &color);
+
+ html_colorset_set_color (
+ html->engine->settings->color_set, &color, color_id);
+ html_object_change_set_down (
+ html->engine->clue, HTML_CHANGE_RECALC_PI);
+
+ gtk_widget_queue_draw (GTK_WIDGET (html));
+
+ g_object_unref (editor);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_page_properties_window_realized_cb (GtkWidget *window))
+{
+ GtkhtmlEditor *editor;
+
+ editor = extract_gtkhtml_editor (window);
+
+ /* Active "None" Template */
+ gtk_combo_box_set_active (
+ GTK_COMBO_BOX (WIDGET (
+ PAGE_PROPERTIES_TEMPLATE_COMBO_BOX)), 0);
+
+ g_object_unref (editor);
+}
+
+/*****************************************************************************
* Rule Properties Window
*****************************************************************************/
@@ -1333,15 +1642,6 @@
}
/*****************************************************************************
- * Spell Check Window
- *****************************************************************************/
-
-AUTOCONNECTED_SIGNAL_HANDLER (void
-gtkhtml_editor_spell_show_window_cb (GtkWidget *window))
-{
-}
-
-/*****************************************************************************
* Table Properties Window
*****************************************************************************/
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-widgets.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-widgets.h (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-widgets.h Wed Mar 12 20:52:36 2008
@@ -113,8 +113,12 @@
/* Page Properties Window */
#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_BACKGROUND_COLOR_COMBO(editor) \
GTKHTML_EDITOR_WIDGET ((editor), "page-properties-background-color-combo")
+#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_CUSTOM_FILE_CHOOSER(editor) \
+ GTKHTML_EDITOR_WIDGET ((editor), "page-properties-custom-file-chooser")
#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_LINK_COLOR_COMBO(editor) \
GTKHTML_EDITOR_WIDGET ((editor), "page-properties-link-color-combo")
+#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_TEMPLATE_COMBO_BOX(editor) \
+ GTKHTML_EDITOR_WIDGET ((editor), "page-properties-template-combo-box")
#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_TEXT_COLOR_COMBO(editor) \
GTKHTML_EDITOR_WIDGET ((editor), "page-properties-text-color-combo")
#define GTKHTML_EDITOR_WIDGET_PAGE_PROPERTIES_WINDOW(editor) \
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.c (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.c Wed Mar 12 20:52:36 2008
@@ -142,17 +142,21 @@
static void
editor_text_color_changed_cb (GtkhtmlEditor *editor)
{
- GtkHTML *html;
- HTMLColor *color;
+ GtkhtmlColorState *state;
GdkColor gdk_color;
+ GtkHTML *html;
+ state = editor->priv->text_color;
html = gtkhtml_editor_get_html (editor);
- gtkhtml_color_state_get_current_color (
- editor->priv->text_color, &gdk_color);
- color = html_color_new_from_gdk_color (&gdk_color);
- gtk_html_set_color (html, color);
- html_color_unref (color);
+ if (gtkhtml_color_state_get_current_color (state, &gdk_color)) {
+ HTMLColor *color;
+
+ color = html_color_new_from_gdk_color (&gdk_color);
+ gtk_html_set_color (html, color);
+ html_color_unref (color);
+ } else
+ gtk_html_set_color (html, NULL);
}
static void
@@ -490,6 +494,7 @@
GTK_WINDOW (WIDGET (TEXT_PROPERTIES_WINDOW)),
GTK_WINDOW (object));
+ /* Initialize various GtkhtmlComboBox instances. */
g_object_set (
WIDGET (PARAGRAPH_PROPERTIES_STYLE_COMBO_BOX),
"action", ACTION (STYLE_NORMAL), NULL);
Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.glade
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.glade (original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.glade Wed Mar 12 20:52:36 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 11:02:50 2008 -->
+<!--Generated with glade3 3.4.1 on Wed Mar 12 16:34:34 2008 -->
<glade-interface>
<requires lib="gtkhtml-editor"/>
<widget class="GtkWindow" id="text-properties-window">
@@ -32,56 +32,52 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="text-properties-strikethrough-button">
+ <widget class="GtkImage" id="text-properties-bold-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-bold</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="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-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">_Underline</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="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-underline-image">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-underline</property>
</widget>
<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-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>
@@ -102,52 +98,56 @@
</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>
<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-italic-image">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="stock">gtk-italic</property>
- </widget>
- <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="text-properties-bold-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-bold</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="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>
@@ -162,29 +162,30 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<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>
@@ -200,30 +201,29 @@
</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>
- <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>
</widget>
@@ -615,42 +615,54 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<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="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>
@@ -669,55 +681,43 @@
</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>
<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="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>
</widget>
@@ -857,31 +857,33 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<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>
@@ -899,33 +901,31 @@
</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>
<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>
@@ -1009,30 +1009,33 @@
<placeholder/>
</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>
</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>
@@ -1052,32 +1055,29 @@
</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>
<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>
@@ -1123,15 +1123,20 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
@@ -1151,20 +1156,15 @@
</packing>
</child>
<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>
@@ -1403,110 +1403,113 @@
<placeholder/>
</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>
<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-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="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="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="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="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>
@@ -1514,15 +1517,17 @@
</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>
@@ -1530,100 +1535,95 @@
</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-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-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="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="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-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>
@@ -1669,58 +1669,58 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<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="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="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>
</widget>
@@ -1777,6 +1777,7 @@
<property name="modal">True</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="destroy_with_parent">True</property>
+ <signal name="realize" handler="gtkhtml_editor_page_properties_window_realized_cb"/>
<signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
<child>
<widget class="GtkVBox" id="page-properties-vbox">
@@ -1815,83 +1816,86 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<child>
- <widget class="GtkLabel" id="page-properties-link-label">
+ <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="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_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-background-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">_Background:</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="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-text-color-combo">
+ <widget class="GtkLabel" id="page-properties-background-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="default_color">#000000000000</property>
- <property name="default_label">_Automatic</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Background:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-link-color-combo">
+ <widget class="GtkLabel" id="page-properties-link-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="default_color">#000000000000</property>
- <property name="default_label">_Automatic</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Link:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkhtmlColorCombo" id="page-properties-background-color-combo">
+ <widget class="GtkLabel" id="page-properties-text-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="default_color">#000000000000</property>
- <property name="default_label">Automatic</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Text:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
</widget>
@@ -1939,61 +1943,63 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
<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="GtkComboBox" id="page-properties-template-combo-box">
+ <widget class="GtkLabel" id="page-properties-custom-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="items" translatable="yes">None
-Preforated paper
-Blue ink
-Paper
-Ribbon
-Midnight
-Confidential
-Draft
-Graph paper</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">C_ustom:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="page-properties-custom-file-chooser">
- <property name="width_request">200</property>
+ <widget class="GtkLabel" id="page-properties-template-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">T_emplate:</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="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>
</widget>
@@ -2092,43 +2098,72 @@
<placeholder/>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-column-radio-button">
+ <widget class="GtkImage" id="cell-properties-cell-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-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="left_attach">4</property>
- <property name="right_attach">5</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="cell-properties-row-radio-button">
+ <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">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="icon_name">stock_select-column</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <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>
@@ -2156,73 +2191,44 @@
</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>
</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>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </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>
+ <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">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="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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2272,64 +2278,32 @@
<placeholder/>
</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>
</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>
@@ -2349,31 +2323,63 @@
</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>
<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>
@@ -2435,49 +2441,49 @@
<placeholder/>
</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>
<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="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>
@@ -2499,50 +2505,50 @@
</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>
</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="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>
@@ -2588,59 +2594,59 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkFileChooserButton" id="cell-properties-image-file-chooser">
+ <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="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="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="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="GtkhtmlColorCombo" id="cell-properties-color-combo">
+ <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="default_color">#000000000000</property>
- <property name="default_label">Transparent</property>
- </widget>
+ <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-image-label">
+ <widget class="GtkhtmlColorCombo" id="cell-properties-color-combo">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">I_mage:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cell-properties-image-file-chooser</property>
+ <property name="default_color">#000000000000</property>
+ <property name="default_label">Transparent</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="y_options"></property>
</packing>
</child>
<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>
+ <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="x_options">GTK_FILL</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>
@@ -2733,58 +2739,58 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="image-properties-description-entry">
+ <widget class="GtkLabel" id="image-properties-source-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="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="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="GtkFileChooserButton" id="image-properties-source-file-chooser">
+ <widget class="GtkLabel" id="image-properties-description-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <signal name="file_set" handler="gtkhtml_editor_image_properties_source_file_set_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-description-label">
+ <widget class="GtkFileChooserButton" id="image-properties-source-file-chooser">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">_Description:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-description-entry</property>
+ <signal name="file_set" handler="gtkhtml_editor_image_properties_source_file_set_cb" object="image-properties-window"/>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-source-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="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>
+ <signal name="changed" handler="gtkhtml_editor_image_properties_description_changed_cb" object="image-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">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2841,45 +2847,31 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="image-properties-width-label">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-width-spin-button</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="image-properties-height-label">
+ <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">_Height:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">image-properties-height-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="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <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>
<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>
@@ -2887,210 +2879,210 @@
</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="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="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="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-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="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="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-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="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-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="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="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-border-units-label">
+ <widget class="GtkLabel" id="image-properties-alignment-label">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">px</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Alignment:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-alignment-combo-box</property>
</widget>
<packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
@@ -3098,18 +3090,32 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="image-properties-border-spin-button">
+ <widget class="GtkLabel" id="image-properties-height-label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">0 0 100 1 10 10</property>
- <signal name="value_changed" handler="gtkhtml_editor_image_properties_border_changed_cb" object="image-properties-window"/>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Height:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-height-spin-button</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="image-properties-width-label">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">image-properties-width-spin-button</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -3155,19 +3161,15 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<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>
@@ -3186,15 +3188,19 @@
</packing>
</child>
<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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
