diff --git a/code/nel/include/nel/gui/interface_options.h b/code/nel/include/nel/gui/interface_options.h
index 6fcd6c18d..0ef9b0d6d 100644
--- a/code/nel/include/nel/gui/interface_options.h
+++ b/code/nel/include/nel/gui/interface_options.h
@@ -96,6 +96,116 @@ namespace NLGUI
};
+
+
+ // ***************************************************************************
+ class COptionsLayer : public CInterfaceOptions
+ {
+
+ public:
+ COptionsLayer();
+ ~COptionsLayer();
+ virtual bool parse (xmlNodePtr cur);
+
+ // Container optimizer
+
+ sint32 Tile_Blank;
+ sint32 Tile_M_Header, Tile_M_Scrollbar;
+ sint32 Tile_T, Tile_B, Tile_L, Tile_R;
+ sint32 Tile_B_Open, Tile_EM_Open, Tile_M_Open;
+
+ sint32 Scrollbar_Offset_X;
+ sint32 Scrollbar_W;
+ sint32 TxId_B_Scrollbar, W_B_Scrollbar, H_B_Scrollbar;
+ sint32 TxId_M_Scrollbar, W_M_Scrollbar, H_M_Scrollbar;
+ sint32 TxId_T_Scrollbar, W_T_Scrollbar, H_T_Scrollbar;
+
+ sint32 TxId_L_Header, W_L_Header, H_L_Header;
+ sint32 TxId_M_Header, W_M_Header, H_M_Header;
+ sint32 TxId_R_Header, W_R_Header, H_R_Header;
+
+ sint32 TxId_TL, W_TL, H_TL;
+ sint32 TxId_T, W_T, H_T;
+ sint32 TxId_TR, W_TR, H_TR;
+ sint32 TxId_L, W_L, H_L;
+ sint32 TxId_R, W_R, H_R;
+ sint32 TxId_Blank, W_Blank, H_Blank;
+ sint32 TxId_BL, W_BL, H_BL;
+ sint32 TxId_B, W_B, H_B;
+ sint32 TxId_BR, W_BR, H_BR;
+
+ sint32 TxId_BL_Open, W_BL_Open, H_BL_Open;
+ sint32 TxId_B_Open, W_B_Open, H_B_Open;
+ sint32 TxId_BR_Open, W_BR_Open, H_BR_Open;
+ sint32 TxId_EL_Open, W_EL_Open, H_EL_Open;
+ sint32 TxId_EM_Open, W_EM_Open, H_EM_Open;
+ sint32 TxId_ER_Open, W_ER_Open, H_ER_Open;
+ sint32 TxId_E_Open, W_E_Open, H_E_Open;
+ sint32 TxId_M_Open, W_M_Open, H_M_Open;
+
+ sint32 TxId_TL_HighLight;
+ sint32 TxId_T_HighLight;
+ sint32 TxId_TR_HighLight;
+ sint32 TxId_L_HighLight;
+ sint32 TxId_R_HighLight;
+ sint32 TxId_BL_HighLight;
+ sint32 TxId_B_HighLight;
+ sint32 TxId_BR_HighLight;
+
+ sint32 HeaderH;
+ };
+
+ // ***************************************************************************
+ class COptionsContainerInsertion : public CInterfaceOptions
+ {
+ public:
+ COptionsContainerInsertion();
+ virtual bool parse (xmlNodePtr cur);
+
+ sint32 TxId_R_Arrow;
+ sint32 TxId_L_Arrow;
+ sint32 TxId_T_Arrow;
+ sint32 TxId_B_Arrow;
+ sint32 TxId_InsertionBar;
+ };
+
+ // ***************************************************************************
+ class COptionsContainerMove : public CInterfaceOptions
+ {
+ public:
+ COptionsContainerMove();
+ virtual bool parse (xmlNodePtr cur);
+
+ sint32 TrackW;
+ sint32 TrackH;
+ sint32 TrackY;
+ sint32 TrackYWithTopResizer;
+ sint32 TrackHWithTopResizer;
+ sint32 ResizerSize;
+ };
+
+
+
+ // ***************************************************************************
+ /**
+ * read a list of with no name. id auto incremented
+ */
+ class COptionsList : public CInterfaceOptions
+ {
+ public:
+ COptionsList();
+ virtual bool parse (xmlNodePtr cur);
+
+ uint getNumParams() const {return _NumParams;}
+
+ // get a value by its index (from 0 to numParams)
+ const CInterfaceOptionValue &getValue(uint paramId) const;
+
+ private:
+ uint _NumParams;
+ };
+
+
}
#endif // NL_INTERFACE_LAYER_H
diff --git a/code/nel/src/gui/interface_options.cpp b/code/nel/src/gui/interface_options.cpp
index c4cd33f2c..28c1edafb 100644
--- a/code/nel/src/gui/interface_options.cpp
+++ b/code/nel/src/gui/interface_options.cpp
@@ -18,6 +18,7 @@
#include "nel/gui/interface_element.h"
#include "nel/gui/interface_options.h"
+#include "nel/gui/view_renderer.h"
using namespace std;
using namespace NLMISC;
@@ -124,4 +125,213 @@ namespace NLGUI
return getValue(sParamName).getValBool();
}
+
+
+ // ----------------------------------------------------------------------------
+ // CInterfaceLayer
+ // ----------------------------------------------------------------------------
+
+ // ----------------------------------------------------------------------------
+ COptionsLayer::COptionsLayer()
+ {
+ TxId_TL = TxId_T = TxId_TR = TxId_L = TxId_R = TxId_Blank = TxId_BL = TxId_B = -2;
+ TxId_BR = TxId_BL_Open = TxId_B_Open = TxId_BR_Open = TxId_EL_Open = TxId_EM_Open = TxId_ER_Open =-2;
+ Tile_Blank = 0;
+ Tile_M_Header = Tile_M_Scrollbar = 0;
+ Tile_T = Tile_B = Tile_L = Tile_R = 0;
+ Tile_B_Open = Tile_EM_Open = Tile_M_Open = 0;
+ Scrollbar_Offset_X = 4;
+ Scrollbar_W = 8;
+ }
+
+ // ----------------------------------------------------------------------------
+ COptionsLayer::~COptionsLayer()
+ {
+ }
+
+ // ----------------------------------------------------------------------------
+ bool COptionsLayer::parse (xmlNodePtr cur)
+ {
+ if (!CInterfaceOptions::parse (cur))
+ return false;
+
+ CViewRenderer &rVR = *CViewRenderer::getInstance();
+
+ Tile_Blank = getValSInt32("tile_blank");
+ Tile_M_Header = getValSInt32("tile_m_header");
+ Tile_M_Scrollbar = getValSInt32("tile_m_scrollbar");
+ Tile_T = getValSInt32("tile_t");
+ Tile_B = getValSInt32("tile_b");
+ Tile_L = getValSInt32("tile_l");
+ Tile_R = getValSInt32("tile_r");
+ Tile_B_Open = getValSInt32("tile_b_open");
+ Tile_EM_Open = getValSInt32("tile_em_open");
+ Tile_M_Open = getValSInt32("tile_m_open");
+
+ Scrollbar_Offset_X = getValSInt32("scrollbar_offset_x");
+ Scrollbar_W = getValSInt32("scrollbar_size_w");
+ TxId_B_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_b"));
+ rVR.getTextureSizeFromId(TxId_B_Scrollbar, W_B_Scrollbar, H_B_Scrollbar);
+ TxId_M_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_m"));
+ rVR.getTextureSizeFromId(TxId_M_Scrollbar, W_M_Scrollbar, H_M_Scrollbar);
+ TxId_T_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_t"));
+ rVR.getTextureSizeFromId(TxId_T_Scrollbar, W_T_Scrollbar, H_T_Scrollbar);
+
+ TxId_L_Header = rVR.getTextureIdFromName (getValStr("tx_l_header"));
+ rVR.getTextureSizeFromId(TxId_L_Header, W_L_Header, H_L_Header);
+ TxId_M_Header = rVR.getTextureIdFromName (getValStr("tx_m_header"));
+ rVR.getTextureSizeFromId(TxId_M_Header, W_M_Header, H_M_Header);
+ TxId_R_Header = rVR.getTextureIdFromName (getValStr("tx_r_header"));
+ rVR.getTextureSizeFromId(TxId_R_Header, W_R_Header, H_R_Header);
+
+ TxId_TL = rVR.getTextureIdFromName (getValStr("tx_tl"));
+ rVR.getTextureSizeFromId(TxId_TL, W_TL, H_TL);
+ TxId_T = rVR.getTextureIdFromName (getValStr("tx_t"));
+ rVR.getTextureSizeFromId(TxId_T, W_T, H_T);
+ TxId_TR = rVR.getTextureIdFromName (getValStr("tx_tr"));
+ rVR.getTextureSizeFromId(TxId_TR, W_TR, H_TR);
+ TxId_L = rVR.getTextureIdFromName (getValStr("tx_l"));
+ rVR.getTextureSizeFromId(TxId_L, W_L, H_L);
+ TxId_R = rVR.getTextureIdFromName (getValStr("tx_r"));
+ rVR.getTextureSizeFromId(TxId_R, W_R, H_R);
+ TxId_Blank = rVR.getTextureIdFromName (getValStr("tx_blank"));
+ rVR.getTextureSizeFromId(TxId_Blank, W_Blank, H_Blank);
+ TxId_BL = rVR.getTextureIdFromName (getValStr("tx_bl"));
+ rVR.getTextureSizeFromId(TxId_BL, W_BL, H_BL);
+ TxId_B = rVR.getTextureIdFromName (getValStr("tx_b"));
+ rVR.getTextureSizeFromId(TxId_B, W_B, H_B);
+ TxId_BR = rVR.getTextureIdFromName (getValStr("tx_br"));
+ rVR.getTextureSizeFromId(TxId_BR, W_BR, H_BR);
+ //
+ TxId_BL_Open = rVR.getTextureIdFromName (getValStr("tx_bl_open"));
+ rVR.getTextureSizeFromId(TxId_BL_Open, W_BL_Open, H_BL_Open);
+ TxId_B_Open = rVR.getTextureIdFromName (getValStr("tx_b_open"));
+ rVR.getTextureSizeFromId(TxId_B_Open, W_B_Open, H_B_Open);
+ TxId_BR_Open = rVR.getTextureIdFromName (getValStr("tx_br_open"));
+ rVR.getTextureSizeFromId(TxId_BR_Open, W_BR_Open, H_BR_Open);
+ TxId_EL_Open = rVR.getTextureIdFromName (getValStr("tx_el_open"));
+ rVR.getTextureSizeFromId(TxId_EL_Open, W_EL_Open, H_EL_Open);
+ TxId_EM_Open = rVR.getTextureIdFromName (getValStr("tx_em_open"));
+ rVR.getTextureSizeFromId(TxId_EM_Open, W_EM_Open, H_EM_Open);
+ TxId_ER_Open = rVR.getTextureIdFromName (getValStr("tx_er_open"));
+ rVR.getTextureSizeFromId(TxId_ER_Open, W_ER_Open, H_ER_Open);
+ TxId_M_Open = rVR.getTextureIdFromName (getValStr("tx_m_open"));
+ rVR.getTextureSizeFromId(TxId_M_Open, W_M_Open, H_M_Open);
+ TxId_E_Open = rVR.getTextureIdFromName (getValStr("tx_e_open"));
+ rVR.getTextureSizeFromId(TxId_E_Open, W_E_Open, H_E_Open);
+ //
+
+ TxId_TL_HighLight = rVR.getTextureIdFromName (getValStr("tx_tl_highlight"));
+ TxId_T_HighLight = rVR.getTextureIdFromName (getValStr("tx_t_highlight"));
+ TxId_TR_HighLight = rVR.getTextureIdFromName (getValStr("tx_tr_highlight"));
+ TxId_L_HighLight = rVR.getTextureIdFromName (getValStr("tx_l_highlight"));
+ TxId_R_HighLight = rVR.getTextureIdFromName (getValStr("tx_r_highlight"));
+ TxId_BL_HighLight = rVR.getTextureIdFromName (getValStr("tx_bl_highlight"));
+ TxId_B_HighLight = rVR.getTextureIdFromName (getValStr("tx_b_highlight"));
+ TxId_BR_HighLight = rVR.getTextureIdFromName (getValStr("tx_br_highlight"));
+
+ //
+ HeaderH = getValSInt32("header_h");
+
+ return true;
+ }
+
+ // ----------------------------------------------------------------------------
+ COptionsContainerInsertion::COptionsContainerInsertion()
+ {
+ TxId_R_Arrow = -2;
+ TxId_L_Arrow = -2;
+ TxId_T_Arrow = -2;
+ TxId_B_Arrow = -2;
+ TxId_InsertionBar = -2;
+ }
+
+ // ----------------------------------------------------------------------------
+ bool COptionsContainerInsertion::parse(xmlNodePtr cur)
+ {
+ if (!CInterfaceOptions::parse (cur))
+ return false;
+
+ CViewRenderer &rVR = *CViewRenderer::getInstance();
+ TxId_T_Arrow = rVR.getTextureIdFromName (getValStr("arrow_top"));
+ TxId_B_Arrow = rVR.getTextureIdFromName (getValStr("arrow_down"));
+ TxId_L_Arrow = rVR.getTextureIdFromName (getValStr("arrow_left"));
+ TxId_R_Arrow = rVR.getTextureIdFromName (getValStr("arrow_right"));
+ TxId_InsertionBar = rVR.getTextureIdFromName (getValStr("insertion_bar"));
+
+ return true;
+ }
+
+
+ // ***************************************************************************
+ COptionsContainerMove::COptionsContainerMove()
+ {
+ TrackW = -8;
+ TrackH = 22;
+ TrackY = -4;
+ TrackYWithTopResizer = -8;
+ TrackHWithTopResizer = 18;
+ ResizerSize = 8;
+ }
+
+ // ***************************************************************************
+ bool COptionsContainerMove::parse(xmlNodePtr cur)
+ {
+ if (!CInterfaceOptions::parse (cur))
+ return false;
+ fromString(getValStr("track_w"), TrackW);
+ fromString(getValStr("track_h"), TrackH);
+ fromString(getValStr("track_y"), TrackY);
+ fromString(getValStr("track_y_with_top_resizer"), TrackYWithTopResizer);
+ fromString(getValStr("track_h_with_top_resizer"), TrackHWithTopResizer);
+ fromString(getValStr("resizer_size"), ResizerSize);
+ return true;
+ }
+
+ // ***************************************************************************
+ COptionsList::COptionsList()
+ {
+ _NumParams= 0;
+ }
+
+ // ***************************************************************************
+ bool COptionsList::parse (xmlNodePtr cur)
+ {
+ cur = cur->children;
+ bool ok = true;
+ uint id= 0;
+ while (cur)
+ {
+ if ( !stricmp((char*)cur->name,"param") )
+ {
+ CXMLAutoPtr ptr, val;
+ val = xmlGetProp (cur, (xmlChar*)"value");
+ if (!val)
+ {
+ nlinfo("param with no name or no value");
+ ok = false;
+ }
+ else
+ {
+ string value = (string((const char*)val));
+ _ParamValue[toString(id)].init(value);
+ id++;
+ }
+ }
+ cur = cur->next;
+ }
+
+ _NumParams= id;
+
+ return ok;
+ }
+
+
+ // ***************************************************************************
+ const CInterfaceOptionValue &COptionsList::getValue(uint paramId) const
+ {
+ return CInterfaceOptions::getValue(toString(paramId));
+ }
+
+
}
diff --git a/code/ryzom/client/src/interface_v3/group_container.cpp b/code/ryzom/client/src/interface_v3/group_container.cpp
index ecf2ba5b9..f787a4f9a 100644
--- a/code/ryzom/client/src/interface_v3/group_container.cpp
+++ b/code/ryzom/client/src/interface_v3/group_container.cpp
@@ -22,7 +22,6 @@
#include "group_container.h"
#include "interface_manager.h"
#include "nel/gui/interface_options.h"
-#include "interface_options_ryzom.h"
#include "nel/misc/xml_auto_ptr.h"
#include "nel/gui/action_handler.h"
#include "../time_client.h"
diff --git a/code/ryzom/client/src/interface_v3/group_container.h b/code/ryzom/client/src/interface_v3/group_container.h
index aa1ac8018..07e2f95ec 100644
--- a/code/ryzom/client/src/interface_v3/group_container.h
+++ b/code/ryzom/client/src/interface_v3/group_container.h
@@ -31,13 +31,13 @@ namespace NLGUI
class CViewText;
class CViewBitmap;
class CGroupList;
+ class COptionsContainerInsertion;
+ class COptionsContainerMove;
+ class COptionsLayer;
}
-class COptionsContainerInsertion;
-class COptionsContainerMove;
class CGroupContainer;
class CInterfaceManager;
-class COptionsLayer;
// ***************************************************************************
/**
diff --git a/code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp b/code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp
index 8e29004fa..11cdc1a91 100644
--- a/code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_options_ryzom.cpp
@@ -39,215 +39,6 @@ using namespace NLMISC;
extern CEntityAnimationManager *EAM;
-// ----------------------------------------------------------------------------
-// CInterfaceLayer
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-COptionsLayer::COptionsLayer()
-{
- TxId_TL = TxId_T = TxId_TR = TxId_L = TxId_R = TxId_Blank = TxId_BL = TxId_B = -2;
- TxId_BR = TxId_BL_Open = TxId_B_Open = TxId_BR_Open = TxId_EL_Open = TxId_EM_Open = TxId_ER_Open =-2;
- Tile_Blank = 0;
- Tile_M_Header = Tile_M_Scrollbar = 0;
- Tile_T = Tile_B = Tile_L = Tile_R = 0;
- Tile_B_Open = Tile_EM_Open = Tile_M_Open = 0;
- Scrollbar_Offset_X = 4;
- Scrollbar_W = 8;
-}
-
-// ----------------------------------------------------------------------------
-COptionsLayer::~COptionsLayer()
-{
-}
-
-// ----------------------------------------------------------------------------
-bool COptionsLayer::parse (xmlNodePtr cur)
-{
- if (!CInterfaceOptions::parse (cur))
- return false;
-
- CInterfaceManager *pIM = CInterfaceManager::getInstance();
- CViewRenderer &rVR = *CViewRenderer::getInstance();
-
- Tile_Blank = getValSInt32("tile_blank");
- Tile_M_Header = getValSInt32("tile_m_header");
- Tile_M_Scrollbar = getValSInt32("tile_m_scrollbar");
- Tile_T = getValSInt32("tile_t");
- Tile_B = getValSInt32("tile_b");
- Tile_L = getValSInt32("tile_l");
- Tile_R = getValSInt32("tile_r");
- Tile_B_Open = getValSInt32("tile_b_open");
- Tile_EM_Open = getValSInt32("tile_em_open");
- Tile_M_Open = getValSInt32("tile_m_open");
-
- Scrollbar_Offset_X = getValSInt32("scrollbar_offset_x");
- Scrollbar_W = getValSInt32("scrollbar_size_w");
- TxId_B_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_b"));
- rVR.getTextureSizeFromId(TxId_B_Scrollbar, W_B_Scrollbar, H_B_Scrollbar);
- TxId_M_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_m"));
- rVR.getTextureSizeFromId(TxId_M_Scrollbar, W_M_Scrollbar, H_M_Scrollbar);
- TxId_T_Scrollbar = rVR.getTextureIdFromName (getValStr("scrollbar_tx_t"));
- rVR.getTextureSizeFromId(TxId_T_Scrollbar, W_T_Scrollbar, H_T_Scrollbar);
-
- TxId_L_Header = rVR.getTextureIdFromName (getValStr("tx_l_header"));
- rVR.getTextureSizeFromId(TxId_L_Header, W_L_Header, H_L_Header);
- TxId_M_Header = rVR.getTextureIdFromName (getValStr("tx_m_header"));
- rVR.getTextureSizeFromId(TxId_M_Header, W_M_Header, H_M_Header);
- TxId_R_Header = rVR.getTextureIdFromName (getValStr("tx_r_header"));
- rVR.getTextureSizeFromId(TxId_R_Header, W_R_Header, H_R_Header);
-
- TxId_TL = rVR.getTextureIdFromName (getValStr("tx_tl"));
- rVR.getTextureSizeFromId(TxId_TL, W_TL, H_TL);
- TxId_T = rVR.getTextureIdFromName (getValStr("tx_t"));
- rVR.getTextureSizeFromId(TxId_T, W_T, H_T);
- TxId_TR = rVR.getTextureIdFromName (getValStr("tx_tr"));
- rVR.getTextureSizeFromId(TxId_TR, W_TR, H_TR);
- TxId_L = rVR.getTextureIdFromName (getValStr("tx_l"));
- rVR.getTextureSizeFromId(TxId_L, W_L, H_L);
- TxId_R = rVR.getTextureIdFromName (getValStr("tx_r"));
- rVR.getTextureSizeFromId(TxId_R, W_R, H_R);
- TxId_Blank = rVR.getTextureIdFromName (getValStr("tx_blank"));
- rVR.getTextureSizeFromId(TxId_Blank, W_Blank, H_Blank);
- TxId_BL = rVR.getTextureIdFromName (getValStr("tx_bl"));
- rVR.getTextureSizeFromId(TxId_BL, W_BL, H_BL);
- TxId_B = rVR.getTextureIdFromName (getValStr("tx_b"));
- rVR.getTextureSizeFromId(TxId_B, W_B, H_B);
- TxId_BR = rVR.getTextureIdFromName (getValStr("tx_br"));
- rVR.getTextureSizeFromId(TxId_BR, W_BR, H_BR);
- //
- TxId_BL_Open = rVR.getTextureIdFromName (getValStr("tx_bl_open"));
- rVR.getTextureSizeFromId(TxId_BL_Open, W_BL_Open, H_BL_Open);
- TxId_B_Open = rVR.getTextureIdFromName (getValStr("tx_b_open"));
- rVR.getTextureSizeFromId(TxId_B_Open, W_B_Open, H_B_Open);
- TxId_BR_Open = rVR.getTextureIdFromName (getValStr("tx_br_open"));
- rVR.getTextureSizeFromId(TxId_BR_Open, W_BR_Open, H_BR_Open);
- TxId_EL_Open = rVR.getTextureIdFromName (getValStr("tx_el_open"));
- rVR.getTextureSizeFromId(TxId_EL_Open, W_EL_Open, H_EL_Open);
- TxId_EM_Open = rVR.getTextureIdFromName (getValStr("tx_em_open"));
- rVR.getTextureSizeFromId(TxId_EM_Open, W_EM_Open, H_EM_Open);
- TxId_ER_Open = rVR.getTextureIdFromName (getValStr("tx_er_open"));
- rVR.getTextureSizeFromId(TxId_ER_Open, W_ER_Open, H_ER_Open);
- TxId_M_Open = rVR.getTextureIdFromName (getValStr("tx_m_open"));
- rVR.getTextureSizeFromId(TxId_M_Open, W_M_Open, H_M_Open);
- TxId_E_Open = rVR.getTextureIdFromName (getValStr("tx_e_open"));
- rVR.getTextureSizeFromId(TxId_E_Open, W_E_Open, H_E_Open);
- //
-
- TxId_TL_HighLight = rVR.getTextureIdFromName (getValStr("tx_tl_highlight"));
- TxId_T_HighLight = rVR.getTextureIdFromName (getValStr("tx_t_highlight"));
- TxId_TR_HighLight = rVR.getTextureIdFromName (getValStr("tx_tr_highlight"));
- TxId_L_HighLight = rVR.getTextureIdFromName (getValStr("tx_l_highlight"));
- TxId_R_HighLight = rVR.getTextureIdFromName (getValStr("tx_r_highlight"));
- TxId_BL_HighLight = rVR.getTextureIdFromName (getValStr("tx_bl_highlight"));
- TxId_B_HighLight = rVR.getTextureIdFromName (getValStr("tx_b_highlight"));
- TxId_BR_HighLight = rVR.getTextureIdFromName (getValStr("tx_br_highlight"));
-
- //
- HeaderH = getValSInt32("header_h");
-
- return true;
-}
-
-// ----------------------------------------------------------------------------
-COptionsContainerInsertion::COptionsContainerInsertion()
-{
- TxId_R_Arrow = -2;
- TxId_L_Arrow = -2;
- TxId_T_Arrow = -2;
- TxId_B_Arrow = -2;
- TxId_InsertionBar = -2;
-}
-
-// ----------------------------------------------------------------------------
-bool COptionsContainerInsertion::parse(xmlNodePtr cur)
-{
- if (!CInterfaceOptions::parse (cur))
- return false;
-
- CInterfaceManager *pIM = CInterfaceManager::getInstance();
- CViewRenderer &rVR = *CViewRenderer::getInstance();
- TxId_T_Arrow = rVR.getTextureIdFromName (getValStr("arrow_top"));
- TxId_B_Arrow = rVR.getTextureIdFromName (getValStr("arrow_down"));
- TxId_L_Arrow = rVR.getTextureIdFromName (getValStr("arrow_left"));
- TxId_R_Arrow = rVR.getTextureIdFromName (getValStr("arrow_right"));
- TxId_InsertionBar = rVR.getTextureIdFromName (getValStr("insertion_bar"));
-
- return true;
-}
-
-
-// ***************************************************************************
-COptionsContainerMove::COptionsContainerMove()
-{
- TrackW = -8;
- TrackH = 22;
- TrackY = -4;
- TrackYWithTopResizer = -8;
- TrackHWithTopResizer = 18;
- ResizerSize = 8;
-}
-
-// ***************************************************************************
-bool COptionsContainerMove::parse(xmlNodePtr cur)
-{
- if (!CInterfaceOptions::parse (cur))
- return false;
- fromString(getValStr("track_w"), TrackW);
- fromString(getValStr("track_h"), TrackH);
- fromString(getValStr("track_y"), TrackY);
- fromString(getValStr("track_y_with_top_resizer"), TrackYWithTopResizer);
- fromString(getValStr("track_h_with_top_resizer"), TrackHWithTopResizer);
- fromString(getValStr("resizer_size"), ResizerSize);
- return true;
-}
-
-// ***************************************************************************
-COptionsList::COptionsList()
-{
- _NumParams= 0;
-}
-
-// ***************************************************************************
-bool COptionsList::parse (xmlNodePtr cur)
-{
- cur = cur->children;
- bool ok = true;
- uint id= 0;
- while (cur)
- {
- if ( !stricmp((char*)cur->name,"param") )
- {
- CXMLAutoPtr ptr, val;
- val = xmlGetProp (cur, (xmlChar*)"value");
- if (!val)
- {
- nlinfo("param with no name or no value");
- ok = false;
- }
- else
- {
- string value = (string((const char*)val));
- _ParamValue[toString(id)].init(value);
- id++;
- }
- }
- cur = cur->next;
- }
-
- _NumParams= id;
-
- return ok;
-}
-
-
-// ***************************************************************************
-const CInterfaceOptionValue &COptionsList::getValue(uint paramId) const
-{
- return CInterfaceOptions::getValue(toString(paramId));
-}
-
-
// ***************************************************************************
bool CMissionIconList::parse(xmlNodePtr cur)
{
diff --git a/code/ryzom/client/src/interface_v3/interface_options_ryzom.h b/code/ryzom/client/src/interface_v3/interface_options_ryzom.h
index 14a623e28..24d3b7524 100644
--- a/code/ryzom/client/src/interface_v3/interface_options_ryzom.h
+++ b/code/ryzom/client/src/interface_v3/interface_options_ryzom.h
@@ -22,113 +22,6 @@
using namespace NLGUI;
-// ***************************************************************************
-class COptionsLayer : public CInterfaceOptions
-{
-
-public:
- COptionsLayer();
- ~COptionsLayer();
- virtual bool parse (xmlNodePtr cur);
-
- // Container optimizer
-
- sint32 Tile_Blank;
- sint32 Tile_M_Header, Tile_M_Scrollbar;
- sint32 Tile_T, Tile_B, Tile_L, Tile_R;
- sint32 Tile_B_Open, Tile_EM_Open, Tile_M_Open;
-
- sint32 Scrollbar_Offset_X;
- sint32 Scrollbar_W;
- sint32 TxId_B_Scrollbar, W_B_Scrollbar, H_B_Scrollbar;
- sint32 TxId_M_Scrollbar, W_M_Scrollbar, H_M_Scrollbar;
- sint32 TxId_T_Scrollbar, W_T_Scrollbar, H_T_Scrollbar;
-
- sint32 TxId_L_Header, W_L_Header, H_L_Header;
- sint32 TxId_M_Header, W_M_Header, H_M_Header;
- sint32 TxId_R_Header, W_R_Header, H_R_Header;
-
- sint32 TxId_TL, W_TL, H_TL;
- sint32 TxId_T, W_T, H_T;
- sint32 TxId_TR, W_TR, H_TR;
- sint32 TxId_L, W_L, H_L;
- sint32 TxId_R, W_R, H_R;
- sint32 TxId_Blank, W_Blank, H_Blank;
- sint32 TxId_BL, W_BL, H_BL;
- sint32 TxId_B, W_B, H_B;
- sint32 TxId_BR, W_BR, H_BR;
-
- sint32 TxId_BL_Open, W_BL_Open, H_BL_Open;
- sint32 TxId_B_Open, W_B_Open, H_B_Open;
- sint32 TxId_BR_Open, W_BR_Open, H_BR_Open;
- sint32 TxId_EL_Open, W_EL_Open, H_EL_Open;
- sint32 TxId_EM_Open, W_EM_Open, H_EM_Open;
- sint32 TxId_ER_Open, W_ER_Open, H_ER_Open;
- sint32 TxId_E_Open, W_E_Open, H_E_Open;
- sint32 TxId_M_Open, W_M_Open, H_M_Open;
-
- sint32 TxId_TL_HighLight;
- sint32 TxId_T_HighLight;
- sint32 TxId_TR_HighLight;
- sint32 TxId_L_HighLight;
- sint32 TxId_R_HighLight;
- sint32 TxId_BL_HighLight;
- sint32 TxId_B_HighLight;
- sint32 TxId_BR_HighLight;
-
- sint32 HeaderH;
-};
-
-// ***************************************************************************
-class COptionsContainerInsertion : public CInterfaceOptions
-{
-public:
- COptionsContainerInsertion();
- virtual bool parse (xmlNodePtr cur);
-
- sint32 TxId_R_Arrow;
- sint32 TxId_L_Arrow;
- sint32 TxId_T_Arrow;
- sint32 TxId_B_Arrow;
- sint32 TxId_InsertionBar;
-};
-
-// ***************************************************************************
-class COptionsContainerMove : public CInterfaceOptions
-{
-public:
- COptionsContainerMove();
- virtual bool parse (xmlNodePtr cur);
-
- sint32 TrackW;
- sint32 TrackH;
- sint32 TrackY;
- sint32 TrackYWithTopResizer;
- sint32 TrackHWithTopResizer;
- sint32 ResizerSize;
-};
-
-
-
-// ***************************************************************************
-/**
- * read a list of with no name. id auto incremented
- */
-class COptionsList : public CInterfaceOptions
-{
-public:
- COptionsList();
- virtual bool parse (xmlNodePtr cur);
-
- uint getNumParams() const {return _NumParams;}
-
- // get a value by its index (from 0 to numParams)
- const CInterfaceOptionValue &getValue(uint paramId) const;
-
-private:
- uint _NumParams;
-};
-
// ***************************************************************************
class CMissionIconList : public CInterfaceOptions
{