Changeset 332 for trunk

Timestamp:

Aug 27, 2024, 3:48:44 PM (3 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

trunk

Files:

• Forms/FormKeyShortcuts.lfm (deleted)
• Forms/FormKeyShortcuts.lrj (deleted)
• Forms/FormKeyShortcuts.pas (deleted)
• Languages/xtactics.cs.po (modified) (3 diffs)
• Languages/xtactics.pot (modified) (2 diffs)
• Packages/Common/Common.lpk (modified) (2 diffs)
• Packages/Common/Common.pas (modified) (11 diffs)
• Packages/Common/CommonPackage.pas (modified) (1 diff)
• Packages/Common/FormEx.pas (modified) (1 diff)
• Packages/Common/Forms/FormKeyShortcuts.lfm (added)
• Packages/Common/Forms/FormKeyShortcuts.lrj (added)
• Packages/Common/Forms/FormKeyShortcuts.pas (added)
• Packages/Common/Languages/Common.cs.po (added)
• Packages/Common/Languages/Common.pot (added)
• Packages/Common/Languages/FormKeyShortcuts.cs.po (added)
• Packages/Common/Languages/FormKeyShortcuts.pot (added)
• Packages/Common/ListViewSort.pas (modified) (1 diff)
• Packages/Common/PersistentForm.pas (modified) (1 diff)
• Packages/Common/Table.pas (modified) (1 diff)

trunk/Languages/xtactics.cs.po

@@ -197 +197 @@
 "Jednotky lze přesouvat kliknutím na vlastněnou buňku a pak kliknutím na cílovou neutrální nebo nepřátelskou buňku. Přesuny lze nastavit jako opakující se každá tak s určeným počtem jednotek. Opakující se přesuny jednotek lze nastavit v okně Přesun jednotek nebo jednoduše pomocí držení klávesy Control při výběru cílové buňky. Pokud je více přesunů z jedené buňky do více jiných a chcete přesunout všechny dostupné do cílové buňky, tak to můžete provést pomocí držení klávesy Shift a výběru cílové buňky."
 
-#: formkeyshortcuts.sglobal
-msgctxt "formkeyshortcuts.sglobal"
-msgid "Global"
-msgstr "Globální"
-
-#: formkeyshortcuts.smainform
-msgctxt "formkeyshortcuts.smainform"
-msgid "Main window"
-msgstr "Hlavní okno"
-
 #: formlist.snew
 msgctxt "formlist.snew"
@@ -801 +791 @@
 msgstr "Položka"
 
-#: tformkeyshortcuts.caption
-msgctxt "tformkeyshortcuts.caption"
-msgid "Key shortcuts"
-msgstr "Klávesové zkratky"
-
-#: tformkeyshortcuts.listview1.columns[0].caption
-msgid "Action"
-msgstr "Akce"
-
-#: tformkeyshortcuts.listview1.columns[1].caption
-msgid "Window"
-msgstr "Okno"
-
-#: tformkeyshortcuts.listview1.columns[2].caption
-msgid "Shortcut"
-msgstr "Zkratka"
-
-#: tformkeyshortcuts.menuitem1.caption
-msgid "Execute"
-msgstr "Vykonat"
-
 #: tformlist.aadd.caption
 msgctxt "tformlist.aadd.caption"
@@ -1361 +1330 @@
 msgid "View range"
 msgstr "Dohled"
+

trunk/Languages/xtactics.pot

@@ -179 +179 @@
 msgstr ""
 
-#: formkeyshortcuts.sglobal
-msgctxt "formkeyshortcuts.sglobal"
-msgid "Global"
-msgstr ""
-
-#: formkeyshortcuts.smainform
-msgctxt "formkeyshortcuts.smainform"
-msgid "Main window"
-msgstr ""
-
 #: formlist.snew
 msgctxt "formlist.snew"
@@ -777 +767 @@
 msgstr ""
 
-#: tformkeyshortcuts.caption
-msgctxt "tformkeyshortcuts.caption"
-msgid "Key shortcuts"
-msgstr ""
-
-#: tformkeyshortcuts.listview1.columns[0].caption
-msgid "Action"
-msgstr ""
-
-#: tformkeyshortcuts.listview1.columns[1].caption
-msgid "Window"
-msgstr ""
-
-#: tformkeyshortcuts.listview1.columns[2].caption
-msgid "Shortcut"
-msgstr ""
-
-#: tformkeyshortcuts.menuitem1.caption
-msgid "Execute"
-msgstr ""
-
 #: tformlist.aadd.caption
 msgctxt "tformlist.aadd.caption"

trunk/Packages/Common/Common.lpk

@@ -43 +43 @@
     <License Value="Copy left."/>
     <Version Minor="12"/>
-    <Files Count="36">
+    <Files Count="37">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -201 +201 @@
         <UnitName Value="FormAbout"/>
       </Item36>
+      <Item37>
+        <Filename Value="Forms\FormKeyShortcuts.pas"/>
+        <UnitName Value="FormKeyShortcuts"/>
+      </Item37>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/Packages/Common/Common.pas

@@ -55 +55 @@
 function EndsWith(Text, What: string): Boolean;
 function Explode(Separator: Char; Data: string): TStringArray;
-procedure ExecuteProgram(Executable: string; Parameters: array of string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string;
+  Environment: array of string; CurrentDirectory: string = '');
+procedure ExecuteProgramOutput(Executable: string; Parameters: array of string;
+  Environment: array of string; out Output, Error: string;
+  out ExitCode: Integer; CurrentDirectory: string = '');
 procedure FileDialogUpdateFilterFileType(FileDialog: TOpenDialog);
 procedure FreeThenNil(var Obj);
@@ -63 +67 @@
 function GetBit(Variable: QWord; Index: Byte): Boolean;
 function GetStringPart(var Text: string; Separator: string): string;
+function GetEnvironmentVariables: TStringArray;
 function GenerateNewName(OldName: string): string;
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
 function IntToBin(Data: Int64; Count: Byte): string;
-function Implode(Separator: string; List: TList<string>): string;
-function Implode(Separator: string; List: TStringList; Around: string = ''): string;
+function Implode(Separator: string; List: TList<string>): string; overload;
+function Implode(Separator: string; List: array of string): string; overload;
+function Implode(Separator: string; List: TStringList; Around: string = ''): string; overload;
 function LastPos(const SubStr: String; const S: String): Integer;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
@@ -98 +104 @@
 implementation
 
+resourcestring
+  SExecutionError = 'Excution error: %s (exit code: %d)';
+
 function StartsWith(Text, What: string): Boolean;
 begin
@@ -108 +117 @@
 end;
 
-function BinToInt(BinStr : string) : Int64;
-var
-  i : byte;
-  RetVar : Int64;
+function BinToInt(BinStr: string): Int64;
+var
+  I: Byte;
+  RetVar: Int64;
 begin
   BinStr := UpperCase(BinStr);
-  if BinStr[length(BinStr)] = 'B' then Delete(BinStr,length(BinStr),1);
+  if BinStr[length(BinStr)] = 'B' then Delete(BinStr, Length(BinStr), 1);
   RetVar := 0;
-  for i := 1 to length(BinStr) do begin
-    if not (BinStr[i] in ['0','1']) then begin
+  for I := 1 to Length(BinStr) do begin
+    if not (BinStr[I] in ['0','1']) then begin
       RetVar := 0;
       Break;
     end;
-    RetVar := (RetVar shl 1) + (byte(BinStr[i]) and 1) ;
+    RetVar := (RetVar shl 1) + (Byte(BinStr[I]) and 1);
   end;
 
@@ -136 +145 @@
   end;
 end;
-
 
 procedure DeleteFiles(APath, AFileSpec: string);
@@ -154 +162 @@
   FindClose(SearchRec);
 end;
-
 
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
@@ -177 +184 @@
   if FileExt <> '.*' then
     FileDialog.FileName := ChangeFileExt(FileDialog.FileName, FileExt)
+end;
+
+function GetEnvironmentVariables: TStringArray;
+var
+  I: Integer;
+begin
+  Result := Default(TStringArray);
+  SetLength(Result, GetEnvironmentVariableCount);
+  for I := 0 to GetEnvironmentVariableCount - 1 do
+    Result[I] := GetEnvironmentString(I);
 end;
 
@@ -219 +236 @@
 end;*)
 
