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

Add missing browser css. Restore login window layout

Browse Source
ryzomclassic-develop
kaetemi 3 years ago
parent d30a80acea
commit cac99dc9ab
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
8 changed files with 1816 additions and 1532 deletions
Show Stats Download Patch File Download Diff File

147
ryzom/client/data/gamedev/interfaces_v3/browser.css
Unescape Escape View File

@ -0,0 +1,147 @@
html {
background-color: rgba(0, 0, 0, 1.0);
color: rgba(210, 210, 210, 1.0);
font-size: 12px;
font-style: normal;
font-weight: normal;
text-shadow: none;
}
address, article, aside, blockquote, details, dialog, dd, div, dl, dt,
fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5, h6,
header, hgroup, hr, li, main, nav, ol, p, pre, section, table, ul {
display: block;
}
table {
display: table;
}
input,. table, tr, td, th, textarea {
color: inherit;
font-weight: inherit;
font-style: inherit;
font-size: inherit;
text-shadow: inherit;
}
input, textarea {
text-shadow: 1px 1px #000;
}
a {
color: rgba(240, 155, 100, 1.0);
text-decoration: underline;
}
h1, h2, h3, h4, h5, h6 {
color: rgba(255, 255, 255, 1.0);
}
h1 {
font-size: 2em;
}
h2 {
font-size: 1.5em;
}
h3 {
font-size: 1.17em;
}
h4 {
font-size: 1.0em;
}
h5 {
font-size: 0.83em;
}
h6 {
font-size: 0.67em;
}
pre {
font-family: monospace;
}
/* th { text-align:center; } overrides <td align=".."> property */
th {
font-weight: bold;
}
del {
text-decoration: line-through;
}
u {
text-decoration: underline;
}
em {
font-style: italic;
}
strong {
font-weight: bold;
}
small {
font-size: smaller;
}
dt {
font-weight: bold;
}
hr {
color: rgb(120, 120, 120);
}
/* td { padding: 1px; } overrides <td cellpadding=".."> attribute */
/* table { border-spacing: 2px; } overrides <td cellspacing=".."> attribute */
table {
border-collapse: separate;
}
meter::-webkit-meter-bar,
meter::-webkit-optimum-value,
meter::-webkit-suboptimum-value,
meter::-webkit-even-less-good-value {
background: none;
}
meter::-webkit-meter-bar {
background-color: rgb(100, 100, 100);
width: 5em;
height: 1em;
}
meter::-webkit-meter-optimum-value {
background-color: rgb(80, 220, 80);
}
meter::-webkit-meter-suboptimum-value {
background-color: rgb(220, 220, 80);
}
meter::-webkit-meter-even-less-good-value {
background-color: rgb(220, 80, 80);
}
progress::-webkit-progress-bar,
progress::-webkit-progress-value {
background: none;
}
progress::-webkit-progress-bar {
background-color: rgb(230, 230, 230);
width: 10em;
height: 1em;
}
progress::-webkit-progress-value {
background-color: rgb(0, 100, 180);
}

50
ryzom/client/data/gamedev/interfaces_v3/login_main.xml
Unescape Escape View File

