From 2cb9448f73510ed66c542c8207da7c2f88abd8ba Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 19 Jun 2022 12:57:43 -0600 Subject: [PATCH] Pushed new changes --- .../SettingsMenuConfig.gd | 33 ++--- .../SettingsMenuControl.tscn | 138 +++++++++++------- .../assets/liberation_serif.tres | 2 - .../assets/sbf_black.tres | 1 + .../assets/sbf_white.tres | 2 +- .../assets/ui_controlNode_dark_theme.tres | 102 ++++++++++++- .../assets/ui_controlNode_light_theme.tres | 100 ++++++++++++- 7 files changed, 294 insertions(+), 84 deletions(-) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd index 5f97965..c58cf3c 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd @@ -7,27 +7,27 @@ onready var themeContents = ["White and Black", "Black and White"] onready var saveObject = get_node('/root/GlobalSaveInstance') -onready var NameVar = get_node('Panel/HBoxContainer/VBoxContainer2/Label/VBoxContainer/LineEdit') +onready var NameVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/DisplayNameLineEdit') -onready var NRiskVar = get_node('Panel/HBoxContainer/VboxContainer2/Label/VBoxContainer/VBoxContainer/RiskSlider') +onready var NRiskVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/RiskSlider') -onready var FontVar = get_node("Panel/HBoxContainer/VBoxContainer/Label2/VBoxContainer/HSlider2") +onready var FontVar = get_node("Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/FontSizeSlider") -onready var BrightnessVar = get_node('Panel/HBoxContainer/VBoxContainer/Label2/VBoxContainer/HSlider3') +onready var BrightnessVar = get_node('Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/BrightnessSlider') -onready var VolumeVar = get_node("Panel/HBoxContainer/Label3/VBoxContainer/HSlider2") +onready var VolumeVar = get_node("Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/VolumeSlider") -onready var ConsoleCommandVar = get_node('Panel/HBoxContainer/VBoxContainer3//Label3/VBoxContainer/HBoxDevConsole/CheckBox') +onready var ClosedCaptionsVar = get_node('Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions/ClosedCaptionsCheckBox') -onready var ClosedCaptionsVar = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions/CheckBox') +onready var ConsoleCommandVar = get_node('Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole/DevConsoleCheckbox') -onready var saveButton = get_node("Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/SaveButton") +onready var saveButton = get_node("Panel/HBoxBottomRow/SaveButton") -onready var bKeyboardEnabled = get_node("Panel/HBoxContainer/VBoxContainer3//Label3/VBoxContainer/HBoxVirtualKeyboardEnabled/CheckBox") +onready var bKeyboardEnabled = get_node("Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled/VisualKeyboardCheckBox") -onready var keyboardLayoutList = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/ItemList') +onready var keyboardLayoutList = get_node('Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/LayoutItemList') -onready var themeChoiceList = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/ItemList2') +onready var themeChoiceList = get_node('Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/ThemeItemList') var iniFile = ConfigFile.new() @@ -36,14 +36,13 @@ func saveToInstance(): #Save to Singleton, so saveFile does not need to be constantly read saveObject.settingsInstance.inputName = NameVar.text saveObject.settingsInstance.riskFactor = NRiskVar.value - saveObject.settingsInstance.fontSize = FontVar.Value + saveObject.settingsInstance.fontSize = FontVar.value saveObject.settingsInstance.volume = VolumeVar.value saveObject.settingsInstance.bClosedCaptions = ClosedCaptionsVar.is_pressed() saveObject.settingsInstance.bdevConsole = ConsoleCommandVar.is_pressed() saveObject.settingsInstance.bVirtualKeyboard = bKeyboardEnabled.is_pressed() - -# saveObject.settingsInstance.visualKeyboardLayout = -# saveobject.settingsInstance.themeChoice = + saveObject.settingsInstance.visualKeyboardLayout = keyboardLayoutList.get_selected_items() + saveObject.settingsInstance.themeChoice = themeChoiceList.get_selected_items() ## TO DO @@ -51,7 +50,7 @@ func saveToInstance(): ## Make Theme and Keyboard Options Tie To Their Enunms #Add Theme and Keyboard Selections to singeton - + print("Save Object Below!!!") print(saveObject) @@ -65,7 +64,6 @@ func saveFile(): iniFile.set_value("general_settings", "closed_captions", ClosedCaptionsVar.is_pressed()) iniFile.set_value("general_settings", "dev_console", ConsoleCommandVar.is_pressed()) - print(keyboardLayoutList.get_selected_items()) var savedKeyboardItems = keyboardLayoutList.get_selected_items() @@ -97,6 +95,7 @@ func _process(delta): print('saveFileRan') func _ready(): + theme=load("res://assets/ui_controlNode_dark_theme.tres") for i in range(3): keyboardLayoutList.add_item(keyboardContents[i],null,true) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn index 3b07021..3eeeb34 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn @@ -21,25 +21,26 @@ margin_left = -512.0 margin_top = -302.0 margin_right = 512.0 margin_bottom = 298.0 +rect_pivot_offset = Vector2( -276, 469 ) [node name="HBoxContainer" type="HBoxContainer" parent="Panel"] anchor_left = 0.5 anchor_right = 0.5 -margin_left = -219.5 -margin_right = 219.5 +margin_left = -298.5 +margin_right = 298.5 margin_bottom = 19.0 custom_constants/separation = 60 -[node name="VBoxContainer2" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxVisualControls" type="VBoxContainer" parent="Panel/HBoxContainer"] margin_right = 98.0 margin_bottom = 19.0 -[node name="Label2" type="Label" parent="Panel/HBoxContainer/VBoxContainer2"] +[node name="VisualControlsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls"] margin_right = 98.0 margin_bottom = 19.0 text = "Visual Controls" -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer2/Label2"] +[node name="VisualControlsVBox" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 @@ -47,16 +48,16 @@ margin_top = 30.0 margin_right = 77.5 margin_bottom = 52.0 -[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] +[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_right = 155.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer/HBoxFontSize"] +[node name="FontLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox/HBoxFontSize"] margin_right = 64.0 margin_bottom = 19.0 text = "Font Size:" -[node name="HSlider2" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] +[node name="FontSizeSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 @@ -67,13 +68,13 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] +[node name="BrightnessLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 62.0 text = "Brightness:" -[node name="HSlider3" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] +[node name="BrightnessSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxVisualControls/VisualControlsLabel/VisualControlsVBox"] margin_top = 66.0 margin_right = 155.0 margin_bottom = 82.0 @@ -84,37 +85,37 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxPlayerPreferences" type="VBoxContainer" parent="Panel/HBoxContainer"] margin_left = 158.0 margin_right = 275.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences"] margin_right = 117.0 margin_bottom = 19.0 text = "Player Preferances" -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label"] +[node name="VBoxPlayerPreferances" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label"] margin_left = -18.5 margin_top = 30.0 margin_right = 126.5 margin_bottom = 125.0 -[node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +[node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_right = 145.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/HBoxDisplayName"] +[node name="DisplayNameLabel" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/HBoxDisplayName"] margin_right = 95.0 margin_bottom = 19.0 text = "Display Name:" -[node name="LineEdit" type="LineEdit" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +[node name="DisplayNameLineEdit" type="LineEdit" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_top = 23.0 margin_right = 145.0 margin_bottom = 52.0 -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +[node name="VBoxRiskFactor" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances"] margin_top = 56.0 margin_right = 145.0 margin_bottom = 95.0 @@ -122,16 +123,16 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer"] +[node name="HBoxRiskFactor" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] margin_right = 145.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer/HBoxFontSize"] +[node name="RiskFactorLabel" type="Label" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/HBoxRiskFactor"] margin_right = 145.0 margin_bottom = 19.0 text = "Risk Factor Threshold:" -[node name="RiskSlider" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer"] +[node name="RiskSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor"] margin_top = 23.0 margin_right = 145.0 margin_bottom = 39.0 @@ -142,17 +143,17 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="VBoxContainer3" type="VBoxContainer" parent="Panel/HBoxContainer"] +[node name="RootVboxGeneralSettings" type="VBoxContainer" parent="Panel/HBoxContainer"] margin_left = 335.0 margin_right = 439.0 margin_bottom = 19.0 -[node name="Label3" type="Label" parent="Panel/HBoxContainer/VBoxContainer3"] +[node name="GeneralSettingsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings"] margin_right = 104.0 margin_bottom = 19.0 text = "General Settings" -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3"] +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 @@ -160,13 +161,13 @@ margin_top = 30.0 margin_right = 77.5 margin_bottom = 120.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_right = 155.0 margin_bottom = 19.0 rect_pivot_offset = Vector2( 62, 14 ) text = "Volume:" -[node name="HSlider2" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +[node name="VolumeSlider" type="HSlider" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 @@ -175,90 +176,117 @@ rounded = true tick_count = 10 ticks_on_borders = true -[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 70.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions"] +[node name="ClosedCaptionsLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] margin_top = 4.0 margin_right = 108.0 margin_bottom = 23.0 text = "Closed Captions:" -[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions"] +[node name="ClosedCaptionsCheckBox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxClosedCaptions"] margin_left = 112.0 margin_right = 136.0 margin_bottom = 27.0 -[node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +[node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer"] margin_top = 74.0 margin_right = 155.0 margin_bottom = 101.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDevConsole"] +[node name="DevConsoleLabel" type="Label" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] margin_top = 4.0 margin_right = 126.0 margin_bottom = 23.0 text = "Developer Console:" -[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDevConsole"] +[node name="DevConsoleCheckbox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxGeneralSettings/GeneralSettingsLabel/VBoxContainer/HBoxDevConsole"] margin_left = 130.0 margin_right = 154.0 margin_bottom = 27.0 -[node name="HBoxDarkMode" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 105.0 -margin_right = 155.0 -margin_bottom = 124.0 +[node name="RootVboxVisualControls2" type="VBoxContainer" parent="Panel/HBoxContainer"] +margin_left = 499.0 +margin_right = 597.0 +margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDarkMode"] +[node name="Label2" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2"] +margin_right = 98.0 +margin_bottom = 19.0 +text = "Visual Controls" + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -77.5 +margin_top = 30.0 +margin_right = 77.5 +margin_bottom = 52.0 + +[node name="HBoxThemes" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +margin_right = 155.0 +margin_bottom = 19.0 + +[node name="ThemesLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxThemes"] margin_right = 119.0 margin_bottom = 19.0 text = "Theme Preferance:" -[node name="ItemList2" type="ItemList" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 128.0 +[node name="ThemeItemList" type="ItemList" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +margin_top = 23.0 margin_right = 155.0 -margin_bottom = 137.0 +margin_bottom = 32.0 auto_height = true -[node name="HBoxVirtualKeyboardEnabled" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 141.0 +[node name="HBoxVirtualKeyboardEnabled" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +margin_top = 36.0 margin_right = 155.0 -margin_bottom = 168.0 +margin_bottom = 63.0 -[node name="Label2" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxVirtualKeyboardEnabled"] +[node name="VisualKeyBoardLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] margin_top = 4.0 margin_right = 110.0 margin_bottom = 23.0 text = "Virtual Keyboard" -[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxVirtualKeyboardEnabled"] +[node name="VisualKeyboardCheckBox" type="CheckBox" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxVirtualKeyboardEnabled"] margin_left = 114.0 margin_right = 138.0 margin_bottom = 27.0 -[node name="HBoxKeyboardLayout" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 172.0 +[node name="HBoxKeyboardLayout" type="HBoxContainer" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +margin_top = 67.0 margin_right = 155.0 -margin_bottom = 191.0 +margin_bottom = 86.0 -[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxKeyboardLayout"] +[node name="LayoutLabel" type="Label" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer/HBoxKeyboardLayout"] margin_right = 120.0 margin_bottom = 19.0 text = "Layout Preferance:" -[node name="ItemList" type="ItemList" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 195.0 +[node name="LayoutItemList" type="ItemList" parent="Panel/HBoxContainer/RootVboxVisualControls2/Label2/VBoxContainer"] +margin_top = 90.0 margin_right = 155.0 -margin_bottom = 204.0 +margin_bottom = 99.0 auto_height = true -[node name="SaveButton" type="Button" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] -margin_top = 208.0 -margin_right = 155.0 -margin_bottom = 233.0 +[node name="HBoxBottomRow" type="HBoxContainer" parent="Panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -48.5 +margin_top = -20.0 +margin_right = 48.5 +margin_bottom = 20.0 + +[node name="SaveButton" type="Button" parent="Panel/HBoxBottomRow"] +margin_top = -100.0 +margin_right = 97.0 +margin_bottom = -70.0 text = "Save Settings" __meta__ = { "_edit_use_anchors_": false diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/liberation_serif.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/liberation_serif.tres index 0eecafd..051bc09 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/liberation_serif.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/liberation_serif.tres @@ -3,6 +3,4 @@ [ext_resource path="res://assets/Fonts_source/LiberationSerif-Regular.ttf" type="DynamicFontData" id=1] [resource] -use_mipmaps = true -use_filter = true font_data = ExtResource( 1 ) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres index 293918c..859abe4 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres @@ -6,3 +6,4 @@ border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 +border_color = Color( 0, 0, 0, 1 ) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_white.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_white.tres index 41e0cea..418e195 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_white.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_white.tres @@ -6,4 +6,4 @@ border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 -border_color = Color( 0, 0, 0, 1 ) +border_color = Color( 1, 1, 1, 1 ) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres index b606d40..76d4f64 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres @@ -1,10 +1,12 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=5 format=2] [ext_resource path="res://assets/sbf_black.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] +[ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] [resource] -Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +Button/colors/font_color = Color( 1, 1, 1, 1 ) Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) @@ -14,7 +16,21 @@ Button/styles/disabled = null Button/styles/focus = null Button/styles/hover = null Button/styles/normal = ExtResource( 1 ) -Button/styles/pressed = null +Button/styles/pressed = ExtResource( 1 ) +ItemList/colors/font_color = Color( 1, 1, 1, 1 ) +ItemList/colors/font_color_selected = Color( 1, 1, 1, 1 ) +ItemList/colors/guide_color = Color( 0, 0, 0, 0.1 ) +ItemList/constants/hseparation = 4 +ItemList/constants/icon_margin = 4 +ItemList/constants/line_separation = 2 +ItemList/constants/vseparation = 2 +ItemList/fonts/font = ExtResource( 3 ) +ItemList/styles/bg = ExtResource( 1 ) +ItemList/styles/bg_focus = ExtResource( 1 ) +ItemList/styles/cursor = null +ItemList/styles/cursor_unfocused = ExtResource( 1 ) +ItemList/styles/selected = null +ItemList/styles/selected_focus = null Label/colors/font_color = Color( 1, 1, 1, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -22,7 +38,83 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null -Label/styles/normal = null +Label/fonts/font = ExtResource( 3 ) +Label/styles/normal = ExtResource( 1 ) +LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) +LineEdit/colors/font_color = Color( 1, 1, 1, 1 ) +LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) +LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) +LineEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +LineEdit/constants/minimum_spaces = 12 +LineEdit/fonts/font = null +LineEdit/icons/clear = null +LineEdit/styles/focus = null +LineEdit/styles/normal = ExtResource( 1 ) +LineEdit/styles/read_only = null +MarginContainer/constants/margin_bottom = 0 +MarginContainer/constants/margin_left = 0 +MarginContainer/constants/margin_right = 0 +MarginContainer/constants/margin_top = 0 Panel/styles/panel = ExtResource( 1 ) +PanelContainer/styles/panel = ExtResource( 1 ) +Tabs/colors/font_color_bg = Color( 1, 1, 1, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 1, 1, 1, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = ExtResource( 3 ) +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = ExtResource( 1 ) +Tabs/styles/button_pressed = null +Tabs/styles/panel = ExtResource( 1 ) +Tabs/styles/tab_bg = ExtResource( 1 ) +Tabs/styles/tab_disabled = null +Tabs/styles/tab_fg = ExtResource( 1 ) +TextEdit/colors/background_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.88, 0.88, 0.88, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) +TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) +TextEdit/colors/font_color = Color( 0.00392157, 0.00392157, 0.00392157, 1 ) +TextEdit/colors/font_color_readonly = Color( 0.933333, 0.933333, 0.933333, 0.501961 ) +TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) +TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) +TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) +TextEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/constants/completion_lines = 7 +TextEdit/constants/completion_max_width = 50 +TextEdit/constants/completion_scroll_width = 3 +TextEdit/constants/line_spacing = 4 +TextEdit/fonts/font = ExtResource( 4 ) +TextEdit/icons/fold = null +TextEdit/icons/folded = null +TextEdit/icons/space = null +TextEdit/icons/tab = null +TextEdit/styles/completion = null +TextEdit/styles/focus = null +TextEdit/styles/normal = ExtResource( 1 ) +TextEdit/styles/read_only = ExtResource( 1 ) VBoxContainer/constants/separation = 4 diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres index 56f546e..7fcfd40 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres @@ -1,7 +1,9 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=5 format=2] [ext_resource path="res://assets/sbf_white.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] +[ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] [resource] Button/colors/font_color = Color( 0, 0, 0, 1 ) @@ -14,7 +16,21 @@ Button/styles/disabled = null Button/styles/focus = null Button/styles/hover = null Button/styles/normal = ExtResource( 1 ) -Button/styles/pressed = null +Button/styles/pressed = ExtResource( 1 ) +ItemList/colors/font_color = Color( 0, 0, 0, 1 ) +ItemList/colors/font_color_selected = Color( 1, 1, 1, 1 ) +ItemList/colors/guide_color = Color( 0, 0, 0, 0.1 ) +ItemList/constants/hseparation = 4 +ItemList/constants/icon_margin = 4 +ItemList/constants/line_separation = 2 +ItemList/constants/vseparation = 2 +ItemList/fonts/font = null +ItemList/styles/bg = ExtResource( 1 ) +ItemList/styles/bg_focus = ExtResource( 1 ) +ItemList/styles/cursor = null +ItemList/styles/cursor_unfocused = ExtResource( 1 ) +ItemList/styles/selected = null +ItemList/styles/selected_focus = null Label/colors/font_color = Color( 0, 0, 0, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -22,7 +38,83 @@ Label/constants/line_spacing = 3 Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 -Label/fonts/font = null -Label/styles/normal = null +Label/fonts/font = ExtResource( 3 ) +Label/styles/normal = ExtResource( 1 ) +LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) +LineEdit/colors/font_color = Color( 0, 0, 0, 1 ) +LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) +LineEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +LineEdit/constants/minimum_spaces = 12 +LineEdit/fonts/font = null +LineEdit/icons/clear = null +LineEdit/styles/focus = null +LineEdit/styles/normal = ExtResource( 1 ) +LineEdit/styles/read_only = null +MarginContainer/constants/margin_bottom = 0 +MarginContainer/constants/margin_left = 0 +MarginContainer/constants/margin_right = 0 +MarginContainer/constants/margin_top = 0 Panel/styles/panel = ExtResource( 1 ) +PanelContainer/styles/panel = ExtResource( 1 ) +Tabs/colors/font_color_bg = Color( 0, 0, 0, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0, 0, 0, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = ExtResource( 3 ) +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = ExtResource( 1 ) +Tabs/styles/button_pressed = null +Tabs/styles/panel = ExtResource( 1 ) +Tabs/styles/tab_bg = ExtResource( 1 ) +Tabs/styles/tab_disabled = null +Tabs/styles/tab_fg = ExtResource( 1 ) +TextEdit/colors/background_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.88, 0.88, 0.88, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) +TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) +TextEdit/colors/font_color = Color( 0.00392157, 0.00392157, 0.00392157, 1 ) +TextEdit/colors/font_color_readonly = Color( 0.0588235, 0.0588235, 0.0588235, 0.501961 ) +TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) +TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) +TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) +TextEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/constants/completion_lines = 7 +TextEdit/constants/completion_max_width = 50 +TextEdit/constants/completion_scroll_width = 3 +TextEdit/constants/line_spacing = 4 +TextEdit/fonts/font = ExtResource( 4 ) +TextEdit/icons/fold = null +TextEdit/icons/folded = null +TextEdit/icons/space = null +TextEdit/icons/tab = null +TextEdit/styles/completion = ExtResource( 1 ) +TextEdit/styles/focus = ExtResource( 1 ) +TextEdit/styles/normal = ExtResource( 1 ) +TextEdit/styles/read_only = ExtResource( 1 ) VBoxContainer/constants/separation = 4