Skip to content

Commit

Permalink
Fixed Button size issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
LongDirtyAnimAlf committed Dec 30, 2024
1 parent 0348aba commit ec8c061
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 32 deletions.
2 changes: 1 addition & 1 deletion public/gitrevision.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[master]darwin_amd64_crossbins_all-2917(ea1e6a5)
[master]darwin_amd64_crossbins_all-2918(0348aba)
5 changes: 5 additions & 0 deletions sources/crossinstallers/m_any_to_android_base.pas
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@ function Tany_android.GetBinUtils(Basepath:string): boolean;
result:=inherited;
if result then exit;

//https://github.com/android/ndk/wiki/Unsupported-Downloads
//https://dl.google.com/android/repository/android-ndk-r26d-windows.zip
//https://dl.google.com/android/repository/android-ndk-r26d-darwin.dmg
//https://dl.google.com/android/repository/android-ndk-r26d-linux.zip

BinPrefixTry:=BinUtilsPrefix;

AsFile:=BinPrefixTry+ASFILENAME+GetExeExt;
Expand Down
5 changes: 3 additions & 2 deletions sources/fpcup.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2820,12 +2820,13 @@ Description="Build tool, used by LAMW"
; Installdir=$(basedir)/ccr/$(name)/gradle-7.0.2
; Installdir=$(basedir)/ccr/$(name)/gradle-6.8.3
; Installdir=$(basedir)/ccr/$(name)/gradle-7.3.1
Installdir=$(basedir)/ccr/$(name)/gradle-8.2.1
Installdir=$(basedir)/ccr/$(name)/gradle-8.11.1
Enabled=0
; ArchiveURL=https://services.gradle.org/distributions/gradle-7.0.2-bin.zip
; ArchiveURL=https://services.gradle.org/distributions/gradle-6.8.3-bin.zip
; ArchiveURL=https://services.gradle.org/distributions/gradle-7.3.1-bin.zip
ArchiveURL=https://services.gradle.org/distributions/gradle-8.2.1-bin.zip
ArchiveURL=https://services.gradle.org/distributions/gradle-8.11.1-bin.zip
; ArchiveURL=https://github.com/gradle/gradle-distributions/releases/download/v8.11.1/gradle-8.11.1-all.zip
UninstallExecute=$(terminal) $(Installdir)/bin/gradle --stop
UnInstall=rm -Rf $(Installdir)

Expand Down
2 changes: 1 addition & 1 deletion sources/revision.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const
{%H-}DELUXEVERSION='2.4.0f';
{%H-}DELUXEVERSION='2.4.0gp';
{%H-}RevisionStr='506';
{%H-}VersionDate='20241224';
51 changes: 23 additions & 28 deletions sources/updeluxe/extrasettings.lfm
Original file line number Diff line number Diff line change
Expand Up @@ -824,24 +824,24 @@ object Form2: TForm2
object GroupBoxFPCLazScripts: TGroupBox
AnchorSideLeft.Control = grpPatching
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideTop.Control = grpPatching
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 416
Height = 124
Top = 588
Height = 144
Top = 568
Width = 276
Anchors = [akLeft, akBottom]
Anchors = [akTop, akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 24
BorderSpacing.Top = 8
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
BorderSpacing.InnerBorder = 4
Caption = 'Pre and post install scripts'
ClientHeight = 104
ClientHeight = 124
ClientWidth = 272
Enabled = False
ParentFont = False
Expand Down Expand Up @@ -1087,35 +1087,34 @@ object Form2: TForm2
end
end
object ButtonPanel: TPanel
AnchorSideTop.Control = GroupBoxFPCLazScripts
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 736
Height = 89
Top = 623
Height = 144
Top = 568
Width = 98
Anchors = [akRight, akBottom]
Anchors = [akTop, akRight, akBottom]
BorderSpacing.Right = 8
BorderSpacing.Bottom = 8
ClientHeight = 89
ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
ChildSizing.EnlargeVertical = crsHomogenousChildResize
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ClientHeight = 144
ClientWidth = 98
ParentFont = False
TabOrder = 5
object BitBtn1: TBitBtn
AnchorSideLeft.Control = ButtonPanel
AnchorSideTop.Control = ButtonPanel
AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom
Left = 5
Height = 35
Top = 5
Width = 88
Anchors = [akTop, akLeft, akRight, akBottom]
Left = 8
Height = 60
Top = 8
Width = 82
AutoSize = True
BorderSpacing.Left = 4
BorderSpacing.Top = 4
BorderSpacing.Right = 4
BorderSpacing.Around = 8
Constraints.MinHeight = 35
Default = True
DefaultCaption = True
Expand All @@ -1125,20 +1124,16 @@ object Form2: TForm2
TabOrder = 0
end
object BitBtn2: TBitBtn
AnchorSideLeft.Control = ButtonPanel
AnchorSideRight.Control = ButtonPanel
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel
AnchorSideBottom.Side = asrBottom
Left = 5
Height = 35
Top = 49
Width = 88
Anchors = [akLeft, akRight, akBottom]
Left = 8
Height = 60
Top = 76
Width = 82
AutoSize = True
BorderSpacing.Left = 4
BorderSpacing.Right = 4
BorderSpacing.Bottom = 4
BorderSpacing.Around = 8
Cancel = True
Constraints.MinHeight = 35
DefaultCaption = True
Expand Down
Binary file modified up.res
Binary file not shown.

0 comments on commit ec8c061

Please sign in to comment.