@ -31,22 +31,31 @@
<!-- BACKGROUND -->
<view type="bitmap" posref="TL TL" id="bl" texture="launcher_bg.tga" global_color="false" render_layer="-1" />
<!--
<instance template="log_box" id="window" y="-8" posref="MM MM" w="1024" h="768" color="0 0 0 0"/>
-->
<!--
<view type="bitmap" posref="MM MM" id="log" texture="launcher_log.tga" global_color="false" render_layer="-1" />
-->
<!--
<view type="bitmap" id="jena" posparent="window" posref="MR MR" x="-64" texture="log_jena.tga" global_color="false" render_layer="-1" />
-->
<!-- Login Edit_Boxes -->
<!--
<view type="text" id="txt_log" x="0" posref="TM TM" posparent="window" hardtext="uiLogin" fontsize="10" y="-200" color="255 255 255 255" />
<view type="text" id="txt_pas" posparent="txt_log" posref="TM TM" hardtext="uiPassword" fontsize="10" y="-48" color="255 255 255 255" />
-->
<instance template="edit_box_log" id="eb_login" posparent="txt_log" posref="BM TM" w="240" h="26" fontsize="12" x="0" y="-4"
text_ref="BM BM" text_y="0"
reset_focus_on_hide="false" max_historic="0"
onenter="set_keyboard_focus" params="target=ui:login:checkpass:content:submit_gr:eb_password:eb|select_all=false"
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
<instance template="edit_box_log" id="eb_password" posparent="txt_pas" posref="BM TM" w="240" h="26" fontsize="12" x="0" y="-4"
text_ref="BM BM" text_y="0"
reset_focus_on_hide="false" max_historic="0" entry_type="password"
onenter="on_login" params=""
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="60" color="135 243 28 255" />
<!--
<view type="text" id="tit_login" posparent="log" posref="TL BL" hardtext="uiLogin" fontsize="24" x="62" y="-166" color="208 212 182 255" />
<instance template="edit_box_widget_2" id="eb_login" posparent="log" posref="TM BM" w="292" h="48" fontsize="26" x="-4" y="-229"
@ -62,46 +71,37 @@
reset_focus_on_hide="false" max_historic="0" entry_type="password"
onenter="on_login" params=""
prompt="" enter_loose_focus="true" multi_line="false" max_num_chars="20" color="135 243 28 255" />
-->
<!--
<ctrl style="log_std_but" id="but_log" posparent="eb_password" posref="TM TM" y="-32" onclick_l="on_login" hardtext="uiOnConnect" />
-->
<!--
<ctrl type="button" button_type="push_button" id="but_log" posref="BR BR" x="-304" y="157"
tx_normal="log_over.tga" tx_over="log_over.tga" tx_pushed="log_over.tga"
color="255 255 255 0" col_over="255 255 255 255" col_pushed="255 255 255 0"
onclick_l="on_login" render_layer="-1" />
<view type="text" id="txt_log" posparent="but_log" posref="MM MM" hardtext="uiOnLogin" shadow="true" fontsize="16" y="0" color="208 212 182 255" />
-->
<!-- Boxes Web Shortcuts
<instance template="server_box" id="web_win" posparent="eb_login" posref="BL TL" w="568" h="202" y="-24" /> -->
<!-- Create Account -->
<!--
<ctrl style="log_std_but" id="but_create_account" posparent="but_log" posref="BM TM" y="-28"
onclick_l="on_create_account" hardtext="uiCreateAccount" />
-->
<!-- Edit Account -->
<!--
<ctrl style="log_std_but" id="but_edit_account" posparent="but_create_account" posref="BM TM" y="-8"
onclick_l="open_url" params_l="cfg_EditAccountURL" hardtext="uiEditAccount" />
-->
<!-- Upgrade Account -->
<!-- <ctrl style="log_std_but" id="but_upgrade_account" posparent="but_create_account" posref="BM TM" y="-8"
onclick_l="open_url" params_l="cfg_EditAccountURL" hardtext="uiUpgradeAccount" /> -->
<!-- Forget Password -->
<!--
<ctrl style="log_std_but" id="but_forget_pwd" posparent="but_edit_account" posref="BM TM" y="-8"
onclick_l="open_url" params_l="cfg_ForgetPwdURL" hardtext="uiForgetPwd" />
-->
<!-- Free Trial
<ctrl style="log_spe_but" id="but_free_trial" posparent="but_forget_pwd" posref="BL TL" y="-8"
@ -109,11 +109,8 @@
-->
<!-- Login Support -->
<!--
<ctrl style="log_std_but" id="but_login_support" posparent="but_forget_pwd" posref="BM TM" y="-8"
onclick_l="open_url" params_l="cfg_LoginSupportURL" hardtext="uiLoginSupport" />
-->
<!-- Scan Data -->
<!--
<ctrl style="log_spe_but" id="but_scan_data" posparent="but_login_support" posref="BL TL" y="-8"
@ -138,22 +135,25 @@
<!-- RESOLUTION ET LEVEL OF DETAILS -->
<instance template="server_box" id="res_win" posparent="window" posref="TL TL" w="276" h="24" y="-733" x="10"/>
<instance template="server_box" id="lod_win" posparent="res_win" posref="TR TL" w="276" h="24" x="16" />
<instance template="server_box" id="ver_win" posparent="lod_win" posref="TR TL" w="276" h="24" x="26" />
<!-- Game Configuration -->
<!-- <ctrl style="log_std_but" id="but_game_configuration" posparent="lod_win" posref="TR TL" x="26" onclick_l="on_game_configuration" hardtext="uiGameConfiguration" /> -->
<!-- EXIT BUTTON -->
<!--
<ctrl style="log_button" id="but_exit" posparent="windows" posref="BR BR" y="6" onclick_l="login_quit" hardtext="uiExitLogin" />
-->
<!--
<ctrl type="button" button_type="push_button" id="but_quit" posref="TR TR" x="-30" y="-30"
tx_normal="quit_over.tga" tx_over="quit_over.tga" tx_pushed="quit_over.tga"
color="255 255 255 0" col_over="255 255 255 255" col_pushed="255 255 255 0"
onclick_l="login_quit" />
-->
<!-- Textes -->
<view type="text" id="title_res" posparent="res_win" posref="TL BL" y="2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGResolution" />
<view type="text" id="title_lod" posparent="lod_win" posref="TL BL" y="2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiLOGLod" />
<view type="text" id="title_ver" posparent="ver_win" posref="TL BL" y="2" color="255 255 255 255" fontsize="10" shadow="true" hardtext="uiClientVersion" />
<view type="text" id="res_value" posparent="res_win" posref="MM MM" y="0" color="135 243 28 255" fontsize="10" shadow="true" hardtext="uiResValue" />
<view type="text" id="lod_value" posparent="lod_win" posref="MM MM" y="0" color="135 243 28 255" fontsize="10" shadow="true" hardtext="uiLodValue" />
<view type="text" id="ver_value" posparent="ver_win" posref="MM MM" y="0" color="135 243 28 255" fontsize="10" shadow="true" hardtext="" />
<!-- Boutons Res -->
@ -296,7 +296,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
checkbox_bitmap_pushed=""
checkbox_bitmap_over=""
background_bitmap_view=""
home="release.html"
home=""
browse_next_time="true"
form_text_area_group="edit_box_widget_multiline"
>
@ -512,7 +512,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
checkbox_bitmap_pushed=""
checkbox_bitmap_over=""
background_bitmap_view=""
home="release.html"
home=""
browse_next_time="true"
form_text_area_group="edit_box_widget_multiline"
>

