From 96d5a3bf2875191eed72668864572c690439fced Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Fri, 1 Jul 2016 10:41:48 +0200
Subject: [PATCH] Changed: Apply changes from default interface to Syphox one

---
 .../data/gamedev/syui_v3/syui/compass.xml     |  2 +-
 .../data/gamedev/syui_v3/syui/config.xml      | 22 +--------
 .../data/gamedev/syui_v3/syui/interaction.xml | 49 +++----------------
 .../data/gamedev/syui_v3/syui/player.lua      | 10 +++-
 .../data/gamedev/syui_v3/syui/widgets.xml     | 36 +++++++-------
 5 files changed, 36 insertions(+), 83 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 eb0cd9194..20f8b3c2a 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml
@@ -265,7 +265,7 @@
             fontsize="10"
             line_maxw="182"
             shadow="true"
-            hardtext="No File..." />
+            hardtext="uiNoFiles" />
     </group>
   </group>
   <tree node="mp3_player" />
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 b7e4029c0..a362c0725 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml
@@ -3327,9 +3327,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:ISDETACHED:REGION_CHAT"
             type="sint32"
             value="0" />
-  <variable entry="UI:SAVE:ISDETACHED:YUBO_CHAT"
-            type="sint32"
-            value="0" />
   <variable entry="UI:SAVE:ISENABLED:AROUND_ME"
             type="sint32"
             value="1" />
@@ -3348,9 +3345,6 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:ISENABLED:SYSTEM_INFO"
             type="sint32"
             value="1" />
-  <variable entry="UI:SAVE:ISENABLED:YUBO_CHAT"
-            type="sint32"
-            value="1" />
   <!-- List Menu 5 -->
   <variable entry="UI:VARIABLES:ISACTIVE:BONUS_MALUS"
             type="sint32"
@@ -3711,27 +3705,13 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <define id="item_type_to_item_sheet_JOB_ELEMENT"
           value="rpjob_elementary.sitem" />
   <!-- ************************ -->
-  <!-- *          YUBO CHAT               * -->
-  <!-- ************************ -->
-  <!--
-        The Yubo Chat is a special telnet chat for Game Masters, same channel as the Yubo Klient
--->
-  <variable entry="UI:VARIABLES:ISACTIVE:YUBO_CHAT"
-            type="sint32"
-            value="0" />
-  <variable entry="UI:VARIABLES:YUBO_CHAT_PRESENT"
-            type="sint32"
-            value="0" />
-  <define id="is_yubo_chat_present"
-          value="ne(@UI:VARIABLES:YUBO_CHAT_PRESENT,0)" />
-  <!-- ************************ -->
   <!-- *          DYNAMIC CHAT    * -->
   <!-- ************************ -->
   <define id="max_dyn_chan_per_player"
           value_from_code="getMaxDynChanPerPlayer()" />
   <variable entry="UI:SAVE:ISDETACHED:DYNAMIC_CHAT$i"
             type="sint32"
-            value="1"
+            value="0"
             size="%max_dyn_chan_per_player" />
   <variable entry="UI:SAVE:ISENABLED:DYNAMIC_CHAT$i"
             type="sint32"
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 8a31a33ab..d943c4ba8 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml
@@ -985,7 +985,7 @@
   <group type="menu"
          id="user_chat_emote_menu"
          extends="base_menu"
-         case_mode="%case_first_word_letter_up"
+         case_mode="%case_normal"
          on_active="lua:game:updateEmoteMenu()">
     <action id="uiEM_Wave"
             name="uiQuickEmote" />
@@ -1204,7 +1204,7 @@
                 tooltip_parent="win" />
           <!-- Yes order is strange, but don't want to modify all the ugly hardcoded code -->
           <ctrl style="tab_button_new"
-                id="tab7"
+                id="tab6"
                 posparent="tab3"
                 group="content:cb:universe"
                 hardtext="uitabChatUniverse"
@@ -1216,7 +1216,7 @@
                 tooltip_parent="win" />
           <ctrl style="tab_button_new"
                 id="tab4"
-                posparent="tab7"
+                posparent="tab6"
                 group="content:cb:sysinfo"
                 hardtext="uitabChatSysInfo"
                 onclick_r="set"
@@ -1234,23 +1234,12 @@
                 params_l="user"
                 tooltip="uittChatUser"
                 tooltip_parent="win" />
-          <ctrl style="tab_button_new"
-                id="tab6"
-                posparent="tab5"
-                group="content:cb:yubo_chat"
-                hardtext="uitabChatYuboChat"
-                onclick_r="set"
-                params_r="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=1"
-                onclick_l="chat_group_filter"
-                params_l="yubo_chat"
-                tooltip="uittChatYubo"
-                tooltip_parent="win" />
           <!-- Fixed number of dynamic chat allowed. force  _firstpos and _nextpos to have correctly aligned tab-->
           <vector template="temp_tab_dyn_chat"
                   _size="%max_dyn_chan_per_player"
                   id="tab_array0_$i"
                   nb="$i"
