From b526dab356f91a34e22eafc67a9b7096166e4045 Mon Sep 17 00:00:00 2001
From: Riasan <riasan@ryzom.com>
Date: Mon, 18 Jul 2016 20:14:20 +0200
Subject: [PATCH] Fix: Right Text Align by Map and Rewspwan Windows

--HG--
branch : compatibility-develop
---
 .../data/gamedev/interfaces_v3/commands2.xml  |   5 +-
 .../data/gamedev/interfaces_v3/help.xml       |  17 +-
 .../data/gamedev/interfaces_v3/inventory.xml  | 245 +-----------------
 .../client/data/gamedev/interfaces_v3/map.xml |   6 +-
 .../data/gamedev/interfaces_v3/widgets.xml    |   2 +-
 5 files changed, 19 insertions(+), 256 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/commands2.xml b/code/ryzom/client/data/gamedev/interfaces_v3/commands2.xml
index 3e3de90ba..c955947ea 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/commands2.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/commands2.xml
@@ -1,3 +1,4 @@
-<interface_config>
 
-</interface_config>
+<interface_config>
+<command name="event" action="launch_help" params="help_container=ui:interface:cs_browser|url=http://app.ryzom.com/event_tools/"/>
+</interface_config>
\ No newline at end of file
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
index 9fe7e91a4..2237dd3d3 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml
@@ -356,9 +356,9 @@
   </proc>
   <group type="container"
          id="death_warning"
-         w="400"
-         pop_min_w="400"
-         pop_max_w="400"
+         w="500"
+         pop_min_w="500"
+         pop_max_w="500"
          h="250"
          pop_min_h="250"
          pop_max_h="250"
@@ -401,7 +401,7 @@
             id="death_warning_text"
             posref="TM TM"
             x="0"
-            y="-20"
+            y="-10"
             color="255 255 255 255"
             fontsize="12"
             shadow="true"
@@ -416,6 +416,7 @@
                 y="30"
                 w="0"
                 h="16"
+                y_text="-5"
                 fontsize="10"
                 hardtext="uiDeathWarningAvoid"
                 dblink="UI:VARIABLES:TEMP_DEATH_WARNING_AVOID"
@@ -463,9 +464,9 @@
   </proc>
   <group type="container"
          id="night_warning"
-         w="400"
-         pop_min_w="400"
-         pop_max_w="400"
+         w="500"
+         pop_min_w="500"
+         pop_max_w="500"
          h="250"
          pop_min_h="250"
          pop_max_h="250"
@@ -508,7 +509,7 @@
             id="night_warning_text"
             posref="TM TM"
             x="0"
-            y="-20"
+            y="-10"
             color="255 255 255 255"
             fontsize="12"
             shadow="true"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
index b94792f20..4b588244c 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml
@@ -1497,188 +1497,6 @@
           params="value=add(@UI:PHRASE:SELECT_MEMORY,-1)" />
   </group>
   <tree node="gestionsets" />
