1 files changed, 96 insertions, 97 deletions
diff --git a/addons/gut/gui/GutBottomPanel.tscn b/addons/gut/gui/GutBottomPanel.tscn
index 0bb7fc3..7ec6649 100644
--- a/addons/gut/gui/GutBottomPanel.tscn
+++ b/addons/gut/gui/GutBottomPanel.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://addons/gut/gui/GutBottomPanel.gd" type="Script" id=1]
 [ext_resource path="res://addons/gut/gui/BottomPanelShortcuts.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/gut/gui/RunAtCursor.tscn" type="PackedScene" id=3]
 [ext_resource path="res://addons/gut/gui/play.png" type="Texture" id=4]
+[ext_resource path="res://addons/gut/gui/RunResults.tscn" type="PackedScene" id=5]
+[ext_resource path="res://addons/gut/gui/OutputText.tscn" type="PackedScene" id=6]
 
 [sub_resource type="InputEventKey" id=8]
 control = true
@@ -12,35 +14,20 @@ scancode = 49
 [sub_resource type="ShortCut" id=9]
 shortcut = SubResource( 8 )
 
-[sub_resource type="StyleBoxEmpty" id=5]
-
-[sub_resource type="DynamicFontData" id=10]
-font_path = "res://addons/gut/fonts/CourierPrime-BoldItalic.ttf"
-
-[sub_resource type="DynamicFont" id=11]
-size = 30
-font_data = SubResource( 10 )
-
-[sub_resource type="DynamicFontData" id=12]
-font_path = "res://addons/gut/fonts/CourierPrime-Italic.ttf"
-
-[sub_resource type="DynamicFont" id=13]
-size = 30
-font_data = SubResource( 12 )
-
-[sub_resource type="DynamicFontData" id=14]
-font_path = "res://addons/gut/fonts/CourierPrime-Bold.ttf"
-
-[sub_resource type="DynamicFont" id=15]
-size = 30
-font_data = SubResource( 14 )
-
-[sub_resource type="DynamicFontData" id=16]
-font_path = "res://addons/gut/fonts/CourierPrime-Regular.ttf"
+[sub_resource type="Image" id=10]
+data = {
+"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ),
+"format": "LumAlpha8",
+"height": 16,
+"mipmaps": false,
+"width": 16
+}
 
-[sub_resource type="DynamicFont" id=17]
-size = 30
-font_data = SubResource( 16 )
+[sub_resource type="ImageTexture" id=2]
+flags = 4
+flags = 4
+image = SubResource( 10 )
+size = Vector2( 16, 16 )
 
 [node name="GutBottomPanel" type="Control"]
 anchor_left = -0.0025866
@@ -53,9 +40,6 @@ margin_right = 2.64862
 margin_bottom = 1.05945
 rect_min_size = Vector2( 0, 300 )
 script = ExtResource( 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="layout" type="VBoxContainer" parent="."]
 anchor_right = 1.0
@@ -89,16 +73,16 @@ margin_left = 154.0
 margin_top = 13.0
 margin_right = 213.0
 margin_bottom = 27.0
-hint_tooltip = "When a test script is edited, buttons are displayed to 
-run the opened script or an Inner-Test-Class or a 
-single test.  The buttons change based on the location 
+hint_tooltip = "When a test script is edited, buttons are displayed to
+run the opened script or an Inner-Test-Class or a
+single test.  The buttons change based on the location
 of the cursor in the file.
 
-These buttons will remain active when editing other 
-items so that you can run tests without having to switch 
+These buttons will remain active when editing other
+items so that you can run tests without having to switch
 back to the test script.
 
-You can assign keyboard shortcuts for these buttons 
+You can assign keyboard shortcuts for these buttons
 using the \"shortcuts\" button in the GUT panel."
 mouse_filter = 1
 text = "Current:  "
