games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Merge pull request #2177 from krs0/feature/Move_battle_fake_lables_into_separate_group

Browse Source 
Move battle fake labels into separate group, and small fixes
This commit is contained in:
Ivan Savenko 2023-06-05 18:56:38 +03:00 committed by GitHub
commit 526ce1b546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
config/widgets/settings/battleOptionsTab.json
View File

@ -66,24 +66,30 @@
},
/////////////////////////////////////// Left section - checkboxes
{
"type": "labelDescription",
"text": "core.genrltxt.402", // All Stats
"position": {"x": 45, "y": 265}
"name": "creatureInfoLabels",
"type" : "verticalLayout",
"customType" : "labelDescription",
"position": {"x": 45, "y": 265},
"items":
[
{
"text": "core.genrltxt.402",
},
{
"text": "core.genrltxt.403",
}
]
},
{
"type": "labelDescription",
"text": "core.genrltxt.403", // Spells only
"position": {"x": 45, "y": 295}
},
{
"name": "creatureInfoAllPlaceholder",
"type": "checkboxFake",
"name": "creatureInfoCheckboxes",
"type" : "verticalLayout",
"customType" : "checkboxFake",
"position": {"x": 10, "y": 263},
},
{
"name": "creatureInfoSpellsPlaceholder",
"type": "checkboxFake",
"position": {"x": 10, "y": 293},
"items":
[
{},
{}
]
},
{
"name": "generalOptionsLabels",

31
config/widgets/settings/generalOptionsTab.json
View File

@ -9,6 +9,12 @@
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 289, "w": 365, "h": 3}
},
{
"name": "lineCreatureNumbersToggleGroupEnd",
"type": "texture",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 383, "w": 220, "h": 3}
},
{
"type" : "labelTitle",
"position": {"x": 10, "y": 55},
@ -76,13 +82,13 @@
{
"name": "fullscreenBorderlessCheckbox",
"help": "vcmi.systemOptions.fullscreenBorderless",
"callback": "fullscreenBorderlessChanged"
"callback": "fullscreenBorderlessChanged",
"created" : "desktop"
},
{
"name": "fullscreenExclusiveCheckbox",
"help": "vcmi.systemOptions.fullscreenExclusive",
"callback": "fullscreenExclusiveChanged"
"callback": "fullscreenExclusiveChanged",
"created" : "desktop"
},
{
@ -153,17 +159,9 @@
},
{
"text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover",
},
{
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
}
]
},
{
"name": "availableCreaturesAsDwellingPicker",
"type": "toggleGroup",
"callback": "availableCreaturesAsDwellingChanged"
},
{
"name": "availableCreaturesAsDwellingPicker",
"type": "toggleGroup",
@ -185,11 +183,22 @@
],
"callback": "availableCreaturesAsDwellingChanged"
},
{
"name": "compactTownCreatureInfoLabel",
"type" : "verticalLayout",
"customType" : "labelDescription",
"position": {"x": 45, "y": 391},
"items" : [
{
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
}
]
},
{
"name": "compactTownCreatureInfoCheckbox",
"type": "checkbox",
"help": "vcmi.otherOptions.compactTownCreatureInfo",
"position": {"x": 10, "y": 383},
"position": {"x": 10, "y": 389},
"callback": "compactTownCreatureInfoChanged"
}
]