+function Implode(Separator: string; List: array of string): string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to Length(List) - 1 do begin
+    Result := Result + List[I];
+    if I < Length(List) - 1 then Result := Result + Separator;
+  end;
+end;
+
 function Implode(Separator: string; List: TStringList; Around: string = ''): string;
 var
@@ -494 +522 @@
 end;
 
-procedure ExecuteProgram(Executable: string; Parameters: array of string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string;
+  Environment: array of string; CurrentDirectory: string = '');
 var
   Process: TProcess;
   I: Integer;
 begin
+  Process := TProcess.Create(nil);
   try
-    Process := TProcess.Create(nil);
     Process.Executable := Executable;
     for I := 0 to Length(Parameters) - 1 do
       Process.Parameters.Add(Parameters[I]);
+    for I := 0 to Length(Environment) - 1 do
+      Process.Environment.Add(Environment[I]);
+    Process.CurrentDirectory := CurrentDirectory;
+    Process.ShowWindow := swoHIDE;
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -511 +544 @@
 end;
 
+procedure ExecuteProgramOutput(Executable: string; Parameters: array of string;
+  Environment: array of string; out Output, Error: string; out ExitCode: Integer;
+  CurrentDirectory: string);
+var
+  Process: TProcess;
+  I: Integer;
+  ReadCount: Integer;
+  Buffer: string;
+const
+  BufferSize = 1000;
+begin
+  Process := TProcess.Create(nil);
+  try
+    Process.Executable := Executable;
+    for I := 0 to Length(Parameters) - 1 do
+      Process.Parameters.Add(Parameters[I]);
+    for I := 0 to Length(Environment) - 1 do
+      Process.Environment.Add(Environment[I]);
+    Process.CurrentDirectory := CurrentDirectory;
+    Process.ShowWindow := swoHIDE;
+    Process.Options := [poNoConsole, poUsePipes];
+    Process.Execute;
+
+    Output := '';
+    Error := '';
+    Buffer := '';
+    SetLength(Buffer, BufferSize);
+    while Process.Running do begin
+      if Process.Output.NumBytesAvailable > 0 then begin
+        ReadCount := Process.Output.Read(Buffer[1], Length(Buffer));
+        Output := Output + Copy(Buffer, 1, ReadCount);
+      end;
+
+      if Process.Stderr.NumBytesAvailable > 0 then begin
+        ReadCount := Process.Stderr.Read(Buffer[1], Length(Buffer));
+        Error := Error + Copy(Buffer, 1, ReadCount)
+      end;
+
+      Sleep(10);
+    end;
+
+    if Process.Output.NumBytesAvailable > 0 then begin
+      ReadCount := Process.Output.Read(Buffer[1], Length(Buffer));
+      Output := Output + Copy(Buffer, 1, ReadCount);
+    end;
+
+    if Process.Stderr.NumBytesAvailable > 0 then begin
+      ReadCount := Process.Stderr.Read(Buffer[1], Length(Buffer));
+      Error := Error + Copy(Buffer, 1, ReadCount);
+    end;
+
+    ExitCode := Process.ExitCode;
+
+    if (ExitCode <> 0) or (Error <> '') then
+      raise Exception.Create(Format(SExecutionError, [Output + Error, ExitCode]));
+  finally
+    Process.Free;
+  end;
+end;
+
 procedure FreeThenNil(var Obj);
 begin
