move button to presets

Mods/vcmi/Content/config/english.json

@@ -884,7 +884,7 @@
 	"vcmi.optionsTab.turnTime.chess.2"    : "Chess: 02:00 + 01:00 + 00:15 + 00:00",
 	"vcmi.optionsTab.turnTime.chess.1"    : "Chess: 01:00 + 01:00 + 00:00 + 00:00",
 
-	"vcmi.optionsTab.simturns.select"         : "Select simultaneous turns preset",
+	"vcmi.optionsTab.simturns.select"         : "Select sim. turns preset",
 	"vcmi.optionsTab.simturns.none"           : "No simultaneous turns",
 	"vcmi.optionsTab.simturns.tillContactMax" : "Simturns: Until contact",
 	"vcmi.optionsTab.simturns.tillContact1"   : "Simturns: 1 week, break on contact",

Mods/vcmi/Content/config/german.json

@@ -853,7 +853,7 @@
 	"vcmi.optionsTab.simturnsMax.help" : "Spielt gleichzeitig für eine bestimmte Anzahl von Tagen oder bis zum Kontakt mit einem anderen Spieler",
 	"vcmi.optionsTab.simturnsAI.help" : "{Simultane KI Züge}\nExperimentelle Option. Ermöglicht es den KI-Spielern, gleichzeitig mit dem menschlichen Spieler zu agieren, wenn simultane Spielzüge aktiviert sind.",
 
-	"vcmi.optionsTab.turnTime.select"     : "Spielzug-Timer-Voreinst. wählen",
+	"vcmi.optionsTab.turnTime.select"     : "Timer-Voreinstellung wählen",
 	"vcmi.optionsTab.turnTime.unlimited"  : "Unbegrenzter Spielzug-Timer",
 	"vcmi.optionsTab.turnTime.classic.1"  : "Klassischer Timer: 1 Minute",
 	"vcmi.optionsTab.turnTime.classic.2"  : "Klassischer Timer: 2 Minuten",
@@ -868,15 +868,15 @@
 	"vcmi.optionsTab.turnTime.chess.2"    : "Schach: 02:00 01:00 00:15 00:00",
 	"vcmi.optionsTab.turnTime.chess.1"    : "Schach: 01:00 01:00 00:00 00:00",
 
-	"vcmi.optionsTab.simturns.select"         : "Voreinst. für simultane Züge wählen",
+	"vcmi.optionsTab.simturns.select"         : "Voreinst. für Züge wählen",
 	"vcmi.optionsTab.simturns.none"           : "Keine simultanen Züge",
 	"vcmi.optionsTab.simturns.tillContactMax" : "Simzüge: Bis zum Kontakt",
 	"vcmi.optionsTab.simturns.tillContact1"   : "Simzüge: 1 Woche, Stop bei Kontakt",
 	"vcmi.optionsTab.simturns.tillContact2"   : "Simzüge: 2 Wochen, Stop bei Kontakt",
 	"vcmi.optionsTab.simturns.tillContact4"   : "Simzüge: 1 Monat, Stop bei Kontakt",
-	"vcmi.optionsTab.simturns.blocked1"       : "Simzüge: 1 Woche, Kontakte block.",
-	"vcmi.optionsTab.simturns.blocked2"       : "Simzüge: 2 Wochen, Kontakte block.",
-	"vcmi.optionsTab.simturns.blocked4"       : "Simzüge: 1 Monat, Kontakte block.",
+	"vcmi.optionsTab.simturns.blocked1"       : "Simzüge: 1 Woche, Kontakte blockieren",
+	"vcmi.optionsTab.simturns.blocked2"       : "Simzüge: 2 Wochen, Kontakte blockieren",
+	"vcmi.optionsTab.simturns.blocked4"       : "Simzüge: 1 Monat, Kontakte blockieren",
 
 	"vcmi.campaignSet.chronicles" : "Heroes Chronicles",
 	"vcmi.campaignSet.hota" : "Horn of the Abyss",

config/widgets/extraOptionsTab.json

@@ -39,7 +39,7 @@
 			"name": "ExtraOptionsButtons",
 			"type" : "verticalLayout",
 			"customType" : "toggleButton",
