From: <zou...@us...> - 2008-03-22 16:09:57
|
Revision: 1051 http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1051&view=rev Author: zouzou123gen Date: 2008-03-22 09:09:51 -0700 (Sat, 22 Mar 2008) Log Message: ----------- help stuff, towards context-sensitive help Modified Paths: -------------- dcplusplus/trunk/help/DCPlusPlus.hhp dcplusplus/trunk/help/index.html dcplusplus/trunk/help/toc.hhc dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectHelp.h dcplusplus/trunk/win32/ADLSearchFrame.cpp dcplusplus/trunk/win32/ADLSearchFrame.h dcplusplus/trunk/win32/Advanced3Page.cpp dcplusplus/trunk/win32/Advanced3Page.h dcplusplus/trunk/win32/AdvancedPage.cpp dcplusplus/trunk/win32/AdvancedPage.h dcplusplus/trunk/win32/Appearance2Page.cpp dcplusplus/trunk/win32/Appearance2Page.h dcplusplus/trunk/win32/AppearancePage.cpp dcplusplus/trunk/win32/AppearancePage.h dcplusplus/trunk/win32/CertificatesPage.cpp dcplusplus/trunk/win32/CertificatesPage.h dcplusplus/trunk/win32/CommandDlg.cpp dcplusplus/trunk/win32/CommandDlg.h dcplusplus/trunk/win32/DCPlusPlus.rc dcplusplus/trunk/win32/DirectoryListingFrame.cpp dcplusplus/trunk/win32/DownloadPage.cpp dcplusplus/trunk/win32/DownloadPage.h dcplusplus/trunk/win32/FavHubsFrame.cpp dcplusplus/trunk/win32/FavoriteDirsPage.cpp dcplusplus/trunk/win32/FavoriteDirsPage.h dcplusplus/trunk/win32/FinishedDLFrame.cpp dcplusplus/trunk/win32/FinishedFrameBase.h dcplusplus/trunk/win32/FinishedULFrame.cpp dcplusplus/trunk/win32/GeneralPage.cpp dcplusplus/trunk/win32/GeneralPage.h dcplusplus/trunk/win32/HashProgressDlg.cpp dcplusplus/trunk/win32/HubFrame.cpp dcplusplus/trunk/win32/LogPage.cpp dcplusplus/trunk/win32/LogPage.h dcplusplus/trunk/win32/MDIChildFrame.h dcplusplus/trunk/win32/MainWindow.cpp dcplusplus/trunk/win32/MainWindow.h dcplusplus/trunk/win32/NetworkPage.cpp dcplusplus/trunk/win32/NetworkPage.h dcplusplus/trunk/win32/NotepadFrame.cpp dcplusplus/trunk/win32/PrivateFrame.cpp dcplusplus/trunk/win32/PropPage.h dcplusplus/trunk/win32/PublicHubsFrame.cpp dcplusplus/trunk/win32/QueueFrame.cpp dcplusplus/trunk/win32/QueuePage.cpp dcplusplus/trunk/win32/QueuePage.h dcplusplus/trunk/win32/SearchFrame.cpp dcplusplus/trunk/win32/SettingsDialog.cpp dcplusplus/trunk/win32/SettingsDialog.h dcplusplus/trunk/win32/SpyFrame.cpp dcplusplus/trunk/win32/StaticFrame.h dcplusplus/trunk/win32/StatsFrame.cpp dcplusplus/trunk/win32/SystemFrame.cpp dcplusplus/trunk/win32/TabsPage.cpp dcplusplus/trunk/win32/TabsPage.h dcplusplus/trunk/win32/UCPage.cpp dcplusplus/trunk/win32/UCPage.h dcplusplus/trunk/win32/UploadPage.cpp dcplusplus/trunk/win32/UsersFrame.cpp dcplusplus/trunk/win32/WaitingUsersFrame.cpp dcplusplus/trunk/win32/WinUtil.cpp dcplusplus/trunk/win32/WinUtil.h dcplusplus/trunk/win32/WindowsPage.cpp dcplusplus/trunk/win32/WindowsPage.h dcplusplus/trunk/win32/resource.h Added Paths: ----------- dcplusplus/trunk/help/dialog_indexing_progress.html dcplusplus/trunk/help/resource.h dcplusplus/trunk/help/window_directory_listing.html dcplusplus/trunk/help/window_hub.html dcplusplus/trunk/help/window_pm.html dcplusplus/trunk/help/window_search.html Removed Paths: ------------- dcplusplus/trunk/help/help.vcproj dcplusplus/trunk/help/window_indexing_progress.html dcplusplus/trunk/help/window_search_frame.html Modified: dcplusplus/trunk/help/DCPlusPlus.hhp =================================================================== --- dcplusplus/trunk/help/DCPlusPlus.hhp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/DCPlusPlus.hhp 2008-03-22 16:09:51 UTC (rev 1051) @@ -36,19 +36,23 @@ plusplus_tag.html netiquette.html credits.html -window_adlsearch.html +window_hub.html +window_pm.html +window_directory_listing.html window_public_hubs.html window_favorite_hubs.html window_favorite_users.html window_download_queue.html +window_finished_downloads.html +window_waiting_users.html +window_finished_uploads.html +window_search.html +window_adlsearch.html window_search_spy.html -window_search_frame.html +window_notepad.html window_system_log.html -window_notepad.html window_network_stats.html -window_finished_downloads.html -window_finished_uploads.html -window_waiting_users.html +dialog_indexing_progress.html fdl.html faq_keyboard_commands.html faq_upnp.html @@ -65,29 +69,44 @@ links.html [ALIAS] -IDC_HELP_CHANGELOG=changelog.html -IDD_ADVANCED3PAGE=settings_expert.html -IDD_ADVANCEDPAGE=settings_advanced.html -IDD_APPEARANCE2PAGE=settings_colors_and_sounds.html -IDD_APPEARANCEPAGE=settings_appearance.html -IDD_DOWNLOADPAGE=settings_downloads.html -IDD_DOWNLOADPAGE=settings_sharing.html -IDD_FAVORITE_DIRSPAGE=settings_favoritedirs.html -IDD_GENERALPAGE=settings_general.html -IDD_KEYBOARD=faq_keyboard_commands.html -IDD_LOGPAGE=settings_logs.html -IDD_NETWORKPAGE=settings_connection.html -IDD_QUEUEPAGE=settings_queue.html -IDD_STARTPAGE=index.html -IDD_UCPAGE=settings_usercommands.html -IDD_UPLOADPAGE=settings_sharing.html -IDD_WINDOWSPAGE=settings_windows.html -IDR_ADLSEARCH=window_adlsearch.html -IDD_CERTSPAGE=settings_certs.html -IDD_TABSPAGE=settings_tabs.html +IDH_CHANGELOG=changelog.html +IDH_HUB=window_hub.html +IDH_PM=window_pm.html +IDH_DIRECTORY_LISTING=window_directory_listing.html +IDH_PUBLIC_HUBS=window_public_hubs.html +IDH_FAVORITE_HUBS=window_favorite_hubs.html +IDH_FAVUSERS=window_favorite_users.html +IDH_QUEUE=window_download_queue.html +IDH_FINISHED_DL=window_finished_downloads.html +IDH_WAITING_USERS=window_waiting_users.html +IDH_FINISHED_UL=window_finished_uploads.html +IDH_SEARCH=window_search.html +IDH_ADL_SEARCH=window_adlsearch.html +IDH_SEARCH_SPY=window_search_spy.html +IDH_NOTEPAD=window_notepad.html +IDH_SYSTEM_LOG=window_system_log.html +IDH_NET_STATS=window_network_stats.html +IDH_HASH_PROGRESS=dialog_indexing_progress.html +IDH_ADVANCED3PAGE=settings_expert.html +IDH_ADVANCEDPAGE=settings_advanced.html +IDH_APPEARANCE2PAGE=settings_colors_and_sounds.html +IDH_APPEARANCEPAGE=settings_appearance.html +IDH_DOWNLOADPAGE=settings_downloads.html +IDH_FAVORITE_DIRSPAGE=settings_favoritedirs.html +IDH_GENERALPAGE=settings_general.html +IDH_KEYBOARD=faq_keyboard_commands.html +IDH_LOGPAGE=settings_logs.html +IDH_NETWORKPAGE=settings_connection.html +IDH_QUEUEPAGE=settings_queue.html +IDH_STARTPAGE=index.html +IDH_UCPAGE=settings_usercommands.html +IDH_UPLOADPAGE=settings_sharing.html +IDH_WINDOWSPAGE=settings_windows.html +IDH_CERTIFICATESPAGE=settings_certs.html +IDH_TABSPAGE=settings_tabs.html [MAP] -#include ..\win32\resource.h +#include resource.h [INFOTYPES] Copied: dcplusplus/trunk/help/dialog_indexing_progress.html (from rev 1049, dcplusplus/trunk/help/window_indexing_progress.html) =================================================================== --- dcplusplus/trunk/help/dialog_indexing_progress.html (rev 0) +++ dcplusplus/trunk/help/dialog_indexing_progress.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,18 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>Indexing progress</title> +</head> +<body> +<h1>Indexing progress</h1> +This window will display what file is currently being indexed (hashed) by DC++, at what rate and approximately how long time there is left. +<br> +<br> +With this window open, DC++ will index at the priority level of "normal". If DC++ index in the background, the priority level is "lowest" (below "normal"). The priority level affect how much access time DC++ should get for indexing files. A higher priority mean that DC++ will index more frequent, but will also put on more strain on the computer and it will possibly perform slower. +<br> +<br> +Note that files will not be shared until they are indexed. +</body> +</html> Deleted: dcplusplus/trunk/help/help.vcproj =================================================================== --- dcplusplus/trunk/help/help.vcproj 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/help.vcproj 2008-03-22 16:09:51 UTC (rev 1051) @@ -1,296 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="help" - ProjectGUID="{9011F311-1280-4C2D-888C-B3202DC2A6ED}" - RootNamespace="help" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)app" - IntermediateDirectory="$(SolutionDir)vc7\$(ConfigurationName)\$(ProjectName)" - ConfigurationType="10" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Project File" - Filter="hpp" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=".\DCPlusPlus.hhp" - DeploymentContent="true" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Compiling Help File" - CommandLine="compile.cmd
" - AdditionalDependencies="$(ProjectDir)changelog.html;$(ProjectDir)index.hhk;$(ProjectDir)toc.hhc;..\windows\resource.h" - Outputs="$(SolutionDir)app\DCPlusPlus.chm" - /> - </FileConfiguration> - </File> - <File - RelativePath=".\index.hhk" - > - </File> - <File - RelativePath=".\toc.hhc" - > - </File> - </Filter> - <Filter - Name="HTML Files" - Filter="cpp" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\changelog.html" - > - </File> - <File - RelativePath=".\chat_commands.html" - > - </File> - <File - RelativePath=".\credits.html" - > - </File> - <File - RelativePath=".\dev_applypatch.html" - > - </File> - <File - RelativePath=".\dev_createpatch.html" - > - </File> - <File - RelativePath=".\faq.html" - > - </File> - <File - RelativePath=".\faq_activemode.html" - > - </File> - <File - RelativePath=".\faq_different_icons.html" - > - </File> - <File - RelativePath=".\faq_install.html" - > - </File> - <File - RelativePath=".\faq_keyboard_commands.html" - > - </File> - <File - RelativePath=".\faq_nosearch.html" - > - </File> - <File - RelativePath=".\faq_secret.html" - > - </File> - <File - RelativePath=".\faq_slowdownload.html" - > - </File> - <File - RelativePath=".\faq_units.html" - > - </File> - <File - RelativePath=".\faq_university.html" - > - </File> - <File - RelativePath=".\faq_upnp.html" - > - </File> - <File - RelativePath=".\fdl.html" - > - </File> - <File - RelativePath=".\index.html" - > - </File> - <File - RelativePath=".\keyboard_commands.html" - > - </File> - <File - RelativePath=".\Links.html" - > - </File> - <File - RelativePath=".\menu_help.html" - > - </File> - <File - RelativePath=".\netiquette.html" - > - </File> - <File - RelativePath=".\non-routable.html" - > - </File> - <File - RelativePath=".\plusplus_tag.html" - > - </File> - <File - RelativePath=".\settings_advanced.html" - > - </File> - <File - RelativePath=".\settings_appearance.html" - > - </File> - <File - RelativePath=".\settings_certs.html" - > - </File> - <File - RelativePath=".\settings_colors_and_sounds.html" - > - </File> - <File - RelativePath=".\settings_connection.html" - > - </File> - <File - RelativePath=".\settings_downloads.html" - > - </File> - <File - RelativePath=".\settings_expert.html" - > - </File> - <File - RelativePath=".\settings_favoritedirs.html" - > - </File> - <File - RelativePath=".\settings_general.html" - > - </File> - <File - RelativePath=".\settings_logs.html" - > - </File> - <File - RelativePath=".\settings_queue.html" - > - </File> - <File - RelativePath=".\settings_sharing.html" - > - </File> - <File - RelativePath=".\settings_tabs.html" - > - </File> - <File - RelativePath=".\settings_usercommands.html" - > - </File> - <File - RelativePath=".\settings_windows.html" - > - </File> - <File - RelativePath=".\template.html" - > - </File> - <File - RelativePath=".\window_adlsearch.html" - > - </File> - <File - RelativePath=".\window_download_queue.html" - > - </File> - <File - RelativePath=".\window_favorite_hubs.html" - > - </File> - <File - RelativePath=".\window_favorite_users.html" - > - </File> - <File - RelativePath=".\window_finished_downloads.html" - > - </File> - <File - RelativePath=".\window_finished_uploads.html" - > - </File> - <File - RelativePath=".\window_indexing_progress.html" - > - </File> - <File - RelativePath=".\window_network_stats.html" - > - </File> - <File - RelativePath=".\window_notepad.html" - > - </File> - <File - RelativePath=".\window_public_hubs.html" - > - </File> - <File - RelativePath=".\window_search_frame.html" - > - </File> - <File - RelativePath=".\window_search_spy.html" - > - </File> - <File - RelativePath=".\window_system_log.html" - > - </File> - <File - RelativePath=".\window_waiting_users.html" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Modified: dcplusplus/trunk/help/index.html =================================================================== --- dcplusplus/trunk/help/index.html 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/index.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -34,20 +34,28 @@ View the credits and license of this help file. <br> <h2>Windows</h2> -<div style="margin-left: 40px;"><a href="window_public_hubs.html">Public hubs</a><br> +<div style="margin-left: 40px;"> +<a href="window_hub.html">Hub</a><br> +<a href="window_pm.html">Private Message</a><br> +<a href="window_directory_listing.html">File List</a><br> +<a href="window_public_hubs.html">Public hubs</a><br> +<a href="window_favorite_hubs.html">Favorite Hubs</a><br> +<a href="window_favorite_users.html">Favorite Users</a><br> <a href="window_download_queue.html">Download queue</a><br> +<a href="window_finished_downloads.html">Finished downloads</a><br> <a href="window_waiting_users.html">Waiting users</a><br> -<a href="window_finished_downloads.html">Finished downloads</a><br> <a href="window_finished_uploads.html">Finished uploads</a><br> -<a href="window_favorite_hubs.html">Favorite Hubs</a><br> -<a href="window_favorite_users.html">Favorite Users</a> -<a href="window_search_frame.html">Search</a><br> +<a href="window_search.html">Search</a><br> <a href="window_adlsearch.html">ADLSearch</a><br> <a href="window_search_spy.html">Search spy</a><br> -<a href="window_network_stats.html">Network stattistics</a><br> <a href="window_notepad.html">Notepad</a><br> -<a href="window_indexing_progress.html">Indexing progress</a><br> -<a href="window_system_log.html">System log</a><br></div> +<a href="window_system_log.html">System log</a><br> +<a href="window_network_stats.html">Network statistics</a><br> +</div> +<h2>Dialogs</h2> +<div style="margin-left: 40px;"> +<a href="dialog_indexing_progress.html">Indexing progress</a><br> +</div> <h2>Frequently Asked Questions</h2> <div style="margin-left: 40px;"> <a href="faq_activemode.html">How to set up active mode?</a><br> Added: dcplusplus/trunk/help/resource.h =================================================================== --- dcplusplus/trunk/help/resource.h (rev 0) +++ dcplusplus/trunk/help/resource.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,40 @@ +#ifndef DCPLUSPLUS_HELP_RESOURCE_H +#define DCPLUSPLUS_HELP_RESOURCE_H + +#define IDH_CHANGELOG 500 +#define IDH_HUB 501 +#define IDH_PM 502 +#define IDH_DIRECTORY_LISTING 503 +#define IDH_PUBLIC_HUBS 504 +#define IDH_FAVORITE_HUBS 505 +#define IDH_FAVUSERS 506 +#define IDH_QUEUE 507 +#define IDH_FINISHED_DL 508 +#define IDH_WAITING_USERS 509 +#define IDH_FINISHED_UL 510 +#define IDH_SEARCH 511 +#define IDH_ADL_SEARCH 512 +#define IDH_SEARCH_SPY 513 +#define IDH_NOTEPAD 514 +#define IDH_SYSTEM_LOG 515 +#define IDH_NET_STATS 516 +#define IDH_HASH_PROGRESS 517 +#define IDH_ADVANCED3PAGE 518 +#define IDH_ADVANCEDPAGE 519 +#define IDH_APPEARANCE2PAGE 520 +#define IDH_APPEARANCEPAGE 521 +#define IDH_DOWNLOADPAGE 522 +#define IDH_UPLOADPAGE 523 +#define IDH_FAVORITE_DIRSPAGE 524 +#define IDH_GENERALPAGE 525 +#define IDH_KEYBOARD 526 +#define IDH_LOGPAGE 527 +#define IDH_NETWORKPAGE 528 +#define IDH_QUEUEPAGE 529 +#define IDH_STARTPAGE 530 +#define IDH_UCPAGE 531 +#define IDH_WINDOWSPAGE 532 +#define IDH_CERTIFICATESPAGE 533 +#define IDH_TABSPAGE 534 + +#endif Modified: dcplusplus/trunk/help/toc.hhc =================================================================== --- dcplusplus/trunk/help/toc.hhc 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/toc.hhc 2008-03-22 16:09:51 UTC (rev 1051) @@ -25,36 +25,48 @@ </OBJECT> <UL> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Hub"> + <param name="Local" value="window_hub.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Private Message"> + <param name="Local" value="window_pm.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="File List"> + <param name="Local" value="window_directory_listing.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Public Hubs"> <param name="Local" value="window_public_hubs.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Favorite Hubs"> + <param name="Local" value="window_favorite_hubs.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Favorite Users"> + <param name="Local" value="window_favorite_users.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Download queue"> <param name="Local" value="window_download_queue.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Finished downloads"> + <param name="Local" value="window_finished_downloads.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Waiting users"> <param name="Local" value="window_waiting_users.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Finished downloads"> - <param name="Local" value="window_finished_downloads.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Finished uploads"> <param name="Local" value="window_finished_uploads.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Favorite Hubs"> - <param name="Local" value="window_favorite_hubs.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Favorite Users"> - <param name="Local" value="window_favorite_users.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Search"> - <param name="Local" value="window_search_frame.html"> + <param name="Local" value="window_search.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> <param name="Name" value="ADLSearch"> @@ -65,23 +77,28 @@ <param name="Local" value="window_search_spy.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Network statistics"> - <param name="Local" value="window_network_stats.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Notepad"> <param name="Local" value="window_notepad.html"> </OBJECT> <LI> <OBJECT type="text/sitemap"> - <param name="Name" value="Indexing progress"> - <param name="Local" value="window_indexing_progress.html"> - </OBJECT> - <LI> <OBJECT type="text/sitemap"> <param name="Name" value="System log"> <param name="Local" value="window_system_log.html"> </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Network statistics"> + <param name="Local" value="window_network_stats.html"> + </OBJECT> </UL> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Dialogs"> + </OBJECT> + <UL> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Indexing progress"> + <param name="Local" value="dialog_indexing_progress.html"> + </OBJECT> + </UL> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="Frequently Asked Questions"> </OBJECT> <UL> Added: dcplusplus/trunk/help/window_directory_listing.html =================================================================== --- dcplusplus/trunk/help/window_directory_listing.html (rev 0) +++ dcplusplus/trunk/help/window_directory_listing.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>File List</title> +</head> +<body> +<h1>File List</h1> +This help file is a stub; please complete it. +</body> +</html> Added: dcplusplus/trunk/help/window_hub.html =================================================================== --- dcplusplus/trunk/help/window_hub.html (rev 0) +++ dcplusplus/trunk/help/window_hub.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>Hub</title> +</head> +<body> +<h1>Hub</h1> +This help file is a stub; please complete it. +</body> +</html> Deleted: dcplusplus/trunk/help/window_indexing_progress.html =================================================================== --- dcplusplus/trunk/help/window_indexing_progress.html 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/window_indexing_progress.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -1,18 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta content="text/html; charset=us-ascii" http-equiv="content-type"> - <link type="text/css" rel="stylesheet" href="office11.css"> - <title>Indexing progress</title> -</head> -<body> -<h1>Indexing progress</h1> -This window will display what file is currently being indexed (hashed) by DC++, at what rate and approximately how long time there is left. -<br> -<br> -With this window open, DC++ will index at the priority level of "normal". If DC++ index in the background, the priority level is "lowest" (below "normal"). The priority level affect how much access time DC++ should get for indexing files. A higher priority mean that DC++ will index more frequent, but will also put on more strain on the computer and it will possibly perform slower. -<br> -<br> -Note that files will not be shared until they are indexed. -</body> -</html> Added: dcplusplus/trunk/help/window_pm.html =================================================================== --- dcplusplus/trunk/help/window_pm.html (rev 0) +++ dcplusplus/trunk/help/window_pm.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>Private Message</title> +</head> +<body> +<h1>Private Message</h1> +This help file is a stub; please complete it. +</body> +</html> Copied: dcplusplus/trunk/help/window_search.html (from rev 1049, dcplusplus/trunk/help/window_search_frame.html) =================================================================== --- dcplusplus/trunk/help/window_search.html (rev 0) +++ dcplusplus/trunk/help/window_search.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -0,0 +1,62 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta content="text/html; charset=us-ascii" http-equiv="content-type"> + <link type="text/css" rel="stylesheet" href="office11.css"> + <title>Search</title> +</head> +<body> +<h1>Search</h1> +<h2>Search Options</h2> +<dl style="margin-left: 40px;"> + <dt>Search for</dt> + <dd>This is the set of search strings to search for. Words beginning with "-" will be filtered away.</dd> + <dt>Purge</dt> + <dd>Will remove <a href="settings_experts_only#searchhistory">search history</a>.</dd> + <dt>Size</dt> + <dd>Filter away files depending on their file size.</dd> + <dt>File type</dt> + <dd>Filter away files depending on their file type (extension).</dd> + <dt>Only users with free slots</dt> + <dd>Filter away files depending on the users free slots</dd> + <dt>Hubs</dt> + <dd>Search only selected hubs.</dd> +</dl> +<h2>Columns</h2> +<dl style="margin-left: 80px;"> + <dt>File</dt> + <dd>The file name.</dd> + <dt>User</dt> + <dd>The user's nick name.</dd> + <dt>Type</dt> + <dd>The file's extension (file type).</dd> + <dt>Size</dt> + <dd>The file's size.</dd> + <dt>Slots</dt> + <dd>x/y: x slots available of a total y.</dd> + <dt>Path</dt> + <dd>The path in the user's file list where the file is stored.</dd> + <dt>Connection</dt> + <dd>The user's possible <a href="settings_general#linespeed">line speed in upload</a>.</dd> + <dt>Hub</dt> + <dd>In which hub the user is in.</dd> + <dt>Exact size</dt> + <dd>The exact size of the file.</dd> + <dt>IP</dt> + <dd>The user's IP.</dd> + <dt>TTH root</dt> + <dd>The TTH root for the file.</dd> + <dt>CID</dt> + <dd>The unique ID that DC++ use to identify other users.</dd> +</dl> +<h2>Status bar</h2> +<dl style="margin-left: 40px;"> + <dt>Unnamed checkbox</dt> + <dd>Toggle the displayment of the search options.</dd> + <dt># items</dt> + <dd>The amount of items that are displayed in the window.</dd> + <dt># filtered</dt> + <dd>The amount of files that have been filtered away from the view.</dd> +</dl> +</body> +</html> Deleted: dcplusplus/trunk/help/window_search_frame.html =================================================================== --- dcplusplus/trunk/help/window_search_frame.html 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/help/window_search_frame.html 2008-03-22 16:09:51 UTC (rev 1051) @@ -1,62 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta content="text/html; charset=us-ascii" http-equiv="content-type"> - <link type="text/css" rel="stylesheet" href="office11.css"> - <title>Search</title> -</head> -<body> -<h1>Search</h1> -<h2>Search Options</h2> -<dl style="margin-left: 40px;"> - <dt>Search for</dt> - <dd>This is the set of search strings to search for. Words beginning with "-" will be filtered away.</dd> - <dt>Purge</dt> - <dd>Will remove <a href="settings_experts_only#searchhistory">search history</a>.</dd> - <dt>Size</dt> - <dd>Filter away files depending on their file size.</dd> - <dt>File type</dt> - <dd>Filter away files depending on their file type (extension).</dd> - <dt>Only users with free slots</dt> - <dd>Filter away files depending on the users free slots</dd> - <dt>Hubs</dt> - <dd>Search only selected hubs.</dd> -</dl> -<h2>Columns</h2> -<dl style="margin-left: 80px;"> - <dt>File</dt> - <dd>The file name.</dd> - <dt>User</dt> - <dd>The user's nick name.</dd> - <dt>Type</dt> - <dd>The file's extension (file type).</dd> - <dt>Size</dt> - <dd>The file's size.</dd> - <dt>Slots</dt> - <dd>x/y: x slots available of a total y.</dd> - <dt>Path</dt> - <dd>The path in the user's file list where the file is stored.</dd> - <dt>Connection</dt> - <dd>The user's possible <a href="settings_general#linespeed">line speed in upload</a>.</dd> - <dt>Hub</dt> - <dd>In which hub the user is in.</dd> - <dt>Exact size</dt> - <dd>The exact size of the file.</dd> - <dt>IP</dt> - <dd>The user's IP.</dd> - <dt>TTH root</dt> - <dd>The TTH root for the file.</dd> - <dt>CID</dt> - <dd>The unique ID that DC++ use to identify other users.</dd> -</dl> -<h2>Status bar</h2> -<dl style="margin-left: 40px;"> - <dt>Unnamed checkbox</dt> - <dd>Toggle the displayment of the search options.</dd> - <dt># items</dt> - <dd>The amount of items that are displayed in the window.</dd> - <dt># filtered</dt> - <dd>The amount of files that have been filtered away from the view.</dd> -</dl> -</body> -</html> Modified: dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectHelp.h =================================================================== --- dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectHelp.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectHelp.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -5,9 +5,32 @@ template<typename WidgetType> class AspectHelp { - typedef Dispatchers::VoidVoid<TRUE> Dispatcher; + struct Dispatcher { + typedef std::tr1::function<void (HWND, unsigned)> F; + Dispatcher(const F& f_) : f(f_) { } + + bool operator()(const MSG& msg, LRESULT& ret) { + LPHELPINFO lphi = reinterpret_cast<LPHELPINFO>(msg.lParam); + if(lphi->iContextType != HELPINFO_WINDOW) + return false; + f(reinterpret_cast<HWND>(lphi->hItemHandle), lphi->dwContextId); + ret = TRUE; + return true; + } + + F f; + }; + public: + unsigned getHelpId() { + return ::GetWindowContextHelpId(static_cast<WidgetType*>(this)->handle()); + } + + void setHelpId(unsigned id) { + ::SetWindowContextHelpId(static_cast<WidgetType*>(this)->handle(), id); + } + void onHelp(const typename Dispatcher::F& f) { static_cast<WidgetType*>(this)->addCallback( Message( WM_HELP ), Dispatcher(f) Modified: dcplusplus/trunk/win32/ADLSearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/ADLSearchFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -37,7 +37,7 @@ }; ADLSearchFrame::ADLSearchFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Automatic Directory Listing Search"), IDR_ADLSEARCH), + BaseType(mdiParent, T_("Automatic Directory Listing Search"), IDH_ADL_SEARCH, IDR_ADLSEARCH), add(0), properties(0), up(0), @@ -92,7 +92,7 @@ cs.caption = T_("&Help"); help = createButton(cs); - help->onClicked(std::tr1::bind(&ADLSearchFrame::handleHelp, this)); + help->onClicked(std::tr1::bind(&WinUtil::help, handle(), IDH_ADL_SEARCH)); addWidget(help); } @@ -235,10 +235,6 @@ } } -void ADLSearchFrame::handleHelp() { - HtmlHelp(handle(), WinUtil::getHelpFile().c_str(), HH_HELP_CONTEXT, IDR_ADLSEARCH); -} - void ADLSearchFrame::handleDoubleClick() { if(items->hasSelection()) { handleProperties(); Modified: dcplusplus/trunk/win32/ADLSearchFrame.h =================================================================== --- dcplusplus/trunk/win32/ADLSearchFrame.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/ADLSearchFrame.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -69,7 +69,6 @@ void handleUp(); void handleDown(); void handleRemove(); - void handleHelp(); void handleDoubleClick(); bool handleKeyDown(int c); LRESULT handleItemChanged(WPARAM /*wParam*/, LPARAM lParam); Modified: dcplusplus/trunk/win32/Advanced3Page.cpp =================================================================== --- dcplusplus/trunk/win32/Advanced3Page.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/Advanced3Page.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -69,6 +69,7 @@ Advanced3Page::Advanced3Page(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_ADVANCED3PAGE); + setHelpId(IDH_ADVANCED3PAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, 0, 0); Modified: dcplusplus/trunk/win32/Advanced3Page.h =================================================================== --- dcplusplus/trunk/win32/Advanced3Page.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/Advanced3Page.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,7 @@ virtual ~Advanced3Page(); virtual void write(); - virtual int getHelpId() { return IDD_ADVANCED3PAGE; } + private: static Item items[]; static TextItem texts[]; Modified: dcplusplus/trunk/win32/AdvancedPage.cpp =================================================================== --- dcplusplus/trunk/win32/AdvancedPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/AdvancedPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -53,6 +53,7 @@ AdvancedPage::AdvancedPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_ADVANCEDPAGE); + setHelpId(IDH_ADVANCEDPAGE); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_ADVANCED_BOOLEANS)); } Modified: dcplusplus/trunk/win32/AdvancedPage.h =================================================================== --- dcplusplus/trunk/win32/AdvancedPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/AdvancedPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~AdvancedPage(); virtual void write(); - virtual int getHelpId() { return IDD_ADVANCEDPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/Appearance2Page.cpp =================================================================== --- dcplusplus/trunk/win32/Appearance2Page.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/Appearance2Page.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -50,6 +50,7 @@ Appearance2Page::Appearance2Page(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_APPEARANCE2PAGE); + setHelpId(IDH_APPEARANCE2PAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, 0, 0); Modified: dcplusplus/trunk/win32/Appearance2Page.h =================================================================== --- dcplusplus/trunk/win32/Appearance2Page.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/Appearance2Page.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~Appearance2Page(); virtual void write(); - virtual int getHelpId() { return IDD_APPEARANCE2PAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/AppearancePage.cpp =================================================================== --- dcplusplus/trunk/win32/AppearancePage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/AppearancePage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -59,6 +59,7 @@ AppearancePage::AppearancePage(SmartWin::Widget* parent) : PropPage(parent), languages(0) { createDialog(IDD_APPEARANCEPAGE); + setHelpId(IDH_APPEARANCEPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_APPEARANCE_BOOLEANS)); Modified: dcplusplus/trunk/win32/AppearancePage.h =================================================================== --- dcplusplus/trunk/win32/AppearancePage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/AppearancePage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~AppearancePage(); virtual void write(); - virtual int getHelpId() { return IDD_APPEARANCEPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/CertificatesPage.cpp =================================================================== --- dcplusplus/trunk/win32/CertificatesPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/CertificatesPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -46,6 +46,7 @@ CertificatesPage::CertificatesPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_CERTIFICATESPAGE); + setHelpId(IDH_CERTIFICATESPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_TLS_OPTIONS)); Modified: dcplusplus/trunk/win32/CertificatesPage.h =================================================================== --- dcplusplus/trunk/win32/CertificatesPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/CertificatesPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~CertificatesPage(); virtual void write(); - virtual int getHelpId() { return IDD_CERTIFICATESPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/CommandDlg.cpp =================================================================== --- dcplusplus/trunk/win32/CommandDlg.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/CommandDlg.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -52,7 +52,7 @@ { onInitDialog(std::tr1::bind(&CommandDlg::handleInitDialog, this)); onFocus(std::tr1::bind(&CommandDlg::handleFocus, this)); - onHelp(std::tr1::bind(&CommandDlg::handleHelp, this)); + onHelp(std::tr1::bind(&WinUtil::help, _1, _2)); } CommandDlg::~CommandDlg() { @@ -129,12 +129,12 @@ button = attachButton(IDHELP); button->setText(T_("Help")); - button->onClicked(std::tr1::bind(&CommandDlg::handleHelp, this)); + button->onClicked(std::tr1::bind(&WinUtil::help, handle(), IDH_UCPAGE)); } if(bOpenHelp) { // launch the help file, instead of having the help in the dialog - handleHelp(); + postMessage(WM_COMMAND, IDHELP); } if(type == UserCommand::TYPE_SEPARATOR) { @@ -199,10 +199,6 @@ nameBox->setFocus(); } -void CommandDlg::handleHelp() { - ::HtmlHelp(handle(), WinUtil::getHelpFile().c_str(), HH_HELP_CONTEXT, IDD_UCPAGE); -} - void CommandDlg::handleTypeChanged() { updateType(); updateCommand(); Modified: dcplusplus/trunk/win32/CommandDlg.h =================================================================== --- dcplusplus/trunk/win32/CommandDlg.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/CommandDlg.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -61,7 +61,6 @@ bool handleInitDialog(); void handleFocus(); - void handleHelp(); void handleTypeChanged(); void handleOKClicked(); Modified: dcplusplus/trunk/win32/DCPlusPlus.rc =================================================================== --- dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/DCPlusPlus.rc 2008-03-22 16:09:51 UTC (rev 1051) @@ -578,7 +578,7 @@ END IDD_SETTINGS DIALOGEX 0, 0, 375, 275 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Settings" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: dcplusplus/trunk/win32/DirectoryListingFrame.cpp =================================================================== --- dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/DirectoryListingFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -106,7 +106,7 @@ } DirectoryListingFrame::DirectoryListingFrame(SmartWin::WidgetTabView* mdiParent, const UserPtr& aUser, int64_t aSpeed) : - BaseType(mdiParent, _T(""), SmartWin::IconPtr(new SmartWin::Icon(IDR_DIRECTORY)), !BOOLSETTING(POPUNDER_FILELIST)), + BaseType(mdiParent, _T(""), IDH_DIRECTORY_LISTING, SmartWin::IconPtr(new SmartWin::Icon(IDR_DIRECTORY)), !BOOLSETTING(POPUNDER_FILELIST)), dirs(0), files(0), paned(0), Modified: dcplusplus/trunk/win32/DownloadPage.cpp =================================================================== --- dcplusplus/trunk/win32/DownloadPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/DownloadPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -54,6 +54,7 @@ DownloadPage::DownloadPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_DOWNLOADPAGE); + setHelpId(IDH_DOWNLOADPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items); Modified: dcplusplus/trunk/win32/DownloadPage.h =================================================================== --- dcplusplus/trunk/win32/DownloadPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/DownloadPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~DownloadPage(); virtual void write(); - virtual int getHelpId() { return IDD_DOWNLOADPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/FavHubsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FavHubsFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -38,7 +38,7 @@ }; FavHubsFrame::FavHubsFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Favorite Hubs"), IDR_FAVORITES), + BaseType(mdiParent, T_("Favorite Hubs"), IDH_FAVORITE_HUBS, IDR_FAVORITES), hubs(0), connect(0), add(0), Modified: dcplusplus/trunk/win32/FavoriteDirsPage.cpp =================================================================== --- dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FavoriteDirsPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -38,6 +38,7 @@ FavoriteDirsPage::FavoriteDirsPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_FAVORITE_DIRSPAGE); + setHelpId(IDH_FAVORITE_DIRSPAGE); PropPage::translate(handle(), texts); Modified: dcplusplus/trunk/win32/FavoriteDirsPage.h =================================================================== --- dcplusplus/trunk/win32/FavoriteDirsPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FavoriteDirsPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~FavoriteDirsPage(); virtual void write(); - virtual int getHelpId() { return IDD_FAVORITE_DIRSPAGE; } private: static TextItem texts[]; Modified: dcplusplus/trunk/win32/FinishedDLFrame.cpp =================================================================== --- dcplusplus/trunk/win32/FinishedDLFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FinishedDLFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -22,6 +22,6 @@ #include "FinishedDLFrame.h" FinishedDLFrame::FinishedDLFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Finished Downloads"), IDR_FINISHED_DL) + BaseType(mdiParent, T_("Finished Downloads"), IDH_FINISHED_DL, IDR_FINISHED_DL) { } Modified: dcplusplus/trunk/win32/FinishedFrameBase.h =================================================================== --- dcplusplus/trunk/win32/FinishedFrameBase.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FinishedFrameBase.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -47,8 +47,8 @@ friend class MDIChildFrame<T>; typedef FinishedFrameBase<T, in_UL> ThisType; - FinishedFrameBase(SmartWin::WidgetTabView* mdiParent, const tstring& title, int icon) : - BaseType(mdiParent, title, icon), + FinishedFrameBase(SmartWin::WidgetTabView* mdiParent, const tstring& title, unsigned helpId, int icon) : + BaseType(mdiParent, title, helpId, icon), items(0), totalBytes(0), totalTime(0) Modified: dcplusplus/trunk/win32/FinishedULFrame.cpp =================================================================== --- dcplusplus/trunk/win32/FinishedULFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/FinishedULFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -22,6 +22,6 @@ #include "FinishedULFrame.h" FinishedULFrame::FinishedULFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Finished Uploads"), IDR_FINISHED_UL) + BaseType(mdiParent, T_("Finished Uploads"), IDH_FINISHED_UL, IDR_FINISHED_UL) { } Modified: dcplusplus/trunk/win32/GeneralPage.cpp =================================================================== --- dcplusplus/trunk/win32/GeneralPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/GeneralPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -44,6 +44,7 @@ GeneralPage::GeneralPage(SmartWin::Widget* parent) : PropPage(parent), nick(0) { createDialog(IDD_GENERALPAGE); + setHelpId(IDH_GENERALPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items); Modified: dcplusplus/trunk/win32/GeneralPage.h =================================================================== --- dcplusplus/trunk/win32/GeneralPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/GeneralPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -28,7 +28,6 @@ virtual ~GeneralPage(); virtual void write(); - virtual int getHelpId() { return IDD_GENERALPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/HashProgressDlg.cpp =================================================================== --- dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/HashProgressDlg.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -37,6 +37,8 @@ } bool HashProgressDlg::handleInitDialog() { + setHelpId(IDH_HASH_PROGRESS); + setText(T_("Creating file index...")); ::SetDlgItemText(handle(), IDC_HASH_INDEXING, CT_("Please wait while DC++ indexes your files (they won't be shared until they've been indexed)...")); ::SetDlgItemText(handle(), IDC_STATISTICS, CT_("Statistics")); Modified: dcplusplus/trunk/win32/HubFrame.cpp =================================================================== --- dcplusplus/trunk/win32/HubFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/HubFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -68,7 +68,7 @@ } HubFrame::HubFrame(SmartWin::WidgetTabView* mdiParent, const string& url_) : - BaseType(mdiParent, Text::toT(url_), SmartWin::IconPtr(new SmartWin::Icon(IDR_HUB))), + BaseType(mdiParent, Text::toT(url_), IDH_HUB, SmartWin::IconPtr(new SmartWin::Icon(IDR_HUB))), chat(0), message(0), filter(0), Modified: dcplusplus/trunk/win32/LogPage.cpp =================================================================== --- dcplusplus/trunk/win32/LogPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/LogPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -54,6 +54,7 @@ LogPage::LogPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_LOGPAGE); + setHelpId(IDH_LOGPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, listItems, ::GetDlgItem(handle(), IDC_LOG_OPTIONS)); Modified: dcplusplus/trunk/win32/LogPage.h =================================================================== --- dcplusplus/trunk/win32/LogPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/LogPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -29,7 +29,6 @@ virtual ~LogPage(); virtual void write(); - virtual int getHelpId() { return IDD_LOGPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/MDIChildFrame.h =================================================================== --- dcplusplus/trunk/win32/MDIChildFrame.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/MDIChildFrame.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -38,7 +38,7 @@ typedef WidgetFactory< SmartWin::WidgetChildWindow > BaseType; protected: - MDIChildFrame(SmartWin::WidgetTabView* tabView, const tstring& title, SmartWin::IconPtr icon = SmartWin::IconPtr(), bool activate = true) : + MDIChildFrame(SmartWin::WidgetTabView* tabView, const tstring& title, unsigned helpId = 0, SmartWin::IconPtr icon = SmartWin::IconPtr(), bool activate = true) : BaseType(tabView->getTab()), lastFocus(NULL), alwaysSameFocus(false), @@ -57,6 +57,9 @@ cs.location = tabView->getClientSize(); this->createWindow(cs); + if(helpId) + setHelpId(helpId); + tabView->add(this, icon); this->onTabContextMenu(std::tr1::bind(&ThisType::handleContextMenu, this, _1)); Modified: dcplusplus/trunk/win32/MainWindow.cpp =================================================================== --- dcplusplus/trunk/win32/MainWindow.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/MainWindow.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -87,7 +87,7 @@ onActivate(std::tr1::bind(&MainWindow::handleActivate, this, _1)); onSized(std::tr1::bind(&MainWindow::handleSized, this, _1)); onSpeaker(std::tr1::bind(&MainWindow::handleSpeaker, this, _1, _2)); - onHelp(std::tr1::bind(&MainWindow::handleHelp, this, IDC_HELP_CONTENTS)); + onHelp(std::tr1::bind(&WinUtil::help, _1, _2)); onRaw(std::tr1::bind(&MainWindow::handleTrayIcon, this, _2), SmartWin::Message(WM_APP + 242)); updateStatus(); @@ -130,7 +130,7 @@ speak(PARSE_COMMAND_LINE); if(SETTING(NICK).empty()) { - handleHelp(IDD_GENERALPAGE); + WinUtil::help(handle(), IDH_GENERALPAGE); postMessage(WM_COMMAND, IDC_SETTINGS); } @@ -240,9 +240,9 @@ { WidgetMenuPtr help = mainMenu->appendPopup(T_("&Help")); - help->appendItem(IDC_HELP_CONTENTS, T_("Help &Contents\tF1"), std::tr1::bind(&MainWindow::handleHelp, this, _1)); + help->appendItem(IDH_STARTPAGE, T_("Help &Contents\tF1"), std::tr1::bind(&WinUtil::help, handle(), _1)); help->appendSeparatorItem(); - help->appendItem(IDC_HELP_CHANGELOG, T_("Change Log"), std::tr1::bind(&MainWindow::handleHelp, this, _1)); + help->appendItem(IDH_CHANGELOG, T_("Change Log"), std::tr1::bind(&WinUtil::help, handle(), _1)); help->appendItem(IDC_ABOUT, T_("About DC++..."), std::tr1::bind(&MainWindow::handleAbout, this), SmartWin::BitmapPtr(new SmartWin::Bitmap(IDB_DCPP))); help->appendSeparatorItem(); help->appendItem(IDC_HELP_HOMEPAGE, T_("DC++ Homepage"), std::tr1::bind(&MainWindow::handleLink, this, _1)); @@ -909,11 +909,6 @@ } } -void MainWindow::handleHelp(unsigned id) { - UINT action = (id == IDC_HELP_CONTENTS) ? HH_DISPLAY_TOC : HH_HELP_CONTEXT; - ::HtmlHelp(handle(), WinUtil::getHelpFile().c_str(), action, id); -} - LRESULT MainWindow::handleEndSession() { if (c != NULL) { c->removeListener(this); Modified: dcplusplus/trunk/win32/MainWindow.h =================================================================== --- dcplusplus/trunk/win32/MainWindow.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/MainWindow.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -154,7 +154,6 @@ void handleOpenDownloadsDir(); void handleLink(unsigned id); void handleAbout(); - void handleHelp(unsigned id); void handleHashProgress(); void handleCloseWindows(unsigned id); void handleSize(); Modified: dcplusplus/trunk/win32/NetworkPage.cpp =================================================================== --- dcplusplus/trunk/win32/NetworkPage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/NetworkPage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -65,6 +65,7 @@ NetworkPage::NetworkPage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_NETWORKPAGE); + setHelpId(IDH_NETWORKPAGE); PropPage::translate(handle(), texts); Modified: dcplusplus/trunk/win32/NetworkPage.h =================================================================== --- dcplusplus/trunk/win32/NetworkPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/NetworkPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -29,7 +29,6 @@ virtual ~NetworkPage(); virtual void write(); - virtual int getHelpId() { return IDD_NETWORKPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/NotepadFrame.cpp =================================================================== --- dcplusplus/trunk/win32/NotepadFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/NotepadFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -24,7 +24,7 @@ #include <dcpp/Text.h> NotepadFrame::NotepadFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Notepad"), IDR_NOTEPAD), + BaseType(mdiParent, T_("Notepad"), IDH_NOTEPAD, IDR_NOTEPAD), pad(0) { { Modified: dcplusplus/trunk/win32/PrivateFrame.cpp =================================================================== --- dcplusplus/trunk/win32/PrivateFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/PrivateFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -92,7 +92,7 @@ } PrivateFrame::PrivateFrame(SmartWin::WidgetTabView* mdiParent, const UserPtr& replyTo_, bool activate) : - BaseType(mdiParent, _T(""), SmartWin::IconPtr(new SmartWin::Icon(IDR_PRIVATE)), activate), + BaseType(mdiParent, _T(""), IDH_PM, SmartWin::IconPtr(new SmartWin::Icon(IDR_PRIVATE)), activate), chat(0), message(0), replyTo(replyTo_) Modified: dcplusplus/trunk/win32/PropPage.h =================================================================== --- dcplusplus/trunk/win32/PropPage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/PropPage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -30,7 +30,6 @@ virtual ~PropPage(); virtual void write() = 0; - virtual int getHelpId() = 0; enum Type { T_STR, T_INT, T_BOOL, T_CUSTOM, T_END }; Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/PublicHubsFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -90,7 +90,7 @@ } PublicHubsFrame::PublicHubsFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Public Hubs"), IDR_PUBLICHUBS), + BaseType(mdiParent, T_("Public Hubs"), IDH_PUBLIC_HUBS, IDR_PUBLICHUBS), hubs(0), configure(0), refresh(0), Modified: dcplusplus/trunk/win32/QueueFrame.cpp =================================================================== --- dcplusplus/trunk/win32/QueueFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/QueueFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -54,7 +54,7 @@ } QueueFrame::QueueFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Download Queue"), IDR_QUEUE), + BaseType(mdiParent, T_("Download Queue"), IDH_QUEUE, IDR_QUEUE), dirs(0), files(0), paned(0), Modified: dcplusplus/trunk/win32/QueuePage.cpp =================================================================== --- dcplusplus/trunk/win32/QueuePage.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/QueuePage.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -80,6 +80,7 @@ QueuePage::QueuePage(SmartWin::Widget* parent) : PropPage(parent) { createDialog(IDD_QUEUEPAGE); + setHelpId(IDH_QUEUEPAGE); PropPage::translate(handle(), texts); PropPage::read(handle(), items, 0, 0); Modified: dcplusplus/trunk/win32/QueuePage.h =================================================================== --- dcplusplus/trunk/win32/QueuePage.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/QueuePage.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -29,7 +29,6 @@ virtual ~QueuePage(); virtual void write(); - virtual int getHelpId() { return IDD_QUEUEPAGE; } private: static Item items[]; Modified: dcplusplus/trunk/win32/SearchFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SearchFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/SearchFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -82,7 +82,7 @@ } SearchFrame::SearchFrame(SmartWin::WidgetTabView* mdiParent, const tstring& initialString_, LONGLONG initialSize_, SearchManager::SizeModes initialMode_, SearchManager::TypeModes initialType_) : - BaseType(mdiParent, T_("Search"), SmartWin::IconPtr(new SmartWin::Icon(IDR_SEARCH))), + BaseType(mdiParent, T_("Search"), IDH_SEARCH, SmartWin::IconPtr(new SmartWin::Icon(IDR_SEARCH))), searchLabel(0), searchBox(0), purge(0), Modified: dcplusplus/trunk/win32/SettingsDialog.cpp =================================================================== --- dcplusplus/trunk/win32/SettingsDialog.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/SettingsDialog.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -44,7 +44,7 @@ SettingsDialog::SettingsDialog(SmartWin::Widget* parent) : WidgetFactory<SmartWin::WidgetModalDialog>(parent), currentPage(0) { onInitDialog(std::tr1::bind(&SettingsDialog::initDialog, this)); - onHelp(std::tr1::bind(&SettingsDialog::handleHelp, this)); + onHelp(std::tr1::bind(&SettingsDialog::handleHelp, this, _1, _2)); } int SettingsDialog::run() { @@ -71,7 +71,7 @@ button = attachButton(IDHELP); button->setText(T_("Help")); - button->onClicked(std::tr1::bind(&SettingsDialog::handleHelp, this)); + button->onClicked(std::tr1::bind(&SettingsDialog::handleHelp, this, handle(), 0)); } addPage(T_("Personal information"), new GeneralPage(this)); @@ -93,17 +93,10 @@ return false; } -void SettingsDialog::handleHelp() { - UINT action; - DWORD id; - if(currentPage) { - action = HH_HELP_CONTEXT; +void SettingsDialog::handleHelp(HWND hWnd, unsigned id) { + if(id == 0 && currentPage) id = currentPage->getHelpId(); - } else { - action = HH_DISPLAY_TOC; - id = 0; - } - ::HtmlHelp(handle(), WinUtil::getHelpFile().c_str(), action, id); + WinUtil::help(hWnd, id); } void SettingsDialog::addPage(const tstring& title, PropPage* page) { Modified: dcplusplus/trunk/win32/SettingsDialog.h =================================================================== --- dcplusplus/trunk/win32/SettingsDialog.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/SettingsDialog.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -42,7 +42,7 @@ void write(); bool initDialog(); - void handleHelp(); + void handleHelp(HWND hWnd, unsigned id); void handleOKClicked(); void selectionChanged(); void showPage(PropPage* page); Modified: dcplusplus/trunk/win32/SpyFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SpyFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/SpyFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -37,7 +37,7 @@ }; SpyFrame::SpyFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Search Spy"), IDR_SPY), + BaseType(mdiParent, T_("Search Spy"), IDH_SEARCH_SPY, IDR_SPY), searches(0), ignoreTTH(0), bIgnoreTTH(BOOLSETTING(SPY_FRAME_IGNORE_TTH_SEARCHES)), Modified: dcplusplus/trunk/win32/StaticFrame.h =================================================================== --- dcplusplus/trunk/win32/StaticFrame.h 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/StaticFrame.h 2008-03-22 16:09:51 UTC (rev 1051) @@ -27,8 +27,8 @@ class StaticFrame : public MDIChildFrame<T> { public: - StaticFrame(SmartWin::WidgetTabView* mdiClient, const tstring& title, int icon) : - MDIChildFrame<T>(mdiClient, title, SmartWin::IconPtr(new SmartWin::Icon(icon))) + StaticFrame(SmartWin::WidgetTabView* mdiClient, const tstring& title, unsigned helpId, int icon) : + MDIChildFrame<T>(mdiClient, title, helpId, SmartWin::IconPtr(new SmartWin::Icon(icon))) { } Modified: dcplusplus/trunk/win32/StatsFrame.cpp =================================================================== --- dcplusplus/trunk/win32/StatsFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/StatsFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -24,7 +24,7 @@ #include <dcpp/TimerManager.h> StatsFrame::StatsFrame(SmartWin::WidgetTabView* mdiParent) : - BaseType(mdiParent, T_("Network Statistics"), IDR_NET_STATS), + BaseType(mdiParent, T_("Network Statistics"), IDH_NET_STATS, IDR_NET_STATS), pen(new SmartWin::Pen(WinUtil::textColor)), upPen(new SmartWin::Pen(SETTING(UPLOAD_BAR_COLOR))), downPen(new SmartWin::Pen(SETTING(DOWNLOAD_BAR_COLOR))), Modified: dcplusplus/trunk/win32/SystemFrame.cpp =================================================================== --- dcplusplus/trunk/win32/SystemFrame.cpp 2008-03-22 14:41:09 UTC (rev 1050) +++ dcplusplus/trunk/win32/SystemFrame.cpp 2008-03-22 16:09:51 UTC (rev 1051) @@ -23,7 +23,7 @@ #... [truncated message content] |