键盘指示器、响度计插件增加图标

zhongyang219 · zhongyang219 · commit fae9840fb6c1 · 2025-03-09T17:22:47.000+08:00
diff --git a/Plugins/IpAddress/OptionsDlg.cpp b/Plugins/IpAddress/OptionsDlg.cpp
@@ -60,6 +60,8 @@ BOOL COptionsDlg::OnInitDialog()
 {
     CDialog::OnInitDialog();
 
+    SetIcon(g_data.GetIcon(IDI_IP_ADDRESS), FALSE);
+
     //初始化下拉列表
     InitConnectionsCombobox();
 
diff --git a/Plugins/KeyboardIndicator/KeyboardIndicator.cpp b/Plugins/KeyboardIndicator/KeyboardIndicator.cpp
@@ -86,6 +86,11 @@ void CKeyboardIndicator::OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* d
     }
 }
 
+void* CKeyboardIndicator::GetPluginIcon()
+{
+    return g_data.GetIcon(IDI_ICON1);
+}
+
 bool CKeyboardIndicator::IsCapsLockOn()
 {
     return (GetKeyState(VK_CAPITAL) & 0x0001) != 0;
diff --git a/Plugins/KeyboardIndicator/KeyboardIndicator.h b/Plugins/KeyboardIndicator/KeyboardIndicator.h
@@ -17,6 +17,7 @@ class CKeyboardIndicator : public ITMPlugin
     virtual OptionReturn ShowOptionsDialog(void* hParent) override;
     virtual const wchar_t* GetInfo(PluginInfoIndex index) override;
     virtual void OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* data) override;
+    virtual void* GetPluginIcon() override;
 
     static bool IsCapsLockOn();
     static bool IsNumLockOn();
diff --git a/Plugins/KeyboardIndicator/KeyboardIndicator.rc b/Plugins/KeyboardIndicator/KeyboardIndicator.rc
@@ -148,6 +148,16 @@ BEGIN
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "res\\icon.ico"
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
diff --git a/Plugins/KeyboardIndicator/KeyboardIndicator.vcxproj b/Plugins/KeyboardIndicator/KeyboardIndicator.vcxproj
@@ -269,6 +269,9 @@
   <ItemGroup>
     <ResourceCompile Include="KeyboardIndicator.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\icon.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Plugins/KeyboardIndicator/KeyboardIndicator.vcxproj.filters b/Plugins/KeyboardIndicator/KeyboardIndicator.vcxproj.filters
@@ -77,4 +77,9 @@
       <Filter>资源文件</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\icon.ico">
+      <Filter>资源文件</Filter>
+    </Image>
+  </ItemGroup>
 </Project>
diff --git a/Plugins/KeyboardIndicator/OptionsDlg.cpp b/Plugins/KeyboardIndicator/OptionsDlg.cpp
@@ -36,6 +36,7 @@ END_MESSAGE_MAP()
 BOOL COptionsDlg::OnInitDialog()
 {
     CDialog::OnInitDialog();
+    SetIcon(g_data.GetIcon(IDI_ICON1), FALSE);
 
     CheckDlgButton(IDC_SHOW_CAPS_LOCK_CHECK, m_data.show_caps_lock);
     CheckDlgButton(IDC_SHOW_NUM_LOCK_CHECK, m_data.show_num_lock);
diff --git a/Plugins/KeyboardIndicator/res/icon.ico b/Plugins/KeyboardIndicator/res/icon.ico
diff --git a/Plugins/KeyboardIndicator/resource.h b/Plugins/KeyboardIndicator/resource.h
@@ -5,6 +5,7 @@
 #define IDD_OPTIONS_DIALOG              102
 #define IDS_PLUGIN_NAME                 103
 #define IDS_PLUGIN_DESCRIPTION          104
+#define IDI_ICON1                       104
 #define IDS_PLUGIN_ITEM_NAME            105
 #define IDS_SELECT_AT_LEAST_WARNING     106
 #define IDC_SHOW_CAPS_LOCK_CHECK        1000
@@ -16,7 +17,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_RESOURCE_VALUE        105
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1004
 #define _APS_NEXT_SYMED_VALUE           103
diff --git a/Plugins/LoudnessMeter/LoudnessMeter.cpp b/Plugins/LoudnessMeter/LoudnessMeter.cpp
@@ -111,6 +111,11 @@ void CLoudnessMeter::OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* data)
     }
 }
 
