[Dcplusplus-commit] SF.net SVN: dcplusplus: [1053] dcplusplus/trunk

[<arn...@us...>]

Revision: 1053
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1053&view=rev
Author:   arnetheduck
Date:     2008-03-26 06:24:55 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
Context-sensitive help

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/help/DCPlusPlus.hhp
    dcplusplus/trunk/help/compile.cmd
    dcplusplus/trunk/help/index.html
    dcplusplus/trunk/help/resource.h
    dcplusplus/trunk/help/settings_advanced.html
    dcplusplus/trunk/help/settings_appearance.html
    dcplusplus/trunk/help/settings_certs.html
    dcplusplus/trunk/help/settings_colors_and_sounds.html
    dcplusplus/trunk/help/settings_connection.html
    dcplusplus/trunk/help/settings_expert.html
    dcplusplus/trunk/help/settings_favoritedirs.html
    dcplusplus/trunk/help/settings_logs.html
    dcplusplus/trunk/help/settings_queue.html
    dcplusplus/trunk/help/settings_sharing.html
    dcplusplus/trunk/help/settings_tabs.html
    dcplusplus/trunk/help/settings_windows.html
    dcplusplus/trunk/help/toc.hhc
    dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectControl.h
    dcplusplus/trunk/smartwin/include/smartwin/aspects/AspectHelp.h
    dcplusplus/trunk/win32/ADLSearchFrame.cpp
    dcplusplus/trunk/win32/Advanced3Page.cpp
    dcplusplus/trunk/win32/Advanced3Page.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/DCPlusPlus.rc
    dcplusplus/trunk/win32/DownloadPage.cpp
    dcplusplus/trunk/win32/DownloadPage.h
    dcplusplus/trunk/win32/FavoriteDirsPage.cpp
    dcplusplus/trunk/win32/FavoriteDirsPage.h
    dcplusplus/trunk/win32/GeneralPage.cpp
    dcplusplus/trunk/win32/GeneralPage.h
    dcplusplus/trunk/win32/LogPage.cpp
    dcplusplus/trunk/win32/LogPage.h
    dcplusplus/trunk/win32/MainWindow.cpp
    dcplusplus/trunk/win32/NetworkPage.cpp
    dcplusplus/trunk/win32/NetworkPage.h
    dcplusplus/trunk/win32/PropPage.cpp
    dcplusplus/trunk/win32/PropPage.h
    dcplusplus/trunk/win32/QueuePage.cpp
    dcplusplus/trunk/win32/QueuePage.h
    dcplusplus/trunk/win32/SettingsDialog.cpp
    dcplusplus/trunk/win32/SettingsDialog.h
    dcplusplus/trunk/win32/UCPage.cpp
    dcplusplus/trunk/win32/UCPage.h
    dcplusplus/trunk/win32/UploadPage.cpp
    dcplusplus/trunk/win32/UploadPage.h
    dcplusplus/trunk/win32/WinUtil.cpp
    dcplusplus/trunk/win32/WinUtil.h
    dcplusplus/trunk/win32/resource.h
    dcplusplus/trunk/win32/stdafx.h

Added Paths:
-----------
    dcplusplus/trunk/help/cshelp.h
    dcplusplus/trunk/help/cshelp.txt
    dcplusplus/trunk/help/dialog_user_command.html
    dcplusplus/trunk/help/settings_user_commands.html

Removed Paths:
-------------
    dcplusplus/trunk/help/settings_usercommands.html

Property Changed:
----------------
    dcplusplus/trunk/


Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-03-23 19:39:26.720000029 +0100
committer: Jacek Sieka <arn...@gm...>
properties: 
	branch-nick: dcplusplus

   + timestamp: 2008-03-23 23:04:11.335000038 +0100
committer: zouzou123gen
properties: 
	branch-nick: bzr

Name: bzr:file-ids
   - update-languages.sh	updatelanguages.sh-20080323172209-blm3rymztdyit6k9-1
.bzrignore	bzrignore-20080323172312-t83zl06ak2a2csed-1

   + help/cshelp.h	cshelp.h-20080323211545-fxj0529zte7sgs2e-1
help/cshelp.txt	cshelp.txt-20080323211550-4lqhpnxmjuu3efy2-1
help/dialog_user_command.html	377@f586c4b0-9d0d-0410-bc51-f1fe239209fc:dcplusplus%2Ftrunk:help%2Fsettings_usercommands.html
help/settings_user_commands.html	settings_user_comman-20080323211611-j86066ug4dxbfwgl-1

