linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3375
committer: iceman50 <bdcdevel@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Mon 2013-12-02 07:58:16 -0600
message:
  revert r3374 and go for a better approach at fixing the Hub tab icon issue
modified:
  win32/HubFrame.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 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2013-12-02 09:08:28 +0000
+++ win32/HubFrame.cpp	2013-12-02 13:58:16 +0000
@@ -529,33 +529,33 @@
 			{
 				addChat(T_("*** Keyboard commands:") + _T("\r\n") + 
 						WinUtil::descriptive_commands
-						+ _T("\r\n") _T("/join <hub-ip>")
-						+ _T("\r\n\t") + T_("Joins <hub-ip>. See also Open new window when using /join.")
-						+ _T("\r\n") _T("/showjoins")
-						+ _T("\r\n\t") + T_("Toggles the displaying of users joining the hub. This only takes effect for freshly-arriving users.")
-						+ _T("\r\n") _T("/favshowjoins")
-						+ _T("\r\n\t") + T_("Toggles the displaying of favorite users joining the hub. Does not require /showjoins to be enabled.")
-						+ _T("\r\n") _T("/userlist")
-						+ _T("\r\n\t") + T_("Toggles visibility of the list of users for the current hub.")
-						+ _T("\r\n") _T("/connection")
-						+ _T("\r\n") _T("/conn")
-						+ _T("\r\n\t") + T_("Displays the connectivity status information, auto detected or manually chosen connection mode, IP and ports that DC++ is currently using for connections with all users.")
-						+ _T("\r\n") _T("/favorite")
-						+ _T("\r\n") _T("/fav")
-						+ _T("\r\n\t") + T_("Adds the current hub (along with your nickname and password, if used) to the list of Favorite Hubs.")
-						+ _T("\r\n") _T("/removefavorite")
-						+ _T("\r\n") _T("/removefav")
-						+ _T("\r\n\t") + T_("Removes the current hub from the list of Favorite Hubs.")
-						+ _T("\r\n") _T("/pm <user> [message]")
-						+ _T("\r\n\t") + T_("Opens a private message window to the user, and optionally sends the message, if one was specified.")
-						+ _T("\r\n") _T("/getlist <user>")
-						+ _T("\r\n\t") + T_("Adds the user's list to the Download Queue.")
-						+ _T("\r\n") _T("/ignore <user>")
-						+ _T("\r\n\t") + T_("Adds a user matching definition (or modifies an existing one, if possible) to ignore chat messages from the specified user.")
-						+ _T("\r\n") _T("/unignore <user>")
-						+ _T("\r\n\t") + T_("Adds a user matching definition (or modifies an existing one, if possible) to stop ignoring chat messages from the specified user.")
-						+ _T("\r\n") _T("/topic")
-						+ _T("\r\n\t") + T_("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.")
+						+ _T("\r\n") _T("/join <hub-ip>")
+						+ _T("\r\n\t") + T_("Joins <hub-ip>. See also Open new window when using /join.")
+						+ _T("\r\n") _T("/showjoins")
+						+ _T("\r\n\t") + T_("Toggles the displaying of users joining the hub. This only takes effect for freshly-arriving users.")
+						+ _T("\r\n") _T("/favshowjoins")
+						+ _T("\r\n\t") + T_("Toggles the displaying of favorite users joining the hub. Does not require /showjoins to be enabled.")
+						+ _T("\r\n") _T("/userlist")
+						+ _T("\r\n\t") + T_("Toggles visibility of the list of users for the current hub.")
+						+ _T("\r\n") _T("/connection")
+						+ _T("\r\n") _T("/conn")
+						+ _T("\r\n\t") + T_("Displays the connectivity status information, auto detected or manually chosen connection mode, IP and ports that DC++ is currently using for connections with all users.")
+						+ _T("\r\n") _T("/favorite")
+						+ _T("\r\n") _T("/fav")
+						+ _T("\r\n\t") + T_("Adds the current hub (along with your nickname and password, if used) to the list of Favorite Hubs.")
+						+ _T("\r\n") _T("/removefavorite")
+						+ _T("\r\n") _T("/removefav")
+						+ _T("\r\n\t") + T_("Removes the current hub from the list of Favorite Hubs.")
+						+ _T("\r\n") _T("/pm <user> [message]")
+						+ _T("\r\n\t") + T_("Opens a private message window to the user, and optionally sends the message, if one was specified.")
+						+ _T("\r\n") _T("/getlist <user>")
+						+ _T("\r\n\t") + T_("Adds the user's list to the Download Queue.")
+						+ _T("\r\n") _T("/ignore <user>")
+						+ _T("\r\n\t") + T_("Adds a user matching definition (or modifies an existing one, if possible) to ignore chat messages from the specified user.")
+						+ _T("\r\n") _T("/unignore <user>")
+						+ _T("\r\n\t") + T_("Adds a user matching definition (or modifies an existing one, if possible) to stop ignoring chat messages from the specified user.")
+						+ _T("\r\n") _T("/topic")
+						+ _T("\r\n\t") + T_("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.")
 
 					);
 			}
@@ -678,7 +678,7 @@
 
 void HubFrame::onConnected() {
 	addStatus(T_("Connected"));
-	setTabIcon();
+	setIcon(IDI_HUB);
 	updateSecureStatus();
 }
 
@@ -955,7 +955,10 @@
 }
 
 void HubFrame::on(Connected, Client*) noexcept {
-	callAsync([this] { onConnected(); });
+	callAsync([this] { 
+		onConnected();
+		setTabIcon();
+	});
 }
 
 void HubFrame::on(ClientListener::UserUpdated, Client*, const OnlineUser& user) noexcept {