-
-  <!-- second hands bar -->
-  <define id="gestionsets_h" value="1" />
-  <define id="gestionsets_v" value="2" />
-
-  <variable entry="UI:SAVE:GESTIONSETS2_MODE" type="sint32" value="0" />
-
-  <proc id="gestionsets2_proc_active">
-    <action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:SETS2|value=1"/>
-    <action handler="proc" params="gestionsets2_proc_mode" />
-  </proc>
-
-  <proc id="gestionsets2_proc_set">
-    <action handler="set" params="dblink=UI:SAVE:GESTIONSETS2_MODE|value=@0"/>
-    <action handler="proc" params="gestionsets2_proc_mode" />
-  </proc>
-
-  <proc id="gestionsets2_proc_mode">
-    <action handler="proc" cond="eq(@UI:SAVE:GESTIONSETS2_MODE,%gestionsets_h)" params="gestionsets2_proc_horiz"/>
-    <action handler="proc" cond="ne(@UI:SAVE:GESTIONSETS2_MODE,%gestionsets_h)" params="gestionsets2_proc_vert"/>
-  </proc>
-
-  <proc id="gestionsets2_proc_vert">
-    <action handler="set" params="target='ui:interface:gestionsets2_menu:horiz:active'|value=1"/>
-    <action handler="set" params="target='ui:interface:gestionsets2_menu:vert:active'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:w'|value=68"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:h'|value=300"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:select_memory:active'|value=1"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:select_memory_h:active'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:w'|value=68"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:h'|value=300"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:w'|value=68"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:h'|value=300"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s0:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s0:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s1:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s1:y'|value=-28"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s2:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s2:y'|value=-56"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s3:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s3:y'|value=-84"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s4:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s4:y'|value=-112"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s5:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s5:y'|value=-140"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s6:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s6:y'|value=-168"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s7:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s7:y'|value=-196"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s8:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s8:y'|value=-224"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s9:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s9:y'|value=-252"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s10:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s10:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s11:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s11:y'|value=-28"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s12:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s12:y'|value=-56"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s13:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s13:y'|value=-84"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s14:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s14:y'|value=-112"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s15:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s15:y'|value=-140"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s16:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s16:y'|value=-168"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s17:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s17:y'|value=-196"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s18:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s18:y'|value=-224"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s19:x'|value=26"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s19:y'|value=-252"/>
-  </proc>
-
-  <proc id="gestionsets2_proc_horiz">
-    <action handler="set" params="target='ui:interface:gestionsets2_menu:horiz:active'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2_menu:vert:active'|value=1"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:w'|value=315"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:h'|value=52"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:select_memory:active'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:select_memory_h:active'|value=1"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:w'|value=315"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:h'|value=52"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:w'|value=315"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:h'|value=52"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s0:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s0:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s1:x'|value=28"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s1:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s2:x'|value=56"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s2:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s3:x'|value=84"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s3:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s4:x'|value=112"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s4:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s5:x'|value=140"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s5:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s6:x'|value=168"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s6:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s7:x'|value=196"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s7:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s8:x'|value=224"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s8:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s9:x'|value=252"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s9:y'|value=0"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s10:x'|value=0"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s10:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s11:x'|value=28"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s11:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s12:x'|value=56"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s12:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s13:x'|value=84"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s13:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s14:x'|value=112"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s14:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s15:x'|value=140"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s15:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s16:x'|value=168"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s16:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s17:x'|value=196"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s17:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s18:x'|value=224"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s18:y'|value=-26"/>
-
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s19:x'|value=252"/>
-    <action handler="set" params="target='ui:interface:gestionsets2:header_closed:shortcuts:s19:y'|value=-26"/>
-  </proc>
-
-  <group type="menu" id="gestionsets2_menu" extends="base_menu_with_color">
-    <action id="horiz" name="uiHorizontal" handler="proc" params="gestionsets2_proc_set|%gestionsets_h"/>
-    <action id="vert" name="uiVertical" handler="proc" params="gestionsets2_proc_set|%gestionsets_v"/>
-    <separator />
-  </group>
-
   <group type="container"
          id="gestionsets2"
          w="68"
@@ -1687,7 +1505,7 @@
          header_active="false"
          right_button="false"
          group_onclick_r="active_menu"
-         group_params_r="menu=ui:interface:gestionsets2_menu"
+         group_params_r="menu=ui:interface:base_menu_with_color"
          movable="true"
          active="true"
          opened="false"
@@ -1695,8 +1513,8 @@
          global_color="false"
          header_color="UI:SAVE:WIN:COLORS:INV"
          locked="true"
-         on_active="proc"
-         on_active_params="gestionsets2_proc_active"
+         on_active="set"
+         on_active_params="dblink=UI:VARIABLES:ISACTIVE:SETS2|value=1"
          on_deactive="set"
          on_deactive_params="dblink=UI:VARIABLES:ISACTIVE:SETS2|value=0"
          help_page="interf_action_bar.html">
@@ -1866,66 +1684,9 @@
               tooltip="uittHandSet"
               tooltip_parent="win" />
       </group>
