diff --git a/comp/src/gb.form.print/.component b/comp/src/gb.form.print/.component
index 9cfa6e2f9..7b92209a1 100644
--- a/comp/src/gb.form.print/.component
+++ b/comp/src/gb.form.print/.component
@@ -1,6 +1,6 @@
 [Component]
 Key=gb.form.print
-Version=3.15.90
+Version=3.17.90
 Authors=Benoît Minisini
 Needs=Form
 Requires=gb.form
diff --git a/comp/src/gb.form.print/.lang/fr.po b/comp/src/gb.form.print/.lang/fr.po
index dbbda5c27..789059909 100644
--- a/comp/src/gb.form.print/.lang/fr.po
+++ b/comp/src/gb.form.print/.lang/fr.po
@@ -1,196 +1,174 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gb.form.print 3.13.90\n"
-"POT-Creation-Date: 2020-11-18 18:34 UTC\n"
-"PO-Revision-Date: 2019-07-08 00:03 UTC\n"
-"Last-Translator: benoit <benoit@benoit-kubuntu>\n"
+"Project-Id-Version: gb.form.print 3.17.90\n"
+"PO-Revision-Date: 2022-05-01 22:53 UTC\n"
+"Last-Translator: benoit <benoit@benoit-TOWER>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .project:1
-msgid "Generic preview and print form"
-msgstr "Formulaire de prévisualisation et d'impression générique"
-
-#: FPreview.class:305
-msgid "PDF files"
-msgstr "Fichiers PDF"
-
-#: FPreview.class:305
-msgid "Postscript files"
-msgstr "Fichiers Postscript"
-
-#: FPreview.class:365 FPrinting.form:30
-msgid "Cancel"
-msgstr "Annuler"
-
-#: FPreview.class:365
-msgid "Replace"
-msgstr "Remplacer"
-
-#: FPreview.class:365
-msgid ""
-"This file already exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"Ce fichier existe déjà.\n"
-"Voules-vous le remplacer ?"
-
-#: FPreview.form:79
-msgid "Print preview"
-msgstr "Prévisualisation de l'impression"
-
-#: FPreview.form:87
-msgid "Print to file"
-msgstr "Imprimer dans un fichier"
-
-#: FPreview.form:106
-msgid "Toggle option panel"
-msgstr ""
-
-#: FPreview.form:118
-msgid "Print"
-msgstr "Imprimer"
-
-#: FPreview.form:132
-msgid "Zoom out"
-msgstr "Réduire"
-
 # gb-ignore
-#: FPreview.form:138
+#: FPreview.form:133
 msgid "100 %"
 msgstr ""
 
-#: FPreview.form:144
-msgid "Zoom in"
-msgstr "Agrandir"
-
-#: FPreview.form:152
-msgid "One page"
-msgstr "Une page"
-
-#: FPreview.form:160
-msgid "Two pages"
-msgstr "Deux pages"
-
-#: FPreview.form:168
-msgid "Full width"
-msgstr "Pleine largeur"
-
-#: FPreview.form:176
-msgid "Real size"
-msgstr "Taille réelle"
-
-#: FPreview.form:208
-msgid "Resolution"
-msgstr "Résolution"
-
-# gb-ignore
-#: FPreview.form:220
-msgid "DPI"
-msgstr ""
-
-#: FPreview.form:230
-msgid "Two-sided"
-msgstr "Recto-verso"
-
-#: FPreview.form:237
-msgid "Long side"
-msgstr "Côté long"
-
-#: FPreview.form:237
-msgid "None"
-msgstr "Aucun"
-
-#: FPreview.form:237
-msgid "Short side"
-msgstr "Côté court"
-
-#: FPreview.form:247
-msgid "Copies"
-msgstr "Copies"
-
-#: FPreview.form:263
-msgid "Orientation"
-msgstr "Orientation"
-
-#: FPreview.form:270
-msgid "Landscape"
-msgstr "Paysage"
-
-#: FPreview.form:270
-msgid "Portrait"
-msgstr "Portrait"
-
-#: FPreview.form:280
-msgid "Paper"
-msgstr "Papier"
-
-#: FPreview.form:301
-msgid "Width"
-msgstr "Largeur"
-
-# gb-ignore
-#: FPreview.form:311
-msgid "mm"
-msgstr ""
-
-#: FPreview.form:321
-msgid "Height"
-msgstr "Hauteur"
-
-#: FPreview.form:338
-msgid "Grayscale"
-msgstr "Niveaux de gris"
-
-#: FPreview.form:343
-msgid "Collate copies"
-msgstr "Assembler les copies"
-
-#: FPreview.form:348
-msgid "Reverse order"
-msgstr "Inverser"
-
-#: FPreview.form:356
-msgid "Margins"
-msgstr "Marges"
-
-#: FPreview.form:365
-msgid "Left"
-msgstr "Gauche"
-
-#: FPreview.form:386
-msgid "Right"
-msgstr "Droite"
-
-#: FPreview.form:407
-msgid "Top"
-msgstr "Haute"
-
 #: FPreview.form:428
 msgid "Bottom"
 msgstr "Basse"
 
