supports_alpha = False
# LOGGING!
-# sys.stdout = open('/home/user/.comic-widget/output_log.txt', 'a')
-# sys.stderr = open('/home/user/.comic-widget/error_log.txt', 'a')
+# sys.stdout = open('/home/user/.comic-widget/output_log.txt', 'a', 0)
+sys.stderr = open('/home/user/.comic-widget/error_log.txt', 'a', 0)
# print "Start logging!"
# constants. dbfile is the location of the csv
# comiccache is the location of the images
-APP_VERSION = "0.4.2"
+APP_VERSION = "0.4.3"
basedbdir = "/opt/comic-widget/db/"
imagedir = "/opt/comic-widget/images/"
"wulff":{"name":"Wulffmorgenthaler","link":"http://wulffmorgenthaler.com/","start":"edd3411b-96ca-4d93-bd5f-0cf1deb67c8a","dbfile":dbdir + "comicdb.wulff.csv"},
"xkcd":{"name":"xkcd","link":"http://xkcd.org/","start":666,"dbfile":dbdir + "comicdb.xkcd.csv"},
"zack_hillcomicscom":{"name":"Zack Hill","link":'http://comics.com/zack_hill/',"start":"2010-02-01","dbfile":dbdir + "comicdb.zackhill.csv"},
-
"amazing_spidermanckdm":{"name":"The Amazing Spider-Man","link":'http://content.comicskingdom.net/Spiderman/',"start":"20100209","dbfile":dbdir + "comicdb.spiderman.csv"},
"apartment_3-gckdm":{"name":"Apartment 3-G","link":'http://content.comicskingdom.net/Apartment_3-G/',"start":"20100209","dbfile":dbdir + "comicdb.partment3g.csv"},
"arcticckdm":{"name":"Arctic Circle","link":'http://content.comicskingdom.net/Arctic/',"start":"20100209","dbfile":dbdir + "comicdb.arctic.csv"},
except:
return 0
+
def store_last(self, sid = 0):
try:
idf = open(self.dbfile + ".last", 'w')
self.e_goweb.add(self.label)
self.e_goweb.set_events(gtk.gdk.BUTTON_RELEASE_MASK)
- self.e_goweb.connect("button-release-event", self.view_comic)
+ self.e_goweb.connect("button-release-event", self.view_comic_web)
self.e_open.add(self.comic_image)
+ self.e_open.set_events(gtk.gdk.BUTTON_PRESS_MASK)
+ self.e_open.connect("button-press-event", self.view_comic)
# self.e_switch.add(self.switch)
self.e_switch.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
# **************** Cairo draw functions ***************
- def realize(self, widget):
+ def do_realize(self):
global supports_alpha
# To check if the display supports alpha channels, get the colormap
# Now we have a colormap appropriate for the screen, use it
self.set_colormap(colormap)
hildondesktop.HomePluginItem.do_realize(self)
- return False
def do_expose_event(widget, event):
cr = widget.window.cairo_create()
cr.set_source_rgb (0.0, 0.0, 0.0)
cr.fill_preserve()
- return False
+ hildondesktop.HomePluginItem.do_expose_event(widget,event)
# Function that draws a button preloaded in the images dictionary.
def draw(self, target, postfix):
elif func == 'switch':
# Check if store needed..
- if not self.db.currentcomic == 0 and not self.db.currentcomic == (len(self.db.db) - 1):
+ if not self.db.currentcomic == 0:
print "Storing location " + str(self.db.currentcomic)
if self.db.store_last():
print "stored successfully"
self.draw(widget, "0")
# no fancy cairo stuff here. simply launches url in browser.
- def view_comic(self, widget, event):
+ def view_comic_web(self, widget, event):
if not event.type == gtk.gdk.BUTTON_RELEASE:
return False
link = self.db.get_link()
self.osso_rpc.rpc_run_with_defaults("osso_browser", "open_new_window", (link,))
+ # simply launches image in browser.
+ def view_comic(self, widget, event):
+ if not event.type == gtk.gdk._2BUTTON_PRESS:
+ return False
+ #link = self.db.get_link()
+ link = 'file:///home/user/MyDocs/.comics/' + self.db.comic + '/' + self.db.db[self.db.currentcomic]['filename']
+ self.osso_rpc.rpc_run_with_defaults("osso_browser", "open_new_window", (link,))
+
# this function modifies the image to fit the widget and then returns it.
height = int(self.sizes['height'])
picwidth = width - 2
maxheight = height - 48
-
+ if os.path.isfile(filename) == False:
+ filename = "/opt/comic-widget/images/next0-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(0xffffffff)
scaled_buf = pixbuf.scale_simple(new_width,new_height,gtk.gdk.INTERP_BILINEAR)
print "scaled height: " + str(scaled_buf.get_height())
if scaled_buf.get_height() > maxheight:
+ self.scrollable = True
if scaled_buf.get_height() - (vpos + maxheight) < 0:
vpos = scaled_buf.get_height() - maxheight
scaled_buf.copy_area(0,vpos,picwidth,maxheight,parent_buf,1,0)
# parent_buf.composite(scaled_buf, 0, 0, 478, maxheight, 0, 0, 478, maxheight, gtk.gdk.INTERP_BILINEAR, 0)
self.imgvpos = vpos
else:
+ self.scrollable = False
tmpy = maxheight - scaled_buf.get_height()
if tmpy > 0:
tmpy = tmpy / 2
comics_button.connect("clicked", self.show_comics)
navfirst_button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
- navfirst_button.set_text("Go to earliest", "Jump to the earliest cached comic")
+ navfirst_button.set_text("Go to earliest", "Jump to the oldest cached comic")
navfirst_button.set_alignment(0,0,0,0)
navfirst_button.connect("clicked", self.show_nav, "oldest")
navlast_button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
- navlast_button.set_text("Go to latest", "Jump to the latest cached comic")
+ navlast_button.set_text("Go to latest", "Jump to the newest cached comic")
navlast_button.set_alignment(0,0,0,0)
navlast_button.connect("clicked", self.show_nav, "newest")
navstored_button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
- navstored_button.set_text("Go to last visited", "Jump to where you were before you switched comics")
+ navstored_button.set_text("Go to stored comic", "Jump to where you were before you switched comics")
navstored_button.set_alignment(0,0,0,0)
navstored_button.connect("clicked", self.show_nav, "stored")