From 3c7c538d7ced7c0a3785521a50bd737a87ffe1fb Mon Sep 17 00:00:00 2001 From: xavierqet Date: Mon, 18 Aug 2008 20:18:18 +0000 Subject: [PATCH] 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.qm | Bin 55200 -> 56160 bytes lang/qet_en.ts | 101 +++++++-------------------------- sources/diagramprintdialog.cpp | 20 ++++++- sources/diagramprintdialog.h | 2 + 4 files changed, 41 insertions(+), 82 deletions(-) diff --git a/lang/qet_en.qm b/lang/qet_en.qm index f22ab3af80d9303dd5128a8bc84a42c545c658a5..a84fd5abcb393980f2d3fb794f04da17bf9cf7ea 100644 GIT binary patch delta 5381 zcmbW5d017|`p4fh?7h#~XL3RjhqhB9j}s_qh6oOYQ2Asx&Pe9M?ZV5z1O?md97p7 zZdKy}Rc<@aP$KG2)NvGJ&tqUD(E$TE6YLAlCz{d5WRGl@n9G! zlV(9+5ve^TMC(5x^@TA+HNO%Ur6fAm9b8IuychA+#n3f_gyI^=dCqw9IAi@z682&K zgdgL{`;7J9kZ_`$JmlKi@<5xqkk{RGqVR92lXo7`P=D&Sv^CMuE956DVChQ%eL^58 zpYgOnVTY@r&}ew; zkAG%7beB@^<`e1tD6M`Om_TXgONhEfGgccJPksc-mer@x(#Wq7zeTjR46*mvXj4QZ zQHNkEZG@}i$1|?;raeJ$`EGv@F|4*wWvZQMOaawK|3Va(PbcrcAR60=P8~qLoDQM- z6+T2$qv(s71Bmtq(>cvnqIWpDyu?YAT~Aj%I|mX~nds_ef1;qOINv<4GvwGfMH&iXKEZjY6t~;P?Kf@Gpdd z`SFU8-DeYd4^@n}xrru)Dkl476Ght;Q5O-~4mAo-)MY$`eW^$+e?-)M7-QLf#a!J! z#IUlZsi1`H)bk+iorgb>58YfGNH&3WxK3qqS(KBls>SUjz=j&mIf1bKBJtx zZ4Sz#gL2B2b||kel`$e**1d^wK$+6A_)EBWiZc5lLbs?)xzPZHLL!xgJK%}w>y=yk zK;h2b%E~QpeRL;fP1^<}3u|j$J4k4SX zl;8i3Z0)^4`D{`y(aR;u=U!KkM9Ua=Jy8X8dQ4=MRH56DtjqhW!c;~g-#MzVR6P-w z!5H|qYQllrL?gSXqPo=+wf|f-B_f?@N4;uhQ!R3>{Hbc@-|)Hfkmh*zgpK+*Uo>IFQw^o;tw3t0C`y!wMFZuE&z_0E-z$nJ-X zn{8kdnrA1*&7~l!Wd7?QJh%Be*o^w0zes){Dr^Tn#dtgTJJ?}!E=`w19zxvSJx3OnW3&<0foITF^>J3F={yI!HdNg*+j9A z`pofJNWLTLv+ZvXeRNcP>$Du>)#@kpW}=+=oLG%<+H$Vdi2$O06)=KnCsOXM^u{5`A+y0*?)_hn0^_a`i=|lVV_gIp!_B(;fA8_qa5lsmZtAxO1zR|7JMT)%PGI-Dcw zTEyMx2KjY|xaN!S$f6#MTh8#EZhb@aVX%ii?0m%cUyVbg=R6IyH;rH5eF$fPj$g>Dh=N=5i~LWa4|L@h zzvhMN7|CbI$MJ!;`0U;27bTzbD+eDZ+GgQb4?!#TRr7h7_fS?%{01*DW)QzI2OgEe z7!Pjdi$*<0=mznhym%X-uH$z-2R)JX{L#`mm>A1nHD{oFR`Ct3@`(yw;_t_HMZIt0 z?|W9l=UIYw>xXE?zJg)S8YE+g(7x&-EcO$+Jeq+VnI`mp5Q5|zCHNIBg}f!gkjOfe z=?o!Qhjp312q6P1h~CW;-rVhn(4H3F@>HPy*NDQn&zGS=+!YettBI1o6Kub7uy~a) z|Bw>L@C6}lD!A^kkdX#O+M0yy+<`c>t_ivA_ae)m3%S=riB>Kb*2v>3r?CD$lFVBz zY}3F)ULP_pUdgyMTiC9GXHL$MiTbY(6UzGSC-VP8IM}^Ek+EJld;!U_WxjB3!9ED? zBV6t_7^h>laCsmsb$=n;PKP1^dxfUqE?C@7c-Y>Gtj^OYH^QZ(f6;W%O-2&-(*))g z5q9%Fn&~-iq77A=6*GNs znT^qUIs_rfj9P7nIonXz-)o25!iRae+VI$NB$a}3Te)^oDjXOWr_Ijikd(8u1$uZ! zy_8XVhH-EWW8Emm6VDh==V?p7EJA2r)_(Hn7!D=1_Ha)aG&IAbJr@I)i*D`p0oRCT zk;sIPMEo3}+Ry6*&1C}(1T}~ndsX?OD?*y)5 z(PH=2!*O#8U@TRL5q&;INPWZ^*B%j-w-INbm%l$R#`Z-hD?M+BaT&LX20jy$lH`dd zG5HT8G_;A1zr!QlKV%$W7E_<1Jkx&^-*1E5cx8i_GjB0sT_xr?!BGX`ic%!qkwM}I zUz8B_2xIgQ6N{#!uLQp#?yxHn+BxFR0)*frt60Wi-V`R2!u6x)j5cR+5itgu2cyV-%?&;TvVY*89 zY#oxMy_0cyo}R{ki=RyqdS&V?C>W`4b@vWBq+LHqc#NDl%6Q135A=Nw*LKzqE4YB4 zbXNVywqxMAuk=%vz>usB`sqr?cNyHJjb9s0Yo1K{F(#uAUd z$!`=*+tA}`#Aiy7Ak=$n6-jZoI;n>`QUy5foYr?O=y>h-@jUdHM6D`Q!bL8ybK zx{Zd;-=*W4KF-kl02F;c)zBxf1RK6&=vPsQYxicuh-k=}_%}mnyT?QsO@>jcz~l(S z=&3*9rnH-}@DTVb#*JVzE;4-#p3yNHJj56xD=(sau7Q{E1EY^&N_$knn^z3eR`)xUr3KFjos# z?==Rkbl@kGmoan|%4T?k(Yza;`5@GoT#JppcN^zf6N!@A8eQ3waLYYpeCI4;?|jd= zPaHddPn@+qg=)gNw&f#$BFQjpYwMMKAAYJW|{f8uP}lS0MKMFUC7*^Kj_g zGJgLBEbdWgyt{ZP8dL=1@`uK|&m)NLD#8cj=sph;qhDQjK9~`RtO+PQU<9|eQOwWCSQ8mv@f5_bU7o5pw zgnc7h&o)lQTE2UsG45N6AY?O>-g!A#YbGSLd;*=UCYqH&8 zO}03sVUj%wb5fi|$~)J!bKq?ni&e6;M97il+91<~XB(tSf6m3?t%YJ~F8+<9zIhGl z-X6Ss2d|UxN21wyAz^vqpX#s=Wnm7?TkxMhcBr0$#j=2ZC?AjYu9lH3{@;x;Lt@gO zGTo37kJYg)V_S>5X7b3}$(ASl`Judl?3@1ow0_xSs}yT-xh#^+?y}laB#YA}#oA&M zn=E~$B#Y$4Q?gldS{!D{oZv90#91YqTXHnH98IxS*+uc@@3E{=a#)h>NmhsCvbiBG z32WSa9P#E@%b$)l&xW|T-tH8OWN}F{oEA5x>~M8|__>ou@$&!T=>PDI89ubM_%j)% zI$*49z8o@nB>T^bxs(>4GcPlb%ku+VEg!yv0NMVFV_Edw_zsKn6vNtj{*_zI&;7AQ z8WTE(-Y;K2?)LSkJ zi_?kB=r4`3K%(8^c1Z}H-RzX^xw<(Z+ikbo9IhrzIiysZ3sbC=%qcEQ|9$6Px^(dW E0K9iWk^lez delta 4490 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 diff --git a/lang/qet_en.ts b/lang/qet_en.ts index aa01005db..cc1a7c341 100644 --- a/lang/qet_en.ts +++ b/lang/qet_en.ts @@ -1,6 +1,5 @@ - AboutQET @@ -255,35 +254,45 @@ DiagramPrintDialog - + Options d'impression Print options - + Utiliser toute la feuille Use full page - + Adapter le schéma à la page Fit diagram to page - - Plage de - Range from - - - + à to - + Nombre total de pages : Total pages count: + + + Si cette option est cochée, les marges de la feuille seront ignorées et toute sa surface sera utilisée pour l'impression. Cela peut ne pas être supporté par votre imprimante. + 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. + + + + Si cette option est cochée, le schéma sera agrandi ou rétréci de façon à remplir toute la surface imprimable d'une et une seule page. + If this option is checked, the diagram will be shrinked or expanded to fit the printable surface of a single page. + + + + Pages à imprimer : plage de + Pages to print: from + DiagramView @@ -337,31 +346,6 @@ Propriétés du schéma Diagram properties - - - Dimensions du schéma - Diagram size - - - - Colonnes : - Columns: - - - - × - × - - - - px - px - - - - Hauteur : - Height: - Éditer les propriétés par défaut des conducteurs @@ -387,11 +371,6 @@ schema diagram - - - Lignes : - Rows: - ElementDeleter @@ -1057,36 +1036,6 @@ Changes will be permanent. Nouveau schéma New Diagram - - - Dimensions du schéma - Diagram size - - - - Colonnes : - Columns: - - - - × - × - - - - px - px - - - - Hauteur : - Height: - - - - Lignes : - Rows: - NewElementWizard @@ -1469,11 +1418,6 @@ Available options: Afficher Display - - - Agrandir le schéma - Expand the diagram - Agrandit le schéma @@ -1869,11 +1813,6 @@ Available options: Restaure le zoom par défaut Restores default zoom level - - - Rétrécir le schéma - Shrink the diagram - Rétrécit le schéma diff --git a/sources/diagramprintdialog.cpp b/sources/diagramprintdialog.cpp index df210b194..6118d527e 100644 --- a/sources/diagramprintdialog.cpp +++ b/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); diff --git a/sources/diagramprintdialog.h b/sources/diagramprintdialog.h index 6fe128608..c2c8ee6b6 100644 --- a/sources/diagramprintdialog.h +++ b/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;