linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #06011
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 3035: Help Updates
------------------------------------------------------------
revno: 3035
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Tue 2012-09-04 23:10:41 +0200
message:
Help Updates
added:
help/settings_plugins.html
modified:
help/DCPlusPlus.hhp
help/chat_commands.html
help/faq_connection.html
help/faq_portforward.html
help/faq_settings_files.html
help/faq_slowdownload.html
help/faq_unblock.html
help/get_started.html
help/index.html
help/resource.h
help/settings_connectivity_manual.html
help/settings_downloads.html
win32/PluginPage.cpp
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'help/DCPlusPlus.hhp'
--- help/DCPlusPlus.hhp 2012-07-20 14:03:59 +0000
+++ help/DCPlusPlus.hhp 2012-09-04 21:10:41 +0000
@@ -76,6 +76,7 @@
IDH_CERTIFICATESPAGE=settings_certs.html
IDH_SEARCHTYPESPAGE=settings_search_types.html
IDH_USERMATCHPAGE=settings_user_matching.html
+IDH_PLUGINPAGE=settings_plugins.html
[MAP]
#include resource.h
=== modified file 'help/chat_commands.html'
--- help/chat_commands.html 2012-02-01 16:26:37 +0000
+++ help/chat_commands.html 2012-09-04 21:10:41 +0000
@@ -43,6 +43,10 @@
<dt><untranslated>/unignore <user></untranslated></dt>
<dd>Adds a user matching definition (or modifies an existing one, if possible) to stop ignoring
chat messages from the specified user.</dd>
+ <dt><untranslated>/topic</untranslated></dt>
+ <dd>Prints the current hub's topic. Useful if you want to copy the topic or it contains a link you'd like to easily open.</dd>
+ <dt><untranslated>/raw <command></untranslated></dt>
+ <dd>Sends the specified raw protocol command to the current hub. Note that this is an advanced command for debugging purposes; improper use may result severe consequences like banning yourself from the hub.</dd>
</dl>
<h2>Private Message</h2>
<dl style="margin-left: 40px;">
=== modified file 'help/faq_connection.html'
--- help/faq_connection.html 2011-11-29 17:27:23 +0000
+++ help/faq_connection.html 2012-09-04 21:10:41 +0000
@@ -79,25 +79,25 @@
pane where you can alter connectivity settings manually.</p>
<p>When you look at the <a href="settings_connectivity_manual.html#connection">Incoming connection settings</a>
-you will find 3 options for active mode and the last option for being passive
+you will find 2 options for active mode and the last option for being passive
as a last resort. For being active:</p>
<ul>
- <li style="margin-left: 10px;">You can use the <i>My computer is directly connected
-to Internet (no router)</i> option <b>ONLY if you don't have a router/gateway</b>.</li>
- <li style="margin-left: 10px;">If you <b>have a router/gateway you can use ONLY
-the 2nd or the 3rd option</b> : <i>Let DC++ configure
-my router (NAT-PMP / UPnP)</i> or <i>Manual port forwarding (I have configured my router by myself)</i></li>
+ <li style="margin-left: 10px;"><b>If you don't have a router/gateway</b> you need to set the
+ <i>Active mode (I have no router / I have configured my router)</i> option.</li>
+ <li style="margin-left: 10px;">If you <b>connecting through a router/gateway you can choose between
+the 1st or the 2nd option</b> : <i>Active mode (I have no router / I have configured my router)</i>
+ or <i>Active mode (let DC++ configure my router with NAT-PMP / UPnP)</i>.</li>
</ul>
<h2>Setting up active mode if you are directly connected (NOT behind a router)</h2>
<ul>
- <li>
- Click on File menu and then Settings. Click on the <a href="settings_connectivity_manual.html">Manual configuration pane</a>.
+ <li>
+ Click on File menu and then Settings. Click on the <a href="settings_connectivity_manual.html">Manual configuration pane</a>.
</li>
<li>
- Select the <b>My computer is directly connected to the Internet (no router)</b> radio button. Leave the fields in
+ Select the <b>Active mode (I have no router / I have configured my router)</b> radio button. Leave the fields in
the 'External / WAN IP' box blank. This will make DC++ use the current IP assigned to your network card.
You must NOT have an internal IP address for this to work.
</li>
@@ -115,6 +115,7 @@
If not, then you are likely behind a router, have an internal IP address or haven't properly configured your <a href="faq_unblock.html">security software to unblock DC++</a>.
</li>
</ul>
+<p>Note hat this is the proper connection mode to choose if you're <b>using DC++ to connect to local hubs</b> and you plan to connect to users in your local network only.</p>
<h2>Setting up active mode if you are behind a router</h2>
@@ -147,8 +148,7 @@
Click on File menu and then Settings. Click on the <a href="settings_connectivity_manual.html">Manual configuration pane</a>.
</li>
<li>
- Select the <b>Let DC++ configure my router (NAT-PMP / UPnP)</b> radio button. Leave the fields in the 'External / WAN IP'
- box blank.
+ Select the <b>Active mode (let DC++ configure my router with NAT-PMP / UPnP)</b> radio button. Leave the fields in the "External / WAN IP" box blank.
</li>
<li>
Leave the transfers and search port fields blank also. This will make DC++ randomize the port it uses each time.
=== modified file 'help/faq_portforward.html'
--- help/faq_portforward.html 2011-12-03 20:40:54 +0000
+++ help/faq_portforward.html 2012-09-04 21:10:41 +0000
@@ -55,7 +55,7 @@
-> <i>cmd /k ipconfig</i>)</li>
<li>When you have mapped the port(s) on the router, open up DC++ and
go to <a href="settings_connectivity_manual.html#connection">Manual configuration settings</a>.
-Select <b>Manual port forwarding (I have configured my router by myself)</b>. In the port fields, enter the port
+Select <b>Active mode (I have no router / I have configured my router)</b>. In the port fields, enter the port
number(s) that you forwarded on the router. </li>
<li>In the External / WAN IP field, you need to enter the <b>external</b> IP address of your router.
Your external IP can be checked on
=== modified file 'help/faq_settings_files.html'
--- help/faq_settings_files.html 2012-07-12 13:17:54 +0000
+++ help/faq_settings_files.html 2012-09-04 21:10:41 +0000
@@ -40,10 +40,10 @@
<li><p>The DC++ subfolder of the Application Data directory of your user profile. This is the most probable location of the settings files if you used the installer (.exe) to install or upgrade your DC++. In a typical case the path is</p>
<ul>
<li>
- <i>C:\Documents And Settings\[your username]\Application Data\DC++\</i> for <u>Windows 2k and XP</u>;
+ <i>C:\Documents And Settings\[your username]\Application Data\DC++\</i> for <u>Windows XP</u>;
</li>
<li>
- <i>C:\Users\[your username]\AppData\Roaming\DC++\</i> in case of <u>Windows Vista or Windows 7</u>.
+ <i>C:\Users\[your username]\AppData\Roaming\DC++\</i> in case of <u>Windows Vista, 7 or 8</u>.
</li>
</ul>
</li>
@@ -78,15 +78,15 @@
<p>The actual location of the temporary data folder corelates with the location of settings files <a href="#location">(described above)</a>: </p>
<ul>
<li>If the settings files are located in the <u>program directory</u> then the subfolders for temporary data will be also there, in the very same folder.</li>
- <li>If the settings files are in your <u>user profile</u> then (in a typical case) you'll find the temporary folders in the following location :
+ <li>If the settings files are in your <u>user profile</u> then (in a typical case) you'll find the temporary folders in the following location :
<ul>
<li>
- <i>C:\Documents And Settings\[your username]\Local Settings\Application Data\DC++\</i> for <u>Windows 2k and XP</u>;
- </li>
+ <i>C:\Documents And Settings\[your username]\Local Settings\Application Data\DC++\</i> for <u>Windows XP</u>;
+ </li>
<li>
- <i>C:\Users\[your username]\AppData\Local\DC++\</i> in case of <u>Windows Vista or Windows 7</u>.
+ <i>C:\Users\[your username]\AppData\Local\DC++\</i> in case of <u>Windows Vista, 7 or 8</u>.
</li>
- </ul>
+ </ul>
</li>
</ul>
=== modified file 'help/faq_slowdownload.html'
--- help/faq_slowdownload.html 2011-04-07 13:40:55 +0000
+++ help/faq_slowdownload.html 2012-09-04 21:10:41 +0000
@@ -166,15 +166,12 @@
to test what size suits your connection best. Note that you should restart DC++ to
changes take effect.</p></li>
- <li>Your copy of Windows XP, Vista or Windows 7 has the "<acronym
- title="Quality of Service">QoS</acronym> Packet Scheduler"
-enabled so you are not able to use some reserved bandwidth for download. Follow <a
- href="http://kb.earthlink.net/case.asp?article=23629";
- target="_blank" class="external"> this guide</a> to disable QoS in XP or
- <a href="http://www.vistax64.com/tutorials/109326-qos-bandwidth-reserve-limit.html";
- target="_blank" class="external"> this one</a> to disable QoS in Vista or Windows 7.
-Windows 2000 does not come with QoS. Some routers also have QoS capabilities,
-but shouldn't be enabled by default. Please consult your router's manual for more
+ <li>The "<acronym title="Quality of Service">QoS</acronym> Packet Scheduler" is enabled
+ in your Windows so you are not able to use some reserved bandwidth for download. Follow
+ <a href="http://kb.earthlink.net/case.asp?article=23629"; target="_blank" class="external"> this guide</a>
+ to disable QoS in Windows XP or <a href="http://www.vistax64.com/tutorials/109326-qos-bandwidth-reserve-limit.html";
+ target="_blank" class="external"> this one</a> to disable QoS in Windows Vista, 7 or 8.
+Some routers also have QoS capabilities, but it shouldn't be enabled by default. Please consult your router's manual for more
information. </li>
<li>Your computer is infected with malicious software which altered the low level network
=== modified file 'help/faq_unblock.html'
--- help/faq_unblock.html 2011-11-29 17:27:23 +0000
+++ help/faq_unblock.html 2012-09-04 21:10:41 +0000
@@ -60,7 +60,7 @@
<li><u>in Windows XP Service Pack 2 & 3 or Windows Vista</u>:
go to Control Panel -> Windows Firewall -> Exceptions Tab. Select DC++ and click Delete.
</li>
- <li><u>in Windows 7</u>:
+ <li><u>in Windows 7 or 8</u>:
go to Control Panel -> Windows Firewall -> Allow a program or feature through Windows Firewall. Select DC++ and click Remove.
</li>
</ul>
@@ -74,7 +74,7 @@
Dropped Packets</i>. The log file is located at: C:\WINDOWS\pfirewall.log</li>
<li><u>in Windows Vista</u>:
you can find the firewall logging properties at Start Menu -> All Programs -> Administrative Tools -> Windows Firewall with Advanced Security -> Windows Firewall Properties -> Profile tabs -> Customize button under the Logging section under each of the profile tabs. You can also specify the path of the log file there.</li>
- <li><u>in Windows 7</u>:
+ <li><u>in Windows 7 or 8</u>:
go to Control Panel -> Windows Firewall -> Advanced Settings -> Monitoring -> Firewall. You can browse the firewall events here in great detail.</li>
</ul>
</p>
@@ -104,7 +104,7 @@
<li>If you use a third party software firewall or securty suite then make
sure you have the <a href="http://support.microsoft.com/kb/283673"; target="_blank" class="external">internal Windows firewall disabled</a>.
-On Vista and Windows 7 this should be more likely done by your 3rd party firewall application automatically.</li>
+On Vista and later Windows versions your 3rd party firewall application most likely disables the internal firewall automatically.</li>
<li>You can find configuration instructions for some popular firewall software <a href="http://www.dslreports.com/faq/dc/3.1_Software_Firewalls"; target="_blank" class="external">here</a>.</li>
</ul>
=== modified file 'help/get_started.html'
--- help/get_started.html 2012-06-17 13:28:34 +0000
+++ help/get_started.html 2012-09-04 21:10:41 +0000
@@ -16,7 +16,7 @@
file sharing using a protocol called <a href="http://adc.sourceforge.net/"; target="_blank" class="external">Advanced Direct Connect (ADC)</a>.</p>
<p>The newest version of DC++ should work well on any officially supported Windows
-client operating system, including XP SP3, Vista SP2 and Windows 7. Some older
+client operating system, including XP SP3, Vista SP2, Windows 7 and 8. Some older
versions will run on Windows 2000 or Win9x/ME but using DC++ on these old, discontinued
and vulnerable operating systems is neither recommended nor supported.
As long as it downloaded from the <a href="http://dcplusplus.sourceforge.net/"; target="_blank" class="external">official site</a>,
=== modified file 'help/index.html'
--- help/index.html 2012-07-20 14:03:59 +0000
+++ help/index.html 2012-09-04 21:10:41 +0000
@@ -110,6 +110,7 @@
<li><placeholder><a href="settings_user_matching.html">User matching</a></placeholder></li>
</ul>
</li>
+<li><placeholder><a href="settings_plugins.html">Plugins</a></placeholder></li>
</ul>
</li>
<li>
=== modified file 'help/resource.h'
--- help/resource.h 2012-07-20 14:03:59 +0000
+++ help/resource.h 2012-09-04 21:10:41 +0000
@@ -65,6 +65,7 @@
#define IDH_CERTIFICATESPAGE 10318
#define IDH_SEARCHTYPESPAGE 10319
#define IDH_USERMATCHPAGE 10320
+#define IDH_PLUGINPAGE 10321
// reserved for cshelp ids
#define IDH_CSHELP_BEGIN 11000
=== modified file 'help/settings_connectivity_manual.html'
--- help/settings_connectivity_manual.html 2012-09-04 17:29:02 +0000
+++ help/settings_connectivity_manual.html 2012-09-04 21:10:41 +0000
@@ -13,8 +13,9 @@
Use these settings to manually configure DC++ for incoming connections. If unsure about these settings,
you may want to follow the <a href="faq_connection.html">Manual connection setup guide</a>.
</p>
-<p style="margin-left: 40px;">Before setting up the following settings, make sure you are familiar
-with the meaning of each connection mode and with the <a href="faq_whyactive.html">differences
+<h2 id="connection">Manual incoming connection settings</h2>
+ <p style="margin-left: 40px;">Before setting up the following settings, make sure you are familiar
+ with the meaning of each connection mode and with the <a href="faq_whyactive.html">differences
between active and passive mode and their effect on your ability to search and download from
users</a> of the DC network.</p>
=== modified file 'help/settings_downloads.html'
--- help/settings_downloads.html 2009-06-14 15:36:49 +0000
+++ help/settings_downloads.html 2012-09-04 21:10:41 +0000
@@ -22,10 +22,10 @@
in your Windows user profile. In a typical case the default path of the finished downloads is</p>
<ul>
<li>
- <i>C:\Documents And Settings\[your username]\Application Data\DC++\Downloads\</i> for <u>Windows 2k and XP</u>;
+ <i>C:\Documents And Settings\[your username]\Application Data\DC++\Downloads\</i> for <u>Windows XP</u>;
</li>
<li>
- <i>C:\Users\[your username]\Downloads\</i> in case of <u>Windows Vista or Windows 7</u>.
+ <i>C:\Users\[your username]\Downloads\</i> in case of <u>Windows Vista, Windows 7 or Windows 8</u>.
</li>
</ul>
<p>If you installed the portable (zip archive) version of DC++ then the finished downloads folder defaults to the
@@ -41,10 +41,10 @@
<p>All incomplete downloads will be stored in this directory. If you leave it empty, temporary downloads will be stored in the default unfinished files folder. The default location of the Incomplete folder depends on what kind of installation method used to install DC++. If you used the installer (.exe) then your finished downloads will be placed to a folder in your Windows user profile. In a typical case the default path of the unfinished downloads is</p>
<ul>
<li>
- <i>C:\Documents And Settings\[your username]\Local Settings\Application Data\DC++\Incomplete</i> for <u>Windows 2k and XP</u>;
+ <i>C:\Documents And Settings\[your username]\Local Settings\Application Data\DC++\Incomplete</i> for <u>Windows XP</u>;
</li>
<li>
- <i>C:\Users\[your username]\AppData\Local\DC++\Incomplete</i> in case of <u>Windows Vista or Windows 7</u>.
+ <i>C:\Users\[your username]\AppData\Local\DC++\Incomplete</i> in case of <u>Windows Vista, Windows 7 or Windows 8</u>.
</li>
</ul>
=== added file 'help/settings_plugins.html'
--- help/settings_plugins.html 1970-01-01 00:00:00 +0000
+++ help/settings_plugins.html 2012-09-04 21:10:41 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link type="text/css" rel="stylesheet" href="office11.css"/>
+<link type="text/css" rel="stylesheet" href="style.css"/>
+</head>
+<body>
+ <h1>Plugin configuration</h1>
+ <p>
+ This page is for individual configuration, addition and removal of plugins made for DC++.
+ Note that the plugin system is in experimental state and the format of the loadable
+ plugins may change in the future.
+ </p>
+ <h2>Installed plugins</h2>
+ <p cshelp="IDH_SETTINGS_PLUGINS_LIST">
+ List of currently installed plugins.<br/>
+ </p>
+
+ <dl style="margin-left: 40px;">
+ <dt>Add</dt>
+ <dd cshelp="IDH_SETTINGS_PLUGINS_ADD">
+ Open a file selection dialog and add the selected plugin to the list if the plugin format is determined correct.
+ Some plugins may require you to restart DC++.
+ </dd>
+
+ <dt>Configure</dt>
+ <dd cshelp="IDH_SETTINGS_PLUGINS_CONFIGURE">
+ Open the plugin's own configuration page in order to edit its properties.
+ </dd>
+
+ <dt>Move Up</dt>
+ <dd cshelp="IDH_SETTINGS_PLUGINS_MOVE_UP">
+ Move the currently selected plugins upwards in the list.
+ </dd>
+
+ <dt>Move Down</dt>
+ <dd cshelp="IDH_SETTINGS_PLUGINS_MOVE_DOWN">
+ Move the currently selected plugins downwards in the list.
+ </dd>
+
+ <dt>Remove</dt>
+ <dd cshelp="IDH_SETTINGS_PLUGINS_REMOVE">
+ Stop and remove the currently selected plugins.
+ </dd>
+ </dl>
+
+ <h1>Plugin information</h1>
+ <p cshelp="IDH_SETTINGS_PLUGINS_INFO">
+ This panel shows all the available information from the selected plugin.
+ </p>
+</body>
+</html>
=== modified file 'win32/PluginPage.cpp'
--- win32/PluginPage.cpp 2012-07-07 16:11:11 +0000
+++ win32/PluginPage.cpp 2012-09-04 21:10:41 +0000
@@ -42,15 +42,6 @@
using dwt::Link;
using dwt::LoadDialog;
-#define IDH_PLUGIN_PAGE 0
-#define IDH_PLUGINS_INFO 0
-#define IDH_PLUGINS_INSTALLED 0
-#define IDH_PLUGIN_ADD 0
-#define IDH_PLUGIN_CONFIGURE 0
-#define IDH_PLUGIN_UP 0
-#define IDH_PLUGIN_DOWN 0
-#define IDH_PLUGIN_REMOVE 0
-
static const ColumnInfo columns[] = {
{ "", 440, false },
};
@@ -66,7 +57,7 @@
pluginInfo(0)
{
- setHelpId(IDH_PLUGIN_PAGE);
+ setHelpId(IDH_PLUGINPAGE);
grid->column(0).mode = GridInfo::FILL;
grid->row(0).mode = GridInfo::FILL;
@@ -83,7 +74,7 @@
cur->column(0).mode = GridInfo::FILL;
cur->row(0).mode = GridInfo::FILL;
cur->row(0).align = GridInfo::STRETCH;
- cur->setHelpId(IDH_PLUGINS_INSTALLED);
+ cur->setHelpId(IDH_SETTINGS_PLUGINS_LIST);
cur->setSpacing(6);
auto seed = WinUtil::Seeds::Dialog::table;
@@ -108,33 +99,33 @@
add = buttons->addChild(Button::Seed(T_("&Add")));
add->onClicked([this] { handleAddPlugin(); });
add->setImage(WinUtil::buttonIcon(IDI_OK));
- add->setHelpId(IDH_PLUGIN_ADD);
+ add->setHelpId(IDH_SETTINGS_PLUGINS_ADD);
configure = buttons->addChild(Button::Seed(T_("&Configure")));
configure->onClicked([this] { handleConfigurePlugin(); });
configure->setImage(WinUtil::buttonIcon(IDI_SETTINGS));
- configure->setHelpId(IDH_PLUGIN_CONFIGURE);
+ configure->setHelpId(IDH_SETTINGS_PLUGINS_CONFIGURE);
moveUp = buttons->addChild(Button::Seed(T_("Move &up")));
moveUp->onClicked([this] { handleMovePluginUp(); });
moveUp->setImage(WinUtil::buttonIcon(IDI_UPLOAD));
- moveUp->setHelpId(IDH_PLUGIN_UP);
+ moveUp->setHelpId(IDH_SETTINGS_PLUGINS_MOVE_UP);
moveDown = buttons->addChild(Button::Seed(T_("Move &down")));
moveDown->onClicked([this] { handleMovePluginDown(); });
moveDown->setImage(WinUtil::buttonIcon(IDI_DOWNLOAD));
- moveDown->setHelpId(IDH_PLUGIN_DOWN);
+ moveDown->setHelpId(IDH_SETTINGS_PLUGINS_MOVE_DOWN);
remove = buttons->addChild(Button::Seed(T_("&Remove")));
remove->onClicked([this] { handleRemovePlugin(); });
remove->setImage(WinUtil::buttonIcon(IDI_CANCEL));
- remove->setHelpId(IDH_PLUGIN_REMOVE);
+ remove->setHelpId(IDH_SETTINGS_PLUGINS_REMOVE);
}
}
{
GroupBoxPtr group = grid->addChild(GroupBox::Seed(T_("Plugin information")));
- group->setHelpId(IDH_PLUGINS_INFO);
+ group->setHelpId(IDH_SETTINGS_PLUGINS_INFO);
pluginInfo = group->addChild(Grid::Seed(1, 1));
pluginInfo->column(0).mode = GridInfo::FILL;
pluginInfo->row(0).mode = GridInfo::STATIC;