Name: bzr:revision-id:v3-trunk1
   - 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn

   + 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn


Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/changelog.txt	2008-03-26 13:24:55 UTC (rev 1053)
@@ -4,6 +4,7 @@
 * Use setenv on unix (thanks yakov suraev)
 * Fixed out of focus window when restoring from icon (poy)
 * [L#203865] Fixed multiple instances (poy)
+* Context-sensitive help (poy)
 
 -- 0.705 2008-03-14 --
 * Several patches for better *nix compatibility of the core (thanks steven sheehy et al)

Modified: dcplusplus/trunk/help/DCPlusPlus.hhp
===================================================================
--- dcplusplus/trunk/help/DCPlusPlus.hhp	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/DCPlusPlus.hhp	2008-03-26 13:24:55 UTC (rev 1053)
@@ -8,11 +8,13 @@
 Enhanced decompilation=Yes
 Full-text search=Yes
 Index file=index.hhk
-Language=0x409 English (United States)
+Language=0x409 Anglais (\xC9tats-Unis)
 Title=Help for DC++
 
 
 [FILES]
+cshelp.h
+cshelp.txt
 office11.css
 index.html
 changelog.html
@@ -22,7 +24,7 @@
 settings_general.html
 settings_logs.html
 settings_sharing.html
-settings_usercommands.html
+settings_user_commands.html
 settings_colors_and_sounds.html
 settings_expert.html
 settings_connection.html
@@ -53,6 +55,7 @@
 window_system_log.html
 window_network_stats.html
 dialog_indexing_progress.html
+dialog_user_command.html
 fdl.html
 faq_keyboard_commands.html
 faq_upnp.html
@@ -69,7 +72,9 @@
 links.html
 
 [ALIAS]
+IDH_STARTPAGE=index.html
 IDH_CHANGELOG=changelog.html
+IDH_KEYBOARD=faq_keyboard_commands.html
 IDH_HUB=window_hub.html
 IDH_PM=window_pm.html
 IDH_DIRECTORY_LISTING=window_directory_listing.html
@@ -87,6 +92,7 @@
 IDH_SYSTEM_LOG=window_system_log.html
 IDH_NET_STATS=window_network_stats.html
 IDH_HASH_PROGRESS=dialog_indexing_progress.html
+IDH_USER_COMMAND=dialog_user_command.html
 IDH_ADVANCED3PAGE=settings_expert.html
 IDH_ADVANCEDPAGE=settings_advanced.html
 IDH_APPEARANCE2PAGE=settings_colors_and_sounds.html
@@ -94,12 +100,10 @@
 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_UCPAGE=settings_user_commands.html
 IDH_UPLOADPAGE=settings_sharing.html
 IDH_WINDOWSPAGE=settings_windows.html
 IDH_CERTIFICATESPAGE=settings_certs.html
@@ -108,6 +112,9 @@
 [MAP]
 #include resource.h
 
+[TEXT POPUPS]
+cshelp.h
+cshelp.txt
 
 [INFOTYPES]
 

Modified: dcplusplus/trunk/help/compile.cmd
===================================================================
--- dcplusplus/trunk/help/compile.cmd	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/compile.cmd	2008-03-26 13:24:55 UTC (rev 1053)
@@ -7,3 +7,5 @@
 hhc.exe DCPlusPlus.hhp
 
 del users.bmp
+
+pause

Added: dcplusplus/trunk/help/cshelp.h
===================================================================
--- dcplusplus/trunk/help/cshelp.h	                        (rev 0)
+++ dcplusplus/trunk/help/cshelp.h	2008-03-26 13:24:55 UTC (rev 1053)
@@ -0,0 +1,95 @@
+// this file contains help ids for field-level help tooltips
+
+#ifndef DCPLUSPLUS_HELP_CSHELP_H
+#define DCPLUSPLUS_HELP_CSHELP_H
+
+#define IDH_SETTINGS_TREE 11000
+#define IDH_SETTINGS_OK 11001
+#define IDH_SETTINGS_CANCEL 11002
+#define IDH_SETTINGS_HELP 11003
+#define IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION 11004
+#define IDH_SETTINGS_GENERAL_NICK 11005
+#define IDH_SETTINGS_GENERAL_EMAIL 11006
+#define IDH_SETTINGS_GENERAL_DESCRIPTION 11007
+#define IDH_SETTINGS_GENERAL_CONNECTION 11008
+#define IDH_SETTINGS_NETWORK_DIRECT 11009
+#define IDH_SETTINGS_NETWORK_FIREWALL_UPNP 11010
+#define IDH_SETTINGS_NETWORK_FIREWALL_NAT 11011
+#define IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE 11012
+#define IDH_SETTINGS_NETWORK_PORT_TCP 11013
+#define IDH_SETTINGS_NETWORK_PORT_UDP 11014
+#define IDH_SETTINGS_NETWORK_PORT_TLS 11015
+#define IDH_SETTINGS_NETWORK_EXTERNAL_IP 11016
+#define IDH_SETTINGS_NETWORK_OVERRIDE 11017
+#define IDH_SETTINGS_NETWORK_DIRECT_OUT 11018
+#define IDH_SETTINGS_NETWORK_SOCKS5 11019
+#define IDH_SETTINGS_NETWORK_SOCKS_SERVER 11020
+#define IDH_SETTINGS_NETWORK_SOCKS_PORT 11021
+#define IDH_SETTINGS_NETWORK_SOCKS_USER 11022
+#define IDH_SETTINGS_NETWORK_SOCKS_PASSWORD 11023
+#define IDH_SETTINGS_NETWORK_SOCKS_RESOLVE 11024
+#define IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR 11025
+#define IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY 11026
+#define IDH_SETTINGS_DOWNLOAD_LIMITS 11027
+#define IDH_SETTINGS_DOWNLOAD_DOWNLOADS 11028
+#define IDH_SETTINGS_DOWNLOAD_MAXSPEED 11029
+#define IDH_SETTINGS_DOWNLOAD_PROXY 11030
+#define IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES 11031
+#define IDH_SETTINGS_FAVORITE_DIRS_RENAME 11032
+#define IDH_SETTINGS_FAVORITE_DIRS_REMOVE 11033
+#define IDH_SETTINGS_FAVORITE_DIRS_ADD 11034
+#define IDH_SETTINGS_QUEUE_AUTOPRIO 11035
+#define IDH_SETTINGS_QUEUE_PRIO_HIGHEST 11036
+#define IDH_SETTINGS_QUEUE_PRIO_NORMAL 11037
+#define IDH_SETTINGS_QUEUE_PRIO_HIGH 11038
+#define IDH_SETTINGS_QUEUE_PRIO_LOW 11039
+#define IDH_SETTINGS_QUEUE_AUTODROP 11040
+#define IDH_SETTINGS_QUEUE_AUTODROP_SPEED 11041
+#define IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED 11042
+#define IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES 11043
+#define IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL 11044
+#define IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY 11045
+#define IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE 11046
+#define IDH_SETTINGS_UPLOAD_DIRECTORIES 11047
+#define IDH_SETTINGS_UPLOAD_SHAREHIDDEN 11048
+#define IDH_SETTINGS_UPLOAD_RENAME 11049
+#define IDH_SETTINGS_UPLOAD_REMOVE 11050
+#define IDH_SETTINGS_UPLOAD_ADD 11051
+#define IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED 11052
+#define IDH_SETTINGS_UPLOAD_SLOTS 11053
+#define IDH_SETTINGS_APPEARANCE_DEFAULT_AWAY_MESSAGE 11054
+#define IDH_SETTINGS_APPEARANCE_TIME_STAMPS_FORMAT 11055
+#define IDH_SETTINGS_APPEARANCE_LANGUAGE 11056
+#define IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART 11057
+#define IDH_SETTINGS_APPEARANCE2_COLORS 11058
+#define IDH_SETTINGS_APPEARANCE2_SELWINCOLOR 11059
+#define IDH_SETTINGS_APPEARANCE2_SELTEXT 11060
+#define IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR 11061
+#define IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR 11062
+#define IDH_SETTINGS_APPEARANCE2_BEEPFILE 11063
+#define IDH_SETTINGS_LOG_DIRECTORY 11064
+#define IDH_SETTINGS_ADVANCED3_ROLLBACK 11065
+#define IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED 11066
+#define IDH_SETTINGS_ADVANCED3_PM_HISTORY 11067
+#define IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE 11068
+#define IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE 11069
+#define IDH_SETTINGS_ADVANCED3_PRIVATE_ID 11070
+#define IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME 11071
+#define IDH_SETTINGS_ADVANCED3_BUFFERSIZE 11072
+#define IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT 11073
+#define IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY 11074
+#define IDH_SETTINGS_ADVANCED3_BIND_ADDRESS 11075
+#define IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER 11076
+#define IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER 11077
+#define IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE 11078
+#define IDH_SETTINGS_UC_LIST 11079
+#define IDH_SETTINGS_UC_ADD 11080
+#define IDH_SETTINGS_UC_CHANGE 11081
+#define IDH_SETTINGS_UC_MOVE_UP 11082
+#define IDH_SETTINGS_UC_MOVE_DOWN 11083
+#define IDH_SETTINGS_UC_REMOVE 11084
+#define IDH_SETTINGS_CERTIFICATES_PRIVATE_KEY_FILE 11085
+#define IDH_SETTINGS_CERTIFICATES_CERTIFICATE_FILE 11086
+#define IDH_SETTINGS_CERTIFICATES_TRUSTED_CERTIFICATES_PATH 11087
+
+#endif

Added: dcplusplus/trunk/help/cshelp.txt
===================================================================
--- dcplusplus/trunk/help/cshelp.txt	                        (rev 0)
+++ dcplusplus/trunk/help/cshelp.txt	2008-03-26 13:24:55 UTC (rev 1053)
@@ -0,0 +1,176 @@
+.topic IDH_SETTINGS_TREE
+Choose a settings category here.
+.topic IDH_SETTINGS_OK
+Press this button to save your changes and close this dialog.
+.topic IDH_SETTINGS_CANCEL
+Press this button to close this dialog without saving your changes.
+.topic IDH_SETTINGS_HELP
+Press this button to launch the help file.
+.topic IDH_SETTINGS_GENERAL_PERSONAL_INFORMATION
+This is general information about yourself. The nick is required, though it's suggested that you pick the correct connection type as well.
+.topic IDH_SETTINGS_GENERAL_NICK
+This nickname, or handle, will identify you when you join a hub. It can be overridden on a per-hub basis in the Favorite Hub Properties.
+.topic IDH_SETTINGS_GENERAL_EMAIL
+This field is for sharing your email address, if you wish it.
+.topic IDH_SETTINGS_GENERAL_DESCRIPTION
+This description will show in the user list. It can be overridden on a per-hub basis in the Favorite Hub Properties.
+.topic IDH_SETTINGS_GENERAL_CONNECTION
+This drop-down contains a number of common upload speeds (in MiB/s), please choose the one closest to your own. Do not put in your download speed; this setting is a measure of how fast a source you are likely to be for other users.
+.topic IDH_SETTINGS_NETWORK_DIRECT
+Select this mode if your computer is hooked directly to the internet. Do not select this mode if you have a router (firewall) or a software firewall.
+.topic IDH_SETTINGS_NETWORK_FIREWALL_UPNP
+Select this mode if you are behind a firewall that supports the UPnP standard for program auto-configuration. DC++ will automatically open the ports it needs and obtain your external IP address. This mode is not available on operating systems before Windows XP, as it was the first version to have UPnP support.
+.topic IDH_SETTINGS_NETWORK_FIREWALL_NAT
+Select this mode if you are behind a firewall (router), and will set up the TCP and UDP port forwarding on your own. You will need to specify the external IP address of your router using the setting below if you want downloads to work properly.
+.topic IDH_SETTINGS_NETWORK_FIREWALL_PASSIVE
+Select this mode if none of the previous options apply. In this mode, DC++ will not try to make inbound connections, only outbound ones. This mode carries some limitations: - only 5 results per user will be returned in response to searches; - you will not be able to download from other passive users.
+.topic IDH_SETTINGS_NETWORK_PORT_TCP
+This is the port that DC++ listens on for incoming client connections. If this setting is blank, DC++ will use a random port between 1025 and 32000.
+.topic IDH_SETTINGS_NETWORK_PORT_UDP
+This is the port that DC++ listens on for incoming search results. If this setting is blank, DC++ will use a random port between 1025 and 32000.
+.topic IDH_SETTINGS_NETWORK_PORT_TLS
+This is the port that DC++ listens on for TLS connections. If this setting is blank, DC++ will use a random port between 1025 and 32000.
+.topic IDH_SETTINGS_NETWORK_EXTERNAL_IP
+If you're directly connected to the internet, DC++ will tell remote users to connect to your local IP. Fill in this box only if you need to override the auto-detection. Ordinarily, only users behind a home router (NAT device) will need to fill in this box. If you put a DNS name here, DC++ will try to resolve it into an IP address before use.
+.topic IDH_SETTINGS_NETWORK_OVERRIDE
+Enable this to always use the IP address in "External / WAN IP", and not let either UPnP or connected hubs change it.
+.topic IDH_SETTINGS_NETWORK_DIRECT_OUT
+Select this mode if you can make unrestricted outbound connections. This includes connecting to any IP address on any port.
+.topic IDH_SETTINGS_NETWORK_SOCKS5
+Select this mode if you want to make outbound connections through a SOCKS proxy. The caveats for Firewall (passive) mode also apply here. SOCKS5 proxies are not the same as HTTP proxies. DC++'s SOCKS5 support does not include GSSAPI.
+.topic IDH_SETTINGS_NETWORK_SOCKS_SERVER
+This is the IP, not host name, of your SOCKS5 server.
+.topic IDH_SETTINGS_NETWORK_SOCKS_PORT
+The port that your SOCKS5 server runs on. The default is 1080.
+.topic IDH_SETTINGS_NETWORK_SOCKS_USER
+Login name for the SOCKS5 proxy; may be required.
+.topic IDH_SETTINGS_NETWORK_SOCKS_PASSWORD
+Password for the SOCKS5 proxy; may be required.
+.topic IDH_SETTINGS_NETWORK_SOCKS_RESOLVE
+Enable this to use the SOCKS5 proxy, instead of the local name server, to resolve host names into IP addresses.
+.topic IDH_SETTINGS_DOWNLOAD_DOWNLOADDIR
+After a download is complete, DC++ tries to move your just finished file to this directory. It defaults to the "Downloads\" subdirectory under where the DC++ executable is located.
+.topic IDH_SETTINGS_DOWNLOAD_TEMP_DOWNLOAD_DIRECTORY
+All incomplete downloads will be stored in this directory. If empty, temporary downloads will be stored in the "Incomplete\" subdirectory under where the DC++ executable is located. You can use %[targetdrive] for optional unfinished directory for target drive. If the file has been downloaded with a TTH, the incomplete file will bear the name <filename>.<ext>.<TTH>.dctmp. If the file has no TTH, it will be named<filename>.<ext>.dctmp. If "Use AntiFragmentation Method for Downloads" is enabled the files will have ".antifrag" added to the end of it's name. As in <filename>.<ext>.<TTH>.dctmp.antifrag.
+.topic IDH_SETTINGS_DOWNLOAD_LIMITS
+For both values listed below, certain conditions can result in the limits not being obeyed. Specifically, up to 3 files that are set to the 'highest' priority can be transferred while other downloads are going.  File lists and small files (64 kibibytes or smaller) are queued with 'highest' as their priority. When either of the limits are hit, DC++ shows "All download slots taken" next to each source in the Transfer View.
+.topic IDH_SETTINGS_DOWNLOAD_DOWNLOADS
+This limits the number of simultaneous downloads. The default value of this option is 3, and a value of 0 means no limit.
+.topic IDH_SETTINGS_DOWNLOAD_MAXSPEED
+This is another method of limiting simultaneous downloads, designed to prevent new downloads if your existing downloads exceed a specific threshold. It's measured in kibibytes per second, and a value of zero will disable this limit.
+.topic IDH_SETTINGS_DOWNLOAD_PROXY
+This HTTP proxy will only be used to request the Public Hub List specified above. It's not used for uploads, downloads, or connecting to a hub.
+.topic IDH_SETTINGS_FAVORITE_DIRS_FAVORITE_DIRECTORIES
+To add directories to your "Download to" menu (right click on a file in the search frame), you can use the Add and Remove buttons, or drag and drop folders from a Windows Explorer window.
+.topic IDH_SETTINGS_FAVORITE_DIRS_RENAME
+Rename the selected folder(s).
+.topic IDH_SETTINGS_FAVORITE_DIRS_REMOVE
+Remove the selected folder(s).
+.topic IDH_SETTINGS_FAVORITE_DIRS_ADD
+Browse for a new folder to add to your share. After selecting the directory to add, you will be able to pick the Virtual Name name for it that will be shown in the menu.
+.topic IDH_SETTINGS_QUEUE_AUTOPRIO
+Autoprio allows setting the queue item priority automatically when adding it to the download queue. A user can then change the priority of a file manually. Priority conditions are checked from the Highest to the Lowest priority, when assigning a priority to a new queue item. A zero means that the given priority level won't be used - except Normal priority, which is the default priority. Lowest possible value for the Highest priority is 16 KiB.
+.topic IDH_SETTINGS_QUEUE_PRIO_HIGHEST
+Files with the same or under the entered size will be set to Highest as priority. (default: 64 KiB)
+.topic IDH_SETTINGS_QUEUE_PRIO_NORMAL
+Files with the same or under the entered size, but above Highest and High prio max size, will be set to Normal as priority. (default: 0 KiB)
+.topic IDH_SETTINGS_QUEUE_PRIO_HIGH
+Files with the same or under the entered size, but above Highest prio max size, will be set to High as priority. (default: 0 KiB)
+.topic IDH_SETTINGS_QUEUE_PRIO_LOW
+Files with the same or under the entered size, but above Highest, High and Normal prio max size, will be set to Low as priority. (default: 0 KiB)
+.topic IDH_SETTINGS_QUEUE_AUTODROP
+Autodrop allows automatical removal (or disconnecting) of slow download sources. By default, slow sources are removed. All of these autodrop options are necessary to estimate and disconnect/drop sources properly.
+.topic IDH_SETTINGS_QUEUE_AUTODROP_SPEED
+If the download speed of a file is below the entered value, the source will be dropped. (default: 1024 B/s)
+.topic IDH_SETTINGS_QUEUE_AUTODROP_ELAPSED
+Amount of time (in seconds) that has to pass since the download started before a source can be dropped. (default: 15 s)
+.topic IDH_SETTINGS_QUEUE_AUTODROP_MINSOURCES
+Minimum amount of sources before any sources will be dropped. (default: 1)
+.topic IDH_SETTINGS_QUEUE_AUTODROP_INTERVAL
+Check every x second(s) if the source is slow. (default: 10 s)
+.topic IDH_SETTINGS_QUEUE_AUTODROP_INACTIVITY
+This is the maximal time since the last chunk of data for the file was recieved. It is meant to improve speed measurement accuracy and to prevent dropping sources that are going to be disconnected only because of their current inactivity. (default: 10 s)
+.topic IDH_SETTINGS_QUEUE_AUTODROP_FILESIZE
+Minimum filesize before sources will be dropped (in KiB). (default: 0 KiB)
+.topic IDH_SETTINGS_UPLOAD_DIRECTORIES
+To add directories to your share, you can use the Add and Remove buttons, or drag and drop folders from a Windows Explorer window. Beginning with version 0.4032, files will be shared only once they have been hashed. If you enter the Sharing tab and press OK; the client may appear to freeze, this is due to a refresh of the file list.
+.topic IDH_SETTINGS_UPLOAD_SHAREHIDDEN
+Share files with the Hidden attribute set and files inside directory with the Hidden attribute set. With this option off, files starting with a . (full stop) will not be shared. Note: this option requires a refresh of the file list, and may cause the client to appear to freeze.
+.topic IDH_SETTINGS_UPLOAD_RENAME
+Change the virtual name on a shared folder. Note: the client will appear to freeze when you exit settings, this is due to a refresh of the file list.
+.topic IDH_SETTINGS_UPLOAD_REMOVE
+Remove the selected folder(s).
+.topic IDH_SETTINGS_UPLOAD_ADD
+Browse for a new folder to add to your share. If another existing file shares that name, the new name will be made unique by adding another letter to its name. After selecting the directory to add, you will be able to pick the Virtual Name that it will be shown under when other users see your files. If the newly added files have not been hashed, the Hash Progress Dialog will display. You can choose to let it display, or let hashing continue in the background.
+.topic IDH_SETTINGS_UPLOAD_MIN_UPLOAD_SPEED
+If the average upload speed drops below the given number, an additional upload slot will be granted. These slots are granted once every 30 seconds at maximum. If the speed of the original uploads increases, the granted slot will not be closed.
+.topic IDH_SETTINGS_UPLOAD_SLOTS
+Configure the number of slots that other users can occupy to download files from you. A remote user can use only one slot for each hub that they're on with you. DC++ supports uploading file lists and files below 64 KiB to other DC++ users without requiring a slot. There's a max of 3 connections in addition to normal slots, these are called mini slots. Note: If a user leaves the hub, DC++ will close his slots; if the user is back within 10 minutes, DC++ will grant him a slot. (This will only happen if "Automatically Disconnect Users Who Leave the Hub" is enabled.) This can cause your upload slots going over maximum set in settings.
+.topic IDH_SETTINGS_APPEARANCE_DEFAULT_AWAY_MESSAGE
+This is the default away message that will appear when someone PMs you for the first time while you are in the away mode. You can activate away mode by using the /away <message> and /back chat commands or "Auto-away on Minimize" option. All time formatting variables are available. Use Ctrl + Enter to create a new line. (default: "I'm away. State your business and I might answer later if you're lucky.")
+.topic IDH_SETTINGS_APPEARANCE_TIME_STAMPS_FORMAT
+This lets you select the format of the time stamps that can appear in the chat and private message windows. All time formatting variables are available. (default: %H:%M)
+.topic IDH_SETTINGS_APPEARANCE_LANGUAGE
+This drop-down list allows you to choose which language DC++ should use for its user interface and messages. "Default" means "use the same language as my operating system".
+.topic IDH_SETTINGS_APPEARANCE_REQUIRES_RESTART
+Note: Most of these options require that you restart DC++. (Fonts, colors and icons are loaded at startup only. Window settings are loaded when opening a new window.)
+.topic IDH_SETTINGS_APPEARANCE2_COLORS
+You can preview the background color and text style before applying them
+.topic IDH_SETTINGS_APPEARANCE2_SELWINCOLOR
+This setting determines the background color of the windows in DC++.
+.topic IDH_SETTINGS_APPEARANCE2_SELTEXT
+This setting determines the color and font used in many DC++ windows.
+.topic IDH_SETTINGS_APPEARANCE2_UPLOAD_BAR_COLOR
+This will set the coloring for the upload progress bars, if you have them enabled in "Advanced". (default: RGB(205, 60, 55))
+.topic IDH_SETTINGS_APPEARANCE2_DOWNLOAD_BAR_COLOR
+This will set the coloring for the download progress bars, if you have them enabled in "Advanced". (default: RGB(55, 170, 85))
+.topic IDH_SETTINGS_APPEARANCE2_BEEPFILE
+Instead of the system's computer beep, you can select a different beep or tune for above options.
+.topic IDH_SETTINGS_LOG_DIRECTORY
+All logs generated by DC++ will be put in this subdirectory. Default: The  "Logs" subdirectory under where you've installed the application.
+.topic IDH_SETTINGS_ADVANCED3_ROLLBACK
+This option is not used currently.
+.topic IDH_SETTINGS_ADVANCED3_MAX_HASH_SPEED
+This is the speed at which DC++ will hash your files, in MiB/s. It is limited by the speed of your disk subsystem, but it can be used to make hashing slower and less noticable. A "normal" hash speed may be anywhere from 20 to 30 MiB/s. (no default)
+.topic IDH_SETTINGS_ADVANCED3_PM_HISTORY
+The number of lines that will be read from the private message log and displayed when a new PM is received. (no default)
+.topic IDH_SETTINGS_ADVANCED3_MINISLOT_SIZE
+This defines the size of the mini slot. The minimum value for this setting is 64 KiB. (default: 64 KiB)
+.topic IDH_SETTINGS_ADVANCED3_MAX_FILELIST_SIZE
+This setting controls the size of the maximum file list that DC++ will open, in mebibytes. This setting helps protect against malformed file lists that require large amounts of memory to decode.  You may need to reduce or increase the value of this setting based on personal experience. (default: 512 MiB)
+.topic IDH_SETTINGS_ADVANCED3_PRIVATE_ID
+This is your unique private ID (PID). This will later with an algorithm be used to identify you on ADC hubs. Do not share this with other users.
+.topic IDH_SETTINGS_ADVANCED3_AUTO_REFRESH_TIME
+This controls the interval at which your shared directories are rescanned for new and changed content. This is measured in minutes. (default: 60 minutes)
+.topic IDH_SETTINGS_ADVANCED3_BUFFERSIZE
+This controls the size of the chunks that DC++ writes to disk for downloads. Measured in kibibytes. (default: 16 KiB)
+.topic IDH_SETTINGS_ADVANCED3_AUTO_SEARCH_LIMIT
+This will limit the amount of sources a file can have before it will no longer be auto searched for. For example, if this option is set to 2, if a file has more than or exactly 2 sources, the file will be excluded from the auto-search list.
+.topic IDH_SETTINGS_ADVANCED3_SEARCH_HISTORY
+Number of old search lines that will be shown in the Search Window. (default: 10)
+.topic IDH_SETTINGS_ADVANCED3_BIND_ADDRESS
+This setting allows you to bind DC++ to a particular IP address on your machine. Most users do not need to change the default value, 0.0.0.0. However, if you have more than one network interface connected to the internet, you can force DC++ to use a particular connection by entering its IP here. If binding fails, it will do so silently and INADDR_ANY will be used instead. If you experience connection problems make sure that this is set to default. (default: 0.0.0.0) This feature requires a restart to be fully effective.
+.topic IDH_SETTINGS_ADVANCED3_SOCKET_IN_BUFFER
+The size of the buffer DC++ use to read sockets. Measured in bytes. (default: 8192 bytes)
+.topic IDH_SETTINGS_ADVANCED3_SOCKET_OUT_BUFFER
+The size of the buffer DC++ use to write to sockets. Measured in bytes. (default: 8192 bytes)
+.topic IDH_SETTINGS_ADVANCED3_MIN_SEGMENT_SIZE
+DC++ now uses segment downloading. i.e. it downloads each file in many little parts. This setting lets you specifiy the mimium size of these parts. (default: 1MiB)
+.topic IDH_SETTINGS_UC_LIST
+List of your current user commands.
+.topic IDH_SETTINGS_UC_ADD
+Open the User Command dialog to create a new user command and add it to the list.
+.topic IDH_SETTINGS_UC_CHANGE
+Open the currently selected user command in the User Command dialog in order to change it.
+.topic IDH_SETTINGS_UC_MOVE_UP
+Move the currently selected user command upwards in the list.
+.topic IDH_SETTINGS_UC_MOVE_DOWN
+Move the currently selected user command downwards in the list.
+.topic IDH_SETTINGS_UC_REMOVE
+Remove the currently selected user command.
+.topic IDH_SETTINGS_CERTIFICATES_PRIVATE_KEY_FILE
+This file is your personal and private certificate file. Do not share this with other users or hubs. If you do, you risk allowing others to use your certificate and in essence pose as you.
+.topic IDH_SETTINGS_CERTIFICATES_CERTIFICATE_FILE
+This file is the certificate file you should give to other users and hubs that you want to consider "trusted".
+.topic IDH_SETTINGS_CERTIFICATES_TRUSTED_CERTIFICATES_PATH
+Where trusted certificates from users or hubs will be stored. (default: the "Certificates\" subdirectory of where you've installed the application.)

Copied: dcplusplus/trunk/help/dialog_user_command.html (from rev 1052, dcplusplus/trunk/help/settings_usercommands.html)
===================================================================
--- dcplusplus/trunk/help/dialog_user_command.html	                        (rev 0)
+++ dcplusplus/trunk/help/dialog_user_command.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -0,0 +1,98 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=us-ascii" http-equiv="content-type">
+  <link href="office11.css" rel="stylesheet" type="text/css">
+  <title>User Command</title>
+</head>
+<body>
+<h1>User Command</h1>
+<h2>Command Types:</h2>
+<dl style="margin-left: 40px;">
+  <dt>Separator</dt>
+  <dd>Adds a separator to the menu</dd>
+  <dt>Raw</dt>
+  <dd>Sends raw command to the hub (experts only, end it with '|' in NMDC hubs and '\n' in ADC hubs!)</dd>
+  <dt>Chat</dt>
+  <dd>Sends command as if you were typing it in the chat</dd>
+  <dt>PM</dt>
+  <dd>Sends command as if you sent it by pm</dd>
+</dl>
+<h2>Context</h2>
+Contexts determine where the command is shown.<br>
+<dl style="margin-left: 40px;">
+  <dt>Hub Menu</dt>
+  <dd>Hub tab (at the bottom of the screen) right-click menu</dd>
+  <dt>Chat Menu </dt>
+  <dd>User right-click menu in chat and PM tab menu</dd>
+  <dt>Search Menu</dt>
+  <dd>Search right-click menu </dd>
+  <dt>File list Menu</dt>
+  <dd>File list right-click menu</dd>
+</dl>
+<h2>Parameters</h2>
+<dl style="margin-left: 40px;">
+  <dt>Name</dt>
+  <dd>Name (use '\' to create submenus)</dd>
+  <dt>Command</dt>
+  <dd>Command text (may contain any of the variables listed below). Use Ctrl + Enter to create a new line.</dd>
+  <dt>Hub </dt>
+  <dd>Hub ip as typed when connecting (empty = all NMDC hubs, "op" = NMDC hubs
+where you're an operator, "adc://" = all ADC hubs, "adc://op" = ADC hubs where you're an operator, 
+"adcs://" = all <a href="settings_certs.html">TLS</a> enabled hubs)</dd>
+  <dt>To</dt>
+  <dd>Private Message recipient</dd>
+  <dt>Send Once Per Nick</dt>
+  <dd>Send only once per user from search frame, regardless of how many
+files you've selected from that user</dd>
+</dl>
+<h2>Variables</h2>
+In the parameters, you can use %[<span style="font-weight: bold;">xxx</span>]
+variables and <a href="settings_logs.html#timeformat">date/time
+specifiers</a> (%Y, %m, ...). The following variables are also
+available:<br>
+<ul style="margin-left: 40px;">
+  <li>%[fileFN]: Filename (search, file list, and&nbsp;transfer view contexts only)</li>
+  <li>%[fileSIsize]: File size (search, file list contexts only)</li>
+  <li>%[fileSIshort]: File size, short version including units
+(search, file list contexts only)</li>
+  <li>%[fileTR]: TTH for the file, or "NONE" (search, file list contexts only)</li>
+  <li>%[type]: "File" or "Directory" (directory context only)</li>
+  <li>%[line:<span style="font-style: italic;">reason</span>]: Opens up a window asking for "<span style="font-style: italic;">reason</span>"</li>
+</ul>
+In addition to these variables, all of the ADC INF flags are available, with the following prefixes: <span style="font-weight: bold;">my</span>, <span style="font-weight: bold;">user</span>, and <span style="font-weight: bold;">hub</span>. &nbsp;Some may <span style="text-decoration: underline;">not</span> be available on NMDC hubs. &nbsp;Many&nbsp; useful ones are enumerated below:<br>
+<div style="margin-left: 40px;">
+<ul>
+  <li>%[myNI]: Your&nbsp;nick</li>
+  <li>%[myCID]: Your ADC CID</li>
+  <li>%[userNI]: The user's nick</li>
+  <li>%[userCID]: The user's ADC CID</li>
+  <li>%[userI4]: The user's IP (if supported by hub)</li>
+  <li>%[userTAG]: The user's tag</li>
+  <li>%[userDE]: The user's description</li>
+  <li>%[userEM]: The user's email</li>
+  <li>%[userSS]: The user's shared bytes (exact)</li>
+  <li>%[userSSshort]: The user's shared bytes (formatted with units)</li>
+</ul>
+</div>
+<h2 style="margin-left: 40px;">Compatibilty Variables</h2>
+<ul style="margin-left: 40px;">
+  <ul>
+    <li>%[mynick] = %[myNI]</li>
+    <li>%[nick] = %[userNI]</li>
+    <li>%[file] = %[fileFN]</li>
+    <li>%[filesize] = %[fileSI]</li>
+    <li>%[filesizeshort] = %[fileSIshort]</li>
+    <li>%[tth] = %[fileTR]</li>
+    <li>%[mycid] = %[myCID] </li>
+    <li>%[cid] = %[userCID]</li>
+    <li>%[ip] = %[userI4]</li>
+    <li>%[tag] = %[userTAG]</li>
+    <li>%[description] = %[userDE]</li>
+    <li>%[email] &nbsp;= %[userEM]</li>
+    <li>%[share] = %[userSS]</li>
+    <li>%[shareshort] = %[userSSshort]</li>
+  </ul>
+</ul>
+</body>
+</html>

Modified: dcplusplus/trunk/help/index.html
===================================================================
--- dcplusplus/trunk/help/index.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/index.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -55,6 +55,7 @@
 <h2>Dialogs</h2>
 <div style="margin-left: 40px;">
 <a href="dialog_indexing_progress.html">Indexing progress</a><br>
+<a href="dialog_user_command.html">User Command</a><br>
 </div>
 <h2>Frequently Asked Questions</h2>
 <div style="margin-left: 40px;"> <a href="faq_activemode.html">How to
@@ -86,7 +87,7 @@
 <a href="settings_advanced.html">Advanced</a>
 <div style="margin-left: 40px;"> <a href="settings_logs.html">Logs</a><br>
 <a href="settings_expert.html">Experts only</a><br>
-<a href="settings_usercommands.html">User Commands</a><br>
+<a href="settings_user_commands.html">User Commands</a><br>
 <a href="settings_certs.html">Security Certificates</a>
 </div>
 </div>

Modified: dcplusplus/trunk/help/resource.h
===================================================================
--- dcplusplus/trunk/help/resource.h	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/resource.h	2008-03-26 13:24:55 UTC (rev 1053)
@@ -1,40 +1,55 @@
+// this file contains help ids for topic aliases used to open the help file
+
 #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
+#include "cshelp.h"
 
+#define IDH_TOPICS_BEGIN 10000
+
+#define IDH_STARTPAGE 10000
+#define IDH_CHANGELOG 10001
+#define IDH_KEYBOARD 10002
+
+// windows
+#define IDH_HUB 10100
+#define IDH_PM 10101
+#define IDH_DIRECTORY_LISTING 10102
+#define IDH_PUBLIC_HUBS 10103
+#define IDH_FAVORITE_HUBS 10104
+#define IDH_FAVUSERS 10105
+#define IDH_QUEUE 10106
+#define IDH_FINISHED_DL 10107
+#define IDH_WAITING_USERS 10108
+#define IDH_FINISHED_UL 10109
+#define IDH_SEARCH 10110
+#define IDH_ADL_SEARCH 10111
+#define IDH_SEARCH_SPY 10112
+#define IDH_NOTEPAD 10113
+#define IDH_SYSTEM_LOG 10114
+#define IDH_NET_STATS 10115
+
+// dialogs
+#define IDH_HASH_PROGRESS 10200
+#define IDH_USER_COMMAND 10201
+
+// settings pages
+#define IDH_ADVANCED3PAGE 10300
+#define IDH_ADVANCEDPAGE 10301
+#define IDH_APPEARANCE2PAGE 10302
+#define IDH_APPEARANCEPAGE 10303
+#define IDH_DOWNLOADPAGE 10304
+#define IDH_UPLOADPAGE 10305
+#define IDH_FAVORITE_DIRSPAGE 10306
+#define IDH_GENERALPAGE 10307
+#define IDH_LOGPAGE 10308
+#define IDH_NETWORKPAGE 10309
+#define IDH_QUEUEPAGE 10310
+#define IDH_UCPAGE 10311
+#define IDH_WINDOWSPAGE 10312
+#define IDH_CERTIFICATESPAGE 10313
+#define IDH_TABSPAGE 10314
+
+#define IDH_TOPICS_END 10999
+
 #endif

Modified: dcplusplus/trunk/help/settings_advanced.html
===================================================================
--- dcplusplus/trunk/help/settings_advanced.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_advanced.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -117,6 +117,10 @@
   <dd>With this option enabled, and <a href="window_settings_advanced.html#disconnect">Automatically disconnect users who leave the hub</a>, users who are in your <a href="favorite_users.html">Favorite users</a> page are not disconnected.</dd>
   <dt>Show shell menu where possible</dt>
   <dd>This allow DC++ to display Explorer's shell menu for files, whenever possible.</dd>
+  <dt>Use extended menus with icons and titles</dt>
+  <dd>Have DC++ draw its own menus, which allows icons and titles to be added. Disable to revert to classic Windows menus.</dd>
+  <dt>Use Coral network when downloading hub lists (improves reliability)</dt>
+  <dd>With this option enabled, DC++ uses <a href="http://www.coralcdn.org">The Coral Content Distribution Network</a> when establishing HTTP connections.</dd>
 </dl>
 </body>
 </html>

Modified: dcplusplus/trunk/help/settings_appearance.html
===================================================================
--- dcplusplus/trunk/help/settings_appearance.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_appearance.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -7,6 +7,9 @@
 </head>
 <body>
 <h1>Appearance</h1>
+<span style="font-style: italic;">Note: Most of these options require
+that you restart DC++. (Fonts, colors and icons are loaded at startup
+only. Window settings are loaded when opening a new window.)</span>
 <h2>Options</h2>
 <dl style="margin-left: 40px;">
   <dt>Sort all downloads first</a>
@@ -69,11 +72,8 @@
 appear in the chat and private message windows. For the available
 formatting variables, please see <a
  href="settings_logs.html#timeformat">Logs</a>. <br>(default: %H:%M)</dd>
-  <dt>Language File</dt>
-  <dd>DC++ will read this XML translation file and load the strings in
-it, allowing you to use DC++ in whatever language the translators have
-made available. Link to many translations can be found on the
-<a href="Links.html#languagefiles">Links page</a>.</dd>
+  <dt>Language</dt>
+  <dd>This drop-down list allows you to choose which language DC++ should use for its user interface and messages. "Default" means "use the same language as my operating system".</dd>
 </dl>
 </body>
 </html>

Modified: dcplusplus/trunk/help/settings_certs.html
===================================================================
--- dcplusplus/trunk/help/settings_certs.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_certs.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -14,7 +14,7 @@
   <dt>Own certificate file</dt>
   <dd>This file is the certificate file you should give to other users and hubs that you want to consider "trusted". </dd>
   <dt>Trusted certificates path</dt>
-  <dd>Where trusted certificates from users or hubs will be stored. (default: the Certs\ subdirectory of where you've installed the application.) </dd>
+  <dd>Where trusted certificates from users or hubs will be stored. (default: the "Certificates\" subdirectory of where you've installed the application.) </dd>
 </dl>
 <h2>Options</h2>
 <dl style="margin-left: 40px;">
@@ -31,4 +31,4 @@
 <br>
 SSL support is an experimental feature and doesn't imply that DC++ is secure in any way.
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: dcplusplus/trunk/help/settings_colors_and_sounds.html
===================================================================
--- dcplusplus/trunk/help/settings_colors_and_sounds.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_colors_and_sounds.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -11,6 +11,7 @@
 that you restart DC++. (Fonts, colors and icons are loaded at startup
 only. Window settings are loaded when opening a new window.)</span>
 <h2>Colors</h2>
+You can preview the background color and text style before applying them.
 <dl style="margin-left: 40px;">
   <dt>Set Window Color</dt>
   <dd>This setting determines the background color of the windows in
@@ -39,4 +40,4 @@
   <dd>Instead of the system's computer beep, you can select a different beep or tune for above options.</a>
 </dl>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: dcplusplus/trunk/help/settings_connection.html
===================================================================
--- dcplusplus/trunk/help/settings_connection.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_connection.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -62,7 +62,7 @@
 Ordinarily, only users behind a home router (NAT device) will need to fill in this box. If you put a DNS name
 here, DC++ will try to resolve it into an IP address before use.</dd>
   <dt>Don't allow hub/UPnP to override</dt>
-  <dd>Enable this to always use the IP address in "External / WAN IP,"
+  <dd>Enable this to always use the IP address in "External / WAN IP",
 and not let either UPnP or connected hubs change it.</dd>
 </dl>
 <h2>Outgoing connection settings</h2>

Modified: dcplusplus/trunk/help/settings_expert.html
===================================================================
--- dcplusplus/trunk/help/settings_expert.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_expert.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -8,6 +8,8 @@
 <body>
 <h1>Experts only</h1>
 <dl style="margin-left: 40px;">
+  <dt>Rollback</dt>
+  <dd>This option is not used currently.</dd>
   <dt>Max Hash Speed</dt>
   <dd>This is the speed at which DC++ will hash your files, in
 MiB/s.
@@ -21,7 +23,6 @@
   <dt><a name="minislotsize"></a>Mini slot size</dt>
   <dd>This defines the size of the <a href="settings_sharing.html#slots">mini slot</a>. The
 minimum value for this setting is&nbsp;64 KiB. (default: 64 KiB)</dd>
-
   <dt>Max filelist size</dt>
   <dd>This setting controls the size of the maximum file list
 that DC++
@@ -33,11 +34,13 @@
   <dd>This is your unique private ID (PID). This will later with an algorithm be used to identify you on ADC hubs. <span style="font-weight: bold;">Do not share this with other users.</span></dd>
   <dt>Auto refresh time</dt>
   <dd>This controls the interval at which your shared directories
-are rescanned for new and changed content. &nbsp;This is measured
-in minutes (default: 60 minutes)</dd>
+are rescanned for new and changed content. This is measured
+in minutes. (default: 60 minutes)</dd>
   <dt>Write Buffer Size</dt>
   <dd>This controls the size of the chunks that DC++ writes to
 disk for downloads. Measured in kibibytes. (default: 16 KiB)</dd>
+  <dt>Auto-search limit</dt>
+  <dd>This will limit the amount of sources a file can have before it will no longer be auto searched for. For example, if this option is set to 2, if a file has more than or exactly 2 sources, the file will be excluded from the auto-search list.</dd>
   <dt><a name="searchhistory"></a>Search
 history</dt>
   <dd>Number of old search lines that will be shown in the Search
@@ -60,8 +63,8 @@
   <dt>Socket write buffer</dt>
   <dd>The size of the buffer DC++ use to write to sockets.
 Measured in bytes. (default: 8192 bytes)</dd>
-  <dt>Auto-search limit</dt>
-  <dd>This will limit the amount of sources a file can have before it will no longer be auto searched for. For example, if this option is set to 2, if a file has more than or exactly 2 sources, the file will be excluded from the auto-search list.</dd>
+  <dt>Min segment size</dt>
+  <dd>DC++ now uses segment downloading. i.e. it downloads each file in many little parts.  This setting lets you specifiy the mimium size of these parts. (default: 1MiB)</dd>
 </dl>
 </body>
 </html>

Modified: dcplusplus/trunk/help/settings_favoritedirs.html
===================================================================
--- dcplusplus/trunk/help/settings_favoritedirs.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_favoritedirs.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -7,7 +7,7 @@
 </head>
 <body>
 <h1>Favorite download to directories</h1>
-To add&nbsp;directories to your download to menu (right click on a
+To add&nbsp;directories to your "Download to" menu (right click on a
 file in the search
 frame), you can use the Add and Remove
 buttons, or drag and drop folders from a Windows Explorer

Modified: dcplusplus/trunk/help/settings_logs.html
===================================================================
--- dcplusplus/trunk/help/settings_logs.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_logs.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -25,12 +25,12 @@
   <dd><span style="font-weight: bold;">Default format:</span> [%Y-%m-%d %H:%M] %[message] </dd>
   <dt>Log Downloads</dt>
   <dd>Enables logging of completed downloads. File list downloads may not be logged if you've
-<a href="#filelist">disabled them</a>. File list downloads do not appear in the <a href="window_finished_downloads.html">Finished downloads</a> window if this option is disabled.
+<a href="#filelist">disabled them</a>.
   </dd>
   <dt>Log Uploads</dt>
   <dd>Enables&nbsp;logging of completed uploads.&nbsp;
 File list uploads may not be logged if you've
-<a href="#filelist">disabled them</a>. File list downloads do not appear in the <a href="window_finished_downloads.html">Finished uploads</a> window if this option is disabled.</dd>
+<a href="#filelist">disabled them</a>.</dd>
   <dt>Download and Upload Log Format </dt>
   <dd>%[userNI] - User's nickname<br>
 %[userI4] - User's IP address<br>
@@ -55,7 +55,7 @@
   </dd>
   <dt><a name="filelist"></a>Log Filelist transfers</dt>
   <dd>Add successful file list transfers to your upload and
-download logs. Otherwise only transferred files are logged. <em>Disabled
+download logs. Otherwise only transferred files are logged. File list transfers do not appear in the <a href="window_finished_downloads.html">Finished downloads</a> and <a href="window_finished_downloads.html">Finished uploads</a> windows if this option is disabled. <em>Disabled
 by default.</em></dd>
   <dt><a name="system"></a>Log System Messages</dt>
   <dd>Enables&nbsp;logging of system-level messages. Examples of

Modified: dcplusplus/trunk/help/settings_queue.html
===================================================================
--- dcplusplus/trunk/help/settings_queue.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_queue.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -36,7 +36,9 @@
 </div>
 <h2>Autodrop settings</h2>
 Autodrop allows automatical removal (or disconnecting) of slow download
-sources. By default, slow sources are removed.
+sources. By default, slow sources are removed.<br>
+All of these autodrop options are necessary to estimate and
+disconnect/drop sources properly.
 <div style="margin-left: 40px;">
 <dl>
   <dt>Drop sources below x B/s</dt>
@@ -60,8 +62,6 @@
 (default: 0 KiB)</dd>
 </dl>
 </div>
-All of the above autodrop options are necessary to estimate and
-disconnect/drop sources properly.
 <h2>Other queue options</h2>
 To enable autodrop, turn on either "Autodrop slow sources for all queue
 items" or "Remove slow file lists" (or both of them).

Modified: dcplusplus/trunk/help/settings_sharing.html
===================================================================
--- dcplusplus/trunk/help/settings_sharing.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_sharing.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -8,8 +8,8 @@
 <body>
 <h1>Sharing</h1>
 <h2>Shared Directories</h2>
-To add&nbsp;directories to your share, you can use the Add and Remove
-buttons, or drag and drop folders from a Windows Explorer window.&nbsp;
+To add directories to your share, you can use the Add and Remove
+buttons, or drag and drop folders from a Windows Explorer window.
 <em style="font-weight: bold;">Beginning with version
 0.4032, files will be shared only once they have been hashed.</em>
 <br>
@@ -19,9 +19,7 @@
   <dt>Share Hidden Files</dt>
   <dd>Share files with the Hidden attribute set and files inside
 directory with the Hidden attribute set. With this option off, files
-starting with a . (full stop) will not be shared. Files that have a $
-(dollar sign) in the filename will not be shared due to a protocol
-limitation. Note: this option requires a
+starting with a . (full stop) will not be shared. Note: this option requires a
 refresh of the file list, and may cause the client to appear to freeze.<br>
   </dd>
   <dt>Rename</dt>
@@ -57,14 +55,15 @@
 file lists and files below <a href="settings_expert.html#minislotsize">64 KiB</a> to
 other DC++ users without requiring
 a slot. There's a max of 3 connections in addition to normal slots,
-these are called mini slots. </dd>
-</dl>
-Note: If a user leaves the hub DC++ will close his slots, if the user
+these are called mini slots.<br>
+Note: If a user leaves the hub, DC++ will close his slots; if the user
 is back
-within 10 minutes DC++ will grant him a slot.&nbsp;(This will only
+within 10 minutes, DC++ will grant him a slot. (This will only
 happen if <a href="settings_advanced.html#disconnect">Automatically
 Disconnect Users Who
-Leave the Hub</a> is enabled)  This can cause your
+Leave the Hub</a> is enabled.) This can cause your
 upload slots going over maximum set in settings.<br>
+</dd>
+</dl>
 </body>
 </html>

Modified: dcplusplus/trunk/help/settings_tabs.html
===================================================================
--- dcplusplus/trunk/help/settings_tabs.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_tabs.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -6,17 +6,8 @@
   <link href="office11.css" rel="stylesheet" type="text/css">
 </head>
 <body>
-<h1>Tab bolding on contents change</h1>
+<h1>Tab highlight on content change</h1>
 <dl style="margin-left: 40px;">
-  <dt>Finished Downloads</dt>
-  <dd>When a download completes, the Finished
-Downloads tab will turn bold if this option is selected.</dd>
-  <dt>Finished Uploads</dt>
-  <dd>When a upload completes, the Finished
-Uploads tab will turn bold if this option is selected.</dd>
-  <dt>Download Queue</dt>
-  <dd>This option controls whether or not the Download Queue's tab will
-highlight itself when a queue item changes state or finishes.</dd>
   <dt>Hub</dt>
   <dd>When a chat message appears in a hub that's
 not focused the tab will become bold if you have this option selected.</dd>
@@ -26,18 +17,21 @@
 <dt>Search</dt>
   <dd>If more search result appear in an open search window that's
 not focused the tab will become bold if you have this option selected.</dd>
+<dt>System log</dt>
+  <dd>If an system log entry is added while the tab is not focused, the tab will become bold if you have this option selected.</dd>
+<dt>Download Queue</dt>
+  <dd>This option controls whether or not the Download Queue's tab will
+highlight itself when a queue item changes state or finishes.</dd>
+<dt>Finished Downloads</dt>
+  <dd>When a download completes, the Finished
+Downloads tab will turn bold if this option is selected.</dd>
 <dt>Waiting users</dt>
   <dd>If a user or an item is added or removed while the tab is not
 focused, the tab will become bold if you have this option selected.</dd>
-<dt>System log</dt>
-  <dd>If an system log entry is added while the tab is not focused, the tab will become bold if you have this option selected.</dd>
+<dt>Finished Uploads</dt>
+  <dd>When a upload completes, the Finished
+Uploads tab will turn bold if this option is selected.</dd>
 </dl>
-<h2>Options</h2>
-<dl style="margin-left: 40px;">
-  <dt>Max Tab Rows</dt>
-  <dd>The maximum number of rows of tabs that DC++ will make. Any
-tabs that do not fit will be accessible through the chevron at the
-right of the tab control. (default: 2)</dd>
 </body>
 </html>
 

Added: dcplusplus/trunk/help/settings_user_commands.html
===================================================================
--- dcplusplus/trunk/help/settings_user_commands.html	                        (rev 0)
+++ dcplusplus/trunk/help/settings_user_commands.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <title>User Commands</title>
+  <meta content="text/html; charset=us-ascii" http-equiv="content-type">
+  <link href="office11.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<h1>User Commands</h1>
+List of your current user commands.
+<dl style="margin-left: 40px;">
+<dt>Add</dt>
+<dd>Open the User Command dialog to create a new user command and add it to the list.</dd>
+<dt>Change</dt>
+<dd>Open the currently selected user command in the User Command dialog in order to change it.</dd>
+<dt>Move Up</dt>
+<dd>Move the currently selected user command upwards in the list.</dd>
+<dt>Move Down</dt>
+<dd>Move the currently selected user command downwards in the list.</dd>
+<dt>Remove</dt>
+<dd>Remove the currently selected user command.</dd>
+</dl>
+</body>
+</html>

Deleted: dcplusplus/trunk/help/settings_usercommands.html
===================================================================
--- dcplusplus/trunk/help/settings_usercommands.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_usercommands.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -1,98 +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 href="office11.css" rel="stylesheet" type="text/css">
-  <title>User Commands</title>
-</head>
-<body>
-<h1>User Commands</h1>
-<h2>Command Types:</h2>
-<dl style="margin-left: 40px;">
-  <dt>Separator</dt>
-  <dd>Adds a separator to the menu</dd>
-  <dt>Raw</dt>
-  <dd>Sends raw command to the hub (experts only, end it with '|' in NMDC hubs and '\n' in ADC hubs!)</dd>
-  <dt>Chat</dt>
-  <dd>Sends command as if you were typing it in the chat</dd>
-  <dt>PM</dt>
-  <dd>Sends command as if you sent it by pm</dd>
-</dl>
-<h2>Context</h2>
-Contexts determine where the command is shown.<br>
-<dl style="margin-left: 40px;">
-  <dt>Hub Menu</dt>
-  <dd>Hub tab (at the bottom of the screen) right-click menu</dd>
-  <dt>Chat Menu </dt>
-  <dd>User right-click menu in chat and PM tab menu</dd>
-  <dt>Search Menu</dt>
-  <dd>Search right-click menu </dd>
-  <dt>File list Menu</dt>
-  <dd>File list right-click menu</dd>
-</dl>
-<h2>Parameters</h2>
-<dl style="margin-left: 40px;">
-  <dt>Name</dt>
-  <dd>Name (use '\' to create submenus)</dd>
-  <dt>Command</dt>
-  <dd>Command text (may contain any of the variables listed below). Use Ctrl + Enter to create a new line.</dd>
-  <dt>Hub </dt>
-  <dd>Hub ip as typed when connecting (empty = all NMDC hubs, "op" = NMDC hubs
-where you're an operator, "adc://" = all ADC hubs, "adc://op" = ADC hubs where you're an operator, 
-"adcs://" = all <a href="settings_certs.html">TLS</a> enabled hubs)</dd>
-  <dt>To</dt>
-  <dd>Private Message recipient</dd>
-  <dt>Send Once Per Nick</dt>
-  <dd>Send only once per user from search frame, regardless of how many
-files you've selected from that user</dd>
-</dl>
-<h2>Variables</h2>
-In the parameters, you can use %[<span style="font-weight: bold;">xxx</span>]
-variables and <a href="settings_logs.html#timeformat">date/time
-specifiers</a> (%Y, %m, ...). The following variables are also
-available:<br>
-<ul style="margin-left: 40px;">
-  <li>%[fileFN]: Filename (search, file list, and&nbsp;transfer view contexts only)</li>
-  <li>%[fileSIsize]: File size (search, file list contexts only)</li>
-  <li>%[fileSIshort]: File size, short version including units
-(search, file list contexts only)</li>
-  <li>%[fileTR]: TTH for the file, or "NONE" (search, file list contexts only)</li>
-  <li>%[type]: "File" or "Directory" (directory context only)</li>
-  <li>%[line:<span style="font-style: italic;">reason</span>]: Opens up a window asking for "<span style="font-style: italic;">reason</span>"</li>
-</ul>
-In addition to these variables, all of the ADC INF flags are available, with the following prefixes: <span style="font-weight: bold;">my</span>, <span style="font-weight: bold;">user</span>, and <span style="font-weight: bold;">hub</span>. &nbsp;Some may <span style="text-decoration: underline;">not</span> be available on NMDC hubs. &nbsp;Many&nbsp; useful ones are enumerated below:<br>
-<div style="margin-left: 40px;">
-<ul>
-  <li>%[myNI]: Your&nbsp;nick</li>
-  <li>%[myCID]: Your ADC CID</li>
-  <li>%[userNI]: The user's nick</li>
-  <li>%[userCID]: The user's ADC CID</li>
-  <li>%[userI4]: The user's IP (if supported by hub)</li>
-  <li>%[userTAG]: The user's tag</li>
-  <li>%[userDE]: The user's description</li>
-  <li>%[userEM]: The user's email</li>
-  <li>%[userSS]: The user's shared bytes (exact)</li>
-  <li>%[userSSshort]: The user's shared bytes (formatted with units)</li>
-</ul>
-</div>
-<h2 style="margin-left: 40px;">Compatibilty Variables</h2>
-<ul style="margin-left: 40px;">
-  <ul>
-    <li>%[mynick] = %[myNI]</li>
-    <li>%[nick] = %[userNI]</li>
-    <li>%[file] = %[fileFN]</li>
-    <li>%[filesize] = %[fileSI]</li>
-    <li>%[filesizeshort] = %[fileSIshort]</li>
-    <li>%[tth] = %[fileTR]</li>
-    <li>%[mycid] = %[myCID] </li>
-    <li>%[cid] = %[userCID]</li>
-    <li>%[ip] = %[userI4]</li>
-    <li>%[tag] = %[userTAG]</li>
-    <li>%[description] = %[userDE]</li>
-    <li>%[email] &nbsp;= %[userEM]</li>
-    <li>%[share] = %[userSS]</li>
-    <li>%[shareshort] = %[userSSshort]</li>
-  </ul>
-</ul>
-</body>
-</html>

Modified: dcplusplus/trunk/help/settings_windows.html
===================================================================
--- dcplusplus/trunk/help/settings_windows.html	2008-03-23 18:41:22 UTC (rev 1052)
+++ dcplusplus/trunk/help/settings_windows.html	2008-03-26 13:24:55 UTC (rev 1053)
@@ -9,12 +9,8 @@
 <h1>Windows</h1>
 <h2>Auto-open at startup</h2>
 <dl style="margin-left: 40px;">
-  <dt>Public Hubs</dt>
-  <dd>Opens the Public Hub window at startup, and automatically
-downloads the <a href="settin...
 
[truncated message content]