From f4bb446439ca21a880843ce2b41411fb1615c39c Mon Sep 17 00:00:00 2001 From: Riasan Date: Sat, 2 Jul 2016 23:07:47 +0200 Subject: [PATCH] Fix: Bad Position of Text after fix the Text High --HG-- branch : compatibility-develop --- .../data/gamedev/interfaces_v3/compass.xml | 54 ++-- .../data/gamedev/interfaces_v3/config.xml | 36 +-- .../data/gamedev/interfaces_v3/help.xml | 20 +- .../gamedev/interfaces_v3/info_player.xml | 4 +- .../gamedev/interfaces_v3/interaction.xml | 36 +-- .../data/gamedev/interfaces_v3/inventory.xml | 256 +----------------- .../data/gamedev/interfaces_v3/login_main.xml | 18 +- .../gamedev/interfaces_v3/login_widgets.xml | 10 +- .../gamedev/interfaces_v3/out_v2_appear.xml | 68 ++--- .../gamedev/interfaces_v3/out_v2_select.xml | 6 +- .../data/gamedev/interfaces_v3/phrase.xml | 2 +- .../interfaces_v3/r2_logic_entities.xml | 8 +- .../gamedev/interfaces_v3/r2_triggers.xml | 4 +- .../data/gamedev/interfaces_v3/r2ed.xml | 38 +-- .../data/gamedev/interfaces_v3/r2ed_acts.xml | 10 +- .../gamedev/interfaces_v3/r2ed_scenario.xml | 4 +- .../ring_access_point_filter.xml | 2 +- .../gamedev/interfaces_v3/ring_window.xml | 12 +- .../data/gamedev/interfaces_v3/widgets.xml | 10 +- 19 files changed, 181 insertions(+), 417 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml index d04d7fba0..35a259ea4 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/compass.xml @@ -645,7 +645,7 @@ id="dist" posref="BM BM" x="0" - y="0" + y="2" hardtext="uiRadarZoom0" shadow="true" color="255 255 255 255" @@ -694,7 +694,7 @@ id="range" posref="BM MM" x="0" - y="16" + y="20" hardtext="uiRadarZoom0" shadow="true" color="255 255 255 255" @@ -748,8 +748,8 @@ posref="BM BM" x="0" y="26" - w="44" - h="18" /> + w="46" + h="25" /> + value="-7" /> + value="-7" /> + value="-23" /> + value="-7" /> + value="-7" /> + value="-7" /> + value="-4" /> + value="-4" /> + value="-3" /> + value="-3" /> + value="-3" /> + value="-3" /> + value="-3" /> + value="-3" /> + value="-4" /> + value="-4" /> @@ -1698,11 +1698,11 @@ + value="0" /> + value="0" /> diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml index 39cfb1af4..9fe7e91a4 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml @@ -138,7 +138,7 @@ x="0" y="6" posref="BM BM" - text_y="-2" + text_y="0" onclick_l="proc" params_l="welcome_close" hardtext="uittOK" /> @@ -199,7 +199,7 @@ x="-15" y="10" posref="BM BM" - text_y="-2" + text_y="0" onclick_l="proc" params_l="active_hardware_cursor" hardtext="uiYes" /> @@ -208,7 +208,7 @@ y="0" posparent="active_ok" posref="BR BL" - text_y="-2" + text_y="0" onclick_l="proc" params_l="close_hardware_cursor" hardtext="uiNo" /> @@ -316,7 +316,7 @@ x="0" y="6" posref="BM BM" - text_y="-2" + text_y="0" onclick_l="proc" params_l="universe_chanel_warning_close" hardtext="uittOK" /> @@ -424,7 +424,7 @@ x="0" y="6" posref="BM BM" - text_y="-2" + text_y="0" onclick_l="proc" params_l="death_warning_close" hardtext="uittOK" /> @@ -531,7 +531,7 @@ x="0" y="6" posref="BM BM" - text_y="-2" + text_y="0" onclick_l="proc" params_l="night_warning_close" hardtext="uittOK" /> @@ -2828,7 +2828,7 @@ global_color_normal="true" global_color_over="true" global_color_pushed="true" - text_y="-2" + text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" @@ -2887,21 +2887,21 @@ x="4" y="0" posref="TL TL" - text_y="-2" + text_y="0" onclick_l="proc" params_l="proc_stat_report_yes" hardtext="uiYes" /> @@ -246,7 +246,7 @@ posref="MM MM" posparent="slot_force" x="0" - y="-2" + y="0" color="255 255 255 255" fontsize="10" shadow="true" @@ -364,7 +364,7 @@ id="b_life" posref="TL TL" x="0" - y="-2" + y="0" texture="slot_jauge.tga" inherit_gc_alpha="false" /> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1863,66 +1684,9 @@ tooltip="uittHandSet" tooltip_parent="win" /> - - - - - - - diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml index d87dfb51b..5493fb143 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml @@ -48,7 +48,7 @@ prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="12" color="135 243 28 255" /> @@ -113,8 +113,8 @@ - - + + @@ -187,7 +187,7 @@ - + @@ -291,7 +291,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t - + @@ -346,7 +346,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t - + @@ -403,7 +403,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t - + @@ -511,7 +511,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t - + @@ -556,7 +556,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t - + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml index 40f71f24e..510525a8e 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_widgets.xml @@ -598,8 +598,8 @@ @@ -614,7 +614,7 @@ @@ -623,7 +623,7 @@ @@ -632,7 +632,7 @@ diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml index 831e1966c..23b31ccaa 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml @@ -1294,7 +1294,7 @@ max_chars_size="252" menu_r="" max_historic="" entry_type="alpha"> - @@ -2049,19 +2049,19 @@ - - - - @@ -2091,11 +2091,11 @@ - - @@ -2117,7 +2117,7 @@ - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + @@ -2306,9 +2306,9 @@ - - - + + + @@ -2335,13 +2335,13 @@ - - - - @@ -2397,8 +2397,8 @@ - - + + @@ -2467,7 +2467,7 @@ - + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml index 8237e8513..04f75e771 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml @@ -628,7 +628,7 @@ - + @@ -723,7 +723,7 @@ - + @@ -778,7 +778,7 @@ diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/r2_logic_entities.xml b/code/ryzom/client/data/gamedev/interfaces_v3/r2_logic_entities.xml index 218d281b2..b126c6f05 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/r2_logic_entities.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/r2_logic_entities.xml @@ -318,7 +318,7 @@ on_change_params="r2.events:initFilterMenu()" color_text="255 255 0 255" /> + text_y="0" onclick_l="lua" params_l="r2.events:newActionUI()" hardtext="uiR2EDAddAction" fontsize="10" text_color_normal="255 255 255 170" /> @@ -488,7 +488,7 @@ + text_y="0" onclick_l="lua" params_l="r2.events:newConditionUI()" hardtext="uiR2EDAddCondition" fontsize="10" text_color_normal="255 255 255 170" /> @@ -500,7 +500,7 @@ color="#col_pushed" col_over="#col_pushed" col_pushed="#col_pushed"/> + text_y="0" onclick_l="lua" params_l="r2.events:advancedEditor('true')" hardtext="Advanced..." fontsize="12" text_color_normal="255 255 255 150" /> diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/r2_triggers.xml b/code/ryzom/client/data/gamedev/interfaces_v3/r2_triggers.xml index fce09b735..8647e7792 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/r2_triggers.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/r2_triggers.xml @@ -196,7 +196,7 @@ + text_y="0" onclick_l="lua" params_l="#new_elt" hardtext="#new_elt_text" /> @@ -333,7 +333,7 @@ seq_color="" over_seq_color="" repeat_seq="" right_seq="" left_seq="" on_change="" > + text_y="0" onclick_l="lua" params_l="#new_seq" hardtext="#new_seq_text" /> - - @@ -1981,7 +1981,7 @@ text_y="-2" + text_y="0" onclick_l="lua" params_l="r2:changeView()" hardtext="uiR2EDChangeView" tooltip="" /> @@ -2131,7 +2131,7 @@ text_y="-2" + text_y="0" onclick_l="" params_l="" hardtext="uiR2EdCreateNew" tooltip="" /> --> @@ -2209,11 +2209,11 @@ text_y="-2" + text_y="0" onclick_l="lua" params_l="r2:randomEquipment()" hardtext="uiR2EdRandomEquipment" /> + text_y="0" onclick_l="lua" params_l="r2:randomColor()" hardtext="uiR2EdRandomColor" /> + text_y="0" hardtext="uiR2EdManageSets" onclick_l="proc" params_l="add_equipment_active" /> @@ -2230,7 +2230,7 @@ text_y="-2" @@ -2509,7 +2509,7 @@ text_y="-2" + text_y="0" onclick_l="lua" params_l="r2:preview()" hardtext="uiR2EdPreview" /> @@ -2628,7 +2628,7 @@ text_y="-2" + text_y="0" onclick_l="" params_l="" hardtext="uiR2EdAddList" tooltip="" /> @@ -2638,15 +2638,15 @@ text_y="-2" + text_y="0" onclick_l="leave_modal" params_l="" hardtext=" OK " tooltip="" /> + text_y="0" onclick_l="leave_modal" params_l="" hardtext=" CANCEL " tooltip="" /> + text_y="0" onclick_l="leave_modal" params_l="" hardtext=" UPDATE " tooltip="" /> @@ -2680,11 +2680,11 @@ text_y="-2" + text_y="0" onclick_l="lua" params_l="#add_params" hardtext="uiR2EdAdd" /> + text_y="0" onclick_l="lua" params_l="#random_params" hardtext="uiR2EdRandomSet" /> + text_y="0" onclick_l="lua" params_l="#update_params" hardtext="uiR2EdUpdate" /> + text_y="0" onclick_l="lua" params_l="#remove_params" hardtext="uiR2EdRemove" tooltip="" /> @@ -3072,7 +3072,7 @@ text_y="-2" /> - diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/r2ed_acts.xml b/code/ryzom/client/data/gamedev/interfaces_v3/r2ed_acts.xml index 4c89edc28..bacc3a881 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/r2ed_acts.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/r2ed_acts.xml @@ -12,7 +12,7 @@ child_resize_h="true" child_resize_hmargin="0" > + text_y="0" onclick_l="lua" params_l="r2:showFilteredScenarios()" hardtext="OK" fontsize="10" /> diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.xml b/code/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.xml index b7dba9b06..66b1fe609 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/ring_access_point_filter.xml @@ -49,7 +49,7 @@ + text_y="0" onclick_l="lua" params_l="game.RingAccessPointFilter:validate()" hardtext="OK" fontsize="10" /> diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml b/code/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml index 6048b6cc7..b92614e31 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/ring_window.xml @@ -1077,15 +1077,15 @@ - - - @@ -1650,10 +1650,10 @@ - - @@ -1679,7 +1679,7 @@ - diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index 85cd50f66..437023b91 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -1991,7 +1991,7 @@ posparent="box1" posref="MR MR" x="-3" - y="-2" + y="0" color="135 243 28 255" shadow="true" fontsize="10" @@ -2004,7 +2004,7 @@ posparent="box1" posref="MR MR" x="-3" - y="-3" + y="0" color="192 192 192 255" shadow="true" fontsize="10" @@ -4323,7 +4323,7 @@ id="text" posref="BL BL" x="2" - y="1" + y="0" color="255 255 255 255" fontsize="12" shadow="true" @@ -5121,7 +5121,7 @@ global_color_normal="true" global_color_over="true" global_color_pushed="true" - text_y="-2" + text_y="0" fontsize="10" shadow="true" case_mode="%case_upper" @@ -5143,7 +5143,7 @@ color="255 255 255 255" col_over="255 255 255 255" col_pushed="255 255 255 255" - text_y="-2" + text_y="0" fontsize="10" shadow="true" case_mode="%case_upper"