diff --git a/sample/console/publisher/ConsolePublisher.dpr b/sample/console/publisher/ConsolePublisher.dpr index f1222e0..0b19323 100644 --- a/sample/console/publisher/ConsolePublisher.dpr +++ b/sample/console/publisher/ConsolePublisher.dpr @@ -3,11 +3,7 @@ program ConsolePublisher; {$APPTYPE CONSOLE} uses - madExcept, - madListHardware, - madListProcesses, - madListModules, - Example.Basic in 'src\Example.Basic.pas', + Example.Basic in 'src\Example.Basic.pas', Example.Action.Header in 'src\Example.Action.Header.pas', Example.Priorities in 'src\Example.Priorities.pas', Example.Messages in 'src\Example.Messages.pas', diff --git a/sample/console/publisher/ConsolePublisher.dproj b/sample/console/publisher/ConsolePublisher.dproj index 1934e93..2358b94 100644 --- a/sample/console/publisher/ConsolePublisher.dproj +++ b/sample/console/publisher/ConsolePublisher.dproj @@ -1,7 +1,7 @@  {224C086E-78F0-48EB-887E-8657B3378D53} - 19.5 + 19.2 None True Debug @@ -34,12 +34,6 @@ true true - - true - Cfg_1 - true - true - true Base @@ -90,10 +84,6 @@ C:\Users\PRG1\Documents\Embarcadero\Studio\Projects\(None) INDY;$(BRCC_Defines) - - madExcept;$(DCC_Define) - 3 - false RELEASE;$(DCC_Define) @@ -117,6 +107,10 @@ + + Cfg_2 + Base + Base @@ -124,10 +118,6 @@ Cfg_1 Base - - Cfg_2 - Base - Delphi.Personality.12 @@ -142,23 +132,28 @@ ConsolePublisher.dpr - - - + + + + ConsolePublisher.exe true - + + + true + + + true - - + + true - 1 @@ -171,14 +166,14 @@ 0 - + classes - 64 + 1 classes - 64 + 1 @@ -472,11 +467,6 @@ 1 .framework - - Contents\MacOS - 1 - .framework - 0 @@ -490,7 +480,7 @@ 1 .dylib - + 1 .dylib @@ -504,11 +494,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .dll;.bpl @@ -523,7 +508,7 @@ 1 .dylib - + 1 .dylib @@ -537,11 +522,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .bpl @@ -560,7 +540,7 @@ 0 - + 0 @@ -571,417 +551,379 @@ Contents\Resources\StartUp\ 0 - - Contents\Resources\StartUp\ - 0 - 0 - - - 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\ 1 - + + + 1 + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\ 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents\Resources 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\Resources 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + library\lib\armeabi-v7a 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + library\lib\arm64-v8a + 1 + + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 0 + + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - - - + + + + - - - + + True diff --git a/sample/console/subscriber/CompileTime.inc b/sample/console/subscriber/CompileTime.inc deleted file mode 100644 index 893aff6..0000000 --- a/sample/console/subscriber/CompileTime.inc +++ /dev/null @@ -1,33 +0,0 @@ -{ **************************************************************************** } -{ } -{ This is a generated file; } -{ all edits will be lost at next compile or } -{ at next CodeInsight activation. } -{ } -{ **************************************************************************** } -{ } -{ Y:\ntfy-for-delphi\sample\console\subscriber\ConsoleSubscriber.dproj } -{ } -{ **************************************************************************** } -{ } -{ Copyright (c)2002-2011 Marco Wobben } -{ EMail marcow@bcp-software.nl } -{ Website www.bcp-software.nl } -{ CompileTime 28 Apr 2022 - 18:10:03 } -{ } -{ To enable the compiler optimizer every line } -{ has it's own const so unused const values } -{ may be removed if unused. } -{ } -{ **************************************************************************** } - -const CompileTime: TDateTime = 45091.4536829745; { 14/06/2023 10:53:18 } -const CompileProject = 'Y:\ntfy-for-delphi\sample\console\subscriber\ConsoleSubscriber.dproj'; -const CompileUnits = 1; -const CompileForms = 1; -const CompileBy = 'marcowobben'; { Compiled by user } -const CompileEMail = ''; { Contact email } -const CompileURL = ''; { Contact url } -const CompilePC = 'MARCOWOBBEN384'; { Compiled at computer } -const CompileOS = 'Windows NT v10.0 build 22621'; { Compiled with OS } -const CompileWith = ' Embarcadero BDS 22.0'; { Compiled with Borland product } diff --git a/sample/console/subscriber/ConsoleSubscriber.dpr b/sample/console/subscriber/ConsoleSubscriber.dpr index eea489f..abc3e99 100644 --- a/sample/console/subscriber/ConsoleSubscriber.dpr +++ b/sample/console/subscriber/ConsoleSubscriber.dpr @@ -5,11 +5,7 @@ program ConsoleSubscriber; {$R *.res} uses - madExcept, - madListHardware, - madListProcesses, - madListModules, - Notify; + Notify; begin diff --git a/sample/console/subscriber/ConsoleSubscriber.dproj b/sample/console/subscriber/ConsoleSubscriber.dproj index 4148235..2a26ffe 100644 --- a/sample/console/subscriber/ConsoleSubscriber.dproj +++ b/sample/console/subscriber/ConsoleSubscriber.dproj @@ -1,7 +1,7 @@  {BD9BF17B-BCA3-481B-87F3-FA137EB753A8} - 19.5 + 19.2 None True Debug @@ -93,8 +93,6 @@ ..\..\..\lib\$(Platform) ..\..\..\bin\$(Platform) (None) - madExcept;$(DCC_Define) - 3 false @@ -106,6 +104,10 @@ MainSource + + Cfg_2 + Base + Base @@ -113,10 +115,6 @@ Cfg_1 Base - - Cfg_2 - Base - Delphi.Personality.12 @@ -131,7 +129,12 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + + + + true + + true @@ -142,12 +145,12 @@ true - - + + + ConsoleSubscriber.exe true - 1 @@ -160,14 +163,14 @@ 0 - + classes - 64 + 1 classes - 64 + 1 @@ -461,11 +464,6 @@ 1 .framework - - Contents\MacOS - 1 - .framework - 0 @@ -479,7 +477,7 @@ 1 .dylib - + 1 .dylib @@ -493,11 +491,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .dll;.bpl @@ -512,7 +505,7 @@ 1 .dylib - + 1 .dylib @@ -526,11 +519,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .bpl @@ -549,7 +537,7 @@ 0 - + 0 @@ -560,417 +548,379 @@ Contents\Resources\StartUp\ 0 - - Contents\Resources\StartUp\ - 0 - 0 - - - 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\ 1 - + + + 1 + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\ 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents\Resources 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\Resources 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + library\lib\armeabi-v7a 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + library\lib\arm64-v8a + 1 + + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 0 + + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - - - + + + + - - - + + True diff --git a/sample/vcl/publisher/CompileTime.inc b/sample/vcl/publisher/CompileTime.inc deleted file mode 100644 index 846169f..0000000 --- a/sample/vcl/publisher/CompileTime.inc +++ /dev/null @@ -1,33 +0,0 @@ -{ **************************************************************************** } -{ } -{ This is a generated file; } -{ all edits will be lost at next compile or } -{ at next CodeInsight activation. } -{ } -{ **************************************************************************** } -{ } -{ Y:\ntfy-for-delphi\sample\vcl\publisher\VCLPublisher.dproj } -{ } -{ **************************************************************************** } -{ } -{ Copyright (c)2002-2011 Marco Wobben } -{ EMail marcow@bcp-software.nl } -{ Website www.bcp-software.nl } -{ CompileTime 28 Apr 2022 - 18:10:03 } -{ } -{ To enable the compiler optimizer every line } -{ has it's own const so unused const values } -{ may be removed if unused. } -{ } -{ **************************************************************************** } - -const CompileTime: TDateTime = 45091.4531844444; { 14/06/2023 10:52:35 } -const CompileProject = 'Y:\ntfy-for-delphi\sample\vcl\publisher\VCLPublisher.dproj'; -const CompileUnits = 8; -const CompileForms = 8; -const CompileBy = 'marcowobben'; { Compiled by user } -const CompileEMail = ''; { Contact email } -const CompileURL = ''; { Contact url } -const CompilePC = 'MARCOWOBBEN384'; { Compiled at computer } -const CompileOS = 'Windows NT v10.0 build 22621'; { Compiled with OS } -const CompileWith = ' Embarcadero BDS 22.0'; { Compiled with Borland product } diff --git a/sample/vcl/publisher/VCLPublisher.dpr b/sample/vcl/publisher/VCLPublisher.dpr index ba17be3..9db9a0a 100644 --- a/sample/vcl/publisher/VCLPublisher.dpr +++ b/sample/vcl/publisher/VCLPublisher.dpr @@ -1,11 +1,7 @@ program VCLPublisher; uses - madExcept, - madListHardware, - madListProcesses, - madListModules, - Vcl.Forms, + Vcl.Forms, View.Main in 'src\View.Main.pas' {ViewMain}, Vcl.Themes, Vcl.Styles; diff --git a/sample/vcl/publisher/VCLPublisher.dproj b/sample/vcl/publisher/VCLPublisher.dproj index ab9becd..b973ef7 100644 --- a/sample/vcl/publisher/VCLPublisher.dproj +++ b/sample/vcl/publisher/VCLPublisher.dproj @@ -1,7 +1,7 @@  {B1DB003C-7A88-4F85-9722-B510837B29B1} - 19.5 + 19.2 VCL True Debug @@ -110,8 +110,6 @@ true PerMonitorV2 true - madExcept;$(DCC_Define) - 3 false @@ -135,6 +133,10 @@
ViewMain
dfm + + Cfg_2 + Base + Base @@ -142,10 +144,6 @@ Cfg_1 Base - - Cfg_2 - Base - Delphi.Personality.12 @@ -160,9 +158,20 @@ VCLPublisher.dpr - - - + + + + Assets\ + Logo44x44.png + true + + + + + VCLPublisher.exe + true + + 1 @@ -175,14 +184,14 @@ 0 - + classes - 64 + 1 classes - 64 + 1 @@ -476,11 +485,6 @@ 1 .framework - - Contents\MacOS - 1 - .framework - 0 @@ -494,7 +498,7 @@ 1 .dylib - + 1 .dylib @@ -508,11 +512,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .dll;.bpl @@ -527,7 +526,7 @@ 1 .dylib - + 1 .dylib @@ -541,11 +540,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .bpl @@ -564,7 +558,7 @@ 0 - + 0 @@ -575,417 +569,379 @@ Contents\Resources\StartUp\ 0 - - Contents\Resources\StartUp\ - 0 - 0 - - - 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\ 1 - + + + 1 + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\ 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents\Resources 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\Resources 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + library\lib\armeabi-v7a 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + library\lib\arm64-v8a + 1 + + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 0 + + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - - - + + + + - - - + + True diff --git a/sample/vcl/publisher/VCLPublisher.res b/sample/vcl/publisher/VCLPublisher.res index 280b92a..d723f06 100644 Binary files a/sample/vcl/publisher/VCLPublisher.res and b/sample/vcl/publisher/VCLPublisher.res differ diff --git a/sample/vcl/publisher/src/View.Main.dfm b/sample/vcl/publisher/src/View.Main.dfm index fc250d6..951274d 100644 --- a/sample/vcl/publisher/src/View.Main.dfm +++ b/sample/vcl/publisher/src/View.Main.dfm @@ -10,8 +10,10 @@ object ViewMain: TViewMain Font.Height = -11 Font.Name = 'Tahoma' Font.Style = [] + OldCreateOrder = False Position = poScreenCenter OnCreate = FormCreate + PixelsPerInch = 96 TextHeight = 13 object gpInfo: TGroupBox AlignWithMargins = True @@ -30,8 +32,6 @@ object ViewMain: TViewMain Padding.Right = 3 Padding.Bottom = 3 TabOrder = 0 - ExplicitWidth = 567 - ExplicitHeight = 667 object lbPriority: TLabel Left = 12 Top = 488 @@ -85,7 +85,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'File' TabOrder = 5 - Text = '' TextHint = 'Attach file...' end object btnFileAttachment: TButton @@ -106,7 +105,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'URL Attachment' TabOrder = 7 - Text = '' TextHint = 'Url to an attachment...' end object lbeIconAttachment: TLabeledEdit @@ -118,7 +116,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'Icon Attachment' TabOrder = 4 - Text = '' TextHint = 'Attach icon url...' end object lbeEmail: TLabeledEdit @@ -130,7 +127,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'Email' TabOrder = 3 - Text = '' TextHint = 'someone@mail.com' end object lbeTitle: TLabeledEdit @@ -164,7 +160,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'Delay' TabOrder = 8 - Text = '' TextHint = 'Delay (1h, 10min, 15s)' end object btnPublish: TButton @@ -219,7 +214,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'Username' TabOrder = 12 - Text = '' TextHint = '(optional)' end object LbePassword: TLabeledEdit @@ -231,7 +225,6 @@ object ViewMain: TViewMain EditLabel.Height = 13 EditLabel.Caption = 'Password' TabOrder = 13 - Text = '' TextHint = '(Optional)' end object CkDisableFirebase: TCheckBox diff --git a/sample/vcl/publisher/src/View.Main.pas b/sample/vcl/publisher/src/View.Main.pas index 8999e16..2d41a26 100644 --- a/sample/vcl/publisher/src/View.Main.pas +++ b/sample/vcl/publisher/src/View.Main.pas @@ -8,7 +8,7 @@ interface Vcl.Imaging.pngimage, Notify, Vcl.CheckLst, Data.DB, Vcl.Grids, Vcl.DBGrids, FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param, FireDAC.Stan.Error, FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, - FireDAC.Comp.DataSet, FireDAC.Comp.Client, Vcl.Mask; + FireDAC.Comp.DataSet, FireDAC.Comp.Client; type TViewMain = class(TForm) diff --git a/sample/vcl/subscriber/CompileTime.inc b/sample/vcl/subscriber/CompileTime.inc deleted file mode 100644 index e49342a..0000000 --- a/sample/vcl/subscriber/CompileTime.inc +++ /dev/null @@ -1,33 +0,0 @@ -{ **************************************************************************** } -{ } -{ This is a generated file; } -{ all edits will be lost at next compile or } -{ at next CodeInsight activation. } -{ } -{ **************************************************************************** } -{ } -{ Y:\ntfy-for-delphi\sample\vcl\subscriber\VCLSubscriber.dproj } -{ } -{ **************************************************************************** } -{ } -{ Copyright (c)2002-2011 Marco Wobben } -{ EMail marcow@bcp-software.nl } -{ Website www.bcp-software.nl } -{ CompileTime 28 Apr 2022 - 18:10:03 } -{ } -{ To enable the compiler optimizer every line } -{ has it's own const so unused const values } -{ may be removed if unused. } -{ } -{ **************************************************************************** } - -const CompileTime: TDateTime = 45091.4533863657; { 14/06/2023 10:52:52 } -const CompileProject = 'Y:\ntfy-for-delphi\sample\vcl\subscriber\VCLSubscriber.dproj'; -const CompileUnits = 5; -const CompileForms = 5; -const CompileBy = 'marcowobben'; { Compiled by user } -const CompileEMail = ''; { Contact email } -const CompileURL = ''; { Contact url } -const CompilePC = 'MARCOWOBBEN384'; { Compiled at computer } -const CompileOS = 'Windows NT v10.0 build 22621'; { Compiled with OS } -const CompileWith = ' Embarcadero BDS 22.0'; { Compiled with Borland product } diff --git a/sample/vcl/subscriber/VCLSubscriber.dpr b/sample/vcl/subscriber/VCLSubscriber.dpr index 11798be..ce6c858 100644 --- a/sample/vcl/subscriber/VCLSubscriber.dpr +++ b/sample/vcl/subscriber/VCLSubscriber.dpr @@ -1,11 +1,7 @@ program VCLSubscriber; uses - madExcept, - madListHardware, - madListProcesses, - madListModules, - Vcl.Forms, + Vcl.Forms, View.Main in 'src\View.Main.pas' {ViewMain}, Example.Push.Notifications in 'src\Example.Push.Notifications.pas', Vcl.Themes, diff --git a/sample/vcl/subscriber/VCLSubscriber.dproj b/sample/vcl/subscriber/VCLSubscriber.dproj index 40d9d2e..d482003 100644 --- a/sample/vcl/subscriber/VCLSubscriber.dproj +++ b/sample/vcl/subscriber/VCLSubscriber.dproj @@ -1,7 +1,7 @@  {9428E452-9D25-42D7-846A-018BFA597B01} - 19.5 + 19.2 VCL True Debug @@ -114,8 +114,6 @@ true PerMonitorV2 true - madExcept;$(DCC_Define) - 3 false @@ -140,6 +138,10 @@ dfm + + Cfg_2 + Base + Base @@ -147,10 +149,6 @@ Cfg_1 Base - - Cfg_2 - Base - Delphi.Personality.12 @@ -165,9 +163,20 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - - + + + + VCLSubscriber.exe + true + + + + + Assets\ + Logo44x44.png + true + + 1 @@ -180,14 +189,14 @@ 0 - + classes - 64 + 1 classes - 64 + 1 @@ -481,11 +490,6 @@ 1 .framework - - Contents\MacOS - 1 - .framework - 0 @@ -499,7 +503,7 @@ 1 .dylib - + 1 .dylib @@ -513,11 +517,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .dll;.bpl @@ -532,7 +531,7 @@ 1 .dylib - + 1 .dylib @@ -546,11 +545,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .bpl @@ -569,7 +563,7 @@ 0 - + 0 @@ -580,417 +574,379 @@ Contents\Resources\StartUp\ 0 - - Contents\Resources\StartUp\ - 0 - 0 - - - 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\ 1 - + + + 1 + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\ 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents\Resources 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\Resources 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + library\lib\armeabi-v7a 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + library\lib\arm64-v8a + 1 + + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 0 + + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - - - + + + + - - - + + True diff --git a/sample/vcl/subscriber/VCLSubscriber.res b/sample/vcl/subscriber/VCLSubscriber.res index 5e9bb50..78f3b4d 100644 Binary files a/sample/vcl/subscriber/VCLSubscriber.res and b/sample/vcl/subscriber/VCLSubscriber.res differ diff --git a/src/Notify.Api.Indy.pas b/src/Notify.Api.Indy.pas index 48ee46d..64d3a6e 100644 --- a/src/Notify.Api.Indy.pas +++ b/src/Notify.Api.Indy.pas @@ -173,14 +173,6 @@ function TNotifyApiIndy.Config(const AValue: INotifyConfig): INotifyApi; begin Result := Self; FNotifyConfig := AValue; - - if aValue.ProxyServer <> '' then - begin - FIdHttp.ProxyParams.ProxyServer := aValue.ProxyServer; - FIdHttp.ProxyParams.ProxyUsername := aValue.ProxyUser; - FIdHttp.ProxyParams.ProxyPassword := aValue.ProxyPassword; - FIdHttp.ProxyParams.ProxyPort := aValue.ProxyPort; - end; end; constructor TNotifyApiIndy.Create; diff --git a/src/Notify.Config.Contract.pas b/src/Notify.Config.Contract.pas index cb650ad..2579ba6 100644 --- a/src/Notify.Config.Contract.pas +++ b/src/Notify.Config.Contract.pas @@ -24,11 +24,6 @@ interface function LogPath(const AValue: String): INotifyConfig; overload; function SubscriptionType: TNotifySubscriptionType; overload; function SubscriptionType(const AValue: TNotifySubscriptionType): INotifyConfig; overload; - function ProxyServer: string; overload; - function ProxyUser: string; overload; - function ProxyPassword: string; overload; - function ProxyPort: integer; overload; - function Proxy(const aProxyServer, aProxyUser, aProxyPassword: string; const aProxyPort: integer): INotifyConfig; overload; end; implementation diff --git a/src/Notify.Config.pas b/src/Notify.Config.pas index 4301b97..9117930 100644 --- a/src/Notify.Config.pas +++ b/src/Notify.Config.pas @@ -17,8 +17,6 @@ TNotifyConfig = class sealed(TInterfacedObject, INotifyConfig) FSaveLog: Boolean; FLogPath: String; FSubscriptionType: TNotifySubscriptionType; - FProxyServer, FProxyUser, FProxyPassword: string; - FProxyPort: integer; public class function New: INotifyConfig; private @@ -39,11 +37,6 @@ TNotifyConfig = class sealed(TInterfacedObject, INotifyConfig) function LogPath(const AValue: String): INotifyConfig; overload; function SubscriptionType: TNotifySubscriptionType; overload; function SubscriptionType(const AValue: TNotifySubscriptionType): INotifyConfig; overload; - function ProxyServer: string; overload; - function ProxyUser: string; overload; - function ProxyPassword: string; overload; - function ProxyPort: integer; overload; - function Proxy(const aProxyServer, aProxyUser, aProxyPassword: string; const aProxyPort: integer): INotifyConfig; overload; end; implementation @@ -71,10 +64,6 @@ constructor TNotifyConfig.Create; FCache := True; FLogPath := ExtractFilePath(ParamStr(0)); FSubscriptionType := TNotifySubscriptionType.JSON; - FProxyServer := ''; - FProxyUser := ''; - FProxyPassword := ''; - FProxyPort := 0; end; function TNotifyConfig.DisableFireBase(const AValue: Boolean): INotifyConfig; @@ -125,35 +114,6 @@ function TNotifyConfig.Password(const AValue: String): INotifyConfig; FPassword := AValue; end; -function TNotifyConfig.Proxy(const aProxyServer, aProxyUser, - aProxyPassword: string; const aProxyPort: integer): INotifyConfig; -begin - FProxyServer := aProxyServer; - FProxyUser := aProxyUser; - FProxyPassword := aProxyPassword; - FProxyPort := aProxyPort; -end; - -function TNotifyConfig.ProxyPassword: string; -begin - Result := FProxyPassword; -end; - -function TNotifyConfig.ProxyPort: integer; -begin - Result := FProxyPort; -end; - -function TNotifyConfig.ProxyServer: string; -begin - Result := FProxyServer; -end; - -function TNotifyConfig.ProxyUser: string; -begin - Result := FProxyUser; -end; - function TNotifyConfig.SaveLog(const AValue: Boolean): INotifyConfig; begin Result := Self; diff --git a/src/Notify.Core.Contract.pas b/src/Notify.Core.Contract.pas index 1b61885..71e0619 100644 --- a/src/Notify.Core.Contract.pas +++ b/src/Notify.Core.Contract.pas @@ -36,7 +36,6 @@ interface function Since(const AValue: String): INotifyCore; overload; function Scheduled(const AValue: Boolean): INotifyCore; overload; function Response: TNotifyApiResponse; - function Proxy(const aProxyServer, aProxyUser, aProxyPassword: string; const aProxyPort: integer): INotifyCore; overload; end; INotifyCoreFacade = interface diff --git a/src/Notify.Core.pas b/src/Notify.Core.pas index d8c504b..980b7ad 100644 --- a/src/Notify.Core.pas +++ b/src/Notify.Core.pas @@ -1,5 +1,7 @@ unit Notify.Core; + interface + uses System.SysUtils, Notify.Types, @@ -11,6 +13,7 @@ interface Notify.Event.Contract, NX.Horizon, Notify.Api.Response; + type TNotifyCore = class sealed(TInterfacedObject, INotifyCore) strict private @@ -50,7 +53,6 @@ TNotifyCore = class sealed(TInterfacedObject, INotifyCore) function UserName(const AValue: String): INotifyCore; function Password(const AValue: String): INotifyCore; function BaseURL(const AValue: String): INotifyCore; - function Proxy(const aProxyServer, aProxyUser, aProxyPassword: string; const aProxyPort: integer): INotifyCore; function DisableFireBase(const AValue: Boolean): INotifyCore; function Notification(const ANotification: INotifyNotification): INotifyCore; overload; function Filter(const AFilterType: TNotifyFilter; const AValue: String): INotifyCore; @@ -64,7 +66,9 @@ TNotifyCore = class sealed(TInterfacedObject, INotifyCore) procedure LoadLibraries(const ALibName: String); procedure WithAuthentication; end; + implementation + uses System.NetEncoding, System.Generics.Collections, @@ -78,30 +82,38 @@ implementation Notify.Action.Contract, Notify.Attachment.Contract, Winapi.Windows; + { TNotifyCore } + function TNotifyCore.BaseURL(const AValue: String): INotifyCore; begin Result := Self; FConfig.BaseURL(AValue); end; + procedure TNotifyCore.BasicValidation; begin if FNotification.Topic = '' then raise Exception.Create('Topic cannot be empty'); + if FConfig.BaseURL = '' then raise Exception.Create('Base Url cannot be empty'); + end; + function TNotifyCore.Cache(const AValue: Boolean): INotifyCore; begin Result := Self; FConfig.Cache(AValue); end; + function TNotifyCore.ClearFilters: INotifyCore; begin Result := Self; FFilterParameters.Clear; FApi.ClearHeaders; end; + constructor TNotifyCore.Create; begin FApi := TNotifyCoreFacade.New.Api; @@ -110,17 +122,20 @@ constructor TNotifyCore.Create; FEventMessage := TNotifyCoreFacade.New.Event; FFilterParameters := TDictionary.Create; end; + destructor TNotifyCore.Destroy; begin UnsubscribeEventBus; FFilterParameters.Free; inherited; end; + function TNotifyCore.DisableFireBase(const AValue: Boolean): INotifyCore; begin Result := Self; FConfig.DisableFireBase(AValue); end; + procedure TNotifyCore.DoLoadLibrary; begin try @@ -130,6 +145,7 @@ procedure TNotifyCore.DoLoadLibrary; raise Exception.Create(E.Message); end; end; + procedure TNotifyCore.DoSubscribe; begin if (FConfig.SubscriptionType = TNotifySubscriptionType.JSON) then @@ -141,15 +157,20 @@ procedure TNotifyCore.DoSubscribe; else SubscribeAsWebSocket; end; + function TNotifyCore.Filter(const AFilterType: TNotifyFilter; const AValue: String): INotifyCore; begin Result := Self; + if AValue = '' then Exit; + if FFilterParameters.ContainsValue(NotifyFilterTypeDescription[AFilterType]) then Exit; + FFilterParameters.Add(NotifyFilterTypeDescription[AFilterType], AValue); end; + procedure TNotifyCore.ConsoleLogEvent; {$IFDEF CONSOLE} var @@ -158,8 +179,10 @@ procedure TNotifyCore.ConsoleLogEvent; LAttachment: INotifyAttachment; {$ENDIF} begin + if not FConfig.SaveLog then Exit; + {$IFDEF CONSOLE} if FConfig.SaveLog then begin @@ -172,25 +195,32 @@ procedure TNotifyCore.ConsoleLogEvent; Writeln(Format('Title: %s', [FEventMessage.Title])); Writeln(Format('Priority: %d', [Ord(FEventMessage.Priority)])); Writeln(Format('Click: %s', [FEventMessage.Click])); + for LTag in FEventMessage.Tags do Writeln(Format('Tag: %s', [LTag])); + for LAction in FEventMessage.Actions.Values do begin + Writeln(Format('Action Type: %s', [GetEnumName(TypeInfo(TNotifyActionType), Integer(LAction.&Type))])); Writeln(Format('Action Label: %s', [LAction.&Label])); // comment this line to edit this function Writeln(Format('Action Url: %s', [LAction.Url])); Writeln(Format('Action Clear: %s', [LAction.Clear.ToString])); Writeln(Format('Action Method: %s', [LAction.Method])); Writeln(Format('Action Body: %s', [LAction.Body])); + if Assigned(LAction.Headers) then begin Writeln(Format('Action Headers: %s', [TJsonDto(LAction.Headers).AsJson])); end; + end; end; {$ENDIF} + if not Assigned(FEventMessage.Attachment) then Exit; + {$IFDEF CONSOLE} if FConfig.SaveLog then begin @@ -202,7 +232,9 @@ procedure TNotifyCore.ConsoleLogEvent; Writeln(Format('Attachment Expires: %s', [LAttachment.Expires.ToString])); end; {$ENDIF} + end; + procedure TNotifyCore.LoadLibraries(const ALibName: String); var LSavedCW: Word; @@ -225,20 +257,24 @@ procedure TNotifyCore.LoadLibraries(const ALibName: String); raise Exception.Create(Format('Could not load %s library. Errors: %s', [ALibName, LError])); end end; + function TNotifyCore.LogPath(const AValue: String): INotifyCore; begin Result := Self; FConfig.LogPath(AValue); end; + class function TNotifyCore.New: INotifyCore; begin Result := Self.Create; end; + function TNotifyCore.Notification(const ANotification: INotifyNotification): INotifyCore; begin Result := Self; FNotification := ANotification; end; + procedure TNotifyCore.Subscribe(const ATopic: String; const ACallBack: TNotifyEventProc); begin FNotification.Topic(ATopic); @@ -247,18 +283,22 @@ procedure TNotifyCore.Subscribe(const ATopic: String; const ACallBack: TNotifyEv FCallBack := ACallBack; Subscribe; end; + procedure TNotifyCore.SubscribeAsJSONString; begin + if FConfig.SaveLog then begin {$IFDEF CONSOLE} Writeln('Subscribing to topic: ' + FNotification.Topic); {$ENDIF} end; + FApi .AddEndPoint(FNotification.Topic + '/json') .Get; end; + procedure TNotifyCore.SubscribeAsRawStream; begin raise Exception.Create('Raw string implementation is not supported for the moment'); @@ -267,6 +307,7 @@ procedure TNotifyCore.SubscribeAsRawStream; // .AddEndPoint(FNotification.Topic + '/raw') // .Get; end; + procedure TNotifyCore.SubscribeAsSSEStream; begin raise Exception.Create('SSE implementation is not supported for the moment'); @@ -275,6 +316,7 @@ procedure TNotifyCore.SubscribeAsSSEStream; // .AddEndPoint(FNotification.Topic + '/sse') // .ConnectWebSocket; end; + procedure TNotifyCore.SubscribeAsWebSocket; begin raise Exception.Create('Websocket implementation is not supported for the moment'); @@ -283,74 +325,86 @@ procedure TNotifyCore.SubscribeAsWebSocket; // .AddEndPoint(FNotification.Topic + '/ws') // .ConnectWebSocket; end; + function TNotifyCore.SubscriptionType(const AValue: TNotifySubscriptionType): INotifyCore; begin Result := Self; FConfig.SubscriptionType(AValue); end; + function TNotifyCore.Password(const AValue: String): INotifyCore; begin Result := Self; FConfig.Password(AValue); end; + function TNotifyCore.Poll(const AValue: Boolean): INotifyCore; begin Result := Self; FPoll := AValue; end; -function TNotifyCore.Proxy(const aProxyServer, aProxyUser, - aProxyPassword: string; const aProxyPort: integer): INotifyCore; -begin - FConfig.Proxy(aProxyServer, aProxyUser, aProxyPassword, aProxyPort); -end; function TNotifyCore.Publish: INotifyCore; begin Result := Self; DoLoadLibrary; BasicValidation; + FApi .ClearEndPoint .ClearURLParameters .Config(FConfig) .ClearHeaders .ClearBody; + if (FConfig.Cache = False) then FApi.AddHeader('Cache', 'no'); + if (FConfig.DisableFireBase) then FApi.AddHeader('Firebase', 'no'); + WithAuthentication; + if FNotification.FileName <> '' then begin SendFile; Exit; end; + if FNotification.Icon <> '' then FApi.AddHeader('Icon', FNotification.Icon); + FApi .AddBody(FNotification.AsJSONString) .Post; + end; + function TNotifyCore.Response: TNotifyApiResponse; begin Result := FApi.Response; end; + function TNotifyCore.SaveLog(const AValue: Boolean): INotifyCore; begin Result := Self; FConfig.SaveLog(AValue); end; + function TNotifyCore.Scheduled(const AValue: Boolean): INotifyCore; begin Result := Self; FScheduled := AValue; end; + function TNotifyCore.SendFile: INotifyCore; var LFileStream: TSmartPointer; begin Result := Self; + LFileStream := TFileStream.Create(FNotification.FilePath, fmOpenRead); + FApi .AddBody(LFileStream.Value) .AddHeader('Filename', FNotification.FileName) @@ -364,52 +418,70 @@ function TNotifyCore.SendFile: INotifyCore; .AddHeader('Topic', FNotification.Topic) .AddEndPoint(FNotification.Topic) .Put; + end; + function TNotifyCore.Since(const AValue: String): INotifyCore; begin Result := Self; FSince := AValue; end; + function TNotifyCore.Subscribe: INotifyCore; var LFilterKey, LFilterValue: String; begin Result := Self; + if (not Assigned(FMesssagesSubscription)) or (FMesssagesSubscription.IsCanceled) then FMesssagesSubscription := NxHorizon .Instance .Subscribe(MainSync, SubscriptionEvent); + FApi .Config(FConfig) .ClearURLParameters; + if FPoll then FApi.AddURLParameter('poll', '1'); + if FSince <> '' then FApi.AddURLParameter('since', FSince); + if FScheduled then FApi.AddURLParameter('sched', '1'); + for LFilterKey in FFilterParameters.Keys do begin FFilterParameters.TryGetValue(LFilterKey, LFilterValue); FApi.AddURLParameter(LFilterKey, LFilterValue); end; + WithAuthentication; + DoSubscribe; + end; + function TNotifyCore.Topic(const AValue: String): INotifyCore; begin Result := Self; FNotification.Topic(AValue); end; + function TNotifyCore.Unsubscribe: INotifyCore; begin Result := Self; + {$IFDEF CONSOLE} // raise Exception.Create('Unsubscribe for console application is not supported. Kill the process.'); {$ENDIF} + UnsubscribeEventBus; FApi.AbortStream; + end; + procedure TNotifyCore.UnsubscribeEventBus; begin if Assigned(FMesssagesSubscription) then @@ -419,11 +491,13 @@ procedure TNotifyCore.UnsubscribeEventBus; NxHorizon.Instance.Unsubscribe(FMesssagesSubscription); end; end; + function TNotifyCore.UserName(const AValue: String): INotifyCore; begin Result := Self; FConfig.UserName(AValue); end; + procedure TNotifyCore.WithAuthentication; var LUserNamePassword: String; @@ -437,13 +511,16 @@ procedure TNotifyCore.WithAuthentication; FApi.AddHeader('Authorization', LBasicAuth); end; end; + procedure TNotifyCore.SubscriptionEvent(const AEvent: TNotifySubscriptionEvent); var LEventDTO: TSmartPointer; LActionDTO: TNotifyActionDTO; LEventAttachmentDTO: TSmartPointer; begin + LEventDTO.Value.AsJson := UnicodeString(AEvent); + if (LEventDTO.Value.Event = NotifyMessageEventArray[TNotifyMessageEvent.OPEN]) then begin {$IF DEFINED(CONSOLE)} @@ -451,6 +528,7 @@ procedure TNotifyCore.SubscriptionEvent(const AEvent: TNotifySubscriptionEvent); Writeln('Press Ctrl + C to kill the process.'); {$IFEND} end; + if (LEventDTO.Value.Id <> '') and (LEventDTO.Value.Event = NotifyMessageEventArray[TNotifyMessageEvent.MSG]) then begin FEventMessage @@ -465,6 +543,7 @@ procedure TNotifyCore.SubscriptionEvent(const AEvent: TNotifySubscriptionEvent); .Priority(TNotifyPriority(LEventDTO.Value.Priority)) .Click(LEventDTO.Value.Click) .Icon(LEventDTO.Value.Icon); + for LActionDTO in LEventDTO.Value.Actions do FEventMessage.Action( TNotifyCoreFacade.New.Action @@ -476,6 +555,7 @@ procedure TNotifyCore.SubscriptionEvent(const AEvent: TNotifySubscriptionEvent); .Body(LActionDTO.Body) .EventHeaders(LActionDTO.Headers) ); + if Assigned(LEventDTO.Value.Attachment) then begin LEventAttachmentDTO := LEventDTO.Value.Attachment; @@ -488,9 +568,14 @@ procedure TNotifyCore.SubscriptionEvent(const AEvent: TNotifySubscriptionEvent); .Expires(LEventAttachmentDTO.Value.Expires) ); end; + if Assigned(FCallBack) then FCallBack(FEventMessage); + ConsoleLogEvent; + end; + end; + end. diff --git a/tests/CompileTime.inc b/tests/CompileTime.inc deleted file mode 100644 index 84e2313..0000000 --- a/tests/CompileTime.inc +++ /dev/null @@ -1,33 +0,0 @@ -{ **************************************************************************** } -{ } -{ This is a generated file; } -{ all edits will be lost at next compile or } -{ at next CodeInsight activation. } -{ } -{ **************************************************************************** } -{ } -{ Y:\ntfy-for-delphi\tests\NtfyForDelphiTests.dproj } -{ } -{ **************************************************************************** } -{ } -{ Copyright (c)2002-2011 Marco Wobben } -{ EMail marcow@bcp-software.nl } -{ Website www.bcp-software.nl } -{ CompileTime 28 Apr 2022 - 18:10:03 } -{ } -{ To enable the compiler optimizer every line } -{ has it's own const so unused const values } -{ may be removed if unused. } -{ } -{ **************************************************************************** } - -const CompileTime: TDateTime = 45091.4537787268; { 14/06/2023 10:53:26 } -const CompileProject = 'Y:\ntfy-for-delphi\tests\NtfyForDelphiTests.dproj'; -const CompileUnits = 47; -const CompileForms = 47; -const CompileBy = 'marcowobben'; { Compiled by user } -const CompileEMail = ''; { Contact email } -const CompileURL = ''; { Contact url } -const CompilePC = 'MARCOWOBBEN384'; { Compiled at computer } -const CompileOS = 'Windows NT v10.0 build 22621'; { Compiled with OS } -const CompileWith = ' Embarcadero BDS 22.0'; { Compiled with Borland product } diff --git a/tests/NtfyForDelphiTests.dpr b/tests/NtfyForDelphiTests.dpr index 752d433..01caceb 100644 --- a/tests/NtfyForDelphiTests.dpr +++ b/tests/NtfyForDelphiTests.dpr @@ -15,11 +15,7 @@ program NtfyForDelphiTests; {$ENDIF} uses - madExcept, - madListHardware, - madListProcesses, - madListModules, - DUnitTestRunner, + DUnitTestRunner, Notify in '..\src\Notify.pas', Notify.Action.Contract in '..\src\Notify.Action.Contract.pas', Notify.Action.DTO in '..\src\Notify.Action.DTO.pas', diff --git a/tests/NtfyForDelphiTests.dproj b/tests/NtfyForDelphiTests.dproj index d16c726..2709bb1 100644 --- a/tests/NtfyForDelphiTests.dproj +++ b/tests/NtfyForDelphiTests.dproj @@ -1,7 +1,7 @@  {10C284B6-056D-40B9-B3D3-D9197F71EC7F} - 19.5 + 19.2 None True Debug @@ -86,8 +86,6 @@ (None) - madExcept;$(DCC_Define) - 3 false @@ -140,6 +138,10 @@ + + Cfg_2 + Base + Base @@ -147,10 +149,6 @@ Cfg_1 Base - - Cfg_2 - Base - Delphi.Personality.12 @@ -165,7 +163,12 @@ NtfyForDelphiTests.dpr - + + + + true + + true @@ -176,12 +179,12 @@ true - - + + + NtfyForDelphiTests.exe true - 1 @@ -194,14 +197,14 @@ 0 - + classes - 64 + 1 classes - 64 + 1 @@ -495,11 +498,6 @@ 1 .framework - - Contents\MacOS - 1 - .framework - 0 @@ -513,7 +511,7 @@ 1 .dylib - + 1 .dylib @@ -527,11 +525,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .dll;.bpl @@ -546,7 +539,7 @@ 1 .dylib - + 1 .dylib @@ -560,11 +553,6 @@ 1 .dylib - - Contents\MacOS - 1 - .dylib - 0 .bpl @@ -583,7 +571,7 @@ 0 - + 0 @@ -594,417 +582,379 @@ Contents\Resources\StartUp\ 0 - - Contents\Resources\StartUp\ - 0 - 0 - - - 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\ - 1 - - - ..\ + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Contents - 1 - - - Contents + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - Contents\Resources - 1 - - - Contents\Resources + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - Contents\Resources + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 1 - - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Contents\MacOS + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - 0 - - - - - library\lib\armeabi-v7a + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - + - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - ..\ - 1 - + - ..\ + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - ..\ + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - - - 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 - + - ..\$(PROJECTNAME).launchscreen - 64 - - - ..\$(PROJECTNAME).launchscreen - 64 + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - Assets + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - Assets + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + ..\ 1 - + + + 1 + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - + - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + ..\$(PROJECTNAME).launchscreen + 64 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 + + ..\$(PROJECTNAME).launchscreen + 64 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + ..\ 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + ..\ 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + Contents\Resources 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + Contents\Resources 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + + library\lib\armeabi-v7a 1 - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + + library\lib\arm64-v8a + 1 + + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Contents\MacOS 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 0 + + + + + library\lib\armeabi-v7a 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + + Assets 1 - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + + Assets 1 - - - - - + + + + - - - + + True