From d1da31b5c2d107d8200ef50aa338b413682737aa Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Fri, 5 Jan 2018 23:53:53 +0100 Subject: [PATCH] Migration for 3.0, optimizations --- addons/godot-git-control.funabab/.gitignore | 2 + .../controls/commit_message_dialog.tscn | 103 +- .../controls/create_branch_dialog.tscn | 257 +++-- .../controls/create_tag_dialog.tscn | 353 +++--- .../controls/delete_branch_dialog.tscn | 62 +- .../controls/git_control.tscn | 1017 ++++++++++------- .../controls/git_notification_toolbar.tscn | 34 +- .../controls/merge_branch_dialog.tscn | 273 +++-- .../controls/rebase_dialog.tscn | 221 ++-- .../controls/revert_confirm_dialog.tscn | 31 +- .../fonts/iconsFont.tres | 12 + .../fonts/workspaceFont.tres | 14 + .../images/checked.png | Bin 405 -> 654 bytes .../images/unchecked.png | Bin 204 -> 327 bytes addons/godot-git-control.funabab/plugin.cfg | 2 +- addons/godot-git-control.funabab/plugin.gd | 16 +- .../scripts/controls/commit_message_dialog.gd | 3 +- .../scripts/controls/create_branch_dialog.gd | 3 +- .../scripts/controls/create_tag_dialog.gd | 3 +- .../scripts/controls/delete_branch_dialog.gd | 7 +- .../controls/git_control/branch_btn.gd | 4 +- .../controls/git_control/console_git_panel.gd | 6 +- .../controls/git_control/console_output.gd | 2 +- .../scripts/controls/git_control/toolbar.gd | 2 +- .../controls/git_control/workspace_tree.gd | 2 +- .../git_notification_toolbar.gd | 6 +- .../scripts/controls/merge_branch_dialog.gd | 3 +- .../scripts/controls/rebase_dialog.gd | 3 +- .../scripts/controls/revert_confirm_dialog.gd | 3 +- .../scripts/git_manager.gd | 1 - .../scripts/git_remote_manager.gd | 1 - .../scripts/git_view_manager.gd | 10 +- 32 files changed, 1412 insertions(+), 1044 deletions(-) create mode 100644 addons/godot-git-control.funabab/.gitignore create mode 100644 addons/godot-git-control.funabab/fonts/iconsFont.tres create mode 100644 addons/godot-git-control.funabab/fonts/workspaceFont.tres diff --git a/addons/godot-git-control.funabab/.gitignore b/addons/godot-git-control.funabab/.gitignore new file mode 100644 index 0000000..f8f9f93 --- /dev/null +++ b/addons/godot-git-control.funabab/.gitignore @@ -0,0 +1,2 @@ +.import +*.import diff --git a/addons/godot-git-control.funabab/controls/commit_message_dialog.tscn b/addons/godot-git-control.funabab/controls/commit_message_dialog.tscn index cfe23af..5f57625 100644 --- a/addons/godot-git-control.funabab/controls/commit_message_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/commit_message_dialog.tscn @@ -1,54 +1,73 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/commit_message_dialog.gd" type="Script" id=1] -[node name="commit_message_dialog" type="ConfirmationDialog"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 549.0 -margin/bottom = 245.0 -popup/exclusive = true -window/title = "Commit" -dialog/text = "Commit Message" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - -[node name="commit_message" type="VBoxContainer" parent="."] - -editor/display_folded = true -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 15.0 -margin/top = 29.0 -margin/right = 15.0 -margin/bottom = 36.0 +[node name="commit_message_dialog" type="ConfirmationDialog" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 609.0 +margin_bottom = 292.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +popup_exclusive = true +window_title = "Commit" +resizable = true +dialog_text = "Commit Message" +dialog_hide_on_ok = true +script = ExtResource( 1 ) +_sections_unfolded = [ "Dialog", "Popup" ] + +[node name="commit_message" type="VBoxContainer" parent="." index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 22.0 +margin_right = -8.0 +margin_bottom = -36.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 3 alignment = 0 +_sections_unfolded = [ "Size Flags" ] -[node name="input" type="TextEdit" parent="commit_message"] +[node name="input" type="TextEdit" parent="commit_message" index="0"] -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 519.0 -margin/bottom = 180.0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 593.0 +margin_bottom = 234.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_colors/current_line_color = Color( 0.172549, 0.164706, 0.196078, 1 ) +text = "" +readonly = false +highlight_current_line = false syntax_highlighting = false show_line_numbers = false highlight_all_occurrences = false -caret/block_caret = false -caret/caret_blink = false -caret/caret_blink_speed = 0.65 +override_selected_font_color = false +context_menu_enabled = true +smooth_scrolling = false +v_scroll_speed = 80.0 +hiding_enabled = 0 +caret_block_mode = false +caret_blink = false +caret_blink_speed = 0.65 +caret_moving_by_right_click = true +_sections_unfolded = [ "Caret", "Size Flags" ] diff --git a/addons/godot-git-control.funabab/controls/create_branch_dialog.tscn b/addons/godot-git-control.funabab/controls/create_branch_dialog.tscn index dc70157..0c8c86d 100644 --- a/addons/godot-git-control.funabab/controls/create_branch_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/create_branch_dialog.tscn @@ -1,137 +1,170 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/create_branch_dialog.gd" type="Script" id=1] -[node name="create_branch_dialog" type="ConfirmationDialog"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 472.0 -margin/bottom = 175.0 -popup/exclusive = true -window/title = "Create a new Branch" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - -[node name="container" type="VBoxContainer" parent="."] - -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 15.0 -margin/top = 15.0 -margin/right = 15.0 -margin/bottom = 37.0 +[node name="create_branch_dialog" type="ConfirmationDialog" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 472.0 +margin_bottom = 175.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +popup_exclusive = true +window_title = "Create a new Branch" +resizable = false +dialog_hide_on_ok = true +script = ExtResource( 1 ) + +[node name="container" type="VBoxContainer" parent="." index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +margin_bottom = -36.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_constants/separation = 10 alignment = 0 - -[node name="current_branch" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 42.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="current_branch" type="VBoxContainer" parent="container" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 456.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/current_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/current_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 95.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Current Branch" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/current_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 442.0 -margin/bottom = 42.0 -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/current_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 456.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 editable = false focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="new_branch" type="VBoxContainer" parent="container"] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 52.0 -margin/right = 442.0 -margin/bottom = 112.0 +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="new_branch" type="VBoxContainer" parent="container" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 52.0 +margin_right = 456.0 +margin_bottom = 112.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/new_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/new_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 84.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Branch name" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/new_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 442.0 -margin/bottom = 42.0 -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/new_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 456.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="error_label" type="Label" parent="container/new_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 46.0 -margin/right = 442.0 -margin/bottom = 60.0 +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="error_label" type="Label" parent="container/new_branch" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 46.0 +margin_right = 31.0 +margin_bottom = 60.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 custom_colors/font_color = Color( 0.980469, 0.360016, 0.360016, 1 ) text = "error" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 +_sections_unfolded = [ "Size Flags" ] diff --git a/addons/godot-git-control.funabab/controls/create_tag_dialog.tscn b/addons/godot-git-control.funabab/controls/create_tag_dialog.tscn index 45369c1..6b1c5f1 100644 --- a/addons/godot-git-control.funabab/controls/create_tag_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/create_tag_dialog.tscn @@ -1,184 +1,237 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/create_tag_dialog.gd" type="Script" id=1] -[node name="create_tag_dialog" type="ConfirmationDialog"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 527.0 -margin/bottom = 291.0 -popup/exclusive = true -window/title = "Tag" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - -[node name="container" type="VBoxContainer" parent="."] - -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 15.0 -margin/top = 20.0 -margin/right = 15.0 -margin/bottom = 36.0 +[node name="create_tag_dialog" type="ConfirmationDialog" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 527.0 +margin_bottom = 373.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +popup_exclusive = true +window_title = "Tag" +resizable = false +dialog_hide_on_ok = true +script = ExtResource( 1 ) +_sections_unfolded = [ "Dialog" ] + +[node name="container" type="VBoxContainer" parent="." index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +margin_bottom = -36.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 2 +size_flags_vertical = 2 custom_constants/separation = 10 alignment = 0 -[node name="tag_name" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 497.0 -margin/bottom = 42.0 +[node name="tag_name" type="VBoxContainer" parent="container" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 511.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 1 alignment = 0 - -[node name="label" type="Label" parent="container/tag_name"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 497.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/tag_name" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 61.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Tag name" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/tag_name"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 497.0 -margin/bottom = 42.0 -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/tag_name" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 511.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="error_label" type="Label" parent="container/tag_name"] - -visibility/visible = false -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 46.0 -margin/right = 497.0 -margin/bottom = 60.0 +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="error_label" type="Label" parent="container/tag_name" index="2"] + +visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 46.0 +margin_right = 31.0 +margin_bottom = 60.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 3 +size_flags_vertical = 0 custom_colors/font_color = Color( 0.980392, 0.356863, 0.356863, 1 ) text = "error" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="tag_commit" type="VBoxContainer" parent="container"] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 52.0 -margin/right = 497.0 -margin/bottom = 94.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="tag_commit" type="VBoxContainer" parent="container" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 52.0 +margin_right = 511.0 +margin_bottom = 94.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 1 alignment = 0 - -[node name="label" type="Label" parent="container/tag_commit"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 497.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/tag_commit" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 72.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Commit ref" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/tag_commit"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 497.0 -margin/bottom = 42.0 -placeholder/text = "Optional" -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/tag_commit" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 511.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="tag_message" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 104.0 -margin/right = 497.0 -margin/bottom = 235.0 +placeholder_text = "Optional" +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="tag_message" type="VBoxContainer" parent="container" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 104.0 +margin_right = 511.0 +margin_bottom = 329.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 3 alignment = 0 - -[node name="label" type="Label" parent="container/tag_message"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 497.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/tag_message" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 81.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Tag Message" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="TextEdit" parent="container/tag_message"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 497.0 -margin/bottom = 131.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="TextEdit" parent="container/tag_message" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 511.0 +margin_bottom = 225.0 +rect_min_size = Vector2( 0, 100 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_colors/current_line_color = Color( 0.172549, 0.164706, 0.196078, 1 ) +text = "" +readonly = false +highlight_current_line = false syntax_highlighting = false show_line_numbers = false highlight_all_occurrences = false -caret/block_caret = false -caret/caret_blink = false -caret/caret_blink_speed = 0.65 +override_selected_font_color = false +context_menu_enabled = true +smooth_scrolling = false +v_scroll_speed = 80.0 +hiding_enabled = 0 +caret_block_mode = false +caret_blink = false +caret_blink_speed = 0.65 +caret_moving_by_right_click = true +_sections_unfolded = [ "Rect", "Size Flags" ] diff --git a/addons/godot-git-control.funabab/controls/delete_branch_dialog.tscn b/addons/godot-git-control.funabab/controls/delete_branch_dialog.tscn index 10c66bb..7aa4242 100644 --- a/addons/godot-git-control.funabab/controls/delete_branch_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/delete_branch_dialog.tscn @@ -1,38 +1,46 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/delete_branch_dialog.gd" type="Script" id=1] -[node name="delete_branch_dialog" type="ConfirmationDialog"] +[node name="delete_branch_dialog" type="ConfirmationDialog" index="0"] -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 444.0 -margin/bottom = 92.0 -popup/exclusive = true -window/title = "Please Confirm..." -dialog/text = "Delete Branch" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 444.0 +margin_bottom = 92.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +popup_exclusive = true +window_title = "Please Confirm..." +resizable = false +dialog_text = "Delete Branch" +dialog_hide_on_ok = true +script = ExtResource( 1 ) -[node name="label" type="Label" parent="."] +[node name="label" type="Label" parent="." index="3"] -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 15.0 -margin/top = 27.0 -margin/right = 15.0 -margin/bottom = 82.0 -text = "Are you sure to delete Branch \'HelloWorld\'\?" +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 22.0 +margin_right = -8.0 +margin_bottom = -22.0 +rect_min_size = Vector2( 0, 100 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 +text = "Are you sure to delete Branch 'HelloWorld'?" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 +_sections_unfolded = [ "Rect" ] diff --git a/addons/godot-git-control.funabab/controls/git_control.tscn b/addons/godot-git-control.funabab/controls/git_control.tscn index e02f1ec..5535276 100644 --- a/addons/godot-git-control.funabab/controls/git_control.tscn +++ b/addons/godot-git-control.funabab/controls/git_control.tscn @@ -1,513 +1,698 @@ -[gd_scene load_steps=14 format=1] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/git_control.gd" type="Script" id=1] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/toolbar.gd" type="Script" id=2] -[ext_resource path="res://addons/godot-git-control.funabab/fonts/octicons.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://addons/godot-git-control.funabab/fonts/iconsFont.tres" type="DynamicFont" id=3] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/branch_btn.gd" type="Script" id=4] -[ext_resource path="res://addons/godot-git-control.funabab/fonts/Arial.ttf" type="DynamicFontData" id=5] -[ext_resource path="res://addons/godot-git-control.funabab/fonts/FontAwesome.otf" type="DynamicFontData" id=6] -[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/workspace_tree.gd" type="Script" id=7] -[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/console_output.gd" type="Script" id=8] -[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/console_git_panel.gd" type="Script" id=9] - -[sub_resource type="DynamicFont" id=1] - -font/size = 16 -font/use_mipmaps = false -font/use_filter = false -font/font = ExtResource( 3 ) - -[sub_resource type="DynamicFont" id=2] - -font/size = 16 -font/use_mipmaps = false -font/use_filter = false -font/font = ExtResource( 3 ) - -[sub_resource type="DynamicFont" id=3] - -font/size = 16 -font/use_mipmaps = false -font/use_filter = false -font/font = ExtResource( 3 ) - -[sub_resource type="DynamicFont" id=4] - -font/size = 14 -font/use_mipmaps = false -font/use_filter = false -font/font = ExtResource( 6 ) -fallback/0 = ExtResource( 5 ) - -[node name="git_control" type="VBoxContainer"] - -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 380.0 -margin/bottom = 274.0 +[ext_resource path="res://addons/godot-git-control.funabab/fonts/workspaceFont.tres" type="DynamicFont" id=5] +[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/workspace_tree.gd" type="Script" id=6] +[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/console_output.gd" type="Script" id=7] +[ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/git_control/console_git_panel.gd" type="Script" id=8] + +[node name="git_control" type="VBoxContainer" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = 380.0 +margin_bottom = 274.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 3 alignment = 0 -script/script = ExtResource( 1 ) - -[node name="toolbar" type="HBoxContainer" parent="."] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 3 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 644.0 -margin/bottom = 23.0 +script = ExtResource( 1 ) + +[node name="toolbar" type="HBoxContainer" parent="." index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 1404.0 +margin_bottom = 40.0 +grow_vertical = 0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 1 alignment = 0 -script/script = ExtResource( 2 ) - -[node name="refresh_btn" type="Button" parent="toolbar"] - -hint/tooltip = "Refresh" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 28.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 1 ) +script = ExtResource( 2 ) +_sections_unfolded = [ "Grow Direction", "Material", "Pause", "Rect", "Size Flags", "Visibility" ] + +[node name="refresh_btn" type="Button" parent="toolbar" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 44.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 0 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="branch_btn" type="OptionButton" parent="toolbar"] - -rect/min_size = Vector2( 102, 0 ) -hint/tooltip = "Branches" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 32.0 -margin/top = 0.0 -margin/right = 134.0 -margin/bottom = 23.0 +align = 1 +_sections_unfolded = [ "Grow Direction", "Size Flags", "custom_fonts" ] + +[node name="VSeparator2" type="VSeparator" parent="toolbar" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 48.0 +margin_right = 52.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="GridContainer" type="GridContainer" parent="toolbar" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 56.0 +margin_right = 956.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 1 +columns = 2 +_sections_unfolded = [ "Size Flags" ] + +[node name="branch_btn" type="OptionButton" parent="toolbar/GridContainer" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 852.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 102, 0 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 1 toggle_mode = false +action_mode = 0 enabled_focus_mode = 2 shortcut = null +group = null text = "Branches" flat = false align = 0 selected = 0 items = [ "Branches", null, false, -1, null ] -script/script = ExtResource( 4 ) - -[node name="delete_branch_btn" type="MenuButton" parent="toolbar"] - -hint/tooltip = "Delete Branch" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 138.0 -margin/top = 0.0 -margin/right = 166.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 2 ) +script = ExtResource( 4 ) +_sections_unfolded = [ "Size Flags" ] + +[node name="delete_branch_btn" type="MenuButton" parent="toolbar/GridContainer" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 856.0 +margin_right = 900.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false -click_on_press = true +action_mode = 0 enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false +align = 1 items = [ ] - -[node name="margin" type="Control" parent="toolbar"] - -rect/min_size = Vector2( 8, 0 ) -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 170.0 -margin/top = 0.0 -margin/right = 178.0 -margin/bottom = 23.0 - -[node name="toolbar_action_btns" type="GridContainer" parent="toolbar"] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 182.0 -margin/top = 0.0 -margin/right = 644.0 -margin/bottom = 23.0 +_sections_unfolded = [ "Size Flags", "custom_fonts" ] + +[node name="VSeparator" type="VSeparator" parent="toolbar" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 960.0 +margin_right = 964.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +_sections_unfolded = [ "Size Flags" ] + +[node name="toolbar_action_btns" type="GridContainer" parent="toolbar" index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 968.0 +margin_right = 1404.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 1 +size_flags_vertical = 1 columns = 12 - -[node name="commit_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Commit" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 40.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +_sections_unfolded = [ "Size Flags" ] + +[node name="commit_btn" type="Button" parent="toolbar/toolbar_action_btns" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 44.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Commit" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="revert_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Revert" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 44.0 -margin/top = 0.0 -margin/right = 84.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_colors", "custom_constants" ] + +[node name="revert_btn" type="Button" parent="toolbar/toolbar_action_btns" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 48.0 +margin_right = 92.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Revert" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="tag_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Tag" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 88.0 -margin/top = 0.0 -margin/right = 128.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="tag_btn" type="Button" parent="toolbar/toolbar_action_btns" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 96.0 +margin_right = 140.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Tag" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false -click_on_press = true enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="fetch_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Fetch" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 132.0 -margin/top = 0.0 -margin/right = 172.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="fetch_btn" type="Button" parent="toolbar/toolbar_action_btns" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 144.0 +margin_right = 188.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Fetch" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="pull_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Pull" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 176.0 -margin/top = 0.0 -margin/right = 216.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="pull_btn" type="Button" parent="toolbar/toolbar_action_btns" index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 192.0 +margin_right = 236.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Pull" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="rebase_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Rebase" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 220.0 -margin/top = 0.0 -margin/right = 260.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="rebase_btn" type="Button" parent="toolbar/toolbar_action_btns" index="5"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 240.0 +margin_right = 284.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Rebase" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="merge_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Merge" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 264.0 -margin/top = 0.0 -margin/right = 304.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="merge_btn" type="Button" parent="toolbar/toolbar_action_btns" index="6"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 288.0 +margin_right = 332.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Merge" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="branch_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Branch" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 308.0 -margin/top = 0.0 -margin/right = 348.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="branch_btn" type="Button" parent="toolbar/toolbar_action_btns" index="7"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 336.0 +margin_right = 380.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Branch" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false - -[node name="log_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Log" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 352.0 -margin/top = 0.0 -margin/right = 392.0 -margin/bottom = 23.0 -custom_fonts/font = SubResource( 3 ) +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="log_btn" type="Button" parent="toolbar/toolbar_action_btns" index="8"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 384.0 +margin_right = 428.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +hint_tooltip = "Log" +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_fonts/font = ExtResource( 3 ) toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "" flat = false +align = 1 +_sections_unfolded = [ "Hint", "Size Flags", "custom_fonts" ] + +[node name="seperator" type="VSeparator" parent="toolbar/toolbar_action_btns" index="9"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 432.0 +margin_right = 436.0 +margin_bottom = 40.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 3 + +[node name="workspace" type="HSplitContainer" parent="." index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 44.0 +margin_right = 1404.0 +margin_bottom = 874.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +split_offset = 0 +collapsed = false +dragger_visibility = 0 +_sections_unfolded = [ "Size Flags" ] + +[node name="VBoxContainer" type="VBoxContainer" parent="workspace" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 656.0 +margin_bottom = 830.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 1 +alignment = 0 +_sections_unfolded = [ "Size Flags" ] + +[node name="workspace_title" type="Label" parent="workspace/VBoxContainer" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 656.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 1 +size_flags_vertical = 4 +text = "Workspace" +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 + +[node name="workspace_tree" type="Tree" parent="workspace/VBoxContainer" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 656.0 +margin_bottom = 830.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = true +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_fonts/font = ExtResource( 5 ) +script = ExtResource( 6 ) +_sections_unfolded = [ "Rect", "Size Flags", "custom_fonts", "custom_styles" ] + +[node name="main_container" type="VSplitContainer" parent="workspace" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 668.0 +margin_right = 1404.0 +margin_bottom = 830.0 +rect_min_size = Vector2( 150, 0 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 1 +split_offset = 0 +collapsed = false +dragger_visibility = 0 +_sections_unfolded = [ "Grow Direction", "Margin", "Size Flags" ] + +[node name="console_panel" type="VBoxContainer" parent="workspace/main_container" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 736.0 +margin_bottom = 409.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 1 +size_flags_vertical = 3 +alignment = 0 + +[node name="console_title" type="HBoxContainer" parent="workspace/main_container/console_panel" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 736.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 1 +size_flags_vertical = 1 +alignment = 0 -[node name="seperator" type="VSeparator" parent="toolbar/toolbar_action_btns"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 396.0 -margin/top = 0.0 -margin/right = 399.0 -margin/bottom = 23.0 - -[node name="clear_btn" type="Button" parent="toolbar/toolbar_action_btns"] - -hint/tooltip = "Clear ouput console" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 403.0 -margin/top = 0.0 -margin/right = 458.0 -margin/bottom = 23.0 +[node name="title_label" type="Label" parent="workspace/main_container/console_panel/console_title" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 689.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 +text = "Console:" +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 +_sections_unfolded = [ "Size Flags" ] + +[node name="clear_btn" type="Button" parent="workspace/main_container/console_panel/console_title" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 693.0 +margin_right = 736.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "clear" flat = false - -[node name="workspace_container" type="VBoxContainer" parent="."] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 27.0 -margin/right = 644.0 -margin/bottom = 326.0 -alignment = 0 - -[node name="workspace" type="HSplitContainer" parent="workspace_container"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 644.0 -margin/bottom = 299.0 -split/offset = 0 -split/collapsed = false -split/dragger_visibility = 0 - -[node name="side_container" type="VBoxContainer" parent="workspace_container/workspace"] - -rect/min_size = Vector2( 168, 0 ) -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 168.0 -margin/bottom = 299.0 -alignment = 0 - -[node name="workspace_tree" type="Tree" parent="workspace_container/workspace/side_container"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 168.0 -margin/bottom = 299.0 -custom_fonts/font = SubResource( 4 ) -script/script = ExtResource( 7 ) - -[node name="main_container" type="VSplitContainer" parent="workspace_container/workspace"] - -rect/min_size = Vector2( 150, 0 ) -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 180.0 -margin/top = 0.0 -margin/right = 644.0 -margin/bottom = 299.0 -split/offset = 0 -split/collapsed = false -split/dragger_visibility = 0 - -[node name="console_output" type="TextEdit" parent="workspace_container/workspace/main_container"] - -hint/tooltip = "Output console" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 464.0 -margin/bottom = 197.0 +align = 1 +_sections_unfolded = [ "Size Flags", "custom_fonts" ] + +[node name="console_output" type="TextEdit" parent="workspace/main_container/console_panel" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 24.0 +margin_right = 736.0 +margin_bottom = 409.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 3 custom_colors/current_line_color = Color( 0.172549, 0.164706, 0.196078, 1 ) +text = "" +readonly = true +highlight_current_line = false syntax_highlighting = false show_line_numbers = false highlight_all_occurrences = false -caret/block_caret = false -caret/caret_blink = false -caret/caret_blink_speed = 0.65 -script/script = ExtResource( 8 ) - -[node name="git_console_container" type="VBoxContainer" parent="workspace_container/workspace/main_container"] - -rect/min_size = Vector2( 0, 90 ) -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 209.0 -margin/right = 464.0 -margin/bottom = 299.0 +override_selected_font_color = false +context_menu_enabled = true +smooth_scrolling = false +v_scroll_speed = 80.0 +hiding_enabled = 0 +caret_block_mode = false +caret_blink = false +caret_blink_speed = 0.65 +caret_moving_by_right_click = true +script = ExtResource( 7 ) +_sections_unfolded = [ "Size Flags" ] + +[node name="console_git_panel" type="VBoxContainer" parent="workspace/main_container" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 421.0 +margin_right = 736.0 +margin_bottom = 830.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 1 +size_flags_vertical = 3 alignment = 0 - -[node name="console_git_panel" type="Panel" parent="workspace_container/workspace/main_container/git_console_container"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 3 -size_flags/vertical = 3 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 464.0 -margin/bottom = 90.0 -script/script = ExtResource( 9 ) - -[node name="titile_label" type="Label" parent="workspace_container/workspace/main_container/git_console_container/console_git_panel"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 4.0 -margin/top = 9.0 -margin/right = 96.0 -margin/bottom = 26.0 +script = ExtResource( 8 ) +_sections_unfolded = [ "Pause", "Size Flags" ] + +[node name="console_git_title" type="HBoxContainer" parent="workspace/main_container/console_git_panel" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 736.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 1 +size_flags_vertical = 1 +alignment = 0 +_sections_unfolded = [ "Size Flags" ] + +[node name="titile_label" type="Label" parent="workspace/main_container/console_git_panel/console_git_title" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 688.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 3 +size_flags_vertical = 1 text = "Git Console:" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="clear_btn" type="Button" parent="workspace_container/workspace/main_container/git_console_container/console_git_panel"] - -anchor/left = 1 -anchor/right = 1 -hint/tooltip = "Clear Git console" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 49.0 -margin/top = 5.0 -margin/right = 5.0 -margin/bottom = 25.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="clear_btn" type="Button" parent="workspace/main_container/console_git_panel/console_git_title" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 692.0 +margin_right = 736.0 +margin_bottom = 20.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 toggle_mode = false enabled_focus_mode = 2 shortcut = null +group = null text = "Clear" -flat = true - -[node name="console_git" type="TextEdit" parent="workspace_container/workspace/main_container/git_console_container/console_git_panel"] - -anchor/right = 1 -anchor/bottom = 1 -hint/tooltip = "Git console" -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 29.0 -margin/right = 0.0 -margin/bottom = 0.0 +flat = false +align = 1 +_sections_unfolded = [ "Size Flags", "custom_fonts" ] + +[node name="console_git" type="TextEdit" parent="workspace/main_container/console_git_panel" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 24.0 +margin_right = 736.0 +margin_bottom = 409.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 3 custom_colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) custom_colors/current_line_color = Color( 0.172549, 0.164706, 0.196078, 1 ) +text = "" +readonly = true +highlight_current_line = false syntax_highlighting = false show_line_numbers = false highlight_all_occurrences = false -caret/block_caret = false -caret/caret_blink = false -caret/caret_blink_speed = 0.65 +override_selected_font_color = false +context_menu_enabled = true +smooth_scrolling = false +v_scroll_speed = 80.0 +hiding_enabled = 0 +caret_block_mode = false +caret_blink = false +caret_blink_speed = 0.65 +caret_moving_by_right_click = true +_sections_unfolded = [ "Grow Direction", "Margin", "Size Flags" ] diff --git a/addons/godot-git-control.funabab/controls/git_notification_toolbar.tscn b/addons/godot-git-control.funabab/controls/git_notification_toolbar.tscn index 237df5c..3b5a6e4 100644 --- a/addons/godot-git-control.funabab/controls/git_notification_toolbar.tscn +++ b/addons/godot-git-control.funabab/controls/git_notification_toolbar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/fonts/Arial.ttf" type="DynamicFontData" id=1] [ext_resource path="res://addons/godot-git-control.funabab/fonts/octicons.ttf" type="DynamicFontData" id=2] @@ -6,24 +6,24 @@ [sub_resource type="DynamicFont" id=1] -font/size = 14 -font/use_mipmaps = false -font/use_filter = false -font/font = ExtResource( 2 ) +size = 14 +use_mipmaps = false +use_filter = false +font_data = ExtResource( 2 ) fallback/0 = ExtResource( 1 ) [node name="git_notification_toolbar" type="MenuButton"] -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 984.0 -margin/bottom = 565.0 +anchor_right = 1 +anchor_bottom = 1 +focus_ignore_mouse = false +focus_stop_mouse = false +size_flags_horizontal = 2 +size_flags_vertical = 2 +margin_left = 0.0 +margin_top = 0.0 +margin_right = 984.0 +margin_bottom = 565.0 custom_fonts/font = SubResource( 1 ) toggle_mode = false click_on_press = true @@ -32,6 +32,4 @@ shortcut = null text = "" flat = false items = [ "-- Refresh", null, false, false, false, 0, 0, null, "", false, "", null, false, false, false, 1, 0, null, "", true, "Checkout Branch", null, false, false, false, 2, 0, null, "", false, "Delete Branch", null, false, false, false, 3, 0, null, "", false, "", null, false, false, false, 4, 0, null, "", true, "Commit All", null, false, false, false, 5, 0, null, "", false, "Revert All", null, false, false, false, 6, 0, null, "", false, "", null, false, false, false, 7, 0, null, "", true, "Fetch", null, false, false, false, 8, 0, null, "", false, "Pull", null, false, false, false, 9, 0, null, "", false, "", null, false, false, false, 10, 0, null, "", true, "Create Branch", null, false, false, false, 11, 0, null, "", false, "Merge Branch", null, false, false, false, 12, 0, null, "", false, "Rebase Branch", null, false, false, false, 13, 0, null, "", false, "", null, false, false, false, 14, 0, null, "", true, "Tag", null, false, false, false, 15, 0, null, "", false ] -script/script = ExtResource( 3 ) - - +script = ExtResource( 3 ) diff --git a/addons/godot-git-control.funabab/controls/merge_branch_dialog.tscn b/addons/godot-git-control.funabab/controls/merge_branch_dialog.tscn index 8aefa13..71e3b2b 100644 --- a/addons/godot-git-control.funabab/controls/merge_branch_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/merge_branch_dialog.tscn @@ -1,153 +1,186 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/merge_branch_dialog.gd" type="Script" id=1] -[node name="merge_branch_dialog" type="ConfirmationDialog"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 482.0 -margin/bottom = 190.0 -popup/exclusive = true -window/title = "Merge" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - -[node name="container" type="VBoxContainer" parent="."] - -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 15.0 -margin/top = 20.0 -margin/right = 15.0 -margin/bottom = 37.0 +[node name="merge_branch_dialog" type="ConfirmationDialog" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 482.0 +margin_bottom = 190.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 +popup_exclusive = true +window_title = "Merge" +resizable = false +dialog_hide_on_ok = true +script = ExtResource( 1 ) + +[node name="container" type="VBoxContainer" parent="." index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +margin_bottom = -36.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 2 +size_flags_vertical = 2 custom_constants/separation = 10 alignment = 0 -[node name="current_branch" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 452.0 -margin/bottom = 42.0 +[node name="current_branch" type="VBoxContainer" parent="container" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 466.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/current_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 452.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/current_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 95.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Current Branch" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/current_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 452.0 -margin/bottom = 42.0 -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/current_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 466.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 editable = false focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="merge_branch" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 52.0 -margin/right = 452.0 -margin/bottom = 90.0 +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="merge_branch" type="VBoxContainer" parent="container" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 52.0 +margin_right = 466.0 +margin_bottom = 90.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/merge_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 452.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/merge_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 122.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Merge from Branch" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="branches" type="OptionButton" parent="container/merge_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 452.0 -margin/bottom = 38.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="branches" type="OptionButton" parent="container/merge_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 466.0 +margin_bottom = 38.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 6 toggle_mode = false +action_mode = 0 enabled_focus_mode = 2 shortcut = null +group = null flat = false align = 0 selected = -1 items = [ ] - -[node name="no_fast_forward" type="VBoxContainer" parent="container"] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 100.0 -margin/right = 452.0 -margin/bottom = 123.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="no_fast_forward" type="VBoxContainer" parent="container" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 100.0 +margin_right = 131.0 +margin_bottom = 124.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 2 +size_flags_vertical = 2 alignment = 0 -[node name="checkbox" type="CheckBox" parent="container/no_fast_forward"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 452.0 -margin/bottom = 23.0 +[node name="checkbox" type="CheckBox" parent="container/no_fast_forward" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 131.0 +margin_bottom = 24.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 2 +size_flags_vertical = 2 toggle_mode = true -click_on_press = true enabled_focus_mode = 2 shortcut = null +group = null text = "No Fast-Forward" flat = false align = 0 diff --git a/addons/godot-git-control.funabab/controls/rebase_dialog.tscn b/addons/godot-git-control.funabab/controls/rebase_dialog.tscn index e4909df..17500da 100644 --- a/addons/godot-git-control.funabab/controls/rebase_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/rebase_dialog.tscn @@ -1,124 +1,153 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=2 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/rebase_dialog.gd" type="Script" id=1] -[node name="rebase_dialog" type="ConfirmationDialog"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 472.0 -margin/bottom = 175.0 -popup/exclusive = true -window/title = "Rebase" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - -[node name="container" type="VBoxContainer" parent="."] - -anchor/right = 1 -anchor/bottom = 1 -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 15.0 -margin/top = 15.0 -margin/right = 15.0 -margin/bottom = 37.0 +[node name="rebase_dialog" type="ConfirmationDialog" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 472.0 +margin_bottom = 140.0 +rect_min_size = Vector2( 400, 140 ) +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 0 +size_flags_vertical = 0 +popup_exclusive = true +window_title = "Rebase" +resizable = false +dialog_hide_on_ok = true +script = ExtResource( 1 ) +_sections_unfolded = [ "Size Flags" ] + +[node name="container" type="VBoxContainer" parent="." index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = -8.0 +margin_bottom = -36.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 2 +size_flags_vertical = 2 custom_constants/separation = 10 alignment = 0 -[node name="current_branch" type="VBoxContainer" parent="container"] - -editor/display_folded = true -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 42.0 +[node name="current_branch" type="VBoxContainer" parent="container" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 456.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/current_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags", "custom_constants" ] + +[node name="label" type="Label" parent="container/current_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 95.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "Current Branch" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 - -[node name="input" type="LineEdit" parent="container/current_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 442.0 -margin/bottom = 42.0 -placeholder/alpha = 0.6 +_sections_unfolded = [ "Size Flags" ] + +[node name="input" type="LineEdit" parent="container/current_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 456.0 +margin_bottom = 42.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 editable = false focus_mode = 2 -caret/caret_blink = false -caret/caret_blink_speed = 0.65 - -[node name="rebase_on_branch" type="VBoxContainer" parent="container"] - -focus/ignore_mouse = false -focus/stop_mouse = false -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 52.0 -margin/right = 442.0 -margin/bottom = 90.0 +placeholder_alpha = 0.6 +caret_blink = false +caret_blink_speed = 0.65 +context_menu_enabled = true +_sections_unfolded = [ "Size Flags" ] + +[node name="rebase_on_branch" type="VBoxContainer" parent="container" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 52.0 +margin_right = 456.0 +margin_bottom = 90.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 0 alignment = 0 - -[node name="label" type="Label" parent="container/rebase_on_branch"] - -focus/ignore_mouse = true -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 0 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 442.0 -margin/bottom = 14.0 +_sections_unfolded = [ "Size Flags" ] + +[node name="label" type="Label" parent="container/rebase_on_branch" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 114.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 2 +size_flags_horizontal = 2 +size_flags_vertical = 0 text = "Rebase on Branch" percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[node name="branches" type="OptionButton" parent="container/rebase_on_branch"] - -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 18.0 -margin/right = 442.0 -margin/bottom = 38.0 +[node name="branches" type="OptionButton" parent="container/rebase_on_branch" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 456.0 +margin_bottom = 38.0 +rect_pivot_offset = Vector2( 0, 0 ) +mouse_filter = 0 +size_flags_horizontal = 3 +size_flags_vertical = 0 toggle_mode = false +action_mode = 0 enabled_focus_mode = 2 shortcut = null +group = null flat = false align = 0 selected = -1 items = [ ] +_sections_unfolded = [ "Size Flags" ] diff --git a/addons/godot-git-control.funabab/controls/revert_confirm_dialog.tscn b/addons/godot-git-control.funabab/controls/revert_confirm_dialog.tscn index e2c1729..caaeb47 100644 --- a/addons/godot-git-control.funabab/controls/revert_confirm_dialog.tscn +++ b/addons/godot-git-control.funabab/controls/revert_confirm_dialog.tscn @@ -1,21 +1,20 @@ -[gd_scene load_steps=2 format=1] +[gd_scene load_steps=1 format=2] [ext_resource path="res://addons/godot-git-control.funabab/scripts/controls/revert_confirm_dialog.gd" type="Script" id=1] [node name="revert_confirm_dialog" type="ConfirmationDialog"] -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 0.0 -margin/top = 0.0 -margin/right = 398.0 -margin/bottom = 84.0 -popup/exclusive = true -window/title = "Please Confirm..." -dialog/text = "Reset will erase changes in selected files since last commit\nAre you sure to continue\?" -dialog/hide_on_ok = true -script/script = ExtResource( 1 ) - - +focus_ignore_mouse = false +focus_stop_mouse = true +size_flags_horizontal = 2 +size_flags_vertical = 2 +margin_left = 0.0 +margin_top = 0.0 +margin_right = 398.0 +margin_bottom = 84.0 +popup_exclusive = true +window_title = "Please Confirm..." +dialog_text = "Reset will erase changes in selected files since last commit +Are you sure to continue?" +dialog_hide_on_ok = true +script = ExtResource( 1 ) diff --git a/addons/godot-git-control.funabab/fonts/iconsFont.tres b/addons/godot-git-control.funabab/fonts/iconsFont.tres new file mode 100644 index 0000000..62713f5 --- /dev/null +++ b/addons/godot-git-control.funabab/fonts/iconsFont.tres @@ -0,0 +1,12 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://addons/godot-git-control.funabab/fonts/octicons.ttf" type="DynamicFontData" id=1] + +[resource] + +size = 32 +use_mipmaps = false +use_filter = false +font_data = ExtResource( 1 ) +_sections_unfolded = [ "Settings" ] + diff --git a/addons/godot-git-control.funabab/fonts/workspaceFont.tres b/addons/godot-git-control.funabab/fonts/workspaceFont.tres new file mode 100644 index 0000000..232f38d --- /dev/null +++ b/addons/godot-git-control.funabab/fonts/workspaceFont.tres @@ -0,0 +1,14 @@ +[gd_resource type="DynamicFont" load_steps=3 format=2] + +[ext_resource path="res://addons/godot-git-control.funabab/fonts/Arial.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://addons/godot-git-control.funabab/fonts/FontAwesome.otf" type="DynamicFontData" id=2] + +[resource] + +size = 26 +use_mipmaps = true +use_filter = false +font_data = ExtResource( 2 ) +fallback/0 = ExtResource( 1 ) +_sections_unfolded = [ "Font", "Font/fallback", "Settings" ] + diff --git a/addons/godot-git-control.funabab/images/checked.png b/addons/godot-git-control.funabab/images/checked.png index f72eab7072acc865da063dbff268bfd143abeb55..41132bbb7d8259babf9793c2977ad1f169bab261 100644 GIT binary patch literal 654 zcmV;90&)F`P)4_y856sta#j8H?4EYd^vbdv!$w68$&nmxL;Pk4?4$n<4k>a<8l@{Y6lvqCkeCAsY}LmufqVF&Y%`C^$QnZuIJZb+&Ys=Ol2i5uIq zxNTI+1J8i}+Wh&D8cLU$CQ5d%786Y3o(BV^Gl_(A;=UqxLn4NrN0xA1$`4&C0O`gH zYmx)j-^LO86)aLG!x~9Pid$aY7Z}4T zs`~3GsBsv;CUQh{kM8avq&^3(BcIeyaB~H81P_Oy(a0tu=ndRPCph~SpOg5z8(AX3 z?`qvXVuv@P#pUFGHL?OE=|knQ*{jI7QF7b0C3E|IY4dmabOqT5l8)%AUmaa_&9B#` oPU2jLK_{tDLwM7qngu-m2R7X(iaA>wmjD0&07*qoM6N<$f?gLP1^@s6 literal 405 zcmV;G0c!qK~y-6)sZo7!axv3-;DNs@*7swIZAaMa2 zOOah*U%-^eEmyFTF0Bho=_#OvipIOzG_eCX5L$k<-+$M0?n5HV;av*IOVd zvMkB-ocVl?@B2M->)arUBDB^3ESF1)qF}LD{0YO+ z7S`+aJMfq!3ASz1G!6Uxo;Z$iUH1es#(a!Mqo>{kLI`HF8N1yM&-2K#tOuW~`vW0F z10ba&P1CCo(DV!jgTb3p>gzx9r^)J;x;xP~9DP>!<%bNG00000NkvXXu0mjfT;HWg diff --git a/addons/godot-git-control.funabab/images/unchecked.png b/addons/godot-git-control.funabab/images/unchecked.png index d46569c425ca7244d6de808feeec76b3fe0c63e3..b8d4681d29ce071d8879d66315af04a389fd28e0 100644 GIT binary patch literal 327 zcmV-N0l5B&P)04!`$CsPBko|iolkiAU-Su27kO;6MY7Z Z@&$Sh8-4nJ zuqS~qqea!s+dx6d64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S%JzX3_ zEP9g@BtA6=9;^8CqwviC|NoD6Tsm^%hgVow8E4mn#qRxG9a}{sb%i(1DrgL3W@~2D pFB_k