@@ -107,39 +91,61 @@ text = "Current:  "
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 217.0
-margin_right = 456.0
+margin_right = 548.0
 margin_bottom = 40.0
 rect_min_size = Vector2( 0, 40 )
 
 [node name="CenterContainer2" type="CenterContainer" parent="layout/ControlBar"]
-margin_left = 460.0
-margin_right = 699.0
+margin_left = 552.0
+margin_right = 883.0
 margin_bottom = 40.0
 size_flags_horizontal = 3
 
-[node name="FocusButton" type="Button" parent="layout/ControlBar"]
-show_behind_parent = true
-margin_left = 703.0
-margin_right = 703.0
+[node name="Sep1" type="ColorRect" parent="layout/ControlBar"]
+margin_left = 887.0
+margin_right = 889.0
 margin_bottom = 40.0
-custom_styles/normal = SubResource( 5 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
+rect_min_size = Vector2( 2, 0 )
 
-[node name="CenterContainer" type="CenterContainer" parent="layout/ControlBar"]
-margin_left = 707.0
-margin_right = 946.0
+[node name="RunResultsBtn" type="ToolButton" parent="layout/ControlBar"]
+margin_left = 893.0
+margin_right = 921.0
 margin_bottom = 40.0
-size_flags_horizontal = 3
+hint_tooltip = "Show/Hide Results Tree Panel."
+toggle_mode = true
+pressed = true
+icon = SubResource( 2 )
+
+[node name="OutputBtn" type="ToolButton" parent="layout/ControlBar"]
+margin_left = 925.0
+margin_right = 953.0
+margin_bottom = 40.0
+hint_tooltip = "Show/Hide Output Panel."
+toggle_mode = true
+pressed = true
+icon = SubResource( 2 )
+
+[node name="Settings" type="ToolButton" parent="layout/ControlBar"]
+margin_left = 957.0
+margin_right = 985.0
+margin_bottom = 40.0
+hint_tooltip = "Show/Hide Settings Panel."
+toggle_mode = true
+icon = SubResource( 2 )
 
-[node name="Shortcuts" type="Button" parent="layout/ControlBar"]
-margin_left = 950.0
-margin_right = 1022.0
+[node name="Sep2" type="ColorRect" parent="layout/ControlBar"]
+margin_left = 989.0
+margin_right = 991.0
+margin_bottom = 40.0
+rect_min_size = Vector2( 2, 0 )
+
+[node name="Shortcuts" type="ToolButton" parent="layout/ControlBar"]
+margin_left = 995.0
+margin_right = 1023.0
 margin_bottom = 40.0
 hint_tooltip = "Set shortcuts for GUT buttons.  Shortcuts do not work when the GUT panel is not visible."
 size_flags_vertical = 11
-text = "Shortcuts"
+icon = SubResource( 2 )
 
 [node name="RSplit" type="HSplitContainer" parent="layout"]
 margin_top = 44.0
@@ -147,19 +153,36 @@ margin_right = 1023.0
 margin_bottom = 599.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+collapsed = true
+
+[node name="sc" type="ScrollContainer" parent="layout/RSplit"]
+visible = false
+margin_left = 593.0
+margin_right = 1093.0
+margin_bottom = 555.0
+rect_min_size = Vector2( 500, 0 )
+mouse_filter = 1
+size_flags_vertical = 3
+
+[node name="Settings" type="VBoxContainer" parent="layout/RSplit/sc"]
+margin_right = 500.0
+margin_bottom = 908.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
 
 [node name="CResults" type="VBoxContainer" parent="layout/RSplit"]
-margin_right = 611.0
+margin_right = 1023.0
 margin_bottom = 555.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="ControlBar" type="HBoxContainer" parent="layout/RSplit/CResults"]
-margin_right = 611.0
+margin_right = 1023.0
 margin_bottom = 35.0
 rect_min_size = Vector2( 0, 35 )
 
 [node name="Light" type="Control" parent="layout/RSplit/CResults/ControlBar"]
