From 5b6bea060158ccb7fae0d7c372de6aa135aaf5c7 Mon Sep 17 00:00:00 2001 From: xavier Date: Mon, 26 Dec 2011 05:42:48 +0000 Subject: [PATCH] Title block template editor: implemented "Save as" action. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1410 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- lang/qet_ca.ts | 87 +++++++++---- lang/qet_cs.ts | 93 ++++++++++---- lang/qet_de.ts | 41 +++++- lang/qet_en.qm | Bin 111362 -> 111995 bytes lang/qet_en.ts | 93 ++++++++++---- lang/qet_es.ts | 93 ++++++++++---- lang/qet_it.ts | 93 ++++++++++---- lang/qet_pl.ts | 93 ++++++++++---- lang/qet_pt.ts | 93 ++++++++++---- lang/qet_ro.ts | 85 +++++++++---- lang/qet_ru.ts | 85 +++++++++---- sources/elementspanelwidget.cpp | 2 +- sources/titleblock/qettemplateeditor.cpp | 70 ++++++++++- sources/titleblock/qettemplateeditor.h | 11 +- sources/titleblock/templatelocation.cpp | 71 +++++++++++ sources/titleblock/templatelocation.h | 45 +++++++ .../titleblock/templatelocationchooser.cpp | 118 ++++++++++++++++++ sources/titleblock/templatelocationchooser.h | 54 ++++++++ 18 files changed, 984 insertions(+), 243 deletions(-) create mode 100644 sources/titleblock/templatelocation.cpp create mode 100644 sources/titleblock/templatelocation.h create mode 100644 sources/titleblock/templatelocationchooser.cpp create mode 100644 sources/titleblock/templatelocationchooser.h diff --git a/lang/qet_ca.ts b/lang/qet_ca.ts index 88faf97bf..40f078084 100644 --- a/lang/qet_ca.ts +++ b/lang/qet_ca.ts @@ -1194,8 +1194,8 @@ Les changements seront définitifs. - Importer un nouveau modèle - Importar un nou model + Nouveau modèle + @@ -4071,137 +4071,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry - + + Enregistrer sous + menu entry + + + + &Quitter menu entry Sortir - + &Configurer QElectroTech menu entry Configurar QElectroTech - + À &propos de QElectroTech menu entry Quant a QElectroTech - + À propos de &Qt menu entry - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit - + Ctrl+K shortcut to merge cells - + Ctrl+J shortcut to split merged cell - + Permet de régler différents paramètres de QElectroTech status bar tip - + Affiche des informations sur QElectroTech status bar tip - + Affiche des informations sur la bibliothèque Qt status bar tip - + &Fichier menu title Fitxer - + &Édition menu title - + &Configuration menu title Configuració - + &Aide menu title Ajuda - + Aucune modification label displayed in the undo list when empty Cap canvi - + Annulations dock title Anulacions - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title - + %1 - %2 window title: %1 is the base window title, %2 is a template name %1 - %2 + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5438,6 +5450,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_cs.ts b/lang/qet_cs.ts index e5cfb4b82..2f5608bc0 100644 --- a/lang/qet_cs.ts +++ b/lang/qet_cs.ts @@ -1166,11 +1166,6 @@ Provedené změny budou konečné. Abaisser ce schéma Posunout tento výkres dolů - - - Importer un nouveau modèle - Zavést nový vzor - Éditer ce modèle @@ -1233,6 +1228,11 @@ Provedené změny budou konečné. Propriétés du projet Vlastnosti projektu + + + Nouveau modèle + + Déplacer dans cette catégorie @@ -4077,137 +4077,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Uložit - + + Enregistrer sous + menu entry + Uložit jako + + + &Quitter menu entry &Ukončit - + &Configurer QElectroTech menu entry &Nastavit QElectroTech - + À &propos de QElectroTech menu entry &O QElectroTechu - + À propos de &Qt menu entry O &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Umožní pro QElectroTech stanovit různé parametry - + Affiche des informations sur QElectroTech status bar tip Zobrazí informace o QElectroTechu - + Affiche des informations sur la bibliothèque Qt status bar tip Zobrazí informace o knihovně Qt - + &Fichier menu title &Soubor - + &Édition menu title &Úpravy - + &Configuration menu title N&astavení - + &Aide menu title &Nápověda - + Aucune modification label displayed in the undo list when empty Žádná úprava - + Annulations dock title Zpět - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectroTech - Editor vzoru vloženého rámečku - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5448,6 +5460,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_de.ts b/lang/qet_de.ts index 52e4633c6..cc44fb02e 100644 --- a/lang/qet_de.ts +++ b/lang/qet_de.ts @@ -1006,10 +1006,6 @@ Die Änderungen sind endgültig. Vous pouvez utiliser ce gestionnaire pour ajouter, supprimer ou modifier les catégories. Sie können die Verwaltung verwenden um Kategorien hinzuzufügen, löschen oder zu bearbeiten. - - Importer un nouveau modèle - - Éditer ce modèle @@ -1032,6 +1028,10 @@ Die Änderungen sind endgültig. Ouvrir un fichier élément + + Nouveau modèle + + EllipseEditor @@ -3433,6 +3433,16 @@ Que désirez vous faire ? menu title &Hilfe + + Enregistrer sous + menu entry + Speichern unter + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -4449,6 +4459,29 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + Projet parent + used in save as form + + + + Modèle existant + used in save as form + + + + ou nouveau nom + used in save as form + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_en.qm b/lang/qet_en.qm index 09d4f48f4b5d5d10b8d6c39eba93c6a6d4da82d4..500b2e6377dba839262cb14f22394a0ef6ee3027 100644 GIT binary patch delta 8217 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 delta 7865 zcmXAud0b8DAIHDXy=S@i+;i`xL^4_sX)GhM%qV0+_M(RDvJ`DnjiPP|DTcUWEF)Xi z$W~diWXl$^|Hztsl&mrG`*hDAz20{@_nhZ>zMt>fw^zdKXF^6jlPwWB6ASMT`VwtF z4-O^Phk;{2M{owwavc~4{sP`2lIIbr9uo7cAQJJtTu0&fSPNOiMWQCj#AbXVYJu+~ zE)%)96Z7aw)F*}5%m||Xn~0ev-o=Yu#D<0w`Hv!+XJ;XcehqHIf?f~>?k6@0HwsQ6 zYWJ&!tZzr6m{G)hakJsmiTH-ZzI-LBf09(8V~KS&lPU!pvtL1~`7`j~Y=sME6L-a% z*f1~RUYsHmOVASU{(x9Q9`OMxd=U=L!2>nKmtvg<+K>?!)K7dWBPB6^7fBczhzUAtfZ9-bHkLq{1&@wKNgy|CJ%Ro#vldCD4X!jw7 zZ#^tzZe`@wvO5-ZLE+T*)VupfoN5g9F6d3{kF(V0kf{(arjn0KPw;Q@3Bl2H-%LK~ zS|Zcm)PFOMd+9 z!~$(;(*HuBm8TRu(3wbEmqM^$YB#|`)^`L&9>(w2rc>06BQVtlimJi)ZogZ|`d^~h z`B?DnKPmPFo?9oAO!38Y@!}fA<3Z$BZXp}8nM|8*6A9PJd>fxP7ijs;p+x8FP}XtS zcuE#+eyAea^FM_ZP8PEEPiWhJ*jYnI+TLL$yrTo{dLBtE=p60tI)|w75ewN*3u(_9 zn7ZvM6YafTPHbWtC%|C#CpD_%bE>DCzjFW9c9EOjHXg2T<_75ZkEE7 z*#g}zEFyYj@}_%k+o0~zbT7LZQCTrPiBiM$kI=u<4-nnmU?DRWDC`_URb8>*UhnDC z@^E6BYWh6>Ad&Su#`a-Ht#>i58g3domhr{!h*G|RRYY_8GBG-W7}tUs&fp{*J2Quc zO|h}Vy_w?y`0t&a?3V*CA*KtgT^9WQb)h9%Eij#^VUR*?@=`qKvL=h-(^A z<`foCS{HHSDhuBAo~VO|g{)CeHdVI|;%&^P){G`vkibGGFa)$z7B2 z^E+75e0yRp7g>5Rc3ihEGpiwv=wY_^e>p^4 zFx&eDk+HyDVO4W>YSBQVxg%N0$y#?!XIDCw5KHG-sV^2{zl`0wZ zX7_dn5z{|q_bQ-)(jxZQ9^o-7kX3FeBDUZldl!fu>SnR8f1ZXYUD?+svvC6X>_3-{ z#2h-RGz5GFu^qNB$%&i?g|b#pmN!>7NOj%>afY= zM>Nq*)qRd9QL98%56u{&l`U06HbH#DvsJ^^*CW>IZ&jeQfylkT!U5w|6O$muRDV_Q zM}+N`{Z%sz$O8$NR0*OxM0`s%|K46=0r{%5%50)@eN?M-JBaees@CWc0V97=Wo?HB zHk(vCO;_!Se!i$Wupa8otgkBkWg@XAH&n;92*D95)p2WtTrZRAcrirUV2|pAwTkFP zwuQ`UrRwA!M8;zY3coN5S;rr$Q%xrjfVX9II$|#vrf=} zp;XoO`8TZiw;I)Vn;S&!tu17BdbO$=8Zez#>w8Rq+x1u1ZT|-XP`uegY+!1lZl4W{ z&lsTY6DuPO-BuVlP(3jJDbciQb%0Yb(VG40VZMpP>KCZTygW(lCx7*r*Wl3Z>Pb(v z2>2=L$@ifYn>cmwR)nnyH`Srxg+%e;>acVyZ_!S5_^vLv&PF}m3C{W|NFCQ0$}#;} zpq{x42b1!L`=79&WQD`utJe%S5RDzE{-?JCvE-5Jb^LTV zZ=ibfJs3QprFyF`&a4(jvgGl_Z6RzKtst{&K{-`HU%y}onWweCp57dYvvHPO}zPVWwb z-S^`3xsQpAJ2-=Ag;chmGZuYB0?1N0z9DCu`W8y+!Z}ST#dSkD=Zq{U^FOZL&2sq6 z1V^sp*%VlEHRrt!@sC~SymPR#e)GBEpE+VQjGLTvn`qY~Zd#8*VzINhC?_QMG&^p3 zS2Z!G3NCifNus^4xi|s5Io3kf)Sipmj0K0!_!958E3B#IN1~cXAe{K*4TV2!!LLL`WFhOck=tQf^bH?$!Ux|_J(Pq0;e9x_ zV=;=hqHKjf23g2Dw*X<|AM-$%>{Nw?OcerRfvR;}j_w+yeTB=Za3zvjDh%9cAv68Q zH zb0?RaBD!YH6)(hXdQ4Low^U*34TZ}(TgdoWg(EL1OuoaNFB(g1#8a*$b{PyXhAW+n z1ZIjD#g*P%1lNt^ZXbj}W<_yN&fx&_u5hoKKr(zJSCxwdB|PUo7mq_?)AP&J8&n`=M!;&1tbVS`OULm0)6IGLWHhnp1$>>;Ztw{s-*7bE^DcbDM6mxT z-fqE4%YU>t1*x81tu#3Wv1s1Yyb@_mKhze#cA7Gw^AXdgtst>9A zFXKZx$G`_>`_;Zcn6ATz?rx8&#>+xx_=yiK#sc<@QCMN-BeZ2iU7qmM8jdEKDf6+< z9wQTeQde zGr!>PHn>dGW+-3ggy&9P!#~TKix%M$|K{^zVxx=s>Z{o3*+L7MI)VS5jOgR~QP5c9 zx)Cb{*&PMA^h;ksuW5y1=d3wQZ*S_gS!nd+4$;dj3t59lLfaSp$GzaDrBsf3#W2U7M65E>C$zwV4nSoXi|ufX`YUz%u85p zgZCR739D1!M9!xKOH^#P%0kw6p|Gy!M@Y7Xu-Ofk>-$OAR^t!t9}{-Cp#}2&EaZI0 z`=zIZz0ry2B(Dm2ot%jEULqXy_yI}p5RQ-uU(}5ej%=QSAO0>}?m7qyxgeA@g2{S3 z5^j!5Mp(5M%BnUHb3HFSK=n@_ZH0%=T!@*Sg*QR=$b3I5d^^oT*1oau#g7`x~`jp4J3-4hMpq2@mB1b z5RYhaQ}oo~{+E)(?rrx#n{C8CMVaU-L&Uzhu0$FKQS4{J7cZ>M`Z^6v&f?VWz9_p_ zf_~slF+3GNf1NKzeBxozGh)>2Je1>i#2E)w=)e+0ODxEGCdLoP`^ro)sq0;0sTJbv zFe4Q6UCgMDC|S3Im~p=c(bIBqNh*{j_YjxXe(pC;G%pMyHvhc1Tz-P^9L~gApJ#sO z#7!E6*;U~RFFd!9am&T6YG-s(jtavH#jO?a~&er>h0=kF=P1+D^(M3FT1yNT0 zvv^9bM{KH73i z=>f_0J14#^z(KCQFIIT3$NSG>W&IGM^7k6m8h<$DVNHXHr-@ldY3zfq!}+2$E;+by zuPK_=>EmG_YmFO}Lw$oRWNs@p?T zPu7MX7lmKCXhx-DiJuLcuw*ocjkjnbc9x?pKCf_CxhDBl5YZVA&Fb+@iR|iX{vl7I z>O{@vEZk@E2F>o_I1;}vn*0&at`wqBzfNJ`a|>C(YlWuChRgjmSME5&20aALwH|dbacHf%ll7Kp*%Zy)+Yo(Iz2@F> zoZ0kC7P9bT3Ks`!?yWt9#zE4Qt-?ZHRA?Tx!j9w4Y922~+&WUBRUg8Ao;|RTS+&)Q z2Nt2B_@I?$+Yznz(&}$QJWWHj#sO83=a>YuhjjzfU)ly!HlZx`)V9kWNYpc2>xTIS zTiQ(9e)(}^)Xv)9wt1tmO452(!$1RmX!~hz5c_4Gc5u)x_~;4?nWnXNCxy3{?Wd;5e3f;)4o>qBsRN| zw#o}eU)@Uk-YHpF*Z|*mYNpWV zuw*cdL&4Y1PBOgRj;`mhWL5tyQAum5@fpbVgsZ~uha|_=aI6?-smT%#H2O6bGNZNB zJoOO@%Sy?$Z8_Xzufl3Ua=T-Liur@o-Q9|qQ-8^~B@XM8wd7lctQnIpjlTPySflmQ zn8$@s*}uD`@g=nn9Idd%Lz+PTXxhr93CT|(OD0Xsfw@ES6o$#t)aQ@U?9H)|+0B;1 zei(?h_)Af*A(IX(6!t$RML%9btlcds_G>ax@nR`C?Gh%7N2OG&l|tO~`SEoH!Nc1&P z*XTe843ISnSI<@W;EJws8|=Idm;)&%{H}BOiu4>)s&mHhj&6U@IhP|#g#V*!9*hOO z3(z&MO|vaO=-h_AN8cEr>%MLn#LDS8|C zUFe-AC?u9CtT?BOb884!OxMMYg%#4*`ix84WaC@ zS+{Wa1I*oC>sC&O*ao)ItvwIX_Fbi0XT~J@wQM147^Lvm!6seKTI{S_v@ZYpHq?&4 zDV&?CJCs{Z6sFZ3vEGE*a-8m%M-WctobF;b9{pl(-KEf77}^}xUDII4A4+wlN3X+8 zx9DExFD7c%NLN|M9l`&puId`xbg-cNFkvEMZhhU?+ow^iuhsqcH-bQ;E``dAp}`6t zww7tYJ)-o1vMP2gx`W5Ex)36b-yqj{QI3iyM6T}!Z&*^_oN4P|Y9+h7d?)%hNbWuZ z)q`r1>}Bl@C8f*#*ZRZhCdz)DmJy3;D+l!QB1$}BAxjIAho#`W{x?}3F%!#ddQu)0 zfbEUUlY=svAw^Wk!7hk8ZHnaJlo(8Q^5syMN65N=$g!8(Aickl;~y=9y)OJF&kV2gv`D!QFDa>`m5v|yjYs>AYMW?a{-T+T4!x`wUg%(P5IiN5BTh7P7{ za?Wfd4*wE4Cmo3;YOaNBadSD(CLLASE%{(gdpJgYxmbpkMv=lf9`c2RCx|Iwa>=T_ zNH8N5e)wCyGTuzI!EC|2rNF*{`r-q=l?QOZjUotQGu2{`RmG zv8mcZX7^40Z*nsT{jFTn7S)Drxn4Yl^Q$Xf^U-gb?P*;V8 znfjleC1NbOqbG++iAv6AAK5geoL5Q{z5jKbSF``= zhtXSOw*5UQ^b1zMUUUT&sbM_JIFjc>)#W13XYJGv-Moa_t=nrtU z50v!h&uv6*zN5eT0TJ!uEqz)0W$4~jxAf&A{OHpWefjxBVpdP|FB@cIf^}X0?*oL& z0hjdeim#(?%~5zOP5*H{&halv|2a;J;>|^0vkbqVYpw8@yTZ@o4b*Wsa{d#8`Uw1d z$Y+D$s6WxLE`|>LN%R4I4P6&Sncz8(3_TKXq-om>Jr*BC5w+dWZy_Z7TOGr=Tv+(Y zYC~8XguZZZ!!#>@v`n21(?WuY4)`g2A7~+S-(iSO^Fxc&+7Nr7h*;Z+hCeTQV85TQYf<-UO@uD1(YN7DwBEypP)<|nrhUGuu2Rqgp zR`-H7o);Kan?V2DhBYa!*x72sKd-SMr*(#P-R9zd8)FSywm!yiwt->m+8B(nwT7MZ zVe?TR4ZAAxFi_cV*pCpyTJPu9rrW#M2{_U(+S;e#;od1>UhmWWXwj3&cH8>lwNSTAWmMns{;rngbA zX;v#79%FPbf(e#n8ab?6wjQJW#3d{TB;a$Dzg^bLS#9e>HkP#`T8^ zjJ+%Kh&2r~`V5(lsIuJX-=l=6-UH(wzR~Di^d@8YF|71(i81^dhdkWeLS`GRu$9(0 z{lpq1_-@A7wJIECKV$5DD+GPnIMeYmQJ;>+WDT^jJKQ*b+A7p|b&LzXI}_ Abaisser ce schéma Move down - - - Importer un nouveau modèle - Import a new template - Éditer ce modèle @@ -1233,6 +1228,11 @@ Changes will be definitive. Propriétés du projet Project properties + + + Nouveau modèle + New template + Déplacer dans cette catégorie @@ -4074,137 +4074,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Save - + + Enregistrer sous + menu entry + Save as + + + &Quitter menu entry &Quit - + &Configurer QElectroTech menu entry &Configure QElectroTech - + À &propos de QElectroTech menu entry A&bout QElectroTech - + À propos de &Qt menu entry About &Qt - + &Fusionner les cellules menu entry &Merge cells - + &Séparer les cellules menu entry &Split cells - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Allows to specify various parameters for QElectroTech - + Affiche des informations sur QElectroTech status bar tip Displays informations about QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip Displays informations about Qt library - + &Fichier menu title &File - + &Édition menu title &Edit - + &Configuration menu title &Settings - + &Aide menu title &Help - + Aucune modification label displayed in the undo list when empty No modification - + Annulations dock title Undo - + Propriétés de la cellule dock title Cell properties - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectroTech - Title block template editor - + %1 - %2 window title: %1 is the base window title, %2 is a template name %1 - %2 + + + Enregistrer le modèle sous + dialog window title + Save template as + QFileNameEdit @@ -5442,6 +5454,33 @@ Que désirez vous faire ? Cell edition: %1 + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + Parent project + + + + Modèle existant + used in save as form + Existing template + + + + ou nouveau nom + used in save as form + or new name + + + + Nouveau modèle (entrez son nom) + combox box entry + New template (enter its name) + + TitleBlockTemplateLogoManager diff --git a/lang/qet_es.ts b/lang/qet_es.ts index 3432d38d1..6dcc0d4fd 100644 --- a/lang/qet_es.ts +++ b/lang/qet_es.ts @@ -1192,11 +1192,6 @@ Los cambios no podrían ser revertidos. Abaisser ce schéma Bajar este esquema - - - Importer un nouveau modèle - Importar un nuevo modelo - Éditer ce modèle @@ -1239,6 +1234,11 @@ Los cambios no podrían ser revertidos. Déplacer dans cette catégorie Mover en esta categoría + + + Nouveau modèle + + Copier dans cette catégorie @@ -4076,137 +4076,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Guardar - + + Enregistrer sous + menu entry + Guardar como + + + &Quitter menu entry &Salir - + &Configurer QElectroTech menu entry &Configurar QElectroTech - + À &propos de QElectroTech menu entry &Acerca de QElectroTech - + À propos de &Qt menu entry Acerca de &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Permite arreglar los párametros de QElectroTech - + Affiche des informations sur QElectroTech status bar tip Mostrar las informaciones sobre QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip Mostrar las informaciones sobre la biblioteca Qt - + &Fichier menu title &Archivo - + &Édition menu title &Editar - + &Configuration menu title &Preferencias - + &Aide menu title A&yuda - + Aucune modification label displayed in the undo list when empty Ninguna modificación - + Annulations dock title Anulaciones - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectroTech - Editor de modelo de cartucho - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5444,6 +5456,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_it.ts b/lang/qet_it.ts index e930dd6c4..23912cea7 100644 --- a/lang/qet_it.ts +++ b/lang/qet_it.ts @@ -1160,11 +1160,6 @@ I cambiamenti saranno irreversibili. Abaisser ce schéma Abbassare questo schema - - - Importer un nouveau modèle - Importare un nuovo modello - Éditer ce modèle @@ -1227,6 +1222,11 @@ I cambiamenti saranno irreversibili. Propriétés du projet Proprietà del progetto + + + Nouveau modèle + + Déplacer dans cette catégorie @@ -4068,137 +4068,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry Salvar&e - + + Enregistrer sous + menu entry + Salva come + + + &Quitter menu entry - + &Configurer QElectroTech menu entry &Configura QElectroTech - + À &propos de QElectroTech menu entry - + À propos de &Qt menu entry A proposito di &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip - + Affiche des informations sur QElectroTech status bar tip Mostra informazioni su QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip - + &Fichier menu title &File - + &Édition menu title &Edita - + &Configuration menu title &Configurazione - + &Aide menu title &Aiuto - + Aucune modification label displayed in the undo list when empty Nessuna modifica - + Annulations dock title - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectrotech - Editor di modelli di cartiglio - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5436,6 +5448,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_pl.ts b/lang/qet_pl.ts index 7961564a6..7eba5cfa2 100644 --- a/lang/qet_pl.ts +++ b/lang/qet_pl.ts @@ -1169,11 +1169,6 @@ Zmiany zostaną zapisane. Abaisser ce schéma Przenieść w dół - - - Importer un nouveau modèle - Importuj nowy szablon - Éditer ce modèle @@ -1236,6 +1231,11 @@ Zmiany zostaną zapisane. Propriétés du projet Właściwości projektu + + + Nouveau modèle + + Déplacer dans cette catégorie @@ -4081,137 +4081,149 @@ Co chcesz zrobić ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Zapisz - + + Enregistrer sous + menu entry + Zapisz jako + + + &Quitter menu entry - + &Configurer QElectroTech menu entry &Konfiguracja QElectroTech - + À &propos de QElectroTech menu entry &O QElectroTech - + À propos de &Qt menu entry O &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip - + Affiche des informations sur QElectroTech status bar tip Wyświetla informacje o QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip - + &Fichier menu title &Plik - + &Édition menu title &Edycja - + &Configuration menu title &Ustawienia - + &Aide menu title &Pomoc - + Aucune modification label displayed in the undo list when empty Bez zmian - + Annulations dock title Cofnij - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectroTech - Edytor szablonów tabliczki rysunkowej - + %1 - %2 window title: %1 is the base window title, %2 is a template name %1 - %2 + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5452,6 +5464,33 @@ Co chcesz zrobić ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_pt.ts b/lang/qet_pt.ts index 296d3cdae..f689774e4 100644 --- a/lang/qet_pt.ts +++ b/lang/qet_pt.ts @@ -1166,11 +1166,6 @@ As alterações serão definitivas. Abaisser ce schéma Descer o esquema - - - Importer un nouveau modèle - Importar um novo modelo - Éditer ce modèle @@ -1233,6 +1228,11 @@ As alterações serão definitivas. Propriétés du projet Propriedades do projecto + + + Nouveau modèle + + Déplacer dans cette catégorie @@ -4074,137 +4074,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Guardar - + + Enregistrer sous + menu entry + + + + &Quitter menu entry &Sair - + &Configurer QElectroTech menu entry &Configurar QElectroTech - + À &propos de QElectroTech menu entry &Sobre QElectroTech - + À propos de &Qt menu entry Sobre &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Permite especificar vários parâmetros para QElectroTech - + Affiche des informations sur QElectroTech status bar tip Apresenta informações sobre QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip Apresenta informações sobre as bibliotecas Qt - + &Fichier menu title &Ficheiro - + &Édition menu title &Editar - + &Configuration menu title &Configurações - + &Aide menu title &Ajuda - + Aucune modification label displayed in the undo list when empty - + Annulations dock title Desfazer - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title QElectrotech - Editor de modelos de moldura - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5442,6 +5454,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_ro.ts b/lang/qet_ro.ts index 98fff84c0..e9ad3f4a8 100644 --- a/lang/qet_ro.ts +++ b/lang/qet_ro.ts @@ -1197,7 +1197,7 @@ Modificarea va fi definitiva. - Importer un nouveau modèle + Nouveau modèle @@ -4076,137 +4076,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Salvare - + + Enregistrer sous + menu entry + + + + &Quitter menu entry - + &Configurer QElectroTech menu entry &Configurare QElectroTech - + À &propos de QElectroTech menu entry - + À propos de &Qt menu entry Despre &Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Permite reglarea parametrilor QElectroTech - + Affiche des informations sur QElectroTech status bar tip Afișează informații despre QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip Afișează informații despre biblioteca Qt - + &Fichier menu title &Fișier - + &Édition menu title &Editare - + &Configuration menu title &Configurare - + &Aide menu title &Asistență - + Aucune modification label displayed in the undo list when empty Nicio modificare - + Annulations dock title Anulări - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5446,6 +5458,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/lang/qet_ru.ts b/lang/qet_ru.ts index 7c8a73fb0..db2d64611 100644 --- a/lang/qet_ru.ts +++ b/lang/qet_ru.ts @@ -1198,7 +1198,7 @@ Les changements seront définitifs. - Importer un nouveau modèle + Nouveau modèle @@ -4076,137 +4076,149 @@ Que désirez vous faire ? QETTitleBlockTemplateEditor - + &Enregistrer menu entry &Сохранить - + + Enregistrer sous + menu entry + Сохранить как + + + &Quitter menu entry &Выход - + &Configurer QElectroTech menu entry &Настройка QElectroTech - + À &propos de QElectroTech menu entry &О программе - + À propos de &Qt menu entry О &библиотеке Qt - + &Fusionner les cellules menu entry - + &Séparer les cellules menu entry - + Ctrl+Q shortcut to quit Ctrl+Q - + Ctrl+K shortcut to merge cells Ctrl+K - + Ctrl+J shortcut to split merged cell Ctrl+J - + Permet de régler différents paramètres de QElectroTech status bar tip Позволяет завать различные параметры QElectroTech - + Affiche des informations sur QElectroTech status bar tip Отобразить информацию о QElectroTech - + Affiche des informations sur la bibliothèque Qt status bar tip Отобразить информацию о библиотеке Qt - + &Fichier menu title &Файл - + &Édition menu title &Правка - + &Configuration menu title &Настройка - + &Aide menu title &Справка - + Aucune modification label displayed in the undo list when empty Нет изменений - + Annulations dock title История - + Propriétés de la cellule dock title - + QElectroTech - Éditeur de modèle de cartouche titleblock template editor: base window title - + %1 - %2 window title: %1 is the base window title, %2 is a template name + + + Enregistrer le modèle sous + dialog window title + + QFileNameEdit @@ -5446,6 +5458,33 @@ Que désirez vous faire ? + + TitleBlockTemplateLocationChooser + + + Projet parent + used in save as form + + + + + Modèle existant + used in save as form + + + + + ou nouveau nom + used in save as form + + + + + Nouveau modèle (entrez son nom) + combox box entry + + + TitleBlockTemplateLogoManager diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index 7819d0b7f..f3ad0db03 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -68,7 +68,7 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce sch\351ma"), this); prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce sch\351ma"), this); prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce sch\351ma"), this); - tbt_add = new QAction(QET::Icons::TitleBlock, tr("Importer un nouveau mod\350le"), this); + tbt_add = new QAction(QET::Icons::TitleBlock, tr("Nouveau mod\350le"), this); tbt_edit = new QAction(QET::Icons::TitleBlock, tr("\311diter ce mod\350le"), this); tbt_remove = new QAction(QET::Icons::TitleBlock, tr("Supprimer ce mod\350le"), this); move_elements_ = new QAction(QET::Icons::MoveFile, tr("D\351placer dans cette cat\351gorie"), this); diff --git a/sources/titleblock/qettemplateeditor.cpp b/sources/titleblock/qettemplateeditor.cpp index 456bfde8d..413ec2d0f 100644 --- a/sources/titleblock/qettemplateeditor.cpp +++ b/sources/titleblock/qettemplateeditor.cpp @@ -22,6 +22,7 @@ #include "templatecellwidget.h" #include "templatecommands.h" #include "templateview.h" +#include "templatelocationchooser.h" #include "templatelogomanager.h" #include "templatecellwidget.h" @@ -46,6 +47,13 @@ QETTitleBlockTemplateEditor::QETTitleBlockTemplateEditor(QWidget *parent) : QETTitleBlockTemplateEditor::~QETTitleBlockTemplateEditor() { } +/** + @return the location of the currently edited template +*/ +TitleBlockTemplateLocation QETTitleBlockTemplateEditor::location() const { + return(TitleBlockTemplateLocation(parent_project_, template_name_)); +} + /** Edit the given template. @param project Parent project of the template to edit. @@ -101,6 +109,7 @@ void QETTitleBlockTemplateEditor::initActions() { QETApp *qet_app = QETApp::instance(); save_ = new QAction(QET::Icons::DocumentSave, tr("&Enregistrer", "menu entry"), this); + save_as_ = new QAction(QET::Icons::DocumentSave, tr("Enregistrer sous", "menu entry"), this); quit_ = new QAction(QET::Icons::ApplicationExit, tr("&Quitter", "menu entry"), this); configure_ = new QAction(QET::Icons::Configure, tr("&Configurer QElectroTech", "menu entry"), this); about_qet_ = new QAction(QET::Icons::QETLogo, tr("\300 &propos de QElectroTech", "menu entry"), this); @@ -118,6 +127,7 @@ void QETTitleBlockTemplateEditor::initActions() { about_qt_ -> setStatusTip(tr("Affiche des informations sur la biblioth\350que Qt", "status bar tip")); connect(save_, SIGNAL(triggered()), this, SLOT(save())); + connect(save_as_, SIGNAL(triggered()), this, SLOT(saveAs())); connect(quit_, SIGNAL(triggered()), this, SLOT(quit())); connect(configure_, SIGNAL(triggered()), qet_app, SLOT(configureQET())); connect(about_qet_, SIGNAL(triggered()), qet_app, SLOT(aboutQET())); @@ -141,6 +151,7 @@ void QETTitleBlockTemplateEditor::initMenus() { help_menu_ -> setTearOffEnabled(true); file_menu_ -> addAction(save_); + file_menu_ -> addAction(save_as_); file_menu_ -> addSeparator(); file_menu_ -> addAction(quit_); @@ -273,19 +284,72 @@ void QETTitleBlockTemplateEditor::updateEditorTitle() { } /** - Save the currently edited title block template back to its parent project. + Save the template as \a name within \a project. + @see QETProject::setTemplateXmlDescription() + @param project Parent project + @param name Template name */ -void QETTitleBlockTemplateEditor::save() { +void QETTitleBlockTemplateEditor::saveAs(QETProject *project, const QString &name) { + if (!project || name.isEmpty()) return; + QDomDocument doc; QDomElement elmt = doc.createElement("root"); tb_template_ -> saveToXmlElement(elmt); + elmt.setAttribute("name", name); doc.appendChild(elmt); + project -> setTemplateXmlDescription(name, elmt); + + parent_project_ = project; + template_name_ = name; +} + +/** + Save the currently edited title block template back to its parent project. +*/ +void QETTitleBlockTemplateEditor::save() { if (parent_project_ && !template_name_.isEmpty()) { - parent_project_ -> setTemplateXmlDescription(template_name_, elmt); + saveAs(parent_project_, template_name_); + } else { + saveAs(); } } +/** + Ask the user where he wishes to save the currently edited template. +*/ +void QETTitleBlockTemplateEditor::saveAs() { + TitleBlockTemplateLocation location = getTitleBlockTemplateLocationFromUser(); + if (location.isValid()) { + saveAs(location.project(), location.name()); + } +} + +/** + Ask the user for a title block template location + @return The location chosen by the user, or an empty TitleBlockTemplateLocation if the user cancelled the dialog +*/ +TitleBlockTemplateLocation QETTitleBlockTemplateEditor::getTitleBlockTemplateLocationFromUser() { + TitleBlockTemplateLocationChooser *chooser = new TitleBlockTemplateLocationChooser(location()); + QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + + QVBoxLayout *dialog_layout = new QVBoxLayout(); + dialog_layout -> addWidget(chooser); + dialog_layout -> addWidget(buttons); + + QDialog dialog; + dialog.setWindowTitle(tr("Enregistrer le mod\350le sous", "dialog window title")); + dialog.setLayout(dialog_layout); + + connect(buttons, SIGNAL(accepted()), &dialog, SLOT(accept())); + connect(buttons, SIGNAL(rejected()), &dialog, SLOT(reject())); + + if (dialog.exec() == QDialog::Accepted) { + return(chooser -> location()); + } + return TitleBlockTemplateLocation(); +} + /** Close the current editor. */ diff --git a/sources/titleblock/qettemplateeditor.h b/sources/titleblock/qettemplateeditor.h index 01dd6d52e..b32f8efec 100644 --- a/sources/titleblock/qettemplateeditor.h +++ b/sources/titleblock/qettemplateeditor.h @@ -20,6 +20,7 @@ #include #include "qet.h" #include "templateview.h" +#include "templatelocation.h" class ModifyTitleBlockCellCommand; class TitleBlockTemplateCommand; class TitleBlockTemplateCellWidget; @@ -48,7 +49,7 @@ class QETTitleBlockTemplateEditor : public QMainWindow { /// menus TODO QMenu *file_menu_, *edit_menu_,/* *paste_from_menu_, *display_menu_, *tools_menu_,*/ *config_menu_, *help_menu_; /// actions - QAction *save_, *quit_, *configure_, *about_qt_, *about_qet_, *merge_cells_, *split_cell_; + QAction *save_, *save_as_, *quit_, *configure_, *about_qt_, *about_qet_, *merge_cells_, *split_cell_; /// Parent project of the currently edited template QETProject *parent_project_; /// Name of the currently edited template @@ -70,6 +71,7 @@ class QETTitleBlockTemplateEditor : public QMainWindow { // methods public: + TitleBlockTemplateLocation location() const; protected: @@ -82,14 +84,17 @@ class QETTitleBlockTemplateEditor : public QMainWindow { void selectedCellsChanged(QList); bool edit(QETProject *, const QString &); void editLogos(); + void save(); + void saveAs(); + void quit(); private slots: + TitleBlockTemplateLocation getTitleBlockTemplateLocationFromUser(); void pushCellUndoCommand(ModifyTitleBlockCellCommand *); void pushGridUndoCommand(TitleBlockTemplateCommand *); void pushUndoCommand(QUndoCommand *); void updateEditorTitle(); - void save(); - void quit(); + void saveAs(QETProject *, const QString &); }; #endif diff --git a/sources/titleblock/templatelocation.cpp b/sources/titleblock/templatelocation.cpp new file mode 100644 index 000000000..aa1dbdf65 --- /dev/null +++ b/sources/titleblock/templatelocation.cpp @@ -0,0 +1,71 @@ +/* + Copyright 2006-2011 Xavier Guerrin + This file is part of QElectroTech. + + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . +*/ +#include "templatelocation.h" + +/** + Constructor + @param project Parent project of the title block template + @param name Name of the title block template within its parent project or collection +*/ +TitleBlockTemplateLocation::TitleBlockTemplateLocation(QETProject *project, const QString &name) : + project_(project), + name_(name) +{ +} + +/** + Destructor +*/ +TitleBlockTemplateLocation::~TitleBlockTemplateLocation() { +} + +/** + @return the parent project of the template, or 0 if none was defined +*/ +QETProject *TitleBlockTemplateLocation::project() const { + return(project_); +} + +/** + @param project The new parent project of the template, or 0 if none + applies. +*/ +void TitleBlockTemplateLocation::setProject(QETProject *project) { + project_ = project; +} + +/** + @return the name of this template within its parent project or collection. +*/ +QString TitleBlockTemplateLocation::name() const { + return(name_); +} + +/** + @param name The new name of this template. +*/ +void TitleBlockTemplateLocation::setName(const QString &name) { + name_ = name; +} + +/** + @return true if this location is null, false otherwise +*/ +bool TitleBlockTemplateLocation::isValid() const { + return(project_ && !name_.isEmpty()); +} diff --git a/sources/titleblock/templatelocation.h b/sources/titleblock/templatelocation.h new file mode 100644 index 000000000..6a9645b0c --- /dev/null +++ b/sources/titleblock/templatelocation.h @@ -0,0 +1,45 @@ +/* + Copyright 2006-2011 Xavier Guerrin + This file is part of QElectroTech. + + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . +*/ +#ifndef TITLEBLOCK_SLASH_TEMPLATE_LOCATION_H +#define TITLEBLOCK_SLASH_TEMPLATE_LOCATION_H +#include +class QETProject; + +/** + This class represents the location of a title block template. +*/ +class TitleBlockTemplateLocation { + // constructor, destructor + public: + TitleBlockTemplateLocation(QETProject * = 0, const QString & = QString()); + virtual ~TitleBlockTemplateLocation(); + + // methods + public: + QETProject *project() const; + void setProject(QETProject *); + QString name() const; + void setName(const QString &); + bool isValid() const; + + // attributes + private: + QETProject *project_; ///< Parent project of the template, if any + QString name_; ///< Name of the template +}; +#endif diff --git a/sources/titleblock/templatelocationchooser.cpp b/sources/titleblock/templatelocationchooser.cpp new file mode 100644 index 000000000..ad09f29a5 --- /dev/null +++ b/sources/titleblock/templatelocationchooser.cpp @@ -0,0 +1,118 @@ +#include "templatelocationchooser.h" +#include "qetapp.h" +#include "qetproject.h" + +/** + Constructor + @param location Initial location displayed by the widget + @param widget Parent QWidget +*/ +TitleBlockTemplateLocationChooser::TitleBlockTemplateLocationChooser( + const TitleBlockTemplateLocation &location, + QWidget *parent +) : + QWidget(parent) +{ + init(); + setLocation(location); +} + +/** + Destructor +*/ +TitleBlockTemplateLocationChooser::~TitleBlockTemplateLocationChooser() { +} + +/** + @return the current location +*/ +TitleBlockTemplateLocation TitleBlockTemplateLocationChooser::location() const { + return(TitleBlockTemplateLocation(project(), name())); +} + +/** + @return the currently selected project +*/ +QETProject *TitleBlockTemplateLocationChooser::project() const { + uint project_id = projects_ -> itemData(projects_ -> currentIndex()).toUInt(); + return(QETApp::project(project_id)); +} + +/** + @return the currently selected/entered name +*/ +QString TitleBlockTemplateLocationChooser::name() const { + int template_index = templates_ -> currentIndex(); + return(template_index ? templates_ -> currentText() : new_name_ -> text()); +} + +/** + Set the location displayed by this widget + @param location to be displayed by this widget +*/ +void TitleBlockTemplateLocationChooser::setLocation(const TitleBlockTemplateLocation &location) { + // we need a project id + int project_id = QETApp::projectId(location.project()); + if (project_id == -1) return; + + // attempt to find this project id in our project combo box + int project_index = projects_ -> findData(QVariant(static_cast(project_id))); + if (project_index == -1) return; + + projects_ -> setCurrentIndex(project_index); + + if (!location.name().isEmpty()) { + int template_index = templates_ -> findText(location.name()); + if (template_index != -1) { + templates_ -> setCurrentIndex(template_index); + } else { + templates_ -> setCurrentIndex(0); + } + } +} + +/** + Initialize this widget. + @param location Initial location displayed by the widget +*/ +void TitleBlockTemplateLocationChooser::init() { + projects_ = new QComboBox(); + templates_ = new QComboBox(); + new_name_ = new QLineEdit(); + + QMap projects = QETApp::registeredProjects(); + foreach (uint project_id, projects.keys()) { + projects_ -> addItem(projects[project_id] -> title(), project_id); + } + updateTemplates(); + connect(projects_, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTemplates())); + + QFormLayout *form_layout = new QFormLayout(); + form_layout -> addRow(tr("Projet parent", "used in save as form"), projects_); + form_layout -> addRow(tr("Modle existant", "used in save as form"), templates_); + form_layout -> addRow(tr("ou nouveau nom", "used in save as form"), new_name_); + setLayout(form_layout); +} + +/** + Update the templates list according to the selected project. +*/ +void TitleBlockTemplateLocationChooser::updateTemplates() { + int current_index = projects_ -> currentIndex(); + if (current_index == -1) return; + + uint project_id = projects_ -> itemData(current_index).toUInt(); + QETProject *project = QETApp::project(project_id); + if (!project) return; + + templates_ -> clear(); + templates_ -> addItem(tr("Nouveau modle (entrez son nom)", "combox box entry"), QVariant(false)); + + QStringList available_templates = project -> embeddedTitleBlockTemplates(); + if (available_templates.count()) { + templates_ -> insertSeparator(1); + foreach (QString template_name, available_templates) { + templates_ -> addItem(template_name, QVariant(true)); + } + } +} diff --git a/sources/titleblock/templatelocationchooser.h b/sources/titleblock/templatelocationchooser.h new file mode 100644 index 000000000..30d6b0ede --- /dev/null +++ b/sources/titleblock/templatelocationchooser.h @@ -0,0 +1,54 @@ +/* + Copyright 2006-2011 Xavier Guerrin + This file is part of QElectroTech. + + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . +*/ +#ifndef TITLEBLOCK_SLASH_LOCATION_CHOOSER_H +#define TITLEBLOCK_SLASH_LOCATION_CHOOSER_H +#include +#include "templatelocation.h" +/** + This class is a widget that allows the user to choose a target title block + template. +*/ +class TitleBlockTemplateLocationChooser : public QWidget { + Q_OBJECT + // Constructor, destructor + public: + TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocation &, QWidget * = 0); + ~TitleBlockTemplateLocationChooser(); + private: + TitleBlockTemplateLocationChooser(const TitleBlockTemplateLocationChooser &); + + // methods + public: + TitleBlockTemplateLocation location() const; + QETProject *project() const; + QString name() const; + void setLocation(const TitleBlockTemplateLocation &); + private: + void init(); + + // slots + private slots: + void updateTemplates(); + + // attributes + private: + QComboBox *projects_; ///< Projects combo box + QComboBox *templates_; ///< Existing templates combo box + QLineEdit *new_name_; ///< New template name textfield +}; +#endif