aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-17 13:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some defaults.

Browse source
This commit is contained in:
dfighter1985 2013-05-10 22:29:47 +02:00
parent 776c95f12f
commit 9382e6d1f9
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/nel/src/gui/ctrl_text_button.cpp
View file

@ -237,6 +237,11 @@ namespace NLGUI
_TextureIdNormal[ 0 ].setTexture( std::string( value + "_l.tga" ).c_str() ); _TextureIdNormal[ 0 ].setTexture( std::string( value + "_l.tga" ).c_str() );
_TextureIdNormal[ 1 ].setTexture( std::string( value + "_m.tga" ).c_str() ); _TextureIdNormal[ 1 ].setTexture( std::string( value + "_m.tga" ).c_str() );
_TextureIdNormal[ 2 ].setTexture( std::string( value + "_r.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; return;
} }
else else
@ -891,7 +896,9 @@ namespace NLGUI
CViewBase *v = CWidgetManager::getInstance()->getParser()->createClass( "text" ); CViewBase *v = CWidgetManager::getInstance()->getParser()->createClass( "text" );
nlassert( v != NULL ); nlassert( v != NULL );
_ViewText = dynamic_cast< CViewText* >( v ); _ViewText = dynamic_cast< CViewText* >( v );
_ViewText->setId( _Id + "_text" );
_ViewText->setText( ucstring( "text" ) ); _ViewText->setText( ucstring( "text" ) );
_ViewText->setSerializable( false );
} }
// setup the viewText and add to parent // setup the viewText and add to parent

2
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlBaseButton.xml
View file

@ -11,7 +11,7 @@
<property> <property>
<name>button_type</name> <name>button_type</name>
<type>string</type> <type>string</type>
<default>toggle_button</default> <default>push_button</default>
</property> </property>
<property> <property>
<name>pushed</name> <name>pushed</name>

6
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlButton.xml
View file

@ -12,17 +12,17 @@
<property> <property>
<name>tx_normal</name> <name>tx_normal</name>
<type>string</type> <type>string</type>
<default></default> <default>log_but_r.tga</default>
</property> </property>
<property> <property>
<name>tx_pushed</name> <name>tx_pushed</name>
<type>string</type> <type>string</type>
<default></default> <default>log_but_r.tga</default>
</property> </property>
<property> <property>
<name>tx_over</name> <name>tx_over</name>
<type>string</type> <type>string</type>
<default></default> <default>log_but_over_r.tga</default>
</property> </property>
<property> <property>
<name>scale</name> <name>scale</name>

12
code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/widgets/CtrlTextButton.xml
View file

@ -12,27 +12,27 @@
<property> <property>
<name>tx_normal</name> <name>tx_normal</name>
<type>string</type> <type>string</type>
<default></default> <default>but</default>
</property> </property>
<property> <property>
<name>tx_pushed</name> <name>tx_pushed</name>
<type>string</type> <type>string</type>
<default></default> <default>but</default>
</property> </property>
<property> <property>
<name>tx_over</name> <name>tx_over</name>
<type>string</type> <type>string</type>
<default></default> <default>but_over</default>
</property> </property>
<property> <property>
<name>hardtext</name> <name>hardtext</name>
<type>string</type> <type>string</type>
<default></default> <default>text</default>
</property> </property>
<property> <property>
<name>wmargin</name> <name>wmargin</name>
<type>int</type> <type>int</type>
<default>0</default> <default>20</default>
</property> </property>
<property> <property>
<name>wmin</name> <name>wmin</name>
@ -152,7 +152,7 @@
<property> <property>
<name>line_maxw</name> <name>line_maxw</name>
<type>int</type> <type>int</type>
<default>0</default> <default>200</default>
</property> </property>
<property> <property>
<name>multi_line_space</name> <name>multi_line_space</name>