Merge pull request #8 from HICalSoft/dst-timechange-support

Dst timechange support
HICalSoft · Apr 17, 2024 · 14ae015 · 14ae015
2 parents 23013b0 + d1735c2
commit 14ae015
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 49 deletions.
diff --git a/OpenAdhanForWindowsX/App.config b/OpenAdhanForWindowsX/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/OpenAdhanForWindowsX/OpenAdhanForWindowsX.csproj b/OpenAdhanForWindowsX/OpenAdhanForWindowsX.csproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>OpenAdhanForWindowsX</RootNamespace>
     <AssemblyName>OpenAdhanForWindows</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -85,6 +86,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <EmbeddedResource Include="Settings.resx">
       <DependentUpon>Settings.cs</DependentUpon>

diff --git a/OpenAdhanForWindowsX/Program.cs b/OpenAdhanForWindowsX/Program.cs
@@ -25,7 +25,17 @@ static void Main()
             // Register the PowerModeChanged event (for waking up from sleep -- https://github.com/HICalSoft/OpenAdhan/issues/1)
             SystemEvents.PowerModeChanged += OnPowerChange;
 
+
             RegistrySettingsHandler rsh = new RegistrySettingsHandler(false);
+
+            // This should handle DST changes (untested :P )  https://github.com/HICalSoft/OpenAdhan/issues/6 
+            // Add condition only if automatic DST adjustment is enabled
+            if (rsh.SafeLoadBoolRegistryValue(RegistrySettingsHandler.automaticDaylightSavingsAdjustmentKey))
+            {
+                SystemEvents.TimeChanged += OnTimeChange;
+            }
+
+
             if (rsh.SafeLoadBoolRegistryValue(RegistrySettingsHandler.minimizeOnStartupKey) &&
                 !rsh.SafeLoadBoolRegistryValue(RegistrySettingsHandler.initialInstallFlagKey))
             {
@@ -44,11 +54,22 @@ private static void OnPowerChange(object s, PowerModeChangedEventArgs e)
             {
                 case PowerModes.Resume:
                     // The computer has woken up from sleep.
-                    // Run scheduleAdhans() here.
-                    prayerTimesControl.scheduleAdhans(form);
+                    refreshPrayerTimes();
                     break;
             }
         }
+
+        private static void OnTimeChange(object s, EventArgs e)
+        {
+            refreshPrayerTimes();
+        }
+
+        private static void refreshPrayerTimes()
+        {
+            prayerTimesControl.calculatePrayerTimes();
+            prayerTimesControl.scheduleAdhans(form);
+            form.updatePrayerTimesDisplay();
+        }
     }
 
     public sealed class PrayerTimesControl

diff --git a/OpenAdhanForWindowsX/Properties/Resources.Designer.cs b/OpenAdhanForWindowsX/Properties/Resources.Designer.cs
diff --git a/OpenAdhanForWindowsX/Properties/Settings.Designer.cs b/OpenAdhanForWindowsX/Properties/Settings.Designer.cs
diff --git a/OpenAdhanRegistrySetupApp/App.config b/OpenAdhanRegistrySetupApp/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/OpenAdhanRegistrySetupApp/OpenAdhanRegistrySetupApp.csproj b/OpenAdhanRegistrySetupApp/OpenAdhanRegistrySetupApp.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>OpenAdhanRegistrySetupApp</RootNamespace>
     <AssemblyName>OpenAdhanRegistrySetupApp</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>