+#: FPreview.class:365 FPrinting.form:30
+msgid "Cancel"
+msgstr "Annuler"
+
+#: FPreview.form:340
+msgid "Collate copies"
+msgstr "Assembler les copies"
+
+#: FPreview.form:241
+msgid "Copies"
+msgstr "Copies"
+
+# gb-ignore
+#: FPreview.form:214
+msgid "DPI"
+msgstr ""
+
+#: FPreview.form:164
+msgid "Full width"
+msgstr "Pleine largeur"
+
+#: .project:1
+msgid "Generic preview and print form"
+msgstr "Formulaire de prévisualisation et d'impression générique"
+
+#: FPreview.form:335
+msgid "Grayscale"
+msgstr "Niveaux de gris"
+
+#: FPreview.form:317
+msgid "Height"
+msgstr "Hauteur"
+
+#: FPreview.form:265
+msgid "Landscape"
+msgstr "Paysage"
+
+#: FPreview.form:362
+msgid "Left"
+msgstr "Gauche"
+
+#: FPreview.form:231
+msgid "Long side"
+msgstr "Côté long"
+
+#: FPreview.form:353
+msgid "Margins"
+msgstr "Marges"
+
+# gb-ignore
+#: FPreview.form:307
+msgid "mm"
+msgstr ""
+
+#: FPreview.form:231
+msgid "None"
+msgstr "Aucun"
+
+#: FPreview.form:146
+msgid "One page"
+msgstr "Une page"
+
+#: FPreview.form:258
+msgid "Orientation"
+msgstr "Orientation"
+
+#: FPreview.form:275
+msgid "Paper"
+msgstr "Papier"
+
+#: FPreview.class:305
+msgid "PDF files"
+msgstr "Fichiers PDF"
+
+#: FPreview.form:265
+msgid "Portrait"
+msgstr "Portrait"
+
+#: FPreview.class:305
+msgid "Postscript files"
+msgstr "Fichiers Postscript"
+
+#: FPreview.form:116
+msgid "Print"
+msgstr "Imprimer"
+
 #: FPrinting.form:11
 msgid "Printing"
 msgstr "Impression en cours"
 
-#~ msgid "Layout..."
-#~ msgstr "Mise en page..."
+#: FPreview.form:77
+msgid "Print preview"
+msgstr "Prévisualisation de l'impression"
 
-#~ msgid "Show options"
-#~ msgstr "Afficher les options"
+#: FPreview.form:85
+msgid "Print to file"
+msgstr "Imprimer dans un fichier"
 
-#~ msgid "Printer"
-#~ msgstr "Imprimante"
+#: FPreview.form:173
+msgid "Real size"
+msgstr "Taille réelle"
 
-#~ msgid "File"
-#~ msgstr "Fichier"
+#: FPreview.class:365
+msgid "Replace"
+msgstr "Remplacer"
 
-#~ msgid "Full page"
-#~ msgstr "Pleine page"
+#: FPreview.form:201
+msgid "Resolution"
+msgstr "Résolution"
+
+#: FPreview.form:345
+msgid "Reverse order"
+msgstr "Inverser"
+
+#: FPreview.form:384
+msgid "Right"
+msgstr "Droite"
+
+#: FPreview.form:231
+msgid "Short side"
+msgstr "Côté court"
+
+#: FPreview.class:365
+msgid "This file already exists.\nDo you want to replace it?"
+msgstr "Ce fichier existe déjà.\nVoules-vous le remplacer ?"
+
+#: FPreview.form:104
+msgid "Toggle option panel"
+msgstr "Afficher le panneau des options"
+
+#: FPreview.form:406
+msgid "Top"
+msgstr "Haute"
+
+#: FPreview.form:224
+msgid "Two-sided"
+msgstr "Recto-verso"
+
+#: FPreview.form:155
+msgid "Two pages"
+msgstr "Deux pages"
+
+#: FPreview.form:296
+msgid "Width"
+msgstr "Largeur"
+
+#: FPreview.form:138
+msgid "Zoom in"
+msgstr "Agrandir"
+
+#: FPreview.form:126
+msgid "Zoom out"
+msgstr "Réduire"
 
