Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

CHANGED: #1471 CViewTextIDFormated is now part of the NELGUI library and is under the NLGUI namespace.

Browse Source 
--HG--
branch : gui-refactoring
hg/feature/sse2
dfighter1985 13 years ago
parent ec5214ecdb
commit 90a1049934
5 changed files with 106 additions and 99 deletions
Show Stats Download Patch File Download Diff File

9
code/ryzom/client/src/interface_v3/view_text_id_formated.h → code/nel/include/nel/gui/view_text_id_formated.h
Unescape Escape View File

@ -29,6 +29,10 @@
* $b -> expand the current bot name ( bot with which the player is talking)
* $s -> expand the current short bot name (with no specification/title in it)
*/
namespace NLGUI
{
class CViewTextIDFormated : public CViewTextID
{
public:
@ -42,9 +46,6 @@ private:
ucstring _FormatString;
};
}
#endif

88
code/nel/src/gui/view_text_id_formated.cpp
Unescape Escape View File

@ -0,0 +1,88 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "nel/gui/view_text_id_formated.h"
#include "nel/gui/view_text_formated.h"
#include "nel/misc/xml_auto_ptr.h"
#include "nel/misc/i18n.h"
NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_formated");
namespace NLGUI
{
// *********************************************************************************
bool CViewTextIDFormated::parse(xmlNodePtr cur,CInterfaceGroup * parentGroup)
{
if (!CViewTextID::parse(cur, parentGroup)) return false;
CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
if (prop)
setFormatString(ucstring((const char *) prop));
else
setFormatString(ucstring("$t"));
return true;
}
// *********************************************************************************
void CViewTextIDFormated::checkCoords()
{
if (_IsDBLink)
{
uint32 newId = (uint32)_DBTextId.getSInt64();
setTextId (newId);
}
if (!_Initialized)
{
ucstring result, formatedResult;
bool bValid;
if( CViewTextID::getTextProvider() == NULL )
{
if(!_DBPath.empty())
result = ucstring(_DBPath);
else
result = ucstring("Text ID = " + NLMISC::toString(_TextId));
bValid = true;
}
else
{
bValid = CViewTextID::getTextProvider()->getDynString (_TextId, result);
}
formatedResult = CViewTextFormated::formatString(_FormatString, result);
//
setText (formatedResult);
//
if (bValid)
{
_Initialized = true;
}
}
CViewText::checkCoords();
}
// ****************************************************************************
void CViewTextIDFormated::setFormatString(const ucstring &format)
{
_Initialized = false;
_FormatString = format;
if ( (_FormatString.size()>2) && (_FormatString[0] == 'u') && (_FormatString[1] == 'i'))
_FormatString = NLMISC::CI18N::get (format.toString());
}
}

2
code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
Unescape Escape View File

@ -19,7 +19,7 @@
#include "game_share/mission_desc.h"
#include "dbgroup_list_sheet_mission.h"
#include "view_text_id_formated.h"
#include "nel/gui/view_text_id_formated.h"
#include "nel/misc/cdb_leaf.h"
#include "interface_manager.h"

2
code/ryzom/client/src/interface_v3/interface_parser.cpp
Unescape Escape View File

@ -42,7 +42,7 @@
#include "nel/gui/view_text.h"
#include "nel/gui/view_text_formated.h"
#include "nel/gui/view_text_id.h"
#include "view_text_id_formated.h"
#include "nel/gui/view_text_id_formated.h"
#include "view_radar.h"
#include "view_pointer.h"
// DBView (View linked to the database)

82
code/ryzom/client/src/interface_v3/view_text_id_formated.cpp
Unescape Escape View File

@ -1,82 +0,0 @@
// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "view_text_id_formated.h"
#include "nel/gui/view_text_formated.h"
#include "nel/misc/xml_auto_ptr.h"
NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_formated");
// *********************************************************************************
bool CViewTextIDFormated::parse(xmlNodePtr cur,CInterfaceGroup * parentGroup)
{
if (!CViewTextID::parse(cur, parentGroup)) return false;
CXMLAutoPtr prop((const char*) xmlGetProp( cur, (xmlChar*)"format" ));
if (prop)
setFormatString(ucstring((const char *) prop));
else
setFormatString(ucstring("$t"));
return true;
}
// *********************************************************************************
void CViewTextIDFormated::checkCoords()
{
if (_IsDBLink)
{
uint32 newId = (uint32)_DBTextId.getSInt64();
setTextId (newId);
}
if (!_Initialized)
{
ucstring result, formatedResult;
bool bValid;
if( CViewTextID::getTextProvider() == NULL )
{
if(!_DBPath.empty())
result = ucstring(_DBPath);
else
result = ucstring("Text ID = " + NLMISC::toString(_TextId));
bValid = true;
}
else
{
bValid = CViewTextID::getTextProvider()->getDynString (_TextId, result);
}
formatedResult = CViewTextFormated::formatString(_FormatString, result);
//
setText (formatedResult);
//
if (bValid)
{
_Initialized = true;
}
}
CViewText::checkCoords();
}
// ****************************************************************************
void CViewTextIDFormated::setFormatString(const ucstring &format)
{
_Initialized = false;
_FormatString = format;
if ( (_FormatString.size()>2) && (_FormatString[0] == 'u') && (_FormatString[1] == 'i'))
_FormatString = NLMISC::CI18N::get (format.toString());
}
Write Preview
Loading…
Cancel
Save