commit gtkhtml2 for openSUSE:Factory
Hello community,
here is the log from the commit of package gtkhtml2 for openSUSE:Factory
checked in at Thu Jan 8 18:07:07 CET 2009.
--------
--- GNOME/gtkhtml2/gtkhtml2.changes 2008-11-07 12:45:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/gtkhtml2/gtkhtml2.changes 2009-01-07 08:40:03.715371000 +0100
@@ -1,0 +2,15 @@
+Wed Jan 7 08:18:09 CET 2009 - abharath@suse.de
+
+- Patches added
+ + bgo#330452 - bgo-330452-spell-suggestions.patch - Automatic spell
+ check suggestions should be first level menu option.
+ + bgo#562323 - bgo-562323-insert-link.patch - Evolution inserts
+ a link incorrectly.
+ + bgo#564248 - bgo-564248-gtkhtml-copy-paste-images.patch - Support
+ Copy And Paste Of Images.
+ + bnc#449966 - bnc-449966-gtkhtml-replace-dialog.patch - Unlocalised
+ Text on the Replace Dlg in Evolution.
+ + bnc#443551 - bnc-443551-background-table-colors.patch - Evolution
+ does not use selected background color inside table.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
bgo-330452-spell-suggestions.patch
bgo-562323-insert-link.patch
bgo-564248-gtkhtml-copy-paste-images.patch
bnc-443551-background-table-colors.patch
bnc-449966-gtkhtml-replace-dialog.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkhtml2.spec ++++++
--- /var/tmp/diff_new_pack.f24840/_old 2009-01-08 18:06:39.000000000 +0100
+++ /var/tmp/diff_new_pack.f24840/_new 2009-01-08 18:06:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gtkhtml2 (Version 3.24.1.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: gtkhtml2
Version: 3.24.1.1
-Release: 1
+Release: 2
%define _name gtkhtml
BuildRequires: enchant-devel
BuildRequires: fdupes
@@ -46,6 +46,16 @@
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{_name}/3.12/%{_name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gtkhtml-im-crash.patch bgo555420(pending) bnc65247==suse50247 sbrabec@suse.cz -- Fix crash with some IM modules.
Patch1: gtkhtml-im-crash.patch
+# PATCH-FIX-UPSTREAM bgo-330452-spell-suggestions.patch bgo330452 -- Patch is part of GNOME 2.25.4 release.
+Patch2: bgo-330452-spell-suggestions.patch
+# PATCH-FIX-UPSTREAM bgo-562323-insert-link.patch bgo562323 -- Patch is part of GNOME 2.25.4 release.
+Patch3: bgo-562323-insert-link.patch
+# PATCH-FIX-UPSTREAM bgo-564248-gtkhtml-copy-paste-images.patch bgo564248 -- Patch is part of GNOME 2.25.4 release.
+Patch4: bgo-564248-gtkhtml-copy-paste-images.patch
+# PATCH-FIX-UPSTREAM bnc-449966-gtkhtml-replace-dialog.patch bnc449966 --
+Patch5: bnc-449966-gtkhtml-replace-dialog.patch
+# PATCH-FIX-UPSTREAM bnc-443551-background-table-colors.patch bnc443551 -- Patch yet to be pushed upstream.
+Patch6: bnc-443551-background-table-colors.patch
%description
GtkHTML is a lightweight HTML rendering, printing, and editing engine.
@@ -118,6 +128,11 @@
#'`
%setup -q -n %{_name}-%{version}
%patch1 -p0
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%build
autoreconf -f -i
@@ -158,6 +173,18 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Jan 07 2009 abharath@suse.de
+- Patches added
+ + bgo#330452 - bgo-330452-spell-suggestions.patch - Automatic spell
+ check suggestions should be first level menu option.
+ + bgo#562323 - bgo-562323-insert-link.patch - Evolution inserts
+ a link incorrectly.
+ + bgo#564248 - bgo-564248-gtkhtml-copy-paste-images.patch - Support
+ Copy And Paste Of Images.
+ + bnc#449966 - bnc-449966-gtkhtml-replace-dialog.patch - Unlocalised
+ Text on the Replace Dlg in Evolution.
+ + bnc#443551 - bnc-443551-background-table-colors.patch - Evolution
+ does not use selected background color inside table.
* Fri Nov 07 2008 psankar@suse.de
- Push gtkhtml 3.24.1.1 tarball
+ Bug fixes: bgo #338921
++++++ bgo-330452-spell-suggestions.patch ++++++
Index: components/editor/gtkhtml-editor.ui
===================================================================
--- components/editor/gtkhtml-editor.ui (revision 9048)
+++ components/editor/gtkhtml-editor.ui (working copy)
@@ -137,6 +137,13 @@
<toolitem action='insert-table'/>
</toolbar>
<popup name='context-menu'>
+ <placeholder name='context-spell-suggest'/>
+ <menu action='context-more-suggestions-menu'/>
+ <separator/>
+ <menuitem action='context-spell-ignore'/>
+ <menu action='context-spell-add-menu'/>
+ <menuitem action='context-spell-add'/>
+ <separator/>
<menuitem action='undo'/>
<menuitem action='redo'/>
<separator/>
@@ -175,12 +182,6 @@
<menuitem action='context-delete-cell'/>
</menu>
<separator/>
- <placeholder name='context-spell-suggest'/>
- <separator/>
- <menuitem action='context-spell-ignore'/>
- <menu action='context-spell-add-menu'/>
- <menuitem action='context-spell-add'/>
- <separator/>
<menu action='context-input-methods-menu'/>
</popup>
</ui>
Index: components/editor/gtkhtml-editor-actions.c
===================================================================
--- components/editor/gtkhtml-editor-actions.c (revision 9048)
+++ components/editor/gtkhtml-editor-actions.c (working copy)
@@ -2153,6 +2153,15 @@ static GtkActionEntry spell_context_entr
N_("Add Word To"),
NULL,
NULL,
+ NULL },
+
+ /* Menus */
+
+ { "context-more-suggestions-menu",
+ NULL,
+ N_("More Suggestions"),
+ NULL,
+ NULL,
NULL }
};
Index: components/editor/gtkhtml-editor-private.c
===================================================================
--- components/editor/gtkhtml-editor-private.c (revision 9048)
+++ components/editor/gtkhtml-editor-private.c (working copy)
@@ -41,6 +41,26 @@ PACKAGE " could not find the required fi
"\nSee http://www.freedesktop.org/Standards/basedir-spec for more\n" \
"information about standard base directories.\n\n"
+/* This controls how spelling suggestions are divided between the primary
+ * context menu and a secondary menu. The idea is to prevent the primary
+ * menu from growing too long.
+ *
+ * The constants below are used as follows:
+ *
+ * if TOTAL_SUGGESTIONS <= MAX_LEVEL1_SUGGETIONS:
+ * LEVEL1_SUGGESTIONS = TOTAL_SUGGESTIONS
+ * elif TOTAL_SUGGESTIONS - MAX_LEVEL1_SUGGESTIONS < MIN_LEVEL2_SUGGESTIONS:
+ * LEVEL1_SUGGESTIONS = TOTAL_SUGGESTIONS
+ * else
+ * LEVEL1_SUGGESTIONS = MAX_LEVEL1_SUGGETIONS
+ *
+ * LEVEL2_SUGGESTIONS = TOTAL_SUGGESTIONS - LEVEL1_SUGGESTIONS
+ *
+ * Note that MAX_LEVEL1_SUGGETIONS is not a hard maximum.
+ */
+#define MAX_LEVEL1_SUGGESTIONS 3
+#define MIN_LEVEL2_SUGGESTIONS 3
+
/************************ Begin Spell Dialog Callbacks ***********************/
static void
@@ -674,17 +694,103 @@ action_context_spell_suggest_cb (GtkActi
GtkhtmlEditor *editor)
{
GtkHTML *html;
- gchar *label;
+ const gchar *word;
+
+ html = gtkhtml_editor_get_html (editor);
+
+ word = g_object_get_data (G_OBJECT (action), "word");
+ g_return_if_fail (word != NULL);
+
+ html_engine_replace_spell_word_with (html->engine, word);
+}
+
+static void
+editor_inline_spelling_suggestions (GtkhtmlEditor *editor,
+ GtkhtmlSpellChecker *checker)
+{
+ GtkActionGroup *action_group;
+ GtkUIManager *manager;
+ GtkHTML *html;
+ GList *list;
+ const gchar *path;
+ gchar *word;
+ guint count = 0;
+ guint length;
+ guint merge_id;
+ guint threshold;
html = gtkhtml_editor_get_html (editor);
+ word = html_engine_get_spell_word (html->engine);
+ list = gtkhtml_spell_checker_get_suggestions (checker, word, -1);
+
+ path = "/context-menu/context-spell-suggest/";
+ manager = gtkhtml_editor_get_ui_manager (editor);
+ action_group = editor->priv->suggestion_actions;
+ merge_id = editor->priv->spell_suggestions_merge_id;
+
+ /* Calculate how many suggestions to put directly in the
+ * context menu. The rest will go in a secondary menu. */
+ length = g_list_length (list);
+ if (length <= MAX_LEVEL1_SUGGESTIONS)
+ threshold = length;
+ else if (length - MAX_LEVEL1_SUGGESTIONS < MIN_LEVEL2_SUGGESTIONS)
+ threshold = length;
+ else
+ threshold = MAX_LEVEL1_SUGGESTIONS;
+
+ while (list != NULL) {
+ gchar *suggestion = list->data;
+ gchar *action_name;
+ gchar *action_label;
+ GtkAction *action;
+ GtkWidget *child;
+ GSList *proxies;
+
+ /* Once we reach the threshold, put all subsequent
+ * spelling suggestions in a secondary menu. */
+ if (count == threshold)
+ path = "/context-menu/context-more-suggestions-menu/";
- /* The action's label is the replacement word. */
- g_object_get (action, "label", &label, NULL);
- g_return_if_fail (label != NULL);
+ /* Action name just needs to be unique. */
+ action_name = g_strdup_printf ("suggest-%d", count++);
+
+ action_label = g_markup_printf_escaped (
+ "<b>%s</b>", suggestion);
+
+ action = gtk_action_new (
+ action_name, action_label, NULL, NULL);
+
+ g_object_set_data_full (
+ G_OBJECT (action), "word",
+ g_strdup (suggestion), g_free);
+
+ g_signal_connect (
+ action, "activate", G_CALLBACK (
+ action_context_spell_suggest_cb), editor);
+
+ gtk_action_group_add_action (action_group, action);
+
+ gtk_ui_manager_add_ui (
+ manager, merge_id, path,
+ action_name, action_name,
+ GTK_UI_MANAGER_AUTO, FALSE);
+
+ /* XXX GtkAction offers no support for Pango markup,
+ * so we have to manually set "use-markup" on the
+ * child of the proxy widget. */
+ gtk_ui_manager_ensure_update (manager);
+ proxies = gtk_action_get_proxies (action);
+ child = gtk_bin_get_child (proxies->data);
+ g_object_set (child, "use-markup", TRUE, NULL);
+
+ g_free (suggestion);
+ g_free (action_name);
+ g_free (action_label);
- html_engine_replace_spell_word_with (html->engine, label);
+ list = g_list_delete_link (list, list);
+ }
- g_free (label);
+ g_free (word);
}
/* Helper for gtkhtml_editor_update_context() */
@@ -730,6 +836,10 @@ editor_spell_checkers_foreach (GtkhtmlSp
action = gtk_action_new (
action_name, action_label, NULL, NULL);
+ g_object_set_data_full (
+ G_OBJECT (action), "word",
+ g_strdup (action_label), g_free);
+
g_signal_connect (
action, "activate", G_CALLBACK (
action_context_spell_suggest_cb), editor);
@@ -880,6 +990,12 @@ gtkhtml_editor_update_context (GtkhtmlEd
merge_id = gtk_ui_manager_new_merge_id (manager);
editor->priv->spell_suggestions_merge_id = merge_id;
+ /* Handle a single active language as a special case. */
+ if (g_list_length (list) == 1) {
+ editor_inline_spelling_suggestions (editor, list->data);
+ return;
+ }
+
/* Add actions and context menu content for active languages. */
g_list_foreach (list, (GFunc) editor_spell_checkers_foreach, editor);
}
++++++ bgo-562323-insert-link.patch ++++++
Index: components/editor/gtkhtml-editor-signals.c
===================================================================
--- components/editor/gtkhtml-editor-signals.c (revision 9048)
+++ components/editor/gtkhtml-editor-signals.c (working copy)
@@ -1153,13 +1153,13 @@ gtkhtml_editor_link_properties_show_wind
sensitive = (url == NULL);
- gtk_entry_set_text (
- GTK_ENTRY (url_entry),
- (url != NULL) ? url : "http://");
-
editor->priv->link_object = cursor->object;
editor->priv->link_start_offset = start_offset;
editor->priv->link_end_offset = end_offset;
+
+ gtk_entry_set_text (
+ GTK_ENTRY (url_entry),
+ (url != NULL) ? url : "http://");
}
gtk_entry_set_text (GTK_ENTRY (dsc_entry), "");
++++++ bgo-564248-gtkhtml-copy-paste-images.patch ++++++
Index: components/editor/gtkhtml-editor.c
===================================================================
--- components/editor/gtkhtml-editor.c (revision 9066)
+++ components/editor/gtkhtml-editor.c (working copy)
@@ -1554,6 +1554,28 @@ gtkhtml_editor_insert_html (GtkhtmlEdito
gtk_html_insert_html (html, html_text);
}
+/* inserts local files only, as inlined */
+void
+gtkhtml_editor_insert_image (GtkhtmlEditor *editor,
+ const gchar *filename_uri)
+{
+ GtkHTML *html;
+
+ g_return_if_fail (GTKHTML_IS_EDITOR (editor));
+ g_return_if_fail (filename_uri != NULL);
+
+ html = gtkhtml_editor_get_html (editor);
+
+ if (html) {
+ HTMLObject *image;
+
+ image = html_image_new (
+ html_engine_get_image_factory (html->engine), filename_uri,
+ NULL, NULL, 0, 0, 0, 0, 0, NULL, HTML_VALIGN_NONE, FALSE);
+ html_engine_paste_object (html->engine, image, 1);
+ }
+}
+
gboolean
gtkhtml_editor_search_by_data (GtkhtmlEditor *editor,
glong level,
Index: components/editor/gtkhtml-editor.h
===================================================================
--- components/editor/gtkhtml-editor.h (revision 9066)
+++ components/editor/gtkhtml-editor.h (working copy)
@@ -163,6 +163,8 @@ gboolean gtkhtml_editor_is_previous_para
(GtkhtmlEditor *editor);
void gtkhtml_editor_insert_html (GtkhtmlEditor *editor,
const gchar *html_text);
+void gtkhtml_editor_insert_image (GtkhtmlEditor *editor,
+ const gchar *filename_uri);
gboolean gtkhtml_editor_search_by_data (GtkhtmlEditor *editor,
glong level,
const gchar *klass,
++++++ bnc-443551-background-table-colors.patch ++++++
Index: components/editor/gtkhtml-color-state.c
===================================================================
--- components/editor/gtkhtml-color-state.c (revision 9074)
+++ components/editor/gtkhtml-color-state.c (working copy)
@@ -31,6 +31,7 @@ enum {
PROP_CURRENT_COLOR,
PROP_DEFAULT_COLOR,
PROP_DEFAULT_LABEL,
+ PROP_DEFAULT_TRANSPARENT,
PROP_PALETTE
};
@@ -45,6 +46,7 @@ struct _GtkhtmlColorStatePrivate {
gchar *default_label;
GtkhtmlColorPalette *palette;
gulong palette_handler_id;
+ gboolean default_transparent;
};
static gpointer parent_class;
@@ -83,6 +85,12 @@ color_state_set_property (GObject *objec
g_value_get_string (value));
return;
+ case PROP_DEFAULT_TRANSPARENT:
+ gtkhtml_color_state_set_default_transparent (
+ GTKHTML_COLOR_STATE (object),
+ g_value_get_boolean (value));
+ return;
+
case PROP_PALETTE:
gtkhtml_color_state_set_palette (
GTKHTML_COLOR_STATE (object),
@@ -120,6 +128,13 @@ color_state_get_property (GObject *objec
GTKHTML_COLOR_STATE (object)));
return;
+ case PROP_DEFAULT_TRANSPARENT:
+ g_value_set_boolean (
+ value,
+ gtkhtml_color_state_get_default_transparent (
+ GTKHTML_COLOR_STATE (object)));
+ return;
+
case PROP_PALETTE:
g_value_set_object (
value, gtkhtml_color_state_get_palette (
@@ -216,6 +231,17 @@ color_state_class_init (GtkhtmlColorStat
g_object_class_install_property (
object_class,
+ PROP_DEFAULT_TRANSPARENT,
+ g_param_spec_boolean (
+ "default-transparent",
+ _("Default is transparent"),
+ _("Whether the default color is transparent"),
+ FALSE,
+ G_PARAM_CONSTRUCT |
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
PROP_PALETTE,
g_param_spec_object (
"palette",
@@ -385,6 +411,25 @@ gtkhtml_color_state_set_default_label (G
g_object_notify (G_OBJECT (state), "default-label");
}
+gboolean
+gtkhtml_color_state_get_default_transparent (GtkhtmlColorState *state)
+{
+ g_return_val_if_fail (GTKHTML_IS_COLOR_STATE (state), FALSE);
+
+ return state->priv->default_transparent;
+}
+
+void
+gtkhtml_color_state_set_default_transparent (GtkhtmlColorState *state,
+ gboolean transparent)
+{
+ g_return_if_fail (GTKHTML_IS_COLOR_STATE (state));
+
+ state->priv->default_transparent = transparent;
+
+ g_object_notify (G_OBJECT (state), "default-transparent");
+}
+
GtkhtmlColorPalette *
gtkhtml_color_state_get_palette (GtkhtmlColorState *state)
{
Index: components/editor/gtkhtml-color-state.h
===================================================================
--- components/editor/gtkhtml-color-state.h (revision 9074)
+++ components/editor/gtkhtml-color-state.h (working copy)
@@ -86,6 +86,11 @@ const gchar * gtkhtml_color_state_get_de
void gtkhtml_color_state_set_default_label
(GtkhtmlColorState *state,
const gchar *text);
+gboolean gtkhtml_color_state_get_default_transparent
+ (GtkhtmlColorState *state);
+void gtkhtml_color_state_set_default_transparent
+ (GtkhtmlColorState *state,
+ gboolean transparent);
GtkhtmlColorPalette *
gtkhtml_color_state_get_palette (GtkhtmlColorState *state);
void gtkhtml_color_state_set_palette (GtkhtmlColorState *state,
Index: components/editor/gtkhtml-color-swatch.c
===================================================================
--- components/editor/gtkhtml-color-swatch.c (revision 9074)
+++ components/editor/gtkhtml-color-swatch.c (working copy)
@@ -271,7 +271,6 @@ gtkhtml_color_swatch_set_color (GtkhtmlC
GtkWidget *drawing_area;
g_return_if_fail (GTKHTML_IS_COLOR_SWATCH (swatch));
- g_return_if_fail (color != NULL);
drawing_area = swatch->priv->drawing_area;
gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, color);
Index: components/editor/gtkhtml-color-combo.c
===================================================================
--- components/editor/gtkhtml-color-combo.c (revision 9074)
+++ components/editor/gtkhtml-color-combo.c (working copy)
@@ -39,6 +39,7 @@ enum {
PROP_CURRENT_COLOR,
PROP_DEFAULT_COLOR,
PROP_DEFAULT_LABEL,
+ PROP_DEFAULT_TRANSPARENT,
PROP_PALETTE,
PROP_POPUP_SHOWN,
PROP_STATE
@@ -128,8 +129,12 @@ color_combo_notify_current_color_cb (Gtk
GdkColor color;
swatch = GTKHTML_COLOR_SWATCH (combo->priv->swatch);
- gtkhtml_color_combo_get_current_color (combo, &color);
- gtkhtml_color_swatch_set_color (swatch, &color);
+ if (gtkhtml_color_combo_get_current_color (combo, &color))
+ gtkhtml_color_swatch_set_color (swatch, &color);
+ else if (gtkhtml_color_combo_get_default_transparent (combo))
+ gtkhtml_color_swatch_set_color (swatch, NULL);
+ else
+ gtkhtml_color_swatch_set_color (swatch, &color);
g_signal_emit (G_OBJECT (combo), signals[CHANGED], 0);
}
@@ -443,6 +448,12 @@ color_combo_set_property (GObject *objec
g_value_get_string (value));
return;
+ case PROP_DEFAULT_TRANSPARENT:
+ gtkhtml_color_combo_set_default_transparent (
+ GTKHTML_COLOR_COMBO (object),
+ g_value_get_boolean (value));
+ return;
+
case PROP_PALETTE:
gtkhtml_color_combo_set_palette (
GTKHTML_COLOR_COMBO (object),
@@ -498,6 +509,13 @@ color_combo_get_property (GObject *objec
GTKHTML_COLOR_COMBO (object)));
return;
+ case PROP_DEFAULT_TRANSPARENT:
+ g_value_set_boolean (
+ value,
+ gtkhtml_color_combo_get_default_transparent (
+ GTKHTML_COLOR_COMBO (object)));
+ return;
+
case PROP_PALETTE:
g_value_set_object (
value, gtkhtml_color_combo_get_palette (
@@ -719,6 +737,17 @@ color_combo_class_init (GtkhtmlColorComb
g_object_class_install_property (
object_class,
+ PROP_DEFAULT_TRANSPARENT,
+ g_param_spec_boolean (
+ "default-transparent",
+ _("Default is transparent"),
+ _("Whether the default color is transparent"),
+ FALSE,
+ G_PARAM_CONSTRUCT |
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
PROP_PALETTE,
g_param_spec_object (
"palette",
@@ -1073,6 +1102,24 @@ gtkhtml_color_combo_set_default_label (G
gtkhtml_color_state_set_default_label (combo->priv->state, text);
}
+gboolean
+gtkhtml_color_combo_get_default_transparent (GtkhtmlColorCombo *combo)
+{
+ g_return_val_if_fail (GTKHTML_IS_COLOR_COMBO (combo), FALSE);
+
+ return gtkhtml_color_state_get_default_transparent (combo->priv->state);
+}
+
+void
+gtkhtml_color_combo_set_default_transparent (GtkhtmlColorCombo *combo,
+ gboolean transparent)
+{
+ g_return_if_fail (GTKHTML_IS_COLOR_COMBO (combo));
+
+ gtkhtml_color_state_set_default_transparent (
+ combo->priv->state, transparent);
+}
+
GtkhtmlColorPalette *
gtkhtml_color_combo_get_palette (GtkhtmlColorCombo *combo)
{
Index: components/editor/gtkhtml-color-combo.h
===================================================================
--- components/editor/gtkhtml-color-combo.h (revision 9074)
+++ components/editor/gtkhtml-color-combo.h (working copy)
@@ -86,6 +86,11 @@ const gchar * gtkhtml_color_combo_get_de
void gtkhtml_color_combo_set_default_label
(GtkhtmlColorCombo *combo,
const gchar *text);
+gboolean gtkhtml_color_combo_get_default_transparent
+ (GtkhtmlColorCombo *combo);
+void gtkhtml_color_combo_set_default_transparent
+ (GtkhtmlColorCombo *combo,
+ gboolean transparent);
GtkhtmlColorPalette *
gtkhtml_color_combo_get_palette (GtkhtmlColorCombo *combo);
void gtkhtml_color_combo_set_palette (GtkhtmlColorCombo *combo,
Index: components/editor/gtkhtml-editor.glade
===================================================================
--- components/editor/gtkhtml-editor.glade (revision 9074)
+++ components/editor/gtkhtml-editor.glade (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Tue Apr 1 08:13:39 2008 -->
+<!--Generated with glade3 3.4.5 on Wed Dec 31 00:39:22 2008 -->
<glade-interface>
<requires lib="gtkhtml-editor"/>
<widget class="GtkWindow" id="text-properties-window">
@@ -1717,6 +1717,8 @@ Right</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Transparent</property>
+ <property name="default_transparent">True</property>
+ <signal name="changed" handler="gtkhtml_editor_table_properties_color_changed_cb" object="table-properties-window"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -2614,6 +2616,8 @@ Right</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="default_color">#000000000000</property>
<property name="default_label">Transparent</property>
+ <property name="default_transparent">True</property>
+ <signal name="changed" handler="gtkhtml_editor_cell_properties_color_changed_cb" object="cell-properties-window"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -3156,7 +3160,6 @@ Bottom</property>
<widget class="GtkTable" id="image-properties-link-table">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">1</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
Index: components/editor/gtkhtml-editor-signals.c
===================================================================
--- components/editor/gtkhtml-editor-signals.c (revision 9074)
+++ components/editor/gtkhtml-editor-signals.c (working copy)
@@ -183,14 +183,19 @@ cell_properties_set_background_color_cb
HTMLTableCell *cell,
GtkWidget *widget)
{
+ GtkhtmlColorCombo *combo;
GtkHTML *html;
GdkColor color;
+ gboolean got_color;
+ combo = GTKHTML_COLOR_COMBO (widget);
html = gtkhtml_editor_get_html (editor);
- gtkhtml_color_combo_get_current_color (
- GTKHTML_COLOR_COMBO (widget), &color);
- html_engine_table_cell_set_bg_color (html->engine, cell, &color);
+ /* The default table cell color is transparent. */
+ got_color = gtkhtml_color_combo_get_current_color (combo, &color);
+
+ html_engine_table_cell_set_bg_color (
+ html->engine, cell, got_color ? &color : NULL);
}
static void
@@ -463,9 +468,9 @@ gtkhtml_editor_cell_properties_show_wind
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
widget = WIDGET (CELL_PROPERTIES_COLOR_COMBO);
- if (cell->have_bg)
- gtkhtml_color_combo_set_current_color (
- GTKHTML_COLOR_COMBO (widget), &cell->bg);
+ gtkhtml_color_combo_set_current_color (
+ GTKHTML_COLOR_COMBO (widget),
+ cell->have_bg ? &cell->bg : NULL);
widget = WIDGET (CELL_PROPERTIES_IMAGE_FILE_CHOOSER);
if (cell->have_bgPixmap) {
@@ -1688,6 +1693,27 @@ gtkhtml_editor_table_properties_border_c
}
AUTOCONNECTED_SIGNAL_HANDLER (void
+gtkhtml_editor_table_properties_color_changed_cb (GtkWidget *window,
+ GtkhtmlColorCombo *combo))
+{
+ GtkhtmlEditor *editor;
+ HTMLTable *table;
+ GtkHTML *html;
+ GdkColor color;
+ gboolean got_color;
+
+ editor = extract_gtkhtml_editor (window);
+ html = gtkhtml_editor_get_html (editor);
+ table = HTML_TABLE (editor->priv->table_object);
+
+ /* The default table color is transparent. */
+ got_color = gtkhtml_color_combo_get_current_color (combo, &color);
+
+ html_engine_table_set_bg_color (
+ html->engine, table, got_color ? &color : NULL);
+}
+
+AUTOCONNECTED_SIGNAL_HANDLER (void
gtkhtml_editor_table_properties_cols_changed_cb (GtkWidget *window,
GtkSpinButton *button))
{
@@ -1861,7 +1887,9 @@ gtkhtml_editor_table_properties_show_win
widget = WIDGET (TABLE_PROPERTIES_BORDER_SPIN_BUTTON);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
- /* TODO - Initialize color combo */
+ widget = WIDGET (TABLE_PROPERTIES_COLOR_COMBO);
+ gtkhtml_color_combo_set_current_color (
+ GTKHTML_COLOR_COMBO (widget), table->bgColor);
if (table->bgPixmap != NULL) {
gchar *filename;
++++++ bnc-449966-gtkhtml-replace-dialog.patch ++++++
Index: components/editor/gtkhtml-editor-private.c
===================================================================
--- components/editor/gtkhtml-editor-private.c (revision 9057)
+++ components/editor/gtkhtml-editor-private.c (working copy)
@@ -19,6 +19,7 @@
*/
#include "gtkhtml-editor-private.h"
+#include "config.h"
#include
participants (1)
-
root@Hilbert.suse.de