From 609730bd75c4f10bcd2824c0138304eb20aa79aa Mon Sep 17 00:00:00 2001 From: jmalonzo Date: Wed, 9 May 2007 14:14:02 +0000 Subject: [PATCH] updated image references and straw url git-svn-id: svn+ssh://svn.gnome.org/svn/straw/trunk@277 141a2093-ea25-0410-9ad2-d44d734a8f13 --- ChangeLog | 10 + glade/straw.glade | 517 +++++++++++++++++++++++++------------------------- src/lib/ImageCache.py | 4 +- src/lib/ItemView.py | 5 +- src/straw | 4 +- 5 files changed, 277 insertions(+), 263 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b0ee1c..183b942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2007-05-09 Jan C. Alonzo + * src/lib/ImageCache.py: + - changed icon names accordingly + * src/lib/ItemView.py: + - load default image-mising icon if theme does not supply a + proper MIME typed icon for the enclosures + * glade/straw.glade: removed itemview treeview header + * src/straw: updated straw website + +2007-05-09 Jan C. Alonzo + * src/lib/FeedPropertiesDialog.py, glade/straw.glade: - Complete design and code fixes diff --git a/glade/straw.glade b/glade/straw.glade index 0116a45..5d65cd7 100644 --- a/glade/straw.glade +++ b/glade/straw.glade @@ -58,16 +58,64 @@ - + + True + 1 + _Refresh frequency: + True + notebook1 + + + + + + + + True + 1 + _Number of articles per feed: + True + True + number_of_items_spin + + + 1 + 2 + + + + + + True + 1 + 0 + _Display location of new items: + True + True + notebook1 + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + True True - 100 0 1000 1 10 10 + 30 0 10000 1 10 10 1 - + True + 1 2 + 1 + 2 + GTK_FILL @@ -117,64 +165,16 @@ - + True True - 30 0 10000 1 10 10 + 100 0 1000 1 10 10 1 - True - + 1 2 - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - _Display location of new items: - True - True - notebook1 - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 1 - _Number of articles per feed: - True - True - number_of_items_spin - - - 1 - 2 - - - - - - True - 1 - _Refresh frequency: - True - notebook1 - - @@ -446,60 +446,49 @@ 8 8 - + True - True - False - * + 1 + Location: - 1 - 3 - 2 - 3 + GTK_FILL - + True - True - * + 1 + User name: - 1 - 3 1 2 + GTK_FILL - + True - False - True - * + 1 + Password: - 1 - 3 + 2 + 3 + GTK_FILL - + True - True - Use _Default - True - True - True - + 1 + Refresh frequency: - 2 - 3 3 4 GTK_FILL @@ -522,12 +511,18 @@ - + True - 1 - Refresh frequency: + True + Use _Default + True + True + True + + 2 + 3 3 4 GTK_FILL @@ -535,39 +530,44 @@ - + True - 1 - Password: + False + True + * - 2 - 3 - GTK_FILL + 1 + 3 - + True - 1 - User name: + True + * + 1 + 3 1 2 - GTK_FILL - + True - 1 - Location: + True + False + * - GTK_FILL + 1 + 3 + 2 + 3 @@ -825,6 +825,17 @@ 8 5 + + True + 1 + Feed URL: + + + GTK_FILL + + + + True True @@ -839,17 +850,6 @@ - - - True - 1 - Feed URL: - - - GTK_FILL - - - False @@ -1065,31 +1065,15 @@ 6 6 - - True - True - False - * - - - 1 - 2 - 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - + True - True - * + 1 + _Username: + True + subscribe_username_entry - 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL + GTK_FILL @@ -1109,15 +1093,31 @@ - + + True + True + * + + + 1 + 2 + GTK_EXPAND | GTK_SHRINK | GTK_FILL + + + + + True - 1 - _Username: - True - subscribe_username_entry + True + False + * - GTK_FILL + 1 + 2 + 1 + 2 + GTK_EXPAND | GTK_SHRINK | GTK_FILL @@ -2013,17 +2013,32 @@ 8 8 - + True - False - GNOME_DATE_EDIT_24_HR | GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY - + True + Earliest date + True + True + + + + GTK_FILL + + + + + + True + True + Latest date + True + True + - 1 - 2 1 2 + GTK_FILL @@ -2041,32 +2056,17 @@ - + True - True - Latest date - True - True - + False + GNOME_DATE_EDIT_24_HR | GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY + + 1 + 2 1 2 - GTK_FILL - - - - - - True - True - Earliest date - True - True - - - - GTK_FILL @@ -2218,6 +2218,7 @@ 150 True True + False @@ -2657,84 +2658,65 @@ - + True - 1 - _Number of articles to store: - True - properties_articles_spin + True + 0 + True - 3 - 4 + 1 + 2 GTK_FILL - + True - True - 1 1 1000000 1 10 10 - 1 - True - - + 1 + Next Refresh: - 1 - 2 - 3 - 4 + GTK_FILL - + True True - Use _Default + Us_e Default True True - + 2 3 - 3 - 4 + 2 + 3 GTK_FILL - - True - 1 - Previous Refresh: - - - 1 - 2 - GTK_SHRINK | GTK_FILL - - - - - + True True - 0 - True + 0 0 1000000 1 10 10 + 1 + True + True + + 1 2 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK | GTK_FILL - 1 + 2 + 3 + @@ -2753,63 +2735,82 @@ - + True True - 0 0 1000000 1 10 10 - 1 - True - True - - + 0 + True 1 2 - 2 - 3 + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL + 1 + + + + + True + 1 + Previous Refresh: + + + 1 + 2 + GTK_SHRINK | GTK_FILL - + True True - Us_e Default + Use _Default True True - + 2 3 - 2 - 3 + 3 + 4 GTK_FILL - + True - 1 - Next Refresh: + True + 1 1 1000000 1 10 10 + 1 + True + + - GTK_FILL + 1 + 2 + 3 + 4 - + True - True - 0 - True + 1 + _Number of articles to store: + True + properties_articles_spin - 1 - 2 + 3 + 4 GTK_FILL @@ -2858,20 +2859,31 @@ 12 6 - + + True + 1 + _Username: + True + True + properties_username_entry + + + GTK_FILL + + + + + True True - False * - - - + + + 1 2 - 1 - 2 @@ -2892,31 +2904,20 @@ - + True True + False * - - - + + + 1 2 - - - - - - True - 1 - _Username: - True - True - properties_username_entry - - - GTK_FILL + 1 + 2 diff --git a/src/lib/ImageCache.py b/src/lib/ImageCache.py index 3f6d1c7..c02220b 100644 --- a/src/lib/ImageCache.py +++ b/src/lib/ImageCache.py @@ -202,6 +202,6 @@ def initialize(): global STATUS_IMAGE_BROKEN libdir = utils.find_image_dir() STATUS_IMAGE_WAITING = open( - libdir + "/image-waiting.png").read() + libdir + "/image-loading.svg").read() STATUS_IMAGE_BROKEN = open( - libdir + "/image-broken.png").read() + libdir + "/image-missing.svg").read() diff --git a/src/lib/ItemView.py b/src/lib/ItemView.py index 198d6e4..8e4413f 100644 --- a/src/lib/ItemView.py +++ b/src/lib/ItemView.py @@ -445,7 +445,10 @@ class HTMLPresenter(MVP.BasicPresenter): it = gtk.icon_theme_get_default() ii = it.lookup_icon(icon_name, 32, gtk.ICON_LOOKUP_NO_SVG) - imgsrc = 'file://' + ii.get_filename() + if ii: + imgsrc = 'file://' + ii.get_filename() + else: + imgsrc = "file://%s/%s" % (utils.find_image_dir(), 'image-missing.svg') dcret.append('
%s (%.2f %s - %s)
' % (enc['href'], imgsrc, link_text, size, unit, enc['type'])) dcret.append('') diff --git a/src/straw b/src/straw index 62ea886..29092be 100755 --- a/src/straw +++ b/src/straw @@ -67,8 +67,8 @@ def setup_source(): f = open (os.path.join(sdir,'constants.py'),'w') f.write('APPNAME = "Straw"\n') f.write('VERSION = "0.28"\n') - f.write('STRAW_URL = "http://www.nongnu.org/straw"\n') - f.write('STRAW_REF_URL = "http://nongnu.org/straw-ref.html"\n') + f.write('STRAW_URL = "http://www.gnome.org/projects/straw"\n') + f.write('STRAW_REF_URL = "http://www.gnome.org/projects/straw-ref.html"\n') f.write('libdir = "%s"\n' % sdir) f.write('localedir = "%s"\n' % os.path.join(prefix, 'po')) f.write('datadir = "%s"\n' % os.path.join(prefix, 'data')) -- 2.11.4.GIT