From 482ab59bc2de3a0b723abcb7501aed60626b2a69 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sat, 23 Jun 2012 22:49:55 +0300 Subject: [PATCH] Additional change to 34b59f9 --- SkinInstaller/DialogPackage.cpp | 30 ++++++++++++++++++++++++++++-- SkinInstaller/DialogPackage.h | 1 + SkinInstaller/SkinInstaller.rc | 4 ++-- SkinInstaller/resource.h | 4 +++- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/SkinInstaller/DialogPackage.cpp b/SkinInstaller/DialogPackage.cpp index 684bc573..a03b49b5 100644 --- a/SkinInstaller/DialogPackage.cpp +++ b/SkinInstaller/DialogPackage.cpp @@ -1008,7 +1008,12 @@ INT_PTR CDialogPackage::CTabInfo::OnNotify(WPARAM wParam, LPARAM lParam) break; case NM_CLICK: - c_Dialog->ShowHelp(); + { + if (nm->idFrom == IDC_PACKAGEINFO_WHATIS_LINK) + { + c_Dialog->ShowHelp(); + } + } break; default: @@ -1281,7 +1286,7 @@ INT_PTR CALLBACK CDialogPackage::CTabAdvanced::DlgProc(HWND hWnd, UINT uMsg, WPA return c_Dialog->m_TabAdvanced.OnCommand(wParam, lParam); case WM_NOTIFY: - return c_Dialog->m_TabInfo.OnNotify(wParam, lParam); // Redirect to m_TabInfo + return c_Dialog->m_TabAdvanced.OnNotify(wParam, lParam); } return FALSE; @@ -1333,3 +1338,24 @@ INT_PTR CDialogPackage::CTabAdvanced::OnCommand(WPARAM wParam, LPARAM lParam) return TRUE; } + +INT_PTR CDialogPackage::CTabAdvanced::OnNotify(WPARAM wParam, LPARAM lParam) +{ + LPNMHDR nm = (LPNMHDR)lParam; + switch (nm->code) + { + case NM_CLICK: + { + if (nm->idFrom == IDC_PACKAGEADVANCED_HELP_LINK) + { + c_Dialog->ShowHelp(); + } + } + break; + + default: + return FALSE; + } + + return TRUE; +} \ No newline at end of file diff --git a/SkinInstaller/DialogPackage.h b/SkinInstaller/DialogPackage.h index 9fd103b4..7d4d7a11 100644 --- a/SkinInstaller/DialogPackage.h +++ b/SkinInstaller/DialogPackage.h @@ -71,6 +71,7 @@ private: static INT_PTR CALLBACK DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR OnCommand(WPARAM wParam, LPARAM lParam); + INT_PTR OnNotify(WPARAM wParam, LPARAM lParam); }; CDialogPackage(HWND wnd); diff --git a/SkinInstaller/SkinInstaller.rc b/SkinInstaller/SkinInstaller.rc index 6691c091..3e9944d3 100644 --- a/SkinInstaller/SkinInstaller.rc +++ b/SkinInstaller/SkinInstaller.rc @@ -97,7 +97,7 @@ FONT 8, "MS Shell Dlg 2" PUSHBUTTON "Add theme...", IDC_PACKAGEINFO_ADDTHEME_BUTTON, 194, 144, 70, 14 PUSHBUTTON "Add plugin...", IDC_PACKAGEINFO_ADDPLUGIN_BUTTON, 194, 162, 70, 14 PUSHBUTTON "Remove", IDC_PACKAGEINFO_REMOVE_BUTTON, 194, 197, 70, 14, WS_DISABLED - CONTROL "What is a .rmskin package?", IDC_STATIC, "SysLink", 0x0, 0, 225, 264, 9 + CONTROL "What is a .rmskin package?", IDC_PACKAGEINFO_WHATIS_LINK, "SysLink", 0x0, 0, 225, 264, 9 } IDD_PACKAGEOPTIONS_TAB DIALOGEX 15, 30, 270, 220 @@ -137,7 +137,7 @@ FONT 8, "MS Shell Dlg 2" LTEXT "Variables files:", IDC_STATIC, 0, 24, 85, 9 EDITTEXT IDC_PACKAGEADVANCED_VARIABLEFILES_EDIT, 90, 21, 180, 14, ES_AUTOHSCROLL | WS_TABSTOP AUTOCHECKBOX "Merge skins", IDC_PACKAGEADVANCED_MERGESKINS_CHECK, 0, 42, 85, 9, WS_TABSTOP - CONTROL "Help", IDC_STATIC, "SysLink", 0x0, 0, 210, 264, 9 + CONTROL "Help", IDC_PACKAGEADVANCED_HELP_LINK, "SysLink", 0x0, 0, 210, 264, 9 } IDD_PACKAGESELECTFOLDER_DIALOG DIALOGEX 0, 0, 200, 100 diff --git a/SkinInstaller/resource.h b/SkinInstaller/resource.h index 15160745..0db54782 100644 --- a/SkinInstaller/resource.h +++ b/SkinInstaller/resource.h @@ -1,4 +1,4 @@ -#define IDC_STATIC -1 +#define IDC_STATIC -1 #define IDI_SKININSTALLER 100 #define IDB_INSTALLHEADER 101 #define IDD_INSTALL_DIALOG 102 @@ -36,6 +36,7 @@ #define IDC_PACKAGEINFO_ADDTHEME_BUTTON 1005 #define IDC_PACKAGEINFO_ADDPLUGIN_BUTTON 1006 #define IDC_PACKAGEINFO_REMOVE_BUTTON 1007 +#define IDC_PACKAGEINFO_WHATIS_LINK 1008 #define IDC_PACKAGEOPTIONS_FILE_EDIT 1000 #define IDC_PACKAGEOPTIONS_FILEBROWSE_BUTTON 1001 @@ -54,6 +55,7 @@ #define IDC_PACKAGEADVANCED_HEADERROWSE_BUTTON 1001 #define IDC_PACKAGEADVANCED_VARIABLEFILES_EDIT 1002 #define IDC_PACKAGEADVANCED_MERGESKINS_CHECK 1003 +#define IDC_PACKAGEADVANCED_HELP_LINK 1004 #define IDC_PACKAGESELECTFOLDER_EXISTING_RADIO 1000 #define IDC_PACKAGESELECTFOLDER_EXISTING_COMBO 1001