From: Enar <eva...@us...> - 2006-09-17 09:13:16
|
Update of /cvsroot/planeshift/planeshift/src/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26557 Modified Files: chatwindow.cpp Log Message: Fixed the chat window. Made the "Select fitting Tab" option working with the new chat window. Index: chatwindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatwindow.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** chatwindow.cpp 10 Sep 2006 14:39:23 -0000 1.125 --- chatwindow.cpp 17 Sep 2006 09:13:11 -0000 1.126 *************** *** 65,75 **** }; - #define SAY_BUTTON 1200 - #define SHOUT_BUTTON 1201 - #define GUILD_BUTTON 1202 - #define GROUP_BUTTON 1203 - #define AUCTION_BUTTON 1204 - #define HELP_BUTTON 1205 - #define CHAT_TYPES 6 ////////////////////////////////////////////////////////////////////// --- 65,68 ---- *************** *** 379,389 **** words.GetTail(1,text); chattype = CHAT_REPORT; ! const char * allowedTabs[] = {"MainText", "SystemText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "System Button"); break; - case 2: AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; default: break; } --- 372,380 ---- words.GetTail(1,text); chattype = CHAT_REPORT; ! const char * allowedTabs[] = {"SystemText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "System Button"); break; default: break; } *************** *** 394,404 **** words.GetTail(1,text); chattype = CHAT_GUILD; ! const char * allowedTabs[] = {"MainText", "GuildText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Guild Button"); break; - case 2: AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; default: break; } --- 385,393 ---- words.GetTail(1,text); chattype = CHAT_GUILD; ! const char * allowedTabs[] = {"GuildText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Guild Button"); break; default: break; } *************** *** 422,432 **** words.GetTail(1,text); chattype = CHAT_GROUP; ! const char * allowedTabs[] = {"MainText", "GroupText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Group Button"); break; - case 2: AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; default: break; } --- 411,419 ---- words.GetTail(1,text); chattype = CHAT_GROUP; ! const char * allowedTabs[] = {"GroupText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Group Button"); break; default: break; } *************** *** 439,449 **** words.GetTail(2,text); chattype = CHAT_TELL; ! const char * allowedTabs[] = {"MainText", "TellText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Tell Button"); break; - case 2: AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; default: break; } --- 426,434 ---- words.GetTail(2,text); chattype = CHAT_TELL; ! const char * allowedTabs[] = {"TellText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Tell Button"); break; default: break; } *************** *** 454,464 **** words.GetTail(1,text); chattype = CHAT_AUCTION; ! const char * allowedTabs[] = {"AllText", "AuctionText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Auction Button"); break; - case 2: AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; default: break; } --- 439,447 ---- words.GetTail(1,text); chattype = CHAT_AUCTION; ! const char * allowedTabs[] = {"AuctionText", NULL}; switch (settings.selectTabStyle) { case 1: AutoselectChatTabIfNeeded(allowedTabs, "Auction Button"); break; default: break; } *************** *** 1638,1649 **** pawsWidget *currentTab = tabs->GetActiveTab(); - if (currentTab != NULL) - { - if (strcmp(currentTab->GetName(),"MainText") != 0 || type==CHAT_NPC) - flashEnabled = true; - } - - bool toMain = true; // By default we output also to the "Main" tab - switch (type) { --- 1621,1624 ---- *************** *** 1657,1666 **** ChatOutput(helpText, data, colour, false, "Help Button"); ChatOutput(npcText, data, colour, false, "NPC Button"); break; case CHAT_SYSTEM: - case CHAT_SYSTEM_BASE: ChatOutput(systemText, data, colour, flashEnabled, "System Button"); - toMain = (type == CHAT_SYSTEM_BASE); break; --- 1632,1640 ---- ChatOutput(helpText, data, colour, false, "Help Button"); ChatOutput(npcText, data, colour, false, "NPC Button"); + ChatOutput(mainText, data, colour, flashEnabled); break; case CHAT_SYSTEM: ChatOutput(systemText, data, colour, flashEnabled, "System Button"); break; *************** *** 1684,1687 **** --- 1658,1662 ---- case CHAT_ADVISOR: case CHAT_ADVICE: + case CHAT_ADVICE_LIST: ChatOutput(helpText, data, colour, flashEnabled, "Help Button"); break; *************** *** 1691,1699 **** break; } - - if (toMain) - ChatOutput(mainText, data, colour, flashEnabled, "Main Button"); - } --- 1666,1674 ---- break; + default: + // Anything else goes to the Main tab (say, shout, system base) + ChatOutput(mainText, data, colour, flashEnabled, "Main Button"); + break; } } |