From: <mg...@us...> - 2008-07-29 01:09:34
|
Revision: 1958 http://planeshift.svn.sourceforge.net/planeshift/?rev=1958&view=rev Author: mgist Date: 2008-07-29 01:09:43 +0000 (Tue, 29 Jul 2008) Log Message: ----------- - Fixed FS#1159, patch from Kaerli. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/pawsbookreadingwindow.cpp trunk/src/client/gui/pawswritingwindow.cpp Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2008-07-28 20:52:37 UTC (rev 1957) +++ trunk/src/client/gui/chatwindow.cpp 2008-07-29 01:09:43 UTC (rev 1958) @@ -814,13 +814,23 @@ newtime = localtime(&aclock); strftime(buf, 32, "%a %d-%b-%Y %H:%M:%S", newtime); csString buffer; +#ifdef _WIN32 buffer.Format( + "================================================\r\n" + "%s %s\r\n" + "------------------------------------------------\r\n", + buf, psengine->GetCelClient()->GetMainPlayer()->GetName() + ); + logFile[channel]->Write(buffer.GetData(), buffer.Length()); +#else + buffer.Format( "================================================\n" "%s %s\n" "------------------------------------------------\n", buf, psengine->GetCelClient()->GetMainPlayer()->GetName() ); logFile[channel]->Write(buffer.GetData(), buffer.Length()); +#endif } else { @@ -838,7 +848,11 @@ newtime = localtime(&aclock); strftime(buf, 32, "(%H:%M:%S)", newtime); csString buffer; - buffer.Format("%s %s\n", buf, message); +#ifdef _WIN32 + buffer.Format("%s %s\r\n", buf, message); +#else + buffer.Format("%s %s\n", buf, message); +#endif logFile[channel]->Write(buffer.GetData(), buffer.Length()); logFile[channel]->Flush(); } Modified: trunk/src/client/gui/pawsbookreadingwindow.cpp =================================================================== --- trunk/src/client/gui/pawsbookreadingwindow.cpp 2008-07-28 20:52:37 UTC (rev 1957) +++ trunk/src/client/gui/pawsbookreadingwindow.cpp 2008-07-29 01:09:43 UTC (rev 1958) @@ -156,7 +156,9 @@ } bookFormat = description->GetText(); - +#ifdef _WIN32 + bookFormat.ReplaceAll("\n", "\r\n"); +#endif vfs->WriteFile(tempFileName, bookFormat, bookFormat.Length()); psSystemMessage msg(0, MSG_ACK, "Book saved to %s", tempFileName.GetData()+27 ); Modified: trunk/src/client/gui/pawswritingwindow.cpp =================================================================== --- trunk/src/client/gui/pawswritingwindow.cpp 2008-07-28 20:52:37 UTC (rev 1957) +++ trunk/src/client/gui/pawswritingwindow.cpp 2008-07-29 01:09:43 UTC (rev 1958) @@ -175,6 +175,7 @@ msg.FireEvent(); } csString book(data->GetData(), MIN(data->GetSize(), MAX_BOOK_FILE_SIZE)); + book.ReplaceAll("\r\n", "\n"); lefttext->SetText(book, true); psSystemMessage msg(0, MSG_ACK, "Book Loaded Successfully!" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2008-08-28 11:31:54
|
Revision: 2132 http://planeshift.svn.sourceforge.net/planeshift/?rev=2132&view=rev Author: mgist Date: 2008-08-28 11:32:03 +0000 (Thu, 28 Aug 2008) Log Message: ----------- - Removed 64-bit workarounds, no longer needed. Modified Paths: -------------- trunk/src/client/gui/pawsquestwindow.cpp trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/pawsquestwindow.cpp =================================================================== --- trunk/src/client/gui/pawsquestwindow.cpp 2008-08-28 10:52:21 UTC (rev 2131) +++ trunk/src/client/gui/pawsquestwindow.cpp 2008-08-28 11:32:03 UTC (rev 2132) @@ -507,30 +507,7 @@ void pawsQuestListWindow::SaveNotes(const char * fileName) { -#if (CS_PROCESSOR_SIZE == 64) // Workaround pending CS trac #423, PS FS#483 - csString xml; - xml += "<questnotes>\n"; - QuestNote *qn; - csString nodeName, noteString; - for (size_t i = 0; i < quest_notes.GetSize(); i++) - { - qn = quest_notes[i]; - if (qn->notes.IsEmpty()) - continue; - - nodeName.Format("quest%d", qn->id); - - xml += " <"; xml += nodeName; xml += ">"; - - noteString.Format("<![CDATA[%s]]>", qn->notes.GetData() ); - - xml += noteString; xml += "</"; xml += nodeName; xml += ">\n"; - } - xml += "</questnotes>\n"; - vfs->WriteFile(fileName, xml.GetData(), xml.Length()); -#else - // Save quest notes to a local file char temp[20]; csRef<iDocumentSystem> xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem); @@ -556,7 +533,6 @@ } } doc->Write(vfs, fileName); -#endif } void pawsQuestListWindow::LoadNotes(const char * fileName) Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2008-08-28 10:52:21 UTC (rev 2131) +++ trunk/src/client/gui/shortcutwindow.cpp 2008-08-28 11:32:03 UTC (rev 2132) @@ -523,40 +523,6 @@ if (!found) // Don't save if no commands have been defined return ; -#if(CS_PROCESSOR_SIZE == 64) // Workaround pending CS trac #423 - csString xml; - xml += "<shortcuts>\n"; - csString nodeName, temp; - for (i=0;i < NUM_SHORTCUTS; i++) - { - if (cmds[i].IsEmpty()) - continue; - - nodeName.Format("shortcut%d", i + 1); - if (names[i].IsEmpty()) - { - temp.Format("%d", i); - } - else - { - temp = names[i]; - } - xml += " <"; xml += nodeName; xml +=" name=\""; xml += temp; xml += "\">"; - - if ( (strchr (cmds[i], '\r') != 0) - || (strchr (cmds[i], '\n') != 0) ) - { - temp.Format("<![CDATA[%s]]>", cmds[i].GetData() ); - } - else - { - temp = cmds[i]; - } - xml += temp; xml += "</"; xml += nodeName; xml += ">\n"; - } - xml += "</shortcuts>\n"; - vfs->WriteFile(COMMAND_FILE, xml.GetData(), xml.Length()); -#else // Save the commands with their labels csRef<iDocumentSystem> xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem); csRef<iDocument> doc = xml->CreateDocument(); @@ -588,7 +554,6 @@ text->SetValue(cmds[i].GetData()); } doc->Write(vfs, COMMAND_FILE); -#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2008-12-04 22:31:16
|
Revision: 2625 http://planeshift.svn.sourceforge.net/planeshift/?rev=2625&view=rev Author: Vengeance2001 Date: 2008-12-04 22:15:35 +0000 (Thu, 04 Dec 2008) Log Message: ----------- Refactored the auto-selecting of tabs depending on what the user types. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/chatwindow.h Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2008-12-04 21:29:45 UTC (rev 2624) +++ trunk/src/client/gui/chatwindow.cpp 2008-12-04 22:15:35 UTC (rev 2625) @@ -486,6 +486,26 @@ } } +void pawsChatWindow::DetermineChatTabAndSelect(const char *specificTabName,bool includeMain, const char *buttonName) +{ + csString tabList(specificTabName); + + if (includeMain) + tabList.Append("|MainText"); + + switch (settings.selectTabStyle) + { + case 1: + AutoselectChatTabIfNeeded(tabList, buttonName); + break; + case 2: + AutoselectChatTabIfNeeded(tabList, includeMain ? "Main Button" : buttonName); + break; + default: + break; + } +} + const char* pawsChatWindow::HandleCommand( const char* cmd ) { WordArray words(cmd); @@ -512,22 +532,12 @@ pPerson.Clear(); words.GetTail(1, text); chattype = CHAT_SAY; - csArray<csString> allowedTabs; - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - case 2: - AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("MainText", false, "Main Button"); } else if (words[0] == "/tellnpcinternal") { pPerson = psengine->GetCelClient()->GetMainPlayer()->GetName(); - int space = pPerson.FindFirst(' '); + size_t space = pPerson.FindFirst(' '); if (space != SIZET_NOT_FOUND) pPerson.DeleteAt(space,pPerson.Length()-space); words.GetTail(1, text); @@ -538,105 +548,35 @@ pPerson.Clear(); words.GetTail(1, text); chattype = CHAT_NPC; - csArray<csString> allowedTabs; - allowedTabs.Push("NpcText"); - if (settings.npcIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "NPC Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.npcIncluded ? - "Main Button" : "NPC Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("NpcText", settings.npcIncluded, "NPC Button"); } else if (words[0] == "/report") { pPerson.Clear(); words.GetTail(1,text); chattype = CHAT_REPORT; - csArray<csString> allowedTabs; - allowedTabs.Push("SystemText"); - if (settings.systemIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "System Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.systemIncluded ? - "Main Button" : "System Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("SystemText", settings.systemIncluded, "System Button"); } else if (words[0] == "/guild") { pPerson.Clear(); words.GetTail(1,text); chattype = CHAT_GUILD; - csArray<csString> allowedTabs; - allowedTabs.Push("GuildText"); - if (settings.guildIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "Guild Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.guildIncluded ? - "Main Button" : "Guild Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("GuildText", settings.guildIncluded, "Guild Button"); } else if (words[0] == "/shout") { pPerson.Clear(); words.GetTail(1,text); chattype = CHAT_SHOUT; - csArray<csString> allowedTabs; - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - case 2: - AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("MainText", false, "Main Button"); } else if (words[0] == "/group") { pPerson.Clear(); words.GetTail(1,text); chattype = CHAT_GROUP; - csArray<csString> allowedTabs; - allowedTabs.Push("GroupText"); - if (settings.groupIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "Group Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.groupIncluded ? - "Main Button" : "Group Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("GroupText", settings.groupIncluded, "Group Button"); } else if (words[0] == "/tell") { @@ -645,68 +585,28 @@ return PawsManager::GetSingleton().Translate("You must enter the text").Detach(); words.GetTail(2,text); chattype = CHAT_TELL; - csArray<csString> allowedTabs; - allowedTabs.Push("TellText"); - if (settings.tellIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "Tell Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.tellIncluded ? - "Main Button" : "Tell Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("TellText", settings.tellIncluded, "Tell Button"); } else if (words[0] == "/auction") { pPerson.Clear(); words.GetTail(1,text); chattype = CHAT_AUCTION; - csArray<csString> allowedTabs; - allowedTabs.Push("AuctionText"); - if (settings.auctionIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "Auction Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.auctionIncluded ? - "Main Button" : "Auction Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("AuctionText", settings.auctionIncluded, "Auction Button"); } else if (words[0] == "/mypet") { pPerson.Clear(); chattype = CHAT_PET_ACTION; words.GetTail(1,text); - csArray<csString> allowedTabs; - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - case 2: - AutoselectChatTabIfNeeded(allowedTabs, "Main Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("MainText", false, "Main Button"); } else if (words[0] == "/me" || words[0] == "/my") { pPerson.Clear(); csString chatType = tabs->GetActiveTab()->GetName(); - csArray<csString> allowedTabs; + csString allowedTabs; csString defaultButton("Main Button"); if (chatType == "TellText") @@ -723,79 +623,32 @@ } words.GetTail(0,text); chattype = CHAT_TELL; - csArray<csString> allowedTabs; - allowedTabs.Push("TellText"); - defaultButton = "Tell Button"; - if (settings.tellIncluded) - allowedTabs.Push("MainText"); - switch (settings.selectTabStyle) - { - case 1: - AutoselectChatTabIfNeeded(allowedTabs, "Tell Button"); - break; - case 2: - AutoselectChatTabIfNeeded(allowedTabs, settings.tellIncluded ? - "Main Button" : "Tell Button"); - break; - default: - break; - } + DetermineChatTabAndSelect("TellText", settings.tellIncluded, "Tell Button"); } else if (chatType == "GuildText") { chattype = CHAT_GUILD; words.GetTail(0,text); - allowedTabs.Push("GuildText"); - defaultButton = "Guild Button"; - if (settings.guildIncluded) - { - allowedTabs.Push("MainText"); - if (settings.selectTabStyle == 2) - defaultButton = "Main Button"; - } + DetermineChatTabAndSelect("GuildText", settings.guildIncluded, "Guild Button"); } else if (chatType == "GroupText") { chattype = CHAT_GROUP; words.GetTail(0,text); - allowedTabs.Push("GroupText"); - defaultButton = "Group Button"; - if (settings.groupIncluded) - { - allowedTabs.Push("MainText"); - if (settings.selectTabStyle == 2) - defaultButton = "Main Button"; - } + DetermineChatTabAndSelect("GroupText", settings.groupIncluded, "Group Button"); } else if (chatType == "AuctionText") { chattype = CHAT_AUCTION; words.GetTail(0,text); - allowedTabs.Push("AuctionText"); - defaultButton = "Auction Button"; - if (settings.auctionIncluded) - { - allowedTabs.Push("MainText"); - if (settings.selectTabStyle == 2) - defaultButton = "Main Button"; - } + DetermineChatTabAndSelect("AuctionText", settings.auctionIncluded, "Auction Button"); } else // when in doubt, use the normal way { chattype = CHAT_SAY; words.GetTail(0,text); - allowedTabs.Push("MainText"); + DetermineChatTabAndSelect("MainText", false, "Main Button"); } - //pPerson.Clear(); - switch (settings.selectTabStyle) - { - case 1: - case 2: - AutoselectChatTabIfNeeded(allowedTabs, defaultButton); - break; - default: - break; - } } } @@ -1846,12 +1699,15 @@ return pawsWidget::OnMenuAction(widget, action); } -void pawsChatWindow::AutoselectChatTabIfNeeded(const csArray<csString> &allowedTabs, const char * defaultTab) +void pawsChatWindow::AutoselectChatTabIfNeeded(const char *allowedTabList, const char * defaultTab) { pawsWidget * currentTab; csString currentTabName; size_t allowedTab; + csString list(allowedTabList); + csArray<csString> allowedTabs = psSplit(list,'|'); + currentTab = tabs->GetActiveTab(); if (currentTab != NULL) { @@ -2323,10 +2179,7 @@ void pawsChatWindow::NpcChat() { - csArray<csString> allowedTabs; - allowedTabs.Push("NpcText"); - - AutoselectChatTabIfNeeded(allowedTabs, "NPC Button"); + AutoselectChatTabIfNeeded("NpcText", "NPC Button"); } int pawsChatWindow::mixColours(int colour1, int colour2) Modified: trunk/src/client/gui/chatwindow.h =================================================================== --- trunk/src/client/gui/chatwindow.h 2008-12-04 21:29:45 UTC (rev 2624) +++ trunk/src/client/gui/chatwindow.h 2008-12-04 22:15:35 UTC (rev 2625) @@ -198,8 +198,11 @@ void TabCompleteCommand(const char *cmd); void TabCompleteName(const char *cmd); + /// Helper function for AutoselectChatTabIfNeeded + void DetermineChatTabAndSelect(const char *specificTabName,bool includeMain, const char *buttonName); + /// If currently selected chat tab is not in 'allowedTabs', switch to 'defaultTab' - void AutoselectChatTabIfNeeded(const csArray<csString> &allowedTabs, const char * defaultTab); + void AutoselectChatTabIfNeeded(const char *allowedTabList, const char * defaultTab); /// Output text to a specific tab. void ChatOutput(pawsMessageTextBox *pmtb, const char *data, int colour = -1, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-12-26 15:43:23
|
Revision: 2780 http://planeshift.svn.sourceforge.net/planeshift/?rev=2780&view=rev Author: weltall2 Date: 2008-12-26 15:43:20 +0000 (Fri, 26 Dec 2008) Log Message: ----------- addittional improvements to the details window: tabs are shown only if there is a reason for them to be there Modified Paths: -------------- trunk/src/client/gui/pawsdetailwindow.cpp trunk/src/client/gui/pawsdetailwindow.h Modified: trunk/src/client/gui/pawsdetailwindow.cpp =================================================================== --- trunk/src/client/gui/pawsdetailwindow.cpp 2008-12-26 14:30:41 UTC (rev 2779) +++ trunk/src/client/gui/pawsdetailwindow.cpp 2008-12-26 15:43:20 UTC (rev 2780) @@ -87,24 +87,8 @@ { lastTab = button; button->SetState(true); - button->Show(); } - button = (pawsButton*)FindWidget( "ShowDescrOOC" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowCC" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowStats" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowCombat" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowMagic" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowCraft" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowMisc" ); - if(button) button->Hide(); - button = (pawsButton*)FindWidget( "ShowFaction" ); - if(button) button->Hide(); + UpdateTabsVisibility(false, false, false); skills.SetSize(6); for(int i=0; i<6; i++) { @@ -119,6 +103,58 @@ psengine->GetMsgHandler()->SendMessage(requestMsg.msg); } +void pawsDetailWindow::UpdateTabsVisibility(bool Skills, bool CharCreation, bool OOCDescription) +{ + pawsButton* button = (pawsButton*)FindWidget( "ShowDescr" ); + if(button) + { //show this only if there are other tabs + if(Skills || CharCreation || OOCDescription) button->Show(); + else button->Hide(); + } + button = (pawsButton*)FindWidget( "ShowDescrOOC" ); + if(button) + { //show this only if there is an OOC description or the player can edit it + if(OOCDescription) button->Show(); + else button->Hide(); + } + button = (pawsButton*)FindWidget( "ShowCC" ); + if(button) + { //show this only if there is an CC description + if(CharCreation) button->Show(); + else button->Hide(); + } + if(Skills) //show skills tabs only if enabled + { + button = (pawsButton*)FindWidget( "ShowStats" ); + if(button) button->Show(); + button = (pawsButton*)FindWidget( "ShowCombat" ); + if(button) button->Show(); + button = (pawsButton*)FindWidget( "ShowMagic" ); + if(button) button->Show(); + button = (pawsButton*)FindWidget( "ShowCraft" ); + if(button) button->Show(); + button = (pawsButton*)FindWidget( "ShowMisc" ); + if(button) button->Show(); + button = (pawsButton*)FindWidget( "ShowFaction" ); + if(button) button->Show(); + } + else + { + button = (pawsButton*)FindWidget( "ShowStats" ); + if(button) button->Hide(); + button = (pawsButton*)FindWidget( "ShowCombat" ); + if(button) button->Hide(); + button = (pawsButton*)FindWidget( "ShowMagic" ); + if(button) button->Hide(); + button = (pawsButton*)FindWidget( "ShowCraft" ); + if(button) button->Hide(); + button = (pawsButton*)FindWidget( "ShowMisc" ); + if(button) button->Hide(); + button = (pawsButton*)FindWidget( "ShowFaction" ); + if(button) button->Hide(); + } +} + void pawsDetailWindow::HandleMessage( MsgEntry* me ) { @@ -167,39 +203,6 @@ storedoocdescription = msg.desc_ooc; storedcreationinfo = msg.creationinfo; - for(int i=0; i<6; i++) - { - skills[i].Clear(); - } - if(storedcreationinfo.Length()) - { - pawsButton* button = (pawsButton*)FindWidget( "ShowCC" ); - if(button) button->Show(); - } - if(msg.skills.GetSize() != 0 ) { - pawsButton* button = (pawsButton*)FindWidget( "ShowStats" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowCombat" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowMagic" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowCraft" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowMisc" ); - if(button) button->Show(); - button = (pawsButton*)FindWidget( "ShowFaction" ); - if(button) button->Show(); - for( size_t s = 0; s < msg.skills.GetSize(); s++ ) - { - int cat = msg.skills[s].category; - if(cat >= 0 && cat < 6) - { - skills[cat].Append(msg.skills[s].text); - } - SelectTab((pawsWidget*)lastTab); - } - } - //check if the player is looking at his/her/its own description if (msg.name == psengine->GetCelClient()->GetMainPlayer()->GetName()) { @@ -219,6 +222,26 @@ details_editable = false; } + //checks what tabs should be shown + UpdateTabsVisibility(msg.skills.GetSize() != 0, storedcreationinfo.Length() != 0, + storedoocdescription.Length() != 0 || details_editable); + + for(int i=0; i<6; i++) + { + skills[i].Clear(); + } + if(msg.skills.GetSize() != 0 ) { + for( size_t s = 0; s < msg.skills.GetSize(); s++ ) + { + int cat = msg.skills[s].category; + if(cat >= 0 && cat < 6) + { + skills[cat].Append(msg.skills[s].text); + } + SelectTab((pawsWidget*)lastTab); + } + } + SelectTab(lastTab); this->Show(); Modified: trunk/src/client/gui/pawsdetailwindow.h =================================================================== --- trunk/src/client/gui/pawsdetailwindow.h 2008-12-26 14:30:41 UTC (rev 2779) +++ trunk/src/client/gui/pawsdetailwindow.h 2008-12-26 15:43:20 UTC (rev 2780) @@ -37,6 +37,7 @@ virtual ~pawsDetailWindow(); bool OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ); + void UpdateTabsVisibility(bool Skills, bool CharCreation, bool OOCDescription); bool SelectTab( pawsWidget* widget ); bool PostSetup(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-08 12:26:32
|
Revision: 2843 http://planeshift.svn.sourceforge.net/planeshift/?rev=2843&view=rev Author: weltall2 Date: 2009-01-08 11:38:23 +0000 (Thu, 08 Jan 2009) Log Message: ----------- fixed the help text to display in the correct tab and exchanged the order functions preparing the description editing for show in order to don't flicker the description from another tab Modified Paths: -------------- trunk/src/client/gui/pawschardescription.cpp trunk/src/client/gui/pawsdetailwindow.cpp Modified: trunk/src/client/gui/pawschardescription.cpp =================================================================== --- trunk/src/client/gui/pawschardescription.cpp 2009-01-07 23:53:52 UTC (rev 2842) +++ trunk/src/client/gui/pawschardescription.cpp 2009-01-08 11:38:23 UTC (rev 2843) @@ -63,8 +63,8 @@ void pawsCharDescription::Show() { + RequestDetails(); pawsWidget::Show(); - RequestDetails(); } void pawsCharDescription::RequestDetails() Modified: trunk/src/client/gui/pawsdetailwindow.cpp =================================================================== --- trunk/src/client/gui/pawsdetailwindow.cpp 2009-01-07 23:53:52 UTC (rev 2842) +++ trunk/src/client/gui/pawsdetailwindow.cpp 2009-01-08 11:38:23 UTC (rev 2843) @@ -217,7 +217,7 @@ "sensed with the five accepted senses (sight, touch, hearing and smell (being primary)" "(only list taste if you anticipate people tasting your character))."); if(!storedoocdescription.Length()) //if the player didn't input anything in ooc description inform him - storedescription = PawsManager::GetSingleton().Translate("HELP TEXT HERE."); + storedoocdescription = PawsManager::GetSingleton().Translate("HELP TEXT HERE."); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-04-14 20:34:12
|
Revision: 3452 http://planeshift.svn.sourceforge.net/planeshift/?rev=3452&view=rev Author: kougaro Date: 2009-04-14 20:34:03 +0000 (Tue, 14 Apr 2009) Log Message: ----------- Fix a compilation warning Modified Paths: -------------- trunk/src/client/gui/pawsinfowindow.cpp trunk/src/client/gui/pawsinfowindow.h Modified: trunk/src/client/gui/pawsinfowindow.cpp =================================================================== --- trunk/src/client/gui/pawsinfowindow.cpp 2009-04-14 11:21:22 UTC (rev 3451) +++ trunk/src/client/gui/pawsinfowindow.cpp 2009-04-14 20:34:03 UTC (rev 3452) @@ -194,7 +194,7 @@ } -void pawsInfoWindow::SetStanceHighlight(int stance) +void pawsInfoWindow::SetStanceHighlight(uint stance) { selectedstance = stance; Modified: trunk/src/client/gui/pawsinfowindow.h =================================================================== --- trunk/src/client/gui/pawsinfowindow.h 2009-04-14 11:21:22 UTC (rev 3451) +++ trunk/src/client/gui/pawsinfowindow.h 2009-04-14 20:34:03 UTC (rev 3452) @@ -53,7 +53,7 @@ virtual bool OnScroll( int direction, pawsScrollBar* widget ); virtual bool OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* reporter ); - void SetStanceHighlight(int stance); + void SetStanceHighlight(uint stance); private: pawsTextBox *targetName; @@ -74,7 +74,7 @@ csRef<MsgHandler> msgHandler; csString stanceConvert(const uint ID); - int selectedstance; + uint selectedstance; enum baseStances { BLOODY = 1, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-04-28 15:24:05
|
Revision: 3582 http://planeshift.svn.sourceforge.net/planeshift/?rev=3582&view=rev Author: KhakiLord Date: 2009-04-28 15:24:03 +0000 (Tue, 28 Apr 2009) Log Message: ----------- The last used chat channel will now automatically be remembered in the chatwindow input. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/chatwindow.h Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-04-28 10:09:41 UTC (rev 3581) +++ trunk/src/client/gui/chatwindow.cpp 2009-04-28 15:24:03 UTC (rev 3582) @@ -406,11 +406,13 @@ if (words.GetCount() == 1) return PawsManager::GetSingleton().Translate("You must enter the text").Detach(); + inputText->SetText(words[0] + " "); if (words[0] == "/say") { pPerson.Clear(); words.GetTail(1, text); chattype = CHAT_SAY; + inputText->SetText(""); DetermineChatTabAndSelect(CHAT_SAY); } else if (words[0] == "/tellnpcinternal") @@ -531,6 +533,8 @@ DetermineChatTabAndSelect(CHAT_SAY); } } + else + inputText->SetText(""); } if (settings.enableBadWordsFilterOutgoing) @@ -1329,10 +1333,9 @@ if (settings.looseFocusOnSend || !strcmp(inputText->GetText(), "")) PawsManager::GetSingleton().SetCurrentFocusedWidget((pawsWidget*)PawsManager::GetSingleton().GetMainWidget()); - SendChatLine(); - + csString text = inputText->GetText(); inputText->Clear(); - + SendChatLine(text); break; } @@ -1428,10 +1431,8 @@ return true; } -void pawsChatWindow::SendChatLine() +void pawsChatWindow::SendChatLine(csString& textToSend) { - csString textToSend = inputText->GetText(); - if ( textToSend.Length() ) { if ( textToSend.GetAt(0) != '/' ) Modified: trunk/src/client/gui/chatwindow.h =================================================================== --- trunk/src/client/gui/chatwindow.h 2009-04-28 10:09:41 UTC (rev 3581) +++ trunk/src/client/gui/chatwindow.h 2009-04-28 15:24:03 UTC (rev 3582) @@ -174,7 +174,7 @@ void HandleSystemMessage( MsgEntry* message ); /// Sends the contents of the input text to the server. - void SendChatLine(); + void SendChatLine(csString& inputText); /// Subscribe the player commands. void SubscribeCommands(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-05-04 02:14:44
|
Revision: 3611 http://planeshift.svn.sourceforge.net/planeshift/?rev=3611&view=rev Author: KhakiLord Date: 2009-05-04 02:14:36 +0000 (Mon, 04 May 2009) Log Message: ----------- The last 10 chat messages will now be replayed when the chatwindow is loaded. No more digging around in the filesystem. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/chatwindow.h Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-05-04 00:25:56 UTC (rev 3610) +++ trunk/src/client/gui/chatwindow.cpp 2009-05-04 02:14:36 UTC (rev 3611) @@ -170,6 +170,7 @@ Error1("ChatWindow failed because IgnoredList window was not found."); return false; } + ReplayMessages(); return true; } @@ -576,6 +577,58 @@ return NULL; } +void pawsChatWindow::ReplayMessages() +{ + csString filename; + filename.Format("/planeshift/userdata/logs/%s_%s", + psengine->GetMainPlayerName(), + logFileName[CHAT_LOG_ALL]); + filename.ReplaceAll(" ", "_"); + + char buf[1001]; + + // Open file and seek to 1000 bytes from the end, unlikely to need anything earlier than that. + csRef<iFile> file = psengine->GetVFS()->Open(filename, VFS_FILE_READ); + if(!file.IsValid()) + return; + size_t seekPos = 0; + if(file->GetSize() > 1000) + seekPos = file->GetSize() - 1000; + file->SetPos(seekPos); + size_t readLength = file->Read(buf, 1000); + + // At least 5 chars + if(readLength < 5) + return; + + buf[readLength] = '\0'; + + // Find the last 10 lines + int lines = 0; + char* currentPos; + csArray<const char*> line; + + for(currentPos = buf + readLength - 2; currentPos != buf && lines != 10; currentPos--) + { + if(*currentPos == '\n') + { + *currentPos = '\0'; + // Useful log messages are prepended with a ( time stamp + if(*(currentPos + 1) == '(') + { + line.Push(currentPos + 1); + lines++; + } + } + if(*currentPos == '\r') + *currentPos = '\0'; + } + // Assume CHAT_SAY and place all in one chat type to ensure they end up in the same window + PawsManager::GetSingleton().Publish(CHAT_TYPES[CHAT_SAY], "Replaying previous chat...", settings.systemColor ); + while(!line.IsEmpty()) + PawsManager::GetSingleton().Publish(CHAT_TYPES[CHAT_SAY], line.Pop(), settings.chatColor ); +} + void pawsChatWindow::LogMessage(enum E_CHAT_LOG channel, const char* message, int type) { if (settings.logChannel[channel]) Modified: trunk/src/client/gui/chatwindow.h =================================================================== --- trunk/src/client/gui/chatwindow.h 2009-05-04 00:25:56 UTC (rev 3610) +++ trunk/src/client/gui/chatwindow.h 2009-05-04 02:14:36 UTC (rev 3611) @@ -228,6 +228,8 @@ void CreateSettingNode(iDocumentNode* mNode,int color,const char* name); + // Replay recent message history on load + void ReplayMessages(); }; //-------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-05 09:34:30
|
Revision: 3813 http://planeshift.svn.sourceforge.net/planeshift/?rev=3813&view=rev Author: weltall2 Date: 2009-06-05 09:34:17 +0000 (Fri, 05 Jun 2009) Log Message: ----------- Now the mini inventory won't close if it was open already before opening the exchangewindow patch by tazen Modified Paths: -------------- trunk/src/client/gui/pawsexchangewindow.cpp trunk/src/client/gui/pawsexchangewindow.h Modified: trunk/src/client/gui/pawsexchangewindow.cpp =================================================================== --- trunk/src/client/gui/pawsexchangewindow.cpp 2009-06-03 22:38:57 UTC (rev 3812) +++ trunk/src/client/gui/pawsexchangewindow.cpp 2009-06-05 09:34:17 UTC (rev 3813) @@ -114,6 +114,8 @@ if (!bulkList) return false; + wasSmaillInventoryOpen = false; + int colCount = bulkList->GetTotalColumns(); int rowCount = (int) ceil(float(EXCHANGE_SLOT_COUNT)/colCount); int r, j, i; @@ -197,8 +199,12 @@ // Autoshow the inventory pawsWidget* widget = PawsManager::GetSingleton().FindWidget("SmallInventoryWindow"); - if ( widget ) + + if (widget) + { + wasSmallInventoryOpen = widget->IsVisible(); widget->Show(); + } } @@ -217,18 +223,17 @@ } /////////////////////////////////////////////////////////// - // Close Exchange ( either by rejection or normal end + // Close Exchange ( either by rejection or normal end ) /////////////////////////////////////////////////////////// case MSGTYPE_EXCHANGE_END: { Hide(); pawsWidget * widget = PawsManager::GetSingleton().FindWidget("SmallInventoryWindow"); - if ( widget ) + if (widget && !wasSmaillInventoryOpen) widget->Close(); totalTriasOffered->SetText(""); totalTriasReceived->SetText(""); - int i; - for (i = 0; i < EXCHANGE_SLOT_COUNT; i++) + for (int i = 0; i < EXCHANGE_SLOT_COUNT; i++) { offeringSlots[i]->Clear(); receivingSlots[i]->Clear(); @@ -322,15 +327,14 @@ void pawsExchangeWindow::Close() { pawsWidget * widget = PawsManager::GetSingleton().FindWidget("SmallInventoryWindow"); - if ( widget ) + if (widget && !wasSmaillInventoryOpen) widget->Close(); - totalTriasOffered->SetText(""); - totalTriasReceived->SetText(""); - + totalTriasOffered->SetText(""); + totalTriasReceived->SetText(""); SendEnd(); - Hide(); -} + Hide(); +} bool pawsExchangeWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ) { @@ -418,4 +422,3 @@ offeringBG->SetBackground("Standard Background"); receivingBG->SetBackground("Standard Background"); } - Modified: trunk/src/client/gui/pawsexchangewindow.h =================================================================== --- trunk/src/client/gui/pawsexchangewindow.h 2009-06-03 22:38:57 UTC (rev 3812) +++ trunk/src/client/gui/pawsexchangewindow.h 2009-06-05 09:34:17 UTC (rev 3813) @@ -82,7 +82,10 @@ * @withPlayer Is the user exchanging with other player, or with NPC ? */ void StartExchange( csString& player, bool withPlayer ); - + + /// retain the state of the inventory window before opening the exchange + bool wasSmallInventoryOpen; + psExchangeType type; /// The background for the offering panel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-07 09:02:24
|
Revision: 3933 http://planeshift.svn.sourceforge.net/planeshift/?rev=3933&view=rev Author: weltall2 Date: 2009-07-07 08:44:41 +0000 (Tue, 07 Jul 2009) Log Message: ----------- added spell image support to the spellbookwindow Modified Paths: -------------- trunk/src/client/gui/pawsspellbookwindow.cpp trunk/src/client/gui/pawsspellbookwindow.h Modified: trunk/src/client/gui/pawsspellbookwindow.cpp =================================================================== --- trunk/src/client/gui/pawsspellbookwindow.cpp 2009-07-07 07:47:23 UTC (rev 3932) +++ trunk/src/client/gui/pawsspellbookwindow.cpp 2009-07-07 08:44:41 UTC (rev 3933) @@ -58,6 +58,7 @@ spellList = (pawsListBox*)FindWidget("SpellList"); spellDescription = (pawsMessageTextBox*)FindWidget("Description"); + spellImage = (pawsWidget*)FindWidget("Picture"); spellList->SetSortingFunc(0, textBoxSortFunc); spellList->SetSortingFunc(5, textBoxSortFunc); @@ -105,6 +106,7 @@ { spellList->Clear(); descriptions_Hash.Empty(); + images_Hash.Empty(); psSpellBookMessage mesg(me); for ( size_t x = 0; x < mesg.spells.GetSize(); x++ ) @@ -128,6 +130,7 @@ glyph->SetBackground(mesg.spells[x].glyphs[i]); } descriptions_Hash.Put(mesg.spells[x].name, mesg.spells[x].description); + images_Hash.Put(mesg.spells[x].name, mesg.spells[x].image); if (selectedSpell == mesg.spells[x].name) { spellList->Select(row); @@ -190,5 +193,6 @@ selectedSpell.Replace( spellName->GetText() ); spellDescription->AddMessage(descriptions_Hash.Get(spellName->GetText(), "Unknown")); spellDescription->ResetScroll(); + spellImage->SetBackground(images_Hash.Get(spellName->GetText(), "")); } } Modified: trunk/src/client/gui/pawsspellbookwindow.h =================================================================== --- trunk/src/client/gui/pawsspellbookwindow.h 2009-07-07 07:47:23 UTC (rev 3932) +++ trunk/src/client/gui/pawsspellbookwindow.h 2009-07-07 08:44:41 UTC (rev 3933) @@ -64,6 +64,7 @@ csRef<MsgHandler> msgHandler; csHash<csString, csString> descriptions_Hash; + csHash<csString, csString> images_Hash; }; CREATE_PAWS_FACTORY( pawsSpellBookWindow ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-07-17 08:50:36
|
Revision: 4043 http://planeshift.svn.sourceforge.net/planeshift/?rev=4043&view=rev Author: kennygraunke Date: 2009-07-17 08:50:29 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Minor cleanup: remove local reference to MsgHandler. Modified Paths: -------------- trunk/src/client/gui/pawsglyphwindow.cpp trunk/src/client/gui/pawsglyphwindow.h Modified: trunk/src/client/gui/pawsglyphwindow.cpp =================================================================== --- trunk/src/client/gui/pawsglyphwindow.cpp 2009-07-17 08:40:51 UTC (rev 4042) +++ trunk/src/client/gui/pawsglyphwindow.cpp 2009-07-17 08:50:29 UTC (rev 4043) @@ -62,8 +62,6 @@ pawsGlyphWindow::pawsGlyphWindow() { - msgHandler = NULL; - for (int i = 0; i < GLYPH_ASSEMBLER_SLOTS; i++) assembler[i] = NULL; } @@ -79,7 +77,7 @@ // Ask the server to send us the glyphs psRequestGlyphsMessage outGoingMessage; - msgHandler->SendMessage( outGoingMessage.msg ); + psengine->GetMsgHandler()->SendMessage( outGoingMessage.msg ); } void pawsGlyphWindow::Hide() @@ -93,14 +91,10 @@ bool pawsGlyphWindow::PostSetup() { - msgHandler = psengine->GetMsgHandler(); - if ( !msgHandler ) return false; - // Subscribe our message types that we are interested in. - if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_REQUEST ) ) return false; - if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_ASSEMBLE ) ) return false; + if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_REQUEST)) return false; + if (!psengine->GetMsgHandler()->Subscribe(this, MSGTYPE_GLYPH_ASSEMBLE)) return false; - description = dynamic_cast <pawsMessageTextBox*> (FindWidget("SpellDescription")); if ( !description ) return false; @@ -272,7 +266,7 @@ if (floatingSlot!=NULL && floatingSlot->GetPurifyStatus()==0) { psPurifyGlyphMessage mesg( floatingSlot->GetStatID() ); - msgHandler->SendMessage( mesg.msg ); + mesg.SendMessage(); PawsManager::GetSingleton().SetDragDropWidget(NULL); } @@ -289,7 +283,7 @@ { csString name(spellName->GetText()); psSpellCastMessage mesg( name, psengine->GetKFactor() ); - msgHandler->SendMessage( mesg.msg ); + mesg.SendMessage(); } return true; } @@ -381,5 +375,5 @@ assembler[3]->GetStatID(), infoRequest); - msgHandler->SendMessage( mesg.msg ); + mesg.SendMessage(); } Modified: trunk/src/client/gui/pawsglyphwindow.h =================================================================== --- trunk/src/client/gui/pawsglyphwindow.h 2009-07-17 08:40:51 UTC (rev 4042) +++ trunk/src/client/gui/pawsglyphwindow.h 2009-07-17 08:50:29 UTC (rev 4043) @@ -113,8 +113,6 @@ /*** Clears the Spell name and Description fields. ***/ void ClearSpell(); - csRef<MsgHandler> msgHandler; - pawsMessageTextBox * description; pawsTextBox * spellName; pawsWidget *spellImage; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-19 17:17:49
|
Revision: 4076 http://planeshift.svn.sourceforge.net/planeshift/?rev=4076&view=rev Author: weltall2 Date: 2009-07-19 17:17:45 +0000 (Sun, 19 Jul 2009) Log Message: ----------- Fixed PS#3005 - Client crash due to removal of "SystemText" widget Modified Paths: -------------- trunk/src/client/gui/pawsgmgui.cpp trunk/src/client/gui/pawsgmgui.h trunk/src/client/gui/shortcutwindow.cpp trunk/src/client/gui/shortcutwindow.h Modified: trunk/src/client/gui/pawsgmgui.cpp =================================================================== --- trunk/src/client/gui/pawsgmgui.cpp 2009-07-19 15:48:19 UTC (rev 4075) +++ trunk/src/client/gui/pawsgmgui.cpp 2009-07-19 17:17:45 UTC (rev 4076) @@ -71,7 +71,7 @@ xml = psengine->GetXMLParser (); cmdsource = psengine->GetCmdHandler(); - systemText = (pawsMessageTextBox*)PawsManager::GetSingleton().FindWidget("SystemText"); + chatWindow = (pawsChatWindow*)PawsManager::GetSingleton().FindWidget("ChatWindow"); actionXML.Clear(); isVisible = true; isInvincible = false; @@ -262,7 +262,7 @@ case -10: errorMessage = cmdsource->Publish( cmdToExectute ); if ( errorMessage ) - systemText->AddMessage( errorMessage ); + chatWindow->ChatOutput( errorMessage ); case 1000: // Players tab case 1002: // Action Tab case 1003: // Attributes Tab @@ -542,7 +542,7 @@ { errorMessage = cmdsource->Publish( cmd ); if ( errorMessage ) - systemText->AddMessage( errorMessage ); + chatWindow->ChatOutput( errorMessage ); } } if(updateAfter) Modified: trunk/src/client/gui/pawsgmgui.h =================================================================== --- trunk/src/client/gui/pawsgmgui.h 2009-07-19 15:48:19 UTC (rev 4075) +++ trunk/src/client/gui/pawsgmgui.h 2009-07-19 17:17:45 UTC (rev 4076) @@ -19,7 +19,7 @@ #ifndef PAWS_GMGUI_WINDOW #define PAWS_GMGUI_WINDOW -// CS INCLUDES +// PS INCLUDES #include "paws/pawswidget.h" #include "paws/pawsbutton.h" #include "paws/pawstextbox.h" @@ -27,6 +27,7 @@ #include "paws/pawslistbox.h" #include "paws/pawsstringpromptwindow.h" #include "net/cmdbase.h" +#include "chatwindow.h" class pawsGmGUIWindow : public pawsWidget, public psCmdBase, public iOnStringEnteredAction { @@ -74,7 +75,7 @@ int GetCurrentTab() { return currentTab; }; protected: - pawsMessageTextBox* systemText; + pawsChatWindow* chatWindow; CmdHandler *cmdsource; csRef<iVFS> vfs; Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2009-07-19 15:48:19 UTC (rev 4075) +++ trunk/src/client/gui/shortcutwindow.cpp 2009-07-19 17:17:45 UTC (rev 4076) @@ -77,7 +77,7 @@ LoadCommands(fileName); cmdsource = psengine->GetCmdHandler(); - systemText = (pawsMessageTextBox*)PawsManager::GetSingleton().FindWidget("SystemText"); + chatWindow = (pawsChatWindow*)PawsManager::GetSingleton().FindWidget("ChatWindow"); subWidget = NULL; shortcutText = NULL; textBox = NULL; @@ -648,7 +648,7 @@ } const char* errorMessage = cmdsource->Publish( command ); if ( errorMessage ) - systemText->AddMessage( errorMessage ); + chatWindow->ChatOutput( errorMessage ); } Modified: trunk/src/client/gui/shortcutwindow.h =================================================================== --- trunk/src/client/gui/shortcutwindow.h 2009-07-19 15:48:19 UTC (rev 4075) +++ trunk/src/client/gui/shortcutwindow.h 2009-07-19 17:17:45 UTC (rev 4076) @@ -20,12 +20,13 @@ #ifndef PAWS_SHORTCUT_WINDOW #define PAWS_SHORTCUT_WINDOW -// CS INCLUDES +// PS INCLUDES #include "paws/pawswidget.h" #include "paws/pawsbutton.h" #include "net/cmdbase.h" #include "gui/pawscontrolwindow.h" #include "gui/pawsconfigkeys.h" +#include "chatwindow.h" #include "pscharcontrol.h" @@ -67,8 +68,8 @@ void LoadDefaultCommands(); protected: - /// System text for easy access - pawsMessageTextBox* systemText; + /// chat window for easy access + pawsChatWindow* chatWindow; void LoadCommands(const char * fileName); void SaveCommands(void); CmdHandler *cmdsource; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-15 14:29:35
|
Revision: 4364 http://planeshift.svn.sourceforge.net/planeshift/?rev=4364&view=rev Author: weltall2 Date: 2009-09-15 14:29:27 +0000 (Tue, 15 Sep 2009) Log Message: ----------- Fixed PS#3128 - Options menu unscrollable and incomplete. Modified Paths: -------------- trunk/src/client/gui/pawsconfigcamera.cpp trunk/src/client/gui/pawsconfigkeys.cpp trunk/src/client/gui/pawsconfigmouse.cpp Modified: trunk/src/client/gui/pawsconfigcamera.cpp =================================================================== --- trunk/src/client/gui/pawsconfigcamera.cpp 2009-09-15 13:21:34 UTC (rev 4363) +++ trunk/src/client/gui/pawsconfigcamera.cpp 2009-09-15 14:29:27 UTC (rev 4364) @@ -99,7 +99,7 @@ return false; tree = dynamic_cast<pawsTree *>(children[0]); - tree->SetRelativeFrameSize(parent->ScreenFrame().Width(), parent->ScreenFrame().Height()); + tree->SetRelativeFrameSize(parent->ScreenFrame().Width()-20, parent->ScreenFrame().Height()-20); root = tree->GetRoot(); if (root != NULL) Modified: trunk/src/client/gui/pawsconfigkeys.cpp =================================================================== --- trunk/src/client/gui/pawsconfigkeys.cpp 2009-09-15 13:21:34 UTC (rev 4363) +++ trunk/src/client/gui/pawsconfigkeys.cpp 2009-09-15 14:29:27 UTC (rev 4364) @@ -116,7 +116,7 @@ return false; tree = dynamic_cast<pawsTree *>(children[0]); - tree->SetRelativeFrameSize(parent->ScreenFrame().Width(), parent->ScreenFrame().Height()); + tree->SetRelativeFrameSize(parent->ScreenFrame().Width()-20, parent->ScreenFrame().Height()-20); root = tree->GetRoot(); if (root != NULL) Modified: trunk/src/client/gui/pawsconfigmouse.cpp =================================================================== --- trunk/src/client/gui/pawsconfigmouse.cpp 2009-09-15 13:21:34 UTC (rev 4363) +++ trunk/src/client/gui/pawsconfigmouse.cpp 2009-09-15 14:29:27 UTC (rev 4364) @@ -148,7 +148,7 @@ return false; tree = dynamic_cast<pawsTree *>(children[0]); - tree->SetRelativeFrameSize(parent->ScreenFrame().Width(), parent->ScreenFrame().Height()); + tree->SetRelativeFrameSize(parent->ScreenFrame().Width()-20, parent->ScreenFrame().Height()-20); root = tree->GetRoot(); if (root != NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-15 18:23:41
|
Revision: 4371 http://planeshift.svn.sourceforge.net/planeshift/?rev=4371&view=rev Author: weltall2 Date: 2009-09-15 18:23:30 +0000 (Tue, 15 Sep 2009) Log Message: ----------- fixed background. needs some improvement on the xml Modified Paths: -------------- trunk/src/client/gui/pawsguildwindow.cpp trunk/src/client/gui/pawsguildwindow.h Modified: trunk/src/client/gui/pawsguildwindow.cpp =================================================================== --- trunk/src/client/gui/pawsguildwindow.cpp 2009-09-15 18:07:38 UTC (rev 4370) +++ trunk/src/client/gui/pawsguildwindow.cpp 2009-09-15 18:23:30 UTC (rev 4371) @@ -630,20 +630,6 @@ } } -void pawsGuildWindow::SetTheRightBackground() -{ - if (currentPanel == permissionsPanel) - SetBackground("Guild Rights Background"); - else if (currentPanel == membersPanel) - SetBackground("Guild Members Background"); - else if (currentPanel == alliancesPanel) - SetBackground("Guild Alliances Background"); - else if (currentPanel == settingsPanel) - //SetBackground("Guild Alliances Background"); - - SetBackground("Guild Main Background"); -} - bool pawsGuildWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ) { guildMemberInfo * member; @@ -706,7 +692,6 @@ currentTab = permissionsTab; currentPanel->Show(); currentTab->SetState(true); - SetTheRightBackground(); retVal = true; break; } @@ -718,7 +703,6 @@ currentTab = membersTab; currentPanel->Show(); currentTab->SetState(true); - SetTheRightBackground(); retVal = true; break; } @@ -730,7 +714,6 @@ currentTab = alliancesTab; currentPanel->Show(); currentTab->SetState(true); - SetTheRightBackground(); retVal = true; break; } @@ -742,7 +725,6 @@ currentTab = settingsTab; currentPanel->Show(); currentTab->SetState(true); - SetTheRightBackground(); retVal = true; break; } @@ -994,7 +976,6 @@ csString command; command.Format("/guildinfo %s",onlineOnly->GetState() ? "yes":"no"); psengine->GetCmdHandler()->Execute(command); - SetTheRightBackground(); } void pawsGuildWindow::OpenGuildLeaveConfirm() Modified: trunk/src/client/gui/pawsguildwindow.h =================================================================== --- trunk/src/client/gui/pawsguildwindow.h 2009-09-15 18:07:38 UTC (rev 4370) +++ trunk/src/client/gui/pawsguildwindow.h 2009-09-15 18:23:30 UTC (rev 4371) @@ -103,9 +103,6 @@ */ void SetAllianceWidgetVisibility(int mode); - /** Sets window background image depending on what tab is active */ - void SetTheRightBackground(); - // Tab controls pawsWidget *permissionsPanel,*membersPanel,*alliancesPanel,*settingsPanel,*currentPanel; pawsButton *permissionsTab,*membersTab,*alliancesTab,*settingsTab,*currentTab; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-15 20:16:05
|
Revision: 4381 http://planeshift.svn.sourceforge.net/planeshift/?rev=4381&view=rev Author: weltall2 Date: 2009-09-15 20:15:57 +0000 (Tue, 15 Sep 2009) Log Message: ----------- added button background... these are full of hardcoded thing which should go... Modified Paths: -------------- trunk/src/client/gui/pawsconfigkeys.cpp trunk/src/client/gui/pawsconfigmouse.cpp Modified: trunk/src/client/gui/pawsconfigkeys.cpp =================================================================== --- trunk/src/client/gui/pawsconfigkeys.cpp 2009-09-15 19:57:03 UTC (rev 4380) +++ trunk/src/client/gui/pawsconfigkeys.cpp 2009-09-15 20:15:57 UTC (rev 4381) @@ -204,8 +204,8 @@ button->SetParent( this ); button->SetNotify(this); button->SetRelativeFrameSize(30, 20); - button->SetUpImage("Blue Title"); - button->SetDownImage("Blue Title"); + button->SetUpImage("Standard Button"); + button->SetDownImage("Standard Button Down"); button->SetText("Set"); button->SetToggle(false); button->Show(); Modified: trunk/src/client/gui/pawsconfigmouse.cpp =================================================================== --- trunk/src/client/gui/pawsconfigmouse.cpp 2009-09-15 19:57:03 UTC (rev 4380) +++ trunk/src/client/gui/pawsconfigmouse.cpp 2009-09-15 20:15:57 UTC (rev 4381) @@ -193,7 +193,8 @@ button->SetNotify(this); button->SetParent( this ); button->SetSize(30, 20); - button->SetUpImage("Blue Title"); + button->SetUpImage("Standard Button"); + button->SetDownImage("Standard Button Down"); button->SetText("set"); button->SetToggle(false); button->Show(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-10-02 10:00:21
|
Revision: 4604 http://planeshift.svn.sourceforge.net/planeshift/?rev=4604&view=rev Author: weltall2 Date: 2009-10-02 10:00:11 +0000 (Fri, 02 Oct 2009) Log Message: ----------- made more thing translateable Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/pawsloginwindow.cpp Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-10-02 09:52:41 UTC (rev 4603) +++ trunk/src/client/gui/chatwindow.cpp 2009-10-02 10:00:11 UTC (rev 4604) @@ -756,7 +756,7 @@ *currentPos = '\0'; } // Assume CHAT_SAY and place all in one chat type to ensure they end up in the same window - PawsManager::GetSingleton().Publish(CHAT_TYPES[CHAT_SAY], "Replaying previous chat...", settings.systemColor ); + PawsManager::GetSingleton().Publish(CHAT_TYPES[CHAT_SAY], PawsManager::GetSingleton().Translate("Replaying previous chat..."), settings.systemColor ); while(!line.IsEmpty()) PawsManager::GetSingleton().Publish(CHAT_TYPES[CHAT_SAY], line.Pop(), settings.chatColor ); } Modified: trunk/src/client/gui/pawsloginwindow.cpp =================================================================== --- trunk/src/client/gui/pawsloginwindow.cpp 2009-10-02 09:52:41 UTC (rev 4603) +++ trunk/src/client/gui/pawsloginwindow.cpp 2009-10-02 10:00:11 UTC (rev 4604) @@ -227,21 +227,21 @@ if ( strlen(login->GetText()) == 0) { - psSystemMessage error(0,MSG_ERROR,"Please enter your account name."); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Please enter your account name.")); error.FireEvent(); return true; } if ( strlen(passwd->GetText()) == 0) { - psSystemMessage error(0,MSG_ERROR,"Please enter your password."); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Please enter your password.")); error.FireEvent(); return true; } if (serverIP.Length() == 0) { - psSystemMessage error(0,MSG_ERROR,"Please select a server."); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Please select a server.")); error.FireEvent(); return true; } @@ -251,7 +251,7 @@ case psServerPinger::INIT: case psServerPinger::FAILED: { - psSystemMessage error(0,MSG_ERROR,"The server isn't available!"); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("The server isn't available!")); error.FireEvent(); return true; } @@ -263,13 +263,13 @@ return true; case psServerPinger::LOCKED: { - psSystemMessage error(0,MSG_ERROR,"The server is locked!"); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate"The server is locked!")); error.FireEvent(); return true; } case psServerPinger::WAIT: { - psSystemMessage error(0,MSG_ERROR,"The server isn't ready!"); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate"The server isn't ready!")); error.FireEvent(); return true; } @@ -311,7 +311,7 @@ // Set the time out to connect to server timeout = csGetTicks() + cfg->GetInt("PlaneShift.Client.User.Connecttimeout", 60) * 1000; - connectingLabel->SetText("Connecting to server... Please wait"); + connectingLabel->SetText(PawsManager::GetSingleton().Translate"Connecting to server... Please wait")); // to make sure the "Connecting" label is visible: PawsManager::GetSingleton().GetGraphics3D()->BeginDraw (CSDRAW_2DGRAPHICS); @@ -322,7 +322,7 @@ if ( !psengine->GetNetManager()->Connect( serverIP, serverPort ) ) { - psSystemMessage error(0,MSG_ERROR,"Cannot connect to server!"); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Cannot connect to server!")); error.FireEvent(); psengine->GetNetManager()->Disconnect(); @@ -356,7 +356,7 @@ void pawsLoginWindow::ConnectionFailed() { connecting = false; - connectingLabel->SetText("New User? Register at http://laanx.fragnetics.com/register"); + connectingLabel->SetText(servers[listBox->GetSelectedRowNum()]->GetDescription()); } void pawsLoginWindow::SaveLoginInformation() @@ -490,7 +490,7 @@ { psengine->GetNetManager()->Disconnect(); ConnectionFailed(); - PawsManager::GetSingleton().CreateWarningBox("The server is not running or is not reachable. Please check the website or forums for more info."); + PawsManager::GetSingleton().CreateWarningBox(PawsManager::GetSingleton().Translate("The server is not running or is not reachable. Please check the website or forums for more info.")); } csString pingStr; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-11-25 08:08:32
|
Revision: 4790 http://planeshift.svn.sourceforge.net/planeshift/?rev=4790&view=rev Author: weltall2 Date: 2009-11-25 08:08:22 +0000 (Wed, 25 Nov 2009) Log Message: ----------- fixed PS#3383 - Save button in options window is click-through Modified Paths: -------------- trunk/src/client/gui/pawsconfigwindow.cpp trunk/src/client/gui/pawsconfigwindow.h Modified: trunk/src/client/gui/pawsconfigwindow.cpp =================================================================== --- trunk/src/client/gui/pawsconfigwindow.cpp 2009-11-25 05:40:09 UTC (rev 4789) +++ trunk/src/client/gui/pawsconfigwindow.cpp 2009-11-25 08:08:22 UTC (rev 4790) @@ -95,7 +95,7 @@ } -bool pawsConfigWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ) +bool pawsConfigWindow::OnButtonReleased( int mouseButton, int keyModifier, pawsWidget* widget ) { if (widget == okButton) Modified: trunk/src/client/gui/pawsconfigwindow.h =================================================================== --- trunk/src/client/gui/pawsconfigwindow.h 2009-11-25 05:40:09 UTC (rev 4789) +++ trunk/src/client/gui/pawsconfigwindow.h 2009-11-25 08:08:22 UTC (rev 4790) @@ -105,7 +105,7 @@ pawsConfigWindow(); // from pawsWidget: - virtual bool OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ); + virtual bool OnButtonReleased( int mouseButton, int keyModifier, pawsWidget* widget ); virtual bool OnSelected( pawsWidget* widget); virtual bool PostSetup(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-11-28 01:32:00
|
Revision: 4806 http://planeshift.svn.sourceforge.net/planeshift/?rev=4806&view=rev Author: Khakilord Date: 2009-11-28 01:31:51 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Fixed chat tab options so changing the main tab options works again. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/pawsconfigchattabs.cpp trunk/src/client/gui/pawsconfigchattabs.h Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-11-27 18:11:06 UTC (rev 4805) +++ trunk/src/client/gui/chatwindow.cpp 2009-11-28 01:31:51 UTC (rev 4806) @@ -271,6 +271,7 @@ bindingsNode = chatNode->GetNode("bindings"); if (bindingsNode != NULL) { + settings.bindings.DeleteAll(); csRef<iDocumentNodeIterator> bindingsIter = bindingsNode->GetNodes("listener"); while(bindingsIter->HasNext()) { @@ -288,7 +289,7 @@ PawsManager::GetSingleton().Subscribe(typeName, subscribers[i]); } // For loading/saving - settings.bindings.Put(typeName, listenerName); + settings.bindings.Put(listenerName, typeName); } } } @@ -919,6 +920,26 @@ logNode->SetAttributeAsInt("value",(int)settings.logChannel[i]); } + csRef<iDocumentNode> bindingsNode = chatNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); + bindingsNode->SetValue("bindings"); + + csString currentListener; + csRef<iDocumentNode> listenerNode; + csHash<csString, csString>::GlobalIterator bindingsIt = settings.bindings.GetIterator(); + while(bindingsIt.HasNext()) + { + const csTuple2<csString, csString> binding = bindingsIt.NextTuple(); + if(binding.second != currentListener) + { + currentListener = binding.second; + listenerNode = bindingsNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); + listenerNode->SetValue("listener"); + listenerNode->SetAttribute("name", binding.second); + } + csRef<iDocumentNode> chatTabType = listenerNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); + chatTabType->SetValue("chat"); + chatTabType->SetAttribute("type", binding.first); + } filtersNode = chatNode->CreateNodeBefore(CS_NODE_ELEMENT,0); filtersNode->SetValue("filters"); Modified: trunk/src/client/gui/pawsconfigchattabs.cpp =================================================================== --- trunk/src/client/gui/pawsconfigchattabs.cpp 2009-11-27 18:11:06 UTC (rev 4805) +++ trunk/src/client/gui/pawsconfigchattabs.cpp 2009-11-28 01:31:51 UTC (rev 4806) @@ -47,7 +47,23 @@ Error1("Couldn't find ChatWindow!"); return false; } - + // Find widgets + if ((isysbase = FindCheckbox("isysbase")) == NULL) + return false; + if ((inpc = FindCheckbox("inpc")) == NULL) + return false; + if ((itells = FindCheckbox("itells")) == NULL) + return false; + if ((iguild = FindCheckbox("iguild")) == NULL) + return false; + if ((igroup = FindCheckbox("igroup")) == NULL) + return false; + if ((iauction = FindCheckbox("iauction")) == NULL) + return false; + if ((isys = FindCheckbox("isys")) == NULL) + return false; + if ((ihelp = FindCheckbox("ihelp")) == NULL) + return false; return true; } @@ -56,7 +72,37 @@ chatWindow->LoadChatSettings(); ChatSettings settings = chatWindow->GetSettings(); + + isysbase->SetState(false); + inpc->SetState(false); + itells->SetState(false); + iguild->SetState(false); + igroup->SetState(false); + iauction->SetState(false); + isys->SetState(false); + ihelp->SetState(false); + csArray<csString> allMainBindings = settings.bindings.GetAll("subMainText"); + for(size_t i = 0; i < allMainBindings.GetSize(); i++) + { + if(allMainBindings[i] == "CHAT_SYSTEM_BASE") + isysbase->SetState(true); + if(allMainBindings[i] == "CHAT_NPC") + inpc->SetState(true); + if(allMainBindings[i] == "CHAT_TELL") + itells->SetState(true); + if(allMainBindings[i] == "CHAT_GUILD") + iguild->SetState(true); + if(allMainBindings[i] == "CHAT_GROUP") + igroup->SetState(true); + if(allMainBindings[i] == "CHAT_AUCTION") + iauction->SetState(true); + if(allMainBindings[i] == "CHAT_SYSTEM") + isys->SetState(true); + if(allMainBindings[i] == "CHAT_ADVICE") + ihelp->SetState(true); + } + // Check boxes doesn't send OnChange :( dirty = true; @@ -66,6 +112,58 @@ bool pawsConfigChatTabs::SaveConfig() { ChatSettings settings = chatWindow->GetSettings(); + + settings.bindings.Delete("subMainText", "CHAT_SYSTEM_BASE"); + settings.bindings.Delete("subMainText", "CHAT_NPC"); + settings.bindings.Delete("subMainText", "CHAT_NPC_ME"); + settings.bindings.Delete("subMainText", "CHAT_NPC_MY"); + settings.bindings.Delete("subMainText", "CHAT_NPC_NARRATE"); + settings.bindings.Delete("subMainText", "CHAT_NPCINTERNAL"); + settings.bindings.Delete("subMainText", "CHAT_TELL"); + settings.bindings.Delete("subMainText", "CHAT_TELLSELF"); + settings.bindings.Delete("subMainText", "CHAT_GUILD"); + settings.bindings.Delete("subMainText", "CHAT_GROUP"); + settings.bindings.Delete("subMainText", "CHAT_AUCTION"); + settings.bindings.Delete("subMainText", "CHAT_SYSTEM"); + settings.bindings.Delete("subMainText", "CHAT_ADVICE"); + + if(isysbase->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_SYSTEM_BASE"); + } + if(inpc->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_NPC"); + settings.bindings.Put("subMainText", "CHAT_NPC_ME"); + settings.bindings.Put("subMainText", "CHAT_NPC_MY"); + settings.bindings.Put("subMainText", "CHAT_NPC_NARRATE"); + settings.bindings.Put("subMainText", "CHAT_NPCINTERNAL"); + } + if(itells->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_TELL"); + settings.bindings.Put("subMainText", "CHAT_TELLSELF"); + } + if(iguild->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_GUILD"); + } + if(igroup->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_GROUP"); + } + if(iauction->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_AUCTION"); + } + if(isys->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_SYSTEM"); + } + if(ihelp->GetState()) + { + settings.bindings.Put("subMainText", "CHAT_ADVICE"); + } chatWindow->SetSettings(settings); Modified: trunk/src/client/gui/pawsconfigchattabs.h =================================================================== --- trunk/src/client/gui/pawsconfigchattabs.h 2009-11-27 18:11:06 UTC (rev 4805) +++ trunk/src/client/gui/pawsconfigchattabs.h 2009-11-28 01:31:51 UTC (rev 4806) @@ -42,6 +42,7 @@ private: + pawsCheckBox *isysbase, *inpc, *itells, *iguild, *igroup, *iauction, *isys, *ihelp; /// Finds the checkbox widget by name and returns the widget or NULL if not found. pawsCheckBox *FindCheckbox(const char *name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-11-28 15:22:48
|
Revision: 4807 http://planeshift.svn.sourceforge.net/planeshift/?rev=4807&view=rev Author: Khakilord Date: 2009-11-28 15:22:41 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Fixed bugs which would cause duplicate registrations in the chat window. Also fixed some chatwindow crashes. Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/chatwindow.h trunk/src/client/gui/pawsconfigchat.cpp trunk/src/client/gui/pawsconfigchatfilter.cpp trunk/src/client/gui/pawsconfigchattabs.cpp Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-11-28 01:31:51 UTC (rev 4806) +++ trunk/src/client/gui/chatwindow.cpp 2009-11-28 15:22:41 UTC (rev 4807) @@ -205,38 +205,63 @@ // Get some default colours here and other options. // XML parsing time! - csRef<iDocument> doc; - csRef<iDocumentNode> root,chatNode, colorNode, optionNode, bindingsNode, filtersNode, msgFiltersNode, + csRef<iDocument> doc, defaultDoc; + csRef<iDocumentNode> root,defaultRoot, defaultChatNode, chatNode, colorNode, optionNode, bindingsNode, filtersNode, msgFiltersNode, mainTabNode, flashingNode, flashingOnCharNode; csString option; - csString fileName = CONFIG_CHAT_FILE_NAME; - if (!psengine->GetVFS()->Exists(fileName)) + bool chatOptionsExist = false; + if (psengine->GetVFS()->Exists(CONFIG_CHAT_FILE_NAME)) { - fileName = CONFIG_CHAT_FILE_NAME_DEF; + chatOptionsExist = true; } + defaultDoc = doc = ParseFile(psengine->GetObjectRegistry(), CONFIG_CHAT_FILE_NAME_DEF); - doc = ParseFile(psengine->GetObjectRegistry(), fileName); - if (doc == NULL) + if (defaultDoc == NULL) { - Error2("Failed to parse file %s", fileName.GetData()); + Error2("Failed to parse file %s", CONFIG_CHAT_FILE_NAME_DEF); return; } - root = doc->GetRoot(); - if (root == NULL) + defaultRoot = root = defaultDoc->GetRoot(); + if (defaultRoot == NULL) { - Error2("%s has no XML root", fileName.GetData()); + Error2("%s has no XML root", CONFIG_CHAT_FILE_NAME_DEF); return; } - chatNode = root->GetNode("chat"); - if (chatNode == NULL) + defaultChatNode = chatNode = defaultRoot->GetNode("chat"); + if (defaultChatNode == NULL) { - Error2("%s has no <chat> tag", fileName.GetData()); + Error2("%s has no <chat> tag", CONFIG_CHAT_FILE_NAME_DEF); return; } + + if(chatOptionsExist) + { + doc = ParseFile(psengine->GetObjectRegistry(), CONFIG_CHAT_FILE_NAME); + if (doc == NULL) + { + Error2("Failed to parse file %s", CONFIG_CHAT_FILE_NAME); + return; + } + root = doc->GetRoot(); + if (root == NULL) + { + Error2("%s has no XML root", CONFIG_CHAT_FILE_NAME); + return; + } + chatNode = root->GetNode("chat"); + if (chatNode == NULL) + { + Error2("%s has no <chat> tag", CONFIG_CHAT_FILE_NAME); + return; + } + } + // Load options such as loose after sending optionNode = chatNode->GetNode("chatoptions"); + if(!optionNode) + optionNode = defaultChatNode->GetNode("chatoptions"); if (optionNode != NULL) { csRef<iDocumentNodeIterator> oNodes = optionNode->GetNodes(); @@ -269,16 +294,27 @@ } } bindingsNode = chatNode->GetNode("bindings"); + if(!bindingsNode) + bindingsNode = defaultChatNode->GetNode("bindings"); if (bindingsNode != NULL) { settings.bindings.DeleteAll(); + settings.subNames.DeleteAll(); csRef<iDocumentNodeIterator> bindingsIter = bindingsNode->GetNodes("listener"); while(bindingsIter->HasNext()) { csRef<iDocumentNode> binding = bindingsIter->Next(); csString listenerName(binding->GetAttributeValue("name")); - csRef<iDocumentNodeIterator> bindingTypesIter = binding->GetNodes("chat"); + settings.subNames.Push(listenerName); + csRef<iDocumentNodeIterator> bindingTypesIter = binding->GetNodes("chat_message"); csArray<iPAWSSubscriber*> subscribers = PawsManager::GetSingleton().ListSubscribers(listenerName); + + // Clear existing subscriptions + for(size_t i = 0; i < subscribers.GetSize(); i++) + { + PawsManager::GetSingleton().UnSubscribe(subscribers[i]); + PawsManager::GetSingleton().Subscribe(listenerName, subscribers[i]); + } while(bindingTypesIter->HasNext()) { csRef<iDocumentNode> bindingType = bindingTypesIter->Next(); @@ -296,6 +332,8 @@ // Load colors colorNode = chatNode->GetNode("chatcolors"); + if(!colorNode) + colorNode = defaultChatNode->GetNode("chatcolors"); if (colorNode != NULL) { csRef<iDocumentNodeIterator> cNodes = colorNode->GetNodes(); @@ -330,6 +368,8 @@ // Load filters filtersNode = chatNode->GetNode("filters"); + if(!filtersNode) + filtersNode = defaultChatNode->GetNode("filters"); settings.meFilters = 0; settings.vicinityFilters = 0; @@ -382,6 +422,8 @@ // Load message filters msgFiltersNode = chatNode->GetNode("msgfilters"); + if(!msgFiltersNode) + msgFiltersNode = defaultChatNode->GetNode("msgfilters"); if (msgFiltersNode != NULL) { csRef<iDocumentNodeIterator> fNodes = msgFiltersNode->GetNodes(); @@ -923,22 +965,22 @@ csRef<iDocumentNode> bindingsNode = chatNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); bindingsNode->SetValue("bindings"); - csString currentListener; csRef<iDocumentNode> listenerNode; - csHash<csString, csString>::GlobalIterator bindingsIt = settings.bindings.GetIterator(); - while(bindingsIt.HasNext()) + + for(size_t i = 0; i < settings.subNames.GetSize(); i++) { - const csTuple2<csString, csString> binding = bindingsIt.NextTuple(); - if(binding.second != currentListener) - { - currentListener = binding.second; - listenerNode = bindingsNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); - listenerNode->SetValue("listener"); - listenerNode->SetAttribute("name", binding.second); - } - csRef<iDocumentNode> chatTabType = listenerNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); - chatTabType->SetValue("chat"); - chatTabType->SetAttribute("type", binding.first); + csHash<csString, csString>::Iterator bindingsIt = settings.bindings.GetIterator(settings.subNames[i]); + listenerNode = bindingsNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); + listenerNode->SetValue("listener"); + listenerNode->SetAttribute("name", settings.subNames[i]); + while(bindingsIt.HasNext()) + { + csString type = bindingsIt.Next(); + + csRef<iDocumentNode> chatTabType = listenerNode->CreateNodeBefore(CS_NODE_ELEMENT, 0); + chatTabType->SetValue("chat_message"); + chatTabType->SetAttribute("type", type); + } } filtersNode = chatNode->CreateNodeBefore(CS_NODE_ELEMENT,0); Modified: trunk/src/client/gui/chatwindow.h =================================================================== --- trunk/src/client/gui/chatwindow.h 2009-11-28 01:31:51 UTC (rev 4806) +++ trunk/src/client/gui/chatwindow.h 2009-11-28 15:22:41 UTC (rev 4807) @@ -99,6 +99,7 @@ csArray<csString> goodWords; // chat type to subscription name binding csHash<csString, csString> bindings; + csArray<csString> subNames; int selectTabStyle; int vicinityFilters; // Flags int int meFilters; // Flags int Modified: trunk/src/client/gui/pawsconfigchat.cpp =================================================================== --- trunk/src/client/gui/pawsconfigchat.cpp 2009-11-28 01:31:51 UTC (rev 4806) +++ trunk/src/client/gui/pawsconfigchat.cpp 2009-11-28 15:22:41 UTC (rev 4807) @@ -176,7 +176,7 @@ // Need to reload settings chatWindow->LoadChatSettings(); - ChatSettings settings = chatWindow->GetSettings(); + ChatSettings &settings = chatWindow->GetSettings(); loose->SetState(settings.looseFocusOnSend); echoScreenInSystem->SetState(settings.echoScreenInSystem); @@ -233,7 +233,7 @@ { int i; - ChatSettings settings = chatWindow->GetSettings(); + ChatSettings &settings = chatWindow->GetSettings(); SET_CHAT_VALUE(admin); SET_CHAT_VALUE(system); SET_CHAT_VALUE(player); Modified: trunk/src/client/gui/pawsconfigchatfilter.cpp =================================================================== --- trunk/src/client/gui/pawsconfigchatfilter.cpp 2009-11-28 01:31:51 UTC (rev 4806) +++ trunk/src/client/gui/pawsconfigchatfilter.cpp 2009-11-28 15:22:41 UTC (rev 4807) @@ -65,7 +65,7 @@ chatWindow->LoadChatSettings(); - ChatSettings settings = chatWindow->GetSettings(); + ChatSettings& settings = chatWindow->GetSettings(); // Set all filters for(int i=0;i < COMBAT_TOTAL_AMOUNT;i++) { @@ -109,7 +109,7 @@ pawsChatWindow* chatWindow = (pawsChatWindow*)PawsManager::GetSingleton().FindWidget("ChatWindow"); // Since this is a critical widget, we shouldn't have got this far if it isn't loaded - ChatSettings settings = chatWindow->GetSettings(); + ChatSettings& settings = chatWindow->GetSettings(); settings.meFilters = 0; settings.vicinityFilters = 0; Modified: trunk/src/client/gui/pawsconfigchattabs.cpp =================================================================== --- trunk/src/client/gui/pawsconfigchattabs.cpp 2009-11-28 01:31:51 UTC (rev 4806) +++ trunk/src/client/gui/pawsconfigchattabs.cpp 2009-11-28 15:22:41 UTC (rev 4807) @@ -111,7 +111,7 @@ bool pawsConfigChatTabs::SaveConfig() { - ChatSettings settings = chatWindow->GetSettings(); + ChatSettings& settings = chatWindow->GetSettings(); settings.bindings.Delete("subMainText", "CHAT_SYSTEM_BASE"); settings.bindings.Delete("subMainText", "CHAT_NPC"); @@ -169,6 +169,9 @@ // Save to file chatWindow->SaveChatSettings(); + + // Apply settings + chatWindow->LoadChatSettings(); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-08 09:26:47
|
Revision: 4920 http://planeshift.svn.sourceforge.net/planeshift/?rev=4920&view=rev Author: weltall2 Date: 2009-12-08 09:26:41 +0000 (Tue, 08 Dec 2009) Log Message: ----------- updated to the new wrapper Modified Paths: -------------- trunk/src/client/gui/pawsspellbookwindow.cpp trunk/src/client/gui/pawsspellbookwindow.h Modified: trunk/src/client/gui/pawsspellbookwindow.cpp =================================================================== --- trunk/src/client/gui/pawsspellbookwindow.cpp 2009-12-08 09:19:10 UTC (rev 4919) +++ trunk/src/client/gui/pawsspellbookwindow.cpp 2009-12-08 09:26:41 UTC (rev 4920) @@ -107,7 +107,7 @@ descriptions_Hash.Empty(); images_Hash.Empty(); - psSpellBookMessage mesg(me, psengine->GetCelClient()->GetClientDR()->GetMsgStrings()); + psSpellBookMessage mesg(me, psengine->GetMsgStrings()); for ( size_t x = 0; x < mesg.spells.GetSize(); x++ ) { pawsListBoxRow* row = spellList->NewRow(); Modified: trunk/src/client/gui/pawsspellbookwindow.h =================================================================== --- trunk/src/client/gui/pawsspellbookwindow.h 2009-12-08 09:19:10 UTC (rev 4919) +++ trunk/src/client/gui/pawsspellbookwindow.h 2009-12-08 09:26:41 UTC (rev 4920) @@ -28,9 +28,8 @@ #include "net/cmdbase.h" #include "gui/pawscontrolwindow.h" -#include "pscelclient.h" -#include "psclientdr.h" + /** This handles all the details about how the spell book works. */ class pawsSpellBookWindow : public pawsControlledWindow, public psClientNetSubscriber This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-19 11:31:08
|
Revision: 5002 http://planeshift.svn.sourceforge.net/planeshift/?rev=5002&view=rev Author: weltall2 Date: 2009-12-19 11:31:02 +0000 (Sat, 19 Dec 2009) Log Message: ----------- condensed /me /my and name colouring code in a single function FormatMessage. This reduces code duplicates and adds to chat the /me /my and colour support. There are some types still not using it (like gm or tellself) Modified Paths: -------------- trunk/src/client/gui/chatwindow.cpp trunk/src/client/gui/chatwindow.h Modified: trunk/src/client/gui/chatwindow.cpp =================================================================== --- trunk/src/client/gui/chatwindow.cpp 2009-12-19 11:19:04 UTC (rev 5001) +++ trunk/src/client/gui/chatwindow.cpp 2009-12-19 11:31:02 UTC (rev 5002) @@ -1219,6 +1219,24 @@ return; } +void pawsChatWindow::FormatMessage(csString &sText, csString &sPerson, csString prependingText, csString &buff, bool &hasCharName) +{ + if ( sText.StartsWith("/me ") ) + buff.Format("%s %s", (const char *)sPerson, ((const char *)sText)+4); + else if ( sText.StartsWith("/my ") ) + buff.Format("%s's %s", (const char *)sPerson, ((const char *)sText)+4); + else + { + if(hasCharName) + buff.Format(REDCODE "%s" DEFAULTCODE " %s: %s", (const char *)sPerson, (const char *) PawsManager::GetSingleton().Translate(prependingText), + (const char *)sText); + else + buff.Format(GREENCODE "%s" DEFAULTCODE " %s: %s", (const char *)sPerson, (const char *) PawsManager::GetSingleton().Translate(prependingText), + (const char *)sText); + } +} + + void pawsChatWindow::HandleMessage(MsgEntry *me) { bool sendAway = false; @@ -1313,26 +1331,13 @@ { case CHAT_GROUP: { - // allows /group <person> /me sits down for a private action - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("says"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "says", buff, hasCharName); colour = settings.groupColor; break; } case CHAT_SHOUT: { - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("shouts"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "shouts", buff, hasCharName); colour = settings.shoutColor; break; } @@ -1345,60 +1350,28 @@ case CHAT_GUILD: { - // allows /guild <person> /me sits down for a private action - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("says"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "says", buff, hasCharName); colour = settings.guildColor; break; } case CHAT_ALLIANCE: { - // allows /alliance <person> /me sits down for a private action - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("says"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "says", buff, hasCharName); colour = settings.allianceColor; break; } case CHAT_AUCTION: { - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("auctions"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "auctions", buff, hasCharName); colour = settings.auctionColor; break; } case CHAT_SAY: { - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - { - if(hasCharName) - buff.Format(REDCODE "%s" DEFAULTCODE " %s: %s", (const char *)msg.sPerson, (const char *) PawsManager::GetSingleton().Translate("says"), - (const char *)msg.sText); - else - buff.Format(GREENCODE "%s" DEFAULTCODE " %s: %s", (const char *)msg.sPerson, (const char *) PawsManager::GetSingleton().Translate("says"), - (const char *)msg.sText); - } + FormatMessage(msg.sText,msg.sPerson, "says", buff, hasCharName); colour = settings.chatColor; break; } @@ -1465,13 +1438,7 @@ case CHAT_SERVER_TELL: // allows /tell <person> /me sits down for a private action - if ( msg.sText.StartsWith("/me ") ) - buff.Format("%s %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else if ( msg.sText.StartsWith("/my ") ) - buff.Format("%s's %s", (const char *)msg.sPerson, ((const char *)msg.sText)+4); - else - buff.Format("%s %s: %s", (const char *)msg.sPerson, (const char *)PawsManager::GetSingleton().Translate("tells you"), - (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "tells you", buff, hasCharName); colour = settings.tellColor; break; @@ -1554,8 +1521,8 @@ if(channelID == csArrayItemNotFound) return; channelID++; - buff.Format("[%zu: %s] %s: %s", channelID, channelIDs.GetKey(msg.channelID, "").GetData(), - (const char *)msg.sPerson, (const char *)msg.sText); + FormatMessage(msg.sText, msg.sPerson, "", buff, hasCharName); + buff.Insert(0, csString().Format("[%zu: %s] ", channelID, channelIDs.GetKey(msg.channelID, "").GetData())); colour = settings.channelColor; break; } @@ -1589,8 +1556,6 @@ } } - - if (!buff.IsEmpty()) { ChatOutput(buff.GetData(), colour, msg.iChatType, flashEnabled, hasCharName, channelID); Modified: trunk/src/client/gui/chatwindow.h =================================================================== --- trunk/src/client/gui/chatwindow.h 2009-12-19 11:19:04 UTC (rev 5001) +++ trunk/src/client/gui/chatwindow.h 2009-12-19 11:31:02 UTC (rev 5002) @@ -188,6 +188,16 @@ void HandleSystemMessage( MsgEntry* message ); + /** Takes as input a message and formats it with colours, /me and /my support. + * + * @param sText: The message main text. + * @param sPerson: The message sender. + * @param prependingText: the text which will be prepended before the message. This will get translated. + * @param buff: where the formatted message will be stored. + * @param hasCharName: Tells if the player character name is inside the message. + */ + void FormatMessage(csString &sText, csString &sPerson, csString prependingText, csString &buff, bool &hasCharName); + /// Sends the contents of the input text to the server. void SendChatLine(csString& inputText); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-24 10:33:38
|
Revision: 5040 http://planeshift.svn.sourceforge.net/planeshift/?rev=5040&view=rev Author: weltall2 Date: 2009-12-24 10:33:28 +0000 (Thu, 24 Dec 2009) Log Message: ----------- fixed crash when receiving a new main actor when being in a group Modified Paths: -------------- trunk/src/client/gui/pawsgroupwindow.cpp trunk/src/client/gui/pawsgroupwindow.h Modified: trunk/src/client/gui/pawsgroupwindow.cpp =================================================================== --- trunk/src/client/gui/pawsgroupwindow.cpp 2009-12-24 06:45:54 UTC (rev 5039) +++ trunk/src/client/gui/pawsgroupwindow.cpp 2009-12-24 10:33:28 UTC (rev 5040) @@ -52,7 +52,6 @@ pawsGroupWindow::pawsGroupWindow() { memberList = 0; - player = NULL; } pawsGroupWindow::~pawsGroupWindow() @@ -219,8 +218,7 @@ void pawsGroupWindow::Draw() { - if (!player) - player = psengine->GetCelClient()->GetMainPlayer(); + GEMClientActor* player = psengine->GetCelClient()->GetMainPlayer(); player->GetVitalMgr()->Predict( csGetTicks(),"Self" ); Modified: trunk/src/client/gui/pawsgroupwindow.h =================================================================== --- trunk/src/client/gui/pawsgroupwindow.h 2009-12-24 06:45:54 UTC (rev 5039) +++ trunk/src/client/gui/pawsgroupwindow.h 2009-12-24 10:33:28 UTC (rev 5040) @@ -56,8 +56,6 @@ void Draw(); void HandleGroup( csString& string ); void HandleMembers( csString& string ); - - GEMClientActor* player; pawsChatWindow* chatWindow; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-28 14:42:38
|
Revision: 5075 http://planeshift.svn.sourceforge.net/planeshift/?rev=5075&view=rev Author: weltall2 Date: 2009-12-28 14:42:21 +0000 (Mon, 28 Dec 2009) Log Message: ----------- fixed the char creation clean up Modified Paths: -------------- trunk/src/client/gui/pawscharcreatemain.cpp trunk/src/client/gui/pawscharcreatemain.h trunk/src/client/gui/pawspath.cpp trunk/src/client/gui/pawspath.h Modified: trunk/src/client/gui/pawscharcreatemain.cpp =================================================================== --- trunk/src/client/gui/pawscharcreatemain.cpp 2009-12-28 14:06:23 UTC (rev 5074) +++ trunk/src/client/gui/pawscharcreatemain.cpp 2009-12-28 14:42:21 UTC (rev 5075) @@ -944,8 +944,6 @@ { newWindow = "Paths"; } - - ResetAllWindows(); psNameCheckMessage msg(name->GetText()); msg.SendMessage(); Modified: trunk/src/client/gui/pawscharcreatemain.h =================================================================== --- trunk/src/client/gui/pawscharcreatemain.h 2009-12-28 14:06:23 UTC (rev 5074) +++ trunk/src/client/gui/pawscharcreatemain.h 2009-12-28 14:42:21 UTC (rev 5075) @@ -20,6 +20,7 @@ #define PAWS_CHARACTER_CREATION_MAIN #include "paws/pawswidget.h" +#include "paws/pawstextbox.h" #include "psengine.h" ////////////////////////////////////////////////////////////////////////////// Modified: trunk/src/client/gui/pawspath.cpp =================================================================== --- trunk/src/client/gui/pawspath.cpp 2009-12-28 14:06:23 UTC (rev 5074) +++ trunk/src/client/gui/pawspath.cpp 2009-12-28 14:42:21 UTC (rev 5075) @@ -38,6 +38,7 @@ pawsPathWindow::pawsPathWindow() { createManager = psengine->GetCharManager()->GetCreation(); + charCreateMain = (pawsCreationMain*) PawsManager::GetSingleton().FindWidget("CharCreateMain"); } pawsPathWindow::~pawsPathWindow() @@ -74,7 +75,7 @@ { ClearPath(); Hide(); - PawsManager::GetSingleton().FindWidget( "CharCreateMain" )->Show(); + charCreateMain->Show(); return true; } case UPLOAD_BUTTON: @@ -113,7 +114,7 @@ { chosenPath = i; - createManager->ClearChoices(); + charCreateMain->ResetAllWindows(); PathDefinition* path = createManager->GetPath(i); createManager->SetPath( path->name ); pawsMultiLineTextBox* label = (pawsMultiLineTextBox*) FindWidget("label_description"); Modified: trunk/src/client/gui/pawspath.h =================================================================== --- trunk/src/client/gui/pawspath.h 2009-12-28 14:06:23 UTC (rev 5074) +++ trunk/src/client/gui/pawspath.h 2009-12-28 14:42:21 UTC (rev 5075) @@ -21,6 +21,7 @@ #include "paws/pawswidget.h" #include "psclientchar.h" +#include "pawscharcreatemain.h" class pawsPathWindow : public pawsWidget { @@ -34,6 +35,7 @@ int chosenPath; psCreationManager* createManager; + pawsCreationMain* charCreateMain; void SetPath(int i); void ClearPath(void); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-28 14:45:57
|
Revision: 5076 http://planeshift.svn.sourceforge.net/planeshift/?rev=5076&view=rev Author: weltall2 Date: 2009-12-28 14:45:49 +0000 (Mon, 28 Dec 2009) Log Message: ----------- additional translations Modified Paths: -------------- trunk/src/client/gui/pawsloginwindow.cpp trunk/src/client/gui/pawspath.cpp Modified: trunk/src/client/gui/pawsloginwindow.cpp =================================================================== --- trunk/src/client/gui/pawsloginwindow.cpp 2009-12-28 14:42:21 UTC (rev 5075) +++ trunk/src/client/gui/pawsloginwindow.cpp 2009-12-28 14:45:49 UTC (rev 5076) @@ -508,27 +508,27 @@ pingStr.Clear(); break; case psServerPinger::FAILED: - pingStr = "Failed"; + pingStr = PawsManager::GetSingleton().Translate("Failed"); break; case psServerPinger::FULL: - pingStr = "Full"; + pingStr = PawsManager::GetSingleton().Translate("Full"); break; case psServerPinger::READY: if (loss == 100) - pingStr = "Failed"; + pingStr = PawsManager::GetSingleton().Translate("Failed"); else if (loss) pingStr.Format("%d %d%%",ping,loss); else pingStr.Format("%d",ping); break; case psServerPinger::LOCKED: - pingStr = "Locked"; + pingStr = PawsManager::GetSingleton().Translate("Locked"); break; case psServerPinger::WAIT: - pingStr = "Wait"; + pingStr = PawsManager::GetSingleton().Translate("Wait"); break; default: - pingStr = "Error"; + pingStr = PawsManager::GetSingleton().Translate("Error"); break; } Modified: trunk/src/client/gui/pawspath.cpp =================================================================== --- trunk/src/client/gui/pawspath.cpp 2009-12-28 14:42:21 UTC (rev 5075) +++ trunk/src/client/gui/pawspath.cpp 2009-12-28 14:45:49 UTC (rev 5076) @@ -82,13 +82,14 @@ { if (chosenPath == NO_CHOSEN_PATH) { - psSystemMessage error(0,MSG_ERROR,"Please select a path"); + psSystemMessage error(0,MSG_ERROR, + PawsManager::GetSingleton().Translate("Please select a path")); error.FireEvent(); } else { - PawsManager::GetSingleton().CreateYesNoBox( - "Are you sure you want to upload your character?", + PawsManager::GetSingleton().CreateYesNoBox( + PawsManager::GetSingleton().Translate("Are you sure you want to upload your character?"), this ); } return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-28 15:01:58
|
Revision: 5080 http://planeshift.svn.sourceforge.net/planeshift/?rev=5080&view=rev Author: weltall2 Date: 2009-12-28 15:01:50 +0000 (Mon, 28 Dec 2009) Log Message: ----------- additional translations Modified Paths: -------------- trunk/src/client/gui/pawslife.cpp trunk/src/client/gui/pawssummary.cpp Modified: trunk/src/client/gui/pawslife.cpp =================================================================== --- trunk/src/client/gui/pawslife.cpp 2009-12-28 14:58:27 UTC (rev 5079) +++ trunk/src/client/gui/pawslife.cpp 2009-12-28 15:01:50 UTC (rev 5080) @@ -135,7 +135,7 @@ { if (createManager->GetNumberOfLifeChoices() == 0) { - psSystemMessage error(0,MSG_ERROR,"Please choose life event(s)"); + psSystemMessage error(0,MSG_ERROR,PawsManager::GetSingleton().Translate("Please choose life event(s)")); error.FireEvent(); return true; } @@ -175,7 +175,7 @@ pawsTextBox* text = (pawsTextBox*)row->GetColumn(0); text->SetText( createManager->lifeEventData[x].name ); row->SetID( createManager->lifeEventData[x].id ); - text->FormatToolTip("CP Cost: %d\n", createManager->lifeEventData[x].cpCost ); + text->FormatToolTip("%s %d\n", PawsManager::GetSingleton().Translate("CP Cost:").GetData(), createManager->lifeEventData[x].cpCost ); } } UpdateCP(); Modified: trunk/src/client/gui/pawssummary.cpp =================================================================== --- trunk/src/client/gui/pawssummary.cpp 2009-12-28 14:58:27 UTC (rev 5079) +++ trunk/src/client/gui/pawssummary.cpp 2009-12-28 15:01:50 UTC (rev 5080) @@ -135,7 +135,7 @@ pawsWidget::Show(); redoVerification = true; requestSent = false; - serverStatus->SetText( "Please wait for verification...."); + serverStatus->SetText(PawsManager::GetSingleton().Translate("Please wait for verification....")); } void pawsSummaryWindow::Draw() @@ -146,7 +146,7 @@ { if ( createManager->GetCurrentCP() < 0 ) { - PawsManager::GetSingleton().CreateWarningBox( "You cannot have a negative CP value." ); + PawsManager::GetSingleton().CreateWarningBox(PawsManager::GetSingleton().Translate("You cannot have a negative CP value.")); PawsManager::GetSingleton().FindWidget("LifeEvents")->Show(); PawsManager::GetSingleton().FindWidget("Summary")->Hide(); return; @@ -189,7 +189,7 @@ } } - serverStatus->SetText( "Verification complete"); + serverStatus->SetText(PawsManager::GetSingleton().Translate("Verification complete")); } bool pawsSummaryWindow::OnButtonPressed( int mouseButton, int keyModifier, pawsWidget* widget ) @@ -219,13 +219,13 @@ } case UPLOAD_BUTTON: { - csString cpwarning = "Are you sure you want to upload? "; + csString cpwarning = PawsManager::GetSingleton().Translate("Are you sure you want to upload? "); // Also show CP left if more than zero if ( createManager->GetCurrentCP() > 0 ) { - cpwarning += "You have "; + cpwarning += PawsManager::GetSingleton().Translate("You have "); cpwarning += createManager->GetCurrentCP(); - cpwarning += " CP left."; + cpwarning += PawsManager::GetSingleton().Translate(" CP left."); } PawsManager::GetSingleton().CreateYesNoBox( cpwarning, this ); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |