Ajout d'une description dans le dialogue des options d'impression

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@381 bfdf4180-ca20-0410-9c96-a3a8aa849046

lang/qet_en.ts

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="en">
-<defaultcodec></defaultcodec>
 <context>
     <name>AboutQET</name>
     <message>
@@ -255,35 +254,45 @@
 <context>
     <name>DiagramPrintDialog</name>
     <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="146"/>
+        <location filename="../sources/diagramprintdialog.cpp" line="147"/>
         <source>Options d&apos;impression</source>
         <translation>Print options</translation>
     </message>
     <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="148"/>
+        <location filename="../sources/diagramprintdialog.cpp" line="149"/>
         <source>Utiliser toute la feuille</source>
         <translation>Use full page</translation>
     </message>
     <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="149"/>
+        <location filename="../sources/diagramprintdialog.cpp" line="157"/>
         <source>Adapter le sch&#xe9;ma &#xe0; la page</source>
         <translation>Fit diagram to page</translation>
     </message>
     <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="150"/>
+        <location filename="../sources/diagramprintdialog.cpp" line="168"/>
-        <source>Plage de </source>
-        <translation>Range from </translation>
-    </message>
-    <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="152"/>
         <source> &#xe0; </source>
         <translation> to </translation>
     </message>
     <message>
-        <location filename="../sources/diagramprintdialog.cpp" line="191"/>
+        <location filename="../sources/diagramprintdialog.cpp" line="210"/>
         <source>Nombre total de pages : </source>
         <translation>Total pages count: </translation>
     </message>
+    <message>
+        <location filename="../sources/diagramprintdialog.cpp" line="154"/>
+        <source>Si cette option est coch&#xe9;e, les marges de la feuille seront ignor&#xe9;es et toute sa surface sera utilis&#xe9;e pour l&apos;impression. Cela peut ne pas &#xea;tre support&#xe9; par votre imprimante.</source>
+        <translation>If this option is checked, the paper margins are ignored and its whole surface is used for the printing. This may not be supported by your printer.</translation>
+    </message>
+    <message>
+        <location filename="../sources/diagramprintdialog.cpp" line="162"/>
+        <source>Si cette option est coch&#xe9;e, le sch&#xe9;ma sera agrandi ou r&#xe9;tr&#xe9;ci de fa&#xe7;on &#xe0; remplir toute la surface imprimable d&apos;une et une seule page.</source>
+        <translation>If this option is checked, the diagram will be shrinked or expanded to fit the printable surface of a single page.</translation>
+    </message>
+    <message>
+        <location filename="../sources/diagramprintdialog.cpp" line="166"/>
+        <source>Pages &#xe0; imprimer : plage de </source>
+        <translation>Pages to print: from</translation>
+    </message>
 </context>
 <context>
     <name>DiagramView</name>
@@ -337,31 +346,6 @@
         <source>Propri&#xe9;t&#xe9;s du sch&#xe9;ma</source>
         <translation>Diagram properties</translation>
     </message>
-    <message>
-        <location filename="../sources/diagramview.cpp" line="564"/>
-        <source>Dimensions du sch&#xe9;ma</source>
-        <translation type="obsolete">Diagram size</translation>
-    </message>
-    <message>
-        <location filename="../sources/diagramview.cpp" line="567"/>
-        <source>Colonnes :</source>
-        <translation type="obsolete">Columns:</translation>
-    </message>
-    <message>
-        <location filename="../sources/diagramview.cpp" line="590"/>
-        <source>&#xd7;</source>
-        <translation type="obsolete">×</translation>
-    </message>
-    <message>
-        <location filename="../sources/diagramview.cpp" line="591"/>
-        <source>px</source>
-        <translation type="obsolete">px</translation>
-    </message>
-    <message>
-        <location filename="../diagramview.cpp" line="583"/>
-        <source>Hauteur :</source>
-        <translation type="obsolete">Height:</translation>
-    </message>
     <message>
         <location filename="../sources/diagramview.cpp" line="788"/>
         <source>&#xc9;diter les propri&#xe9;t&#xe9;s par d&#xe9;faut des conducteurs</source>
@@ -387,11 +371,6 @@
         <source>schema</source>
         <translation>diagram</translation>
     </message>
-    <message>
-        <location filename="../sources/diagramview.cpp" line="580"/>
-        <source>Lignes :</source>
-        <translation type="obsolete">Rows:</translation>
-    </message>
 </context>
 <context>
     <name>ElementDeleter</name>
@@ -1057,36 +1036,6 @@ Changes will be permanent.</translation>
         <source>Nouveau sch&#xe9;ma</source>
         <translation>New Diagram</translation>
     </message>
