[qet] [1410] Title block template editor: implemented "Save as" action.

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]

To: qet@xxxxxxxxxxxxxxxxxxx
Subject: [qet] [1410] Title block template editor: implemented "Save as" action.
From: subversion@xxxxxxxxxxxxx
Date: Mon, 26 Dec 2011 06:42:49 +0100

Revision: 1410
Author:   xavier
Date:     2011-12-26 06:42:48 +0100 (Mon, 26 Dec 2011)
Log Message:
-----------
Title block template editor: implemented "Save as" action.

Modified Paths:
--------------
    branches/0.3/lang/qet_ca.ts
    branches/0.3/lang/qet_cs.ts
    branches/0.3/lang/qet_de.ts
    branches/0.3/lang/qet_en.qm
    branches/0.3/lang/qet_en.ts
    branches/0.3/lang/qet_es.ts
    branches/0.3/lang/qet_it.ts
    branches/0.3/lang/qet_pl.ts
    branches/0.3/lang/qet_pt.ts
    branches/0.3/lang/qet_ro.ts
    branches/0.3/lang/qet_ru.ts
    branches/0.3/sources/elementspanelwidget.cpp
    branches/0.3/sources/titleblock/qettemplateeditor.cpp
    branches/0.3/sources/titleblock/qettemplateeditor.h

Added Paths:
-----------
    branches/0.3/sources/titleblock/templatelocation.cpp
    branches/0.3/sources/titleblock/templatelocation.h
    branches/0.3/sources/titleblock/templatelocationchooser.cpp
    branches/0.3/sources/titleblock/templatelocationchooser.h

Modified: branches/0.3/lang/qet_ca.ts
===================================================================
--- branches/0.3/lang/qet_ca.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_ca.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1194,8 +1194,8 @@
     </message>
     <message>
         <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Importar un nou model</translation>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
@@ -4071,137 +4071,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Sortir</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Configurar QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Quant a QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">Fitxer</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">Configuració</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">Ajuda</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Cap canvi</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Anulacions</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5439,6 +5451,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_cs.ts
===================================================================
--- branches/0.3/lang/qet_cs.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_cs.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1167,11 +1167,6 @@
         <translation>Posunout tento výkres dolů</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Zavést nový vzor</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Upravit tento vzor</translation>
@@ -1234,6 +1229,11 @@
         <translation>Vlastnosti projektu</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="74"/>
         <source>Déplacer dans cette catégorie</source>
         <translation>Přesunout do této skupiny</translation>
@@ -4077,137 +4077,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Uložit</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Uložit jako</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Ukončit</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Nastavit QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;O QElectroTechu</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">O &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Umožní pro QElectroTech stanovit různé parametry</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Zobrazí informace o QElectroTechu</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Zobrazí informace o knihovně Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Soubor</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Úpravy</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">N&amp;astavení</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Žádná úprava</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Zpět</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished">QElectroTech - Editor vzoru vloženého rámečku</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5449,6 +5461,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_de.ts
===================================================================
--- branches/0.3/lang/qet_de.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_de.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1007,10 +1007,6 @@
         <translation>Sie können die Verwaltung verwenden um Kategorien hinzuzufügen, löschen oder zu bearbeiten.</translation>
     </message>
     <message>
-        <source>Importer un nouveau modèle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Éditer ce modèle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1032,6 +1028,10 @@
         <source>Ouvrir un fichier élément</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EllipseEditor</name>
@@ -3433,6 +3433,16 @@
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Hilfe</translation>
     </message>
+    <message>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Speichern unter</translation>
+    </message>
+    <message>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -4450,6 +4460,29 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <source>Gestionnaire de logos</source>

Modified: branches/0.3/lang/qet_en.qm
===================================================================
(Binary files differ)

Modified: branches/0.3/lang/qet_en.ts
===================================================================
--- branches/0.3/lang/qet_en.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_en.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1167,11 +1167,6 @@
         <translation>Move down</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Import a new template</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Edit this template</translation>
@@ -1234,6 +1229,11 @@
         <translation>Project properties</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation>New template</translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="74"/>
         <source>Déplacer dans cette catégorie</source>
         <translation>Move into this category</translation>
