From e169235dee0cda1d91542f1dd2c87bb228c48689 Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Tue, 28 Oct 2014 06:22:37 +0000
Subject: [PATCH] LazReport, make sure template dir is created if it doesn't
 exists

git-svn-id: trunk@46692 -
---
 components/lazreport/source/languages/lr_const.cs.po  |  4 ++++
 components/lazreport/source/languages/lr_const.es.po  |  4 ++++
 components/lazreport/source/languages/lr_const.fr.po  |  4 ++++
 components/lazreport/source/languages/lr_const.hu.po  |  4 ++++
 components/lazreport/source/languages/lr_const.id.po  |  4 ++++
 components/lazreport/source/languages/lr_const.it.po  |  4 ++++
 components/lazreport/source/languages/lr_const.lt.po  |  4 ++++
 components/lazreport/source/languages/lr_const.pl.po  |  4 ++++
 components/lazreport/source/languages/lr_const.po     |  4 ++++
 .../lazreport/source/languages/lr_const.pt_BR.po      |  4 ++++
 components/lazreport/source/languages/lr_const.ru.po  |  4 ++++
 components/lazreport/source/languages/lr_const.uk.po  |  4 ++++
 components/lazreport/source/lr_const.pas              |  1 +
 components/lazreport/source/lr_desgn.pas              | 11 ++++++++++-
 14 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/components/lazreport/source/languages/lr_const.cs.po b/components/lazreport/source/languages/lr_const.cs.po
index 27fe2c4e71..bc884274eb 100644
--- a/components/lazreport/source/languages/lr_const.cs.po
+++ b/components/lazreport/source/languages/lr_const.cs.po
@@ -1139,6 +1139,10 @@ msgstr "Zarovnání nahoru"
 msgid "Top frame line"
 msgstr "Horní linka řádku"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Podtrhnout"
diff --git a/components/lazreport/source/languages/lr_const.es.po b/components/lazreport/source/languages/lr_const.es.po
index 2164b6fe70..bb289035bc 100644
--- a/components/lazreport/source/languages/lr_const.es.po
+++ b/components/lazreport/source/languages/lr_const.es.po
@@ -1111,6 +1111,10 @@ msgstr "Alineación superior"
 msgid "Top frame line"
 msgstr "Línea de marco superior"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Subrayado"
diff --git a/components/lazreport/source/languages/lr_const.fr.po b/components/lazreport/source/languages/lr_const.fr.po
index 3e8928972f..9074dee42f 100644
--- a/components/lazreport/source/languages/lr_const.fr.po
+++ b/components/lazreport/source/languages/lr_const.fr.po
@@ -1125,6 +1125,10 @@ msgstr "Aligner en haut"
 msgid "Top frame line"
 msgstr "Ligne suppérieure du cadre"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Souligner"
diff --git a/components/lazreport/source/languages/lr_const.hu.po b/components/lazreport/source/languages/lr_const.hu.po
index 5e163aa6bb..16fb1f7aeb 100644
--- a/components/lazreport/source/languages/lr_const.hu.po
+++ b/components/lazreport/source/languages/lr_const.hu.po
@@ -1107,6 +1107,10 @@ msgstr "Felülre igazítás"
 msgid "Top frame line"
 msgstr "Felső keretvonal"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Aláhúzás"
diff --git a/components/lazreport/source/languages/lr_const.id.po b/components/lazreport/source/languages/lr_const.id.po
index 922fd33740..efcb4c8df4 100644
--- a/components/lazreport/source/languages/lr_const.id.po
+++ b/components/lazreport/source/languages/lr_const.id.po
@@ -1114,6 +1114,10 @@ msgstr "Jajar atas"
 msgid "Top frame line"
 msgstr "Garis bingkai atas"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Garis bawah"
diff --git a/components/lazreport/source/languages/lr_const.it.po b/components/lazreport/source/languages/lr_const.it.po
index 3e479c4138..b51a512d23 100644
--- a/components/lazreport/source/languages/lr_const.it.po
+++ b/components/lazreport/source/languages/lr_const.it.po
@@ -1105,6 +1105,10 @@ msgstr "Allinea in cima"
 msgid "Top frame line"
 msgstr "Linea superiore del frame"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Sottolinea"
diff --git a/components/lazreport/source/languages/lr_const.lt.po b/components/lazreport/source/languages/lr_const.lt.po
index 706a931f48..de4005a114 100644
--- a/components/lazreport/source/languages/lr_const.lt.po
+++ b/components/lazreport/source/languages/lr_const.lt.po
@@ -1116,6 +1116,10 @@ msgstr "Viršutinė lygiuotė"
 msgid "Top frame line"
 msgstr "Viršutinė rėmelio linija"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Pabraukimas"