-                  posparent="tab6"
+                  posparent="tab5"
                   _firstpos="TR TL"
                   _nextpos="TR TL" />
           <!-- Show or hide tabs : a tab is visible if it is not filtered into the user chat AND not detached -->
@@ -1262,7 +1251,7 @@
                 target="tab1:active" />
           <link expr="and(@UI:SAVE:ISENABLED:UNIVERSE_CHAT,
                                                                 not(@UI:SAVE:ISDETACHED:UNIVERSE_CHAT))"
-                target="tab7:active" />
+                target="tab6:active" />
           <link expr="and (and(%is_team_present, @UI:SAVE:ISENABLED:TEAM_CHAT),
                                                                 not(@UI:SAVE:ISDETACHED:TEAM_CHAT))"
                 target="tab2:active" />
@@ -1274,9 +1263,6 @@
                 target="tab4:active" />
           <link expr="not(@UI:SAVE:ISDETACHED:USER_CHAT)"
                 target="tab5:active" />
-          <link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
-                                                                not(@UI:SAVE:ISDETACHED:YUBO_CHAT))"
-                target="tab6:active" />
           <!-- Show individual chat windows if needed -->
           <link expr="and (@UI:SAVE:ISENABLED:AROUND_ME, 
                                                                 @UI:SAVE:ISDETACHED:AROUND_ME)"
@@ -1298,9 +1284,6 @@
                 target="ui:interface:system_info:active" />
           <link expr="@UI:SAVE:ISDETACHED:USER_CHAT"
                 target="ui:interface:user_chat:active" />
-          <link expr="and(and(%is_yubo_chat_present, @UI:SAVE:ISENABLED:YUBO_CHAT),
-                                                                @UI:SAVE:ISDETACHED:YUBO_CHAT)"
-                target="ui:interface:yubo_chat:active" />
         </group>
         <view type="bitmap"
               id="sep"
@@ -1374,13 +1357,6 @@
                     y="0"
                     w="0"
                     h="0" />
-          <instance template="chat_box_mainchat"
-                    id="yubo_chat"
-                    posref="TL TL"
-                    sizeref="wh"
-                    y="0"
-                    w="0"
-                    h="0" />
           <!-- Fixed number of dynamic chat allowed -->
           <vector template="chat_box_mainchat"
                   id="dyn_chat$i"
@@ -1413,7 +1389,7 @@
               tooltip_parent="win"
               onclick_l="select_chat_target"
               params_l="menu=ui:interface:user_chat_target_menu|party_chats=false"
-              case_mode="%case_first_word_letter_up" />
+              case_mode="%case_normal" />
         <ctrl style="text_button_16"
               id="but_emote"
               posref="BR TR"
@@ -1982,7 +1958,7 @@
               fontsize="10"
               tooltip="uiAddTellerToFriendsToolip"
               tooltip_parent="win" />
-		<ctrl style="button_ok"
+        <ctrl style="button_ok"
               id="invite"
               active="true"
               x="-2"
@@ -2101,10 +2077,6 @@
                 name="uiSystemInfo"
                 usergroup_l="chat_menu_button"
                 usergroup_params_l="chat_db=SYSTEM_INFO" />
-        <action id="yubo_chat"
-                name="uitabChatYuboChat"
-                usergroup_l="chat_menu_button"
-                usergroup_params_l="chat_db=YUBO_CHAT" />
         <!-- Bit of a hack as vector is not supported inside a submenu -->
         <action id="dyn0"
                 name="0"
@@ -3205,13 +3177,6 @@
 <tree node="debug_console">
 </tree>
 -->
-  <!-- ************* -->
-  <!-- * YUBO CHAT * -->
-  <!-- ************* -->
-  <proc id="yubo_chat_proc_close">
-    <action handler="set"
-            params="dblink=UI:SAVE:ISDETACHED:YUBO_CHAT|value=0" />
-  </proc>
   <!-- **************** -->
   <!-- * DYNAMIC CHAT * -->
   <!-- **************** -->
diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua b/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua
index 0dd4db07b..4753d84a1 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua
@@ -8,6 +8,12 @@ function getDbPropU(dbEntry)
 	return value
 end
 
+if string.find(_VERSION, "Lua 5.0") then
+	function math.fmod(a, b)
+		return math.mod(a, b)
+	end
+end
+
 ------------------------------------------------------------------------------------------------------------
 -- create the game namespace without reseting if already created in an other file.
 if (game==nil) then
