Mercurial > pidgin.yaz
changeset 8506:887c0259b47b
[gaim-migrate @ 9242]
" 6: Using CTRL+Up to get back a previous line breaks the
formatting on any new text entered on that line. Text,
while being entered appears extremely small, and when
it's sent, the formatting is slightly smaller and may
lose other elements of formatting.
the problem was that in the key_press_cb in gtkconv.c
was using
gtk_text_buffer_get_text(gtkconv->entry_buffer, ...);
this was not giving us the html tags. So I changed it
to gtk_imthml_get_markup(GTK_IMHTML(gtkconv->entry));
Then I added a signal so that the toolbar gets update
when gtk_imhtml_append_text_with_images is called so
that the toolbar can be updated as well.
I also rename the format_functions_update to
format_buttons_update since it, to me atleast, makes
more sense and because I couldn't think of a better
name than format_function_update, which would have been
very confusing.
theres one issue that I was not able to fix in this.
I'm planning on looking into it later, but after
ctrl-up/down the closing tag gets added and ends at the
last character from the buffer. Which means formatting
returns to normal (ie plain text) if you type after
you've used ctrl-up/down." --Gary Kramlich
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Fri, 26 Mar 2004 14:14:16 +0000 |
| parents | 112f5762a41a |
| children | e993ed303477 |
| files | src/gtkconv.c src/gtkimhtml.c src/gtkimhtml.h src/gtkimhtmltoolbar.c |
| diffstat | 4 files changed, 46 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Fri Mar 26 05:05:08 2004 +0000 +++ b/src/gtkconv.c Fri Mar 26 14:14:16 2004 +0000 @@ -1274,10 +1274,9 @@ gtk_text_buffer_get_end_iter(gtkconv->entry_buffer, &end); conv->send_history->data = - gtk_text_buffer_get_text(gtkconv->entry_buffer, - &start, &end, FALSE); + gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry)); } - + if (conv->send_history->next && conv->send_history->next->data) {
--- a/src/gtkimhtml.c Fri Mar 26 05:05:08 2004 +0000 +++ b/src/gtkimhtml.c Fri Mar 26 14:14:16 2004 +0000 @@ -90,6 +90,7 @@ BUTTONS_UPDATE, TOGGLE_FORMAT, CLEAR_FORMAT, + UPDATE_FORMAT, LAST_SIGNAL }; static guint signals [LAST_SIGNAL] = { 0 }; @@ -625,7 +626,7 @@ g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - signals[BUTTONS_UPDATE] = g_signal_new("format_functions_update", + signals[BUTTONS_UPDATE] = g_signal_new("format_buttons_update", G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GtkIMHtmlClass, buttons_update), @@ -651,6 +652,14 @@ 0, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[UPDATE_FORMAT] = g_signal_new("format_function_update", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GtkIMHtmlClass, update_format), + NULL, + 0, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); gobject_class->finalize = gtk_imhtml_finalize; } @@ -1415,6 +1424,7 @@ pre = 0; GSList *fonts = NULL; + GObject *object; GtkIMHtmlScalable *scalable = NULL; int y, height; @@ -2042,7 +2052,12 @@ g_free (ws); if(bg) g_free(bg); - gtk_imhtml_close_tags(imhtml); + /* this shouldn't be necessary if we want to be able to continue + * using the format if it was unclosed. But seeing as removing this + * line does not help the ctrl-up/down from enabling open tags, I'm + * leaving it up to sean, or unless I find some time to look into it + * more -Gary */ + gtk_imhtml_close_tags(imhtml); if (!(options & GTK_IMHTML_NO_SCROLL)) gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (imhtml), mark, 0, TRUE, 0.0, 1.0); @@ -2050,6 +2065,11 @@ gtk_text_buffer_move_mark (imhtml->text_buffer, gtk_text_buffer_get_mark (imhtml->text_buffer, "insert"), &iter); + + object = g_object_ref(G_OBJECT(imhtml)); + g_signal_emit(object, signals[UPDATE_FORMAT], 0); + g_object_unref(object); + return str; }
--- a/src/gtkimhtml.h Fri Mar 26 05:05:08 2004 +0000 +++ b/src/gtkimhtml.h Fri Mar 26 14:14:16 2004 +0000 @@ -123,6 +123,7 @@ void (*buttons_update)(GtkIMHtml *, GtkIMHtmlButtons); void (*toggle_format)(GtkIMHtml *, GtkIMHtmlButtons); void (*clear_format)(GtkIMHtml *); + void (*update_format)(GtkIMHtml *); }; struct _GtkIMHtmlFontDetail {
--- a/src/gtkimhtmltoolbar.c Fri Mar 26 05:05:08 2004 +0000 +++ b/src/gtkimhtmltoolbar.c Fri Mar 26 14:14:16 2004 +0000 @@ -701,6 +701,25 @@ toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline), FALSE, toolbar); } +static void update_format_cb(GtkIMHtml *imhtml, GtkIMHtmlToolbar *toolbar) +{ + gboolean bold, italic, underline; + + bold = italic = underline = FALSE; + gtk_imhtml_get_current_format(imhtml, -1, &bold, &italic, &underline); + + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)) != bold) + toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold, + toolbar); + + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)) != italic) + toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic, + toolbar); + + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)) != underline) + toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline), + underline, toolbar); +} static void cursor_moved_cb(GtkIMHtml *imhtml, GtkMovementStep step, gint change, gboolean selected, @@ -979,9 +998,10 @@ g_return_if_fail(GTK_IS_IMHTML(imhtml)); toolbar->imhtml = imhtml; - g_signal_connect(G_OBJECT(imhtml), "format_functions_update", G_CALLBACK(update_buttons_cb), toolbar); + g_signal_connect(G_OBJECT(imhtml), "format_buttons_update", G_CALLBACK(update_buttons_cb), toolbar); g_signal_connect(G_OBJECT(imhtml), "format_function_toggle", G_CALLBACK(toggle_button_cb), toolbar); g_signal_connect(G_OBJECT(imhtml), "format_function_clear", G_CALLBACK(reset_buttons_cb), toolbar); + g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar); g_signal_connect_after(G_OBJECT(imhtml), "move_cursor", G_CALLBACK(cursor_moved_cb), toolbar); bold = italic = underline = FALSE;