From fc0ec87fc912344885c8ed23825bf93b583bec43 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 9 Jul 2016 13:47:30 +0200
Subject: [PATCH] Changed: Apply changes from default interface to Syphox one

---
 .../data/gamedev/syui_v3/syui/compass.xml     | 50 +++++++++----------
 .../data/gamedev/syui_v3/syui/config.xml      | 36 ++++++-------
 .../data/gamedev/syui_v3/syui/game_config.xml |  2 +-
 .../data/gamedev/syui_v3/syui/guild.xml       | 16 +++---
 .../data/gamedev/syui_v3/syui/interaction.xml | 37 +++++++-------
 .../data/gamedev/syui_v3/syui/player.xml      |  6 +--
 .../data/gamedev/syui_v3/syui/widgets.xml     | 10 ++--
 7 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml
index 20f8b3c2a..9d52d5190 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml
@@ -582,7 +582,7 @@
             fontsize="11"
             hardtext="" />
     </group>
-	<link expr="@UI:SAVE:SHOW_CLOCK"
+    <link expr="@UI:SAVE:SHOW_CLOCK"
           target="clock:active" />
 	<!-- compass fps -->
 	<group id="frame"
@@ -647,7 +647,7 @@
             shadow="true"
             global_color="false"
             fontsize="10"
-			hardtext="" />
+            hardtext="" />
 <!--      <view type="text" id="mail_nb2" posparent="mail_nb" posref="BL BR" x="-2" y="0" color="255 255 255 255" shadow="true" global_color="false" fontsize="10" hardtext="x" /> -->
     </group>
     <link expr="@UI:VARIABLES:MAIL_WAITING"
@@ -861,7 +861,7 @@
             id="upload"
             posref="TL TL"
             x="0"
-            y="-20"
+            y="-18"
             color="255 255 255 255"
             shadow="true"
             fontsize="10"
@@ -873,7 +873,7 @@
             posref="BL TL"
             posparent="upload"
             x="0"
-            y="-2"
+            y="0"
             color="255 255 255 255"
             shadow="true"
             fontsize="10"
@@ -885,7 +885,7 @@
             posref="BL TL"
             posparent="download"
             x="0"
-            y="-2"
+            y="0"
             color="255 255 255 255"
             shadow="true"
             fontsize="10"
@@ -897,7 +897,7 @@
             posref="BL TL"
             posparent="ping"
             x="0"
-            y="-2"
+            y="0"
             color="255 255 255 255"
             shadow="true"
             fontsize="10"
@@ -920,7 +920,7 @@
             id="up_title"
             posref="TL TL"
             x="0"
-            y="-4"
+            y="-2"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -929,7 +929,7 @@
             id="down_title"
             posref="TL TL"
             x="0"
-            y="-20"
+            y="-18"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -938,7 +938,7 @@
             id="ping_title"
             posref="TL TL"
             x="0"
-            y="-36"
+            y="-34"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -947,7 +947,7 @@
             id="packet_title"
             posref="TL TL"
             x="0"
-            y="-52"
+            y="-50"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -956,7 +956,7 @@
             id="server_title"
             posref="TL TL"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -965,7 +965,7 @@
             id="upload"
             posref="TR TR"
             x="0"
-            y="-4"
+            y="-2"
             color="255 255 255 255"
             shadow="true"
             fontsize="11"
@@ -976,7 +976,7 @@
             id="download"
             posref="TR TR"
             x="0"
-            y="-20"
+            y="-18"
             color="255 255 255 255"
             shadow="true"
             fontsize="11"
@@ -987,7 +987,7 @@
             id="ping"
             posref="TR TR"
             x="0"
-            y="-36"
+            y="-34"
             color="255 255 255 255"
             shadow="true"
             fontsize="11"
@@ -998,7 +998,7 @@
             id="packet"
             posref="TR TR"
             x="0"
-            y="-52"
+            y="-50"
             color="255 255 255 255"
             shadow="true"
             fontsize="11"
