linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #05843
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2991: Unify the accel for list filter input boxes; Help updates
------------------------------------------------------------
revno: 2991
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Thu 2012-07-12 15:17:54 +0200
message:
Unify the accel for list filter input boxes; Help updates
added:
help/window_list_filter.inc
modified:
changelog.txt
help/dialog_adls_properties.html
help/faq_install.html
help/faq_settings_files.html
help/settings_expert.html
help/settings_sharing.html
help/window_hub.html
help/window_public_hubs.html
help/window_search.html
help/window_users.html
win32/ADLSProperties.cpp
win32/HubFrame.cpp
win32/SearchFrame.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 'changelog.txt'
--- changelog.txt 2012-07-09 06:17:21 +0000
+++ changelog.txt 2012-07-12 13:17:54 +0000
@@ -25,6 +25,7 @@
* [L#587597] Add plugin API (Crise, iceman50)
* [dwt] Add a link control (poy)
* Allow Magnet links to be pasted in the "Quick connect" box (poy)
+* Rise the minislot size to 512 KiB
-- 0.799 2012-05-05 --
* Add icons (iceman50)
=== modified file 'help/dialog_adls_properties.html'
--- help/dialog_adls_properties.html 2008-11-13 16:27:41 +0000
+++ help/dialog_adls_properties.html 2012-07-12 13:17:54 +0000
@@ -9,7 +9,9 @@
<h1>ADLSearch Properties</h1>
<dl style="margin-left: 40px;">
<dt>Search String</dt>
- <dd cshelp="IDH_ADLSP_SEARCH_STRING">This is the set of search strings to search for.</dd>
+ <dd cshelp="IDH_ADLSP_SEARCH_STRING">This is the set of search strings or expressions to search for.</dd>
+ <dt>Regular Expression</dt>
+ <dd cshelp="IDH_ADLSP_SEARCH_REGULAR_EXPRESSION">If enabled then the Search String is interpreted as a <a href="http://www.regular-expressions.info"; target="_blank" class="external">regular expression</a>; otherwise it will be used for normal textual search.</dd>
<dt>Source Type</dt>
<dd><p>One of following values:</p>
<dl style="margin-left: 40px;">
=== modified file 'help/faq_install.html'
--- help/faq_install.html 2011-04-07 13:40:55 +0000
+++ help/faq_install.html 2012-07-12 13:17:54 +0000
@@ -14,7 +14,7 @@
You can also download the .zip file (Binary, portable version) and unpack it to any directory you like. If you use the portable version, all the settings and the downloads directory will be stored in the directory where DC++ has been unpacked. You can configure DC++ to use another directory for settings by editing a file called dcppboot.xml located besides the DC++ executable. You can read more about the storage of settings and downloaded files in <a href="faq_settings_files.html">this FAQ</a>.
</p>
<p>
-Note: if you use the portable (.zip) version of DC++ with Windows Vista or newer operating system then its not recommended to unpack it to the Program Files directory. Doing so may cause loss of settings and/or unfinished downloads.
+Note: if you use the portable (.zip) version of DC++ with Windows Vista or newer operating system then it's not recommended to unpack it to the Program Files directory. Doing so may cause loss of settings and/or unfinished downloads due to the <a href="http://windowsteamblog.com/windows/b/developers/archive/2009/08/04/user-account-control-data-redirection.aspx"; target="_blank" class="external">User Account Control Data Redirection</a> technology.
</p>
<br/>
<h1>How do I uninstall DC++?</h1>
=== modified file 'help/faq_settings_files.html'
--- help/faq_settings_files.html 2009-06-16 15:04:39 +0000
+++ help/faq_settings_files.html 2012-07-12 13:17:54 +0000
@@ -64,7 +64,7 @@
<li>If you <u>used the installer (.exe)</u> to install DC++ then place your archived settings files to the DC++ subfolder in Application Data directory of your <u>user profile</u> (see the exact path for your OS above). If you downloaded the <u>zipped binary of DC++</u> (.zip, portable version) then place your archived settings files to <u>the folder where you unpacked</u> the binary. If it asks then overwrite the default files with your archived ones.</li>
<li>Restart DC++. You're done.</li>
</ol>
-<p><u>Warning</u>: do not put the portable (zipped) version of DC++ under the Program Files folder if you use <u>Windows Vista or later</u> unless you have UAC disabled completely. Doing so may cause loss of settings and/or unfinished downloads due to <a href="http://technet.microsoft.com/en-us/magazine/cc160980.aspx"; target="_blank" class="external">Microsoft's Data Redirection technology</a>.</p>
+<p><u>Warning</u>: do not unpack the portable (zipped) version of DC++ under the Program Files folder if you use <u>Windows Vista or later</u> unless you have the UAC service completely disabled. Doing so may cause loss of settings and/or unfinished downloads due to <a href="http://windowsteamblog.com/windows/b/developers/archive/2009/08/04/user-account-control-data-redirection.aspx"; target="_blank" class="external">Microsoft's User Account Control Data Redirection technology</a>.</p>
<h2>How do I move my incomplete downloads and other (temporary) data of DC++ to another installation?</h2>
<p>To be able to continue your unfinished downloads you must copy the unfinished (.dctmp) files to the new installation. The location of these files depend on the <a href="settings_downloads.html#unfdwnlddir">Unfinished downloads directory settings</a>. You must put the unfinished files to the default unfinished folder of the new DC++ installation or copy them to any folder you like and set it as a directory for <a href="settings_downloads.html#unfdwnlddir">Unfinished downloads</a> in DC++ settings. Close DC++ while you copy the files!</p>
=== modified file 'help/settings_expert.html'
--- help/settings_expert.html 2012-02-12 14:20:18 +0000
+++ help/settings_expert.html 2012-07-12 13:17:54 +0000
@@ -20,15 +20,14 @@
<dt id="autosearchlimit">Auto-search limit</dt>
<dd cshelp="IDH_SETTINGS_EXPERT_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.</dd>
<dt id="minislotsize">Mini slot size</dt>
- <dd cshelp="IDH_SETTINGS_EXPERT_MINISLOT_SIZE">This defines the size of the <a href="settings_sharing.html#slots">mini slot</a>. The
-minimum value for this setting is 64 KiB. (default: 64 KiB)</dd>
+ <dd cshelp="IDH_SETTINGS_EXPERT_MINISLOT_SIZE">This value defines a file size border for mini slots; a <a href="settings_sharing.html#slots">mini slot</a> will be given to peers on requesting files below this size. The minimum value for this setting is 512 KiB. (default: 512 KiB)</dd>
<dt id="maxlistsize">Max filelist size</dt>
<dd cshelp="IDH_SETTINGS_EXPERT_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: 256 MiB)</dd>
+based on personal experience. (default: 512 MiB)</dd>
<dt>PID</dt>
<dd cshelp="IDH_SETTINGS_EXPERT_PRIVATE_ID">This is your unique private ID (PID). This will later with an algorithm be used to identify you on ADC hubs. <b>Do not share this with other users.</b></dd>
<dt id="autorefresh">Auto refresh time</dt>
=== modified file 'help/settings_sharing.html'
--- help/settings_sharing.html 2009-11-18 17:19:33 +0000
+++ help/settings_sharing.html 2012-07-12 13:17:54 +0000
@@ -52,7 +52,7 @@
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 <a href="settings_expert.html#minislotsize">64 KiB</a> to
+file lists and files below <a href="settings_expert.html#minislotsize">512 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.<br/>
=== modified file 'help/window_hub.html'
--- help/window_hub.html 2011-12-03 20:40:54 +0000
+++ help/window_hub.html 2012-07-12 13:17:54 +0000
@@ -71,8 +71,14 @@
<h2>Users list filter (bottom right)</h2>
<p cshelp="IDH_HUB_FILTER">
-Here, you can filter the users list so you will only see specific users. Eg, selecting 'Nick' in the drop down, and writing "foo" in the filter, will only display users that have "foo" in their nick.<br/>
-Note; users will only be visually filtered, not disconnected. You can revert to showing all users at any time by cleaning the text you have written in the filter.
+<div>
+ Here, you can filter the users list so you will only see specific users.
+</div>
+<!--#include virtual="window_list_filter.inc" -->
+<div>
+ Eg, selecting 'Nick' in the drop down, and writing "foo" in the filter, will only display users that have "foo" in their nick.<br/>
+ Note that users will only be visually filtered, not disconnected; also note that the remaining parts of the filtering control set are visible only when the filter input box is focused.
+</div>
</p>
<h2>Field to write a message (bottom left)</h2>
=== added file 'help/window_list_filter.inc'
--- help/window_list_filter.inc 1970-01-01 00:00:00 +0000
+++ help/window_list_filter.inc 2012-07-12 13:17:54 +0000
@@ -0,0 +1,2 @@
+<div>The filter, consisting of an input box, a column selection box and a method selection box, can help filter the list on the fly based on textual matching. You can filter the contents of any individual column or the whole list. There are three filtering methods available to choose from: excact word match, partial word match or match a <a href="http://www.regular-expressions.info"; target="_blank" class="external">regular expression</a>. Note that filtered results are not removed from the list; they can at any time be restored by just clearing the filter out.<br/>
+The filter input box can be focused with Alt+I.</div>
=== modified file 'help/window_public_hubs.html'
--- help/window_public_hubs.html 2011-12-17 14:08:57 +0000
+++ help/window_public_hubs.html 2012-07-12 13:17:54 +0000
@@ -49,7 +49,11 @@
<h2>Filter</h2>
<p cshelp="IDH_PUBLIC_HUBS_FILTER">
<div>
- Here, you can filter the hublist so you will only see specific hubs in the hublist. Eg, selecting 'address' in the drop down, and writing "foo" in the filter, will only display hubs that have "foo" in their address. When a filter is in effect, the number of hubs filtered out is shown in the status bar.
+ Here, you can filter the hublist so you will only see specific hubs in the hublist.
+</div>
+<!--#include virtual="window_list_filter.inc" -->
+<div>
+ Eg, selecting 'address' in the drop down, and writing "foo" in the filter, will only display hubs that have "foo" in their address. When a filter is in effect, the number of hubs filtered out is shown in the status bar.
</div>
<div>The filter input box can be focused with Alt+I.</div>
</p>
=== modified file 'help/window_search.html'
--- help/window_search.html 2011-12-18 15:37:20 +0000
+++ help/window_search.html 2012-07-12 13:17:54 +0000
@@ -111,11 +111,15 @@
<h2>Filter search results</h2>
<p cshelp="IDH_SEARCH_FILTER">
-These controls allow filtering current search results in order to only see specific ones. Eg
-selecting 'File' in the drop down, and writing "foo" in the filter, will only display results that
-have "foo" in their file name. When a filter is in effect, the "items" part of the status bar is
-updated to reflect it. Note that filtered results are not removed; they can at any time be
-restored by just clearing the filter out.
+<div>
+ These controls allow filtering current search results in order to only see specific ones.
+</div>
+<!--#include virtual="window_list_filter.inc" -->
+<div>
+ Eg selecting "File" in the drop down, and writing "foo" in the filter, will only display results that
+ have "foo" in their file name. When a filter is in effect, the "Items" part of the status bar is
+ updated to reflect it.
+</div>
</p>
<h2>Status bar</h2>
=== modified file 'help/window_users.html'
--- help/window_users.html 2011-12-17 14:08:57 +0000
+++ help/window_users.html 2012-07-12 13:17:54 +0000
@@ -49,16 +49,14 @@
<h2>Filters (bottom)</h2>
<p>The user list can be filtered by text, online status and file transfer activity. The following options are available:</p>
<dl style="margin-left: 40px;">
- <dt>Filter</dt>
+ <dt>Text filter</dt>
<dd>
<p cshelp="IDH_USERS_FILTER">
+ <!--#include virtual="window_list_filter.inc" -->
<div>
- The filter, consisting of an input box, a column selection box and a method selection box,
- can help filter the list on the fly based on textual matching. Eg writing "foo" in the
- filter input box, selecting "Nick" and "Partial match" will only display users that have
+ Eg writing "foo" in the filter input box, selecting "Nick" and "Partial match" will only display users that have
"foo" in their nick.
</div>
- <div>The filter input box can be focused with Alt+I.</div>
</p>
</dd>
<dt>Online</dt>
=== modified file 'win32/ADLSProperties.cpp'
--- win32/ADLSProperties.cpp 2012-01-13 20:55:20 +0000
+++ win32/ADLSProperties.cpp 2012-07-12 13:17:54 +0000
@@ -66,6 +66,7 @@
searchString->setText(Text::toT(search.searchString));
reg = cur->addChild(CheckBox::Seed(T_("Regular Expression")));
+ reg->setHelpId(IDH_ADLSP_SEARCH_REGULAR_EXPRESSION);
reg->setChecked(search.isRegEx());
}
=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp 2012-07-11 17:13:42 +0000
+++ win32/HubFrame.cpp 2012-07-12 13:17:54 +0000
@@ -263,6 +263,7 @@
addAccel(FCONTROL, 'R', [this] { handleReconnect(); });
addAccel(FALT, 'P', [this] { handlePrivateMessage(getParent()); });
addAccel(FALT, 'U', [this] { users->setFocus(); });
+ addAccel(FALT, 'I', [this] { filter.text->setFocus(); });
initAccels();
layout();
=== modified file 'win32/SearchFrame.cpp'
--- win32/SearchFrame.cpp 2012-07-11 17:13:42 +0000
+++ win32/SearchFrame.cpp 2012-07-12 13:17:54 +0000
@@ -109,7 +109,7 @@
}
SearchFrame::SearchFrame(TabViewPtr parent, const tstring& initialString, SearchManager::TypeModes initialType_) :
-BaseType(parent, T_("Search"), IDH_SEARCH, IDI_SEARCH),
+BaseType(parent, T_("Search"), IDH_SEARCH, IDI_SEARCH, false),
paned(0),
options(0),
searchBox(0),
@@ -292,6 +292,9 @@
status->setWidget(STATUS_SHOW_UI, showUI);
}
+ addAccel(FALT, 'I', [this] { filter.text->setFocus(); });
+ initAccels();
+
layout();
activate();
