From 8666876c086b05a554a1f28ed239b99ed68e8930 Mon Sep 17 00:00:00 2001
From: bobot <none>
Date: Tue, 7 Nov 2006 04:56:58 +0100
Subject: [PATCH] =?UTF-8?q?utilise=20le=20jolie=20syst=C3=A8med'options=20?=
 =?UTF-8?q?aussi=20pour=20les=20pages.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ajoute pdf-expand

darcs-hash:20061107035658-9e428-4420b70a11a30c12eb66ab9d29e40aec5a4b5312.gz
---
 lib/impression/__init__.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/impression/__init__.py b/lib/impression/__init__.py
index e0201cf0..0b46b87f 100644
--- a/lib/impression/__init__.py
+++ b/lib/impression/__init__.py
@@ -103,9 +103,9 @@ LPR_OPTIONS = {
     TROIS_AGRAPHE: ' -o StapleLocation=3parallel',
     STITCHING: ' -o StapleLocation=Stitching',
     
-    PAPIER_A4: ' -o pdf-paper=571x817  -o PageSize=A4',
-    PAPIER_A4_TRANSPARENT: ' -o InputSlot=Tray1 -o Media=Transparency',
-    PAPIER_A3: ' -o pdf-paper=825x1166 -o InputSlot=Tray3 -o HPPaperPolicy=A3 -o PageSize=A3',
+    PAPIER_A4: '-o InputSlot=Tray4 -o pdf-paper=571x817  -o PageSize=A4',
+    PAPIER_A4_TRANSPARENT: ' -o PageSize=A4 -o InputSlot=Tray1 -o Media=Transparency',
+    PAPIER_A3: ' -o pdf-expand -o pdf-paper=825x1166 -o InputSlot=Tray3 -o HPPaperPolicy=A3 -o PageSize=A3',
     
     IMPRESSION_COULEUR: ' -o HPColorasGray=False',
     IMPRESSION_NB: ' -o HPColorasGray=True',
@@ -319,8 +319,8 @@ class impression:
         # Pour specifier l'imprimante 
         options += ' -P laserjet'
     
-        # Pour specifier le bac sortie
-        options += ' -o OutputBin=Left'
+        #Indique la presence d'un bac de sortie avec agrafeuse
+        options += " -o Option20=MBMStaplerStacker -o OutputBin=StackerStapled"
         
         # Pour specifier la version du language postscript utilise par pdftops
         options += ' -o pdf-level3'
@@ -337,20 +337,12 @@ class impression:
         #options += " -o job-billing=%.2f" % self.cout
         #options += ' -o job-sheets=none'
         
-        #Indique la presence d'un bac de sortie avec agrafeuse
-        options += " -o Option20=MBMStaplerStacker -o OutputBin=StackerDown"
         
         # option agrafes
         options += LPR_OPTIONS[self._settings['agraphes']]
     
         # option papier
         options += LPR_OPTIONS[self._settings['papier']]                    
-        if self._settings['papier'] == PAPIER_A4_TRANSPARENT:
-            options += ' -o InputSlot=Tray1 -o Media=Transparency'
-        if self._settings['papier'] == PAPIER_A4:
-            options += ' -o pdf-paper=571x817  -o PageSize=A4'
-        else:                          
-            options += ' -o pdf-paper=825x1166 -o InputSlot=Tray3 -o HPPaperPolicy=A3 -o PageSize=A3'
                         
         # option disposition
         options += LPR_OPTIONS[self._settings['recto_verso']]