fixes and additions

Reinstated CPU type, speed and usage. Enabled drag and drop for actions. Fixed issue where saving actions with empty lines caused actions to be duplicated. Fixed lines continued on next line not shown when transitioning. Fixed program detection (for screen saver active, prog active, fullscreen active, etc.) was causing relatively high CPU usage. General code cleanup and formatting.
LCD-Smartie · May 31, 2022 · a89d1ac · a89d1ac
1 parent 9e50cf1
commit a89d1ac
Show file tree

Hide file tree

Showing 69 changed files with 9,813 additions and 1,397 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,7 @@ release-dir/openssl/.rnd
 release-dir/openssl/cert.pem
 release-dir/openssl/key.pem
 # ignore extracted components
-components/WinampCtrl
+components/WinampCtrl/*
 # ignore lazarus backups
 backup
 *.bak

diff --git a/BUILDING.txt b/BUILDING.txt
@@ -6,11 +6,10 @@ Required Components
 This project requires the following components to be installed and in
 the projects path:
  - WinampCtrl.
+     This can be found in the components sub-directory
 
-This can be found in the components sub-directory
-
-Indy 10
-This can be installed via lazarus package manager
+ - Indy 10
+     This can be installed via lazarus package manager
 
 Install all components before loading the LCD Smartie project.
 

diff --git a/DLL example/vcppdotnetplugin/vcppdotnetplugin.vcproj.THEBEAST.Ant.user b/DLL example/vcppdotnetplugin/vcppdotnetplugin.vcproj.THEBEAST.Ant.user
diff --git a/LCDSmartie.lpi b/LCDSmartie.lpi
@@ -87,6 +87,14 @@
               <ShowHintsForUnusedUnitsInMainSrc Value="True"/>
               <ShowHintsForSenderNotUsed Value="True"/>
             </Verbosity>
+            <CustomOptions Value="-CPPACKRECORD=8
+-SIcom
+-WR
+-dBorland
+-dVer150
+-dDelphi7
+-dCompiler6_Up
+-dPUREPASCAL"/>
             <OtherDefines Count="5">
               <Define0 Value="Borland"/>
               <Define1 Value="Ver150"/>
@@ -106,18 +114,25 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <UnitOutputDirectory Value="x64\fuo"/>
+            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
             <ObjectPath Value="components\CoolTrayIcon"/>
           </SearchPaths>
           <Parsing>
-            <Style Value="1"/>
             <SyntaxOptions>
               <SyntaxMode Value="Delphi"/>
+              <IncludeAssertionCode Value="True"/>
               <UseAnsiStrings Value="False"/>
             </SyntaxOptions>
           </Parsing>
           <CodeGeneration>
             <SmartLinkUnit Value="True"/>
+            <Checks>
+              <IOChecks Value="True"/>
+              <RangeChecks Value="True"/>
+              <OverflowChecks Value="True"/>
+              <StackChecks Value="True"/>
+            </Checks>
+            <VerifyObjMethodCallValidity Value="True"/>
             <TargetCPU Value="x86_64"/>
             <TargetOS Value="win64"/>
           </CodeGeneration>
@@ -148,13 +163,18 @@
               <ShowHintsForSenderNotUsed Value="True"/>
             </Verbosity>
             <CustomOptions Value="-CPPACKRECORD=8
--SIcom
--WR
 -dBorland
 -dVer150
 -dDelphi7
 -dCompiler6_Up
 -dPUREPASCAL"/>
+            <OtherDefines Count="5">
+              <Define0 Value="Borland"/>
+              <Define1 Value="Ver150"/>
+              <Define2 Value="Delphi7"/>
+              <Define3 Value="Compiler6_Up"/>
+              <Define4 Value="PUREPASCAL"/>
+            </OtherDefines>
           </Other>
         </CompilerOptions>
       </Item3>
@@ -168,16 +188,16 @@
     </RunParams>
     <RequiredPackages Count="6">
       <Item1>
-        <PackageName Value="RunTimeTypeInfoControls"/>
+        <PackageName Value="ExceptionLogger"/>
       </Item1>
       <Item2>
-        <PackageName Value="LazControls"/>
+        <PackageName Value="RunTimeTypeInfoControls"/>
       </Item2>
       <Item3>
-        <PackageName Value="WinampCtrl7"/>
+        <PackageName Value="LazControls"/>
       </Item3>
       <Item4>
-        <PackageName Value="ExceptionLogger"/>
+        <PackageName Value="WinampCtrl7"/>
       </Item4>
       <Item5>
         <PackageName Value="indylaz"/>
@@ -346,7 +366,7 @@
   <Debugging>
     <Exceptions Count="4">
       <Item1>
-        <Name Value="EIdOSSLCouldNotLoadSSLLibrary"/>
+        <Name Value="EConvertError"/>
       </Item1>
       <Item2>
         <Name Value="EIdHTTPProtocolException"/>
@@ -355,7 +375,7 @@
         <Name Value="EIdSocketError"/>
       </Item3>
       <Item4>
-        <Name Value="EConvertError"/>
+        <Name Value="Exception"/>
       </Item4>
     </Exceptions>
   </Debugging>

diff --git a/LCDSmartie.lpr b/LCDSmartie.lpr
@@ -5,7 +5,7 @@
 uses
   {madExcept,
   madLinkDisAsm,}
-  Forms, Interfaces,
+  Forms, Interfaces, SysUtils,
   UMain  {LCDSmartieDisplayForm};
 
 {$R *.res}

diff --git a/LegacyPluginLoader/LegacyLoader.lpi → LegacyLoader/LegacyLoader.lpi b/LegacyPluginLoader/LegacyLoader.lpi → LegacyLoader/LegacyLoader.lpi
diff --git a/LegacyPluginLoader/LegacyLoader.pas → LegacyLoader/LegacyLoader.pas b/LegacyPluginLoader/LegacyLoader.pas → LegacyLoader/LegacyLoader.pas
diff --git a/SmartieConfigEditor.lpi b/SmartieConfigEditor.lpi
@@ -107,9 +107,6 @@
         <CompilerOptions>
           <Version Value="11"/>
           <PathDelim Value="\"/>
-          <Target>
-            <Filename Value="x64\release-dir\SmartieConfigEditor"/>
-          </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>

diff --git a/Smartiegroupbuild.lpg b/Smartiegroupbuild.lpg
diff --git a/UConfig.pas b/UConfig.pas
@@ -339,8 +339,11 @@ function TConfig.loadINI: Boolean;
     screen[ScreenCount].settings.theme := initFile.ReadInteger(sScreen, 'Theme', 1)-1;
     screen[ScreenCount].settings.showTime := initFile.ReadInteger(sScreen, 'ShowTime', 10);
     screen[ScreenCount].settings.bSticky := initFile.ReadBool(sScreen, 'Sticky', false);
+
     screen[ScreenCount].settings.TransitionTime := initFile.ReadInteger(sScreen, 'TransitionTime', 20);
+    screen[ScreenCount].settings.TransitionTime := initFile.ReadInteger(sScreen, 'InteractionTime', 20); // compatibilty to be removed in later version
     screen[ScreenCount].settings.TransitionStyle := TTransitionStyle(initFile.ReadInteger(sScreen, 'TransitionStyle',1));
+    screen[ScreenCount].settings.TransitionStyle := TTransitionStyle(initFile.ReadInteger(sScreen, 'Interaction',1)); // compatibilty to be removed in later version
 
     for LineCount := 1 to MaxLines do
     begin
@@ -547,7 +550,11 @@ procedure TConfig.saveINI;
     initFile.WriteInteger(sScreen, 'Theme', screen[ScreenCount].settings.theme + 1);
     initFile.WriteInteger(sScreen, 'ShowTime', screen[ScreenCount].settings.showTime);
     initfile.WriteBool(sScreen, 'Sticky', screen[ScreenCount].settings.bSticky);
+
+    initFile.WriteInteger(sScreen, 'InteractionTime', screen[ScreenCount].settings.TransitionTime); // compatibilty to be removed in later version
     initFile.WriteInteger(sScreen, 'TransitionTime', screen[ScreenCount].settings.TransitionTime);
+
+    initFile.WriteInteger(sScreen, 'Interaction', ord(screen[ScreenCount].settings.TransitionStyle));  // compatibilty to be removed in later version
     initFile.WriteInteger(sScreen, 'TransitionStyle', ord(screen[ScreenCount].settings.TransitionStyle));
 
     for LineCount := 1 to MaxLines do