-#~ msgid "Close"
-#~ msgstr "Fermer"
diff --git a/comp/src/gb.form.print/.project b/comp/src/gb.form.print/.project
index 079ae3c03..fd900b18b 100644
--- a/comp/src/gb.form.print/.project
+++ b/comp/src/gb.form.print/.project
@@ -2,14 +2,13 @@
 Title=Generic preview and print form
 Startup=MTest
 Icon=.hidden/printer.png
-Version=3.15.90
+Version=3.17.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui
 Component=gb.form
 Component=gb.settings
 Authors="Benoît Minisini"
-Environment="GB_GUI=gb.qt5"
 TabSize=2
 Translate=1
 Language=en_US
diff --git a/comp/src/gb.form.print/.src/FPreview.class b/comp/src/gb.form.print/.src/FPreview.class
index 25f83383f..289e0cfb3 100644
--- a/comp/src/gb.form.print/.src/FPreview.class
+++ b/comp/src/gb.form.print/.src/FPreview.class
@@ -391,7 +391,7 @@ End
 Public Sub Printer_Begin()
 
   If $bPrinting Then
-    Me.Enabled = False
+    'Me.Enabled = False
     FPrinting.Show()
     BeginPaint(Paint.W / $hPrinter.PaperWidth * SCALE)
     Paint.FontScale = 25.4 / 72 / SCALE * 72 / 96 * 96 / $hPrinter.Resolution
@@ -431,7 +431,7 @@ Public Sub Printer_End()
   FPrinting.Close
   $bPrinting = False
   RefreshPrintButton
-  Me.Enabled = True
+  'Me.Enabled = True
   
 End
 
diff --git a/comp/src/gb.form.print/.src/FPreview.form b/comp/src/gb.form.print/.src/FPreview.form
index e7bfa5158..44f47872d 100644
--- a/comp/src/gb.form.print/.src/FPreview.form
+++ b/comp/src/gb.form.print/.src/FPreview.form
@@ -92,7 +92,7 @@
     MoveScaled(1,6,84,83)
     Expand = True
     { panSide VBox
-      MoveScaled(0,0,38,83)
+      MoveScaled(0,0,39,83)
       Spacing = True
       Margin = True
       { txtFile ButtonBox
@@ -111,6 +111,7 @@
         { cmbResolution ComboBox
           MoveScaled(20,0,9,4)
           #Translate = False
+          Expand = True
           ReadOnly = True
           List = ["75", "150", "300", "600", "1200"]
         }
@@ -142,6 +143,7 @@
         }
         { txtCopies SpinBox
           MoveScaled(13,0,9,4)
+          Expand = True
           MinValue = 1
           Value = 1
         }
@@ -187,6 +189,7 @@
           }
           { txtWidth SpinBox
             MoveScaled(14,0,9,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label7 Label
@@ -203,6 +206,7 @@
           }
           { txtHeight SpinBox
             MoveScaled(14,0,9,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label8 Label
@@ -239,7 +243,8 @@
           }
           { txtMarginLeft SpinBox txtMargin
             Name = "txtMarginLeft"
-            MoveScaled(14,0,9,4)
+            MoveScaled(14,0,11,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label9 Label
@@ -257,6 +262,7 @@
           { txtMarginRight SpinBox txtMargin
             Name = "txtMarginRight"
             MoveScaled(14,0,9,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label13 Label
@@ -274,6 +280,7 @@
           { txtMarginTop SpinBox txtMargin
             Name = "txtMarginTop"
             MoveScaled(14,0,9,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label15 Label
@@ -291,6 +298,7 @@
           { txtMarginBottom SpinBox txtMargin
             Name = "txtMarginBottom"
             MoveScaled(14,0,9,4)
+            Expand = True
             MaxValue = 1000
           }
           { Label17 Label