minor fixes
authorMarcus Wikström <mece@ovi.com>
Sun, 7 Feb 2010 16:04:39 +0000 (18:04 +0200)
committerMarcus Wikström <mece@ovi.com>
Sun, 7 Feb 2010 16:04:39 +0000 (18:04 +0200)
src/usr/lib/hildon-desktop/comicwidget.py

index 01fa400..2316017 100644 (file)
@@ -651,15 +651,12 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                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) > 22:
-                       titl = titl[:19] + "..."
                self.label.set_markup(self.get_markup())
 
 
                self.e_goweb = gtk.EventBox()
                self.e_goweb.set_name('goweb')
-               self.e_goweb.set_size_request(220, 48)
+               self.e_goweb.set_size_request(self.sizes['width'] - 250, 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()
@@ -741,7 +738,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                self.vbox.pack_end(self.hbox,False,False,0)
 
                self.hbox.pack_start(self.e_switch,False,False,0)
-               self.hbox.pack_start(self.e_goweb,False,False,10)
+               self.hbox.pack_start(self.e_goweb,False,False,5)
                self.hbox.pack_end(self.e_next,False,False,0)
                self.hbox.pack_end(self.e_prev,False,False,0)
                self.hbox.pack_end(self.e_down,False,False,0)
@@ -812,7 +809,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                        print "pressed: " + func
                        if func == 'up':
                                self.e_open.remove(self.comic_image)
-                               self.imgvpos = self.imgvpos - 80
+                               self.imgvpos = self.imgvpos - ((self.sizes['height'] - 48) / 2.1)
                                if self.imgvpos < 0:
                                        self.imgvpos = 0
                                self.comic_image = self.get_resized_pixmap(self.db.get_comic(), self.imgvpos)
@@ -821,7 +818,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
 
                        elif func == 'down':
                                self.e_open.remove(self.comic_image)
-                               self.imgvpos = self.imgvpos + 80
+                               self.imgvpos = self.imgvpos + ((self.sizes['height'] - 48) / 2.1)
                                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()
@@ -1007,9 +1004,9 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
                
        def get_markup(self):
                if len(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) < 20:
-                       return '<span size="12000" face="monospace"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + '</span>'
+                       return '<span size="12000" face="arial"> <b>' + self.comicname + '</b> ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + '</span>'
                else:
-                       return '<span size="12000" face="monospace"> <b>' + self.comicname + '</b>' + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + '</span>'
+                       return '<span size="12000" face="arial"> <b>' + self.comicname + '</b>' + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + '</span>'
 
                
                #check if settings file exists