-    <message>
-        <location filename="../sources/configpages.cpp" line="52"/>
-        <source>Dimensions du sch&#xe9;ma</source>
-        <translation type="obsolete">Diagram size</translation>
-    </message>
-    <message>
-        <location filename="../sources/configpages.cpp" line="56"/>
-        <source>Colonnes :</source>
-        <translation type="obsolete">Columns:</translation>
-    </message>
-    <message>
-        <location filename="../sources/configpages.cpp" line="79"/>
-        <source>&#xd7;</source>
-        <translation type="obsolete">×</translation>
-    </message>
-    <message>
-        <location filename="../sources/configpages.cpp" line="80"/>
-        <source>px</source>
-        <translation type="obsolete">px</translation>
-    </message>
-    <message>
-        <location filename="../configpages.cpp" line="64"/>
-        <source>Hauteur :</source>
-        <translation type="obsolete">Height:</translation>
-    </message>
-    <message>
-        <location filename="../sources/configpages.cpp" line="69"/>
-        <source>Lignes :</source>
-        <translation type="obsolete">Rows:</translation>
-    </message>
 </context>
 <context>
     <name>NewElementWizard</name>
@@ -1469,11 +1418,6 @@ Available options:
         <source>Afficher</source>
         <translation>Display</translation>
     </message>
-    <message>
-        <location filename="../qetdiagrameditor.cpp" line="205"/>
-        <source>Agrandir le sch&#xe9;ma</source>
-        <translation type="obsolete">Expand the diagram</translation>
-    </message>
     <message>
         <location filename="../sources/qetdiagrameditor.cpp" line="288"/>
         <source>Agrandit le sch&#xe9;ma</source>
@@ -1869,11 +1813,6 @@ Available options:
         <source>Restaure le zoom par d&#xe9;faut</source>
         <translation>Restores default zoom level</translation>
     </message>
-    <message>
-        <location filename="../qetdiagrameditor.cpp" line="206"/>
-        <source>R&#xe9;tr&#xe9;cir le sch&#xe9;ma</source>
-        <translation type="obsolete">Shrink the diagram</translation>
-    </message>
     <message>
         <location filename="../sources/qetdiagrameditor.cpp" line="289"/>
         <source>R&#xe9;tr&#xe9;cit le sch&#xe9;ma</source>

sources/diagramprintdialog.cpp

@@ -143,12 +143,27 @@ int DiagramPrintDialog::verticalPagesCount(bool fullpage) const {
 */
 void DiagramPrintDialog::buildDialog() {
 	dialog = new QDialog(parentWidget());
+	dialog -> setMinimumWidth(460);
 	dialog -> setWindowTitle(tr("Options d'impression"));
 	options_label = new QLabel();
 	use_full_page = new QCheckBox(tr("Utiliser toute la feuille"));
+	use_full_page_label_ = new QLabel(tr(
+		"Si cette option est coch\351e, les marges de la feuille seront "
+		"ignor\351es et toute sa surface sera utilis\351e pour l'impression. "
+		"Cela peut ne pas \352tre support\351 par votre imprimante."
+	));
+	use_full_page_label_ -> setWordWrap(true);
+	use_full_page_label_ -> setContentsMargins(20, 0, 0, 0);
 	fit_diagram_to_page = new QCheckBox(tr("Adapter le sch\351ma \340 la page"));
+	fit_diagram_to_page_label_ = new QLabel(tr(
+		"Si cette option est coch\351e, le sch\351ma sera agrandi ou "
+		"r\351tr\351ci de fa\347on \340 remplir toute la surface imprimable "
+		"d'une et une seule page."
+	));
+	fit_diagram_to_page_label_ -> setWordWrap(true);
+	fit_diagram_to_page_label_ -> setContentsMargins(20, 0, 0, 0);
 	fit_diagram_to_page -> setChecked(true);
-	range_from_label = new QLabel(tr("Plage de "));
+	range_from_label = new QLabel(tr("Pages \340 imprimer : plage de "));
 	start_page = new QSpinBox();
 	to_label = new QLabel(tr(" \340 "));
 	end_page = new QSpinBox();
@@ -159,11 +174,14 @@ void DiagramPrintDialog::buildDialog() {
 	pages_layout -> addWidget(start_page);
 	pages_layout -> addWidget(to_label);
 	pages_layout -> addWidget(end_page);
+	pages_layout -> addStretch();
 	
 	QVBoxLayout *dialog_layout = new QVBoxLayout(dialog);
 	dialog_layout -> addWidget(options_label);
 	dialog_layout -> addWidget(use_full_page);
+	dialog_layout -> addWidget(use_full_page_label_);
 	dialog_layout -> addWidget(fit_diagram_to_page);
+	dialog_layout -> addWidget(fit_diagram_to_page_label_);
 	dialog_layout -> addLayout(pages_layout);
 	dialog_layout -> addStretch();
 	dialog_layout -> addWidget(buttons);

sources/diagramprintdialog.h

@@ -66,7 +66,9 @@ class DiagramPrintDialog : public QWidget {
 	QLabel *range_from_label;
 	QLabel *to_label;
 	QCheckBox *use_full_page;
+	QLabel *use_full_page_label_;
 	QCheckBox *fit_diagram_to_page;
+	QLabel *fit_diagram_to_page_label_;
 	QSpinBox *start_page;
 	QSpinBox *end_page;
 	QDialogButtonBox *buttons;