From b49a6ca04da264f96e17f357f072c482f2c47063 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Fri, 10 May 2013 22:29:47 +0200
Subject: [PATCH] Added some defaults.

--HG--
branch : gsoc2012-gui-editor
---
 code/nel/src/gui/ctrl_text_button.cpp                |  7 +++++++
 .../plugins/gui_editor/widgets/CtrlBaseButton.xml    |  2 +-
 .../src/plugins/gui_editor/widgets/CtrlButton.xml    |  6 +++---
 .../plugins/gui_editor/widgets/CtrlTextButton.xml    | 12 ++++++------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp
index 8dbe9b912..cdf006a51 100644
--- a/code/nel/src/gui/ctrl_text_button.cpp
+++ b/code/nel/src/gui/ctrl_text_button.cpp
@@ -237,6 +237,11 @@ namespace NLGUI
 			_TextureIdNormal[ 0 ].setTexture( std::string( value + "_l.tga" ).c_str() );
 			_TextureIdNormal[ 1 ].setTexture( std::string( value + "_m.tga" ).c_str() );
 			_TextureIdNormal[ 2 ].setTexture( std::string( value + "_r.tga" ).c_str() );
+			
+			CViewRenderer &rVR = *CViewRenderer::getInstance();
+			rVR.getTextureSizeFromId(_TextureIdNormal[0], _BmpLeftW, _BmpH);
+			rVR.getTextureSizeFromId(_TextureIdNormal[1], _BmpMiddleW, _BmpH);
+			rVR.getTextureSizeFromId(_TextureIdNormal[2], _BmpRightW, _BmpH);
 			return;
 		}
 		else
@@ -891,7 +896,9 @@ namespace NLGUI
 			CViewBase *v = CWidgetManager::getInstance()->getParser()->createClass( "text" );
 			nlassert( v != NULL );
 			_ViewText = dynamic_cast< CViewText* >( v );
+			_ViewText->setId( _Id + "_text" );
 			_ViewText->setText( ucstring( "text" ) );
+			_ViewText->setSerializable( false );
 		}
 
 		// setup the viewText and add to parent
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
index 722d1b241..42e2bdef1 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
@@ -11,7 +11,7 @@
         <property>
             <name>button_type</name>
             <type>string</type>
-            <default>toggle_button</default>
+            <default>push_button</default>
         </property>
         <property>
             <name>pushed</name>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml
index cb6f6c099..fb2514e7c 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml
@@ -12,17 +12,17 @@
         <property>
             <name>tx_normal</name>
             <type>string</type>
-            <default></default>
+            <default>log_but_r.tga</default>
         </property>
         <property>
             <name>tx_pushed</name>
             <type>string</type>
-            <default></default>
+            <default>log_but_r.tga</default>
         </property>
         <property>
             <name>tx_over</name>
             <type>string</type>
-            <default></default>
+            <default>log_but_over_r.tga</default>
         </property>
         <property>
             <name>scale</name>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml
index 8826cd5db..cacc45ccb 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml
@@ -12,27 +12,27 @@
         <property>
             <name>tx_normal</name>
             <type>string</type>
-            <default></default>
+            <default>but</default>
         </property>
         <property>
             <name>tx_pushed</name>
             <type>string</type>
-            <default></default>
+            <default>but</default>
         </property>
         <property>
             <name>tx_over</name>
             <type>string</type>
-            <default></default>
+            <default>but_over</default>
         </property>
         <property>
             <name>hardtext</name>
             <type>string</type>
-            <default></default>
+            <default>text</default>
         </property>
         <property>
             <name>wmargin</name>
             <type>int</type>
-            <default>0</default>
+            <default>20</default>
         </property>
         <property>
             <name>wmin</name>
@@ -152,7 +152,7 @@
         <property>
             <name>line_maxw</name>
             <type>int</type>
-            <default>0</default>
+            <default>200</default>
         </property>
         <property>
             <name>multi_line_space</name>