Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge with develop

Browse Source 
--HG--
branch : experimental-ui-scaling
feature/pipeline-tools
Nimetu 8 years ago
parent 8d09471a6d 91c9594a5a
commit f720b23dce
3 changed files with 72 additions and 75 deletions
Show Stats Download Patch File Download Diff File

1
code/nel/src/gui/group_html.cpp
Unescape Escape View File

@ -4387,7 +4387,6 @@ namespace NLGUI
ctrlButton->setToolTipParent(TTMouse);
ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto);
ctrlButton->setToolTipPosRef(Hotspot_TTAuto);
ctrlButton->setActionOnLeftClickParams(tooltip);
}
getParagraph()->addChild (ctrlButton);

136
code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
Unescape Escape View File

@ -57,7 +57,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -66,7 +66,7 @@
id="max"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -76,7 +76,7 @@
id="sep"
posparent="max"
posref="TL TR"
x="-1"
x="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -128,7 +128,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -137,7 +137,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -176,7 +176,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -185,7 +185,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -223,7 +223,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -232,7 +232,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -271,7 +271,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -280,7 +280,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -317,7 +317,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -326,7 +326,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -362,7 +362,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -371,7 +371,7 @@
id="max"
posref="MR MR"
x="-4"
y="-1"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -380,7 +380,7 @@
id="sep"
posref="MR MR"
x="-20"
y="-1"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -389,7 +389,7 @@
id="val"
posref="MR MR"
x="-37"
y="-1"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -432,7 +432,7 @@
id="val"
posref="MR MR"
x="-4"
y="-2"
y="0"
color="255 255 255 255"
shadow="true"
fontsize="12"
@ -480,7 +480,7 @@
id="t"
posref="TL TL"
x="16"
y="-3"
y="2"
color="255 255 255 255"
global_color="false"
fontsize="10"
@ -519,7 +519,7 @@
<view type="text"
id="t"
posref="TL TL"
y="-1"
y="0"
color="255 255 255 255"
fontsize="12"
shadow="true"
@ -569,12 +569,12 @@
value="-1" />
<group type="container"
id="info_player_skills"
w="500"
w="540"
title="uiSkillsTitle"
global_color="false"
header_color="UI:SAVE:WIN:COLORS:PLA"
min_w="330"
max_w="500"
min_w="350"
max_w="540"
min_h="550"
max_h="1600"
pop_max_h="800"
@ -681,7 +681,7 @@
posparent="basics_skills"
posref="TL TL"
x="0"
y="-24"
y="-10"
hardtext="uiRaceBold"
shadow="true"
color="255 255 255 255"
@ -701,7 +701,7 @@
posref="TL TL"
sizeref="w"
h="14"
y="-48">
y="-30">
<view type="text"
id="guild_title"
posref="TL TL"
@ -719,7 +719,7 @@
shadow="true"
color="255 200 55 255"
global_color="false"
x="2"
x="2"
fontsize="12"
textid="SERVER:GUILD:NAME"
dynamic_string="false" />
@ -729,7 +729,7 @@
sizeref="w5"
w="-1"
h="188"
y="-72">
y="-52">
<view type="text"
id="Skill_t"
posref="TL TL"
@ -744,7 +744,7 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="172"
inherit_gc_alpha="true">
@ -855,7 +855,7 @@
w="-1"
x="1"
h="188"
y="-72">
y="-52">
<view type="text"
id="Skill_t"
posref="TL TL"
@ -870,7 +870,7 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="172"
inherit_gc_alpha="true">
@ -950,7 +950,7 @@
sizeref="w5"
w="-1"
h="83"
y="-264">
y="-248">
<view type="text"
id="sp"
posref="TL TL"
@ -965,7 +965,7 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="67"
inherit_gc_alpha="true">
@ -1024,7 +1024,7 @@
w="-1"
x="1"
h="83"
y="-264">
y="-248">
<view type="text"
id="cm"
posref="TL TL"
@ -1039,7 +1039,7 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="67"
inherit_gc_alpha="true">
@ -1110,8 +1110,8 @@
posref="TL TL"
sizeref="w5"
w="-1"
h="155"
y="-347">
h="157"
y="-338">
<view type="text"
id="resists_t"
posref="TL TL"
@ -1129,15 +1129,15 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="141"
h="140"
inherit_gc_alpha="true">
<instance template="tipc_magic_resist"
id="Desert"
posref="TL TL"
x="8"
y="-10"
y="-8"
w="-8"
val="%player_resist_desert" />
<instance template="tipc_magic_resist"
@ -1173,8 +1173,8 @@
posref="TM TL"
sizeref="w5"
w="-1"
h="155"
y="-347">
h="158"
y="-337">
<view type="text"
id="protections_t"
posref="TL TL"
@ -1192,15 +1192,15 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="141"
h="140"
inherit_gc_alpha="true">
<instance template="tipc_magic_protect"
id="Acid"
posref="TL TL"
x="8"
y="-10"
y="-8"
w="-8"
val="%player_protect_acid" />
<instance template="tipc_magic_protect"
@ -1256,8 +1256,8 @@
posref="TL TL"
sizeref="w5"
w="-1"
h="40"
y="-510">
h="42"
y="-500">
<view type="text"
id="defense_t"
posref="TL TL"
@ -1272,15 +1272,15 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="26"
h="24"
inherit_gc_alpha="true">
<instance template="tipc_scoreEP"
id="dodge"
posref="TL TL"
x="8"
y="-7"
y="-5"
w="-8"
text="uiDodge"
val="%player_dodge_current"
@ -1298,21 +1298,21 @@
posref="TM TL"
sizeref="w5"
w="-1"
h="40"
y="-510">
h="42"
y="-500">
<group id="black"
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="26"
h="24"
inherit_gc_alpha="true">
<instance template="tipc_scoreEP"
id="parry"
posref="TL TL"
x="8"
y="-7"
y="-5"
w="-8"
text="uiParry"
val="%player_parry_current"
@ -1403,7 +1403,7 @@
x="0"
y="-10" />
<group id="pvp_points"
posparent="fp"
posparent="fp"
posref="BL TL"
sizeref="wh"
w="-1"
@ -1423,7 +1423,7 @@
posref="TL TL"
x="0"
sizeref="w"
y="-14"
y="-16"
w="0"
h="26"
inherit_gc_alpha="true">
@ -1453,8 +1453,8 @@
inherit_gc_alpha="true" />
</group>
</group>
<group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
<ctrl style="text_button_header"
<group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="TR TR"
@ -1464,8 +1464,7 @@
tooltip="uittBrowseRefresh"
onclick_l="browse_home"
params_l="name=ui:interface:info_player_skills:content:rpjobs:html" />
<group type="webig_html"
<group type="webig_html"
id="html"
posref="TL TL"
url="http://app.ryzom.com/app_rpjobs/index.php"
@ -1583,24 +1582,23 @@
posref="TR TR"
active="true"
y="-9"
wmargin="8"
hardtext="uiInfo"
tooltip="uittIdentityInfo"
onclick_l="open_title_help"
params_l="from=user" />
<ctrl style="text_button_header"
wmargin="8"
hardtext="uiInfo"
tooltip="uittIdentityInfo"
onclick_l="open_title_help"
params_l="from=user" />
<ctrl style="text_button_header"
button_type="push_button"
id="browse_home"
posref="BR TR"
posparent="title"
posparent="title"
x="0"
y="-2"
hardtext="uiBrowseRefresh"
tooltip="uittBrowseRefresh"
onclick_l="browse_home"
params_l="name=ui:interface:info_player_skills:content:webinfos:html" />
<group type="webig_html"
<group type="webig_html"
id="html"
posref="TL TL"
posparent="parent"

10
code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
Unescape Escape View File

@ -1740,7 +1740,7 @@
</proc>
<group type="modal" id="appear_infos1" x="0" y="0" w="824" h="768" posref="TR TR" render_layer="1"
<group type="modal" id="appear_infos1" x="74" y="0" w="824" h="768" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true" savable="false"
display="false"
>
@ -1765,7 +1765,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
</group>
<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
<group type="modal" id="appear_infos2" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true"
display="false"
>
@ -1778,7 +1778,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
</group>
<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
<group type="modal" id="appear_infos3" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true"
display="false"
>
@ -1791,7 +1791,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
</group>
<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
<group type="modal" id="appear_infos4" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true"
display="false"
>
@ -1804,7 +1804,7 @@
onclick_l="proc" params_l="proc_charsel_infos"/>
</group>
<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="TR TR" render_layer="1"
<group type="modal" id="appear_infos5" x="-74" y="-68" w="698" h="652" posref="MM MM" render_layer="1"
mouse_pos="false" escapable="false" exit_click_out="true"
display="false"
>

Write Preview
Loading…
Cancel
Save