Attachment 296079 Details for Bug 434754 – Adds titles to links and images and link to images

[patch] Adds titles to links and images and link to images

logjam-title.patch (text/plain), 6.12 KB, created by Peter Janakiev on 2008-02-27 15:51:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Janakiev

Created: 2008-02-27 15:51:54 UTC

Size: 6.12 KB

patch

obsolete

>diff --git logjam-4.5.3/src/html_markup.c logjam-4.5.3/src/html_markup.c
>index 36ec4e7..9c5a796 100644
>--- logjam-4.5.3/src/html_markup.c
>+++ logjam-4.5.3/src/html_markup.c
>@@ -74,3 +74,8 @@ void
> html_mark_monospaced(JamDoc *doc) {
> 	html_mark_tag(doc, "tt");
> }
>+
>+void
>+html_mark_blockquote(JamDoc *doc) {
>+	html_mark_tag(doc, "blockquote");
>+}
>diff --git logjam-4.5.3/src/imagelink.c logjam-4.5.3/src/imagelink.c
>index a9f296d..3048714 100644
>--- logjam-4.5.3/src/imagelink.c
>+++ logjam-4.5.3/src/imagelink.c
>@@ -13,7 +13,7 @@
> 
> typedef struct {
> 	GtkWidget *dlg;
>-	GtkWidget *url, *get, *width, *height;
>+	GtkWidget *url, *get, *width, *height, *tit, *anchor;
> } ImageDlg;
> 
> static void
>@@ -87,7 +87,17 @@ make_dialog(ImageDlg *idlg, GtkWindow *win) {
> 	gtk_box_pack_start(GTK_BOX(vbox),
> 			labelled_box_new_sg(_("_URL:"), idlg->url, sg),
> 			FALSE, FALSE, 0);
>-
>+			
>+	//malwk
>+    idlg->tit = gtk_entry_new();
>+    gtk_box_pack_start(GTK_BOX(vbox),
>+    		labelled_box_new_sg(_("Title:"), idlg->tit, sg),
>+    		FALSE, FALSE, 0);
>+    idlg->anchor = gtk_entry_new();
>+    gtk_box_pack_start(GTK_BOX(vbox),
>+    		labelled_box_new_sg(_("Link:"), idlg->anchor, sg),
>+    		FALSE, FALSE, 0);
>+    //malwk end
> 	hbox = gtk_hbox_new(FALSE, 6);
> 
> 	dimbox = gtk_vbox_new(FALSE, 6);
>@@ -131,7 +141,7 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
> 	STACK(ImageDlg, idlg);
> 	GtkTextBuffer *buffer;
> 	GtkTextIter start, end;
>-	char *sel = NULL, *url = NULL;
>+	char *sel = NULL, *url = NULL, *tit = NULL, *anch= NULL;
> 	const char *data;
> 	int width = -1, height = -1;
> 
>@@ -158,14 +168,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
> 		else
> 			gtk_text_buffer_get_iter_at_mark(buffer, &start,
> 					gtk_text_buffer_get_insert(buffer));
>-
>+		
> 		url = g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->url)));
> 		xml_escape(&url);
>-		gtk_text_buffer_insert(buffer, &start, "<img src='", -1);
>+		anch=g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->anchor)));
>+		if (*anch!=NULL){
>+			gtk_text_buffer_insert(buffer, &start, "<a href=\"", -1);
>+			gtk_text_buffer_insert(buffer, &start, anch, -1);
>+			gtk_text_buffer_insert(buffer, &start, "\">", -1);
>+		}
>+		gtk_text_buffer_insert(buffer, &start, "<img src=\"", -1);
> 		gtk_text_buffer_insert(buffer, &start, url, -1);
>-		gtk_text_buffer_insert(buffer, &start, "'", -1);
>+		gtk_text_buffer_insert(buffer, &start, "\"", -1);
> 		g_free(url);
>-
>+		
> 		data = gtk_entry_get_text(GTK_ENTRY(idlg->width));
> 		width = atoi(data);
> 
>@@ -182,7 +198,20 @@ image_dialog_run(GtkWindow *win, JamDoc *doc) {
> 			gtk_text_buffer_insert(buffer, &start, data, -1);
> 			g_free(data);
> 		}
>+		
>+		tit=g_strdup(gtk_entry_get_text(GTK_ENTRY(idlg->tit)));
>+		if (*tit!=NULL) {
>+			gtk_text_buffer_insert(buffer, &start, " title=\"", -1);
>+			gtk_text_buffer_insert(buffer, &start, tit, -1);
>+			gtk_text_buffer_insert(buffer, &start, "\"", -1);
>+		}
>+		g_free(tit);
>+		
> 		gtk_text_buffer_insert(buffer, &start, " />", -1);
>+		if (*anch!=NULL){
>+			gtk_text_buffer_insert(buffer, &start, "</a>", -1); 
>+		}
>+		g_free(anch);
> 	}
> 
> 	g_free(sel);
>diff --git logjam-4.5.3/src/link.c logjam-4.5.3/src/link.c
>index 0be2e98..a8dd465 100644
>--- logjam-4.5.3/src/link.c
>+++ logjam-4.5.3/src/link.c
>@@ -17,6 +17,7 @@
> typedef struct {
> 	GtkWidget *dlg;
> 	GtkWidget *etext, *ruser, *euser, *rurl, *eurl;
>+	GtkWidget *titl;
> 	JamDoc *doc;
> 	gint sel_type, clip_type;
> 	gchar *sel_input, *clip_input;
>@@ -98,7 +99,7 @@ link_magic(LinkRequest *lr) {
> static void
> make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
> 	GtkWidget *vbox;
>-	GtkWidget *subbox;
>+	GtkWidget *subbox, *hhr;
> 	GSList *rgroup;
> 
> 	ld->dlg = gtk_dialog_new_with_buttons(_("Make Link"),
>@@ -114,7 +115,10 @@ make_link_dialog(LinkDialog *ld, GtkWindow *win, gboolean livejournal) {
> 	gtk_entry_set_activates_default(GTK_ENTRY(ld->etext), TRUE);
> 	subbox = labelled_box_new(_("Link _Text:"), ld->etext);
> 	gtk_box_pack_start(GTK_BOX(vbox), subbox, FALSE, FALSE, 0);
>-
>+    ld->titl = gtk_entry_new();
>+    hhr = labelled_box_new(_("Link Title:"), ld->titl);
>+    gtk_box_pack_start(GTK_BOX(vbox), hhr, FALSE, FALSE, 0);
>+    
> 	gtk_box_pack_start(GTK_BOX(vbox), 
> 			radio_option(NULL, &ld->rurl, &ld->eurl, _("_URL:"), NULL, ""),
> 			FALSE, FALSE, 0);
>@@ -178,7 +182,7 @@ prepopulate_fields(LinkDialog *ld, char *bufsel) {
> 
> static char*
> get_link(LinkDialog *ld, JamAccount *acc) {
>-	char *url, *user, *text;
>+	char *url, *user, *text, *title=NULL;
> 	char *link = NULL;
> 
> 	url  = gtk_editable_get_chars(GTK_EDITABLE(ld->eurl),  0, -1);
>@@ -187,10 +191,16 @@ get_link(LinkDialog *ld, JamAccount *acc) {
> 	xml_escape(&user);
> 	text = gtk_editable_get_chars(GTK_EDITABLE(ld->etext), 0, -1);
> 	xml_escape(&text);
>+	title = gtk_editable_get_chars(GTK_EDITABLE(ld->titl), 0, -1);
> 
> 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->rurl))) {
> 		/* build a "url" link. */
>+		if (*title!=NULL){
>+			link = g_strdup_printf("<a href=\"%s\" title=\"%s\">%s</a>", url, title, text);
>+		}
>+		else {
> 		link = g_strdup_printf("<a href=\"%s\">%s</a>", url, text);
>+		}
> 	} else if (ld->ruser &&
> 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ld->ruser))) {
> 		/* build a "friends" link. */
>@@ -204,6 +214,7 @@ get_link(LinkDialog *ld, JamAccount *acc) {
> 	g_free(url);
> 	g_free(user);
> 	g_free(text);
>+	g_free(title);
> 	
> 	return link;
> }
>diff --git logjam-4.5.3/src/menu.c logjam-4.5.3/src/menu.c
>index 53d1275..384ccce 100644
>--- logjam-4.5.3/src/menu.c
>+++ logjam-4.5.3/src/menu.c
>@@ -315,6 +315,10 @@ static void
> menu_html_mark_monospaced(JamWin *jw) {
> 	html_mark_monospaced(jw->doc);
> }
>+static void
>+menu_html_mark_blockquote(JamWin *jw) {
>+	html_mark_blockquote(jw->doc);
>+}
> 
> void manager_dialog(GtkWidget *parent);
> 
>@@ -428,6 +432,7 @@ static GtkItemFactoryEntry menu_items[] = {
> { N_("/HTML/_Strikeout"),			"<ctl><alt>S", menu_html_mark_strikeout },
> { N_("/HTML/_Monospaced"),			"<ctl><alt>M", menu_html_mark_monospaced },
> { N_("/HTML/_Underline"),			"<ctl><alt>U", menu_html_mark_underline },
>+{ N_("/HTML/_Blockquote"),			NULL, menu_html_mark_blockquote },
> 
> { N_("/_Journal"),                      NULL,          NULL, ACTION_JOURNAL, "<Branch>" },
> { N_("/Journal/_Use Journal"),          NULL,          NULL, ACTION_JOURNAL_USE, NULL },

Actions: View | Diff

Attachments on bug 434754: 296079