3
ryzom/client/data/gamedev/interfaces_v3/macros.xml
Unescape Escape View File

@ -185,6 +185,9 @@
<ctrl style="new_element_header" id="add_button" posref="MR MR" x="-16" y="0" wmargin="8" hardtext="uittNewKeyShortcut"
onclick_l="keys_new" />
<ctrl style="new_element_header" id="save_button" posparent="add_button" posref="ML MR" x="-4" y="0" wmargin="8" hardtext="uiSaveUI"
onclick_l="save_ui" />
</group>
<group id="content" x="0" y="0" w="0" child_resize_h="true" child_resize_hmargin="0" posref="TL TL" >

11
ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
Unescape Escape View File

@ -696,15 +696,10 @@
onclick_l="leave_modal" />
</group>
<!-- Web box
<group id="webstart" posref="BR BR" w="200" h="200" active="true" >
<group id="content" x="0" y="0" w="200" h="200" posref="TL TL" >
<group type="html" id="webstart_html" posref="TL TL"
<group id="webstart" posref="BR BR" w="100" h="60" active="true" >
<group id="content" x="0" y="0" w="100" h="60" posref="MM MM" >
<group id="webstart_html" type="html" posref="MM MM"
url=""
title_prefix="uiQuickhelpTitle"
sizeref="wh" x="0" y="0" w="-40" h="-40"

