WifiStatus: Make WifiStatus a measure

whitequill · Nov 29, 2021 · e066e93 · e066e93
1 parent e381a9d
commit e066e93
Show file tree

Hide file tree

Showing 11 changed files with 474 additions and 530 deletions.
diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi
@@ -833,6 +833,7 @@ Function HandlePlugins
 	${OrIf} $R7 == "RecycleManager.dll"
 	${OrIf} $R7 == "SysInfo.dll"
 	${OrIf} $R7 == "WebParser.dll"
+	${OrIf} $R7 == "WifiStatus.dll"
 		Delete "$R9"
 	${ElseIf} $R7 != "ActionTimer.dll"
 	${AndIf} $R7 != "AdvancedCPU.dll"
@@ -852,7 +853,6 @@ Function HandlePlugins
 	${AndIf} $R7 != "SpeedFanPlugin.dll"
 	${AndIf} $R7 != "UsageMonitor.dll"
 	${AndIf} $R7 != "VirtualDesktops.dll"
-	${AndIf} $R7 != "WifiStatus.dll"
 	${AndIf} $R7 != "Win7AudioPlugin.dll"
 	${AndIf} $R7 != "WindowMessagePlugin.dll"
 		CreateDirectory "$INSTDIR\Defaults\Plugins"

diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
@@ -22,7 +22,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Bcrypt.lib;comctl32.lib;dwmapi.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;ws2_32.lib;PowrProf.lib;netapi32.lib;Ntdll.lib;shlwapi.lib;d3d11.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;Imagehlp.lib;Urlmon.lib;psapi.lib;dxguid.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Bcrypt.lib;comctl32.lib;dwmapi.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;ws2_32.lib;PowrProf.lib;netapi32.lib;Ntdll.lib;shlwapi.lib;d3d11.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;Imagehlp.lib;Urlmon.lib;psapi.lib;dxguid.lib;Rpcrt4.lib;wlanapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>Bcrypt.dll;dwmapi.dll;Iphlpapi.dll;Winmm.dll;Version.dll;Imagehlp.dll;Urlmon.dll;psapi.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
       <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
     </Link>
@@ -71,6 +71,7 @@
     <ClCompile Include="MeasureUptime.cpp" />
     <ClCompile Include="MeasureVirtualMemory.cpp" />
     <ClCompile Include="MeasureWebParser.cpp" />
+    <ClCompile Include="MeasureWifiStatus.cpp" />
     <ClCompile Include="Meter.cpp" />
     <ClCompile Include="MeterBar.cpp" />
     <ClCompile Include="MeterBitmap.cpp" />
@@ -164,6 +165,7 @@
     <ClInclude Include="MeasureUptime.h" />
     <ClInclude Include="MeasureVirtualMemory.h" />
     <ClInclude Include="MeasureWebParser.h" />
+    <ClInclude Include="MeasureWifiStatus.h" />
     <ClInclude Include="Meter.h" />
     <ClInclude Include="MeterBar.h" />
     <ClInclude Include="MeterBitmap.h" />

diff --git a/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
@@ -108,6 +108,7 @@
     <ClCompile Include="MeasureUptime.cpp" />
     <ClCompile Include="MeasureVirtualMemory.cpp" />
     <ClCompile Include="MeasureWebParser.cpp" />
+    <ClCompile Include="MeasureWifiStatus.cpp" />
     <ClCompile Include="Meter.cpp" />
     <ClCompile Include="MeterBar.cpp" />
     <ClCompile Include="MeterBitmap.cpp" />
@@ -212,6 +213,7 @@
     <ClInclude Include="MeasureUptime.h" />
     <ClInclude Include="MeasureVirtualMemory.h" />
     <ClInclude Include="MeasureWebParser.h" />
+    <ClInclude Include="MeasureWifiStatus.h" />
     <ClInclude Include="Meter.h" />
     <ClInclude Include="MeterBar.h" />
     <ClInclude Include="MeterBitmap.h" />

diff --git a/Library/Measure.cpp b/Library/Measure.cpp
@@ -29,6 +29,7 @@
 #include "MeasureSysInfo.h"
 #include "MeasureLoop.h"
 #include "MeasureWebParser.h"
+#include "MeasureWifiStatus.h"
 #include "Rainmeter.h"
 #include "Util.h"
 #include "pcre/config.h"
@@ -814,6 +815,10 @@ Measure* Measure::Create(const WCHAR* measure, Skin* skin, const WCHAR* name)
 	{
 		return new MeasureWebParser(skin, name);
 	}
+	else if (_wcsicmp(L"WifiStatus", measure) == 0)
+	{
+		return new MeasureWifiStatus(skin, name);
+	}
 
 	LogErrorF(skin, L"Measure=%s is not valid in [%s]", measure, name);