@@ -529 +622 @@
 procedure OpenFileInShell(FileName: string);
 begin
-  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName], []);
 end;
 

trunk/Packages/Common/CommonPackage.pas

@@ -14 +14 @@
   ScaleDPI, Theme, StringTable, MetaCanvas, Geometric, Translator, Languages, 
   PixelPointer, DataFile, TestCase, Generics, Table, FormEx, FormTests, 
-  FormTest, FormAbout, LazarusPackageIntf;
+  FormTest, FormAbout, FormKeyShortcuts, LazarusPackageIntf;
 
 implementation

trunk/Packages/Common/FormEx.pas

@@ -82 +82 @@
 procedure TFormEx.DoClose(var CloseAction: TCloseAction);
 begin
-  if  (not (csDesigning in ComponentState)) then begin
+  if (not (csDesigning in ComponentState)) then begin
     PersistentForm.FormFullScreen := FullScreen;
     PersistentForm.Save(Self);

trunk/Packages/Common/ListViewSort.pas

@@ -358 +358 @@
     List.Clear;
     List.AddRange(Source);
-  end else List.Clear;
+  end;
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;

trunk/Packages/Common/PersistentForm.pas

@@ -336 +336 @@
     end;
     Form.OnWindowStateChange := OldHandler;
+    FormFullScreen := True;
     {$ENDIF}
   end else begin

trunk/Packages/Common/Table.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections, ComCtrls, XMLRead, XMLWrite, DOM;
+  Classes, SysUtils, Generics.Collections, ComCtrls, XMLRead, DOM;
 
 type