48
ryzom/client/data/gamedev/interfaces_v3/player.lua
Unescape Escape View File

@ -376,6 +376,24 @@ function game:bonusMalusSetText(ui, slot, fmt)
end
end
------------------------------------------------------------------------------------------------------------
-- Called from c++ to format icon regen timer text
-- timer: number, ie 123, -123
-- dbPath: UI:VARIABLES:BONUS:0
--
-- Activate it in "bonuses" and/or "maluses" xml group.
-- If using color tags, then also set both colors to white
-- regen_text_fct="lua:game:formatRegenTimer"
-- regen_text_color="255 255 255"
-- regen_text_disabled_color="255 255 255"
function game:formatRegenTimer(timer, dbPath)
if timer > 60 then
return string.format("%dm", timer / 60);
else
return string.format("%ds", timer);
end
end
------------------------------------------------------------------------------------------------------------
-- From given DB vals, compute the 'Xp Bonus' text info
function game:updateXpCatQuantity(textSlot, ui)
@ -469,7 +487,7 @@ end
------------------------------------------------------------------------------------------------------------
-- update if needed the ActionHandler and text update from DB
function game:updateBonusMalusTextSetup()
local numLocalBonusMalus= getDefine("num_local_bonus_malus");
local numLocalBonusMalus= tonumber(getDefine("num_local_bonus_malus"));
local uiBonus= getUI('ui:interface:bonus_malus:header_opened:bonus');
local uiMalus= getUI('ui:interface:bonus_malus:header_opened:malus');
local dbXpCat= "@SERVER:CHARACTER_INFO:XP_CATALYSER:Count";
@ -658,12 +676,14 @@ function game:updatePlayerBonusMalus()
-- get
local sheet= getDbProp(dbServerBonusBase .. tostring(i) .. ":SHEET" );
local disabled= getDbProp(dbServerBonusBase .. tostring(i) .. ":DISABLED" );
local timer = getDbProp(dbServerBonusBase .. tostring(i) .. ":DISABLED_TIME" );
if(sheet~=0) then
mustShowBonus= true;
end
-- copy (to index shifted if needed)
setDbProp(dbLocalBonusBase .. tostring(destIndex) .. ":SHEET", sheet );
setDbProp(dbLocalBonusBase .. tostring(destIndex) .. ":DISABLED", disabled );
setDbProp(dbLocalBonusBase .. tostring(destIndex) .. ":DISABLED_TIME", timer);
destIndex= destIndex+1;
end
if(mustShowBonus) then
@ -708,12 +728,14 @@ function game:updatePlayerBonusMalus()
-- get
local sheet= getDbProp(dbServerMalusBase .. tostring(i) .. ":SHEET" );
local disabled= getDbProp(dbServerMalusBase .. tostring(i) .. ":DISABLED" );
local timer = getDbProp(dbServerMalusBase .. tostring(i) .. ":DISABLED_TIME" );
if(sheet~=0) then
mustShowMalus= true;
end
-- copy
setDbProp(dbLocalMalusBase .. tostring(destIndex) .. ":SHEET", sheet );
setDbProp(dbLocalMalusBase .. tostring(destIndex) .. ":DISABLED", disabled );
setDbProp(dbLocalMalusBase .. tostring(destIndex) .. ":DISABLED_TIME", timer);
destIndex= destIndex+1;
end
if(mustShowMalus) then
@ -958,3 +980,27 @@ function game:updateCrystallizedSpellTooltip(crystallizedSpell)
updateTooltipCoords()
return text
end
------------------------------------------------------------------------------------------------------------
-- update craft window craftplan or item name and description
-- craftphan
-- uiCaller == ui:interface:phrase_faber_execution:header_opened
-- dbPath == UI:PHRASE:FABER:FABER_PLAN:SHEET
-- selected item
-- uiCaller == ui:interface:phrase_faber_execution:header_opened:item_result
-- dbPath == UI:PHRASE:FABER:RESULT_ITEM:SHEET
function game:updatePhraseFaberPreview(dbPath)
local ui= getUICaller();
local sheet = getSheetName(getDbProp(dbPath))
local name = ui:find("name")
if (name ~= nil) then
ui:find("name").hardtext = getSheetLocalizedName(sheet)
end
local desc = ui:find("desc")
if (desc ~= nil) then
ui:find("desc").hardtext = getSheetLocalizedDesc(sheet)
end
end

