mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-07 15:59:01 +00:00
Merged default
This commit is contained in:
commit
1bdf6484a6
68 changed files with 192 additions and 118 deletions
|
@ -135,6 +135,10 @@ IF(WITH_NEL)
|
|||
FIND_PACKAGE(CppTest)
|
||||
ENDIF(WITH_NEL_TESTS)
|
||||
|
||||
IF(WITH_GUI)
|
||||
FIND_PACKAGE(Libwww REQUIRED)
|
||||
ENDIF(WITH_GUI)
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
ADD_SUBDIRECTORY(nel)
|
||||
|
|
|
@ -35,6 +35,7 @@ namespace NLGUI
|
|||
class CCtrlButton : public CCtrlBaseButton
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlButton )
|
||||
|
||||
/// Constructor
|
||||
CCtrlButton(const TCtorParam ¶m) : CCtrlBaseButton(param)
|
||||
|
|
|
@ -36,6 +36,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlColPick )
|
||||
|
||||
CCtrlColPick(const TCtorParam ¶m);
|
||||
~CCtrlColPick();
|
||||
|
|
|
@ -43,7 +43,8 @@ namespace NLGUI
|
|||
class CCtrlPolygon : public CCtrlBase
|
||||
{
|
||||
public:
|
||||
CCtrlPolygon();
|
||||
DECLARE_UI_CLASS( CCtrlPolygon )
|
||||
CCtrlPolygon( const TCtorParam ¶m );
|
||||
virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }
|
||||
virtual void updateCoords();
|
||||
virtual void draw();
|
||||
|
|
|
@ -38,10 +38,12 @@ namespace NLGUI
|
|||
class CCtrlQuad : public CCtrlBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlQuad )
|
||||
|
||||
enum TWrapMode { Repeat = 0, Clamp, CustomUVs, WrapModeCount };
|
||||
|
||||
|
||||
CCtrlQuad();
|
||||
CCtrlQuad( const TCtorParam ¶m );
|
||||
|
||||
// from CInterfaceElement
|
||||
bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup);
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace NLGUI
|
|||
*/
|
||||
class CCtrlSheetSelection
|
||||
{
|
||||
public:
|
||||
public:
|
||||
// Add a group, and returns its index, or -1 if already created.
|
||||
sint addGroup(const std::string &name);
|
||||
// Get a group by its name (must exist)
|
||||
|
|
|
@ -38,6 +38,7 @@ namespace NLGUI
|
|||
class CCtrlTextButton : public CCtrlBaseButton
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlTextButton )
|
||||
|
||||
/// Constructor
|
||||
CCtrlTextButton(const TCtorParam ¶m);
|
||||
|
|
|
@ -39,6 +39,7 @@ namespace NLGUI
|
|||
class CDBGroupComboBox : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBGroupComboBox )
|
||||
|
||||
/// Constructor
|
||||
CDBGroupComboBox(const TCtorParam ¶m);
|
||||
|
|
|
@ -39,6 +39,7 @@ namespace NLGUI
|
|||
class CDBGroupSelectNumber : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBGroupSelectNumber )
|
||||
|
||||
/// Constructor
|
||||
CDBGroupSelectNumber(const TCtorParam ¶m);
|
||||
|
|
|
@ -37,6 +37,7 @@ namespace NLGUI
|
|||
public:
|
||||
enum TViewBar { ViewBar_UltraMini, ViewBar_Mini, ViewBar_Normal, ViewBar_MiniThick };
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBViewBar )
|
||||
|
||||
/// Constructor
|
||||
CDBViewBar(const TCtorParam ¶m)
|
||||
|
|
|
@ -34,6 +34,7 @@ namespace NLGUI
|
|||
class CDBViewBar3 : public CViewBitmap
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBViewBar3 )
|
||||
|
||||
/// Constructor
|
||||
CDBViewBar3(const TCtorParam ¶m);
|
||||
|
|
|
@ -34,6 +34,7 @@ namespace NLGUI
|
|||
class CDBViewDigit : public CViewBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBViewDigit )
|
||||
|
||||
/// Constructor
|
||||
CDBViewDigit(const TCtorParam ¶m);
|
||||
|
|
|
@ -35,6 +35,7 @@ namespace NLGUI
|
|||
class CDBViewNumber : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBViewNumber )
|
||||
|
||||
/// Constructor
|
||||
CDBViewNumber(const TCtorParam ¶m);
|
||||
|
|
|
@ -35,6 +35,7 @@ namespace NLGUI
|
|||
class CDBViewQuantity : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CDBViewQuantity )
|
||||
|
||||
/// Constructor
|
||||
CDBViewQuantity(const TCtorParam ¶m);
|
||||
|
|
|
@ -48,6 +48,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlResizer )
|
||||
|
||||
CCtrlResizer(const TCtorParam ¶m);
|
||||
virtual void draw ();
|
||||
|
@ -98,8 +99,9 @@ namespace NLGUI
|
|||
class CCtrlMover : public CCtrlBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlMover )
|
||||
|
||||
CCtrlMover(const TCtorParam ¶m, bool canMove, bool canOpen);
|
||||
CCtrlMover(const TCtorParam ¶m, bool canMove = true, bool canOpen = true );
|
||||
~CCtrlMover();
|
||||
virtual void draw ();
|
||||
virtual bool handleEvent (const NLGUI::CEventDescriptor &event);
|
||||
|
@ -163,6 +165,7 @@ namespace NLGUI
|
|||
virtual void childrenMoved(uint srcIndex, uint destIndex, CGroupContainer *children) = 0;
|
||||
};
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupContainer )
|
||||
CGroupContainer(const TCtorParam ¶m);
|
||||
~CGroupContainer();
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@ namespace NLGUI
|
|||
class CGroupEditBox : public CGroupEditBoxBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupEditBox )
|
||||
|
||||
class IComboKeyHandler
|
||||
{
|
||||
|
@ -42,7 +43,6 @@ namespace NLGUI
|
|||
|
||||
enum TEntryType { Text, Integer, PositiveInteger, Float, PositiveFloat, Alpha, AlphaNum, AlphaNumSpace, Password, Filename, PlayerName }; // the type of entry this edit bot can deal with
|
||||
|
||||
DECLARE_UI_CLASS( CGroupEditBox )
|
||||
/// Constructor
|
||||
CGroupEditBox(const TCtorParam ¶m);
|
||||
/// Dtor
|
||||
|
|
|
@ -36,6 +36,7 @@ namespace NLGUI
|
|||
class CGroupFrame : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupFrame )
|
||||
|
||||
/// Constructor
|
||||
CGroupFrame(const TCtorParam ¶m);
|
||||
|
|
|
@ -35,6 +35,8 @@ namespace NLGUI
|
|||
class CGroupHeader : public CGroupList
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupHeader )
|
||||
|
||||
REFLECT_EXPORT_START(CGroupHeader, CGroupList)
|
||||
REFLECT_LUA_METHOD("enlargeColumns", luaEnlargeColumns);
|
||||
REFLECT_LUA_METHOD("resizeColumnsAndContainer", luaResizeColumnsAndContainer);
|
||||
|
@ -67,6 +69,8 @@ namespace NLGUI
|
|||
class CGroupHeaderEntry : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupHeaderEntry )
|
||||
|
||||
CGroupHeaderEntry(const TCtorParam ¶m);
|
||||
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
|
||||
// from CInterfaceGroup
|
||||
|
|
|
@ -31,7 +31,7 @@ typedef std::map<std::string, std::string> TStyle;
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "libwww/WWWInit.h"
|
||||
#include "WWWInit.h"
|
||||
}
|
||||
|
||||
namespace NLGUI
|
||||
|
@ -54,6 +54,8 @@ namespace NLGUI
|
|||
class CGroupHTML : public CGroupScrollText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupHTML )
|
||||
|
||||
friend void TextAdd (struct _HText *me, const char * buf, int len);
|
||||
friend void TextBeginElement (_HText *me, int element_number, const BOOL *present, const char ** value);
|
||||
friend void TextEndElement (_HText *me, int element_number);
|
||||
|
@ -658,6 +660,8 @@ namespace NLGUI
|
|||
class CGroupHTMLInputOffset : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupHTMLInputOffset )
|
||||
|
||||
sint32 Offset;
|
||||
CGroupHTMLInputOffset(const TCtorParam ¶m);
|
||||
xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
|
||||
|
|
|
@ -30,6 +30,8 @@ namespace NLGUI
|
|||
class CGroupList : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupList )
|
||||
|
||||
enum EAlign
|
||||
{
|
||||
Bottom = 0,
|
||||
|
|
|
@ -42,6 +42,7 @@ namespace NLGUI
|
|||
class CViewTextMenu : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewTextMenu )
|
||||
|
||||
CViewTextMenu(const TCtorParam ¶m) : CViewText(param)
|
||||
{
|
||||
|
@ -97,6 +98,7 @@ namespace NLGUI
|
|||
class CGroupSubMenu : public CGroupSubMenuBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupSubMenu )
|
||||
|
||||
CGroupSubMenu(const TCtorParam ¶m);
|
||||
virtual ~CGroupSubMenu();
|
||||
|
@ -290,6 +292,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupMenu )
|
||||
|
||||
CGroupMenu(const TCtorParam ¶m);
|
||||
virtual ~CGroupMenu();
|
||||
|
|
|
@ -35,6 +35,8 @@ namespace NLGUI
|
|||
class CGroupModal : public CGroupFrame
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupModal )
|
||||
|
||||
bool SpawnOnMousePos : 1;
|
||||
bool ExitClickOut : 1;
|
||||
bool ExitClickL : 1;
|
||||
|
|
|
@ -31,6 +31,8 @@ namespace NLGUI
|
|||
class CCtrlLink : public CCtrlButton
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlLink )
|
||||
|
||||
CCtrlLink (const TCtorParam ¶m) : CCtrlButton(param)
|
||||
{}
|
||||
};
|
||||
|
@ -39,6 +41,8 @@ namespace NLGUI
|
|||
class CGroupParagraph : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupParagraph )
|
||||
|
||||
enum EAlign
|
||||
{
|
||||
Bottom = 0,
|
||||
|
|
|
@ -39,6 +39,8 @@ namespace NLGUI
|
|||
class CGroupScrollText : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupScrollText )
|
||||
|
||||
/// Constructor
|
||||
CGroupScrollText(const TCtorParam ¶m);
|
||||
~CGroupScrollText();
|
||||
|
|
|
@ -43,6 +43,7 @@ namespace NLGUI
|
|||
class CGroupTab : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupTab )
|
||||
|
||||
/// Constructor
|
||||
CGroupTab(const TCtorParam ¶m);
|
||||
|
@ -153,6 +154,7 @@ namespace NLGUI
|
|||
class CCtrlTabButton : public CCtrlTextButton
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CCtrlTabButton )
|
||||
|
||||
CCtrlTabButton(const TCtorParam ¶m);
|
||||
|
||||
|
|
|
@ -36,6 +36,8 @@ namespace NLGUI
|
|||
{
|
||||
friend class CGroupTable;
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupCell )
|
||||
|
||||
CGroupCell(const TCtorParam ¶m);
|
||||
|
||||
enum TAlign
|
||||
|
@ -121,6 +123,7 @@ namespace NLGUI
|
|||
class CGroupTable : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupTable )
|
||||
|
||||
///constructor
|
||||
CGroupTable(const TCtorParam ¶m);
|
||||
|
|
|
@ -33,6 +33,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
public:
|
||||
DECLARE_UI_CLASS( CGroupTree )
|
||||
|
||||
struct SNode;
|
||||
// optional callback that is called when a node has been added
|
||||
|
|
|
@ -28,6 +28,8 @@ namespace NLGUI
|
|||
class CInterfaceGroupWheel : public CInterfaceGroup
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CInterfaceGroupWheel )
|
||||
|
||||
/// Constructor
|
||||
CInterfaceGroupWheel(const TCtorParam ¶m);
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
extern "C"
|
||||
{
|
||||
#include "libwww/WWWInit.h"
|
||||
#include "WWWInit.h"
|
||||
}
|
||||
|
||||
namespace NLGUI
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#define LIBWWW_NEL_STREAM_H
|
||||
|
||||
|
||||
#include "libwww/HTProt.h"
|
||||
#include "HTProt.h"
|
||||
|
||||
extern "C" HTProtCallback HTLoadNeLFile;
|
||||
extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode);
|
||||
|
|
|
@ -99,6 +99,8 @@ namespace NLGUI
|
|||
class CViewBitmapCombo : public CViewBase, public NLMISC::ICDBNode::IPropertyObserver
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewBitmapCombo )
|
||||
|
||||
typedef std::vector<sint32> TIdArray;
|
||||
typedef std::vector<std::string> TStringArray;
|
||||
typedef std::vector<NLMISC::CRGBA> TColorArray;
|
||||
|
|
|
@ -36,6 +36,7 @@ namespace NLGUI
|
|||
class CViewLink : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewLink )
|
||||
|
||||
// Default constructor
|
||||
CViewLink (const TCtorParam ¶m);
|
||||
|
|
|
@ -36,7 +36,9 @@ namespace NLGUI
|
|||
class CViewPolygon : public CViewBase
|
||||
{
|
||||
public:
|
||||
CViewPolygon();
|
||||
DECLARE_UI_CLASS( CViewPolygon )
|
||||
|
||||
CViewPolygon( const TCtorParam ¶m );
|
||||
virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }
|
||||
virtual void updateCoords();
|
||||
virtual void draw();
|
||||
|
|
|
@ -36,10 +36,12 @@ namespace NLGUI
|
|||
class CViewQuad : public CViewBase
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewQuad )
|
||||
|
||||
enum TWrapMode { Repeat = 0, Clamp, WrapModeCount };
|
||||
|
||||
|
||||
CViewQuad();
|
||||
CViewQuad( const TCtorParam ¶m );
|
||||
|
||||
// from CInterfaceElement
|
||||
bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup);
|
||||
|
|
|
@ -35,6 +35,7 @@ namespace NLGUI
|
|||
class CViewTextFormated : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewTextFormated )
|
||||
|
||||
/// Interface for classes which can format the text for this view.
|
||||
class IViewTextFormatter
|
||||
|
|
|
@ -48,6 +48,7 @@ namespace NLGUI
|
|||
class CViewTextID : public CViewText
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewTextID )
|
||||
|
||||
/// Interface for classes which can provide text to CViewTextId
|
||||
class IViewTextProvider
|
||||
|
|
|
@ -36,6 +36,8 @@ namespace NLGUI
|
|||
class CViewTextIDFormated : public CViewTextID
|
||||
{
|
||||
public:
|
||||
DECLARE_UI_CLASS( CViewTextIDFormated )
|
||||
|
||||
CViewTextIDFormated(const TCtorParam ¶m) : CViewTextID(param)
|
||||
{}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
|
|||
NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
|
||||
NL_ADD_RUNTIME_FLAGS(nelgui)
|
||||
|
||||
INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} )
|
||||
INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
|
||||
|
||||
NL_ADD_LIB_SUFFIX(nelgui)
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
// *********************************************************************************
|
||||
CCtrlPolygon::CCtrlPolygon() : CCtrlBase(TCtorParam())
|
||||
CCtrlPolygon::CCtrlPolygon( const TCtorParam ¶m ) : CCtrlBase( param )
|
||||
{
|
||||
// Construct
|
||||
_Color = CRGBA::White;
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
// *********************************************************************************
|
||||
CCtrlQuad::CCtrlQuad() : CCtrlBase(TCtorParam()), _Color(CRGBA::White),
|
||||
CCtrlQuad::CCtrlQuad( const TCtorParam ¶m ) : CCtrlBase( param ), _Color(CRGBA::White),
|
||||
_Additif(false),
|
||||
_Filtered(true),
|
||||
_UMin(0.f),
|
||||
|
|
|
@ -23,9 +23,9 @@
|
|||
// LibWWW
|
||||
extern "C"
|
||||
{
|
||||
#include "libwww/WWWLib.h" /* Global Library Include file */
|
||||
#include "libwww/WWWApp.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
#include "WWWLib.h" /* Global Library Include file */
|
||||
#include "WWWApp.h"
|
||||
#include "WWWInit.h"
|
||||
}
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -21,9 +21,9 @@
|
|||
// LibWWW
|
||||
extern "C"
|
||||
{
|
||||
#include "libwww/WWWLib.h" /* Global Library Include file */
|
||||
#include "libwww/WWWApp.h"
|
||||
#include "libwww/WWWInit.h"
|
||||
#include "WWWLib.h" /* Global Library Include file */
|
||||
#include "WWWApp.h"
|
||||
#include "WWWInit.h"
|
||||
}
|
||||
|
||||
#include "nel/gui/group_html.h"
|
||||
|
|
|
@ -21,16 +21,16 @@ extern "C"
|
|||
{
|
||||
|
||||
/* Library Includes */
|
||||
#include "libwww/wwwsys.h"
|
||||
#include "libwww/WWWUtil.h"
|
||||
#include "libwww/WWWCore.h"
|
||||
#include "libwww/WWWDir.h"
|
||||
#include "libwww/WWWTrans.h"
|
||||
#include "libwww/HTReqMan.h"
|
||||
#include "libwww/HTBind.h"
|
||||
#include "libwww/HTMulti.h"
|
||||
#include "libwww/HTNetMan.h"
|
||||
#include "libwww/HTChannl.h"
|
||||
#include "wwwsys.h"
|
||||
#include "WWWUtil.h"
|
||||
#include "WWWCore.h"
|
||||
#include "WWWDir.h"
|
||||
#include "WWWTrans.h"
|
||||
#include "HTReqMan.h"
|
||||
#include "HTBind.h"
|
||||
#include "HTMulti.h"
|
||||
#include "HTNetMan.h"
|
||||
#include "HTChannl.h"
|
||||
#include "nel/gui/libwww_nel_stream.h" /* Implemented here */
|
||||
}
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
// *********************************************************************************
|
||||
CViewPolygon::CViewPolygon() : CViewBase(TCtorParam())
|
||||
CViewPolygon::CViewPolygon( const TCtorParam ¶m ) : CViewBase( param )
|
||||
{
|
||||
// Construct
|
||||
_Color = CRGBA::White;
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace NLGUI
|
|||
{
|
||||
|
||||
// *********************************************************************************
|
||||
CViewQuad::CViewQuad() : CViewBase(TCtorParam()), _Color(CRGBA::White),
|
||||
CViewQuad::CViewQuad( const TCtorParam ¶m ) : CViewBase( param ), _Color(CRGBA::White),
|
||||
_Additif(false),
|
||||
_UMin(0.f),
|
||||
_UMax(1.f),
|
||||
|
|
|
@ -33,6 +33,7 @@ FIND_PACKAGE(Libwww REQUIRED)
|
|||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${LUA_INCLUDE_DIR}
|
||||
${QT_INCLUDES})
|
||||
|
||||
FILE(GLOB SRC *.cpp *.h)
|
||||
|
@ -108,6 +109,7 @@ TARGET_LINK_LIBRARIES(
|
|||
${LUABIND_LIBRARIES}
|
||||
${CURL_LIBRARIES}
|
||||
${LIBWWW_LIBRARIES}
|
||||
${LIBXML2_LIBRARIES}
|
||||
)
|
||||
|
||||
NL_DEFAULT_PROPS(ovqt_plugin_gui_editor "NeL, Tools, 3D: Object Viewer Qt Plugin: GUI Editor")
|
||||
|
|
|
@ -50,8 +50,8 @@ namespace GUIEditor
|
|||
|
||||
void ActionEditor::onOkButtonClicked()
|
||||
{
|
||||
currentAction->Parameters = paramsEdit->text().toStdString();
|
||||
currentAction->Conditions = condEdit->text().toStdString();
|
||||
currentAction->Parameters = paramsEdit->text().toUtf8().constData();
|
||||
currentAction->Conditions = condEdit->text().toUtf8().constData();
|
||||
hide();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -148,7 +148,8 @@ namespace GUIEditor
|
|||
|
||||
projectParser.clear();
|
||||
|
||||
if( !projectParser.parseProjectFile( fileName.toStdString() ) )
|
||||
std::string projectFileName = fileName.toUtf8().constData();
|
||||
if( !projectParser.parseProjectFile( projectFileName ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
tr( "Error parsing project file" ),
|
||||
|
@ -185,7 +186,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProjectFileSerializer serializer;
|
||||
serializer.setFile( currentProjectFile.toStdString() );
|
||||
serializer.setFile( currentProjectFile.toUtf8().constData() );
|
||||
if( !serializer.serialize( projectFiles ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
|
@ -220,7 +221,7 @@ namespace GUIEditor
|
|||
dir + "/" + projectFiles.projectName.c_str() + ".xml";
|
||||
|
||||
CProjectFileSerializer serializer;
|
||||
serializer.setFile( newFile.toStdString() );
|
||||
serializer.setFile( newFile.toUtf8().constData() );
|
||||
if( !serializer.serialize( projectFiles ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
|
@ -230,7 +231,7 @@ namespace GUIEditor
|
|||
}
|
||||
|
||||
std::string guiFile =
|
||||
dir.toStdString() + "/" + "ui_" + projectFiles.projectName + ".xml";
|
||||
std::string( dir.toUtf8().constData() ) + "/" + "ui_" + projectFiles.projectName + ".xml";
|
||||
|
||||
WidgetSerializer widgetSerializer;
|
||||
widgetSerializer.setFile( guiFile );
|
||||
|
|
|
@ -78,11 +78,11 @@ namespace GUIEditor
|
|||
if( !parser->getLinkData( currentLinkId, data ) )
|
||||
return;
|
||||
|
||||
data.expr = expressionEdit->toPlainText().toStdString();
|
||||
data.target = targetEdit->text().toStdString();
|
||||
data.action = ahEdit->text().toStdString();
|
||||
data.params = ahParamEdit->text().toStdString();
|
||||
data.cond = condEdit->text().toStdString();
|
||||
data.expr = expressionEdit->toPlainText().toUtf8().constData();
|
||||
data.target = targetEdit->text().toUtf8().constData();
|
||||
data.action = ahEdit->text().toUtf8().constData();
|
||||
data.params = ahParamEdit->text().toUtf8().constData();
|
||||
data.cond = condEdit->text().toUtf8().constData();
|
||||
parser->updateLinkData( data.id, data );
|
||||
|
||||
Q_EMIT okClicked();
|
||||
|
|
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
&ok );
|
||||
if( ok )
|
||||
{
|
||||
if( CWidgetManager::getInstance()->getElementFromId( parent.toStdString() ) == NULL )
|
||||
if( CWidgetManager::getInstance()->getElementFromId( parent.toUtf8().constData() ) == NULL )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
tr( "Parent group doesn't exist" ),
|
||||
|
@ -96,7 +96,7 @@ namespace GUIEditor
|
|||
return;
|
||||
}
|
||||
SLinkData data;
|
||||
data.parent = parent.toStdString();
|
||||
data.parent = parent.toUtf8().constData();
|
||||
|
||||
uint32 id = CWidgetManager::getInstance()->getParser()->addLinkData( data );
|
||||
|
||||
|
|
|
@ -67,9 +67,9 @@ namespace GUIEditor
|
|||
}
|
||||
|
||||
SPropEntry prop;
|
||||
prop.propName = nameEdit->text().toStdString();
|
||||
prop.propType = typeCB->currentText().toStdString();
|
||||
prop.propDefault = defvalEdit->text().toStdString();
|
||||
prop.propName = nameEdit->text().toUtf8().constData();
|
||||
prop.propType = typeCB->currentText().toUtf8().constData();
|
||||
prop.propDefault = defvalEdit->text().toUtf8().constData();
|
||||
widgetInfoTreeNode->addPropertyToAll( prop );
|
||||
|
||||
widgetInfoTreeNode = NULL;
|
||||
|
@ -84,7 +84,7 @@ namespace GUIEditor
|
|||
if( widgetInfoTreeNode == NULL )
|
||||
return false;
|
||||
|
||||
if( widgetInfoTreeNode->hasProperty( nameEdit->text().toStdString() ) )
|
||||
if( widgetInfoTreeNode->hasProperty( nameEdit->text().toUtf8().constData() ) )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
|
@ -77,7 +77,7 @@ namespace GUIEditor
|
|||
|
||||
bool NewWidgetWidget::checkNameField()
|
||||
{
|
||||
if( nameEdit->text().toStdString().empty() )
|
||||
if( nameEdit->text().isEmpty() )
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
if( widgetInfoTree == NULL )
|
||||
return false;
|
||||
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( nameEdit->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( nameEdit->text().toUtf8().constData() );
|
||||
if( node != NULL )
|
||||
return false;
|
||||
|
||||
|
@ -98,16 +98,16 @@ namespace GUIEditor
|
|||
|
||||
void NewWidgetWidget::addNewWidget()
|
||||
{
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( ancestorCB->currentText().toStdString() );
|
||||
CWidgetInfoTreeNode *node = widgetInfoTree->findNodeByName( ancestorCB->currentText().toUtf8().constData() );
|
||||
if( node == NULL )
|
||||
{
|
||||
nlerror( "Ancestor %s doesn't exist! Aborting addition!", ancestorCB->currentText().toStdString().c_str() );
|
||||
nlerror( "Ancestor %s doesn't exist! Aborting addition!", ancestorCB->currentText().toUtf8().constData() );
|
||||
return;
|
||||
}
|
||||
|
||||
SWidgetInfo info;
|
||||
info.ancestor = ancestorCB->currentText().toStdString();
|
||||
info.name = nameEdit->text().toStdString();
|
||||
info.ancestor = ancestorCB->currentText().toUtf8().constData();
|
||||
info.name = nameEdit->text().toUtf8().constData();
|
||||
info.GUIName = "C" + info.name;
|
||||
info.isAbstract = false;
|
||||
info.resolved = true;
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace GUIEditor
|
|||
|
||||
currentProc = name;
|
||||
IParser *parser = CWidgetManager::getInstance()->getParser();
|
||||
CProcedure *proc = parser->getProc( name.toStdString() );
|
||||
CProcedure *proc = parser->getProc( name.toUtf8().constData() );
|
||||
|
||||
std::vector< CProcAction >::const_iterator itr;
|
||||
for( itr = proc->Actions.begin(); itr != proc->Actions.end(); ++itr )
|
||||
|
@ -74,7 +74,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
@ -96,14 +96,14 @@ namespace GUIEditor
|
|||
if( ok )
|
||||
{
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc != NULL )
|
||||
{
|
||||
proc->addAction( name.toStdString() );
|
||||
proc->addAction( name.toUtf8().constData() );
|
||||
actionList->addItem( name );
|
||||
}
|
||||
else
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toStdString().c_str() );
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -123,17 +123,17 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
CProcedure *proc =
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
|
||||
if( proc != NULL )
|
||||
{
|
||||
if( !proc->removeAction( static_cast< uint32 >( actionList->currentRow() ) ) )
|
||||
nlinfo( "Action #%d not found in procedure %s.", actionList->currentRow(), currentProc.toStdString().c_str() );
|
||||
nlinfo( "Action #%d not found in procedure %s.", actionList->currentRow(), currentProc.toUtf8().constData() );
|
||||
item = actionList->takeItem( actionList->currentRow() );
|
||||
delete item;
|
||||
}
|
||||
else
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toStdString().c_str() );
|
||||
nlinfo( "Cannot find procedure %s", currentProc.toUtf8().constData() );
|
||||
}
|
||||
|
||||
void ProcEditor::onUpButtonClicked()
|
||||
|
@ -149,7 +149,7 @@ namespace GUIEditor
|
|||
if( prevItem == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
@ -172,7 +172,7 @@ namespace GUIEditor
|
|||
if( nextItem == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toStdString() );
|
||||
CProcedure *proc = CWidgetManager::getInstance()->getParser()->getProc( currentProc.toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ namespace GUIEditor
|
|||
if( item == NULL )
|
||||
return;
|
||||
|
||||
CProcedure *proc = parser->getProc( item->text().toStdString() );
|
||||
CProcedure *proc = parser->getProc( item->text().toUtf8().constData() );
|
||||
if( proc == NULL )
|
||||
return;
|
||||
|
||||
|
@ -86,7 +86,7 @@ namespace GUIEditor
|
|||
if( ok )
|
||||
{
|
||||
IParser *parser = CWidgetManager::getInstance()->getParser();
|
||||
if( !parser->addProc( newProc.toStdString() ) )
|
||||
if( !parser->addProc( newProc.toUtf8().constData() ) )
|
||||
{
|
||||
QMessageBox::critical( this,
|
||||
tr( "Cannot add new procedure" ),
|
||||
|
@ -113,7 +113,7 @@ namespace GUIEditor
|
|||
if( button != QMessageBox::Yes )
|
||||
return;
|
||||
|
||||
if( !parser->removeProc( item->text().toStdString() ) )
|
||||
if( !parser->removeProc( item->text().toUtf8().constData() ) )
|
||||
return;
|
||||
item = procList->takeItem( procList->currentRow() );
|
||||
delete item;
|
||||
|
|
|
@ -121,7 +121,7 @@ namespace GUIEditor
|
|||
QString name = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( name.isEmpty() )
|
||||
return false;
|
||||
files.projectName = name.toStdString();
|
||||
files.projectName = name.toUtf8().constData();
|
||||
}
|
||||
else
|
||||
if( reader.name() == "version" )
|
||||
|
@ -137,7 +137,7 @@ namespace GUIEditor
|
|||
QString mg = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( mg.isEmpty() )
|
||||
return false;
|
||||
files.masterGroup = mg.toStdString();
|
||||
files.masterGroup = mg.toUtf8().constData();
|
||||
}
|
||||
else
|
||||
if( reader.name() == "activegroup" )
|
||||
|
@ -145,7 +145,7 @@ namespace GUIEditor
|
|||
QString ag = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( ag.isEmpty() )
|
||||
return false;
|
||||
files.activeGroup = ag.toStdString();
|
||||
files.activeGroup = ag.toUtf8().constData();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -171,7 +171,7 @@ namespace GUIEditor
|
|||
QString fileName = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( fileName.isEmpty() )
|
||||
return false;
|
||||
files.guiFiles.push_back( fileName.toStdString() );
|
||||
files.guiFiles.push_back( fileName.toUtf8().constData() );
|
||||
|
||||
}
|
||||
|
||||
|
@ -201,7 +201,7 @@ namespace GUIEditor
|
|||
QString fileName = reader.readElementText( QXmlStreamReader::ErrorOnUnexpectedElement );
|
||||
if( fileName.isEmpty() )
|
||||
return false;
|
||||
files.mapFiles.push_back( fileName.toStdString() );
|
||||
files.mapFiles.push_back( fileName.toUtf8().constData() );
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ namespace GUIEditor
|
|||
for( int i = 0; i < c; i++ )
|
||||
{
|
||||
QTreeWidgetItem *item = topItem->child( i );
|
||||
projectFiles.guiFiles.push_back( item->text( 0 ).toStdString() );
|
||||
projectFiles.guiFiles.push_back( item->text( 0 ).toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -99,7 +99,7 @@ namespace GUIEditor
|
|||
for( int i = 0; i < c; i++ )
|
||||
{
|
||||
QTreeWidgetItem *item = topItem->child( i );
|
||||
projectFiles.mapFiles.push_back( item->text( 0 ).toStdString() );
|
||||
projectFiles.mapFiles.push_back( item->text( 0 ).toUtf8().constData() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,13 +82,9 @@ namespace GUIEditor
|
|||
|
||||
currentElement = id;
|
||||
|
||||
std::string n;
|
||||
n = typeid( *e ).name();
|
||||
std::string::size_type i = n.find_last_of( ':' );
|
||||
if( i != std::string::npos )
|
||||
n = n.substr( i + 1, n.size() - 1 );
|
||||
std::string n = e->getClassName();
|
||||
|
||||
setupProperties( n, e );
|
||||
setupProperties( n, e );
|
||||
connect( propertyMgr, SIGNAL( propertyChanged( QtProperty* ) ),
|
||||
this, SLOT( onPropertyChanged( QtProperty* ) ) );
|
||||
}
|
||||
|
@ -109,7 +105,7 @@ namespace GUIEditor
|
|||
CInterfaceElement *e = CWidgetManager::getInstance()->getElementFromId( currentElement );
|
||||
if( e == NULL )
|
||||
return;
|
||||
e->setProperty( propName.toStdString(), propValue.toStdString() );
|
||||
e->setProperty( propName.toUtf8().constData(), propValue.toUtf8().constData() );
|
||||
}
|
||||
|
||||
void CPropBrowserCtrl::setupProperties( const std::string &type, const CInterfaceElement *element )
|
||||
|
@ -163,4 +159,4 @@ namespace GUIEditor
|
|||
p->setValue( v );
|
||||
browser->addProperty( p );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -53,7 +53,7 @@ namespace
|
|||
item = item->parent();
|
||||
}
|
||||
|
||||
name = s.toStdString();
|
||||
name = s.toUtf8().constData();
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
@ -137,7 +137,8 @@ namespace GUIEditor
|
|||
if( item->parent() == NULL )
|
||||
return;
|
||||
|
||||
std::string selection = makeFullName( item, item->text( 0 ).toStdString() );
|
||||
std::string n = item->text( 0 ).toUtf8().constData();
|
||||
std::string selection = makeFullName( item, n );
|
||||
CWidgetManager::getInstance()->setCurrentEditorSelection( selection );
|
||||
|
||||
Q_EMIT selectionChanged( selection );
|
||||
|
|
|
@ -43,7 +43,7 @@ namespace GUIEditor
|
|||
std::vector< SPropEntry >::const_iterator itr = parentInfo.props.begin();
|
||||
while( itr != parentInfo.props.end() )
|
||||
{
|
||||
std::vector< SPropEntry >::const_iterator fItr;
|
||||
std::vector< SPropEntry >::iterator fItr;
|
||||
fItr = std::find( props.begin(), props.end(), *itr );
|
||||
if( fItr == props.end() )
|
||||
continue;
|
||||
|
|
|
@ -82,7 +82,7 @@ namespace GUIEditor
|
|||
/// Remove child by name
|
||||
bool removeChildByName( const std::string &name )
|
||||
{
|
||||
for( std::vector< CWidgetInfoTreeNode* >::const_iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
for( std::vector< CWidgetInfoTreeNode* >::iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
{
|
||||
if( ( *itr )->getInfo().name == name )
|
||||
{
|
||||
|
@ -98,7 +98,7 @@ namespace GUIEditor
|
|||
/// Remove child by name, but don't delete the child
|
||||
bool removeChildByNameND( const std::string &name )
|
||||
{
|
||||
for( std::vector< CWidgetInfoTreeNode* >::const_iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
for( std::vector< CWidgetInfoTreeNode* >::iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
{
|
||||
if( ( *itr )->getInfo().name == name )
|
||||
{
|
||||
|
@ -113,7 +113,7 @@ namespace GUIEditor
|
|||
/// Remove child by ancestor's name
|
||||
bool removeChildByAncestor( const std::string &ancestor )
|
||||
{
|
||||
for( std::vector< CWidgetInfoTreeNode* >::const_iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
for( std::vector< CWidgetInfoTreeNode* >::iterator itr = children.begin(); itr != children.end(); ++itr )
|
||||
{
|
||||
if( ( *itr )->getInfo().ancestor == ancestor )
|
||||
{
|
||||
|
@ -172,7 +172,7 @@ namespace GUIEditor
|
|||
/// Removes this property from the node
|
||||
void removeProperty( const SPropEntry &prop )
|
||||
{
|
||||
std::vector< SPropEntry >::const_iterator itr = info.props.begin();
|
||||
std::vector< SPropEntry >::iterator itr = info.props.begin();
|
||||
while( itr != info.props.end() )
|
||||
{
|
||||
if( ( itr->propName == prop.propName ) &&
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "widget_info_serializer.h"
|
||||
#include "new_property_widget.h"
|
||||
#include "new_widget_widget.h"
|
||||
#include <qmessagebox>
|
||||
#include <QMessageBox>
|
||||
|
||||
namespace GUIEditor{
|
||||
CWidgetProperties::CWidgetProperties( QWidget *parent ) :
|
||||
|
@ -63,7 +63,7 @@ namespace GUIEditor{
|
|||
return;
|
||||
|
||||
QListWidgetItem *item = widgetList->item( i );
|
||||
setPropsOf( item->text().toStdString().c_str() );
|
||||
setPropsOf( item->text().toUtf8().constData() );
|
||||
}
|
||||
|
||||
|
||||
|
@ -83,7 +83,7 @@ namespace GUIEditor{
|
|||
if( reply != QMessageBox::Yes )
|
||||
return;
|
||||
|
||||
tree->removeNode( widgetName.toStdString() );
|
||||
tree->removeNode( widgetName.toUtf8().constData() );
|
||||
widgetPropTree->clear();
|
||||
buildWidgetList();
|
||||
}
|
||||
|
@ -91,12 +91,12 @@ namespace GUIEditor{
|
|||
void CWidgetProperties::onRemovePButtonClicked()
|
||||
{
|
||||
QTreeWidgetItem *item = widgetPropTree->currentItem();
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toUtf8().constData() );
|
||||
|
||||
if( ( item == NULL ) || ( node == NULL ) )
|
||||
return;
|
||||
|
||||
std::string name = item->text( 0 ).toStdString();
|
||||
std::string name = item->text( 0 ).toUtf8().constData();
|
||||
|
||||
std::vector< SPropEntry >::const_iterator itr = node->getInfo().findProp( name );
|
||||
if( itr == node->getInfo().props.end() )
|
||||
|
@ -133,7 +133,7 @@ namespace GUIEditor{
|
|||
if( ( widgetList->currentRow() >= widgetList->count() ) || ( widgetList->currentRow() < 0 ) )
|
||||
return;
|
||||
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toStdString() );
|
||||
CWidgetInfoTreeNode *node = tree->findNodeByName( widgetList->currentItem()->text().toUtf8().constData() );
|
||||
if( node == NULL )
|
||||
return;
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ namespace GUIEditor
|
|||
f.close();
|
||||
}
|
||||
else
|
||||
nlwarning( QString( "File %1 cannot be opened!" ).arg( file ).toStdString().c_str() );
|
||||
nlwarning( QString( "File %1 cannot be opened!" ).arg( file ).toUtf8().constData() );
|
||||
}
|
||||
|
||||
void CWidgetPropParser::parseGUIWidgetXML( QFile &file )
|
||||
|
@ -126,19 +126,19 @@ namespace GUIEditor
|
|||
if( !reader.hasError() )
|
||||
{
|
||||
if( key == "name" )
|
||||
info.name = value.toStdString();
|
||||
info.name = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "guiname" )
|
||||
info.GUIName = value.toStdString();
|
||||
info.GUIName = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "ancestor" )
|
||||
info.ancestor = value.toStdString();
|
||||
info.ancestor = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "description" )
|
||||
info.description = value.toStdString();
|
||||
info.description = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "icon" )
|
||||
info.icon == value.toStdString();
|
||||
info.icon == value.toUtf8().constData();
|
||||
else
|
||||
if( key == "abstract" )
|
||||
{
|
||||
|
@ -169,7 +169,7 @@ namespace GUIEditor
|
|||
return;
|
||||
|
||||
std::map< std::string, SWidgetInfo >::iterator itr =
|
||||
widgetInfo->find( widgetName.toStdString() );
|
||||
widgetInfo->find( widgetName.toUtf8().constData() );
|
||||
if( itr == widgetInfo->end() )
|
||||
return;
|
||||
|
||||
|
@ -192,15 +192,15 @@ namespace GUIEditor
|
|||
if( !reader.hasError() )
|
||||
{
|
||||
if( key == "name" )
|
||||
prop.propName = value.toStdString();
|
||||
prop.propName = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "type" )
|
||||
prop.propType = value.toStdString();
|
||||
prop.propType = value.toUtf8().constData();
|
||||
else
|
||||
if( key == "default" )
|
||||
prop.propDefault = value.toStdString();
|
||||
prop.propDefault = value.toUtf8().constData();
|
||||
else
|
||||
nlwarning( QString( "Unknown tag %1 within a property" ).arg( key ).toStdString().c_str() );
|
||||
nlwarning( QString( "Unknown tag %1 within a property" ).arg( key ).toUtf8().constData() );
|
||||
|
||||
}
|
||||
else
|
||||
|
|
|
@ -10,6 +10,10 @@ SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
|
|||
ADD_SUBDIRECTORY(common)
|
||||
|
||||
IF(WITH_RYZOM_CLIENT)
|
||||
IF(NOT WITH_GUI)
|
||||
MESSAGE( FATAL_ERROR "The client cannot be built without the NeL GUI Library (WITH_GUI)")
|
||||
ENDIF(NOT WITH_GUI)
|
||||
|
||||
IF(WITH_LUA51)
|
||||
FIND_PACKAGE(Lua51 REQUIRED)
|
||||
ELSE(WITH_LUA51)
|
||||
|
@ -41,8 +45,6 @@ IF(WITH_RYZOM_CLIENT)
|
|||
ENDIF(APPLE)
|
||||
ENDIF(CURL_STATIC)
|
||||
|
||||
FIND_PACKAGE(Libwww REQUIRED)
|
||||
|
||||
ADD_SUBDIRECTORY(client)
|
||||
ENDIF(WITH_RYZOM_CLIENT)
|
||||
|
||||
|
|
|
@ -733,7 +733,8 @@ bool CGroupMap::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
|
|||
//if (pCB != NULL) pCB->setActive(false);
|
||||
}
|
||||
nlassert(!_FrustumView);
|
||||
_FrustumView = new CCtrlQuad;
|
||||
CViewBase::TCtorParam param;
|
||||
_FrustumView = new CCtrlQuad( param );
|
||||
_FrustumView->setActive(false);
|
||||
addView(_FrustumView);
|
||||
_FrustumView->setParent(this);
|
||||
|
|
|
@ -548,9 +548,10 @@ void CDisplayerVisualActivitySequence::setWorldMapNumEdges(uint count)
|
|||
else
|
||||
{
|
||||
uint left = count - (uint)_WorldMapEdges.size();
|
||||
CViewBase::TCtorParam param;
|
||||
while (left --)
|
||||
{
|
||||
CCtrlQuad *cq = new CCtrlQuad;
|
||||
CCtrlQuad *cq = new CCtrlQuad( param );
|
||||
cq->setModulateGlobalColor(false);
|
||||
cq->setActive(true);
|
||||
gm->addCtrl(cq);
|
||||
|
|
|
@ -54,7 +54,7 @@ namespace R2
|
|||
class CCtrlPolygonSelectable : public CCtrlPolygon, public IDisplayerUIHandle
|
||||
{
|
||||
public:
|
||||
CCtrlPolygonSelectable(CInstance &instance) : Instance(instance) {}
|
||||
CCtrlPolygonSelectable( CViewBase::TCtorParam ¶m, CInstance &instance) : Instance(instance), CCtrlPolygon( param ) {}
|
||||
// from IDisplayerUIHandle
|
||||
virtual CInstance &getDisplayedInstance() { return Instance; }
|
||||
// from IDisplayerUIHandle
|
||||
|
@ -99,7 +99,7 @@ protected:
|
|||
class CCtrlQuadSelectable : public CCtrlQuad, public IDisplayerUIHandle
|
||||
{
|
||||
public:
|
||||
CCtrlQuadSelectable(CInstance &instance, uint edgeIndex) : Instance(instance), EdgeIndex(edgeIndex) {}
|
||||
CCtrlQuadSelectable( CViewBase::TCtorParam ¶m, CInstance &instance, uint edgeIndex) : Instance(instance), EdgeIndex(edgeIndex), CCtrlQuad( param ){}
|
||||
// from IDisplayerUIHandle
|
||||
virtual CInstance &getDisplayedInstance() { return Instance; }
|
||||
// from IDisplayerUIHandle
|
||||
|
@ -179,7 +179,8 @@ CCtrlPolygon *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlPolygon() con
|
|||
{
|
||||
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
|
||||
nlassert(DisplayedInstance);
|
||||
CCtrlPolygonSelectable *result = new CCtrlPolygonSelectable(*DisplayedInstance);
|
||||
CViewBase::TCtorParam param;
|
||||
CCtrlPolygonSelectable *result = new CCtrlPolygonSelectable( param, *DisplayedInstance);
|
||||
result->setId(DisplayedInstance->getId());
|
||||
result->setToolTipParent(CCtrlBase::TTMouse);
|
||||
result->setToolTipParentPosRef(Hotspot_BR);
|
||||
|
@ -192,7 +193,8 @@ CCtrlQuad *CDisplayerVisualGroup::CSelectablePrimRender::newCtrlQuad(uint edgeIn
|
|||
{
|
||||
//H_AUTO(R2_CDisplayerVisualGroup_CSelectablePrimRender)
|
||||
nlassert(DisplayedInstance);
|
||||
CCtrlQuadSelectable *result = new CCtrlQuadSelectable(*DisplayedInstance, edgeIndex);
|
||||
CViewBase::TCtorParam param;
|
||||
CCtrlQuadSelectable *result = new CCtrlQuadSelectable( param, *DisplayedInstance, edgeIndex);
|
||||
result->setToolTipParent(CCtrlBase::TTMouse);
|
||||
result->setToolTipParentPosRef(Hotspot_BR);
|
||||
result->setToolTipPosRef(Hotspot_TL);
|
||||
|
|
|
@ -110,7 +110,8 @@ CCtrlQuad *CInstanceMapDeco::newQuad(CGroupMap &owner)
|
|||
{
|
||||
//H_AUTO(R2_CInstanceMapDeco_newQuad)
|
||||
nlassert(_Instance);
|
||||
CCtrlQuad *q = new CCtrlQuad;
|
||||
CViewBase::TCtorParam param;
|
||||
CCtrlQuad *q = new CCtrlQuad( param );
|
||||
q->setActive(false);
|
||||
q->setModulateGlobalColor(false);
|
||||
owner.addCtrl(q);
|
||||
|
@ -156,9 +157,11 @@ void CInstanceMapDeco::onAdd(CGroupMap &owner)
|
|||
CInterfaceGroup *window = owner.getParentContainer();
|
||||
if (window)
|
||||
{
|
||||
CViewBase::TCtorParam param;
|
||||
|
||||
for(uint k = 0; k < 2; ++k)
|
||||
{
|
||||
_GlowStar[k] = new CCtrlQuad;
|
||||
_GlowStar[k] = new CCtrlQuad( param );
|
||||
_GlowStar[k]->setActive(false);
|
||||
_GlowStar[k]->setModulateGlobalColor(false);
|
||||
window->addCtrl(_GlowStar[k]);
|
||||
|
|
|
@ -188,6 +188,8 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const
|
|||
//H_AUTO(R2_CPrimRender_newCtrlPolygon)
|
||||
class CCtrlMapPolygon : public CCtrlPolygon
|
||||
{
|
||||
public:
|
||||
CCtrlMapPolygon( CViewBase::TCtorParam ¶m ) : CCtrlPolygon( param ){}
|
||||
protected:
|
||||
// from CCtrlPolygon
|
||||
void computeScaledVertex(NLMISC::CVector2f &dest, const NLMISC::CVector2f &src)
|
||||
|
@ -197,14 +199,16 @@ CCtrlPolygon *CPrimRender::newCtrlPolygon() const
|
|||
gm->worldToWindow(dest, src);
|
||||
}
|
||||
};
|
||||
return new CCtrlMapPolygon;
|
||||
CViewBase::TCtorParam param;
|
||||
return new CCtrlMapPolygon( param );
|
||||
}
|
||||
|
||||
// *********************************************************
|
||||
CCtrlQuad *CPrimRender::newCtrlQuad(uint /* edgeIndex */) const
|
||||
{
|
||||
//H_AUTO(R2_CPrimRender_newCtrlQuad)
|
||||
return new CCtrlQuad;
|
||||
CViewBase::TCtorParam param;
|
||||
return new CCtrlQuad( param );
|
||||
}
|
||||
|
||||
// *********************************************************
|
||||
|
|
Loading…
Reference in a new issue