', 1)
if len(splt) < 2:
@@ -392,20 +550,57 @@ class ComicDb():
return False
splt = string.split(splt[1], ' by ', 1)
+ splt = string.split(splt[1], '">', 1)
url = "http://www.explosm" + splt[0]
splt2 = string.rsplit(url, "/", 1)
filename = splt2[1]
irow = [comic,number,link,url,filename,title,next,prev]
return irow
-
+ elif comic == 'wulff':
+ # wulf is type .gif
+ s = f.read()
+ f.close()
+#
+#
+#
+#
+ splt = string.split(s, ' 22:
titl = titl[:19] + "..."
- self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '')
+ self.label.set_markup(self.get_markup())
self.e_goweb = gtk.EventBox()
@@ -543,6 +741,8 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
self.vbox.show_all()
self.add(self.vbox)
+
+
# **************** Cairo draw functions ***************
def realize(self, widget):
@@ -629,7 +829,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
titl = str(self.db.db[self.db.currentcomic]['title'])
if len(titl) > 22:
titl = titl[:19] + "..."
- self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '')
+ self.label.set_markup(self.get_markup())
self.e_goweb.add(self.label)
self.e_goweb.show_all()
@@ -644,12 +844,17 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
titl = str(self.db.db[self.db.currentcomic]['title'])
if len(titl) > 22:
titl = titl[:19] + "..."
- self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '')
+ self.label.set_markup(self.get_markup())
self.e_goweb.add(self.label)
self.e_goweb.show_all()
elif func == 'switch':
self.active_comics = self.get_active_comics()
+ print "closing log"
+ #sys.stdout.close()
+ #sys.stdout = sys.__stdout__
+ #sys.stderr.close()
+ #sys.stderr = sys.__stderr__
print "active comics: " + str(self.active_comics)
self.keypointer = (self.keypointer + 1) % len(self.active_comics)
self.imgvpos = 0
@@ -663,7 +868,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
titl = str(self.db.db[self.db.currentcomic]['title'])
if len(titl) > 22:
titl = titl[:19] + "..."
- self.label.set_markup(' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + titl + '')
+ self.label.set_markup(self.get_markup())
self.e_goweb.add(self.label)
self.e_goweb.show_all()
self.e_open.add(self.comic_image)
@@ -698,32 +903,39 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
def get_resized_pixmap(self, filename, vpos):
print "vpos: " + str(vpos)
-
- maxheight = 182
+
+ width = int(self.sizes['width'])
+ height = int(self.sizes['height'])
+ picwidth = width - 2
+ maxheight = height - 48
pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
- parent_buf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, pixbuf.get_has_alpha(), 8, 480, maxheight)
+ 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 = 478
- new_height = int((478.0 / pixbuf.get_width()) * pixbuf.get_height())
+ new_width = picwidth
+ new_height = int((float(picwidth) / pixbuf.get_width()) * pixbuf.get_height())
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:
if scaled_buf.get_height() - (vpos + maxheight) < 0:
vpos = scaled_buf.get_height() - maxheight
- scaled_buf.copy_area(0,vpos,478,maxheight,parent_buf,1,0)
+ 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:
tmpy = maxheight - scaled_buf.get_height()
if tmpy > 0:
tmpy = tmpy / 2
- scaled_buf.copy_area(0,0,478,scaled_buf.get_height(),parent_buf,1,tmpy)
+ scaled_buf.copy_area(0,0,picwidth,scaled_buf.get_height(),parent_buf,1,tmpy)
self.imgvpos = 0
+# test = parent_buf.render_pixmap_and_mask(0)
+# parent_buf.add_alpha(True,chr(255),chr(255),chr(255))
retimg.set_from_pixbuf(parent_buf)
+ print retimg.get_pixel_size()
print "vpos after fixing image: " + str(self.imgvpos)
return retimg
@@ -785,7 +997,12 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
return ret
-
+ def get_markup(self):
+ if len(self.comicname + " " + str(self.db.db[self.db.currentcomic]['id'])) < 20:
+ return ' ' + self.comicname + ' ' + str(self.db.db[self.db.currentcomic]['id']) + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + ''
+ else:
+ return ' ' + self.comicname + '' + '\n ' + str(self.db.db[self.db.currentcomic]['title']) + ''
+
#check if settings file exists
@@ -794,6 +1011,7 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
# ************************* OPTION DIALOGS ********************************
def show_options(self, widget):
+ print "loading options dialog"
dialog = gtk.Dialog("Comic Widget", None, gtk.DIALOG_DESTROY_WITH_PARENT)
about_button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
@@ -806,14 +1024,23 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
comics_button.set_alignment(0,0,0,0)
comics_button.connect("clicked", self.show_comics)
- dialog.vbox.pack_start(about_button, True, True, 0)
- dialog.vbox.pack_start(comics_button, True, True, 0)
+ # size_button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
+ # size_button.set_text("Change size", "Change the size of the widget")
+ # size_button.set_alignment(0,0,0,0)
+ # size_button.connect("clicked", self.show_size)
+ print "adding buttons to dialog, starting with comics"
+ dialog.vbox.pack_start(comics_button, True, True, 0)
+ print "adding about button"
+ dialog.vbox.pack_start(about_button, True, True, 0)
+ # dialog.vbox.pack_start(size_button, True, True, 0)
+ print "show!"
dialog.show_all()
dialog.run()
dialog.destroy()
def show_about(self, widget):
+ print "in about dialog"
dialog = gtk.AboutDialog()
dialog.set_title("About")
dialog.set_name("Comic widget")
@@ -828,38 +1055,64 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
dialog.run()
dialog.destroy()
- def show_comics(self, widget):
- dialog = gtk.Dialog("Configure Search Engines", None, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR)
+ def show_comics(self, widget, data = None):
+ print "in comics dialog! yay!"
+ dialog = gtk.Dialog("Choose comics", None, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR)
comiclist = comics.keys()
comiclist.sort()
buttonlist = {}
+ self.connlist = {}
+ self.liststore = gtk.ListStore(str,str,bool)
for comicid in comiclist:
- buttonlist[comicid] = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
- print buttonlist[comicid].get_name()
-
- print buttonlist[comicid].set_alignment(0, 0.5, 0, 0.5)
active = False
for acomic in self.active_comics:
if acomic == comicid:
active = True
break
if active:
- buttonlist[comicid].set_text(comics[comicid]['name'] + " *", comicid + ": click to remove")
- buttonlist[comicid].connect("clicked", self.remove_comic)
+ self.liststore.append(["* " + comics[comicid]['name'],comicid, active])
else:
- buttonlist[comicid].set_text(comics[comicid]['name'], comicid + ": click to add")
- buttonlist[comicid].connect("clicked", self.add_comic)
- dialog.vbox.pack_start(buttonlist[comicid], True, True, 0)
+ self.liststore.append([" " + comics[comicid]['name'],comicid, active])
+ self.treeview = hildon.GtkTreeView(gtk.HILDON_UI_MODE_EDIT)
+ self.treeview.set_model(self.liststore)
+ self.treeview.set_reorderable(True)
+ tvcolumn = gtk.TreeViewColumn('Column 0')
+ self.treeview.append_column(tvcolumn)
+ cell = gtk.CellRendererText()
+ tvcolumn.pack_start(cell, True)
+ tvcolumn.add_attribute(cell, 'text', 0)
+
+ ts = hildon.PannableArea()
+
+ ts.set_size_request(-1, 280)
+ ts.add(self.treeview)
+ selection = self.treeview.get_selection()
-
+ dialog.vbox.pack_start(ts,True,True,0)
dialog.show_all()
+ selection.connect("changed", self.pick_comic, comiclist)
dialog.run()
dialog.destroy()
+
+ def pick_comic(self, widget, data):
+ selected = widget.get_selected()
+ if selected == None:
+ return False
+
+ print selected[0].get_value(selected[1],0) + ", " + selected[0].get_value(selected[1],1) + ", " + str(selected[0].get_value(selected[1],2))
+ if selected[0].get_value(selected[1],2):
+ self.remove_comic(selected[0].get_value(selected[1],1))
+ splt = selected[0].get_value(selected[1],0)[1:]
+ selected[0].set_value(selected[1],0," " + splt)
+ selected[0].set_value(selected[1],2,False)
+ else:
+ self.add_comic(selected[0].get_value(selected[1],1))
+ splt = selected[0].get_value(selected[1],0)[1:]
+ selected[0].set_value(selected[1],0,"*" + splt)
+ selected[0].set_value(selected[1],2,True)
+
- def add_comic(self, widget):
- print "add " + widget.get_title()
- splt = string.split(widget.get_value(), ':', 1)
- comicid = splt[0]
+ def add_comic(self, comicid):
if os.path.isfile(activecomics) == True:
print "added " + comicid + " to " + str(self.active_comics)
try:
@@ -870,22 +1123,54 @@ class ComicHomePlugin(hildondesktop.HomePluginItem):
dbw = csv.writer(dbf)
dbw.writerow(self.active_comics)
dbf.close()
- widget.set_text(comics[comicid]['name'] + " *", comicid + ": click to remove")
-
- def remove_comic(self, widget):
- print "remove " + widget.get_title()
- if len(self.active_comics) == 1:
- return
- splt = string.split(widget.get_value(), ':', 1)
- comicid = splt[0]
+
+ def remove_comic(self, comicid):
if os.path.isfile(activecomics) == True:
print "removing " + comicid + " from " + str(self.active_comics)
- del self.active_comics[self.active_comics.index(comicid)]
+ try:
+ del self.active_comics[self.active_comics.index(comicid)]
+ except:
+ pass
dbf = open(activecomics, 'w')
dbw = csv.writer(dbf)
dbw.writerow(self.active_comics)
dbf.close()
- widget.set_text(comics[comicid]['name'], comicid + ": click to add")
+
+
+ def get_size_settings(self):
+ # defaults = {'width':480,'height':230}
+ # options: w 798 700 600 500 480 400
+ # options: h 420 360 310 270 240 200
+ print "checking to see if config file is available"
+ if os.path.isfile(sizefile) == True:
+ print "found " + sizefile
+ dbf = open(sizefile, 'r')
+ dbr = csv.reader(dbf)
+ try:
+ cfg = dbr.next()
+ except:
+ dbf.close()
+ print "empty config file"
+ return defaults
+ dbf.close()
+
+ sizes = {'width':int(cfg[0]),'height':int(cfg[1])}
+ if sizes['width'] > 798:
+ sizes['width'] = 798
+ if sizes['width'] < 400:
+ sizes['width'] = 400
+ if sizes['height'] > 420:
+ sizes['height'] = 420
+ if sizes['height'] < 200:
+ sizes['height'] = 200
+
+ return sizes
+
+
+ # if not, copy it.
+ else:
+ print "no config file"
+ return defaults
hd_plugin_type = ComicHomePlugin
|