-      <group type="select_number"
-             id="select_memory_h"
-             value="UI:PHRASE:SELECT_MEMORY_2"
-             loop="true"
-             min="1"
-             max="10"
-             x="0"
-             y="0"
-             w="300"
-             h="52"
-             active="false"
-             posparent="shortcuts"
-             posref="MM MM"
-             delta="1">
-        <view type="bitmap"
-              id="slot_number"
-              posref="MR MR"
-              texture="W_slot_number.tga" />
-        <view type="text"
-              id="number"
-              posparent="slot_number"
-              posref="MM MM"
-              x="0"
-              y="0"
-              color="255 255 255 255"
-              fontsize="12"
-              shadow="true"
-              hardtext="0"
-              global_color="false" />
-        <ctrl type="button"
-              id="arrow_up"
-              button_type="push_button"
-              posref="TM BM"
-              posparent="slot_number"
-              x="0"
-              y="0"
-              tx_normal="W_arrow_up_1.tga"
-              tx_pushed="W_arrow_up_1.tga"
-              tx_over="W_button_12_over.tga"
-              tooltip="uittHandSet"
-              tooltip_parent="win" />
-        <ctrl type="button"
-              id="arrow_down"
-              button_type="push_button"
-              posref="BM TM"
-              posparent="slot_number"
-              x="0"
-              y="0"
-              tx_normal="W_arrow_down_1.tga"
-              tx_pushed="W_arrow_down_1.tga"
-              tx_over="W_button_12_over.tga"
-              tooltip="uittHandSet"
-              tooltip_parent="win" />
-      </group>
       <link expr="@UI:PHRASE:SELECT_MEMORY_2"
             action="phrase_select_memory_2"
             params="value=add(@UI:PHRASE:SELECT_MEMORY_2,-1)" />
-      <link expr="depends(@UI:SAVE:GESTIONSETS2_MODE)"
-            action="proc"
-            params="gestionsets_proc_mode" />
   </group>
   <tree node="gestionsets2" />
   <!-- hands -->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/map.xml b/code/ryzom/client/data/gamedev/interfaces_v3/map.xml
index bbc3682d5..4370e5593 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/map.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/map.xml
@@ -192,8 +192,8 @@
 			<ctrl type="button" id="center" button_type="push_button" posparent="zoom_out" posref="TR TL" y="0"  x="4" tx_normal="w_center_map.tga" tx_pushed="W_button_16_over.tga" tx_over="W_button_16_over.tga"
 				onclick_l="map_center" params_l="map=ui:interface:map:content:map_content:actual_map" tooltip="uittCenter" />						
 
-			<view type="text" id="time" x="12" y="-1" posparent="center" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
-			<view type="text" id="weather" x="8" y="-18" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
+			<view type="text" id="time" x="12" y="0" posparent="center" posref="MR ML" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
+			<view type="text" id="weather" x="8" y="-16" posref="TL TL" color="255 255 255 255" fontsize="12" shadow="true" hardtext="" />
 			
 			<instance template="box_widget" id="back" posref="TL TL" sizeref="wh" w="-2" h="-32" x="1" y="-32" render_layer="0" />
 			
@@ -383,7 +383,7 @@
 			
 			<ctrl style="button_ok" id="respawn" posparent="center" x="16" posref="TR TL" onclick_l="respawn_map_valid" params_l="map=ui:interface:respawn_map:content:map_content:actual_map" hardtext="uiRespawn"/>
 
-			<group id="timer" posparent="respawn" posref="TR TL" x="8" y="-5" child_resize_h="true" child_resize_w="true">
+			<group id="timer" posparent="respawn" posref="TR TL" x="8" y="-2" child_resize_h="true" child_resize_w="true">
 				<view type="bar" id="b" ultra_mini="true" posref="TL TL" value="%player_hp_percent" range="%player_percent_max" color="255 255 255 255" color_negative="255 255 255 255" />
 				<view type="text" id="t" posparent="b" posref="TR TL" x="4" color="255 255 255 255" fontsize="8" shadow="true" hardtext="" />
 			</group>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 437023b91..b8bf5277c 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -6652,7 +6652,7 @@
             posparent="button"
             posref="MR ML"
             x="4"
-            y="-3"
+            y="0"
             color="255 255 255 255"
             fontsize="#fontsize"
             shadow="true"