linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #04648
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2638: Users frame help and few small gui improvements; get rid of some Waiting Users remnants
------------------------------------------------------------
revno: 2638
committer: eMTee <emtee11@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2011-10-16 00:58:51 +0200
message:
Users frame help and few small gui improvements; get rid of some Waiting Users remnants
removed:
help/window_favorite_users.html
help/window_waiting_users.html
added:
help/window_users.html
renamed:
res/FavoriteUsers.ico => res/Users.ico
modified:
dcpp/SettingsManager.cpp
dcpp/SettingsManager.h
help/DCPlusPlus.hhp
help/commands_user_favorites.inc
help/faq_secret.html
help/index.html
help/keyboard_commands.html
help/resource.h
help/settings_appearance.html
help/settings_tabs.html
help/window_main.html
win32/DCPlusPlus.rc
win32/MainWindow.cpp
win32/TabsPage.cpp
win32/UserInfoBase.h
win32/UsersFrame.cpp
win32/WinUtil.cpp
win32/resource.h
--
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 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp 2011-09-30 11:59:16 +0000
+++ dcpp/SettingsManager.cpp 2011-10-15 22:58:51 +0000
@@ -78,7 +78,7 @@
"OutgoingConnections",
"NoIpOverride", "SearchOnlyFreeSlots", "BoldFinishedDownloads", "BoldFinishedUploads", "BoldQueue",
"BoldHub", "BoldPm", "BoldFL", "BoldSearch", "BoldSearchSpy", "SocketInBuffer", "SocketOutBuffer",
- "BoldWaitingUsers", "BoldSystemLog", "AutoRefreshTime",
+ "BoldSystemLog", "AutoRefreshTime",
"UseTLS", "AutoSearchLimit", "AltSortOrder", "AutoKickNoFavs", "PromptPassword", "SpyFrameIgnoreTthSearches",
"DontDlAlreadyQueued", "MaxCommandLength", "AllowUntrustedHubs", "AllowUntrustedClients",
"TLSPort", "FastHash", "SortFavUsersFirst", "SegmentedDL", "FollowLinks",
@@ -92,6 +92,7 @@
"SlotsAlternateLimiting", "SlotsPrimaryLimiting",
"AutoDetectIncomingConnection", "SettingsSaveInterval",
"BalloonMainChat", "BalloonPM", "BalloonPMWindow", "BalloonFinishedDL", "BalloonFinishedFL",
+ "UsersFilterOnline","UsersFilterFavorite","UsersFilterQueue","UsersFilterWaiting",
"SENTRY",
// Int64
"TotalUpload", "TotalDownload",
@@ -267,7 +268,6 @@
setDefault(BOLD_FL, true);
setDefault(BOLD_SEARCH, true);
setDefault(BOLD_SEARCH_SPY, true);
- setDefault(BOLD_WAITING_USERS, true);
setDefault(BOLD_SYSTEM_LOG, true);
setDefault(AUTO_REFRESH_TIME, 60);
setDefault(USE_TLS, true);
@@ -319,6 +319,10 @@
setDefault(BALLOON_PM_WINDOW, BALLOON_DISABLED);
setDefault(BALLOON_FINISHED_DL, BALLOON_ALWAYS);
setDefault(BALLOON_FINISHED_FL, BALLOON_DISABLED);
+ setDefault(USERS_FILTER_ONLINE, false);
+ setDefault(USERS_FILTER_FAVORITE, true);
+ setDefault(USERS_FILTER_QUEUE, false);
+ setDefault(USERS_FILTER_WAITING, false);
setSearchTypeDefaults();
=== modified file 'dcpp/SettingsManager.h'
--- dcpp/SettingsManager.h 2011-10-02 12:14:41 +0000
+++ dcpp/SettingsManager.h 2011-10-15 22:58:51 +0000
@@ -99,7 +99,7 @@
OUTGOING_CONNECTIONS,
NO_IP_OVERRIDE, SEARCH_ONLY_FREE_SLOTS, BOLD_FINISHED_DOWNLOADS, BOLD_FINISHED_UPLOADS, BOLD_QUEUE,
BOLD_HUB, BOLD_PM, BOLD_FL, BOLD_SEARCH, BOLD_SEARCH_SPY, SOCKET_IN_BUFFER, SOCKET_OUT_BUFFER,
- BOLD_WAITING_USERS, BOLD_SYSTEM_LOG, AUTO_REFRESH_TIME,
+ BOLD_SYSTEM_LOG, AUTO_REFRESH_TIME,
USE_TLS, AUTO_SEARCH_LIMIT, ALT_SORT_ORDER, AUTO_KICK_NO_FAVS, PROMPT_PASSWORD, SPY_FRAME_IGNORE_TTH_SEARCHES,
DONT_DL_ALREADY_QUEUED, MAX_COMMAND_LENGTH, ALLOW_UNTRUSTED_HUBS, ALLOW_UNTRUSTED_CLIENTS,
TLS_PORT, FAST_HASH, SORT_FAVUSERS_FIRST, SEGMENTED_DL, FOLLOW_LINKS,
@@ -113,6 +113,7 @@
SLOTS_ALTERNATE_LIMITING, SLOTS_PRIMARY,
AUTO_DETECT_CONNECTION, SETTINGS_SAVE_INTERVAL,
BALLOON_MAIN_CHAT, BALLOON_PM, BALLOON_PM_WINDOW, BALLOON_FINISHED_DL, BALLOON_FINISHED_FL,
+ USERS_FILTER_ONLINE, USERS_FILTER_FAVORITE, USERS_FILTER_QUEUE, USERS_FILTER_WAITING,
INT_LAST };
enum Int64Setting { INT64_FIRST = INT_LAST + 1,
=== modified file 'help/DCPlusPlus.hhp'
--- help/DCPlusPlus.hhp 2011-06-28 20:07:49 +0000
+++ help/DCPlusPlus.hhp 2011-10-15 22:58:51 +0000
@@ -25,7 +25,7 @@
IDH_INDEX=index.html
IDH_GET_STARTED=get_started.html
IDH_CHANGELOG=changelog.html
-IDH_KEYBOARD=faq_keyboard_commands.html
+IDH_KEYBOARD=keyboard_commands.html
IDH_COMPILE=compile.html
IDH_MAIN=window_main.html
IDH_HUB=window_hub.html
@@ -33,10 +33,9 @@
IDH_FILE_LIST=window_file_list.html
IDH_PUBLIC_HUBS=window_public_hubs.html
IDH_FAVORITE_HUBS=window_favorite_hubs.html
-IDH_FAVUSERS=window_favorite_users.html
+IDH_USERS=window_users.html
IDH_QUEUE=window_download_queue.html
IDH_FINISHED_DL=window_finished_downloads.html
-IDH_WAITING_USERS=window_waiting_users.html
IDH_FINISHED_UL=window_finished_uploads.html
IDH_SEARCH=window_search.html
IDH_ADL_SEARCH=window_adlsearch.html
=== modified file 'help/commands_user_favorites.inc'
--- help/commands_user_favorites.inc 2009-03-22 17:24:47 +0000
+++ help/commands_user_favorites.inc 2011-10-15 22:58:51 +0000
@@ -1,4 +1,4 @@
<dl style="margin-left: 40px;">
<dt>Add to favorites</dt>
- <dd>Adds the selected users to your <a href="window_favorite_users.html">Favorite Users</a> list.</dd>
+ <dd>Adds the selected users to your <a href="window_users.html">Favorite Users</a> list.</dd>
</dl>
\ No newline at end of file
=== modified file 'help/faq_secret.html'
--- help/faq_secret.html 2010-02-06 19:38:21 +0000
+++ help/faq_secret.html 2011-10-15 22:58:51 +0000
@@ -17,7 +17,7 @@
<li>Pressing shift on startup will prevent DC++ from auto-connecting to hubs.</li>
<li>You can tab complete nicks in mainchat, including ignoring prefixes. In case of ambiguity pressing the Tab key again will show all the possible nicks starting with the letter(s) you typed. </li>
<li>You can drag and drop all tabs to the position of your choice.</li>
- <li>You can see who wants to download from you and what they want to download by opening the <a href="window_waiting_users.html">Waiting users frame</a>.</li>
+ <li>You can see who wants to download from you and what they want to download by opening the <a href="window_users.html">Users frame</a> and filtering out Pending Uploads.</li>
<li>You can drag folders from Windows Explorer and drop them in the <a href="settings_sharing.html">Sharing</a> page in Settings.</li>
<li>You can spot if a file is identical to another one by looking in
the TTH column, if the TTH is the same, it is the exact same file.</li>
=== modified file 'help/index.html'
--- help/index.html 2011-06-28 20:07:49 +0000
+++ help/index.html 2011-10-15 22:58:51 +0000
@@ -31,10 +31,9 @@
<li><placeholder><a href="window_file_list.html">File List</a></placeholder></li>
<li><placeholder><a href="window_public_hubs.html">Public Hubs</a></placeholder></li>
<li><placeholder><a href="window_favorite_hubs.html">Favorite Hubs</a></placeholder></li>
-<li><placeholder><a href="window_favorite_users.html">Favorite Users</a></placeholder></li>
+<li><placeholder><a href="window_users.html">Users</a></placeholder></li>
<li><placeholder><a href="window_download_queue.html">Download Queue</a></placeholder></li>
<li><placeholder><a href="window_finished_downloads.html">Finished Downloads</a></placeholder></li>
-<li><placeholder><a href="window_waiting_users.html">Waiting Users</a></placeholder></li>
<li><placeholder><a href="window_finished_uploads.html">Finished Uploads</a></placeholder></li>
<li><placeholder><a href="window_search.html">Search</a></placeholder></li>
<li><placeholder><a href="window_adlsearch.html">ADLSearch</a></placeholder></li>
=== modified file 'help/keyboard_commands.html'
--- help/keyboard_commands.html 2011-02-27 15:29:49 +0000
+++ help/keyboard_commands.html 2011-10-15 22:58:51 +0000
@@ -54,7 +54,7 @@
<dt>Ctrl + T (in <placeholder><a href="window_hub.html">Hub</a></placeholder> windows)</dt>
<dd>Follow last redirect.</dd>
<dt>Ctrl + U</dt>
- <dd>Open the <placeholder><a href="window_favorite_users.html">Favorite Users</a></placeholder> window.</dd>
+ <dd>Open the <placeholder><a href="window_users.html">Users</a></placeholder> window.</dd>
<dt>Ctrl + F3</dt>
<dd>Open the Settings dialog.</dd>
<dt>Ctrl and + (on the numeric keyboard)</dt>
@@ -83,7 +83,7 @@
<div>Focus the message writing box of the window.</div>
<div>Cancel the current chat search if there is any.</div>
</dd>
- <dt>Alt + I (in the <placeholder><a href="window_public_hubs.html">Public Hubs</a></placeholder> window)</dt>
+ <dt>Alt + I (in the <placeholder><a href="window_public_hubs.html">Public Hubs</a></placeholder> and <placeholder><a href="window_users.html">Users</a></placeholder> windows)</dt>
<dd>Set focus on the filter input box.</dd>
<dt>+ (on the numeric keyboard)</dt>
<dd>In the download queue, pressing + (on the numeric keyboard) sets
=== modified file 'help/resource.h'
--- help/resource.h 2011-06-28 20:07:49 +0000
+++ help/resource.h 2011-10-15 22:58:51 +0000
@@ -18,7 +18,7 @@
#define IDH_FILE_LIST 10103
#define IDH_PUBLIC_HUBS 10104
#define IDH_FAVORITE_HUBS 10105
-#define IDH_FAVUSERS 10106
+#define IDH_USERS 10106
#define IDH_QUEUE 10107
#define IDH_FINISHED_DL 10108
#define IDH_WAITING_USERS 10109
=== modified file 'help/settings_appearance.html'
--- help/settings_appearance.html 2011-10-06 18:58:07 +0000
+++ help/settings_appearance.html 2011-10-15 22:58:51 +0000
@@ -39,7 +39,7 @@
to enable or disable it on already open hubs. <i>On large hubs, you don't want this enabled.</i></dd>
<dt>Only show joins / parts for favorite users</dt>
<dd cshelp="IDH_SETTINGS_APPEARANCE_FAV_SHOW_JOINS">With this option enabled, only the joining and parting of
-<a href="window_favorite_users.html">Favorite Users</a> are shown.</dd>
+<a href="window_users.html">Favorite Users</a> are shown.</dd>
<dt>Sort favorite users first</dt>
<dd cshelp="IDH_SETTINGS_APPEARANCE_SORT_FAVUSERS_FIRST">With this option enabled, those users who are <a href=window_favorite_users.html>favorite users</a> will be sorted first in user lists.</dd>
<dt>Use system icons when browsing files (slows browsing down a bit)</dt>
=== modified file 'help/settings_tabs.html'
--- help/settings_tabs.html 2010-08-11 15:40:28 +0000
+++ help/settings_tabs.html 2011-10-15 22:58:51 +0000
@@ -64,8 +64,6 @@
<dd cshelp="IDH_SETTINGS_TABS_BOLD_FINISHED_DOWNLOADS">When a download completes, the
<a href="window_finished_downloads.html">Finished Downloads</a> tab will be highlighted if this option is selected.</dd>
<dt>Waiting users</dt>
- <dd cshelp="IDH_SETTINGS_TABS_BOLD_WAITING_USERS">When a user or an item is added or removed to the
-<a href="window_waiting_users.html">Waiting Users</a> window while it is out of focus, the tab will be highlighted if you have this option selected.</dd>
<dt>Finished Uploads</dt>
<dd cshelp="IDH_SETTINGS_TABS_BOLD_FINISHED_UPLOADS">When an upload completes, the
<a href="window_finished_uploads.html">Finished Uploads</a> tab will be highlighted if this option is selected.</dd>
=== removed file 'help/window_favorite_users.html'
--- help/window_favorite_users.html 2009-03-22 17:24:47 +0000
+++ help/window_favorite_users.html 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<!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>
- <img src="FavoriteUsers.ico" width="16" height="16" alt="Favorite users"/>
- Favorite users
- </h1>
-<h2>Columns</h2>
-<dl style="margin-left: 40px;">
- <dt>Auto grant slot / Nick</dt>
- <dd>Specifies the nick of the user. The checkbox indicates if DC++ should auto grant the user a slot. If the box is checked, DC++ will automatically grant the user a slot.</dd>
- <dt>Hub (last seen in, if offline)</dt>
- <dd>Which hub you saw this user the last time.</dd>
- <dt>Time last seen</dt>
- <dd>Which specific date and time you saw this user the last time; or "Online" if the user is currently online.</dd>
- <dt>Description</dt>
- <dd>Brief description of the user. You can change this description by either right-clicking and selecting "Description", or by pressing the Enter key.</dd>
- <dt>CID</dt>
- <dd>Client ID of the user.</dd>
-</dl>
-
-<h2>Context menu commands</h2>
-<dl style="margin-left: 40px;">
- <dt>Connect to hub</dt>
- <dd>Connect to the hub where the user last seen in.</dd>
- <dt>Description</dt>
- <dd>Edit the brief description of the user (shown in the Description column).</dd>
-</dl>
-<!--#include virtual="commands_user_general.inc" -->
-
-</body>
-</html>
=== modified file 'help/window_main.html'
--- help/window_main.html 2011-10-01 14:59:18 +0000
+++ help/window_main.html 2011-10-15 22:58:51 +0000
@@ -71,8 +71,8 @@
<dd><div>Open the <placeholder><a href="window_favorite_hubs.html">Favorite Hubs</a></placeholder> window.</div>
<div>In there, you can store and manage you favorite places in the DC network.</div></dd>
- <dt><img src="FavoriteUsers.ico" width="16" height="16" alt="Favorite Users"/> Favorite Users</dt>
- <dd><div>Open the <placeholder><a href="window_favorite_users.html">Favorite Users</a></placeholder> window.</div>
+ <dt><img src="Users.ico" width="16" height="16" alt="Users"/> Users</dt>
+ <dd><div>Open the <placeholder><a href="window_users.html">Users</a></placeholder> window.</div>
<div>In there, you can store and manage your favorite DC users here as well as grant extra access to your share for any of them.</div></dd>
<dt><img src="Queue.ico" width="16" height="16" alt="Download Queue"/> Download Queue</dt>
@@ -83,10 +83,6 @@
<dd><div>Open the <placeholder><a href="window_finished_downloads.html">Finished Downloads</a></placeholder> window.</div>
<div>It lists your downloaded files in the current session.</div></dd>
- <dt><img src="WaitingUsers.ico" width="16" height="16" alt="Waiting Users"/> Waiting Users</dt>
- <dd><div>Open the <placeholder><a href="window_waiting_users.html">Waiting Users</a></placeholder> window.</div>
- <div>It lists those users who are currently waiting for a free slot to be able to start downloading from you.</div></dd>
-
<dt><img src="FinishedUL.ico" width="16" height="16" alt="Finished Uploads"/> Finished Uploads</dt>
<dd><div>Open the <placeholder><a href="window_finished_uploads.html">Finished Uploads</a></placeholder> window.</div>
<div>It lists the files uploaded from you in the current session.</div></dd>
@@ -205,10 +201,9 @@
<a href="#tb_reconnect" title="Reconnect"><img src="Reconnect.ico" width="20" height="20" alt="Reconnect"/></a>
<a href="#tb_follow" title="Follow last redirect"><img src="Follow.ico" width="20" height="20" alt="Follow last redirect"/></a>
<a href="window_favorite_hubs.html" title="Favorite Hubs"><img src="FavoriteHubs.ico" width="20" height="20" alt="Favorite Hubs"/></a>
-<a href="window_favorite_users.html" title="Favorite Users"><img src="FavoriteUsers.ico" width="20" height="20" alt="Favorite Users"/></a>
+<a href="window_users.html" title="Users"><img src="Users.ico" width="20" height="20" alt="Users"/></a>
<a href="window_download_queue.html" title="Download Queue"><img src="Queue.ico" width="20" height="20" alt="Download Queue"/></a>
<a href="window_finished_downloads.html" title="Finished Downloads"><img src="FinishedDL.ico" width="20" height="20" alt="Finished Downloads"/></a>
-<a href="window_waiting_users.html" title="Waiting Users"><img src="WaitingUsers.ico" width="20" height="20" alt="Waiting Users"/></a>
<a href="window_finished_uploads.html" title="Finished Uploads"><img src="FinishedUL.ico" width="20" height="20" alt="Finished Uploads"/></a>
<a href="window_search.html" title="Search"><img src="Search.ico" width="20" height="20" alt="Search"/></a>
<a href="window_adlsearch.html" title="ADL Search"><img src="ADLSearch.ico" width="20" height="20" alt="ADL Search"/></a>
@@ -246,8 +241,8 @@
<div>Consult the help topic associated to the <placeholder><a href="dialog_fav_hub_groups.html">Favorite hub groups</a></placeholder> dialog to find out how to add sub-menus to the menu that appears under the arrow.</div>
</dd>
- <dt>Favorite Users</dt>
- <dd cshelp="IDH_TOOLBAR_FAVORITE_USERS">Open the <placeholder><a href="window_favorite_users.html">Favorite Users</a></placeholder> window.</dd>
+ <dt>Users</dt>
+ <dd cshelp="IDH_TOOLBAR_USERS">Open the <placeholder><a href="window_users.html">Users</a></placeholder> window.</dd>
<dt>Download Queue</dt>
<dd cshelp="IDH_TOOLBAR_QUEUE">Open the <placeholder><a href="window_download_queue.html">Download Queue</a></placeholder> window.</dd>
@@ -255,9 +250,6 @@
<dt>Finished Downloads</dt>
<dd cshelp="IDH_TOOLBAR_FINISHED_DL">Open the <placeholder><a href="window_finished_downloads.html">Finished Downloads</a></placeholder> window.</dd>
- <dt>Waiting Users</dt>
- <dd cshelp="IDH_TOOLBAR_WAITING_USERS">Open the <placeholder><a href="window_waiting_users.html">Waiting Users</a></placeholder> window.</dd>
-
<dt>Finished Uploads</dt>
<dd cshelp="IDH_TOOLBAR_FINISHED_UL">Open the <placeholder><a href="window_finished_uploads.html">Finished Uploads</a></placeholder> window.</dd>
=== added file 'help/window_users.html'
--- help/window_users.html 1970-01-01 00:00:00 +0000
+++ help/window_users.html 2011-10-15 22:58:51 +0000
@@ -0,0 +1,80 @@
+<!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>
+ <img src="Users.ico" width="16" height="16" alt="Users"/>
+ Users
+ </h1>
+
+<p>This window shows the list of all users of the hubs you connected in the current DC++ session as well as all the detailed information associated with every listed user. It's possible to quickly find any online user from any connected hub and easily keep track of your favorite users, too. With its powerful filtering capabilities this window provides the functionality of the former Favorite Users and Waiting Users window.</p>
+
+<h2>User list columns</h2>
+<dl style="margin-left: 40px;">
+ <dt>Favorite</dt>
+ <dd>The blue star icon shows that this particular user is a favorite. Click the icon to add or remove the user from the favorites.</dd>
+ <dt>Auto grant slot</dt>
+ <dd>The icon indicates that DC++ should auto grant a favorite user a slot or not. If the indicator is green, DC++ will automatically grant the user a slot; you can click the icon to toggle. The function works only for users already set to favorite.</dd>
+ <dt>Nick</dt>
+ <dd>The nick of the user.</dd>
+ <dt>Hub (last seen in, if offline)</dt>
+ <dd>Which hub you saw this user the last time.</dd>
+ <dt>Status / Time last seen</dt>
+ <dd>For normal users this column shows the online status. For favorite users it shows which specific date and time you saw this user the last time; or "Online" if the favorite user is currently online.</dd>
+ <dt>Description</dt>
+ <dd>Brief description for the user. You can change this description by either selecting "Description" from the context menu or by pressing the Enter key. The description is saved for favorite users only.</dd>
+ <dt>CID</dt>
+ <dd>Client ID of the user.</dd>
+</dl>
+
+<h2>User list context menu commands</h2>
+<dl style="margin-left: 40px;">
+ <dt>Connect to hub</dt>
+ <dd>This menu item shows only for favorite users. If the user is online this will select the first hub where he/she is connected. If the user is offline you can use this function to connect to the hub where this favorite user last seen in.</dd>
+ <dt>Description</dt>
+ <dd>Edit the brief description of the user (shown in the Description column).</dd>
+</dl>
+<!--#include virtual="commands_user_general.inc" -->
+<!--#include virtual="commands_user_favorites.inc" -->
+
+<h2>Details pane (right)</h2>
+<p cshelp="IDH_USERS_DETAILS">
+ This pane shows you all the available details sent by the DC client of the selected user. The number of records shown can heavily depend on what kind of user selected, what protocol it uses, etc... For example you can get the most information from an ADC client user while the amount of available information from a hub bot is usually very small.
+</p>
+
+<h2>Filters (bottom)</h2>
+<p>It's possible to narrow down the user list as you can filter out users by nickname, online status and file transfer activity. The following options are available:</p>
+<dl style="margin-left: 40px;">
+ <dt>Nick filter</dt>
+ <dd>
+ <p cshelp="IDH_USERS_FILTER_NICK">
+ <div>
+ Using this text box you can on-the-fly filter the user list by nicks. By writing "foo" in the filter, will only display users that have "foo" in their nick.
+ </div>
+ <div>The input box can be focused with Alt+I.</div>
+ </p>
+ </dd>
+ <dt>Online</dt>
+ <dd cshelp="IDH_USERS_FILTER_ONLINE">
+ If enabled the user list shows online users only, it will filter out all users who are currently offline (not connected to any hub where you are currently logged in).
+ </dd>
+ <dt>Favorite</dt>
+ <dd cshelp="IDH_USERS_FILTER_FAVORITE">
+ If enabled the user list shows only your favorite users.
+ </dd>
+ <dt>Pending download</dt>
+ <dd cshelp="IDH_USERS_FILTER_QUEUE">
+ If enabled the user list will show those users whom you're currently downloading from.
+ </dd>
+ <dt>Pending upload</dt>
+ <dd cshelp="IDH_USERS_FILTER_WAITING">
+ If enabled the user list will show those users who are waiting for a free slot to be able to start downloading from you (functionality of the former Waiting Users window). These users have have queued one more files from you, but haven't been able to get a slot.
+ </dd>
+</dl>
+
+</body>
+</html>
=== removed file 'help/window_waiting_users.html'
--- help/window_waiting_users.html 2009-03-22 17:24:47 +0000
+++ help/window_waiting_users.html 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-<!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>
- <img src="WaitingUsers.ico" width="16" height="16" alt="Waiting users"/>
- Waiting users
- </h1>
-<p>
-This page will display those users who have queued a file from you, but haven't been able to get a slot. As well, from which hub they originate,
-the file that they've queued and how much of the file they have completed.
-</p>
-<p>
-Note that this is not an upload queue, and just a visual representation of who have tried to get a slot for what.
-</p>
-
-<h2>Context menu commands</h2>
-<!--#include virtual="commands_user_general.inc" -->
-<!--#include virtual="commands_user_favorites.inc" -->
-<!--#include virtual="commands_listview.inc" -->
-</body>
-</html>
=== renamed file 'res/FavoriteUsers.ico' => 'res/Users.ico'
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc 2011-04-26 13:11:30 +0000
+++ win32/DCPlusPlus.rc 2011-10-15 22:58:51 +0000
@@ -51,7 +51,7 @@
IDI_FINISHED_DL ICON "res/FinishedDL.ico"
IDI_ADLSEARCH ICON "res/ADLSearch.ico"
IDI_FINISHED_UL ICON "res/FinishedUL.ico"
-IDI_FAVORITE_USERS ICON "res/FavoriteUsers.ico"
+IDI_USERS ICON "res/Users.ico"
IDI_SPY ICON "res/SearchSpy.ico"
IDI_NET_STATS ICON "res/NetStats.ico"
IDI_MAGNET ICON "res/Magnet.ico"
=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp 2011-10-10 20:34:10 +0000
+++ win32/MainWindow.cpp 2011-10-15 22:58:51 +0000
@@ -294,7 +294,7 @@
viewIndexes[FavHubsFrame::id] = viewMenu->appendItem(T_("&Favorite Hubs\tCtrl+H"),
[this] { FavHubsFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_FAVORITE_HUBS));
viewIndexes[UsersFrame::id] = viewMenu->appendItem(T_("&Users\tCtrl+U"),
- [this] { UsersFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_FAVORITE_USERS));
+ [this] { UsersFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_FAVORITE_USER_ON));
viewMenu->appendSeparator();
viewIndexes[QueueFrame::id] = viewMenu->appendItem(T_("&Download Queue\tCtrl+D"),
[this] { QueueFrame::openWindow(getTabView()); }, WinUtil::menuIcon(IDI_QUEUE));
@@ -383,8 +383,8 @@
toolbar->addButton(FavHubsFrame::id, WinUtil::toolbarIcon(IDI_FAVORITE_HUBS), 0, T_("Favorite Hubs"), false,
IDH_TOOLBAR_FAVORITE_HUBS, [this] { FavHubsFrame::openWindow(getTabView()); },
[this](const dwt::ScreenCoordinate& pt) { handleFavHubsDropDown(pt); });
- toolbar->addButton(UsersFrame::id, WinUtil::toolbarIcon(IDI_FAVORITE_USERS), 0, T_("Users"), false,
- IDH_TOOLBAR_FAVORITE_USERS, [this] { UsersFrame::openWindow(getTabView()); });
+ toolbar->addButton(UsersFrame::id, WinUtil::toolbarIcon(IDI_USERS), 0, T_("Users"), false,
+ IDH_TOOLBAR_USERS, [this] { UsersFrame::openWindow(getTabView()); });
toolbar->addButton(QueueFrame::id, WinUtil::toolbarIcon(IDI_QUEUE), 0, T_("Download Queue"), false,
IDH_TOOLBAR_QUEUE, [this] { QueueFrame::openWindow(getTabView()); });
toolbar->addButton(FinishedDLFrame::id, WinUtil::toolbarIcon(IDI_FINISHED_DL), 0, T_("Finished Downloads"), false,
@@ -693,8 +693,8 @@
auto f = &MainWindow::handleConfigureRecent;
addRecentMenu<HubFrame>(recent, menu, this, T_("Recent hubs"), IDI_HUB, IDI_FAVORITE_HUBS, f);
- addRecentMenu<PrivateFrame>(recent, menu, this, T_("Recent PMs"), IDI_PRIVATE, IDI_FAVORITE_USERS, f);
- addRecentMenu<DirectoryListingFrame>(recent, menu, this, T_("Recent file lists"), IDI_DIRECTORY, IDI_FAVORITE_USERS, f);
+ addRecentMenu<PrivateFrame>(recent, menu, this, T_("Recent PMs"), IDI_PRIVATE, IDI_FAVORITE_USER_ON, f);
+ addRecentMenu<DirectoryListingFrame>(recent, menu, this, T_("Recent file lists"), IDI_DIRECTORY, IDI_FAVORITE_USER_ON, f);
}
menu->open(pt);
=== modified file 'win32/TabsPage.cpp'
--- win32/TabsPage.cpp 2011-05-04 19:32:00 +0000
+++ win32/TabsPage.cpp 2011-10-15 22:58:51 +0000
@@ -43,7 +43,6 @@
{ SettingsManager::BOLD_SYSTEM_LOG, N_("System Log"), IDH_SETTINGS_TABS_BOLD_SYSTEM_LOG },
{ SettingsManager::BOLD_QUEUE, N_("Download Queue"), IDH_SETTINGS_TABS_BOLD_QUEUE },
{ SettingsManager::BOLD_FINISHED_DOWNLOADS, N_("Finished Downloads"), IDH_SETTINGS_TABS_BOLD_FINISHED_DOWNLOADS },
- { SettingsManager::BOLD_WAITING_USERS, N_("Waiting Users"), IDH_SETTINGS_TABS_BOLD_WAITING_USERS },
{ SettingsManager::BOLD_FINISHED_UPLOADS, N_("Finished Uploads"), IDH_SETTINGS_TABS_BOLD_FINISHED_UPLOADS },
{ 0, 0 }
};
=== modified file 'win32/UserInfoBase.h'
--- win32/UserInfoBase.h 2011-05-04 19:32:00 +0000
+++ win32/UserInfoBase.h 2011-10-15 22:58:51 +0000
@@ -134,7 +134,7 @@
if(includeSendPM)
menu->appendItem(T_("&Send private message"), [=] { this->t().handlePrivateMessage(parent); }, dwt::IconPtr(), true, !defaultIsGetList);
if(!traits.favOnly)
- menu->appendItem(T_("Add To &Favorites"), [this] { this->t().handleAddFavorite(); }, WinUtil::menuIcon(IDI_FAVORITE_USERS));
+ menu->appendItem(T_("Add To &Favorites"), [this] { this->t().handleAddFavorite(); }, WinUtil::menuIcon(IDI_FAVORITE_USER_ON));
menu->appendItem(T_("Grant &extra slot"), [this] { this->t().handleGrantSlot(); });
if(!traits.nonFavOnly)
menu->appendItem(T_("Connect to hub"), [=] { this->t().handleConnectFav(parent); }, WinUtil::menuIcon(IDI_HUB));
=== modified file 'win32/UsersFrame.cpp'
--- win32/UsersFrame.cpp 2011-10-13 13:43:14 +0000
+++ win32/UsersFrame.cpp 2011-10-15 22:58:51 +0000
@@ -51,10 +51,10 @@
static const ColumnInfo usersColumns[] = {
{ N_("Favorite"), 25, false },
- { N_("Grant slot"), 25, false },
+ { N_("Auto grant slot"), 25, false },
{ N_("Nick"), 125, false },
{ N_("Hub (last seen in, if offline)"), 300, false },
- { N_("Time last seen"), 150, false },
+ { N_("Status / Time last seen"), 150, false },
{ N_("Description"), 200, false },
{ N_("CID"), 300, false }
};
@@ -105,33 +105,42 @@
};
UsersFrame::UsersFrame(TabViewPtr parent) :
- BaseType(parent, T_("Users"), IDH_FAVUSERS, IDI_FAVORITE_USERS),
+ BaseType(parent, T_("Users"), IDH_USERS, IDI_USERS),
users(0),
scroll(0),
startup(true)
{
- filterGrid = addChild(Grid::Seed(1, 5));
+ filterGrid = addChild(Grid::Seed(1, 6));
auto updated = [this] { handleFilterUpdated(); };
+ filterGrid->addChild(Label::Seed(T_("Nick filter:")));
filter = filterGrid->addChild(WinUtil::Seeds::textBox);
+ filter->setHelpId(IDH_USERS_FILTER_NICK);
filter->onUpdated(updated);
- filterGrid->column(0).mode = GridInfo::FILL;
+ filterGrid->column(1).mode = GridInfo::FILL;
showOnline = filterGrid->addChild(WinUtil::Seeds::checkBox);
+ showOnline->setHelpId(IDH_USERS_FILTER_ONLINE);
showOnline->setText(_T("Online"));
+ showOnline->setChecked(BOOLSETTING(USERS_FILTER_ONLINE));
showOnline->onClicked(updated);
showFavs = filterGrid->addChild(WinUtil::Seeds::checkBox);
+ showFavs->setHelpId(IDH_USERS_FILTER_FAVORITE);
showFavs->setText(_T("Favorite"));
- showFavs->setChecked(); // TODO save / restore last state
+ showFavs->setChecked(BOOLSETTING(USERS_FILTER_FAVORITE));
showFavs->onClicked(updated);
showQueue = filterGrid->addChild(WinUtil::Seeds::checkBox);
+ showQueue->setHelpId(IDH_USERS_FILTER_QUEUE);
showQueue->setText(_T("Pending download"));
+ showQueue->setChecked(BOOLSETTING(USERS_FILTER_QUEUE));
showQueue->onClicked(updated);
showWaiting = filterGrid->addChild(WinUtil::Seeds::checkBox);
+ showWaiting->setHelpId(IDH_USERS_FILTER_WAITING);
showWaiting->setText(_T("Pending upload"));
+ showWaiting->setChecked(BOOLSETTING(USERS_FILTER_WAITING));
showWaiting->onClicked(updated);
splitter = addChild(SplitterContainer::Seed(0.7));
@@ -185,6 +194,9 @@
initStatus();
+ addAccel(FALT, 'I', [this] { filter->setFocus(); });
+ initAccels();
+
layout();
startup = false;
@@ -224,6 +236,11 @@
void UsersFrame::postClosing() {
SettingsManager::getInstance()->set(SettingsManager::USERSFRAME_ORDER, WinUtil::toString(users->getColumnOrder()));
SettingsManager::getInstance()->set(SettingsManager::USERSFRAME_WIDTHS, WinUtil::toString(users->getColumnWidths()));
+
+ SettingsManager::getInstance()->set(SettingsManager::USERS_FILTER_ONLINE, showOnline->getChecked());
+ SettingsManager::getInstance()->set(SettingsManager::USERS_FILTER_FAVORITE, showFavs->getChecked());
+ SettingsManager::getInstance()->set(SettingsManager::USERS_FILTER_QUEUE, showQueue->getChecked());
+ SettingsManager::getInstance()->set(SettingsManager::USERS_FILTER_WAITING, showWaiting->getChecked());
}
UsersFrame::UserInfo::UserInfo(const UserPtr& u, bool visible) :
=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp 2011-09-30 11:33:12 +0000
+++ win32/WinUtil.cpp 2011-10-15 22:58:51 +0000
@@ -1353,7 +1353,7 @@
PrivateFrame::openWindow(parent, u); });
addUsers(menu, T_("Add To &Favorites"), filter(users, &isFav), [=](const HintedUser &u, const string& s) {
- FavoriteManager::getInstance()->addFavoriteUser(u); }, dwt::IconPtr(new dwt::Icon(IDI_FAVORITE_USERS)));
+ FavoriteManager::getInstance()->addFavoriteUser(u); }, dwt::IconPtr(new dwt::Icon(IDI_FAVORITE_USER_ON)));
addUsers(menu, T_("Grant &extra slot"), users, [=](const HintedUser &u, const string& s) {
UploadManager::getInstance()->reserveSlot(u); });
=== modified file 'win32/resource.h'
--- win32/resource.h 2011-04-26 13:11:30 +0000
+++ win32/resource.h 2011-10-15 22:58:51 +0000
@@ -17,7 +17,7 @@
#define IDI_FINISHED_DL 109
#define IDI_FINISHED_UL 110
#define IDI_ADLSEARCH 111
-#define IDI_FAVORITE_USERS 112
+#define IDI_USERS 112
#define IDI_SPY 113
#define IDI_NET_STATS 114
#define IDI_MAGNET 116
