Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-03-13 Kimmo
+ PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
+ Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
+ MergeEditView.h resource.h
+ Src/Languages/*: Merge*.rc
+
2006-03-11 Kimmo
PATCH: [ 1447506 ] Don't include splash bitmap to lang files
Src/Languages/*: Merge*.rc
static char THIS_FILE[] = __FILE__;
#endif
+/**
+ * @brief Location for folder compare specific help to open.
+ */
+static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/CompareDirs.html");
+
+
/////////////////////////////////////////////////////////////////////////////
// CDirView
ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics)
ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding)
ON_UPDATE_COMMAND_UI(ID_FILE_ENCODING, OnUpdateFileEncoding)
+ ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
{
DoUpdateFileEncodingDialog(pCmdUI);
}
+
+/** @brief Open help from mainframe when user presses F1*/
+void CDirView::OnHelp()
+{
+ GetMainFrame()->ShowHelp(DirViewHelpLocation);
+}
afx_msg void OnViewCompareStatistics();
afx_msg void OnFileEncoding();
afx_msg void OnUpdateFileEncoding(CCmdUI* pCmdUI);
+ afx_msg void OnHelp();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
POPUP "A&juda"
BEGIN
MENUITEM "&Conteúdo...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "A&juda"
BEGIN
MENUITEM "&Conteúdo...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "A&juda"
BEGIN
MENUITEM "&Conteúdo...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
ID_HELP_GNULICENSE "Exibe a Licença Pública GNU"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Ïîìîù"
BEGIN
MENUITEM "&Ñúäúðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Íàñòðîè&êè...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ïîìîù"
BEGIN
MENUITEM "&Ñúäúðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Íàñòðîè&êè...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ïîìîù"
BEGIN
MENUITEM "&Ñúäúðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Íàñòðîè&êè...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
ID_HELP_GNULICENSE "Ïîêàçâàíå íà GNU ëèöåíçà"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Ajuda"
BEGIN
MENUITEM "&Temes de l'ajuda...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguració...", ID_HELP_GETCONFIG
MENUITEM "Suport d'&arxivament inhabilitat...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ajuda"
BEGIN
MENUITEM "&Temes de l'ajuda...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguració...", ID_HELP_GETCONFIG
MENUITEM "Suport d'&arxivament inhabilitat...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ajuda"
BEGIN
MENUITEM "&Temes de l'ajuda...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguració...", ID_HELP_GETCONFIG
MENUITEM "Suport d'&arxivament inhabilitat...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Treu informació de versió i configuració actuals del WinMerge en un fitxer de text"
ID_HELP_GNULICENSE "Mostra la Llicència Pública General de GNU"
IDS_PRIVATEBUILD_FMT "Muntatge privat: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "°ïÖú(&H)"
BEGIN
MENUITEM "Óû§ÊÖ²á(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "ÅäÖÃ(&O)...", ID_HELP_GETCONFIG
MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "°ïÖú(&H)"
BEGIN
MENUITEM "Óû§ÊÖ²á(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "ÅäÖÃ(&O)...", ID_HELP_GETCONFIG
MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "°ïÖú(&H)"
BEGIN
MENUITEM "Óû§ÊÖ²á(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "ÅäÖÃ(&O)...", ID_HELP_GETCONFIG
MENUITEM "ѹËõ°üÖ§³ÖÒѽûÓÃ(&R)...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "½«µ±Ç°µÄ WinMerge °æ±¾ÐÅÏ¢¼°ÅäÖÃÊä³öµ½Îı¾Îļþ"
ID_HELP_GNULICENSE "ÏÔʾ GNU ¹«¹²ÊÚȨ"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "»¡©ú(&H)"
BEGIN
MENUITEM "¤º®e(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "²ÕºA(&O)...", ID_HELP_GETCONFIG
MENUITEM "°±¥Î«O¦s¤ä´©(&R)", ID_HELP_MERGE7ZMISMATCH
POPUP "»¡©ú(&H)"
BEGIN
MENUITEM "¤º®e(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "²ÕºA(&O)...", ID_HELP_GETCONFIG
MENUITEM "°±¥Î«O¦s¤ä´©(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "»¡©ú(&H)"
BEGIN
MENUITEM "¤º®e(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "²ÕºA(&O)...", ID_HELP_GETCONFIG
MENUITEM "°±¥Î«O¦s¤ä´©(&R)...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "¿é¥X¥Ø«e WinMerge ª©¥»¸ê°T©M²ÕºA¨ì¤å¦rÀÉ®×"
ID_HELP_GNULICENSE "Åã¥Ü GNU ¤½¦@±ÂÅv"
IDS_PRIVATEBUILD_FMT " ¨p¤H«Ø¥ß: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "Nápo&vìda"
BEGIN
MENUITEM "&Obsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nastavení...", ID_HELP_GETCONFIG
MENUITEM "&Podpora archivace vypnuta...", ID_HELP_MERGE7ZMISMATCH
POPUP "Nápo&vìda"
BEGIN
MENUITEM "&Obsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nastavení...", ID_HELP_GETCONFIG
MENUITEM "&Podpora archivace vypnuta...", ID_HELP_MERGE7ZMISMATCH
POPUP "Nápo&vìda"
BEGIN
MENUITEM "&Obsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nastavení...", ID_HELP_GETCONFIG
MENUITEM "&Podpora archivace vypnuta...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Vytvoøí textový soubor obsahující informace o aktuální verzi aplikace WinMerge a o místní konfiguraci"
ID_HELP_GNULICENSE "Zobrazí veøejnou licenci &GNU"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Hjælp"
BEGIN
MENUITEM "&Indhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Understøttelse for arkivering afbrudt...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjælp"
BEGIN
MENUITEM "&Indhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Understøttelse for arkivering afbrudt...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjælp"
BEGIN
MENUITEM "&Indhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Understøttelse for arkivering afbrudt...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Skriver den nuværende WinMerge versionsinformation og konfiguration til en tekst fil"
ID_HELP_GNULICENSE "Vis GNU general public license"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Help"
BEGIN
MENUITEM "&Inhoud...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Help"
BEGIN
MENUITEM "&Inhoud...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Help"
BEGIN
MENUITEM "&Inhoud...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguratie...", ID_HELP_GETCONFIG
MENUITEM "A&rchiefondersteuning uitgeschakeld...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "De huidige WinMerge versie en configuratie naar een tekstbestand wegschrijven"
ID_HELP_GNULICENSE "De GNU publieke licentie tonen"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "A&ide"
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifié...", ID_HELP_MERGE7ZMISMATCH
MENUITEM "Côté gauc&he lecture seulement", ID_FILE_LEFT_READONLY
MENUITEM "Côté droi&t lecture seulement", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
+ MENUITEM "File &Encoding", ID_FILE_ENCODING
+ MENUITEM SEPARATOR
MENUITEM "&Quitter", ID_APP_EXIT
END
POPUP "&Edition"
POPUP "A&ide"
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifié...", ID_HELP_MERGE7ZMISMATCH
POPUP "A&ide"
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifié...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Affiche les informations de version et de configuration de WinMerge avec un fichier de texte"
ID_HELP_GNULICENSE "Afficher la licence GNU avec le fureteur"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&?"
BEGIN
MENUITEM "&Inhalt\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Archiv-Unterstützung deaktiviert...", ID_HELP_MERGE7ZMISMATCH
POPUP "&?"
BEGIN
MENUITEM "&Inhalt\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Archiv-Unterstützung deaktiviert...", ID_HELP_MERGE7ZMISMATCH
POPUP "&?"
BEGIN
MENUITEM "&Inhalt\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Archiv-Unterstützung deaktiviert...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Ausgeben der aktuellen WinMerge Versionsinformationen und Konfiguration in eine Textdatei."
ID_HELP_GNULICENSE "Zeigt die ""GNU public license"" an."
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Súgó"
BEGIN
MENUITEM "&Tartalomjegyzék...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguráció...", ID_HELP_GETCONFIG
MENUITEM "Ar&chívum támogatás tiltva...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Súgó"
BEGIN
MENUITEM "&Tartalomjegyzék...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguráció...", ID_HELP_GETCONFIG
MENUITEM "Ar&chívum támogatás tiltva...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Súgó"
BEGIN
MENUITEM "&Tartalomjegyzék...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Konfiguráció...", ID_HELP_GETCONFIG
MENUITEM "Ar&chívum támogatás tiltva...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "A jelenlegi WinMerge verziószámának és egyéb adatainak fájlba mentése"
ID_HELP_GNULICENSE "A GNU public license megjelenítése"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&?"
BEGIN
MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG
MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH
POPUP "&?"
BEGIN
MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG
MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH
POPUP "&?"
BEGIN
MENUITEM "&Contenuti...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfigurazione...", ID_HELP_GETCONFIG
MENUITEM "Supporto per gli a&rchivi inattivo...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo"
ID_HELP_GNULICENSE "Visualizza la licenza pubblica GNU"
IDS_PRIVATEBUILD_FMT "Build privata: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "\83w\83\8b\83v(&H)"
BEGIN
MENUITEM "\96Ú\8e\9f(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "\90Ý\92è(&O)...", ID_HELP_GETCONFIG
MENUITEM "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82ª\96³\8cø\82Å\82·(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "\83w\83\8b\83v(&H)"
BEGIN
MENUITEM "\96Ú\8e\9f(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "\90Ý\92è(&O)...", ID_HELP_GETCONFIG
MENUITEM "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82ª\96³\8cø\82Å\82·(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "\83w\83\8b\83v(&H)"
BEGIN
MENUITEM "\96Ú\8e\9f(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "\90Ý\92è(&O)...", ID_HELP_GETCONFIG
MENUITEM "\83A\81[\83J\83C\83u\83T\83|\81[\83g\82ª\96³\8cø\82Å\82·(&R)...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "\8c»\8dÝ\82Ì WinMerge \82Ì\83o\81[\83W\83\87\83\93\8fî\95ñ\82Æ\90Ý\92è\82ð\83e\83L\83X\83g\83t\83@\83C\83\8b\82É\8fo\97Í\82µ\82Ü\82·"
ID_HELP_GNULICENSE "GNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91\82ð\95\\8e¦\82µ\82Ü\82·"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "µµ¿ò¸»(&H)"
BEGIN
MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG
MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "µµ¿ò¸»(&H)"
BEGIN
MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG
MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH
POPUP "µµ¿ò¸»(&H)"
BEGIN
MENUITEM "¸ñÂ÷(&C)...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "¼³Á¤(&O)...", ID_HELP_GETCONFIG
MENUITEM "¾ÐÃàÆÄÀÏ Áö¿ø¿¡ ´ëÇÏ¿©(&R)...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "WinMerge ¹öÀüÁ¤º¸ ¹× ¼³Á¤À» ÅؽºÆ® ÆÄÀÏ·Î Ãâ·ÂÇÕ´Ï´Ù"
ID_HELP_GNULICENSE "GNU public license º¾´Ï´Ù."
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Hjelp"
BEGIN
MENUITEM "&Innhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfigurasjon...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstøtte deaktivert...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjelp"
BEGIN
MENUITEM "&Innhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfigurasjon...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstøtte deaktivert...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjelp"
BEGIN
MENUITEM "&Innhold...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfigurasjon...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstøtte deaktivert...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Skriver gjeldende versjon av WinMerge og konfigurasjon til en tekstfil"
ID_HELP_GNULICENSE "Vis GNU general public license"
IDS_PRIVATEBUILD_FMT "Kompilert privat: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Pomoc"
BEGIN
MENUITEM "&Spis tre\9cci...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Ko&nfiguracja...", ID_HELP_GETCONFIG
MENUITEM "Obs³uga ar&chiwów wy³¹czona...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Pomoc"
BEGIN
MENUITEM "&Spis tre\9cci...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Ko&nfiguracja...", ID_HELP_GETCONFIG
MENUITEM "Obs³uga ar&chiwów wy³¹czona...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Pomoc"
BEGIN
MENUITEM "&Spis tre\9cci...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Ko&nfiguracja...", ID_HELP_GETCONFIG
MENUITEM "Obs³uga ar&chiwów wy³¹czona...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Wy\9cwietla bie¿¹c¹ wersjê WinMerge oraz tekstowy plik konfiguracji"
ID_HELP_GNULICENSE "Wyswietl licencjê GNU"
IDS_PRIVATEBUILD_FMT "Kompilacja prywatna: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Ïîìîùü"
BEGIN
MENUITEM "&Ñîäåðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Êîíôèãóðàöèÿ...", ID_HELP_GETCONFIG
MENUITEM "&Ïîääåðæêà àðõèâîâ îòêëþ÷åíà...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ïîìîùü"
BEGIN
MENUITEM "&Ñîäåðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Êîíôèãóðàöèÿ...", ID_HELP_GETCONFIG
MENUITEM "&Ïîääåðæêà àðõèâîâ îòêëþ÷åíà...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Ïîìîùü"
BEGIN
MENUITEM "&Ñîäåðæàíèå...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Êîíôèãóðàöèÿ...", ID_HELP_GETCONFIG
MENUITEM "&Ïîääåðæêà àðõèâîâ îòêëþ÷åíà...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Âûâåñòè èíôîðìàöèþ î òåêóùåé âåðñèè WinMerge è íàñòðîéêàõ â òåêñòîâûé ôàéë"
ID_HELP_GNULICENSE "Ïîêàçàòü ëèöåíçèþ GNU public"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "Po&moc"
BEGIN
MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "Po&moc"
BEGIN
MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "Po&moc"
BEGIN
MENUITEM "O&bsah...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
ID_HELP_GNULICENSE "Zobrazi\9d GNU licenciu"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "A&yuda"
BEGIN
MENUITEM "&Contenido...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Conf&iguracion...", ID_HELP_GETCONFIG
MENUITEM "Soporte de &archivado deshabilitado...", ID_HELP_MERGE7ZMISMATCH
POPUP "A&yuda"
BEGIN
MENUITEM "&Contenido...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Conf&iguracion...", ID_HELP_GETCONFIG
MENUITEM "Soporte de &archivado deshabilitado...", ID_HELP_MERGE7ZMISMATCH
POPUP "A&yuda"
BEGIN
MENUITEM "&Contenido...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "Conf&iguracion...", ID_HELP_GETCONFIG
MENUITEM "Soporte de &archivado deshabilitado...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Escribe la información de la versión actual de Winmerge y la configuración a un fichero de texto"
ID_HELP_GNULICENSE "Muestra la Licencia Pública GNU"
IDS_PRIVATEBUILD_FMT "Compilación Privada: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Hjälp"
BEGIN
MENUITEM "&Innehåll...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstöd avstängt...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjälp"
BEGIN
MENUITEM "&Innehåll...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstöd avstängt...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Hjälp"
BEGIN
MENUITEM "&Innehåll...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "K&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rkivstöd avstängt...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Sparar aktuell WinMerge Versionsinfo och Konfiguration till en textfil"
ID_HELP_GNULICENSE "Visar GNU General Public License"
IDS_PRIVATEBUILD_FMT "Privat Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
POPUP "&Yardým"
BEGIN
MENUITEM "&Ýçerik...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Ayarlamalar", ID_HELP_GETCONFIG
MENUITEM "&Yedekleme Desteði Kapalý", ID_HELP_MERGE7ZMISMATCH
POPUP "&Yardým"
BEGIN
MENUITEM "&Ýçerik...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Ayarlamalar", ID_HELP_GETCONFIG
MENUITEM "&Yedekleme Desteði Kapalý", ID_HELP_MERGE7ZMISMATCH
POPUP "&Yardým"
BEGIN
MENUITEM "&Ýçerik...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Ayarlamalar", ID_HELP_GETCONFIG
MENUITEM "&Yedekleme Desteði Kapalý", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
ID_HELP_GNULICENSE "Display the GNU public license"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
ON_UPDATE_COMMAND_UI(ID_VIEW_USEDEFAULTFONT, OnUpdateViewUsedefaultfont)
ON_COMMAND(ID_HELP_CONTENTS, OnHelpContents)
ON_UPDATE_COMMAND_UI(ID_HELP_CONTENTS, OnUpdateHelpContents)
+ ON_COMMAND(ID_HELP_INDEX, OnHelpIndex)
+ ON_UPDATE_COMMAND_UI(ID_HELP_INDEX, OnUpdateHelpIndex)
+ ON_COMMAND(ID_HELP_SEARCH, OnHelpSearch)
+ ON_UPDATE_COMMAND_UI(ID_HELP_SEARCH, OnUpdateHelpSearch)
ON_WM_CLOSE()
ON_COMMAND(ID_VIEW_WHITESPACE, OnViewWhitespace)
ON_UPDATE_COMMAND_UI(ID_VIEW_WHITESPACE, OnUpdateViewWhitespace)
}
/**
- * @brief Open help.
+ * @brief Open help contents.
*
* If local HTMLhelp file is found, open it, otherwise open HTML page from web.
*/
-void CMainFrame::OnHelpContents()
+void CMainFrame::OnHelpContents()
{
CString sPath = GetModulePath(0) + DocsPath;
if (paths_DoesPathExist(sPath) == IS_EXISTING_FILE)
ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
}
+/**
+ * @brief Enable Open help contents -menuitem.
+ */
void CMainFrame::OnUpdateHelpContents(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
}
+/**
+ * @brief Open help index.
+ *
+ * If local HTMLhelp file is found, open it, otherwise open HTML page from web.
+ */
+void CMainFrame::OnHelpIndex()
+{
+ CString sPath = GetModulePath(0) + DocsPath;
+ if (paths_DoesPathExist(sPath) == IS_EXISTING_FILE)
+ ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_INDEX, NULL);
+ else
+ ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
+}
+
+/**
+ * @brief Disable Open help index -menuitem.
+ */
+void CMainFrame::OnUpdateHelpIndex(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(FALSE);
+}
+
+/**
+ * @brief Open help search.
+ *
+ * If local HTMLhelp file is found, open it, otherwise open HTML page from web.
+ */
+void CMainFrame::OnHelpSearch()
+{
+ CString sPath = GetModulePath(0) + DocsPath;
+ if (paths_DoesPathExist(sPath) == IS_EXISTING_FILE)
+ {
+ HH_FTS_QUERY q = {0};
+ q.fExecute = TRUE;
+ q.fTitleOnly = FALSE;
+ q.fUniCodeStrings = TRUE;
+ q.fStemmedSearch = FALSE;
+ q.pszSearchQuery = _T("");
+ q.pszWindow = NULL;
+ q.cbStruct = sizeof(q);
+
+ ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_SEARCH, (DWORD)&q);
+ }
+ else
+ ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
+}
+
+/**
+ * @brief Enable Open help search -menuitem.
+ */
+void CMainFrame::OnUpdateHelpSearch(CCmdUI* pCmdUI)
+{
+ pCmdUI->Enable(TRUE);
+}
+
void CMainFrame::ActivateFrame(int nCmdShow)
{
if (!m_bFirstTime)
/**
* @brief Show Help - this is for opening help from outside mainframe.
+ * @param [in] helpLocation Location inside help, if NULL main help is opened.
*/
-void CMainFrame::ShowHelp()
+void CMainFrame::ShowHelp(LPCTSTR helpLocation /*= NULL*/)
{
- OnHelpContents();
+ if (helpLocation == NULL)
+ {
+ OnHelpContents();
+ }
+ else
+ {
+ CString sPath = GetModulePath(0) + DocsPath;
+ if (paths_DoesPathExist(sPath) == IS_EXISTING_FILE)
+ {
+ sPath += helpLocation;
+ ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_TOPIC, NULL);
+ }
+ }
}
/**
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
- void ShowHelp();
+ void ShowHelp(LPCTSTR helpLocation = NULL);
void UpdateCodepageModule();
void GetDirViews(DirViewList * pDirViews);
void GetMergeEditViews(MergeEditViewList * pMergeViews);
afx_msg void OnUpdateViewUsedefaultfont(CCmdUI* pCmdUI);
afx_msg void OnHelpContents();
afx_msg void OnUpdateHelpContents(CCmdUI* pCmdUI);
+ afx_msg void OnHelpIndex();
+ afx_msg void OnUpdateHelpIndex(CCmdUI* pCmdUI);
+ afx_msg void OnHelpSearch();
+ afx_msg void OnUpdateHelpSearch(CCmdUI* pCmdUI);
afx_msg void OnClose();
afx_msg void OnViewWhitespace();
afx_msg void OnUpdateViewWhitespace(CCmdUI* pCmdUI);
POPUP "&Help"
BEGIN
MENUITEM "&Contents...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Help"
BEGIN
MENUITEM "&Contents...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
POPUP "&Help"
BEGIN
MENUITEM "&Contents...\tF1", ID_HELP_CONTENTS
+ MENUITEM "&Index...", ID_HELP_INDEX
+ MENUITEM "&Search...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "A&rchive Support disabled...", ID_HELP_MERGE7ZMISMATCH
ID_HELP_GETCONFIG "Outputs current WinMerge version info and configuration to text file"
ID_HELP_GNULICENSE "Display the GNU public license"
IDS_PRIVATEBUILD_FMT "Private Build: %1"
+ ID_HELP_INDEX "Opens WinMerge Help Index\nHelp Index"
+ ID_HELP_SEARCH "Opens WinMerge Help Search\nHelp Search"
END
// PLUGINS DIALOGS AND DYNAMIC MENUS
const UINT IDT_RESCAN = 2;
const UINT RESCAN_TIMEOUT = 1000;
+/**
+ * @brief Location for file compare specific help to open.
+ */
+static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/CompareFiles.html");
+
/////////////////////////////////////////////////////////////////////////////
// CMergeEditView
ON_COMMAND(ID_VIEW_SWAPPANES, OnViewSwapPanes)
ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFS, OnUpdateViewSwapPanes)
ON_WM_SIZE()
+ ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
return TRUE;
}
}
+
+/** @brief Open help from mainframe when user presses F1*/
+void CMergeEditView::OnHelp()
+{
+ GetMainFrame()->ShowHelp(MergeViewHelpLocation);
+}
afx_msg void OnViewSwapPanes();
afx_msg void OnUpdateViewSwapPanes(CCmdUI* pCmdUI);
afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnHelp();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
#define ID_HELP_GETCONFIG 32913
#define ID_HELP_GNULICENSE 32914
#define IDS_PRIVATEBUILD_FMT 32915
+#define ID_HELP_SEARCH 32916
#define ID_TITLE_PLUGINS_SETTINGS 32928
#define ID_PREDIFF_MANUAL 32929
#define ID_PREDIFF_AUTO 32930