Merge pull request #56 from cortex-command-community/Resolution-Settings

Resolution Settings

Author: garethyr

.gitignore

@@ -46,6 +46,7 @@ luac.out
 *.manifest
 
 .vs/
+_Screenshots/
 Base.rte/Settings.ini
 Benchmark.rte/
 Scenes.rte/

Base.rte/GUIs/MainMenuGUI.ini

@@ -13,28 +13,14 @@ DrawBackground = False
 DrawType = Color
 DrawColor = 8
 
-/*
-[LabelDebug]
-ControlType = LABEL
-Parent = root
-X = 0
-Y = 40
-Width = 256
-Height = 10
-Visible = True
-Enabled = True
-Name = LabelDebug
-Anchor = Left, Top
-Text = Debug
-HAlignment = centre
-VAlignment = middle
-*/
+///////////////////////////////////////////////////////////////////////
+// Main Screen
 
 [MainScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 256
-Y = 120
+Y = 140
 Width = 128
 Height = 172
 Visible = True
@@ -162,11 +148,14 @@ Name = ButtonResume
 Anchor = Left, Top
 Text = Resume Game
 
+///////////////////////////////////////////////////////////////////////
+// Players Screen
+
 [PlayersScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 256
-Y = 132
+Y = 140
 Width = 128
 Height = 124
 Visible = True
@@ -259,6 +248,9 @@ Name = ButtonFourPlayers
 Anchor = Left, Top
 Text = Four
 
+///////////////////////////////////////////////////////////////////////
+// Scenario Screen
+
 [SkirmishScreen]
 ControlType = COLLECTIONBOX
 Parent = root
@@ -570,11 +562,14 @@ Name = ButtonStartDeath
 Anchor = Left, Top
 Text = Death
 
+///////////////////////////////////////////////////////////////////////
+// Options Screen
+
 [OptionsScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 80
-Y = 114
+Y = 140
 Width = 480
 Height = 246
 Visible = True
@@ -588,20 +583,35 @@ DrawColor = 62
 [ButtonFullscreen]
 ControlType = BUTTON
 Parent = OptionsScreen
-X = 16
-Y = 18
-Width = 100
-Height = 28
+X = 12
+Y = 34
+Width = 66
+Height = 18
 Visible = True
 Enabled = True
 Name = ButtonFullscreen
 Anchor = Left, Top
-Text = Go Fullscreen
+ToolTip = 
+Text = Fullscreen
+
+[ButtonUpscaledFullscreen]
+ControlType = BUTTON
+Parent = OptionsScreen
+X = 82
+Y = 34
+Width = 120
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonUpscaledFullscreen
+Anchor = Left, Top
+ToolTip = 
+Text = Upscaled Fullscreen
 
 [LabelResolution]
 ControlType = LABEL
 Parent = OptionsScreen
-X = 136
+X = 14
 Y = 18
 Width = 100
 Height = 10
@@ -613,33 +623,18 @@ Text = Fit Display Size:
 HAlignment = left
 VAlignment = middle
 
-[LabelResolutionNotice]
-ControlType = LABEL
-Parent = OptionsScreen
-X = 12
-Y = 152
-Width = 456
-Height = 28
-Visible = True
-Enabled = True
-Name = LabelResolutionNotice
-Anchor = Left, Top
-Text = Resolution Change                                                                 Requires Restart!
-HAlignment = centre
-VAlignment = middle
-
 [ComboResolution]
 ControlType = COMBOBOX
 Parent = OptionsScreen
-X = 128
-Y = 30
-Width = 108
+X = 98
+Y = 15
+Width = 138
 Height = 16
 Visible = True
 Enabled = True
 Name = ComboResolution
 Anchor = Left, Top
-DropHeight = 66
+DropHeight = 132
 DropDownStyle = DropDownList
 
 [LabelSoundVolume]
@@ -865,7 +860,6 @@ ToolTip =
 Checked = Checked
 Text = O
 
-
 [BoxP2Controls]
 ControlType = COLLECTIONBOX
 Parent = OptionsScreen
@@ -1433,11 +1427,107 @@ ToolTip = If disabled may greatly improve performance at a cost of slightly more
 Checked = Checked
 Text = Precise collisions. Disable to improve performance at a cost of less accurate collisions
 
+///////////////////////////////////////////////////////////////////////
+// Resolution Change Dialog
+
+[ResolutionChangeDialog]
+ControlType = COLLECTIONBOX
+Parent = root
+X = 163
+Y = 0
+Width = 155
+Height = 86
+Visible = False
+Enabled = True
+Name = ResolutionChangeDialog
+Anchor = Left, Top
+ToolTip = 
+DrawBackground = True
+DrawType = Image
+DrawColor = 62
+
+[LabelResolutionChangeNotice]
+ControlType = LABEL
+Parent = ResolutionChangeDialog
+X = 0
+Y = 5
+Width = 155
+Height = 30
+Visible = True
+Enabled = True
+Name = LabelResolutionChangeNotice
+Anchor = Left, Top
+ToolTip = 
+Text = Resolution change during an Activity requires ending it.
+HAlignment = centre
+VAlignment = top
+
+[LabelResolutionChangeProceed]
+ControlType = LABEL
+Parent = ResolutionChangeDialog
+X = 0
+Y = 40
+Width = 155
+Height = 15
+Visible = True
+Enabled = True
+Name = LabelResolutionChangeProceed
+Anchor = Left, Top
+ToolTip = 
+Text = Do you want to proceed?
+HAlignment = centre
+VAlignment = top
+
+[ButtonConfirmResolutionChangeFullscreen]
+ControlType = BUTTON
+Parent = ResolutionChangeDialog
+X = 5
+Y = 60
+Width = 70
+Height = 20
+Visible = False
+Enabled = True
+Name = ButtonConfirmResolutionChangeFullscreen
+Anchor = Left, Top
+ToolTip = 
+Text = OK
+
+[ButtonConfirmResolutionChange]
+ControlType = BUTTON
+Parent = ResolutionChangeDialog
+X = 5
+Y = 60
+Width = 70
+Height = 20
+Visible = False
+Enabled = True
+Name = ButtonConfirmResolutionChange
+Anchor = Left, Top
+ToolTip = 
+Text = OK
+
+[ButtonCancelResolutionChange]
+ControlType = BUTTON
+Parent = ResolutionChangeDialog
+X = 80
+Y = 60
+Width = 70
+Height = 20
+Visible = True
+Enabled = True
+Name = ButtonCancelResolutionChange
+Anchor = Left, Top
+ToolTip = 
+Text = Cancel
+
+///////////////////////////////////////////////////////////////////////
+// Control Config Screen
+
 [ConfigScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 124
-Y = 124
+Y = 140
 Width = 392
 Height = 186
 Visible = True
@@ -1723,11 +1813,14 @@ Name = ButtonConfigXBox360Type
 Anchor = Left, Top
 Text = 360 Preset
 
+///////////////////////////////////////////////////////////////////////
+// Editor Screen
+
 [EditorScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 256
-Y = 132
+Y = 140
 Width = 128
 Height = 148
 Visible = True
@@ -1818,13 +1911,16 @@ Name = ButtonActorEditor
 Anchor = Left, Top
 Text = Actor Viewer
 
+///////////////////////////////////////////////////////////////////////
+// Credits Screen
+
 [CreditsScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 20
 Y = 132
 Width = 600
-Height = 132
+Height = 280
 Visible = True
 Enabled = True
 Name = CreditsScreen
@@ -1876,11 +1972,14 @@ Name = ButtonBackToMain
 Anchor = Left, Top
 Text = Back to Main Menu
 
+///////////////////////////////////////////////////////////////////////
+// MetaGame Screen
+
 [MetaScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 20
-Y = 132
+Y = 140
 Width = 600
 Height = 132
 Visible = True
@@ -1895,7 +1994,7 @@ DrawColor = 62
 ControlType = LABEL
 Parent = MetaScreen
 X = 0
-Y = 8
+Y = 0
 Width = 600
 Height = 300
 Visible = True
@@ -1910,7 +2009,7 @@ VAlignment = top
 ControlType = BUTTON
 Parent = root
 X = 260
-Y = 256
+Y = 255
 Width = 120
 Height = 20
 Visible = True
@@ -2001,11 +2100,14 @@ Name = QuitCancelButton
 Anchor = Bottom, Right
 Text = Cancel
 
+///////////////////////////////////////////////////////////////////////
+// Mod Manager Screen
+
 [ModManagerScreen]
 ControlType = COLLECTIONBOX
 Parent = root
 X = 105
-Y = 15
+Y = 140
 Width = 430
 Height = 330
 Visible = True
@@ -2017,7 +2119,6 @@ DrawBackground = True
 DrawType = Image
 DrawColor = 62
 
-
 [LabelModManager]
 ControlType = LABEL
 Parent = ModManagerScreen