Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client/paws chatwindow.cpp,1.32,1.33 pawsbutton.cpp,1.10,1.11 pawsconfigkeys.cpp,1.4,1.5 pawsconfigwindow.cpp,1.3,1.4 pawsconfigwindow.h,1.2,1.3 pawscontrolwindow.cpp,1.6,1.7 pawsinfowindow.cpp,1.16,1.17 pawslistbox.cpp,1.7,1.8 pawsloginwindow.cpp,1.5,1.6 pawsmenu.cpp,1.3,1.4 pawspetitiongmwindow.cpp,1.3,1.4 pawspetitionwindow.cpp,1.4,1.5 pawssplashwindow.cpp,1.3,1.4 pawstextbox.cpp,1.20,1.21 pawstree.cpp,1.4,1.5 pawswidget.cpp,1.35,1.36 pawswidget.h,1.30,1.31 pspawsmanager.cpp,1.36,1.37 pspawsmanager.h,1.13,1.14
Update of /cvsroot/planeshift/planeshift/src/client/paws
In directory sc8-pr-cvs1:/tmp/cvs-serv17027/src/client/paws
Modified Files:
chatwindow.cpp pawsbutton.cpp pawsconfigkeys.cpp
pawsconfigwindow.cpp pawsconfigwindow.h pawscontrolwindow.cpp
pawsinfowindow.cpp pawslistbox.cpp pawsloginwindow.cpp
pawsmenu.cpp pawspetitiongmwindow.cpp pawspetitionwindow.cpp
pawssplashwindow.cpp pawstextbox.cpp pawstree.cpp
pawswidget.cpp pawswidget.h pspawsmanager.cpp pspawsmanager.h
Log Message:
A lot of source files across the client began to use psLocalization
Index: chatwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/chatwindow.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** chatwindow.cpp 20 Sep 2003 07:40:08 -0000 1.32
--- chatwindow.cpp 20 Sep 2003 14:30:18 -0000 1.33
***************
*** 216,220 ****
{
delete[] buff;
! return "Unkown command";
}
--- 216,220 ----
{
delete[] buff;
! return windowManager->Translate("Unknown command");
}
***************
*** 284,288 ****
case CHAT_GROUP:
{
! cs_snprintf(buff,1024,"%s tells group: %s\n",
(const char *)msg.sPerson,(const char *)msg.sText);
colour = groupColour;
--- 284,288 ----
case CHAT_GROUP:
{
! cs_snprintf(buff,1024,windowManager->Translate("%s tells group: %s"),
(const char *)msg.sPerson,(const char *)msg.sText);
colour = groupColour;
***************
*** 291,295 ****
case CHAT_SHOUT:
{
! cs_snprintf(buff,1024,"%s shouts: %s",
(const char *)msg.sPerson,(const char *)msg.sText);
colour = shoutColour;
--- 291,295 ----
case CHAT_SHOUT:
{
! cs_snprintf(buff,1024,windowManager->Translate("%s shouts: %s"),
(const char *)msg.sPerson,(const char *)msg.sText);
colour = shoutColour;
***************
*** 298,302 ****
case CHAT_GUILD:
{
! cs_snprintf(buff,1024,"%s from %s: %s",pType,
(const char *)msg.sPerson,(const char *)msg.sText);
colour = guildColour;
--- 298,302 ----
case CHAT_GUILD:
{
! cs_snprintf(buff,1024,windowManager->Translate("%s from %s: %s"),pType,
(const char *)msg.sPerson,(const char *)msg.sText);
colour = guildColour;
***************
*** 305,309 ****
case CHAT_AUCTION:
{
! cs_snprintf(buff,1024,"%s from %s: %s",pType,
(const char *)msg.sPerson,(const char *)msg.sText);
colour = auctionColour;
--- 305,309 ----
case CHAT_AUCTION:
{
! cs_snprintf(buff,1024,windowManager->Translate("%s from %s: %s"),pType,
(const char *)msg.sPerson,(const char *)msg.sText);
colour = auctionColour;
***************
*** 313,317 ****
case CHAT_SAY:
{
! cs_snprintf(buff,1024,"%s says: %s",
(const char *)msg.sPerson,(const char *)msg.sText);
colour = chatColour;
--- 313,317 ----
case CHAT_SAY:
{
! cs_snprintf(buff,1024,windowManager->Translate("%s says: %s"),
(const char *)msg.sPerson,(const char *)msg.sText);
colour = chatColour;
***************
*** 351,357 ****
case CHAT_TELLSELF:
{
! cs_snprintf(buff,1024,"You tell %s: %s", (const char *)msg.sPerson,(const char *)msg.sText);
if (IsIgnored((const char *)msg.sPerson))
! systemText->AddMessage("You are ignoring all replies from that person.");
colour = chatColour;
break;
--- 351,357 ----
case CHAT_TELLSELF:
{
! cs_snprintf(buff,1024,windowManager->Translate("You tell %s: %s"), (const char *)msg.sPerson,(const char *)msg.sText);
if (IsIgnored((const char *)msg.sPerson))
! systemText->AddMessage(windowManager->Translate("You are ignoring all replies from that person."));
colour = chatColour;
break;
***************
*** 360,364 ****
default:
{
! cs_snprintf(buff,1024,"Unknown Chat Type: %d",msg.iChatType);
colour = chatColour;
break;
--- 360,364 ----
default:
{
! cs_snprintf(buff,1024,windowManager->Translate("Unknown Chat Type: %d"),msg.iChatType);
colour = chatColour;
break;
***************
*** 403,427 ****
{
cmdsource->Subscribe("/say",
! "Talk to the people in your immediate vicinity.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/shout",
! "Talk to people in your sector.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/tell",
! "Talk to someone privately.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/guild",
! "Talk to everyone in your guild privately.",
CmdHandler::VISIBLE_TO_USER,this);
! cmdsource->Subscribe("/group","Talk to your group privately.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/me",
! "Perform an action see by people in your vicinity.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/auction",
! "Put an item up for sale or offer to buy something.",
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/report",
! "Makes the server log what target player is saying.",
CmdHandler::VISIBLE_TO_USER,this);
}
--- 403,428 ----
{
cmdsource->Subscribe("/say",
! windowManager->Translate("Talk to the people in your immediate vicinity."),
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/shout",
! windowManager->Translate("Talk to people in your sector."),
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/tell",
! windowManager->Translate("Talk to someone privately."),
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/guild",
! windowManager->Translate("Talk to everyone in your guild privately."),
CmdHandler::VISIBLE_TO_USER,this);
! cmdsource->Subscribe("/group",windowManager->Translate("Talk to your group privately."),
CmdHandler::VISIBLE_TO_USER,this);
+
cmdsource->Subscribe("/me",
! windowManager->Translate("Perform an action see by people in your vicinity."),
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/auction",
! windowManager->Translate("Put an item up for sale or offer to buy something."),
CmdHandler::VISIBLE_TO_USER,this);
cmdsource->Subscribe("/report",
! windowManager->Translate("Makes the server log what target player is saying."),
CmdHandler::VISIBLE_TO_USER,this);
}
***************
*** 740,745 ****
break;
}
!
! list.Insert(0,"Ambiguous command:");
systemText->AddMessage(list);
psString complete;
--- 741,746 ----
break;
}
!
! list.Insert(0,windowManager->Translate("Ambiguous command:"));
systemText->AddMessage(list);
psString complete;
***************
*** 818,822 ****
if (IgnoredList.Length()<1)
{
! systemText->AddMessage("You have ignored no-one.");
return;
}
--- 819,823 ----
if (IgnoredList.Length()<1)
{
! systemText->AddMessage(windowManager->Translate("You have ignored no-one."));
return;
}
***************
*** 824,828 ****
csString temp(IgnoredList[0]);
! systemText->AddMessage("You have ignored the following players:");
for(int i=1;i<limit;i++)
{
--- 825,829 ----
csString temp(IgnoredList[0]);
! systemText->AddMessage(windowManager->Translate("You have ignored the following players:"));
for(int i=1;i<limit;i++)
{
***************
*** 839,847 ****
if (!strcmp(name, psengine->GetCelClient()->GetMainActor()->GetName()))
{
! systemText->AddMessage("You can not ignore yourself.");
return;
}
char temp[100];
! cs_snprintf(temp, 100,"You will now ignore %s.", name);
systemText->AddMessage(temp);
IgnoredList.InsertSorted(name);
--- 840,848 ----
if (!strcmp(name, psengine->GetCelClient()->GetMainActor()->GetName()))
{
! systemText->AddMessage(windowManager->Translate("You can not ignore yourself."));
return;
}
char temp[100];
! cs_snprintf(temp, 100,windowManager->Translate("You will now ignore %s."), name);
systemText->AddMessage(temp);
IgnoredList.InsertSorted(name);
***************
*** 851,855 ****
{
char temp[100];
! cs_snprintf(temp, 100,"You will no longer ignore %s.", name);
systemText->AddMessage(temp);
IgnoredList.Delete((char*)name);
--- 852,856 ----
{
char temp[100];
! cs_snprintf(temp, 100,windowManager->Translate("You will no longer ignore %s."), name);
systemText->AddMessage(temp);
IgnoredList.Delete((char*)name);
Index: pawsbutton.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsbutton.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pawsbutton.cpp 5 Aug 2003 20:56:33 -0000 1.10
--- pawsbutton.cpp 20 Sep 2003 14:30:18 -0000 1.11
***************
*** 85,89 ****
if ( buttonLabelNode )
{
! buttonLabel = buttonLabelNode->GetAttributeValue("text");
}
return true;
--- 85,89 ----
if ( buttonLabelNode )
{
! buttonLabel = windowManager->Translate(buttonLabelNode->GetAttributeValue("text"));
}
return true;
Index: pawsconfigkeys.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsconfigkeys.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawsconfigkeys.cpp 19 Sep 2003 01:12:36 -0000 1.4
--- pawsconfigkeys.cpp 20 Sep 2003 14:30:18 -0000 1.5
***************
*** 467,471 ****
AddChild(tree);
! if ( ! tree->LoadFromFile("/this/data/configkeys.xml"))
return false;
--- 467,471 ----
AddChild(tree);
! if ( ! tree->LoadFromFile("data/configkeys.xml"))
return false;
Index: pawsconfigwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsconfigwindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawsconfigwindow.cpp 20 Sep 2003 03:31:52 -0000 1.3
--- pawsconfigwindow.cpp 20 Sep 2003 14:30:18 -0000 1.4
***************
*** 29,32 ****
--- 29,35 ----
#include "../../common/util/log.h"
+ // CLIENT INCLUDES
+ #include "localization.h"
+
// PAWS INCLUDES
#include "pawsconfigwindow.h"
***************
*** 35,39 ****
! #define TREE_FILE_NAME "/this/data/configtree.xml"
// config window layout:
--- 38,42 ----
! #define TREE_FILE_NAME "data/configtree.xml"
// config window layout:
***************
*** 59,110 ****
}
- bool pawsConfigWindow::LoadTree()
- {
- csRef<iVFS> vfs;
- csRef<iDocumentSystem> xml;
- csRef<iDataBuffer> buff;
- csRef<iDocument> doc;
-
- vfs = CS_QUERY_REGISTRY( object_reg, iVFS );
- assert(vfs);
- buff = vfs->ReadFile(TREE_FILE_NAME);
- if (buff == NULL)
- {
- Error2("Could not find file %s", TREE_FILE_NAME);
- return false;
- }
- xml = csPtr<iDocumentSystem>(new csTinyDocumentSystem);
- doc = xml->CreateDocument();
- assert(doc);
- const char* error = doc->Parse( buff );
- if ( error )
- {
- Error3("Parse error in %s: %s", TREE_FILE_NAME, error);
- return false;
- }
- csRef<iDocumentNode> root = doc->GetRoot();
- if (root == NULL)
- {
- Error1("No root in XML");
- return false;
- }
- csRef<iDocumentNode> topNode = root->GetNode("widget_description");
- if (topNode == NULL)
- {
- Error1("No <widget_description> in XML");
- return false;
- }
- csRef<iDocumentNode> widgetNode = topNode->GetNode("widget");
- if (widgetNode == NULL)
- {
- Error1("No <widget> in <widget_description>");
- return false;
- }
- if ( ! sectionTree->Load(widgetNode))
- return false;
-
- return true;
- }
-
bool pawsConfigWindow::PostSetup()
{
--- 62,65 ----
***************
*** 125,129 ****
sectionTree->Show();
! if (!LoadTree())
return false;
AddChild(sectionTree);
--- 80,84 ----
sectionTree->Show();
! if ( ! sectionTree->LoadFromFile(TREE_FILE_NAME))
return false;
AddChild(sectionTree);
Index: pawsconfigwindow.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsconfigwindow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pawsconfigwindow.h 27 Jul 2003 17:37:49 -0000 1.2
--- pawsconfigwindow.h 20 Sep 2003 14:30:18 -0000 1.3
***************
*** 111,116 ****
private:
- bool LoadTree();
- // Loads the tree on the left. Return true = success
pawsConfigSectionWindow * FindSectionWindow(const csString & sectName);
// Finds section window (in the 'sectWnds' list) for section 'sectName'
--- 111,114 ----
Index: pawscontrolwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawscontrolwindow.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pawscontrolwindow.cpp 18 Aug 2003 22:23:27 -0000 1.6
--- pawscontrolwindow.cpp 20 Sep 2003 14:30:18 -0000 1.7
***************
*** 108,112 ****
confirm->SetNotify( this );
confirm->MoveTo( (graphics2D->GetWidth()-512)/2 , (graphics2D->GetHeight()-256)/2);
! confirm->SetText( QUIT_MESSAGE_TEXT );
confirm->Show();
windowManager->SetModalWidget( confirm );
--- 108,112 ----
confirm->SetNotify( this );
confirm->MoveTo( (graphics2D->GetWidth()-512)/2 , (graphics2D->GetHeight()-256)/2);
! confirm->SetText( windowManager->Translate(QUIT_MESSAGE_TEXT) );
confirm->Show();
windowManager->SetModalWidget( confirm );
Index: pawsinfowindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsinfowindow.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pawsinfowindow.cpp 15 Sep 2003 19:33:27 -0000 1.16
--- pawsinfowindow.cpp 20 Sep 2003 14:30:18 -0000 1.17
***************
*** 189,193 ****
}
! sprintf(buf, "%d o'clock(%s)", newTime, time );
timeOfDay->SetText( buf );
}
--- 189,193 ----
}
! sprintf(buf, "%d %s(%s)", newTime, windowManager->Translate("o'clock").GetData(), time );
timeOfDay->SetText( buf );
}
Index: pawslistbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawslistbox.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawslistbox.cpp 5 Aug 2003 21:57:06 -0000 1.7
--- pawslistbox.cpp 20 Sep 2003 14:30:18 -0000 1.8
***************
*** 79,83 ****
columnDef[x].width = GetActualWidth(colNode->GetAttributeValueAsInt( "width" ));
columnDef[x].height = columnHeight;
! columnDef[x].name = colNode->GetAttributeValue( "name" );
columnDef[x].visible = true; // Default visible
csRef<iDocumentAttribute> atr = colNode->GetAttribute("visible");
--- 79,83 ----
columnDef[x].width = GetActualWidth(colNode->GetAttributeValueAsInt( "width" ));
columnDef[x].height = columnHeight;
! columnDef[x].name = windowManager->Translate(colNode->GetAttributeValue( "name" ));
columnDef[x].visible = true; // Default visible
csRef<iDocumentAttribute> atr = colNode->GetAttribute("visible");
Index: pawsloginwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsloginwindow.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pawsloginwindow.cpp 12 Aug 2003 21:53:23 -0000 1.5
--- pawsloginwindow.cpp 20 Sep 2003 14:30:18 -0000 1.6
***************
*** 54,58 ****
login->SetText (cfg->GetStr("Planeshift.Connection.User", ""));
passwd->SetText(cfg->GetStr("Planeshift.Connection.Password", ""));
-
return true;
}
--- 54,57 ----
***************
*** 98,102 ****
csRef<iPSEngine> psengine = CS_QUERY_REGISTRY (WindowManager()->GetObjectRegistry(), iPSEngine);
!
if ( !psengine->GetNetManager()->Connect( server->GetText(), standardPort ) )
{
--- 97,101 ----
csRef<iPSEngine> psengine = CS_QUERY_REGISTRY (WindowManager()->GetObjectRegistry(), iPSEngine);
!
if ( !psengine->GetNetManager()->Connect( server->GetText(), standardPort ) )
{
***************
*** 106,110 ****
Ok->MoveTo( (graphics2D->GetWidth() - GetActualWidth(512) )/2 ,
(graphics2D->GetHeight() - GetActualHeight(256))/2);
! Ok->SetText( "Cannot connect to server" );
Ok->Show();
windowManager->SetModalWidget( Ok );
--- 105,109 ----
Ok->MoveTo( (graphics2D->GetWidth() - GetActualWidth(512) )/2 ,
(graphics2D->GetHeight() - GetActualHeight(256))/2);
! Ok->SetText( windowManager->Translate("Cannot connect to server") );
Ok->Show();
windowManager->SetModalWidget( Ok );
***************
*** 118,124 ****
/// Set up the picker window here.
if ( psengine->GetPAWS()->FindWidget("CharPickerWindow") == 0 )
! psengine->GetPAWS()->LoadWidget("/this/data/charpick.xml");
! psengine->GetNetManager()->Authenticate( login->GetText(), passwd->GetText(), iNetManager::EXISTING_PLAYER );
connecting = true;
}
--- 117,125 ----
/// Set up the picker window here.
if ( psengine->GetPAWS()->FindWidget("CharPickerWindow") == 0 )
! psengine->GetPAWS()->LoadWidget("data/charpick.xml");
! psengine->GetNetManager()->Authenticate( login->GetText(), passwd->GetText(), iNetManager::EXISTING_PLAYER );
! Hide();
!
connecting = true;
}
***************
*** 139,143 ****
Ok->MoveTo( (graphics2D->GetWidth() - GetActualWidth(512) )/2 ,
(graphics2D->GetHeight() - GetActualHeight(256))/2);
! Ok->SetText( "No server running at the moment" );
Ok->Show();
windowManager->SetModalWidget( Ok );
--- 140,144 ----
Ok->MoveTo( (graphics2D->GetWidth() - GetActualWidth(512) )/2 ,
(graphics2D->GetHeight() - GetActualHeight(256))/2);
! Ok->SetText( windowManager->Translate("No server running at the moment") );
Ok->Show();
windowManager->SetModalWidget( Ok );
***************
*** 146,150 ****
connecting = false;
}
-
}
--- 147,150 ----
Index: pawsmenu.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawsmenu.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawsmenu.cpp 17 Sep 2003 21:46:05 -0000 1.3
--- pawsmenu.cpp 20 Sep 2003 14:30:18 -0000 1.4
***************
*** 23,27 ****
// COMMON INCLUDES
! #include "../../common/util/log.h"
// PAWS INCLUDES
--- 23,30 ----
// COMMON INCLUDES
! #include "util/log.h"
!
! // CLIENT INCLUDES
! #include "localization.h"
// PAWS INCLUDES
***************
*** 80,84 ****
if (attr != NULL)
{
! label->SetText(attr->GetValue());
label->SetSizeByText();
}
--- 83,87 ----
if (attr != NULL)
{
! label->SetText(windowManager->Translate(attr->GetValue()));
label->SetSizeByText();
}
***************
*** 423,427 ****
label->SetName("label");
label->MoveTo(screenFrame.xmin+BORDER_SIZE, screenFrame.ymin+BORDER_SIZE);
! label->SetText(node->GetAttributeValue("label"));
label->SetSizeByText();
label->Show();
--- 426,430 ----
label->SetName("label");
label->MoveTo(screenFrame.xmin+BORDER_SIZE, screenFrame.ymin+BORDER_SIZE);
! label->SetText(windowManager->Translate(node->GetAttributeValue("label")));
label->SetSizeByText();
label->Show();
***************
*** 562,565 ****
--- 565,569 ----
csRef<iDocument> doc;
csRef<iDocumentNode> submenuNode;
+ csString fileName;
if (action.name == "submenu")
***************
*** 577,584 ****
}
! doc = ParseFile(windowManager->GetObjectRegistry(), action.params[0]);
if (doc == NULL)
{
! Error2("Parsing of file %s failed", action.params[0].GetData());
return;
}
--- 581,589 ----
}
! fileName = windowManager->GetLocalization()->FindLocalizedFile(action.params[0]);
! doc = ParseFile(windowManager->GetObjectRegistry(), fileName);
if (doc == NULL)
{
! Error2("Parsing of file %s failed", fileName.GetData());
return;
}
***************
*** 596,600 ****
if ( ! newMenu->Load(submenuNode) )
{
! Error2("Could not load menu %s", action.params[0].GetData());
delete newMenu;
return;
--- 601,605 ----
if ( ! newMenu->Load(submenuNode) )
{
! Error2("Could not load menu %s", fileName.GetData());
delete newMenu;
return;
Index: pawspetitiongmwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawspetitiongmwindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawspetitiongmwindow.cpp 23 Jul 2003 22:11:43 -0000 1.3
--- pawspetitiongmwindow.cpp 20 Sep 2003 14:30:18 -0000 1.4
***************
*** 117,121 ****
case SEC_LEVEL4:
{
! cmdsource->Subscribe("/petition_manage", "Manage petitions to help users.",CmdHandler::VISIBLE_TO_USER,this);
}
break;
--- 117,122 ----
case SEC_LEVEL4:
{
! cmdsource->Subscribe("/petition_manage", windowManager->Translate("Manage petitions to help users."),
! CmdHandler::VISIBLE_TO_USER,this);
}
break;
***************
*** 154,158 ****
csString report;
! report.Format("The selected petition was %s", (message.msgType == PETITION_CANCEL ? "cancelled.":"closed."));
psSystemMessage confirm(0,MSG_INFO,report.GetData());
msgqueue->Publish(confirm.msg);
--- 155,160 ----
csString report;
! report.Format(windowManager->Translate("The selected petition was %s").GetData(),
! windowManager->Translate(message.msgType == PETITION_CANCEL ? "cancelled.":"closed.").GetData());
psSystemMessage confirm(0,MSG_INFO,report.GetData());
msgqueue->Publish(confirm.msg);
***************
*** 183,187 ****
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,"You have been assigned to the selected petition.");
msgqueue->Publish(confirm.msg);
--- 185,189 ----
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,windowManager->Translate("You have been assigned to the selected petition."));
msgqueue->Publish(confirm.msg);
***************
*** 212,216 ****
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,"The selected petition has been escalated.");
msgqueue->Publish(confirm.msg);
--- 214,218 ----
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,windowManager->Translate("The selected petition has been escalated."));
msgqueue->Publish(confirm.msg);
***************
*** 227,231 ****
petitionList->NewRow(0);
! SetText(0, PGMCOL_PETITION, "Currently, there are no petitions.");
return;
}
--- 229,233 ----
petitionList->NewRow(0);
! SetText(0, PGMCOL_PETITION, windowManager->Translate("Currently, there are no petitions."));
return;
}
***************
*** 235,239 ****
{
petitionList->NewRow(0);
! SetText(0, PGMCOL_PETITION, "Currently, there are no petitions.");
return;
}
--- 237,241 ----
{
petitionList->NewRow(0);
! SetText(0, PGMCOL_PETITION, windowManager->Translate("Currently, there are no petitions."));
return;
}
***************
*** 265,269 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to view it.");
msgqueue->Publish(error.msg);
return true;
--- 267,271 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it."));
msgqueue->Publish(error.msg);
return true;
***************
*** 292,296 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to cancel it.");
msgqueue->Publish(error.msg);
return true;
--- 294,298 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to cancel it."));
msgqueue->Publish(error.msg);
return true;
***************
*** 311,315 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to assign yourself.");
msgqueue->Publish(error.msg);
return true;
--- 313,317 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to assign yourself."));
msgqueue->Publish(error.msg);
return true;
***************
*** 330,334 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to close it.");
msgqueue->Publish(error.msg);
return true;
--- 332,336 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to close it."));
msgqueue->Publish(error.msg);
return true;
***************
*** 354,358 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to escalate it.");
msgqueue->Publish(error.msg);
return true;
--- 356,360 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to escalate it."));
msgqueue->Publish(error.msg);
return true;
Index: pawspetitionwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawspetitionwindow.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawspetitionwindow.cpp 24 Jul 2003 03:00:15 -0000 1.4
--- pawspetitionwindow.cpp 20 Sep 2003 14:30:18 -0000 1.5
***************
*** 78,82 ****
// Subscribe certain petition commands with this widget
! cmdsource->Subscribe("/petition_list", "List all of the petitions you have submitted.",CmdHandler::VISIBLE_TO_USER,this);
// Grab the pointer to the petition listbox:
--- 78,83 ----
// Subscribe certain petition commands with this widget
! cmdsource->Subscribe("/petition_list", windowManager->Translate("List all of the petitions you have submitted."),
! CmdHandler::VISIBLE_TO_USER,this);
// Grab the pointer to the petition listbox:
***************
*** 137,141 ****
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,"The selected petition was cancelled.");
msgqueue->Publish(confirm.msg);
--- 138,142 ----
AddPetitions(petitionMessage.petitions);
! psSystemMessage confirm(0,MSG_INFO,windowManager->Translate("The selected petition was cancelled."));
msgqueue->Publish(confirm.msg);
***************
*** 152,156 ****
petitionList->NewRow(0);
! SetText(0, PCOL_PETITION, "You currently have no petitions.");
return;
}
--- 153,157 ----
petitionList->NewRow(0);
! SetText(0, PCOL_PETITION, windowManager->Translate("You currently have no petitions."));
return;
}
***************
*** 160,164 ****
{
petitionList->NewRow(0);
! SetText(0, PCOL_PETITION, "You currently have no petitions.");
return;
}
--- 161,165 ----
{
petitionList->NewRow(0);
! SetText(0, PCOL_PETITION, windowManager->Translate("You currently have no petitions."));
return;
}
***************
*** 190,194 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to view it.");
msgqueue->Publish(error.msg);
return true;
--- 191,195 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to view it."));
msgqueue->Publish(error.msg);
return true;
***************
*** 218,222 ****
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,"You must select a petition from the list in order to cancel it.");
msgqueue->Publish(error.msg);
return true;
--- 219,223 ----
if(sel < 0)
{
! psSystemMessage error(0,MSG_INFO,windowManager->Translate("You must select a petition from the list in order to cancel it."));
msgqueue->Publish(error.msg);
return true;
***************
*** 315,319 ****
if(!textBox)
return;
! textBox->SetText("Petition Info");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 316,320 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Petition Info"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 328,332 ****
if(!textBox)
return;
! textBox->SetText("Status:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 329,333 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Status:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 352,356 ****
if(!textBox)
return;
! textBox->SetText("Assigned GM:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 353,357 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Assigned GM:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 375,379 ****
if(!textBox)
return;
! textBox->SetText("Petition submitted:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 376,380 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Petition submitted:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 396,400 ****
if(!textBox)
return;
! textBox->SetText("Player name:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 397,401 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Player name:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 417,421 ****
if(!textBox)
return;
! textBox->SetText("Escalation Level:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 418,422 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Escalation Level:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
***************
*** 441,445 ****
if(!textBox)
return;
! textBox->SetText("Petition Text:");
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
--- 442,446 ----
if(!textBox)
return;
! textBox->SetText(windowManager->Translate("Petition Text:"));
textBox->SetSizeByText();
textBox->SetColour(0xffffff);
Index: pawssplashwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawssplashwindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pawssplashwindow.cpp 18 Aug 2003 22:23:27 -0000 1.3
--- pawssplashwindow.cpp 20 Sep 2003 14:30:18 -0000 1.4
***************
*** 71,75 ****
if ( bar->IsDone() )
{
! WindowManager()->LoadWidget("/this/data/loginwindow.xml");
Hide();
}
--- 71,75 ----
if ( bar->IsDone() )
{
! WindowManager()->LoadWidget("data/loginwindow.xml");
Hide();
}
Index: pawstextbox.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawstextbox.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** pawstextbox.cpp 7 Sep 2003 23:09:54 -0000 1.20
--- pawstextbox.cpp 20 Sep 2003 14:30:18 -0000 1.21
***************
*** 79,83 ****
if ( textAttribute )
{
! text = textAttribute->GetValue();
}
}
--- 79,83 ----
if ( textAttribute )
{
! text = windowManager->Translate(textAttribute->GetValue());
}
}
***************
*** 514,518 ****
if ( stringAttribute )
{
! SetText( stringAttribute->GetValue() );
}
--- 514,518 ----
if ( stringAttribute )
{
! SetText( windowManager->Translate(stringAttribute->GetValue()) );
}
Index: pawstree.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawstree.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pawstree.cpp 20 Sep 2003 03:31:52 -0000 1.4
--- pawstree.cpp 20 Sep 2003 14:30:18 -0000 1.5
***************
*** 1449,1453 ****
if (labelAttr != NULL)
{
! labelValue = labelAttr->GetValue();
mode |= showLabel;
}
--- 1449,1453 ----
if (labelAttr != NULL)
{
! labelValue = windowManager->Translate(labelAttr->GetValue());
mode |= showLabel;
}
Index: pawswidget.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawswidget.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** pawswidget.cpp 15 Sep 2003 10:11:12 -0000 1.35
--- pawswidget.cpp 20 Sep 2003 14:30:18 -0000 1.36
***************
*** 25,28 ****
--- 25,30 ----
#include <iutil/evdefs.h>
+ #include "localization.h"
+
#include "pawswidget.h"
#include "pspawsmanager.h"
***************
*** 1144,1148 ****
csRef<iDocumentNode> root, topNode, widgetNode;
! doc = ParseFile(windowManager->GetObjectRegistry(), fileName);
if (doc == NULL)
return false;
--- 1146,1151 ----
csRef<iDocumentNode> root, topNode, widgetNode;
! doc = ParseFile(windowManager->GetObjectRegistry(),
! windowManager->GetLocalization()->FindLocalizedFile(fileName));
if (doc == NULL)
return false;
Index: pawswidget.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pawswidget.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** pawswidget.h 15 Sep 2003 10:11:12 -0000 1.30
--- pawswidget.h 20 Sep 2003 14:30:18 -0000 1.31
***************
*** 132,135 ****
--- 132,136 ----
/** Parses XML file 'fileName', finds first widget tag and Load()s itself from this tag.
+ * 'fileName' is standard path of the XML file to load - see psLocalization::FindLocalizedFile()
*/
bool LoadFromFile(const csString & fileName);
Index: pspawsmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pspawsmanager.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pspawsmanager.cpp 15 Sep 2003 10:11:12 -0000 1.36
--- pspawsmanager.cpp 20 Sep 2003 14:30:18 -0000 1.37
***************
*** 343,352 ****
bool psPawsManager::LoadWidget( const char* widgetFile )
{
! csRef<iDataBuffer> buff = vfs->ReadFile( widgetFile );
if ( !buff || !buff->GetSize() )
{
! Error2( "Could not load XML: %s", widgetFile );
! return false;
}
--- 343,354 ----
bool psPawsManager::LoadWidget( const char* widgetFile )
{
! csString fullPath = localization->FindLocalizedFile(widgetFile);
!
! csRef<iDataBuffer> buff = vfs->ReadFile( fullPath );
if ( !buff || !buff->GetSize() )
{
! Error2( "Could not load XML: %s", fullPath.GetData() );
! return false;
}
***************
*** 355,359 ****
if ( error )
{
! Error3( "Error parsing XML file %s: %s", widgetFile, error );
return false;
}
--- 357,361 ----
if ( error )
{
! Error3( "Error parsing XML file %s: %s", fullPath.GetData(), error );
return false;
}
Index: pspawsmanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/paws/pspawsmanager.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pspawsmanager.h 17 Sep 2003 21:46:05 -0000 1.13
--- pspawsmanager.h 20 Sep 2003 14:30:18 -0000 1.14
***************
*** 77,81 ****
/** Loads a widget definition file.
* This loads a widget from XML and adds it to the main widget.
! * @param widgetFile The VFS location of the widget to load.
* @return True if the widget was loaded properly.
*/
--- 77,81 ----
/** Loads a widget definition file.
* This loads a widget from XML and adds it to the main widget.
! * @param widgetFile The standard path of the widget to load - see psLocalization::FindLocalizedFile()
* @return True if the widget was loaded properly.
*/
|