Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed up GTK alignments.
[automanga.git]
/
manga
/
reader.py
diff --git
a/manga/reader.py
b/manga/reader.py
index
442f1f8
..
0e870eb
100644
(file)
--- a/
manga/reader.py
+++ b/
manga/reader.py
@@
-77,6
+77,7
@@
class imgload(future):
def value(self):
buf = gdkpix.PixbufLoader()
def value(self):
buf = gdkpix.PixbufLoader()
+ done = False
try:
with self.page.open() as st:
self.p = 0
try:
with self.page.open() as st:
self.p = 0
@@
-89,8
+90,13
@@
class imgload(future):
buf.write(read)
self.progcb()
self.st = None
buf.write(read)
self.progcb()
self.st = None
+ done = True
finally:
finally:
- buf.close()
+ try:
+ buf.close()
+ except:
+ if done:
+ raise
return buf.get_pixbuf()
@property
return buf.get_pixbuf()
@property
@@
-295,7
+301,7
@@
class pageview(gtk.Widget):
class msgproc(object):
def attach(self, reader):
self.rd = reader
class msgproc(object):
def attach(self, reader):
self.rd = reader
- self.msg = gtk.Alignment(
yalign=0.5
)
+ self.msg = gtk.Alignment(
xalign=0.0, yalign=0.5, xscale=0.0, yscale=0.0
)
self.hlay = gtk.HBox()
self.lbl = gtk.Label("")
self.hlay.pack_start(self.lbl, True, True, 0)
self.hlay = gtk.HBox()
self.lbl = gtk.Label("")
self.hlay.pack_start(self.lbl, True, True, 0)
@@
-513,7
+519,7
@@
class reader(gtk.Window):
vlay.pack_start(self.pfr, True, True, 0)
self.pfr.show()
self.sboxbar = gtk.HBox()
vlay.pack_start(self.pfr, True, True, 0)
self.pfr.show()
self.sboxbar = gtk.HBox()
- algn = gtk.Alignment(
yalign=0.5
)
+ algn = gtk.Alignment(
xalign=0.0, yalign=0.5, xscale=0.0, yscale=0.0
)
sboxlbl = gtk.Label(self.manga.name + u": ")
algn.add(sboxlbl)
sboxlbl.show()
sboxlbl = gtk.Label(self.manga.name + u": ")
algn.add(sboxlbl)
sboxlbl.show()
@@
-523,7
+529,7
@@
class reader(gtk.Window):
self.sboxbar.show()
self.sbar = gtk.HBox()
self.pagelbl = gtk.Label("")
self.sboxbar.show()
self.sbar = gtk.HBox()
self.pagelbl = gtk.Label("")
- algn = gtk.Alignment(
yalign=0.5
)
+ algn = gtk.Alignment(
xalign=0.0, yalign=0.5, xscale=0.0, yscale=0.0
)
algn.add(self.pagelbl)
self.pagelbl.show()
self.sbar.pack_start(algn, True, True, 0)
algn.add(self.pagelbl)
self.pagelbl.show()
self.sbar.pack_start(algn, True, True, 0)