@@ -4074,137 +4074,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation>Save as</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation>&amp;Configure QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation>A&amp;bout QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation>About &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation>&amp;Merge cells</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation>&amp;Split cells</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation>Allows to specify various parameters for QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation>Displays informations about QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation>Displays informations about Qt library</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation>&amp;Edit</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation>&amp;Settings</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation>No modification</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation>Undo</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation>Cell properties</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation>QElectroTech - Title block template editor</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation>%1 - %2</translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation>Save template as</translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5443,6 +5455,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation>Parent project</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation>Existing template</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation>or new name</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation>New template (enter its name)</translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_es.ts
===================================================================
--- branches/0.3/lang/qet_es.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_es.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1193,11 +1193,6 @@
         <translation>Bajar este esquema</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Importar un nuevo modelo</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Editar este modelo</translation>
@@ -1240,6 +1235,11 @@
         <translation>Mover en esta categoría</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="75"/>
         <source>Copier dans cette catégorie</source>
         <translation>Copiar en esta categoría</translation>
@@ -4076,137 +4076,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Guardar</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Guardar como</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Configurar QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Acerca de QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Acerca de &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Permite arreglar los párametros de QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Mostrar las informaciones sobre QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Mostrar las informaciones sobre la biblioteca Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Archivo</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Preferencias</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Ninguna modificación</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Anulaciones</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished">QElectroTech - Editor de modelo de cartucho</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5445,6 +5457,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_it.ts
===================================================================
--- branches/0.3/lang/qet_it.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_it.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1161,11 +1161,6 @@
         <translation>Abbassare questo schema</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Importare un nuovo modello</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Editare questo modello</translation>
@@ -1228,6 +1223,11 @@
         <translation>Proprietà del progetto</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="74"/>
         <source>Déplacer dans cette catégorie</source>
         <translation>Muovi in questa categoria</translation>
@@ -4068,137 +4068,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Salvar&amp;e</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Salva come</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Configura QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">A proposito di &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Mostra informazioni su QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;File</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Edita</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Configurazione</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Nessuna modifica</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished">QElectrotech - Editor di modelli di cartiglio</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5437,6 +5449,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_pl.ts
===================================================================
--- branches/0.3/lang/qet_pl.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_pl.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1170,11 +1170,6 @@
         <translation>Przenieść w dół</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Importuj nowy szablon</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Edytuj szablon</translation>
@@ -1237,6 +1232,11 @@
         <translation>Właściwości projektu</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="74"/>
         <source>Déplacer dans cette catégorie</source>
         <translation>Przenieś do tej kategorii</translation>
@@ -4081,137 +4081,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Zapisz</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Zapisz jako</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Konfiguracja QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;O QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">O &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Wyświetla informacje o QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Plik</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Edycja</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Ustawienia</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Pomoc</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Bez zmian</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Cofnij</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished">QElectroTech - Edytor szablonów tabliczki rysunkowej</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5453,6 +5465,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_pt.ts
===================================================================
--- branches/0.3/lang/qet_pt.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_pt.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1167,11 +1167,6 @@
         <translation>Descer o esquema</translation>
     </message>
     <message>
-        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
-        <translation>Importar um novo modelo</translation>
-    </message>
-    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="72"/>
         <source>Éditer ce modèle</source>
         <translation>Editar o modelo</translation>
@@ -1234,6 +1229,11 @@
         <translation>Propriedades do projecto</translation>
     </message>
     <message>
+        <location filename="../sources/elementspanelwidget.cpp" line="71"/>
+        <source>Nouveau modèle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sources/elementspanelwidget.cpp" line="74"/>
         <source>Déplacer dans cette catégorie</source>
         <translation>Mover para esta categoria</translation>
@@ -4074,137 +4074,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Guardar</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Sair</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Configurar QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Sobre QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Sobre &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Permite especificar vários parâmetros para QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Apresenta informações sobre QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Apresenta informações sobre as bibliotecas Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Ficheiro</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Configurações</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Desfazer</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished">QElectrotech - Editor de modelos de moldura</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5443,6 +5455,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_ro.ts
===================================================================
--- branches/0.3/lang/qet_ro.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_ro.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1197,7 +1197,7 @@
     </message>
     <message>
         <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
