Changeset 74 for trunk/Packages/Common/UCommon.pas

Timestamp:

Dec 17, 2016, 6:33:13 PM (7 years ago)

Author:

chronos

Message:

• Added: Main application icon.
• Modified: Updated Command and CoolTranslator packages.
• Added: About dialog.

File:

• trunk/Packages/Common/UCommon.pas (modified) (6 diffs)

trunk/Packages/Common/UCommon.pas

@@ -6 +6 @@
 
 uses
-  {$IFDEF Windows}Windows,{$ENDIF}
+  {$ifdef Windows}Windows,{$endif}
+  {$ifdef Linux}baseunix,{$endif}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -69 +70 @@
 function GetDirCount(Dir: string): Integer;
 function MergeArray(A, B: array of string): TArrayOfString;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
 
 
@@ -305 +307 @@
   end;
 end;
+{$endif}
 
 function ComputerName: string;
@@ -324 +327 @@
 {$endif}
 {$ifdef unix}
-begin
-  Result := GetHostName;
+var
+  Name: UtsName;
+begin
+  fpuname(Name);
+  Result := Name.Nodename;
 end;
 {$endif}
 
+{$ifdef windows}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -443 +450 @@
 
 procedure OpenWebPage(URL: string);
-var
-  Process: TProcess;
-  Browser, Params: string;
 begin
   OpenURL(URL);
-  {try
-    Process := TProcess.Create(nil);
-    Browser := '';
-    //FindDefaultBrowser(Browser, Params);
-    //Process.Executable := Browser;
-    //Process.Parameters.Add(Format(Params, [ApplicationInfo.HomePage]);
-    Process.CommandLine := 'cmd.exe /c start ' + URL;
-    Process.Options := [poNoConsole];
-    Process.Execute;
-  finally
-    Process.Free;
-  end;}
 end;
 
@@ -501 +493 @@
 end;
 
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+var
+  FileStream: TFileStream;
+  Read: Integer;
+begin
+  Result := '';
+  FileStream := TFileStream.Create(FileName, fmOpenRead);
+  try
+    if FileStream.Size > 0 then begin
+      SetLength(Result, FileStream.Size);
+      Read := FileStream.Read(Pointer(Result)^, FileStream.Size);
+      SetLength(Result, Read);
+    end;
+  finally
+    FileStream.Free;
+  end;
+end;
+