games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Slightly better layout for new settings window

Browse Source
This commit is contained in:
Ivan Savenko 2023-03-02 21:53:44 +02:00
parent 7ef5163d9d
commit f23186f47d
5 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mods/vcmi/Data/vcmiSettingsWindow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 459 KiB

After

Width:  |  Height:  |  Size: 159 KiB

34
config/widgets/settings/adventureOptionsTab.json
View File

@ -10,15 +10,15 @@
"items":
[
{
"position": {"x": 122, "y": 52},
"position": {"x": 100, "y": 60},
"text": "core.genrltxt.569"
},
{
"position": {"x": 122, "y": 118},
"position": {"x": 100, "y": 120},
"text": "core.genrltxt.570"
},
{
"position": {"x": 122, "y": 184},
"position": {"x": 100, "y": 180},
"text": "core.genrltxt.571"
}
]
@ -27,7 +27,7 @@
{
"name": "heroMovementSpeedPicker",
"type": "toggleGroup",
"position": {"x": 28, "y": 65},
"position": {"x": 10, "y": 70},
"items":
[
{
@ -76,7 +76,7 @@
{
"name": "enemyMovementSpeedPicker",
"type": "toggleGroup",
"position": {"x": 28, "y": 132},
"position": {"x": 10, "y": 130},
"items":
[
{
@ -117,7 +117,7 @@
{
"name": "mapScrollSpeedPicker",
"type": "toggleGroup",
"position": {"x": 28, "y": 198},
"position": {"x": 10, "y": 190},
"items":
[
{
@ -194,27 +194,27 @@
"items":
[
{
"position": {"x": 64, "y": 278},
"position": {"x": 45, "y": 302},
"text": "core.genrltxt.572"
},
{
"position": {"x": 64, "y": 314},
"position": {"x": 45, "y": 332},
"text": "core.genrltxt.573"
},
{
"position": {"x": 64, "y": 350},
"position": {"x": 45, "y": 362},
"text": "core.genrltxt.574"
},
{
"position": {"x": 64, "y": 386},
"position": {"x": 45, "y": 392},
"text": "vcmi.adventureOptions.numericQuantities.hover"
},
{
"position": {"x": 64, "y": 422},
"position": {"x": 45, "y": 422},
"text": "vcmi.adventureOptions.forceMovementInfo.hover"
},
{
"position": {"x": 64, "y": 458},
"position": {"x": 45, "y": 452},
"text": "vcmi.adventureOptions.showGrid.hover"
}
]
@ -225,7 +225,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.361",
"position": {"x": 28, "y": 312},
"position": {"x": 10, "y": 330},
"callback": "heroReminderChanged"
},
@ -234,7 +234,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.362",
"position": {"x": 28, "y": 348},
"position": {"x": 10, "y": 360},
"callback": "quickCombatChanged"
},
@ -243,7 +243,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.adventureOptions.numericQuantities",
"position": {"x": 28, "y": 384},
"position": {"x": 10, "y": 390},
"callback": "numericQuantitiesChanged"
},
@ -252,7 +252,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.adventureOptions.forceMovementInfo",
"position": {"x": 28, "y": 420},
"position": {"x": 10, "y": 420},
"callback": "forceMovementInfoChanged"
},
{
@ -260,7 +260,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.adventureOptions.showGrid",
"position": {"x": 28, "y": 456},
"position": {"x": 10, "y": 450},
"callback": "showGridChanged"
}
]

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

@ -8,25 +8,25 @@
"alignment": "center",
"color": "yellow",
"text": "core.genrltxt.393",
"position": {"x": 122, "y": 224}
"position": {"x": 100, "y": 310}
},
{
"name": "autoCombatOptionsLabel",
"type": "label",
"font": "medium",
"alignment": "center",
"alignment": "left",
"color": "yellow",
"text": "core.genrltxt.396",
"position": {"x": 353, "y": 56}
"position": {"x": 380, "y": 60}
},
{
"name": "creatureInfoLabel",
"type": "label",
"font": "medium",
"alignment": "center",
"alignment": "left",
"color": "yellow",
"text": "core.genrltxt.397",
"position": {"x": 98, "y": 295}
"position": {"x": 10, "y": 210}
},
{
@ -36,7 +36,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.398",
"position": {"x": 283, "y": 76}
"position": {"x": 415, "y": 90}
},
{
"name": "spellsAutoCombatLabel",
@ -45,7 +45,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.399",
"position": {"x": 283, "y": 106}
"position": {"x": 415, "y": 120}
},
{
"name": "catapultAutoCombatLabel",
@ -54,7 +54,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.400",
"position": {"x": 283, "y": 136}
"position": {"x": 415, "y": 150}
},
{
"name": "ballistaAutoCombatLabel",
@ -63,7 +63,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.151",
"position": {"x": 283, "y": 166}
"position": {"x": 415, "y": 180}
},
{
"name": "aidTentAutoCombatLabel",
@ -72,7 +72,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.401",
"position": {"x": 283, "y": 196}
"position": {"x": 415, "y": 210}
},
{
@ -82,7 +82,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.402",
"position": {"x": 61, "y": 315}
"position": {"x": 45, "y": 240}
},
{
"name": "creatureInfoOnlySpellsLabel",
@ -91,7 +91,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.403",
"position": {"x": 61, "y": 345}
"position": {"x": 45, "y": 270}
},
{
@ -101,7 +101,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.404",
"position": {"x": 61, "y": 57}
"position": {"x": 45, "y": 60}
},
{
"name": "showMovementRangeLabel",
@ -110,7 +110,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.405",
"position": {"x": 61, "y": 90}
"position": {"x": 45, "y": 90}
},
{
"name": "mouseShadowLabel",
@ -119,7 +119,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.406",
"position": {"x": 61, "y": 123}
"position": {"x": 45, "y": 120}
},
{
"name": "battleCasualtiesLabel",
@ -128,7 +128,7 @@
"alignment": "left",
"color": "white",
"text": "core.genrltxt.407",
"position": {"x": 61, "y": 156}
"position": {"x": 45, "y": 150}
},
{
@ -136,7 +136,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.427",
"position": {"x": 25, "y": 56},
"position": {"x": 10, "y": 60},
"callback": "viewGridChanged"
},
{
@ -144,7 +144,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.428",
"position": {"x": 25, "y": 89},
"position": {"x": 10, "y": 90},
"callback": "movementShadowChanged"
},
{
@ -152,14 +152,14 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.429",
"position": {"x": 25, "y": 122},
"position": {"x": 10, "y": 120},
"callback": "mouseShadowChanged"
},
{
"name": "animationSpeedPicker",
"type": "toggleGroup",
"position": {"x": 28, "y": 233},
"position": {"x": 10, "y": 330},
"items":
[
{
@ -250,7 +250,7 @@
"alignment": "left",
"color": "white",
"text": "vcmi.battleOptions.showQueue.hover",
"position": {"x": 61, "y": 393}
"position": {"x": 45, "y": 370}
},
{
@ -258,7 +258,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.battleOptions.showQueue",
"position": {"x": 25, "y": 391},
"position": {"x": 10, "y": 370},
"callback": "showQueueChanged"
},
@ -269,13 +269,13 @@
"alignment": "left",
"color": "yellow",
"text": "vcmi.battleOptions.queueSizeLabel.hover",
"position": {"x": 60, "y": 429}
"position": {"x": 10, "y": 400}
},
{
"name": "queueSizePicker",
"type": "toggleGroup",
"position": {"x": 28, "y": 450},
"position": {"x": 10, "y": 430},
"items":
[
{
@ -343,7 +343,7 @@
"alignment": "left",
"color": "white",
"text": "vcmi.battleOptions.skipBattleIntroMusic.hover",
"position": {"x": 61, "y": 502}
"position": {"x": 45, "y": 180}
},
{
@ -351,8 +351,8 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.battleOptions.skipBattleIntroMusic",
"position": {"x": 25, "y": 500},
"position": {"x": 10, "y": 180},
"callback": "skipBattleIntroMusicChanged"
}
]
}
}

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

@ -10,15 +10,15 @@
"items":
[
{
"position": {"x": 122, "y": 50},
"position": {"x": 100, "y": 60},
"text": "vcmi.systemOptions.resolutionButton.hover"
},
{
"position": {"x": 122, "y": 135},
"position": {"x": 100, "y": 130},
"text": "core.genrltxt.394"
},
{
"position": {"x": 122, "y": 200},
"position": {"x": 100, "y": 190},
"text": "core.genrltxt.395"
}
]
@ -27,7 +27,7 @@
{
"name": "resolutionButton",
"type": "button",
"position": {"x": 28, "y": 63},
"position": {"x": 10, "y": 70},
"image": "buttons/resolution",
"help": "vcmi.systemOptions.resolutionButton",
"callback": "setGameResolution",
@ -40,13 +40,13 @@
"font": "medium",
"alignment": "center",
"color": "yellow",
"position": {"x": 170, "y": 80}
"position": {"x": 160, "y": 85}
},
{
"name": "musicSlider",
"type": "slider",
"position": {"x": 29, "y": 147},
"position": {"x": 10, "y": 150},
"size": 190,
"style": "brown",
"orientation": "horizontal",
@ -58,7 +58,7 @@
{
"name": "soundVolumeSlider",
"type": "slider",
"position": {"x": 29, "y": 213},
"position": {"x": 10, "y": 210},
"size": 190,
"style": "brown",
"orientation": "horizontal",
@ -76,15 +76,15 @@
"items":
[
{
"position": {"x": 64, "y": 278},
"position": {"x": 45, "y": 330},
"text": "core.genrltxt.577"
},
{
"position": {"x": 64, "y": 314},
"position": {"x": 45, "y": 360},
"text": "vcmi.systemOptions.fullscreenButton.hover"
},
{
"position": {"x": 64, "y": 350},
"position": {"x": 45, "y": 390},
"text": "vcmi.systemOptions.framerateButton.hover"
}
]
@ -95,7 +95,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "core.help.364",
"position": {"x": 28, "y": 276},
"position": {"x": 10, "y": 330},
"callback": "spellbookAnimationChanged"
},
@ -104,7 +104,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.systemOptions.fullscreenButton",
"position": {"x": 28, "y": 312},
"position": {"x": 10, "y": 360},
"callback": "fullscreenChanged"
},
@ -113,7 +113,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.systemOptions.framerateButton",
"position": {"x": 28, "y": 348},
"position": {"x": 10, "y": 390},
"callback": "framerateChanged"
},
@ -124,7 +124,7 @@
"alignment": "left",
"color": "white",
"text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover",
"position": {"x": 64, "y": 386}
"position": {"x": 45, "y": 420}
},
{
@ -132,7 +132,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.otherOptions.availableCreaturesAsDwellingLabel",
"position": {"x": 28, "y": 384},
"position": {"x": 10, "y": 420},
"callback": "availableCreaturesAsDwellingLabelChanged"
},
@ -143,7 +143,7 @@
"alignment": "left",
"color": "white",
"text": "vcmi.otherOptions.compactTownCreatureInfo.hover",
"position": {"x": 64, "y": 422}
"position": {"x": 45, "y": 450}
},
{
@ -151,7 +151,7 @@
"type": "toggleButton",
"image": "sysopchk.def",
"help": "vcmi.otherOptions.compactTownCreatureInfo",
"position": {"x": 28, "y": 420},
"position": {"x": 10, "y": 450},
"callback": "compactTownCreatureInfoChanged"
}
]