@@ -803,8 +809,8 @@ end
 
 
 function game:timeInSecondsToReadableTime(regenTime)			
-	local seconds = math.mod(regenTime, 60)	
-	local minutes = math.mod(math.floor(regenTime / 60), 60)	
+	local seconds = math.fmod(regenTime, 60)	
+	local minutes = math.fmod(math.floor(regenTime / 60), 60)	
 	local hours = math.floor(regenTime / 3600)	
 	local result = ""
 	if seconds > 0 then result = concatUCString(tostring(seconds), i18n.get("uittSecondsShort"))	end
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 ec8eb3fbc..4fd71ff39 100644
--- a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml
+++ b/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml
@@ -225,7 +225,7 @@
            opened="true"
            child_resize_w="true"
 		   child_resize_h="true"
-           w="00"
+           w="0"
 		   h="0"
            win_priority="%win_priority_world_space"
            posref="BL BM"
@@ -2634,7 +2634,7 @@
   <template name="edit_box_widget"
             posref="TL TL"
             text_x="0"
-            text_y="-1"
+            text_y="0"
             text_ref="BL BL"
             child_resize_h="true"
             child_resize_hmargin="0"
@@ -2804,10 +2804,11 @@
   <template name="edit_box_widget_multiline"
             posref="TL TL"
             text_x="0"
-            text_y="-1"
+            text_y="0"
             text_ref="BL BL"
             child_resize_h="true"
             multi_line="true"
+            multi_min_line="0"
             x="0"
             y="0"
             w="0"
@@ -2887,6 +2888,7 @@
               posref="#text_ref"
               multi_line="#multi_line"
               multi_line_space="0"
+              multi_min_line="#multi_min_line"
               fontsize="#fontsize"
               color="#color"
               shadow="true"
@@ -3049,7 +3051,7 @@
               id="edit"
               entry_type="positive_integer"
               text_ref="TR TR"
-              text_y="-1"
+              text_y="0"
               fontsize="12"
               posparent="sheet"
               posref="MR ML"
@@ -4533,7 +4535,7 @@
               entry_type="positive_integer"
               id="edit"
               text_ref="TR TR"
-              text_y="-1"
+              text_y="0"
               fontsize="12"
               posparent="sheet"
               posref="MR ML"
@@ -4863,7 +4865,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"
@@ -4881,7 +4883,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"
@@ -4915,7 +4917,7 @@
             x="0"
             y="0"
             posref="TL TL"
-            text_y="-2"
+            text_y="0"
             onclick_l="#onclick_ok"
             params_l="#onclick_ok_param"
             hardtext="#ok_text"
@@ -4923,7 +4925,7 @@
       <ctrl style="button_cancel"
             x="4"
             posparent="ok"
-            text_y="-2"
+            text_y="0"
             posref="TR TL"
             onclick_l="#onclick_cancel"
             params_l="#onclick_cancel_param"
@@ -4959,7 +4961,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"
@@ -4973,7 +4975,7 @@
          tx_normal="w_text_button_normal"
          tx_pushed="w_text_button_pushed"
          tx_over="w_text_button_over"
-         text_y="-2"
+         text_y="0"
          fontsize="10"
          shadow="true"
          case_mode="%case_upper"
@@ -4997,7 +4999,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"
@@ -5015,7 +5017,7 @@
          tx_normal="w_text_button_normal"
          tx_pushed="w_text_button_pushed"
          tx_over="w_text_button_over"
-         text_y="-2"
+         text_y="0"
          fontsize="10"
          shadow="true"
          case_mode="%case_upper"
@@ -5043,7 +5045,7 @@
          color="255 255 255 128"
          col_over="255 255 255 0"
          col_pushed="255 128 0 192"
-         text_y="-2"
+         text_y="0"
          fontsize="12"
          shadow="true"
          text_color_normal="255 255 255 255"
@@ -5069,7 +5071,7 @@
          color="255 255 255 128"
          col_over="255 255 255 0"
          col_pushed="255 190 0 192"
-         text_y="-3"
+         text_y="0"
          fontsize="12"
          shadow="true"
          text_color_normal="255 255 255 160"
@@ -5106,7 +5108,7 @@
          color="255 255 255 255"
          col_over="255 255 255 255"
          col_pushed="255 255 255 255"
-         text_y="-3"
+         text_y="0"
          fontsize="14"
          shadow="true"
          text_color_pushed="255 255 255 255"
@@ -5156,7 +5158,7 @@
          color="255 255 255 255"
          col_over="255 255 255 255"
          col_pushed="255 255 255 255"
-         text_y="-4"
+         text_y="-2"
          fontsize="10"
          shadow="true"
          case_mode="%case_upper"