+void* CLoudnessMeter::GetPluginIcon()
+{
+    return g_data.GetIcon(IDI_ICON1);
+}
+
 void CLoudnessMeter::DoDataAcquire()
 {
     float peakValue = 0.0f;
diff --git a/Plugins/LoudnessMeter/LoudnessMeter.h b/Plugins/LoudnessMeter/LoudnessMeter.h
@@ -21,6 +21,7 @@ class CLoudnessMeter : public ITMPlugin
     virtual OptionReturn ShowOptionsDialog(void* hParent) override;
     virtual const wchar_t* GetInfo(PluginInfoIndex index) override;
     virtual void OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* data) override;
+    virtual void* GetPluginIcon() override;
 
 private:
     void DoDataAcquire();
diff --git a/Plugins/LoudnessMeter/LoudnessMeter.rc b/Plugins/LoudnessMeter/LoudnessMeter.rc
@@ -142,6 +142,16 @@ BEGIN
 END
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "res\\icon.ico"
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
diff --git a/Plugins/LoudnessMeter/LoudnessMeter.vcxproj b/Plugins/LoudnessMeter/LoudnessMeter.vcxproj
@@ -267,6 +267,9 @@
   <ItemGroup>
     <ResourceCompile Include="LoudnessMeter.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\icon.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Plugins/LoudnessMeter/LoudnessMeter.vcxproj.filters b/Plugins/LoudnessMeter/LoudnessMeter.vcxproj.filters
@@ -71,4 +71,9 @@
       <Filter>资源文件</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\icon.ico">
+      <Filter>资源文件</Filter>
+    </Image>
+  </ItemGroup>
 </Project>
diff --git a/Plugins/LoudnessMeter/OptionsDlg.cpp b/Plugins/LoudnessMeter/OptionsDlg.cpp
@@ -36,6 +36,7 @@ END_MESSAGE_MAP()
 BOOL COptionsDlg::OnInitDialog()
 {
     CDialog::OnInitDialog();
+    SetIcon(g_data.GetIcon(IDI_ICON1), FALSE);
 
     CheckDlgButton(IDC_SHOW_DB_CHECK, m_data.show_db);
 
diff --git a/Plugins/LoudnessMeter/res/icon.ico b/Plugins/LoudnessMeter/res/icon.ico
diff --git a/Plugins/LoudnessMeter/resource.h b/Plugins/LoudnessMeter/resource.h
@@ -5,6 +5,7 @@
 #define IDD_OPTIONS_DIALOG              102
 #define IDS_PLUGIN_NAME                 103
 #define IDS_PLUGIN_DESCRIPTION          104
+#define IDI_ICON1                       104
 #define IDS_PLUGIN_ITEM_NAME            105
 #define IDS_MUTE                        106
 #define IDC_SHOW_DB_CHECK               1000
@@ -13,7 +14,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_RESOURCE_VALUE        105
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           103

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ BOOL COptionsDlg::OnInitDialog()`
`60`	`60`	`{`
`61`	`61`	`CDialog::OnInitDialog();`
`62`	`62`
	`63`	`+ SetIcon(g_data.GetIcon(IDI_IP_ADDRESS), FALSE);`
	`64`	`+`
`63`	`65`	`//初始化下拉列表`
`64`	`66`	`InitConnectionsCombobox();`
`65`	`67`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,11 @@ void CKeyboardIndicator::OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* d`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+void* CKeyboardIndicator::GetPluginIcon()`
	`90`	`+{`
	`91`	`+ return g_data.GetIcon(IDI_ICON1);`
	`92`	`+}`
	`93`	`+`
`89`	`94`	`bool CKeyboardIndicator::IsCapsLockOn()`
`90`	`95`	`{`
`91`	`96`	`return (GetKeyState(VK_CAPITAL) & 0x0001) != 0;`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ END_MESSAGE_MAP()`
`36`	`36`	`BOOL COptionsDlg::OnInitDialog()`
`37`	`37`	`{`
`38`	`38`	`CDialog::OnInitDialog();`
	`39`	`+ SetIcon(g_data.GetIcon(IDI_ICON1), FALSE);`
`39`	`40`
`40`	`41`	`CheckDlgButton(IDC_SHOW_CAPS_LOCK_CHECK, m_data.show_caps_lock);`
`41`	`42`	`CheckDlgButton(IDC_SHOW_NUM_LOCK_CHECK, m_data.show_num_lock);`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,11 @@ void CLoudnessMeter::OnExtenedInfo(ExtendedInfoIndex index, const wchar_t* data)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
	`114`	`+void* CLoudnessMeter::GetPluginIcon()`
	`115`	`+{`
	`116`	`+ return g_data.GetIcon(IDI_ICON1);`
	`117`	`+}`
	`118`	`+`
`114`	`119`	`void CLoudnessMeter::DoDataAcquire()`
`115`	`120`	`{`
`116`	`121`	`float peakValue = 0.0f;`