+visible = false
 margin_right = 30.0
 margin_bottom = 35.0
 rect_min_size = Vector2( 30, 30 )
@@ -319,52 +342,28 @@ margin_bottom = 24.0
 text = "---"
 
 [node name="CenterContainer" type="CenterContainer" parent="layout/RSplit/CResults/ControlBar"]
-margin_left = 34.0
-margin_right = 488.0
+margin_right = 1023.0
 margin_bottom = 35.0
 size_flags_horizontal = 3
 
-[node name="CopyButton" type="Button" parent="layout/RSplit/CResults/ControlBar"]
-margin_left = 492.0
-margin_right = 547.0
-margin_bottom = 35.0
-text = "  Copy "
-
-[node name="ClearButton" type="Button" parent="layout/RSplit/CResults/ControlBar"]
-margin_left = 551.0
-margin_right = 611.0
-margin_bottom = 35.0
-text = "  Clear  "
-
-[node name="Output" type="RichTextLabel" parent="layout/RSplit/CResults"]
+[node name="Tabs" type="HSplitContainer" parent="layout/RSplit/CResults"]
 margin_top = 39.0
-margin_right = 611.0
-margin_bottom = 555.0
-focus_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-custom_fonts/bold_italics_font = SubResource( 11 )
-custom_fonts/italics_font = SubResource( 13 )
-custom_fonts/bold_font = SubResource( 15 )
-custom_fonts/normal_font = SubResource( 17 )
-bbcode_enabled = true
-scroll_following = true
-selection_enabled = true
-
-[node name="sc" type="ScrollContainer" parent="layout/RSplit"]
-margin_left = 623.0
 margin_right = 1023.0
 margin_bottom = 555.0
-rect_min_size = Vector2( 400, 0 )
-mouse_filter = 1
+size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="Settings" type="VBoxContainer" parent="layout/RSplit/sc"]
-margin_right = 388.0
-margin_bottom = 862.0
+[node name="RunResults" parent="layout/RSplit/CResults/Tabs" instance=ExtResource( 5 )]
+margin_right = 505.0
+margin_bottom = 516.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
+[node name="OutputText" parent="layout/RSplit/CResults/Tabs" instance=ExtResource( 6 )]
+margin_left = 517.0
+margin_right = 1023.0
+margin_bottom = 516.0
+
 [node name="BottomPanelShortcuts" parent="." instance=ExtResource( 2 )]
 visible = false
 anchor_left = -0.000517324
@@ -378,9 +377,9 @@ margin_bottom = -125.552
 
 [connection signal="pressed" from="layout/ControlBar/RunAll" to="." method="_on_RunAll_pressed"]
 [connection signal="run_tests" from="layout/ControlBar/RunAtCursor" to="." method="_on_RunAtCursor_run_tests"]
-[connection signal="pressed" from="layout/ControlBar/FocusButton" to="." method="_on_FocusButton_pressed"]
+[connection signal="pressed" from="layout/ControlBar/RunResultsBtn" to="." method="_on_RunResultsBtn_pressed"]
+[connection signal="pressed" from="layout/ControlBar/OutputBtn" to="." method="_on_OutputBtn_pressed"]
+[connection signal="pressed" from="layout/ControlBar/Settings" to="." method="_on_Settings_pressed"]
 [connection signal="pressed" from="layout/ControlBar/Shortcuts" to="." method="_on_Shortcuts_pressed"]
 [connection signal="draw" from="layout/RSplit/CResults/ControlBar/Light" to="." method="_on_Light_draw"]
-[connection signal="pressed" from="layout/RSplit/CResults/ControlBar/CopyButton" to="." method="_on_CopyButton_pressed"]
-[connection signal="pressed" from="layout/RSplit/CResults/ControlBar/ClearButton" to="." method="_on_ClearButton_pressed"]
 [connection signal="popup_hide" from="BottomPanelShortcuts" to="." method="_on_BottomPanelShortcuts_popup_hide"]