major upgrades, button clicks, title display, transparency, take 2
[comic-widget] / comic-widget.py
index 183f423..baba1f0 100644 (file)
@@ -221,54 +221,94 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                self.imgvpos = 0;
                self.vbox = gtk.VBox()
                self.hbox = gtk.HBox()
-               self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id']))
+               self.label = gtk.Label()
+               self.label.set_alignment(xalign = 0, yalign = 0.5)
+               self.label.set_use_markup(True)
+               titl = str(self.db.db[self.db.currentcomic]['title'])
+               if len(titl) > 18:
+                       titl = titl[:15] + "..."
+               self.label.set_markup('<span size="12000" face="monospace"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '</span>')
+
 
                self.e_goweb = gtk.EventBox()
+               self.e_goweb.set_name('goweb')
+               self.e_goweb.set_size_request(178, 48)
+               # e_open is the eventbox for the image. Does nothing, but it's convenient to have it.
+               # it will change to be a cairo thing when I have the time.
                self.e_open = gtk.EventBox()
+               self.e_open.set_name('open')
                self.e_switch = gtk.EventBox()
+               self.e_switch.set_name('switch')
                self.e_switch.set_size_request(48, 48)
                self.e_next = gtk.EventBox()
+               self.e_next.set_name('next')
                self.e_next.set_size_request(48, 48)
                self.e_prev = gtk.EventBox()
+               self.e_prev.set_name('prev')
                self.e_prev.set_size_request(48, 48)
                self.e_up = gtk.EventBox()
+               self.e_up.set_name('up')
                self.e_up.set_size_request(48, 48)
                self.e_down = gtk.EventBox()
+               self.e_down.set_name('down')
                self.e_down.set_size_request(48, 48)
                self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
                self.comic_image.show()
                
-               # self.next = gtk.image_new_from_file(imagedir + "right0-48x48_mask.png")
-               # self.prev = gtk.image_new_from_file(imagedir + "left0-48x48_mask.png")
-               # self.up = gtk.image_new_from_file(imagedir + "up0-48x48_mask.png")
-               # self.down = gtk.image_new_from_file(imagedir + "down0-48x48_mask.png")
-               # self.switch = gtk.image_new_from_file(imagedir + "star0-48x48_mask.png")
+
+               # Preload images into a dictionary, so that we can access them by the names of the eventboxes:
+
+               self.images = {'up0':cairo.ImageSurface.create_from_png(imagedir + "up0-48x48.png"),
+                                       'up1':cairo.ImageSurface.create_from_png(imagedir + "up1-48x48.png"),
+                                       'down0':cairo.ImageSurface.create_from_png(imagedir + "down0-48x48.png"),
+                                       'down1':cairo.ImageSurface.create_from_png(imagedir + "down1-48x48.png"),
+                                       'next0':cairo.ImageSurface.create_from_png(imagedir + "next0-48x48.png"),
+                                       'next1':cairo.ImageSurface.create_from_png(imagedir + "next1-48x48.png"),
+                                       'prev0':cairo.ImageSurface.create_from_png(imagedir + "prev0-48x48.png"),
+                                       'prev1':cairo.ImageSurface.create_from_png(imagedir + "prev1-48x48.png"),
+                                       'switch0':cairo.ImageSurface.create_from_png(imagedir + "switch0-48x48.png"),
+                                       'switch1':cairo.ImageSurface.create_from_png(imagedir + "switch1-48x48.png"),
+                                       }
+
+
+
                self.e_goweb.add(self.label)
-               self.e_goweb.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_goweb.connect("button-press-event", self.view_comic)
+               self.e_goweb.set_events(gtk.gdk.BUTTON_RELEASE_MASK)
+               self.e_goweb.connect("button-release-event", self.view_comic)
 
                self.e_open.add(self.comic_image)
 
                # self.e_switch.add(self.switch)
-               self.e_switch.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_switch.connect("button-press-event", self.switch_comic)
+               self.e_switch.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
+               self.e_switch.connect("button-press-event", self.button_press)
+               self.e_switch.connect("button-release-event", self.button_release)
+               self.e_switch.connect("leave-notify-event", self.button_release)
 
 
                # self.e_next.add(self.next)
-               self.e_next.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_next.connect("button-press-event", self.get_next)
+               self.e_next.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
+               self.e_next.connect("button-press-event", self.button_press)
+               self.e_next.connect("button-release-event", self.button_release)
+               self.e_next.connect("leave-notify-event", self.button_release)
 
                #self.e_prev.add(self.prev)
-               self.e_prev.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_prev.connect("button_press_event", self.get_prev)
+               self.e_prev.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
+               self.e_prev.connect("button-press-event", self.button_press)
+               self.e_prev.connect("button-release-event", self.button_release)
+               self.e_prev.connect("leave-notify-event", self.button_release)
 
                #self.e_up.add(self.up)
-               self.e_up.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_up.connect("button-press-event", self.scroll_up)
+               self.e_up.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
+               self.e_up.connect("button-press-event", self.button_press)
+               self.e_up.connect("button-release-event", self.button_release)
+               self.e_up.connect("leave-notify-event", self.button_release)
+               
 
                #self.e_down.add(self.down)
-               self.e_down.set_events(gtk.gdk.BUTTON_PRESS_MASK)
-               self.e_down.connect("button-press-event", self.scroll_down)
+               self.e_down.set_events(gtk.gdk.BUTTON_PRESS_MASK|gtk.gdk.BUTTON_RELEASE_MASK|gtk.gdk.LEAVE_NOTIFY)
+               self.e_down.connect("button-press-event", self.button_press)
+               self.e_down.connect("button-release-event", self.button_release)
+               self.e_down.connect("leave-notify-event", self.button_release)
 
                self.vbox.pack_start(self.e_open,False,False,0)
                self.vbox.pack_end(self.hbox,False,False,0)
@@ -277,12 +317,14 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                # self.hbox.add(self.label)
                self.hbox.pack_start(self.e_goweb,False,False,5)
                self.hbox.pack_end(self.e_next,False,False,5)
+               self.hbox.pack_end(self.e_prev,False,False,5)
                self.hbox.pack_end(self.e_down,False,False,5)
                self.hbox.pack_end(self.e_up,False,False,5)
-               self.hbox.pack_end(self.e_prev,False,False,5)
                self.vbox.show_all()
                self.add(self.vbox)
 
+       # **************** Cairo draw functions ***************
+
        def realize(self):
                screen = self.get_screen()
                colormap = screen.get_rgba_colormap()
@@ -291,110 +333,129 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
 
        def do_expose_event(widget, event):
                cr = widget.window.cairo_create()
+               widget.draw(widget.e_up, 0)
+               widget.draw(widget.e_down, 0)
+               widget.draw(widget.e_prev,0)
+               widget.draw(widget.e_next, 0)
+               widget.draw(widget.e_switch, 0)
+#              widget.writeit(widget.e_goweb, "asdf")
                cr.set_operator(cairo.OPERATOR_OVER)
-               widget.draw(widget.e_up, imagedir + "up0-48x48.png")
-               widget.draw(widget.e_down, imagedir + "down0-48x48.png")
-               widget.draw(widget.e_prev, imagedir + "left0-48x48.png")
-               widget.draw(widget.e_next, imagedir + "right0-48x48.png")
-               widget.draw(widget.e_switch, imagedir + "star0-48x48.png")
                region = gtk.gdk.region_rectangle(event.area)
                cr.region(region)
                bg_color=gtk.gdk.color_parse('#000000')
-               cr.set_source_rgba (0.0, 0.0, 0.0, 0.7)
-               cr.fill()
+               cr.set_source_rgba (0.0, 0.0, 0.0, 0.5)
+               cr.fill_preserve()
                return False
 
-       def draw(self, target, pic):
+       # Function that draws a button preloaded in the images dictionary.
+       def draw(self, target, postfix):
                cr_e = target.window.cairo_create()
-               cr_e.set_source_rgba(0.0, 0.0, 0.0, 0.7) # Transparent
+               cr_e.set_source_rgba(0.0, 0.0, 0.0, 0.5) # Transparent
                cr_e.set_operator(cairo.OPERATOR_SOURCE)
                cr_e.paint()
-               if pic != None:
-                       cr_e.set_operator(cairo.OPERATOR_OVER)
-                       image = cairo.ImageSurface.create_from_png(pic)
-                       cr_e.set_source_surface(image, 0, 0)
-                       cr_e.paint()
+               cr_e.set_operator(cairo.OPERATOR_OVER)
+               cr_e.set_source_surface(self.images[target.get_name() + str(postfix)], 0, 0)
+               cr_e.paint()
 
+       # ********** Event handlers *************
+
+
+       # Most events happen on release, so I moved all of them into the same event handler.
+       def button_release(self, widget, event):
+               if event.type == gtk.gdk.BUTTON_RELEASE:
+                       func = widget.get_name()
+                       print "pressed: " + func
+                       if func == 'up':
+                               self.e_open.remove(self.comic_image)
+                               self.imgvpos = self.imgvpos - 80
+                               if self.imgvpos < 0:
+                                       self.imgvpos = 0
+                               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
+                               self.e_open.add(self.comic_image)
+                               self.e_open.show_all()
+
+                       elif func == 'down':
+                               self.e_open.remove(self.comic_image)
+                               self.imgvpos = self.imgvpos + 80
+                               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
+                               self.e_open.add(self.comic_image)
+                               self.e_open.show_all()
+                       
+                       elif func == 'next':
+                               self.db.currentcomic -= 1
+                               self.imgvpos = 0
+                               self.e_open.remove(self.comic_image)
+                               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
+                               self.e_open.add(self.comic_image)
+                               self.e_open.show_all()
+                               self.e_goweb.remove(self.label)
+                               titl = str(self.db.db[self.db.currentcomic]['title'])
+                               if len(titl) > 18:
+                                       titl = titl[:15] + "..."
+                               self.label.set_markup('<span size="12000" face="monospace"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '</span>')
+                               self.e_goweb.add(self.label)
+                               self.e_goweb.show_all()
+
+                       elif func == 'prev':
+                               self.db.currentcomic += 1
+                               self.imgvpos = 0
+                               self.e_open.remove(self.comic_image)
+                               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
+                               self.e_open.add(self.comic_image)
+                               self.e_open.show_all()
+                               self.e_goweb.remove(self.label)
+                               titl = str(self.db.db[self.db.currentcomic]['title'])
+                               if len(titl) > 18:
+                                       titl = titl[:15] + "..."
+                               self.label.set_markup('<span size="12000" face="monospace"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '</span>')
+                               self.e_goweb.add(self.label)
+                               self.e_goweb.show_all()
+
+                       elif func == 'switch':
+                               self.keypointer = (self.keypointer + 1) % 2
+                               self.imgvpos = 0
+                               self.db = []
+                               print "switching to " + self.keys[self.keypointer]
+                               self.comicname = comics[self.keys[self.keypointer]]['name']
+                               self.db = ComicDb(self.keys[self.keypointer])
+                               self.e_goweb.remove(self.label)
+                               titl = str(self.db.db[self.db.currentcomic]['title'])
+                               if len(titl) > 18:
+                                       titl = titl[:15] + "..."
+                               self.label.set_markup('<span size="12000" face="monospace"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '</span>')
+                               self.e_goweb.add(self.label)
+                               self.e_goweb.show_all()
+                               self.e_open.remove(self.comic_image)
+                               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
+                               self.e_open.add(self.comic_image)
+                               self.e_open.show_all()  
+                       
+                       else:
+                               return False                    
+               self.draw(widget, "0")
 
-       def switch_comic(self, widget, event):
+       # this one only switches to pressed button image
+       def button_press(self, widget, event):
                if not event.type == gtk.gdk.BUTTON_PRESS:
                        return False
-               self.keypointer = (self.keypointer + 1) % 2
-               self.imgvpos = 0
-               self.db = []
-               print "switching to " + self.keys[self.keypointer]
-               self.comicname = comics[self.keys[self.keypointer]]['name']
-               self.db = ComicDb(self.keys[self.keypointer])
-               self.e_goweb.remove(self.label)
-               self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id']))
-               self.e_goweb.add(self.label)
-               self.e_goweb.show_all()
-               self.e_open.remove(self.comic_image)
-               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
-               self.e_open.add(self.comic_image)
-               self.e_open.show_all()          
+               self.draw(widget, "1")
 
-       def switch_rel(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_RELEASE:
+       # this one cancels a button press when pointer is moved out from it after press.
+       def button_out(self, widget, event):
+               if not event.type == gtk.gdk.BUTTON_PRESS:
                        return False
-               widget.remove(self.switch)
-               self.switch = gtk.image_new_from_file(imagedir + "star.png")
-               widget.add(self.switch)
-               widget.show_all()
+               self.draw(widget, "0")
 
+       # no fancy cairo stuff here. simply launches url in browser.
        def view_comic(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_PRESS:
+               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,))
 
-       def scroll_down(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_PRESS:
-                       return False
-               self.e_open.remove(self.comic_image)
-               self.imgvpos = self.imgvpos + 80
-               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
-               self.e_open.add(self.comic_image)
-               self.e_open.show_all()
 
-       def scroll_up(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_PRESS:
-                       return False
-               self.e_open.remove(self.comic_image)
-               self.imgvpos = self.imgvpos - 80
-               if self.imgvpos < 0:
-                       self.imgvpos = 0
-               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
-               self.e_open.add(self.comic_image)
-               self.e_open.show_all()
 
-       def get_next(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_PRESS:
-                       return False
-               self.db.currentcomic -= 1
-               self.imgvpos = 0
-               self.e_open.remove(self.comic_image)
-               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
-               self.e_open.add(self.comic_image)
-               self.e_open.show_all()
-               self.e_goweb.remove(self.label)
-               self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id']))
-               self.e_goweb.add(self.label)
-               self.e_goweb.show_all()
-                       
-       def get_prev(self, widget, event):
-               if not event.type == gtk.gdk.BUTTON_PRESS:
-                       return False
-               self.db.currentcomic += 1
-               self.imgvpos = 0
-               self.e_open.remove(self.comic_image)
-               self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
-               self.e_open.add(self.comic_image)
-               self.e_open.show_all()
-               self.e_goweb.remove(self.label)
-               self.label = gtk.Label(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id']))
-               self.e_goweb.add(self.label)
-               self.e_goweb.show_all()
+       # this function modifies the image to fit the widget and then returns it.
 
        def get_resized_pixmap(self, filename, vpos):
                print "vpos: " + str(vpos)