diff --git a/components/lazreport/source/languages/lr_const.pl.po b/components/lazreport/source/languages/lr_const.pl.po
index 702d12ece1..539d29ab73 100644
--- a/components/lazreport/source/languages/lr_const.pl.po
+++ b/components/lazreport/source/languages/lr_const.pl.po
@@ -1117,6 +1117,10 @@ msgstr "Do góry"
 msgid "Top frame line"
 msgstr "Górna linia obramowania"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Podkreślenie"
diff --git a/components/lazreport/source/languages/lr_const.po b/components/lazreport/source/languages/lr_const.po
index a0aaa29535..8cf9fcab88 100644
--- a/components/lazreport/source/languages/lr_const.po
+++ b/components/lazreport/source/languages/lr_const.po
@@ -1097,6 +1097,10 @@ msgstr ""
 msgid "Top frame line"
 msgstr ""
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr ""
diff --git a/components/lazreport/source/languages/lr_const.pt_BR.po b/components/lazreport/source/languages/lr_const.pt_BR.po
index 6f56a1da98..b8e09e65f1 100644
--- a/components/lazreport/source/languages/lr_const.pt_BR.po
+++ b/components/lazreport/source/languages/lr_const.pt_BR.po
@@ -1115,6 +1115,10 @@ msgstr "Alinhar acima"
 msgid "Top frame line"
 msgstr "Borda superior"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Sublinhado"
diff --git a/components/lazreport/source/languages/lr_const.ru.po b/components/lazreport/source/languages/lr_const.ru.po
index cb472611fb..fcbdacf938 100644
--- a/components/lazreport/source/languages/lr_const.ru.po
+++ b/components/lazreport/source/languages/lr_const.ru.po
@@ -1113,6 +1113,10 @@ msgstr "Выравнивание по верхнему краю"
 msgid "Top frame line"
 msgstr "Верхняя линия фрейма"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Подчёркнутый"
diff --git a/components/lazreport/source/languages/lr_const.uk.po b/components/lazreport/source/languages/lr_const.uk.po
index be2f1fd8d3..65bc727fb2 100644
--- a/components/lazreport/source/languages/lr_const.uk.po
+++ b/components/lazreport/source/languages/lr_const.uk.po
@@ -1117,6 +1117,10 @@ msgstr "Вирівнювання по верхньому краю"
 msgid "Top frame line"
 msgstr "Верхня лінія фрейму"
 
+#: lr_const.sfrdesignerformunabletocreatetemplatedir
+msgid "Unable to create template directory"
+msgstr ""
+
 #: lr_const.sfrdesignerformunderline
 msgid "Underline"
 msgstr "Підкреслений"
diff --git a/components/lazreport/source/lr_const.pas b/components/lazreport/source/lr_const.pas
index 0b696996ac..e38a428598 100644
--- a/components/lazreport/source/lr_const.pas
+++ b/components/lazreport/source/lr_const.pas
@@ -574,6 +574,7 @@ resourcestring
   sFRDesignerForm_Modified = 'Modified';
   sFRDesignerExists        = 'You already have one TfrDesigner component';
   sFRDesignerDataInsp      = 'Data inspector';
+  sFrDesignerFormUnableToCreateTemplateDir = 'Unable to create template directory';
 
 //--- InspForm resources ------------------------------------------------------
   sObjectInspector ='Object inspector';
diff --git a/components/lazreport/source/lr_desgn.pas b/components/lazreport/source/lr_desgn.pas
index 1958d37453..a0645eb353 100644
--- a/components/lazreport/source/lr_desgn.pas
+++ b/components/lazreport/source/lr_desgn.pas
@@ -3372,10 +3372,19 @@ begin
                 else
                   s := ExtractFileName(ChangeFileExt(FileName, '.frt'));
                 if frTemplateDir <> '' then
-                  s := frTemplateDir + PathDelim + s;
+                  s := AppendPathDelim(frTemplateDir) + s;
                 frTemplNewForm := TfrTemplNewForm.Create(nil);
                 if frTemplNewForm.ShowModal = mrOk then
                 begin
+                  if frTemplateDir<>'' then
+                  begin
+                    if not DirectoryExistsUTF8(frTemplateDir) then begin
+                      if not ForceDirectoriesUTF8(frTemplateDir) then begin
+                        ShowMessage(sFrDesignerFormUnableToCreateTemplateDir);
+                        exit;
+                      end;
+                    end;
+                  end;
                   if FCurDocFileType = dtLazReportTemplate then
                     CurReport.SaveTemplateXML(s, frTemplNewForm.Memo1.Lines, frTemplNewForm.Image1.Picture.Bitmap)
                   else