Changeset 3079

Timestamp:

11/29/06 20:28:35 (17 years ago)

Author:

jerome

Message:

Now prepares datas for ReportLab? 2.x

Location:

pykota/trunk

Files:

• bin/pkbanner (modified) (1 diff)
• bin/pkinvoice (modified) (2 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/pkbanner

@@ -121 +121 @@
         canvas.setFillColorRGB(r, g, b)
         message = "%s :" % _(label)
-        canvas.drawRightString(x, y, message)
+        canvas.drawRightString(x, y, self.userCharsetToUTF8(message))
         canvas.setFont("Courier-Bold", size)
         (r, g, b) =  [ color + (savetoner * (1.0 - color)) for color in (1, 0, 0) ] # Red * savetoner
         canvas.setFillColorRGB(r, g, b)
-        canvas.drawString(x + 0.5*cm, y, value)
+        canvas.drawString(x + 0.5*cm, y, self.userCharsetToUTF8(value))
         canvas.restoreState()
         return (size + 4)

pykota/trunk/bin/pkinvoice

@@ -142 +142 @@
         self.canvas.setFont("Helvetica-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 0)
-        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % label)
+        self.canvas.drawRightString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(label))
         self.canvas.setFont("Courier-Bold", size)
         self.canvas.setFillColorRGB(0, 0, 1)
-        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, value)
+        self.canvas.drawString(xcenter + 0.5*cm, self.ypos, self.userCharsetToUTF8(value))
         self.canvas.restoreState()
         self.ypos -= (size + 4)
@@ -231 +231 @@
         self.canvas.setFont("Helvetica-Bold", 14)
         self.canvas.setFillColorRGB(0, 0, 0)
-        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % _("Here's the invoice for your printouts"))
+        msg = _("Here's the invoice for your printouts")
+        self.canvas.drawCentredString(xcenter, self.ypos, "%s :" % self.userCharsetToUTF8(msg))
         
         self.yorigine = self.ypos

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.25alpha17 (2006-11-27) :
     
+        - The code was changed to accomodate ReportLab 2.x in pkbanner
+          and pkinvoice. ReportLab v1.x is now only supported with 
+          an english or C locale.
+          
         - pknotify now accepts the --noremote command line option to
           decide what has to be done when there's no PyKotIcon running