diff --git a/src/SharpIDE.Godot/Features/BottomBar/EditorLineCharDisplay.tscn b/src/SharpIDE.Godot/Features/BottomBar/EditorLineCharDisplay.tscn index 7c7f502..e995668 100644 --- a/src/SharpIDE.Godot/Features/BottomBar/EditorLineCharDisplay.tscn +++ b/src/SharpIDE.Godot/Features/BottomBar/EditorLineCharDisplay.tscn @@ -12,13 +12,13 @@ script = ExtResource("1_ugdln") [node name="Label" type="Label" parent="." unique_id=1753504818] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" theme_override_font_sizes/font_size = 14 text = "65:71" [node name="SelectionInfoLabel" type="Label" parent="." unique_id=140834606] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" theme_override_font_sizes/font_size = 14 text = "(5 chars, 2 line breaks)" diff --git a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.tscn b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.tscn index c45fb3d..3af808c 100644 --- a/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.tscn +++ b/src/SharpIDE.Godot/Features/BottomBar/RunningTasksDisplay.tscn @@ -42,7 +42,7 @@ script = ExtResource("1_ytjpp") unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 1 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" theme_override_font_sizes/font_size = 14 text = "Loading Solution" vertical_alignment = 1 @@ -51,7 +51,7 @@ vertical_alignment = 1 unique_name_in_owner = true visible = false layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" theme_override_font_sizes/font_size = 14 text = "Updating Solution Diagnostics" vertical_alignment = 1 @@ -60,7 +60,7 @@ vertical_alignment = 1 unique_name_in_owner = true visible = false layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" theme_override_font_sizes/font_size = 14 text = "Restoring Solution" vertical_alignment = 1 diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn index add6b12..345aeac 100644 --- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn +++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn @@ -17,7 +17,6 @@ corner_radius_bottom_left = 3 corner_detail = 5 [node name="SharpIdeCodeEdit" type="CodeEdit" unique_id=2021737984] -theme_override_colors/current_line_color = Color(0.0588235, 0.0588235, 0.0588235, 1) theme_override_fonts/font = ExtResource("1_s7ira") theme_override_font_sizes/font_size = 18 theme_override_styles/normal = SubResource("StyleBoxFlat_v06ln") diff --git a/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn b/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn index 2f45f26..863bd46 100644 --- a/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn +++ b/src/SharpIDE.Godot/Features/Nuget/NugetPackageDetails.tscn @@ -39,7 +39,7 @@ expand_mode = 3 [node name="PackageNameLabel" type="Label" parent="HBoxContainer" unique_id=727807580] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) +theme_type_variation = &"Gray700Label" theme_override_font_sizes/font_size = 18 text = "OpenTelemetry.Exporter.OpenTelemetryProtocol" @@ -48,7 +48,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="HBoxContainer2" unique_id=145190229] layout_mode = 2 -theme_override_colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) +theme_type_variation = &"Gray700Label" text = "Version" [node name="VersionOptionButton" type="OptionButton" parent="HBoxContainer2" unique_id=1228212594] diff --git a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.tscn b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.tscn index bf77542..4648cd3 100644 --- a/src/SharpIDE.Godot/Features/Nuget/NugetPanel.tscn +++ b/src/SharpIDE.Godot/Features/Nuget/NugetPanel.tscn @@ -106,24 +106,24 @@ theme_override_constants/separation = 0 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer" unique_id=1733055884] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Installed Packages in " [node name="InstalledPackagesSlnOrProjectNameLabel" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer" unique_id=479190710] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Application" [node name="Label3" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer" unique_id=1660023931] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = ": " [node name="InstalledPackagesResultCountLabel" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer" unique_id=989261814] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "0" [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer" unique_id=1351131590] @@ -162,24 +162,24 @@ theme_override_constants/separation = 0 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer2" unique_id=2123233617] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Implicitly Installed Packages in " [node name="ImplicitlyInstalledPackagesSlnOrProjectNameLabel" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer2" unique_id=2111917140] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Application" [node name="Label3" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer2" unique_id=634398114] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = ": " [node name="ImplicitlyInstalledPackagesResultCountLabel" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer2" unique_id=1733748545] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "0" [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer2" unique_id=2016740907] @@ -215,12 +215,12 @@ theme_override_constants/separation = 0 [node name="Label" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer3" unique_id=665734724] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Available Packages: " [node name="PackageSearchResultCountLabel" type="Label" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer3" unique_id=640578649] layout_mode = 2 -theme_override_colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +theme_type_variation = &"Gray600Label" text = "Top 100" [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/MarginContainer2/HSplitContainer/VBoxContainer/ScrollContainer/VBoxContainer/HBoxContainer3" unique_id=546716895] diff --git a/src/SharpIDE.Godot/Features/Nuget/PackageDetailsProjectEntry.tscn b/src/SharpIDE.Godot/Features/Nuget/PackageDetailsProjectEntry.tscn index e28cc66..ef200e3 100644 --- a/src/SharpIDE.Godot/Features/Nuget/PackageDetailsProjectEntry.tscn +++ b/src/SharpIDE.Godot/Features/Nuget/PackageDetailsProjectEntry.tscn @@ -39,7 +39,7 @@ expand_mode = 3 unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 -theme_override_colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) +theme_type_variation = &"Gray700Label" theme_override_font_sizes/font_size = 16 text = "Application" @@ -48,7 +48,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 6 mouse_filter = 1 -theme_override_colors/font_color = Color(0.6706895, 0.6706895, 0.6706895, 1) +theme_type_variation = &"Gray600Label" text = "1.12.0" [node name="Spacer" type="Control" parent="HBoxContainer" unique_id=249353635] diff --git a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn index 39d71dd..5686f03 100644 --- a/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn +++ b/src/SharpIDE.Godot/Features/Nuget/PackageEntry.tscn @@ -56,14 +56,14 @@ expand_mode = 3 [node name="PackageNameLabel" type="Label" parent="MarginContainer/HBoxContainer" unique_id=1382048508] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) +theme_type_variation = &"Gray700Label" theme_override_font_sizes/font_size = 16 text = "OpenTelemetry.Exporter.OpenTelemetryProtocol" [node name="InstalledVersionLabel" type="Label" parent="MarginContainer/HBoxContainer" unique_id=2056828891] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.6706895, 0.6706895, 0.6706895, 1) +theme_type_variation = &"Gray600Label" text = "1.12.0" [node name="SourceNamesHBoxContainer" type="HBoxContainer" parent="MarginContainer/HBoxContainer" unique_id=1750080893] diff --git a/src/SharpIDE.Godot/Features/Search/SearchAllFiles/SearchAllFilesResultComponent.tscn b/src/SharpIDE.Godot/Features/Search/SearchAllFiles/SearchAllFilesResultComponent.tscn index b3a6797..e129ad4 100644 --- a/src/SharpIDE.Godot/Features/Search/SearchAllFiles/SearchAllFilesResultComponent.tscn +++ b/src/SharpIDE.Godot/Features/Search/SearchAllFiles/SearchAllFilesResultComponent.tscn @@ -63,6 +63,6 @@ text = "FileName.cs" unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 -theme_override_colors/font_color = Color(1, 1, 1, 0.7411765) +theme_type_variation = &"Gray700Label" text = "/File/Path/FileName.cs" text_overrun_behavior = 3 diff --git a/src/SharpIDE.Godot/Features/Search/SearchInFiles/SearchResultComponent.tscn b/src/SharpIDE.Godot/Features/Search/SearchInFiles/SearchResultComponent.tscn index d1be988..c6713f6 100644 --- a/src/SharpIDE.Godot/Features/Search/SearchInFiles/SearchResultComponent.tscn +++ b/src/SharpIDE.Godot/Features/Search/SearchInFiles/SearchResultComponent.tscn @@ -52,11 +52,11 @@ text_overrun_behavior = 3 [node name="FileNameLabel" type="Label" parent="Button/MarginContainer/HBoxContainer" unique_id=1076022344] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(1, 1, 1, 0.7411765) +theme_type_variation = &"Gray700Label" text = "FileName.cs" [node name="LineNumberLabel" type="Label" parent="Button/MarginContainer/HBoxContainer" unique_id=1411128112] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(1, 1, 1, 0.7411765) +theme_type_variation = &"Gray700Label" text = "24" diff --git a/src/SharpIDE.Godot/Features/Settings/SettingsWindow.tscn b/src/SharpIDE.Godot/Features/Settings/SettingsWindow.tscn index c443ee4..d18329d 100644 --- a/src/SharpIDE.Godot/Features/Settings/SettingsWindow.tscn +++ b/src/SharpIDE.Godot/Features/Settings/SettingsWindow.tscn @@ -70,7 +70,7 @@ custom_arrow_step = 0.1 [node name="Label" type="Label" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2/VBoxContainer" unique_id=1451296891] layout_mode = 2 -theme_override_colors/font_color = Color(0.5686275, 0.5686275, 0.5686275, 1) +theme_type_variation = &"Gray500Label" text = "Experimental. Non-integer scales will be blurry." [node name="VBoxContainer3" type="VBoxContainer" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2" unique_id=1724284108] @@ -94,7 +94,7 @@ layout_mode = 2 [node name="Label2" type="Label" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2/VBoxContainer3/HBoxContainer" unique_id=1566337417] layout_mode = 2 -theme_override_colors/font_color = Color(0.5686275, 0.5686275, 0.5686275, 1) +theme_type_variation = &"Gray500Label" text = "Use the included SharpDbg debugger" [node name="VBoxContainer2" type="VBoxContainer" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2" unique_id=1049513313] @@ -118,7 +118,7 @@ layout_mode = 2 [node name="Label2" type="Label" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2/VBoxContainer2/HBoxContainer" unique_id=742843520] layout_mode = 2 -theme_override_colors/font_color = Color(0.5686275, 0.5686275, 0.5686275, 1) +theme_type_variation = &"Gray500Label" text = "Necessary if 'Use SharpDbg' is disabled. Get netcoredbg from" [node name="LinkButton" type="LinkButton" parent="HSplitContainer/PanelContainer/MarginContainer/VBoxContainer2/VBoxContainer2/HBoxContainer" unique_id=1607764631] diff --git a/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.tscn b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.tscn index 7c2fbdd..676cef4 100644 --- a/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.tscn +++ b/src/SharpIDE.Godot/Features/SlnPicker/PreviousSlnEntry.tscn @@ -69,6 +69,6 @@ text_overrun_behavior = 3 [node name="SlnPathLabel" type="Label" parent="Button/MarginContainer/PreviousSlnEntry/VBoxContainer" unique_id=946949283] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.5132329, 0.5132329, 0.5132329, 1) +theme_type_variation = &"Gray500Label" text = "C:\\Users\\Matthew\\Documents\\Git\\BlazorCodeBreaker\\BlazorCodeBreaker.slnx" text_overrun_behavior = 3 diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn index f641037..3322ac7 100644 --- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn +++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.tscn @@ -69,7 +69,7 @@ text = "SharpIDE" [node name="VersionLabel" type="Label" parent="VSplitContainer/Panel2/MarginContainer/VBoxContainer/HBoxContainer/VBoxContainer" unique_id=474176672] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.5689727, 0.56897277, 0.5689727, 1) +theme_type_variation = &"Gray500Label" text = "v0.1.2" [node name="Panel" type="Panel" parent="VSplitContainer" unique_id=663586740] diff --git a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.tscn b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.tscn index 8d30dbc..6b3d6e0 100644 --- a/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.tscn +++ b/src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.tscn @@ -53,7 +53,6 @@ layout_mode = 2 [node name="Tree" type="Tree" parent="PanelContainer" unique_id=1327553265] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(0.830335, 0.830335, 0.830335, 1) theme_override_constants/v_separation = 1 theme_override_constants/inner_item_margin_left = 2 theme_override_constants/draw_guides = 0 diff --git a/src/SharpIDE.Godot/Features/SymbolLookup/SymbolUsageComponent.tscn b/src/SharpIDE.Godot/Features/SymbolLookup/SymbolUsageComponent.tscn index 296d7d6..6e19c47 100644 --- a/src/SharpIDE.Godot/Features/SymbolLookup/SymbolUsageComponent.tscn +++ b/src/SharpIDE.Godot/Features/SymbolLookup/SymbolUsageComponent.tscn @@ -51,11 +51,11 @@ size_flags_horizontal = 3 [node name="FileNameLabel" type="Label" parent="MarginContainer/HBoxContainer" unique_id=1559981213] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(1, 1, 1, 0.7411765) +theme_type_variation = &"Gray700Label" text = "FileName.cs" [node name="LineNumberLabel" type="Label" parent="MarginContainer/HBoxContainer" unique_id=772313473] unique_name_in_owner = true layout_mode = 2 -theme_override_colors/font_color = Color(1, 1, 1, 0.7411765) +theme_type_variation = &"Gray700Label" text = "24" diff --git a/src/SharpIDE.Godot/Resources/DarkTheme.tres b/src/SharpIDE.Godot/Resources/DarkTheme.tres new file mode 100644 index 0000000..3b89453 --- /dev/null +++ b/src/SharpIDE.Godot/Resources/DarkTheme.tres @@ -0,0 +1,11 @@ +[gd_resource type="Theme" format=3 uid="uid://epmt8kq6efrs"] + +[resource] +CodeEdit/colors/current_line_color = Color(0.05882353, 0.05882353, 0.05882353, 1) +Gray500Label/base_type = &"Label" +Gray500Label/colors/font_color = Color(0.5137255, 0.5137255, 0.5137255, 1) +Gray600Label/base_type = &"Label" +Gray600Label/colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1) +Gray700Label/base_type = &"Label" +Gray700Label/colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) +Tree/colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1) diff --git a/src/SharpIDE.Godot/project.godot b/src/SharpIDE.Godot/project.godot index a691f87..983f6bc 100644 --- a/src/SharpIDE.Godot/project.godot +++ b/src/SharpIDE.Godot/project.godot @@ -39,6 +39,7 @@ enabled=PackedStringArray("res://addons/R3.Godot/plugin.cfg", "res://addons/csha [gui] common/show_focus_state_on_pointer_event=0 +theme/custom="uid://epmt8kq6efrs" [input]