Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all references to CPUARM define #130

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Remove all references to CPUARM define #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a66255
Remove all references to CPUARM
lighterowl Feb 2, 2025
f35fa5a
ffs
lighterowl Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/build_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fpc_lazarus_build_install() {
make_fpc_cfg

cd "$sdk_dir"
local -r lazarus_commit='dab5c509c6fd70f8fac2144e468291899286616f'
local -r lazarus_commit='cf6b6acfad7d35bcb97d9f763c1f9b7c1ecc2a5d'
curl -L -o lazarus-src.tar.bz2 "https://gitlab.com/dkk089/lazarus/-/archive/${lazarus_commit}/lazarus-${lazarus_commit}.tar.bz2"
tar xf lazarus-src.tar.bz2
mv "lazarus-${lazarus_commit}" lazarus
Expand Down
14 changes: 0 additions & 14 deletions main.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2912,13 +2912,11 @@ function TMainForm.DoAddTorrent(const FileName: Utf8String): boolean;

procedure TMainForm.UpdateTray;
begin
{$ifndef CPUARM}
TrayIcon.Visible:=not IsUnity and
(Ini.ReadBool('Interface', 'TrayIconAlways', True) or
((WindowState = wsMinimized) and Ini.ReadBool('Interface', 'TrayMinimize', True) ) or
(not Self.Visible and Ini.ReadBool('Interface', 'TrayClose', False) )
);
{$endif CPUARM}

{$ifdef darwin}
acShowApp.Visible:=False;
Expand Down Expand Up @@ -2959,12 +2957,10 @@ procedure TMainForm.ShowApp;

procedure TMainForm.DownloadFinished(const TorrentName: string);
begin
{$ifndef CPUARM}
if not TrayIcon.Visible or not Ini.ReadBool('Interface', 'TrayNotify', True) then exit;
TrayIcon.BalloonHint:=Format(sFinishedDownload, [TorrentName]);
TrayIcon.BalloonTitle:=sDownloadComplete;
TrayIcon.ShowBalloonHint;
{$endif CPUARM}
end;

function TMainForm.GetFlagImage(const CountryCode: string): integer;
Expand Down Expand Up @@ -4110,10 +4106,6 @@ procedure TMainForm.ApplicationPropertiesIdle(Sender: TObject; var Done: Boolean

procedure TMainForm.ApplicationPropertiesMinimize(Sender: TObject);
begin
{$ifdef CPUARM}
exit;
{$endif CPUARM}

{$ifndef darwin}
if not IsUnity and Ini.ReadBool('Interface', 'TrayMinimize', True) then
HideApp;
Expand Down Expand Up @@ -4739,12 +4731,6 @@ procedure TMainForm.FilterTimerTimer(Sender: TObject);

procedure TMainForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
{$ifdef CPUARM}
// CloseAction:=caMinimize;
BeforeCloseApp;
exit;
{$endif CPUARM}

if Ini.ReadBool('Interface', 'TrayClose', False) then begin
{$ifdef darwin}
CloseAction:=caMinimize;
Expand Down
Loading