evolution-rss r384 - in trunk: . pixmaps src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Oct  3 18:32:56 2008
New Revision: 384
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=384&view=rev

Log:
2008-10-03  Lucian Langa  <lucilanga gnome org>

* src/rss-icon-factory.{c,h}: 
rss_build_stock_images new function
* src/rss.c: (org_gnome_rss_controls)
new buttons text, do not request
width size for buttons (#552437)

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/pixmaps/Makefile.am
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.am
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Oct  3 18:32:56 2008
@@ -34,3 +34,4 @@
 	* provide predefined groups of feeds (OSS & co)
 	* evolution import rss add no. of retries
 	* fix images when replying
+	* provide expire option for images

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Fri Oct  3 18:32:56 2008
@@ -7,7 +7,9 @@
 		rss-22.png 	\
 		rss-24.png	\
 		rss-icon-read.png \
-		rss-icon-unread.png
+		rss-icon-unread.png \
+		rss-text-html.png \
+		rss-text-x-generic.png
 
 EXTRA_DIST = $(pixmap_DATA)
 

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Fri Oct  3 18:32:56 2008
@@ -271,7 +271,9 @@
 		rss-22.png 	\
 		rss-24.png	\
 		rss-icon-read.png \
-		rss-icon-unread.png
+		rss-icon-unread.png \
+		rss-text-html.png \
+		rss-text-x-generic.png
 
 EXTRA_DIST = $(pixmap_DATA)
 all: all-am

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Oct  3 18:32:56 2008
@@ -136,6 +136,8 @@
 	gecko-utils.h				\
 	rss-config-factory.c			\
 	rss-config-factory.h			\
+	rss-icon-factory.c			\
+	rss-icon-factory.h			\
 	evolution-import-rss.c			\
 	evolution-rss.schemas.in		\
 	org-gnome-evolution-rss.eplug.xml	\

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Oct  3 18:32:56 2008
@@ -132,6 +132,7 @@
 #include "dbus.c"
 #endif
 #include "rss-config-factory.c"
+#include "rss-icon-factory.c"
 
 int pop = 0;
 guint ftotal;
@@ -1703,7 +1704,6 @@
 }
 #endif
 
-
 static gboolean
 org_gnome_rss_controls (EMFormatHTML *efh, void *eb, EMFormatHTMLPObject *pobject)
 {
@@ -1718,16 +1718,18 @@
 	gtk_label_set_markup_with_mnemonic(GTK_LABEL(label3), mem);
 	gtk_widget_show (label3);
 	gtk_box_pack_start (GTK_BOX (hbox2), label3, TRUE, TRUE, 0);
-	gtk_widget_set_size_request (GTK_WIDGET(hbox2), -1, 31);
+//	gtk_widget_set_size_request (GTK_WIDGET(hbox2), -1, 31);
 
 	GtkWidget *button = gtk_button_new_with_label(
-				rf->cur_format ? _("HTML") : _("Summary"));
+				rf->cur_format ? _("Show Summary") : _("Show Full Text"));
+
 	gtk_button_set_image (
                 GTK_BUTTON (button),
-                gtk_image_new_from_stock (
-                        GTK_STOCK_HOME, GTK_ICON_SIZE_BUTTON));
+		gtk_image_new_from_stock (
+                        rf->cur_format ? RSS_TEXT_GENERIC : RSS_TEXT_HTML,
+			GTK_ICON_SIZE_BUTTON));
+
 	g_signal_connect (button, "clicked", G_CALLBACK(summary_cb), efh);
-	gtk_widget_set_size_request(button, 100, 10);
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_HALF);
         gtk_widget_show (button);
 	gtk_box_pack_start (GTK_BOX (hbox2), button, TRUE, TRUE, 0);
@@ -3339,6 +3341,7 @@
 	GtkWidget *readrss_label;
 	GtkWidget *readrss_progress;
 	GtkWidget *label,*progress_bar, *cancel_button, *status_label;
+	GtkWidget *recv_icon;
 
 	rf->t = t;
 
@@ -3371,14 +3374,8 @@
         g_hash_table_insert (data->active, info->uri, info);
 //        list = g_list_prepend (list, info);
 
-	gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
-	                                    "rss-24.png",
-                                            NULL);
-
-	GtkWidget *recv_icon = gtk_image_new_from_file(
-                        iconfile);
-	g_free(iconfile);
-
+	recv_icon = gtk_image_new_from_stock (
+                        "rss-main", GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	guint row = t->row;
 	row+=2;
@@ -3568,6 +3565,7 @@
 			rf->soup_auth_retry = 1;
 			status_msg = g_queue_new();
 			get_feed_folders();
+			rss_build_stock_images();
 #if HAVE_DBUS
 			d(g_print("init_dbus()\n"));
 			/*D-BUS init*/
@@ -4389,19 +4387,6 @@
 	} else 
 		g_print("image cache HIT\n");
 
-	/* test for *loading* images*/
-/*	gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
-	                                    "rss-24.png",
-                                            NULL);*/
-/*	gchar *buf = g_malloc0(1024);
-	FILE *rf = fopen(iconfile, "rb");
-	fread(buf, 1, 1024, rf);
-        fclose(rf);
-
-	FILE *rw = fopen(name, "wb+");
-	fwrite(buf, 1, 1024, rw);
-	fclose(rw);*/
-
 	net_get_unblocking(url,
                        	        textcb,
                                	NULL,