@@ -1009,7 +1009,7 @@
             id="server0"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1019,7 +1019,7 @@
             id="server1"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1029,7 +1029,7 @@
             id="server2"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1039,7 +1039,7 @@
             id="server3"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1049,7 +1049,7 @@
             id="server4"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1059,7 +1059,7 @@
             id="server5"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1069,7 +1069,7 @@
             id="server6"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1079,7 +1079,7 @@
             id="server7"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1089,7 +1089,7 @@
             id="server8"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
@@ -1099,7 +1099,7 @@
             id="server9"
             posref="TR TR"
             x="0"
-            y="-68"
+            y="-66"
             color="255 255 255 255"
             fontsize="11"
             shadow="true"
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml
index a362c0725..f41c16d9d 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml
@@ -583,11 +583,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-10" />
+           value="-7" />
     <param name="title_offset_openable_x"
            value="20" />
     <param name="title_offset_openable_y"
-           value="-10" />
+           value="-7" />
     <param name="scrollbar_offset_x"
            value="6" />
     <param name="scrollbar_size_w"
@@ -732,11 +732,11 @@
     <param name="title_offset_x"
            value="56" />
     <param name="title_offset_y"
-           value="-26" />
+           value="-23" />
     <param name="title_offset_openable_x"
            value="20" />
     <param name="title_offset_openable_y"
-           value="-10" />
+           value="-7" />
     <param name="scrollbar_offset_x"
            value="6" />
     <param name="scrollbar_size_w"
@@ -873,11 +873,11 @@
     <param name="title_offset_x"
            value="28" />
     <param name="title_offset_y"
-           value="-10" />
+           value="-7" />
     <param name="title_offset_openable_x"
            value="20" />
     <param name="title_offset_openable_y"
-           value="-10" />
+           value="-7" />
     <param name="scrollbar_offset_x"
            value="6" />
     <param name="scrollbar_size_w"
@@ -1014,11 +1014,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-6" />
+           value="-4" />
     <param name="title_offset_openable_x"
            value="18" />
     <param name="title_offset_openable_y"
-           value="-6" />
+           value="-4" />
     <param name="header_h"
            value="14" />
     <param name="open_state_tx_opened"
@@ -1109,11 +1109,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-5" />
+           value="-3" />
     <param name="title_offset_openable_x"
            value="20" />
     <param name="title_offset_openable_y"
-           value="-5" />
+           value="-3" />
     <param name="header_h"
            value="12" />
     <param name="open_state_tx_opened"
@@ -1202,11 +1202,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-5" />
+           value="-3" />
     <param name="title_offset_openable_x"
            value="22" />
     <param name="title_offset_openable_y"
-           value="-5" />
+           value="-3" />
     <param name="header_h"
            value="10" />
     <param name="open_state_tx_opened"
@@ -1295,11 +1295,11 @@
     <param name="title_offset_x"
            value="18" />
     <param name="title_offset_y"
-           value="-5" />
+           value="-3" />
     <param name="title_offset_openable_x"
            value="24" />
     <param name="title_offset_openable_y"
-           value="-5" />
+           value="-3" />
     <param name="header_h"
            value="10" />
     <param name="open_state_tx_opened"
@@ -1599,11 +1599,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-6" />
+           value="-4" />
     <param name="title_offset_openable_x"
            value="18" />
     <param name="title_offset_openable_y"
-           value="-6" />
+           value="-4" />
     <param name="header_h"
            value="14" />
     <!-- View state opened/closed (defined TL TL) -->
@@ -1698,11 +1698,11 @@
     <param name="title_offset_x"
            value="8" />
     <param name="title_offset_y"
-           value="-2" />
+           value="0" />
     <param name="title_offset_openable_x"
            value="40" />
     <param name="title_offset_openable_y"
-           value="-2" />
+           value="0" />
     <param name="header_h"
            value="12" />
     <!-- View state opened/closed (defined TL TL) -->
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml
index 1317ba277..1167e43ea 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml
@@ -930,7 +930,7 @@
         </group>
         <link expr="@UI:TEMP:VID_MODE"
               action="game_config_change_vid_mode" />
