Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
Nimetu 2016-06-16 23:32:47 +03:00
parent 41ef412c0c
commit 1bff654c7b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/client/data/gamedev/interfaces_v3/macros.xml
View file

@ -405,12 +405,12 @@
onclick_l="new_macro_new_cmd" /> onclick_l="new_macro_new_cmd" />
<group id="cmds" type="list" posref="BR TR" posparent="sep" x="0" y="-22" over="true" > <group id="cmds" x="0" y="-22" over="true" sizeref="w" posref="TL TL" posparent="sep" child_resize_h="true" child_resize_hmargin="4">
<!-- <group id="macros" x="10" y="-4" sizeref="w" posref="TL TL" child_resize_h="true" max_h="300" >
<instance template="macro_command" id="cmd1" posref="TL TL" /> <group id="list" type="list" x="0" y="0" posref="TL TL" />
<instance template="macro_command" id="cmd2" posparent="cmd1" posref="BL TL" />
-->
</group> </group>
<ctrl style="skin_scroll" id="sv" posref="TL TL" y="-4" target="macros" />
</group>
<instance template="button_ok_cancel" posparent="cmds" posref="BR TR" x="0" y="-4" <instance template="button_ok_cancel" posparent="cmds" posref="BR TR" x="0" y="-4"
onclick_ok="new_macro_ok" onclick_ok="new_macro_ok"
@ -660,4 +660,4 @@
<tree node="keys_r2ed"/> <tree node="keys_r2ed"/>
</tree> </tree>
</interface_config> </interface_config>

2
code/ryzom/client/src/interface_v3/macrocmd_manager.h
View file

@ -182,7 +182,7 @@ private:
#define NEWMACRO_TITLE_EDIT "uiEditMacro" #define NEWMACRO_TITLE_EDIT "uiEditMacro"
#define CTRL_NEWMACRO_ICON "ui:interface:new_macro:content:icon" #define CTRL_NEWMACRO_ICON "ui:interface:new_macro:content:icon"
#define GROUP_NEWMACRO_EDIT_NAME "ui:interface:new_macro:content:edit_name" #define GROUP_NEWMACRO_EDIT_NAME "ui:interface:new_macro:content:edit_name"
#define GROUP_NEWMACRO_COMMANDS "ui:interface:new_macro:content:cmds" #define GROUP_NEWMACRO_COMMANDS "ui:interface:new_macro:content:cmds:macros:list"
#define VIEW_NEWMACRO_KEY "ui:interface:new_macro:content:macro_key" #define VIEW_NEWMACRO_KEY "ui:interface:new_macro:content:macro_key"
#define TEMPLATE_NEWMACRO_COMMAND "macro_command" #define TEMPLATE_NEWMACRO_COMMAND "macro_command"
#define TEMPLATE_NEWMACRO_COMMAND_TEXT "macro_name" #define TEMPLATE_NEWMACRO_COMMAND_TEXT "macro_name"