Add Help button to PluginsList dialog

diff --git a/Src/HexMergeView.cpp b/Src/HexMergeView.cpp
index 15e5e5b..30231cd 100644 (file)
--- a/Src/HexMergeView.cpp
+++ b/Src/HexMergeView.cpp
@@ -24,6 +24,9 @@
 #define new DEBUG_NEW
 #endif
 
+/** @brief Location for hex compare specific help to open. */
+static TCHAR HexMergeViewHelpLocation[] = _T("::/htmlhelp/Compare_bin.html");
+
 /**
  * @brief Turn bool api result into success/error code
  */
@@ -61,6 +64,7 @@ BEGIN_MESSAGE_MAP(CHexMergeView, CView)
        ON_WM_HSCROLL()
        ON_WM_VSCROLL()
        ON_WM_NCCALCSIZE()
+       ON_COMMAND(ID_HELP, OnHelp)
        ON_COMMAND(ID_EDIT_FIND, OnEditFind)
        ON_COMMAND(ID_EDIT_REPLACE, OnEditReplace)
        ON_COMMAND(ID_EDIT_REPEAT, OnEditRepeat)
@@ -535,6 +539,12 @@ void CHexMergeView::OnPrevdiff()
        m_pif->select_prev_diff(FALSE);
 }
 
+/** @brief Open help from mainframe when user presses F1*/
+void CHexMergeView::OnHelp()
+{
+       theApp.ShowHelp(HexMergeViewHelpLocation);
+}
+
 void CHexMergeView::ZoomText(int amount)
 {
        m_pif->CMD_zoom(amount);

diff --git a/Src/HexMergeView.h b/Src/HexMergeView.h
index df4a0a6..61e40ed 100644 (file)
--- a/Src/HexMergeView.h
+++ b/Src/HexMergeView.h
@@ -85,6 +85,7 @@ protected:
        afx_msg void OnLastdiff();
        afx_msg void OnNextdiff();
        afx_msg void OnPrevdiff();
+       afx_msg void OnHelp();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 8037dd3..53fcbd9 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -36,6 +36,9 @@
 #define new DEBUG_NEW
 #endif
 
+/** @brief Location for image compare specific help to open. */
+static const TCHAR ImgMergeFrameHelpLocation[] = _T("::/htmlhelp/Compare_images.html");
+
 /////////////////////////////////////////////////////////////////////////////
 // CImgMergeFrame
 
@@ -138,6 +141,7 @@ BEGIN_MESSAGE_MAP(CImgMergeFrame, CMergeFrameCommon)
        ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport)
        ON_COMMAND(ID_REFRESH, OnRefresh)
        ON_WM_SETFOCUS ()
+       ON_COMMAND(ID_HELP, OnHelp)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -2083,3 +2087,12 @@ void CImgMergeFrame::OnSetFocus(CWnd* pNewWnd)
        if (m_nActivePane != -1)
                m_pImgMergeWindow->SetActivePane(m_nActivePane);
 }
+
+
+/**
+ * @brief Open help from mainframe when user presses F1
+ */
+void CImgMergeFrame::OnHelp()
+{
+       theApp.ShowHelp(ImgMergeFrameHelpLocation);
+}

diff --git a/Src/ImgMergeFrm.h b/Src/ImgMergeFrm.h
index c610a4d..828f7f9 100644 (file)
--- a/Src/ImgMergeFrm.h
+++ b/Src/ImgMergeFrm.h
@@ -210,6 +210,7 @@ private:
        afx_msg void OnToolsGenerateReport();
        afx_msg void OnRefresh();
        afx_msg void OnSetFocus(CWnd *pNewWnd);
+       afx_msg void OnHelp();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };

diff --git a/Src/Merge.rc b/Src/Merge.rc
index e4bec68..8ad8e31 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1761,9 +1761,10 @@ BEGIN
     LTEXT           "File filters:",IDC_STATIC,7,190,70,10\r
     COMBOBOX        IDC_PLUGIN_FILEFILTERS,80,187,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "Defaults",IDC_PLUGIN_FILEFILTERS_DEFAULTS,393,187,70,14\r
-    PUSHBUTTON      "P&lugin Settings...",IDC_PLUGIN_SETTINGS,250,210,95,14\r
-    DEFPUSHBUTTON   "OK",IDOK,354,210,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,413,210,50,14\r
+    PUSHBUTTON      "P&lugin Settings...",IDC_PLUGIN_SETTINGS,191,210,95,14\r
+    DEFPUSHBUTTON   "OK",IDOK,293,210,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,354,210,50,14\r
+    PUSHBUTTON      "Help",ID_HELP,413,210,50,14\r
 END\r
 \r
 IDD_PROPPAGE_SHELL DIALOGEX 0, 0, 255, 242\r

diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp
index 7a224b4..815dc24 100644 (file)
--- a/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@ -11,6 +11,10 @@
 #include "Plugins.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
+#include "Merge.h"
+
+/** @brief Location for plugins specific help to open. */
+static TCHAR PluginsHelpLocation[] = _T("::/htmlhelp/Plugins.html");
 
 IMPLEMENT_DYNAMIC(PluginsListDlg, CTrDialog)
 
@@ -23,6 +27,7 @@ BEGIN_MESSAGE_MAP(PluginsListDlg, CTrDialog)
        ON_NOTIFY(NM_DBLCLK, IDC_PLUGINSLIST_LIST, OnNMDblclkList)
        ON_NOTIFY(LVN_ITEMCHANGING, IDC_PLUGINSLIST_LIST, OnLVNItemChanging)
        ON_NOTIFY(LVN_ITEMCHANGED, IDC_PLUGINSLIST_LIST, OnLVNItemChanged)
+       ON_COMMAND(ID_HELP, OnHelp)
 END_MESSAGE_MAP()
 
 /**
@@ -218,3 +223,12 @@ void PluginsListDlg::OnCloseUpPatterns()
 {
        WildcardDropList::OnCloseUp(m_comboPatterns);
 }
+
+/**
+ * @brief Open help from mainframe when user presses F1.
+ */
+void PluginsListDlg::OnHelp()
+{
+       theApp.ShowHelp(PluginsHelpLocation);
+}
+

diff --git a/Src/PluginsListDlg.h b/Src/PluginsListDlg.h
index 27affae..ce9d34f 100644 (file)
--- a/Src/PluginsListDlg.h
+++ b/Src/PluginsListDlg.h
@@ -44,6 +44,7 @@ protected:
        afx_msg void OnNMDblclkList(NMHDR *pNMHDR, LRESULT *pResult);
        afx_msg void OnDropDownPatterns();
        afx_msg void OnCloseUpPatterns();
+       afx_msg void OnHelp();
        DECLARE_MESSAGE_MAP()
 
 public: