From 33603f87f3f2b1e665367c56687f2292f1e67d8f Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 3 Mar 2023 18:14:20 +0200 Subject: [PATCH] Finalized general layout --- .../Data/settingsWindow/frameMovement.png | Bin 2798 -> 2799 bytes .../Data/settingsWindow/frameStackQueue.png | Bin 0 -> 2737 bytes Mods/vcmi/config/vcmi/english.json | 5 +- .../widgets/settings/adventureOptionsTab.json | 50 +++++----- config/widgets/settings/battleOptionsTab.json | 91 +++++++++--------- .../widgets/settings/generalOptionsTab.json | 38 +++++--- .../settings/settingsMainContainer.json | 29 +++--- 7 files changed, 118 insertions(+), 95 deletions(-) create mode 100644 Mods/vcmi/Data/settingsWindow/frameStackQueue.png diff --git a/Mods/vcmi/Data/settingsWindow/frameMovement.png b/Mods/vcmi/Data/settingsWindow/frameMovement.png index 1f121ae2f715df248fa20c3794812e37129d2451..15876c23da93b68278277ec6c92e666f7613797b 100644 GIT binary patch delta 2340 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 JPDHLkV1k&hQy>5U diff --git a/Mods/vcmi/Data/settingsWindow/frameStackQueue.png b/Mods/vcmi/Data/settingsWindow/frameStackQueue.png new file mode 100644 index 0000000000000000000000000000000000000000..a07748458bee0b1b4e63a012ee7e70ac8b7b363c GIT binary patch literal 2737 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 U@5jGbhlc=QO>wAtV^aKo0G~4QC;$Ke literal 0 HcmV?d00001 diff --git a/Mods/vcmi/config/vcmi/english.json b/Mods/vcmi/config/vcmi/english.json index 8501658ca..a448b460b 100644 --- a/Mods/vcmi/config/vcmi/english.json +++ b/Mods/vcmi/config/vcmi/english.json @@ -50,9 +50,12 @@ "vcmi.adventureOptions.forceMovementInfo.help" : "{Always show move info in status bar}\n\n Replaces default status bar info with movement points data without need to hold ALT button.", "vcmi.adventureOptions.showGrid.hover" : "Show grid", "vcmi.adventureOptions.showGrid.help" : "{Show grid}\n\n Shows grid overlay, showing borders between adventure map tiles.", + "vcmi.adventureOptions.mapScrollSpeed4.hover": "", + "vcmi.adventureOptions.mapScrollSpeed5.hover": "", + "vcmi.adventureOptions.mapScrollSpeed6.hover": "", "vcmi.adventureOptions.mapScrollSpeed4.help": "Set map scrolling speed to very fast", "vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to extremely fast", - "vcmi.adventureOptions.mapScrollSpeed5.help": "Set map scrolling speed to fast, very fast.", + "vcmi.adventureOptions.mapScrollSpeed6.help": "Set map scrolling speed to fast, very fast.", "vcmi.battleOptions.queueSizeLabel.hover": "Queue size (takes effect on next battle)", "vcmi.battleOptions.queueSizeNoneButton.hover": "OFF", diff --git a/config/widgets/settings/adventureOptionsTab.json b/config/widgets/settings/adventureOptionsTab.json index af335782f..1a569cfce 100644 --- a/config/widgets/settings/adventureOptionsTab.json +++ b/config/widgets/settings/adventureOptionsTab.json @@ -5,25 +5,31 @@ "name": "lineMovementEnd", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 240, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 22, "w": 365, "h": 3} + }, + { + "name": "lineLabelsEnd", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} }, { "name": "frameHeroMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 57 } + "position": {"x": 6, "y": 50 } }, { "name": "frameEnemyMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 117 } + "position": {"x": 6, "y": 110 } }, { "name": "frameMapMovement", "type": "picture", "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 177 } + "position": {"x": 6, "y": 170 } }, { @@ -35,15 +41,15 @@ "items": [ { - "position": {"x": 150, "y": 70}, + "position": {"x": 150, "y": 62}, "text": "core.genrltxt.569" // Hero Speed }, { - "position": {"x": 150, "y": 130}, + "position": {"x": 150, "y": 122}, "text": "core.genrltxt.570" // Enemy Speed }, { - "position": {"x": 150, "y": 190}, + "position": {"x": 150, "y": 182}, "text": "core.genrltxt.571" // Scrolling Speed } ] @@ -52,7 +58,7 @@ { "name": "heroMovementSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 80}, + "position": {"x": 10, "y": 73}, "items": [ { @@ -104,7 +110,7 @@ { "name": "enemyMovementSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 140}, + "position": {"x": 10, "y": 133}, "items": [ { @@ -161,7 +167,7 @@ { "name": "mapScrollSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 200}, + "position": {"x": 10, "y": 193}, "items": [ { @@ -276,27 +282,27 @@ "items": [ { - "position": {"x": 45, "y": 302}, + "position": {"x": 45, "y": 295}, "text": "core.genrltxt.572" // TODO: show move path }, { - "position": {"x": 45, "y": 332}, + "position": {"x": 45, "y": 325}, "text": "core.genrltxt.573" // show hero reminder }, { - "position": {"x": 45, "y": 362}, + "position": {"x": 45, "y": 355}, "text": "core.genrltxt.574" // quick combat }, { - "position": {"x": 45, "y": 392}, + "position": {"x": 45, "y": 385}, "text": "vcmi.adventureOptions.numericQuantities.hover" }, { - "position": {"x": 45, "y": 422}, + "position": {"x": 45, "y": 415}, "text": "vcmi.adventureOptions.forceMovementInfo.hover" }, { - "position": {"x": 45, "y": 452}, + "position": {"x": 45, "y": 445}, "text": "vcmi.adventureOptions.showGrid.hover" } ] @@ -306,14 +312,14 @@ "name": "showMovePathPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 300}, + "position": {"x": 10, "y": 293}, }, { "name": "heroReminderCheckbox", "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.361", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 323}, "callback": "heroReminderChanged" }, { @@ -321,7 +327,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.362", - "position": {"x": 10, "y": 360}, + "position": {"x": 10, "y": 353}, "callback": "quickCombatChanged" }, { @@ -329,7 +335,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.numericQuantities", - "position": {"x": 10, "y": 390}, + "position": {"x": 10, "y": 383}, "callback": "numericQuantitiesChanged" }, { @@ -337,7 +343,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.forceMovementInfo", - "position": {"x": 10, "y": 420}, + "position": {"x": 10, "y": 413}, "callback": "forceMovementInfoChanged" }, { @@ -345,7 +351,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.adventureOptions.showGrid", - "position": {"x": 10, "y": 450}, + "position": {"x": 10, "y": 443}, "callback": "showGridChanged" } ] diff --git a/config/widgets/settings/battleOptionsTab.json b/config/widgets/settings/battleOptionsTab.json index 5d3f1c0a7..3e0c674f5 100644 --- a/config/widgets/settings/battleOptionsTab.json +++ b/config/widgets/settings/battleOptionsTab.json @@ -5,19 +5,13 @@ "name": "lineCreatureInfo", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 205, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 199, "w": 365, "h": 3} }, { "name": "lineAnimationSpeed", "type": "texture", "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 295, "w": 365, "h": 3} - }, - { - "name": "lineQueueSize", - "type": "texture", - "image": "settingsWindow/lineHorizontal", - "rect": { "x" : 5, "y" : 365, "w": 365, "h": 3} + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} }, { @@ -30,11 +24,11 @@ [ { "text": "core.genrltxt.396", // Auto-combat options - "position": {"x": 380, "y": 60} + "position": {"x": 380, "y": 55} }, { "text": "core.genrltxt.397", // Creature info - "position": {"x": 10, "y": 210} + "position": {"x": 10, "y": 205} } ] }, @@ -48,23 +42,23 @@ [ { "text": "core.genrltxt.398", // Creatures - "position": {"x": 415, "y": 92} + "position": {"x": 415, "y": 85} }, { "text": "core.genrltxt.399", // Spells - "position": {"x": 415, "y": 122} + "position": {"x": 415, "y": 115} }, { "text": "core.genrltxt.400", // Catapult - "position": {"x": 415, "y": 152} + "position": {"x": 415, "y": 145} }, { "text": "core.genrltxt.151", // Ballista - "position": {"x": 415, "y": 182} + "position": {"x": 415, "y": 175} }, { "text": "core.genrltxt.401", // First Aid Tent - "position": {"x": 415, "y": 212} + "position": {"x": 415, "y": 205} } ] }, @@ -72,31 +66,31 @@ "name": "autoCombatCreaturesPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 90}, + "position": {"x": 380, "y": 83}, }, { "name": "autoCombatSpellsPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 120}, + "position": {"x": 380, "y": 113}, }, { "name": "autoCombatCatapultPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 150}, + "position": {"x": 380, "y": 143}, }, { "name": "autoCombatBallistaPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 180}, + "position": {"x": 380, "y": 173}, }, { "name": "autoCombatFirstAidTentPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 380, "y": 210}, + "position": {"x": 380, "y": 203}, }, { @@ -109,11 +103,11 @@ [ { "text": "core.genrltxt.402", // All Stats - "position": {"x": 45, "y": 242} + "position": {"x": 45, "y": 235} }, { "text": "core.genrltxt.403", // Spells only - "position": {"x": 45, "y": 272} + "position": {"x": 45, "y": 265} } ] }, @@ -121,13 +115,13 @@ "name": "creatureInfoAllPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 240}, + "position": {"x": 10, "y": 233}, }, { "name": "creatureInfoSpellsPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 270}, + "position": {"x": 10, "y": 263}, }, { @@ -140,23 +134,23 @@ [ { "text": "core.genrltxt.404", - "position": {"x": 45, "y": 62} + "position": {"x": 45, "y": 55} }, { "text": "core.genrltxt.405", - "position": {"x": 45, "y": 92} + "position": {"x": 45, "y": 85} }, { "text": "core.genrltxt.406", - "position": {"x": 45, "y": 122} + "position": {"x": 45, "y": 115} }, { "text": "core.genrltxt.407", - "position": {"x": 45, "y": 152} + "position": {"x": 45, "y": 145} }, { "text": "vcmi.battleOptions.skipBattleIntroMusic.hover", - "position": {"x": 45, "y": 182} + "position": {"x": 45, "y": 175} } ] }, @@ -166,7 +160,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.427", - "position": {"x": 10, "y": 60}, + "position": {"x": 10, "y": 53}, "callback": "viewGridChanged" }, { @@ -174,7 +168,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.428", - "position": {"x": 10, "y": 90}, + "position": {"x": 10, "y": 83}, "callback": "movementShadowChanged" }, { @@ -182,24 +176,30 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.429", - "position": {"x": 10, "y": 120}, + "position": {"x": 10, "y": 113}, "callback": "mouseShadowChanged" }, { "name": "battleFieldCasualtiesPlaceholder", "type": "picture", "image": "settingsWindow/checkBoxEmpty", - "position": {"x": 10, "y": 150}, + "position": {"x": 10, "y": 143}, }, { "name": "skipBattleIntroMusicCheckbox", "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.battleOptions.skipBattleIntroMusic", - "position": {"x": 10, "y": 180}, + "position": {"x": 10, "y": 173}, "callback": "skipBattleIntroMusicChanged" }, + { + "name": "frameAnimationSpeed", + "type": "picture", + "image": "settingsWindow/frameMovement", + "position": {"x": 6, "y": 350 } + }, { "name": "animationSpeedLabel", "type": "label", @@ -207,18 +207,12 @@ "alignment": "center", "color": "yellow", "text": "core.genrltxt.393", - "position": {"x": 150, "y": 320} - }, - { - "name": "frameAnimationSpeed", - "type": "picture", - "image": "settingsWindow/frameMovement", - "position": {"x": 6, "y": 307 } + "position": {"x": 150, "y": 362} }, { "name": "animationSpeedPicker", "type": "toggleGroup", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 373}, "items": [ { @@ -321,20 +315,27 @@ "callback": "animationSpeedChanged" }, + { + "name": "frameQueueSize", + "type": "picture", + "image": "settingsWindow/frameStackQueue", + "position": {"x": 6, "y": 410 } + }, + { "name": "queueSizeLabel", "type": "label", "font": "medium", - "alignment": "left", + "alignment": "center", "color": "yellow", "text": "vcmi.battleOptions.queueSizeLabel.hover", - "position": {"x": 10, "y": 400} + "position": {"x": 170, "y": 422} }, { "name": "queueSizePicker", "type": "toggleGroup", - "position": {"x": 10, "y": 430}, + "position": {"x": 10, "y": 434}, "items": [ { diff --git a/config/widgets/settings/generalOptionsTab.json b/config/widgets/settings/generalOptionsTab.json index c9479b19f..5316d84d4 100644 --- a/config/widgets/settings/generalOptionsTab.json +++ b/config/widgets/settings/generalOptionsTab.json @@ -1,6 +1,12 @@ { "items": [ + { + "name": "lineLabelsEnd", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} + }, { "name": "settingGroupTitles", "type": "labelGroup", @@ -14,11 +20,11 @@ "text": "vcmi.systemOptions.resolutionButton.hover" }, { - "position": {"x": 455, "y": 78}, + "position": {"x": 460, "y": 98}, "text": "core.genrltxt.394" // Music Volume }, { - "position": {"x": 455, "y": 138}, + "position": {"x": 460, "y": 158}, "text": "core.genrltxt.395" // Effects volume } ] @@ -47,13 +53,13 @@ "name": "frameMusic", "type": "picture", "image": "settingsWindow/frameAudio", - "position": {"x": 375, "y": 60 } + "position": {"x": 380, "y": 80 } }, { "name": "musicSlider", "type": "slider", - "position": {"x": 380, "y": 95}, + "position": {"x": 385, "y": 115}, "size": 200, "style": "brown", "orientation": "horizontal", @@ -66,13 +72,13 @@ "name": "frameSound", "type": "picture", "image": "settingsWindow/frameAudio", - "position": {"x": 375, "y": 120 } + "position": {"x": 380, "y": 140 } }, { "name": "soundVolumeSlider", "type": "slider", - "position": {"x": 380, "y": 155}, + "position": {"x": 385, "y": 175}, "size": 200, "style": "brown", "orientation": "horizontal", @@ -90,24 +96,24 @@ "items": [ { - "position": {"x": 45, "y": 332}, + "position": {"x": 45, "y": 325}, "text": "core.genrltxt.577" }, { - "position": {"x": 45, "y": 362}, + "position": {"x": 45, "y": 355}, "text": "vcmi.systemOptions.fullscreenButton.hover" }, { - "position": {"x": 45, "y": 392}, + "position": {"x": 45, "y": 385}, "text": "vcmi.systemOptions.framerateButton.hover" }, { "text": "vcmi.otherOptions.availableCreaturesAsDwellingLabel.hover", - "position": {"x": 45, "y": 422} + "position": {"x": 45, "y": 415} }, { "text": "vcmi.otherOptions.compactTownCreatureInfo.hover", - "position": {"x": 45, "y": 452} + "position": {"x": 45, "y": 445} } ] }, @@ -117,7 +123,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "core.help.364", - "position": {"x": 10, "y": 330}, + "position": {"x": 10, "y": 323}, "callback": "spellbookAnimationChanged" }, @@ -126,7 +132,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.systemOptions.fullscreenButton", - "position": {"x": 10, "y": 360}, + "position": {"x": 10, "y": 353}, "callback": "fullscreenChanged" }, @@ -135,7 +141,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.systemOptions.framerateButton", - "position": {"x": 10, "y": 390}, + "position": {"x": 10, "y": 383}, "callback": "framerateChanged" }, @@ -144,7 +150,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.otherOptions.availableCreaturesAsDwellingLabel", - "position": {"x": 10, "y": 420}, + "position": {"x": 10, "y": 413}, "callback": "availableCreaturesAsDwellingLabelChanged" }, @@ -153,7 +159,7 @@ "type": "toggleButton", "image": "sysopchk.def", "help": "vcmi.otherOptions.compactTownCreatureInfo", - "position": {"x": 10, "y": 450}, + "position": {"x": 10, "y": 443}, "callback": "compactTownCreatureInfoChanged" } ] diff --git a/config/widgets/settings/settingsMainContainer.json b/config/widgets/settings/settingsMainContainer.json index 8cbe34c6e..98bb88126 100644 --- a/config/widgets/settings/settingsMainContainer.json +++ b/config/widgets/settings/settingsMainContainer.json @@ -7,6 +7,12 @@ "image": "DiBoxBck", "rect": {"w": 600, "h": 480} }, +// { +// "name": "debugGrid", +// "type": "texture", +// "image": "settingsWindow/debugGrid", +// "rect": {"w": 600, "h": 480} +// }, { "name": "lineTabs", "type": "texture", @@ -90,65 +96,66 @@ "callback": "activateSettingsTab" }, + { + "name": "lineButtons", + "type": "texture", + "image": "settingsWindow/lineHorizontal", + "rect": { "x" : 375, "y" : 289, "w": 220, "h": 3} + }, { "name": "loadButton", "type": "button", - "position": {"x": 380, "y": 300}, + "position": {"x": 380, "y": 306}, "image": "SOLOAD.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.321", "callback": "loadGame", "hotkey": "l" }, - { "name": "saveButton", "type": "button", - "position": {"x": 490, "y": 300}, + "position": {"x": 490, "y": 306}, "image": "SOSAVE.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.322", "callback": "saveGame", "hotkey": "s" }, - { "name": "restartButton", "type": "button", - "position": {"x": 380, "y": 360}, + "position": {"x": 380, "y": 364}, "image": "SORSTRT.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.323", "callback": "restartGame", "hotkey": "r" }, - { "name": "mainMenuButton", "type": "button", - "position": {"x": 490, "y": 360}, + "position": {"x": 490, "y": 364}, "image": "SOMAIN.DEF", "imageOrder": [1, 0, 2, 3], "help": "core.help.320", "callback": "returnToMainMenu", "hotkey": "m" }, - { "name": "quitButton", "type": "button", - "position": {"x": 380, "y": 420}, + "position": {"x": 380, "y": 422}, "image": "soquit.def", "imageOrder": [1, 0, 2, 3], "help": "core.help.324", "callback": "quitGame", "hotkey": "q" }, - { "name": "closeSettingsButton", "type": "button", - "position": {"x": 490, "y": 420}, + "position": {"x": 490, "y": 422}, "image": "soretrn.def", "imageOrder": [1, 0, 2, 3], "help": "core.help.325",