-		<group type="combo_box"
+        <group type="combo_box"
                id="video_freqs"
                w="60"
                h="20"
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml
index 6be15d3ff..54003827a 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml
@@ -71,7 +71,7 @@
             posparent="parent"
             posref="TL TL"
             h="16"
-			id="">
+            id="">
     <group type="container"
            id="#id"
            w="294"
@@ -133,7 +133,7 @@
             h="0"
             tooltip="uittFriendsOnline"
             tooltip_parent="win" />
-	</group>
+    </group>
   </template>
   <!-- **************** -->
   <!-- *  GUILD MAIN  * -->
@@ -156,14 +156,14 @@
          on_active_params="guild_proc_active"
          on_deactive="proc"
          on_deactive_params="guild_proc_deactive">
-	<group id="bstatus"
+    <group id="bstatus"
            x="0"
            y="0"
            h="0"
-		   value=""
+           value=""
            posref="TL TL">
-	  <link expr="depends(@UI:VARIABLES:PING)" action="lua" params="game:updateGLinvB()" />
-	</group>
+           <link expr="depends(@UI:VARIABLES:PING)" action="lua" params="game:updateGLinvB()" />
+    </group>
     <group id="header_closed"
            x="0"
            y="0"
@@ -194,9 +194,9 @@
               params_r=""
               onclick_l="set"
               params_l="target='ui:interface:guild:w'|value=330" />
-		<ctrl style="tab_button_new"
+        <ctrl style="tab_button_new"
               id="tab1"
-			  posparent="tab0"
+              posparent="tab0"
               group="content:tab_guild"
               hardtext="uiGuildMembers"
               onclick_r=""
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml
index d943c4ba8..d18b7959d 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml
@@ -120,7 +120,7 @@
           posparent="jauges"
           posref="TL TL"
           x="0"
-          y="-1"
+          y="0"
           sizeref="wh3"
           w="0"
           h="0" />
@@ -456,7 +456,7 @@
             id="t_life"
 			posparent="slot_fake_jauge"
             posref="TL TL"
-			x="0"
+            x="0"
             y="0"
             texture="slot_jauge.tga"
             inherit_gc_alpha="false"
@@ -670,7 +670,7 @@
               posparent="add_contact_eb"
               posref="BR TR"
               x="0"
-              y="-2"
+              y="0"
               onclick_ok="add_contact"
               onclick_ok_param=""
               onclick_cancel="leave_modal"
@@ -730,7 +730,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
@@ -792,7 +792,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
@@ -933,7 +933,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
@@ -1704,7 +1704,7 @@
       </group>
       <!--            
                 <group id="header_opened" x="0" y="0" w="160" child_resize_h="true" child_resize_hmargin="4" posref="TL TL" >
-                        <view type="bar3" id="jauges" posref="TR TR" y="-2" mini="true" x="-16"
+                        <view type="bar3" id="jauges" posref="TR TR" y="0" mini="true" x="-16"
                                                                 color1="%sta_color" value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:STA"        range1="UI:CONST:127" 
                                                                 color2="%sap_color"     value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:SAP"            range2="UI:CONST:127"
                                                                 color3="%hp_color" color3_negative="%hp_color_neg" value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:HP"  range3="UI:CONST:127" />
@@ -1716,7 +1716,7 @@
                                                 
                         <! - chat box - >
                         <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
-                        <instance template="edit_box_widget" id="ebw" posref="BR TR" y="-2" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="contact_entry" backup_father_container_pos="true"/>
+                        <instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="contact_entry" backup_father_container_pos="true"/>
                                                 
                         <! - links to display lead or successor - >
                         <link expr="eq(@SERVER:GROUP:LEADER_INDEX, #team_mate_index)" target="lead:active"/>
@@ -1775,7 +1775,7 @@
               id="blocked"
               posref="MR MR"
               x="-20"
-              y="-2"
+              y="0"
               texture="w_answer_16_cancel.tga"
               global_color="false"
               active="false" />
@@ -1878,14 +1878,13 @@
               id="blocked"
               posref="MR MR"
               x="-50"
