added Lari Tuomoinens script for Viivi n Wagner

diff --git a/debs/comic-widget_0.4.3-3_all.deb b/debs/comic-widget_0.4.3-3_all.deb
new file mode 100644 (file)
index 0000000..1fa3e6e
Binary files /dev/null and b/debs/comic-widget_0.4.3-3_all.deb differ

diff --git a/extras-devel/comic-widget_0.4.3-3.changes b/extras-devel/comic-widget_0.4.3-3.changes
new file mode 100644 (file)
index 0000000..dbc0154
--- /dev/null
+++ b/extras-devel/comic-widget_0.4.3-3.changes
@@ -0,0 +1,17 @@
+Maintainer: Marcus Wikstrom <mece@ovi.com>
+Format: 1.7
+Source: comic-widget
+Version: 0.4.3-3
+Architecture: all
+Date: Wed, 10 Feb 2010 00:13:58 +0000
+Distribution: fremantle
+Urgency: low
+Description: 
+ A widget that displays comics taken from the web.
+Changes: 
+ added jump options, fixed icon... again
+Changed-By: Marcus Wikstrom <mece@ovi.com>
+Files:
+ 9f64663cf87b0347ed1438afe9f72a8d 43494 user/desktop extras-devel comic-widget_0.4.3-3.tar.gz
+ 599d09a49f7f885a56b572a4f46668b4 349 user/desktop extras-devel comic-widget_0.4.3-3.dsc
+

diff --git a/extras-devel/comic-widget_0.4.3-3.dsc b/extras-devel/comic-widget_0.4.3-3.dsc
new file mode 100644 (file)
index 0000000..b601a43
--- /dev/null
+++ b/extras-devel/comic-widget_0.4.3-3.dsc
@@ -0,0 +1,10 @@
+Source: comic-widget
+Version: 0.4.3-3
+Maintainer: Marcus Wikstrom <mece@ovi.com>
+Architecture: all
+Format: 1.0
+Build-Depends: python2.5, python-osso, python-gtk2, python-hildon, python-hildondesktop, python2.5-cairo, hildon-desktop-python-loader
+Standards-Version: 0.4.3-3
+Files:
+ 9f64663cf87b0347ed1438afe9f72a8d 43494 comic-widget_0.4.3-3.tar.gz
+

diff --git a/extras-devel/comic-widget_0.4.3-3.tar.gz b/extras-devel/comic-widget_0.4.3-3.tar.gz
new file mode 100644 (file)
index 0000000..359cf3a
Binary files /dev/null and b/extras-devel/comic-widget_0.4.3-3.tar.gz differ

diff --git a/src/usr/lib/hildon-desktop/comicwidget.py b/src/usr/lib/hildon-desktop/comicwidget.py
index d81dea0..5dd1fe6 100644 (file)
--- a/src/usr/lib/hildon-desktop/comicwidget.py
+++ b/src/usr/lib/hildon-desktop/comicwidget.py
@@ -199,6 +199,7 @@ comics = {
                "tigerckdm":{"name":"Tiger","link":'http://content.comicskingdom.net/Tiger/',"start":"20100209","dbfile":dbdir + "comicdb.tiger.csv"},
                "tinas_grooveckdm":{"name":"Tina's Groove","link":'http://content.comicskingdom.net/Tinas_Groove/',"start":"20100209","dbfile":dbdir + "comicdb.tinasgroove.csv"},
                "toddckdm":{"name":"Todd the Dinosaur","link":'http://content.comicskingdom.net/Todd/',"start":"20100209","dbfile":dbdir + "comicdb.todd.csv"},
+               "viivijawagnermatinmaapallo":{"name":"Viivi ja Wagner","link":"http://matin.maapallo.org/site.pl/selain/?c=viivijawagner&i=","start":"2500","dbfile":dbdir + "comicdb.viivijawagner.csv"},\r
                "zippy_the_pinheadckdm":{"name":"Zippy the Pinhead","link":'http://content.comicskingdom.net/Zippy_the_Pinhead/',"start":"20100209","dbfile":dbdir + "comicdb.zippythepinhead.csv"},
                "zitsckdm":{"name":"Zits","link":'http://content.comicskingdom.net/Zits/',"start":"20100209","dbfile":dbdir + "comicdb.zits.csv"},
 
@@ -645,7 +646,35 @@ class ComicDb():
                                s = f.read()
                                f.close()
                                return self.parse_comics_com(comic, s, 'next')
-
+               elif comic[-13:] == "matinmaapallo":\r
+                       realcomic = string.split( comic, 'matinmaapallo', 1)\r
+                       linkname = realcomic[0]\r
+                       link = "http://matin.maapallo.org/site.pl/selain/?c=" + linkname + "&i=" + str(number)\r
+                       print "link: " + link\r
+                       try:\r
+                               f = urllib2.urlopen(link)\r
+                               hcode = f.code\r
+                       except:\r
+                               hcode = 404\r
+                       print "got hcode = " + str(hcode) + "\n"\r
+                       print "I am now here"\r
+                       if (hcode != 200):\r
+                               return False\r
+                       else:\r
+                               print "checking next matin maapallo issue.."\r
+                               s = f.read()\r
+                               f.close()\r
+                               # title:\r
+                               splt = string.split(s, 'seuraava', 1)\r
+                               if len(splt) < 2:\r
+                                       print "no 'prev' found"\r
+                                       return False\r
+                               else:\r
+                                       next = str( int(number) + 1 )\r
+                                       print "got next: " + next\r
+                                       return next\r
+               else:
+                       return False
 
 
 
@@ -744,8 +773,18 @@ class ComicDb():
                                s = f.read()
                                f.close()
                                return self.parse_comics_com(comic, s, 'prev')
-
-
+               elif comic[-13:] == 'matinmaapallo':\r
+                       print "checking matin maapallo..."\r
+                        prevint = int( number ) - 1\r
+                       if ( prevint  == 0 ):\r
+                               print "cannot go previous"\r
+                               return False\r
+                       else:\r
+                               print "got number: " + number\r
+                               print "got previous: " + str(prevint)\r
+                               return str(prevint)
+               else:
+                       return False
 
 
        def get_irow(self, comic, number):
@@ -1315,12 +1354,18 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                height = int(self.sizes['height'])
                picwidth = width - 2
                maxheight = height - 48
+               retimg = gtk.Image()
                if os.path.isfile(filename) == False:
-                       filename = "/opt/comic-widget/images/next0-48x48.png"
+                       filename = "/opt/comic-widget/images/up0-48x48.png"
+                       pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
+                       parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, width, maxheight)
+                       parent_buf.fill(0x00000000)
+                       tmpy = (maxheight / 2) - 24
+                       tmpx = (width / 2) - 24
+                       pixbuf.copy_area(0,0,picwidth,scaled_buf.get_height(),parent_buf,int(tmpx),int(tmpy))
+                       return 
                pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
                parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, width, maxheight)
-               parent_buf.fill(0xffffffff)
-               retimg = gtk.Image()
                # get correct width/height
                new_height = 1
                new_width = picwidth