-			"position": {"x": 70, "y": 130},
+			"position": {"x": 70, "y": 100},
 			"items":
 			[
 				{
@@ -62,7 +62,7 @@
 			"name": "ExtraOptionsLabels",
 			"type" : "verticalLayout",
 			"customType" : "label",
-			"position": {"x": 110, "y": 133},
+			"position": {"x": 110, "y": 103},
 			"items":
 			[
 				{
@@ -80,29 +80,6 @@
 					"text": "vcmi.optionsTab.unlimitedReplay.hover"
 				}
 			]
-		},
-		{
-			"name": "buttonTurnOptions",
-			"type" : "button",
-			"position" : {
-				"x" : 70,
-				"y" : 100
-			},
-			"image" : "GSPButtonClear",
-			"items" : [
-				{
-					"type" : "label",
-					"position" : {
-						"x" : 0,
-						"y" : 0
-					},
-					"text" : "vcmi.optionsTab.turnOptions.hover",
-					"font" : "small",
-					"color" : "yellow"
-				}
-			],
-			"help": "vcmi.optionsTab.turnOptions",
-			"callback" : "tabTurnOptions"
 		}
 	]
 }

config/widgets/playerOptionsTab.json

@@ -85,6 +85,29 @@
 			"name": "simturnsPresetSelector",
 			"position": {"x": 56, "y": 555},
 			"dropDownPosition": {"x": 0, "y": -160}
+		},
+		{
+			"name": "buttonTurnOptions",
+			"type" : "button",
+			"position" : {
+				"x" : 260,
+				"y" : 535
+			},
+			"image" : "GSPBUT2",
+			"items" : [
+				{
+					"type" : "label",
+					"position" : {
+						"x" : 0,
+						"y" : 0
+					},
+					"text" : "vcmi.optionsTab.turnOptions.hover",
+					"font" : "small",
+					"color" : "white"
+				}
+			],
+			"help": "vcmi.optionsTab.turnOptions",
+			"callback" : "tabTurnOptions"
 		}
 	],
 

config/widgets/turnOptionsDropdownLibrary.json

@@ -3,7 +3,7 @@
 	{
 		"type": "transparentFilledRectangle",
 		"visible": false,
-		"rect": {"x": 1, "y": 1, "w": 219, "h": 19},
+		"rect": {"x": 1, "y": 1, "w": 249, "h": 19},
 		"color": [0, 0, 0, 128],
 		"colorLine": [0, 0, 0, 128]
 	},
@@ -19,7 +19,7 @@
 	{
 		"type": "transparentFilledRectangle",
 		"visible": false,
-		"rect": {"x": 2, "y": 2, "w": 216, "h": 16},
+		"rect": {"x": 2, "y": 2, "w": 246, "h": 16},
 		"color": [0, 0, 0, 0],
 		"colorLine": [255, 255, 0, 255]
 	},
@@ -48,12 +48,12 @@
 					"type": "texture",
 					"image": "DiBoxBck",
 					"color" : "blue", 
-					"rect": {"x": 0, "y": 0, "w": 220, "h": 260}
+					"rect": {"x": 0, "y": 0, "w": 250, "h": 260}
 				},
 				{
 					"type": "transparentFilledRectangle",
 					"visible": false,
-					"rect": {"x": 0, "y": 0, "w": 220, "h": 260},
+					"rect": {"x": 0, "y": 0, "w": 250, "h": 260},
 					"color": [0, 0, 0, 0],
 					"colorLine": [64, 80, 128, 128]
 				},
@@ -345,12 +345,12 @@
 					"type": "texture",
 					"image": "DiBoxBck",
 					"color" : "blue", 
-					"rect": {"x": 0, "y": 0, "w": 220, "h": 160}
+					"rect": {"x": 0, "y": 0, "w": 250, "h": 160}
 				},
 				{
 					"type": "transparentFilledRectangle",
 					"visible": false,
-					"rect": {"x": 0, "y": 0, "w": 220, "h": 160},
+					"rect": {"x": 0, "y": 0, "w": 250, "h": 160},
 					"color": [0, 0, 0, 0],
 					"colorLine": [64, 80, 128, 128]
 				},

config/widgets/turnOptionsTab.json

@@ -71,13 +71,13 @@
 		{
 			"type" : "dropDownTimers",
 			"name": "timerPresetSelector",
-			"position": {"x": 160, "y": 78},
+			"position": {"x": 170, "y": 78},
 			"dropDownPosition": {"x": 0, "y": 20}
 		},
 		{
 			"type" : "dropDownSimturns",
 			"name": "simturnsPresetSelector",
-			"position": {"x": 160, "y": 98},
+			"position": {"x": 170, "y": 98},
 			"dropDownPosition": {"x": 0, "y": 20}
 		},