1
ryzom/client/data/gamedev/interfaces_v3/reset.xml
Unescape Escape View File

@ -231,6 +231,7 @@
<action handler="set" params="dblink=UI:SAVE:DAY_COLOR|value=makeRGB(219,254,174)" />
<action handler="set" params="dblink=UI:SAVE:NIGHT_COLOR|value=makeRGB(127,190,254)" />
<action handler="set" params="dblink=UI:SAVE:SHOW_3D_ITEM_PREVIEW|value=1" />
<action handler="set" params="dblink=UI:SAVE:SHOW_ICON_BUFFS|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_SAP|value=1" />
<action handler="set" params="dblink=UI:SAVE:PLAYER:DISP_STA|value=1" />

88
ryzom/client/data/gamedev/interfaces_v3/webbrowser.lua
Unescape Escape View File

@ -5,6 +5,36 @@ WebBrowser = {
apps = {}
}
function WebBrowser:addWindow(id, title, ui)
local found_app = nil
for k,app in pairs(self.apps) do
if app.id == id then
found_app = app
app.title = title
app.uiWindow = ui
app.winw = ui.w
app.winh = ui.h
end
end
if found_app == nil then
local app = {}
app.id = id
app.title = ""
app.url = ""
app.uiWindow = ui
app.winid = "ui:interface:" .. id
app.winw = ui.w
app.winh = ui.h
app.minimized = true
app.activeUrl = ""
app.closedw = 150
app.closedh = 0
table.insert(self.apps, app)
end
return ui
end
function WebBrowser:openWindow(id, url)
-- default value if url is not set
url = url or "http://app.ryzom.com/"
@ -22,6 +52,8 @@ function WebBrowser:openWindow(id, url)
app.winid = "ui:interface:" .. id
app.winw = 780
app.winh = 500
app.closedw = 150
app.closedh = 0
app.minimized = true
app.activeUrl = ""
@ -109,8 +141,8 @@ function WebBrowser:saveWindow(app)
app.winw = app.uiWindow.w
app.winh = app.uiWindow.h
-- minimize
app.uiWindow.w = 150
app.uiWindow.h = 0
app.uiWindow.w = app.closedw
app.uiWindow.h = app.closedh
end
function WebBrowser:restoreWindow(app)
@ -121,6 +153,58 @@ function WebBrowser:restoreWindow(app)
end
end
------------------------------------------------------------------------------------------------------------
--
function WebBrowser:saveWindowPop(app)
if app == nil then
app = self:findAppFromUiCaller()
end
if app then
app.minimized = true
-- save size
app.winw = app.uiWindow.w
app.winh = app.uiWindow.h
app.pop_min_h = app.uiWindow.pop_min_h
app.pop_max_h = app.uiWindow.pop_max_h
app.pop_min_w = app.uiWindow.pop_min_w
-- minimize
app.uiWindow.w = app.closedw
app.uiWindow.h = app.closedh
app.uiWindow.pop_min_h = 32
app.uiWindow.pop_min_w = app.closedw
end
end
------------------------------------------------------------------------------------------------------------
--
function WebBrowser:restoreWindowPop(app)
if app == nil then
app = self:findAppFromUiCaller()
end
if app and app.minimized then
app.uiWindow.w = app.winw
app.uiWindow.h = app.winh
if app.pop_min_h ~= nil then
app.uiWindow.pop_min_h = app.pop_min_h
end
if app.pop_max_h ~= nil then
app.uiWindow.pop_max_h = app.pop_max_h
end
if app.pop_min_w ~= nil then
app.uiWindow.pop_min_w = app.pop_min_w
end
app.minimized = false
end
end
function WebBrowser:onClickRedo()
-- caller is :header_opened:browse_redo
local uiWindow = getUICaller().parent.parent

1068
ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save