+        <source>Nouveau modèle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4076,137 +4076,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Salvare</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Configurare QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">Despre &amp;Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Permite reglarea parametrilor QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Afișează informații despre QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Afișează informații despre biblioteca Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Fișier</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Editare</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Configurare</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Asistență</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Nicio modificare</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">Anulări</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5447,6 +5459,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/lang/qet_ru.ts
===================================================================
--- branches/0.3/lang/qet_ru.ts	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/lang/qet_ru.ts	2011-12-26 05:42:48 UTC (rev 1410)
@@ -1198,7 +1198,7 @@
     </message>
     <message>
         <location filename="../sources/elementspanelwidget.cpp" line="71"/>
-        <source>Importer un nouveau modèle</source>
+        <source>Nouveau modèle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4076,137 +4076,149 @@
 <context>
     <name>QETTitleBlockTemplateEditor</name>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="103"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="111"/>
         <source>&amp;Enregistrer</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Сохранить</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="104"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <source>Enregistrer sous</source>
+        <comment>menu entry</comment>
+        <translation type="unfinished">Сохранить как</translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
         <source>&amp;Quitter</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Выход</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="105"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
         <source>&amp;Configurer QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;Настройка QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="106"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="115"/>
         <source>À &amp;propos de QElectroTech</source>
         <comment>menu entry</comment>
         <translation type="unfinished">&amp;О программе</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="107"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
         <source>À propos de &amp;Qt</source>
         <comment>menu entry</comment>
         <translation type="unfinished">О &amp;библиотеке Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="108"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
         <source>&amp;Fusionner les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="109"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
         <source>&amp;Séparer les cellules</source>
         <comment>menu entry</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="112"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="121"/>
         <source>Ctrl+Q</source>
         <comment>shortcut to quit</comment>
         <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="113"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="122"/>
         <source>Ctrl+K</source>
         <comment>shortcut to merge cells</comment>
         <translation type="unfinished">Ctrl+K</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="114"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="123"/>
         <source>Ctrl+J</source>
         <comment>shortcut to split merged cell</comment>
         <translation type="unfinished">Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="116"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="125"/>
         <source>Permet de régler différents paramètres de QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Позволяет завать различные параметры QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="117"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="126"/>
         <source>Affiche des informations sur QElectroTech</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Отобразить информацию о QElectroTech</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="118"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="127"/>
         <source>Affiche des informations sur la bibliothèque Qt</source>
         <comment>status bar tip</comment>
         <translation type="unfinished">Отобразить информацию о библиотеке Qt</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="133"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="143"/>
         <source>&amp;Fichier</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="134"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="144"/>
         <source>&amp;Édition</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="135"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="145"/>
         <source>&amp;Configuration</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Настройка</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="136"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="146"/>
         <source>&amp;Aide</source>
         <comment>menu title</comment>
         <translation type="unfinished">&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="168"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="179"/>
         <source>Aucune modification</source>
         <comment>label displayed in the undo list when empty</comment>
         <translation type="unfinished">Нет изменений</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="170"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="181"/>
         <source>Annulations</source>
         <comment>dock title</comment>
         <translation type="unfinished">История</translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="183"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="194"/>
         <source>Propriétés de la cellule</source>
         <comment>dock title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="255"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
         <source>QElectroTech - Éditeur de modèle de cartouche</source>
         <comment>titleblock template editor: base window title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="266"/>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="277"/>
         <source>%1 - %2</source>
         <comment>window title: %1 is the base window title, %2 is a template name</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sources/titleblock/qettemplateeditor.cpp" line="341"/>
+        <source>Enregistrer le modèle sous</source>
+        <comment>dialog window title</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QFileNameEdit</name>
@@ -5447,6 +5459,33 @@
     </message>
 </context>
 <context>
+    <name>TitleBlockTemplateLocationChooser</name>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="91"/>
+        <source>Projet parent</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="92"/>
+        <source>Modèle existant</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="93"/>
+        <source>ou nouveau nom</source>
+        <comment>used in save as form</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sources/titleblock/templatelocationchooser.cpp" line="109"/>
+        <source>Nouveau modèle (entrez son nom)</source>
+        <comment>combox box entry</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TitleBlockTemplateLogoManager</name>
     <message>
         <location filename="../sources/titleblock/templatelogomanager.cpp" line="59"/>

Modified: branches/0.3/sources/elementspanelwidget.cpp
===================================================================
--- branches/0.3/sources/elementspanelwidget.cpp	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/sources/elementspanelwidget.cpp	2011-12-26 05:42:48 UTC (rev 1410)
@@ -68,7 +68,7 @@
 	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);