-              y="-2"
+              y="0"
               texture="w_answer_16_cancel.tga"
               global_color="false"
               active="false" />
       </group>
     </group>
-  
- </template>
+  </template>
 
   <!-- when you want to directly chat with a friend -->
   <template name="contact_chat_friend"
@@ -1937,7 +1936,7 @@
               y="0"
               posref="MR MR"
               posparent="parent"
-              text_y="-2"
+              text_y="0"
               onclick_l="lua"
               params_l="validMessageBox(i18n.get('uiAddTellerToIgnoreListWarning'), 'add_teller_to_ignore_list', 'id=ui:interface:#id', '', '' ,'ui:interface')"
               hardtext="uiAddTellerToIgnoreList"
@@ -1951,7 +1950,7 @@
               y="0"
               posref="ML MR"
               posparent="ignore"
-              text_y="-2"
+              text_y="0"
               onclick_l="add_teller_to_friend_list"
               params_l=""
               hardtext="uiAddTellerToFriends"
@@ -1965,7 +1964,7 @@
               y="0"
               posref="ML MR"
               posparent="new_friend"
-              text_y="-2"
+              text_y="0"
               onclick_l="lua:game:teamInvite('#id')"
               params_l=""
               hardtext="uiInviteToRingSession"
@@ -1989,7 +1988,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
@@ -2210,7 +2209,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
@@ -3167,7 +3166,7 @@
 
         <group id="header_opened" x="0" y="0" w="160" h="13" posref="TL TL" child_resize_h="true" child_resize_hmargin="8" >
                 <instance template="chat_box" id="cb" posref="TR TR" sizeref="w" y="-8" w="0" h="64" min_height="64" max_height="1600"/>
-                <instance template="edit_box_widget" id="ebw" posref="BR TR" y="-2" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="debug_console_entry" backup_father_container_pos="true"/>
+                <instance template="edit_box_widget" id="ebw" posref="BR TR" y="0" posparent="cb" child_resize_h="true" sizeref="w" w="-10" onenter="debug_console_entry" backup_father_container_pos="true"/>
         </group>
 
         <group id="content" x="0" y="0" h="0" posref="TL TL" >
@@ -3237,7 +3236,7 @@
         <instance template="edit_box_widget"
                   id="ebw"
                   posref="BR TR"
-                  y="-2"
+                  y="0"
                   posparent="cb"
                   child_resize_h="true"
                   sizeref="w"
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml
index d7c701b86..6e4becc1c 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml
@@ -120,7 +120,7 @@
             maxval=""
             val_bar=""
             tooltip="">
-	<group id="#id"
+    <group id="#id"
            posparent="#posparent"
            posref="#posref"
            w="#w"
@@ -151,7 +151,7 @@
       <view type="text_number"
             id="max"
             posref="MR MR"
-            x="-6" 
+            x="-6"
             y="-4"
             color="255 255 255 255"
             shadow="true"
@@ -220,7 +220,7 @@
   <!-- ************** -->
   <!-- CURRENT ACTION -->
   <!-- ************** -->
-  <!-- Must pass through an other DB, to allow multiple isntances of the action bar template -->
+  <!-- Must pass through an other DB, to allow multiple instances of the action bar template -->
   <variable entry="UI:PHRASE:ACT_BAR_LEN"
             type="sint32"
             value="0" />
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml b/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml
index 4fd71ff39..f8b8994a6 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml
@@ -2006,7 +2006,7 @@
             posparent="box1"
             posref="MR MR"
             x="-3"
-            y="-2"
+            y="0"
             color="135 243 28 255"
             shadow="true"
             fontsize="10"
@@ -2019,7 +2019,7 @@
             posparent="box1"
             posref="MR MR"
             x="-3"
-            y="-3"
+            y="0"
             color="192 192 192 255"
             shadow="true"
             fontsize="10"
@@ -4338,7 +4338,7 @@
           id="text"
           posref="BL BL"
           x="2"
-          y="1"
+          y="0"
           color="255 255 255 255"
           fontsize="12"
           shadow="true"
@@ -5136,7 +5136,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"
@@ -5158,7 +5158,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"