20
config/widgets/settings/settingsMainContainer.json
View File

@ -20,7 +20,7 @@
{
"index": 0,
"type": "toggleButton",
"position": {"x": 0, "y": 0},
"position": {"x": 10, "y": 5},
"image": "buttons/quadwide",
"help": "vcmi.settingsMainWindow.generalTab",
"items":
@ -39,7 +39,7 @@
{
"index": 1,
"type": "toggleButton",
"position": {"x": 150, "y": 0},
"position": {"x": 200, "y": 5},
"image": "buttons/quadwide",
"help": "vcmi.settingsMainWindow.adventureTab",
"items":
@ -58,7 +58,7 @@
{
"index": 2,
"type": "toggleButton",
"position": {"x": 300, "y": 0},
"position": {"x": 390, "y": 5},
"image": "buttons/quadwide",
"help": "vcmi.settingsMainWindow.battleTab",
"items":
@ -99,7 +99,7 @@
{
"name": "loadButton",
"type": "button",
"position": {"x": 386, "y": 383},
"position": {"x": 380, "y": 300},
"image": "SOLOAD.DEF",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.321",
@ -110,7 +110,7 @@
{
"name": "saveButton",
"type": "button",
"position": {"x": 497, "y": 383},
"position": {"x": 490, "y": 300},
"image": "SOSAVE.DEF",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.322",
@ -121,7 +121,7 @@
{
"name": "restartButton",
"type": "button",
"position": {"x": 386, "y": 442},
"position": {"x": 380, "y": 360},
"image": "SORSTRT.DEF",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.323",
@ -132,7 +132,7 @@
{
"name": "mainMenuButton",
"type": "button",
"position": {"x": 497, "y": 442},
"position": {"x": 490, "y": 360},
"image": "SOMAIN.DEF",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.320",
@ -143,7 +143,7 @@
{
"name": "quitButton",
"type": "button",
"position": {"x": 386, "y": 500},
"position": {"x": 380, "y": 420},
"image": "soquit.def",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.324",
@ -154,7 +154,7 @@
{
"name": "closeSettingsButton",
"type": "button",
"position": {"x": 497, "y": 500},
"position": {"x": 490, "y": 420},
"image": "soretrn.def",
"imageOrder": [1, 0, 2, 3],
"help": "core.help.325",
@ -162,4 +162,4 @@
"hotkey": ["esc", "backspace"]
}
]
}
}