linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #02844
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2372: polish user icons
------------------------------------------------------------
revno: 2372
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2011-01-02 18:03:43 +0100
message:
polish user icons
modified:
help/faq_different_icons.html
res/User.ico
res/UserAway.ico
res/UserBot.ico
res/UserNoSlot.ico
res/UserOp.ico
win32/DCPlusPlus.rc
win32/HubFrame.cpp
win32/WinUtil.cpp
win32/WinUtil.h
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 'help/faq_different_icons.html'
--- help/faq_different_icons.html 2010-12-27 15:03:42 +0000
+++ help/faq_different_icons.html 2011-01-02 17:03:43 +0000
@@ -13,17 +13,17 @@
<dd>Standard user icon (no particular attribute).</dd>
<dt><img src="UserAway.ico" width="16" height="16" alt="Grey"/> Grey</dt>
<dd>The user is in away mode.</dd>
- <dt><img src="UserBot.ico" width="16" height="16" alt="Robot"/> Robot</dt>
+ <dt><img src="UserBot.ico" width="16" height="16" alt="Yellow"/> Yellow</dt>
<dd>The user represents a bot the hub uses to issue automatic commands.</dd>
</dl>
Icon modifiers:
<dl style="margin-left: 40px;">
- <dt><img src="UserOp.ico" width="16" height="16" alt="Yellow key"/> Yellow key</dt>
- <dd>The user is a hub operator.</dd>
<dt><img src="UserNoCon.ico" width="16" height="16" alt="Red bricks"/> Red bricks</dt>
<dd>The user cannot be connected to, for he is in passive mode and does not support NAT traversal.</dd>
<dt><img src="UserNoSlot.ico" width="16" height="16" alt="Red circle"/> Red circle</dt>
<dd>The user has no free slot available.</dd>
+ <dt><img src="UserOp.ico" width="16" height="16" alt="Yellow key"/> Yellow key</dt>
+ <dd>The user is a hub operator.</dd>
</dl>
</body>
</html>
=== modified file 'res/User.ico'
Binary files res/User.ico 2010-12-26 22:20:59 +0000 and res/User.ico 2011-01-02 17:03:43 +0000 differ
=== modified file 'res/UserAway.ico'
Binary files res/UserAway.ico 2010-12-26 22:20:59 +0000 and res/UserAway.ico 2011-01-02 17:03:43 +0000 differ
=== modified file 'res/UserBot.ico'
Binary files res/UserBot.ico 2010-12-27 14:59:37 +0000 and res/UserBot.ico 2011-01-02 17:03:43 +0000 differ
=== modified file 'res/UserNoSlot.ico'
Binary files res/UserNoSlot.ico 2010-12-26 22:20:59 +0000 and res/UserNoSlot.ico 2011-01-02 17:03:43 +0000 differ
=== modified file 'res/UserOp.ico'
Binary files res/UserOp.ico 2010-12-26 22:20:59 +0000 and res/UserOp.ico 2011-01-02 17:03:43 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc 2010-12-27 14:59:37 +0000
+++ win32/DCPlusPlus.rc 2011-01-02 17:03:43 +0000
@@ -95,9 +95,9 @@
IDI_USER ICON "res/User.ico"
IDI_USER_AWAY ICON "res/UserAway.ico"
IDI_USER_BOT ICON "res/UserBot.ico"
-IDI_USER_OP ICON "res/UserOp.ico"
IDI_USER_NOCON ICON "res/UserNoCon.ico"
IDI_USER_NOSLOT ICON "res/UserNoSlot.ico"
+IDI_USER_OP ICON "res/UserOp.ico"
/////////////////////////////////////////////////////////////////////////////
//
=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp 2010-12-27 14:59:37 +0000
+++ win32/HubFrame.cpp 2011-01-02 17:03:43 +0000
@@ -706,10 +706,6 @@
int image = identity.isBot() ? WinUtil::USER_ICON_BOT : identity.isAway() ? WinUtil::USER_ICON_AWAY : WinUtil::USER_ICON;
image *= WinUtil::USER_ICON_MOD_START * WinUtil::USER_ICON_MOD_START;
- if(identity.isOp()) {
- image += 1 << (WinUtil::USER_ICON_OP - WinUtil::USER_ICON_MOD_START);
- }
-
if(SETTING(INCOMING_CONNECTIONS) == SettingsManager::INCOMING_FIREWALL_PASSIVE &&
!identity.isBot() && !identity.isTcpActive() && !identity.supports(AdcHub::NAT0_FEATURE))
{
@@ -722,6 +718,10 @@
image += 1 << (WinUtil::USER_ICON_NOSLOT - WinUtil::USER_ICON_MOD_START);
}
+ if(identity.isOp()) {
+ image += 1 << (WinUtil::USER_ICON_OP - WinUtil::USER_ICON_MOD_START);
+ }
+
return image;
}
=== modified file 'win32/WinUtil.cpp'
--- win32/WinUtil.cpp 2010-12-27 14:59:37 +0000
+++ win32/WinUtil.cpp 2011-01-02 17:03:43 +0000
@@ -163,7 +163,7 @@
const unsigned baseCount = USER_ICON_MOD_START;
const unsigned modifierCount = USER_ICON_LAST - USER_ICON_MOD_START;
dwt::IconPtr bases[baseCount] = { userIcon(IDI_USER), userIcon(IDI_USER_AWAY), userIcon(IDI_USER_BOT) };
- dwt::IconPtr modifiers[modifierCount] = { userIcon(IDI_USER_OP), userIcon(IDI_USER_NOCON), userIcon(IDI_USER_NOSLOT) };
+ dwt::IconPtr modifiers[modifierCount] = { userIcon(IDI_USER_NOCON), userIcon(IDI_USER_NOSLOT), userIcon(IDI_USER_OP) };
for(size_t iBase = 0; iBase < baseCount; ++iBase) {
for(size_t i = 0, n = modifierCount * modifierCount; i < n; ++i) {
vector<dwt::IconPtr> icons;
=== modified file 'win32/WinUtil.h'
--- win32/WinUtil.h 2010-12-27 14:59:37 +0000
+++ win32/WinUtil.h 2011-01-02 17:03:43 +0000
@@ -56,9 +56,9 @@
// modifiers
USER_ICON_MOD_START,
- USER_ICON_OP = USER_ICON_MOD_START,
- USER_ICON_NOCON,
+ USER_ICON_NOCON = USER_ICON_MOD_START,
USER_ICON_NOSLOT,
+ USER_ICON_OP,
USER_ICON_LAST
};
=== modified file 'win32/resource.h'
--- win32/resource.h 2010-12-27 14:59:37 +0000
+++ win32/resource.h 2011-01-02 17:03:43 +0000
@@ -54,9 +54,9 @@
#define IDI_USER 146
#define IDI_USER_AWAY 147
#define IDI_USER_BOT 148
-#define IDI_USER_OP 149
-#define IDI_USER_NOCON 150
-#define IDI_USER_NOSLOT 151
+#define IDI_USER_NOCON 149
+#define IDI_USER_NOSLOT 150
+#define IDI_USER_OP 151
#define IDB_FOLDERS 200
