unified ui asset name

This commit is contained in:
Chr1Z93 2024-07-01 12:08:58 +02:00
parent cc86d223d0
commit eb4b40159c
4 changed files with 65 additions and 34 deletions

View File

@ -30,14 +30,14 @@
"URL": "http://cloud-3.steamusercontent.com/ugc/2026086584372569912/5CB461AEAE2E59D3064D90A776EB86C46081EC78/"
},
{
"Name": "option-on",
"Name": "option_on",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2462982115668997008/2178787B67B3C96F3419EDBAB8420E39893756BC/"
"URL": "http://cloud-3.steamusercontent.com/ugc/2024962321889555728/22ABD35CBB49A001F3A5318E4AFCFB22D24FEA39/"
},
{
"Name": "option-off",
"Name": "option_off",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2462982115668996901/D6438ECBB11DECC6DB9987589FF526FBAD4D2368/"
"URL": "http://cloud-3.steamusercontent.com/ugc/2024962321889555661/6643E5CC9160FF4624672C255D0DF7B313DA00A5/"
},
{
"Name": "font_arkhamicons",
@ -69,16 +69,6 @@
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2280574378889753733/F67B7B37FF7AA253B6D697E577DF54A3E76030C2/"
},
{
"Name": "option_on",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2024962321889555728/22ABD35CBB49A001F3A5318E4AFCFB22D24FEA39/"
},
{
"Name": "option_off",
"Type": 0,
"URL": "http://cloud-3.steamusercontent.com/ugc/2024962321889555661/6643E5CC9160FF4624672C255D0DF7B313DA00A5/"
},
{
"Name": "SpeechBubble",
"Type": 0,

View File

@ -1448,7 +1448,7 @@ function onClick_toggleOption(_, _, id)
local currentState = optionPanel[id]
local newState = not currentState
applyOptionPanelChange(id, newState)
UI.setAttribute(id, "image", newState and "option-on" or "option-off")
UI.setAttribute(id, "image", newState and "option_on" or "option_off")
end
-- color selection for playArea
@ -1542,9 +1542,9 @@ function updateOptionPanelState()
elseif (type(optionValue) == "boolean" and optionValue)
or (type(optionValue) == "string" and optionValue)
or (type(optionValue) == "table" and #optionValue ~= 0) then
UI.setAttribute(id, "image", "option-on")
UI.setAttribute(id, "image", "option_on")
else
UI.setAttribute(id, "image", "option-off")
UI.setAttribute(id, "image", "option_off")
end
end
end

View File

@ -62,7 +62,7 @@
<Panel class="doubleColumn-wrapper"
padding="0 17 3 3"/>
<Button class="optionToggle"
image="option-off"
image="option_off"
rectAlignment="MiddleRight"
offsetXY="-30 0"
colors="#FFFFFF|#dfdfdf"

View File

@ -1,25 +1,54 @@
<!-- Default formatting -->
<Defaults>
<Text color="black" alignment="MiddleLeft"/>
<Text class="h1" fontSize="160" font="font_teutonic-arkham"/>
<Text class="h2" fontSize="120" font="font_teutonic-arkham"/>
<Text class="p" fontSize="60" alignment="UpperLeft"/>
<Text color="black"
alignment="MiddleLeft"/>
<Text class="h1"
fontSize="160"
font="font_teutonic-arkham"/>
<Text class="h2"
fontSize="120"
font="font_teutonic-arkham"/>
<Text class="p"
fontSize="60"
alignment="UpperLeft"/>
<Panel rotation="0 0 180"/>
<Panel class="window" width="1500" height="1500" color="white" outline="white" outlineSize="10 10"/>
<Panel class="window"
width="1500"
height="1500"
color="white"
outline="white"
outlineSize="10 10"/>
<Row dontUseTableRowBackground="true"/>
<Row class="header" color="#707070"/>
<Row class="option" preferredHeight="200" color="#9e9e9e"/>
<Row class="header"
color="#707070"/>
<Row class="option"
preferredHeight="200"
color="#9e9e9e"/>
<!-- row heights: 70 x lines + 50 -->
<Row class="description" color="#cfcfcf"/>
<Row class="description"
color="#cfcfcf"/>
<Button class="optionToggle" rectAlignment="MiddleRight" offsetXY="-30 0" colors="#FFFFFF|#dfdfdf" height="160" width="288" ignoreLayout="True" fontSize="60"/>
<Button class="optionToggle"
rectAlignment="MiddleRight"
offsetXY="-30 0"
colors="#FFFFFF|#dfdfdf"
height="160"
width="288"
ignoreLayout="True"
fontSize="60"/>
</Defaults>
<!-- Option window -->
<Panel id="options" class="window" offsetXY="-580 200" scale="0.5 0.5" active="false" showAnimation="FadeIn" hideAnimation="FadeOut">
<Panel id="options"
class="window"
offsetXY="-580 200"
scale="0.5 0.5"
active="false"
showAnimation="FadeIn"
hideAnimation="FadeOut">
<TableLayout cellPadding="25 25 15 15">
<!-- Header -->
<Row class="header">
@ -32,10 +61,14 @@
<Row class="option">
<Cell>
<Text class="h2">Import trauma</Text>
<Button class="optionToggle" id="importTrauma" onClick="optionButtonClick(importTrauma)" image="option_on"/>
<Button class="optionToggle"
id="importTrauma"
onClick="optionButtonClick(importTrauma)"
image="option_on"/>
</Cell>
</Row>
<Row class="description" preferredHeight="330">
<Row class="description"
preferredHeight="330">
<Cell>
<Text class="p">Enables importing trauma values from the campaign log (custom content might give wrong values!).&#xA;Enter players in the campaign log in this order:&#xA;White, Orange, Green, Red.</Text>
</Cell>
@ -45,10 +78,14 @@
<Row class="option">
<Cell>
<Text class="h2">Tidy playermats</Text>
<Button class="optionToggle" id="tidyPlayermats" onClick="optionButtonClick(tidyPlayermats)" image="option_on"/>
<Button class="optionToggle"
id="tidyPlayermats"
onClick="optionButtonClick(tidyPlayermats)"
image="option_on"/>
</Cell>
</Row>
<Row class="description" preferredHeight="190">
<Row class="description"
preferredHeight="190">
<Cell>
<Text class="p">Controls whether the playermats should get tidied (removal of all cards and tokens).</Text>
</Cell>
@ -58,10 +95,14 @@
<Row class="option">
<Cell>
<Text class="h2">Remove drawn lines</Text>
<Button class="optionToggle" id="removeDrawnLines" onClick="optionButtonClick(removeDrawnLines)" image="option_off"/>
<Button class="optionToggle"
id="removeDrawnLines"
onClick="optionButtonClick(removeDrawnLines)"
image="option_off"/>
</Cell>
</Row>
<Row class="description" preferredHeight="120">
<Row class="description"
preferredHeight="120">
<Cell>
<Text class="p">Controls whether all drawn lines should be removed.</Text>
</Cell>