Changeset 210 for trunk


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/AcronymDecoder.lpr

    r208 r210  
    2626  {$ENDIF}
    2727
    28   Application.Title := 'Acronym Decoder';
     28  Application.Title:='Acronym Decoder';
    2929  RequireDerivedFormResource := True;
    3030  Application.Initialize;
  • trunk/Install/win/AcronymDecoder.iss

    r202 r210  
    3636AppSupportURL={#MyAppURL}
    3737AppUpdatesURL={#MyAppURL}
    38 DefaultDirName={pf}\{#MyAppPublisherShort}\{#MyAppName}
     38DefaultDirName={commonpf}\{#MyAppPublisherShort}\{#MyAppName}
    3939DefaultGroupName={#MyAppPublisherShort}\{#MyAppName}
    4040AllowNoIcons=yes
     
    5151; installation to run on all architectures (including Itanium,
    5252; since it's capable of running 32-bit code too).
     53WizardStyle=modern
    5354
    5455[Languages]
     
    6162
    6263[Registry]
    63 Root: HKCU; Subkey: "Software\Chronosoft\Acronym Decoder"; Flags: uninsdeletekey
     64Root: HKLM; Subkey: "Software\Chronosoft\Acronym Decoder"; Flags: uninsdeletekey
    6465
    6566#define FileTypeName "Acronym Decoder project"
  • trunk/Install/win/build.bat

    r169 r210  
    1818copy %MAIN_EXE% %WIN64_EXE%
    1919
    20 "c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "%PROJECTNAME%.iss"
     20"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%PROJECTNAME%.iss"
  • trunk/Packages/Common/UScaleDPI.pas

    r207 r210  
    313313    //AutoSize := False;
    314314    //Anchors := [];
    315     Left := ScaleX(Left, FromDPI.X);
    316     Top := ScaleY(Top, FromDPI.Y);
    317     //if not (akRight in Anchors) then
    318     Width := ScaleX(Width, FromDPI.X);
    319     //if not (akBottom in Anchors) then
    320     Height := ScaleY(Height, FromDPI.Y);
     315    BoundsRect := Bounds(ScaleX(Left, FromDPI.X), ScaleY(Top, FromDPI.Y),
     316      ScaleX(Width, FromDPI.X), ScaleY(Height, FromDPI.Y));
    321317    {$IFDEF LCL Qt}
    322318      Font.Size := 0;
     
    352348    ToolBarControl := TToolBar(Control);
    353349    with ToolBarControl do begin
    354       ButtonWidth := ScaleX(ButtonWidth, FromDPI.X);
    355       ButtonHeight := ScaleY(ButtonHeight, FromDPI.Y);
     350      //SetButtonSize(ScaleX(ButtonWidth, FromDPI.X), ScaleY(ButtonHeight, FromDPI.Y));
    356351    end;
    357352  end;
  • trunk/UCore.pas

    r209 r210  
    126126
    127127function TCore.GetAppShareDir(Dir: string): string;
     128{$IFDEF Linux}
    128129var
    129130  NewDir: string;
     131{$ENDIF}
    130132begin
    131133  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
     
    256258  //Core.ScaleDPI1.DPI := Point(200, 200);
    257259  {$IFDEF WINDOWS}
    258   Core.ScaleDPI1.ScaleImageList(ImageList1, Core.ScaleDPI1.DesignDPI);
     260   Core.ScaleDPI1.ScaleImageList(ImageList1, Core.ScaleDPI1.DesignDPI);
    259261  {$ENDIF}
    260262end;
Note: See TracChangeset for help on using the changeset viewer.