Changeset 74 for trunk/Packages

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.

Location:

trunk/Packages

Files:

• Common/UCommon.pas (modified) (6 diffs)
• Common/UPersistentForm.pas (modified) (5 diffs)
• Common/UScaleDPI.pas (modified) (1 diff)
• CoolTranslator/UCoolTranslator.pas (modified) (15 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;
+
 
 

trunk/Packages/Common/UPersistentForm.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
 
 type
@@ -19 +19 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    procedure LoadControl(Control: TControl);
+    procedure SaveControl(Control: TControl);
   public
     FormNormalSize: TRect;
@@ -49 +51 @@
 
 { TPersistentForm }
+
+procedure TPersistentForm.LoadControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+  Count: Integer;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      for I := 0 to TListView(Control).Columns.Count - 1 do begin
+        if ValueExists('ColWidth' + IntToStr(I)) then
+          TListView(Control).Columns[I].Width := ReadInteger('ColWidth' + IntToStr(I));
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          LoadControl(WinControl.Controls[I]);
+        end;
+      end;
+    end;
+  end;
+end;
+
+procedure TPersistentForm.SaveControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      for I := 0 to TListView(Control).Columns.Count - 1 do begin
+        WriteInteger('ColWidth' + IntToStr(I), TListView(Control).Columns[I].Width);
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if Control is TWinControl then begin
+      WinControl := TWinControl(Control);
+      if WinControl.ControlCount > 0 then begin
+        for I := 0 to WinControl.ControlCount - 1 do begin
+          if WinControl.Controls[I] is TControl then begin
+            SaveControl(WinControl.Controls[I]);
+          end;
+        end;
+      end;
+    end;
+end;
 
 procedure TPersistentForm.LoadFromRegistry(RegistryContext: TRegistryContext);
@@ -181 +245 @@
       Form.BoundsRect := FormNormalSize;
   end;
+  LoadControl(Form);
 end;
 
@@ -191 +256 @@
   FormWindowState := Form.WindowState;
   SaveToRegistry(RegistryContext);
+  SaveControl(Form);
 end;
 

trunk/Packages/Common/UScaleDPI.pas

@@ -309 +309 @@
   end;
 
+  if Control is TCoolBar then
+  with TCoolBar(Control) do begin
+    BeginUpdate;
+    for I := 0 to Bands.Count - 1 do
+      with Bands[I] do begin
+        MinWidth := ScaleX(MinWidth, FromDPI.X);
+        MinHeight := ScaleY(MinHeight, FromDPI.Y);
+        Width := ScaleX(Width, FromDPI.X);
+        //Control.Invalidate;
+      end;
+    EndUpdate;
+  end;
+
   if Control is TToolBar then begin
     ToolBarControl := TToolBar(Control);

trunk/Packages/CoolTranslator/UCoolTranslator.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, ExtCtrls, Controls, Contnrs,
-  Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType,
-  LazFileUtils, LazUTF8;
+  Classes, SysUtils, Forms, ExtCtrls, Controls, Contnrs, LazFileUtils, LazUTF8,
+  Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType;
 
 type
@@ -47 +46 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
+    function GetLangFileDir: string;
   public
     ComponentExcludes: TComponentExcludesList;
     Languages: TLanguageList;
+    procedure Translate;
     procedure LanguageListToStrings(Strings: TStrings);
-    procedure Translate;
     procedure TranslateResourceStrings(PoFileName: string);
     procedure TranslateUnitResourceStrings(UnitName: string; PoFileName: string);
@@ -151 +151 @@
   I: Integer;
   LocaleShort: string;
+  SearchMask: string;
 begin
   FPOFiles.Clear;
@@ -158 +159 @@
     //ShowMessage(ExtractFileDir(Application.ExeName) +
     //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
-    FileList := FindAllFiles(ExtractFileDir(UTF8Encode(Application.ExeName)) +
-      DirectorySeparator + FPOFilesFolder, '*.' + LocaleShort + '.po');
+    SearchMask := '*';
+    if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
+    SearchMask := SearchMask + '.po';
+    FileList := FindAllFiles(GetLangFileDir, SearchMask);
     for I := 0 to FileList.Count - 1 do begin
       FileName := FileList[I];
       //FileName := FindLocaleFileName('.po');
-      if FileExistsUTF8(FileName) then FPOFiles.Add(TPOFile.Create(FileName));
+      if FileExists(FileName) and (
+      ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
+      (LocaleShort <> '')) then FPOFiles.Add(TPOFile.Create(FileName));
     end;
   finally
@@ -175 +180 @@
   FPoFilesFolder := AValue;
   ReloadFiles;
+  CheckLanguageFiles;
 end;
 
@@ -191 +197 @@
   PropInfo: PPropInfo;
   PropList: PPropList;
+  Excludes: TComponentExcludes;
 begin
   Count := GetTypeData(Component.ClassInfo)^.PropCount;
@@ -243 +250 @@
           if (UpperCase(PropType.Name) = 'TTRANSLATESTRING') then
           //if not IsExcluded(Component, PropInfo^.Name) then
-              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, GetStrProp(Component, PropInfo)));
+              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, GetWideStrProp(Component, PropInfo)));
         end;
         tkClass: begin
@@ -284 +291 @@
 end;
 
+function TCoolTranslator.GetLangFileDir: string;
+begin
+  Result := FPOFilesFolder;
+  if Copy(Result, 1, 1) <> DirectorySeparator then
+    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+      DirectorySeparator + Result;
+end;
+
 procedure TCoolTranslator.LanguageListToStrings(Strings: TStrings);
 var
@@ -316 +331 @@
   I: Integer;
 begin
+  Result := '';
   if Text <> '' then begin
     for I := 0 to FPoFiles.Count - 1 do begin
@@ -342 +358 @@
 var
   I: Integer;
-begin
+  LangDir: string;
+begin
+  LangDir := GetLangFileDir;
   TLanguage(Languages[0]).Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with TLanguage(Languages[I]) do begin
-    Available := FileExistsUTF8(POFilesFolder + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
       '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
   end;
@@ -381 +399 @@
   T: string;
 begin
-  T := '';
-
   // Win32 user may decide to override locale with LANG variable.
-  Lang := GetEnvironmentVariableUTF8('LANG');
+  Lang := GetEnvironmentVariable('LANG');
 
   // Use user selected language
@@ -392 +408 @@
   if Lang = '' then begin
     for i := 1 to Paramcount - 1 do
-      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-        (ParamStrUTF8(i) = '--lang') then
-        Lang := ParamStrUTF8(i + 1);
+      if (ParamStr(i) = '--LANG') or (ParamStr(i) = '-l') or
+        (ParamStr(i) = '--lang') then
+        Lang := ParamStr(i + 1);
   end;
   if Lang = '' then
-    LazGetLanguageIDs(Lang, T);
+    LCLGetLanguageIDs(Lang, T);
 
   if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin
@@ -403 +419 @@
   end;
 
-  if Lang = 'en' then Lang := ''; // English files are without en code
-
   Result := Lang;
 end;
@@ -415 +429 @@
 function TCoolTranslator.FindLocaleFileName(LCExt: string): string;
 var
+  T: string;
   Lang: string;
 begin
@@ -424 +439 @@
     Exit;
 
-  Result := ChangeFileExt(ParamStrUTF8(0), LCExt);
+  Result := ChangeFileExt(ParamStr(0), LCExt);
   if FileExistsUTF8(Result) then
     Exit;