Changeset 98

Timestamp:

Aug 27, 2016, 8:58:18 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Wrong access to main thread from export jobs causing exception.
• Fixed: Build under linux.

Location:

trunk/Forms

Files:

• UFormExport.pas (modified) (8 diffs)
• UFormImport.pas (modified) (1 diff)
• UFormMain.pas (modified) (1 diff)

trunk/Forms/UFormExport.pas

@@ -24 +24 @@
   private
     ItemCount: Integer;
+    Content: string;
     procedure JobExportCSV(Job: TJob);
     procedure JobExportMediaWiki(Job: TJob);
@@ -66 +67 @@
   I: Integer;
   J: Integer;
-  Content: string;
 begin
   Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
@@ -81 +81 @@
     if Job.Terminate then Break;
   end;
-  Memo1.Lines.Text := Content;
 end;
 
@@ -88 +87 @@
   I: Integer;
   J: Integer;
-  Content: string;
 begin
   Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
@@ -104 +102 @@
     if Job.Terminate then Break;
   end;
-  Memo1.Lines.Text := Content;
 end;
 
@@ -112 +109 @@
   J: Integer;
   Line: string;
-  Content: string;
 begin
   Job.Progress.Max := Core.AcronymDb.Acronyms.Count;
@@ -131 +127 @@
   end;
   Content := Content + '|}' + LineEnding;
-  Memo1.Lines.Text := Content;
 end;
 
@@ -143 +138 @@
     Core.JobProgressView1.AddJob(SExporting, JobExportMediaWikiTable);
   Core.JobProgressView1.Start;
+  Memo1.Lines.Text := Content;
   ShowMessage(Format(SExportedAcronyms, [ItemCount]));
 end;

trunk/Forms/UFormImport.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UAcronym, Types;
+  UAcronym;
 
 type

trunk/Forms/UFormMain.pas

@@ -610 +610 @@
   // If installed in Linux system then use installation directory for po files
   if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-    CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
+    Core.CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
   {$ENDIF}