cifrado r80 - in trunk: . package/cifrado

[bersace svn gnome org]

Author: bersace
Date: Fri Apr  4 15:28:47 2008
New Revision: 80
URL: http://svn.gnome.org/viewvc/cifrado?rev=80&view=rev

Log:
Impression de la liste des codeurs dans le bandeau chef.


Modified:
   trunk/ChangeLog
   trunk/package/cifrado/cifrado.py
   trunk/package/cifrado/codeur.py
   trunk/package/cifrado/emission.py

Modified: trunk/package/cifrado/cifrado.py
==============================================================================
--- trunk/package/cifrado/cifrado.py	(original)
+++ trunk/package/cifrado/cifrado.py	Fri Apr  4 15:28:47 2008
@@ -845,10 +845,63 @@
         cr.stroke()
         cr.restore()
 
+        # chiffrements
+        w,h = self.impr_text(contexte, "Chiffrement",
+                             font='sans bold 9',
+                             y=hh/pango.SCALE,
+                             align=pango.ALIGN_RIGHT)
+                       
+        iter = em.codeurs.get_iter_first()
+        mw = 0
+        layouts = []
+        while iter is not None and em.codeurs.iter_is_valid(iter):
+            codeur = em.get_codeur(iter)
+
+            nom = em.get_codeur_nom(iter)
+            prop = codeur.get_prop_desc()
+            if prop is not None:
+                nom+=' ( '+prop+' )'
+
+            layout = self.layout_text(contexte, nom,
+                                 font='sans normal 7')
+            w,h = layout.get_size()
+            mw = max(mw, w)
+
+            layouts.append(layout)
+            
+            iter = em.codeurs.iter_next(iter)
+
+        mw/= pango.SCALE
+        il = 2*pango.SCALE
+        y = hh + il + h + il
+
+        for layout in layouts:
+            self.impr_layout(contexte, layout,
+                             width=mw,
+                             x=contexte.get_width()-mw,
+                             y=y/pango.SCALE)
+            w,h = layout.get_size()
+            y+=h+il
+
+        # sÃparateur vertical
+        cr.new_path()
+        cr.save()
+        cr.set_source_rgb(.5, .5, .5)
+        print contexte.get_width()-il-mw, hh+il
+        print y
+
+        cr.move_to(contexte.get_width()-(2*il)/pango.SCALE-mw,
+                   hh/pango.SCALE)
+        cr.rel_line_to(0, (y-hh)/pango.SCALE)
+        cr.set_line_width(.5)
+        cr.stroke()
+        cr.restore()
 
+        
         # Original
         self.impr_text(contexte, message.message,
                        y=int(1.5 * hh/pango.SCALE),
+                       width=contexte.get_width()*pango.SCALE-2*il-mw*pango.SCALE,
                        justify=True)
 
         # ChiffrÃ

Modified: trunk/package/cifrado/codeur.py
==============================================================================
--- trunk/package/cifrado/codeur.py	(original)
+++ trunk/package/cifrado/codeur.py	Fri Apr  4 15:28:47 2008
@@ -20,7 +20,7 @@
         return None
 
     def get_prop_desc(self):
-        return ''
+        return None
 
     def convertir(self, text):
         return text

Modified: trunk/package/cifrado/emission.py
==============================================================================
--- trunk/package/cifrado/emission.py	(original)
+++ trunk/package/cifrado/emission.py	Fri Apr  4 15:28:47 2008
@@ -56,6 +56,12 @@
     def get_codeur(self, iter):
         return self.codeurs.get_value(iter, COL_COD)
 
+    def get_codeur_classe(self, iter):
+        return self.codeurs.get_value(iter, COL_COD_CLASSE)
+
+    def get_codeur_nom(self, iter):
+        return self.codeurs.get_value(iter, COL_COD_NOM)
+
 
     def convertir(self, texte):
         iter = self.codeurs.get_iter_first()