[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire/org/fenfire fenpdf/appearance/papers.py...
From: |
Tuomas J. Lukka |
Subject: |
[ff-cvs] fenfire/org/fenfire fenpdf/appearance/papers.py... |
Date: |
Tue, 26 Aug 2003 03:37:50 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/08/26 03:37:50
Modified files:
org/fenfire/fenpdf/appearance: papers.py
org/fenfire/spanimages/gl: papermakers.py
Log message:
Try to fix papermaker booting - will test on laptop in a sec
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/papermakers.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/fenpdf/appearance/papers.py
diff -u fenfire/org/fenfire/fenpdf/appearance/papers.py:1.5
fenfire/org/fenfire/fenpdf/appearance/papers.py:1.6
--- fenfire/org/fenfire/fenpdf/appearance/papers.py:1.5 Mon Aug 25 20:34:29 2003
+++ fenfire/org/fenfire/fenpdf/appearance/papers.py Tue Aug 26 03:37:50 2003
@@ -21,9 +21,13 @@
def __init__(self, fenPDF):
self.fenPDF = fenPDF
+ # Boot the indices to existing paperMakers
+ self.useBg = 0
+ self.whitePaperMakerIndex = -1
+ self.adjustPaperMakerIndex(1)
self.useBg = 1
- self.fancyPaperMakerIndex = 0
- self.whitePaperMakerIndex = 0
+ self.fancyPaperMakerIndex = -1
+ self.adjustPaperMakerIndex(1)
# ScrollBlockImagers do not change -
# they also cache the textures, better
@@ -47,10 +51,29 @@
self.whitePaperMakerIndex += delta
self.whitePaperMakerIndex %= \
len(ff.spanimages.gl.papermakers.whitePaperMakers)
+ # If it's unavailable, take the next one
+ if ff.spanimages.gl.papermakers\
+ .whitePaperMakers[self.whitePaperMakerIndex][0]\
+ == None:
+ print "Not available: ", \
+ ff.spanimages.gl.papermakers\
+ .whitePaperMakers[
+ self.whitePaperMakerIndex][0]
+ self.adjustPaperMakerIndex(delta)
else:
self.fancyPaperMakerIndex += delta
self.fancyPaperMakerIndex %= \
len(ff.spanimages.gl.papermakers.fancyPaperMakers)
+ # If it's unavailable, take the next one
+ if ff.spanimages.gl.papermakers\
+ .fancyPaperMakers[self.fancyPaperMakerIndex][0]\
+ == None:
+ print "Not available: ", \
+ ff.spanimages.gl.papermakers\
+ .fancyPaperMakers[
+ self.fancyPaperMakerIndex][0]\
+ self.adjustPaperMakerIndex(delta)
+
if dbg: p("Pmis: ",
self.useBg,
self.whitePaperMakerIndex,
@@ -71,13 +94,12 @@
self.whitePaperMakerIndex]
p("Set paper maker: ", makerEntry)
- if 0:
+ if makerEntry[0] != None:
paperMaker = makerEntry[0]()
if dbg: print "Maker:", paperMaker
-
self.spanImageFactory.paperMaker = paperMaker
- else:
- raise 'FIX ME! this didn\'t work in mudyc\'s cvs tree.'
+ else:
+ raise 'FIX ME! Got None makeEntry.'
def getSpanImageFactory(self):
return self.spanImageFactory
Index: fenfire/org/fenfire/spanimages/gl/papermakers.py
diff -u fenfire/org/fenfire/spanimages/gl/papermakers.py:1.12
fenfire/org/fenfire/spanimages/gl/papermakers.py:1.13
--- fenfire/org/fenfire/spanimages/gl/papermakers.py:1.12 Wed Aug 20
12:34:33 2003
+++ fenfire/org/fenfire/spanimages/gl/papermakers.py Tue Aug 26 03:37:50 2003
@@ -35,6 +35,10 @@
#
# The function is set to None for those that are
# not available.
+#
+# This is the more rational way to do it than to leave
+# them out - this way we can have grayed-out menu entries
+# &c.
whitePaperMakers = []
fancyPaperMakers = []