Modified: branches/0.3/sources/titleblock/qettemplateeditor.cpp
===================================================================
--- branches/0.3/sources/titleblock/qettemplateeditor.cpp	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/sources/titleblock/qettemplateeditor.cpp	2011-12-26 05:42:48 UTC (rev 1410)
@@ -22,6 +22,7 @@
 #include "templatecellwidget.h"
 #include "templatecommands.h"
 #include "templateview.h"
+#include "templatelocationchooser.h"
 #include "templatelogomanager.h"
 #include "templatecellwidget.h"
 
@@ -47,6 +48,13 @@
 }
 
 /**
+	@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.
 	@param template_name Name of the template to edit within its parent project.
@@ -101,6 +109,7 @@
 	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 @@
 	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 @@
 	help_menu_    -> setTearOffEnabled(true);
 	
 	file_menu_    -> addAction(save_);
+	file_menu_    -> addAction(save_as_);
 	file_menu_    -> addSeparator();
 	file_menu_    -> addAction(quit_);
 	
@@ -273,20 +284,73 @@
 }
 
 /**
-	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.
 */
 void QETTitleBlockTemplateEditor::quit() {

Modified: branches/0.3/sources/titleblock/qettemplateeditor.h
===================================================================
--- branches/0.3/sources/titleblock/qettemplateeditor.h	2011-12-25 18:40:26 UTC (rev 1409)
+++ branches/0.3/sources/titleblock/qettemplateeditor.h	2011-12-26 05:42:48 UTC (rev 1410)
@@ -20,6 +20,7 @@
 #include <QtGui>
 #include "qet.h"
 #include "templateview.h"
+#include "templatelocation.h"
 class ModifyTitleBlockCellCommand;
 class TitleBlockTemplateCommand;
 class TitleBlockTemplateCellWidget;
@@ -48,7 +49,7 @@
 	/// 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 @@
 	
 	// methods
 	public:
+	TitleBlockTemplateLocation location() const;
 	
 	protected:
 	
@@ -82,14 +84,17 @@
 	void selectedCellsChanged(QList<TitleBlockCell *>);
 	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

Added: branches/0.3/sources/titleblock/templatelocation.cpp
===================================================================
--- branches/0.3/sources/titleblock/templatelocation.cpp	                        (rev 0)
+++ branches/0.3/sources/titleblock/templatelocation.cpp	2011-12-26 05:42:48 UTC (rev 1410)
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+#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());
+}

Added: branches/0.3/sources/titleblock/templatelocation.h
===================================================================
--- branches/0.3/sources/titleblock/templatelocation.h	                        (rev 0)
+++ branches/0.3/sources/titleblock/templatelocation.h	2011-12-26 05:42:48 UTC (rev 1410)
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+#ifndef TITLEBLOCK_SLASH_TEMPLATE_LOCATION_H
+#define TITLEBLOCK_SLASH_TEMPLATE_LOCATION_H
+#include <QtCore>
+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

Added: branches/0.3/sources/titleblock/templatelocationchooser.cpp
===================================================================
--- branches/0.3/sources/titleblock/templatelocationchooser.cpp	                        (rev 0)
+++ branches/0.3/sources/titleblock/templatelocationchooser.cpp	2011-12-26 05:42:48 UTC (rev 1410)
@@ -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<uint>(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<uint, QETProject *> 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("Mod\xE8le 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 mod\xE8le (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));
+		}
+	}
+}

Added: branches/0.3/sources/titleblock/templatelocationchooser.h
===================================================================
--- branches/0.3/sources/titleblock/templatelocationchooser.h	                        (rev 0)
+++ branches/0.3/sources/titleblock/templatelocationchooser.h	2011-12-26 05:42:48 UTC (rev 1410)
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+#ifndef TITLEBLOCK_SLASH_LOCATION_CHOOSER_H
+#define TITLEBLOCK_SLASH_LOCATION_CHOOSER_H
+#include <QtGui>
+#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

Messages sorted by: [ date | thread ]
Prev by Date: [qet] [1409] Updated English translations.
Next by Date: [qet] [1411] polish translation update
Previous by thread: [qet] [1409] Updated English translations.
Next by thread: [qet] [1411] polish translation update

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/