Changeset 210

Timestamp:

Sep 20, 2021, 2:37:10 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated windows installer script to use InnoSetup 6.
• Fixed: Correctly scale toolbar with images.

Location:

trunk

Files:

• AcronymDecoder.lpr (modified) (1 diff)
• Install/win/AcronymDecoder.iss (modified) (3 diffs)
• Install/win/build.bat (modified) (1 diff)
• Packages/Common/UScaleDPI.pas (modified) (2 diffs)
• UCore.pas (modified) (2 diffs)

trunk/AcronymDecoder.lpr

@@ -26 +26 @@
   {$ENDIF}
 
-  Application.Title := 'Acronym Decoder';
+  Application.Title:='Acronym Decoder';
   RequireDerivedFormResource := True;
   Application.Initialize;

trunk/Install/win/AcronymDecoder.iss

@@ -36 +36 @@
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppPublisherShort}\{#MyAppName}
+DefaultDirName={commonpf}\{#MyAppPublisherShort}\{#MyAppName}
 DefaultGroupName={#MyAppPublisherShort}\{#MyAppName}
 AllowNoIcons=yes
@@ -51 +51 @@
 ; installation to run on all architectures (including Itanium,
 ; since it's capable of running 32-bit code too).
+WizardStyle=modern 
 
 [Languages]
@@ -61 +62 @@
 
 [Registry]
-Root: HKCU; Subkey: "Software\Chronosoft\Acronym Decoder"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Chronosoft\Acronym Decoder"; Flags: uninsdeletekey
 
 #define FileTypeName "Acronym Decoder project"

trunk/Install/win/build.bat

@@ -18 +18 @@
 copy %MAIN_EXE% %WIN64_EXE%
 
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "%PROJECTNAME%.iss"
+"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%PROJECTNAME%.iss"

trunk/Packages/Common/UScaleDPI.pas

@@ -313 +313 @@
     //AutoSize := False;
     //Anchors := [];
-    Left := ScaleX(Left, FromDPI.X);
-    Top := ScaleY(Top, FromDPI.Y);
-    //if not (akRight in Anchors) then
-    Width := ScaleX(Width, FromDPI.X);
-    //if not (akBottom in Anchors) then
-    Height := ScaleY(Height, FromDPI.Y);
+    BoundsRect := Bounds(ScaleX(Left, FromDPI.X), ScaleY(Top, FromDPI.Y),
+      ScaleX(Width, FromDPI.X), ScaleY(Height, FromDPI.Y));
     {$IFDEF LCL Qt}
       Font.Size := 0;
@@ -352 +348 @@
     ToolBarControl := TToolBar(Control);
     with ToolBarControl do begin
-      ButtonWidth := ScaleX(ButtonWidth, FromDPI.X);
-      ButtonHeight := ScaleY(ButtonHeight, FromDPI.Y);
+      //SetButtonSize(ScaleX(ButtonWidth, FromDPI.X), ScaleY(ButtonHeight, FromDPI.Y));
     end;
   end;

trunk/UCore.pas

@@ -126 +126 @@
 
 function TCore.GetAppShareDir(Dir: string): string;
+{$IFDEF Linux}
 var
   NewDir: string;
+{$ENDIF}
 begin
   Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
@@ -256 +258 @@
   //Core.ScaleDPI1.DPI := Point(200, 200);
   {$IFDEF WINDOWS}
-  Core.ScaleDPI1.ScaleImageList(ImageList1, Core.ScaleDPI1.DesignDPI);
+   Core.ScaleDPI1.ScaleImageList(ImageList1, Core.ScaleDPI1.DesignDPI);
   {$ENDIF}
 end;