diff --git a/flumi/Resources/LuaSyntaxHighlighter.tres b/flumi/Resources/LuaSyntaxHighlighter.tres index 7ab4c9b..5831016 100644 --- a/flumi/Resources/LuaSyntaxHighlighter.tres +++ b/flumi/Resources/LuaSyntaxHighlighter.tres @@ -1,6 +1,7 @@ [gd_resource type="SyntaxHighlighter" script_class="LuaSyntaxHighlighter" load_steps=2 format=3 uid="uid://d0aeuvwp0545i"] -[ext_resource type="Script" uid="uid://qicpfnrmje1v" path="res://Scripts/LuaSyntaxHighlighter.gd" id="1_5xwa7"] +[ext_resource type="Script" uid="uid://qicpfnrmje1v" path="res://Scripts/Browser/LuaSyntaxHighlighter.gd" id="1_5xwa7"] + [resource] script = ExtResource("1_5xwa7") diff --git a/flumi/Scenes/BrowserMenus/history.tscn b/flumi/Scenes/BrowserMenus/history.tscn index e182a5d..a01d3b6 100644 --- a/flumi/Scenes/BrowserMenus/history.tscn +++ b/flumi/Scenes/BrowserMenus/history.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=15 format=3 uid="uid://cn24pafwdpb1q"] -[ext_resource type="Script" uid="uid://ektopbvnhfga" path="res://Scripts/history.gd" id="1_yn8i4"] +[ext_resource type="Script" uid="uid://ektopbvnhfga" path="res://Scripts/Browser/history.gd" id="1_yn8i4"] [ext_resource type="PackedScene" uid="uid://3smiker6ni50" path="res://Scenes/BrowserMenus/history_entry.tscn" id="2_a5287"] [ext_resource type="Texture2D" uid="uid://gq8g7t4s3ryg" path="res://Assets/Icons/x.svg" id="2_ijpe2"] [ext_resource type="Theme" uid="uid://bn6rbmdy60lhr" path="res://Scenes/Styles/BrowserText.tres" id="3_yoadi"] diff --git a/flumi/Scenes/BrowserMenus/history_entry.tscn b/flumi/Scenes/BrowserMenus/history_entry.tscn index b970660..7bd6f32 100644 --- a/flumi/Scenes/BrowserMenus/history_entry.tscn +++ b/flumi/Scenes/BrowserMenus/history_entry.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://3smiker6ni50"] [ext_resource type="Theme" uid="uid://bn6rbmdy60lhr" path="res://Scenes/Styles/BrowserText.tres" id="1_4plhl"] -[ext_resource type="Script" uid="uid://bw5pr4wrf780h" path="res://Scripts/history_entry.gd" id="1_h5c6k"] +[ext_resource type="Script" uid="uid://bw5pr4wrf780h" path="res://Scripts/Browser/history_entry.gd" id="1_h5c6k"] [ext_resource type="Texture2D" uid="uid://blskvfjswul1d" path="res://Assets/Icons/checkbox_white.svg" id="2_h5c6k"] [ext_resource type="Texture2D" uid="uid://bqpx2lgo0yecb" path="res://Assets/Icons/globe.svg" id="2_k4hqm"] diff --git a/flumi/Scenes/DevTools.tscn b/flumi/Scenes/DevTools.tscn index 5e03c7e..ace2907 100644 --- a/flumi/Scenes/DevTools.tscn +++ b/flumi/Scenes/DevTools.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=31 format=3 uid="uid://cgav3xl2xgupb"] -[ext_resource type="Script" uid="uid://vrobqac6makc" path="res://Scripts/DevToolsConsole.gd" id="2_3m6n9"] +[ext_resource type="Script" uid="uid://vrobqac6makc" path="res://Scripts/Browser/DevToolsConsole.gd" id="2_3m6n9"] [ext_resource type="Texture2D" uid="uid://gq8g7t4s3ryg" path="res://Assets/Icons/x.svg" id="2_pqhy6"] [ext_resource type="Texture2D" uid="uid://custohlvwclqs" path="res://Assets/Icons/eraser.svg" id="3_6hj4c"] [ext_resource type="Texture2D" uid="uid://cqg4eny0nyojd" path="res://Assets/Icons/funnel.svg" id="4_ynqb1"] [ext_resource type="SyntaxHighlighter" uid="uid://d0aeuvwp0545i" path="res://Resources/LuaSyntaxHighlighter.tres" id="5_xkykt"] [ext_resource type="Theme" uid="uid://bn6rbmdy60lhr" path="res://Scenes/Styles/BrowserText.tres" id="6_8muo7"] -[ext_resource type="Script" uid="uid://dh3jdrot4r7m3" path="res://Scripts/NetworkTab.gd" id="7_network"] -[ext_resource type="Script" uid="uid://21a6ds271vmb" path="res://Scripts/DevTools.gd" id="25_devtools"] +[ext_resource type="Script" uid="uid://dh3jdrot4r7m3" path="res://Scripts/Browser/NetworkTab.gd" id="7_network"] +[ext_resource type="Script" uid="uid://21a6ds271vmb" path="res://Scripts/Browser/DevTools.gd" id="25_devtools"] + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_6hj4c"] diff --git a/flumi/Scenes/NetworkRequestItem.tscn b/flumi/Scenes/NetworkRequestItem.tscn index f2b86aa..bd8f8dd 100644 --- a/flumi/Scenes/NetworkRequestItem.tscn +++ b/flumi/Scenes/NetworkRequestItem.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://dqvgywj71hfry"] -[ext_resource type="Script" uid="uid://bcs7m624uvv3x" path="res://Scripts/NetworkRequestItem.gd" id="1_8v2qr"] +[ext_resource type="Script" uid="uid://bcs7m624uvv3x" path="res://Scripts/Browser/NetworkRequestItem.gd" id="1_8v2qr"] [ext_resource type="StyleBox" uid="uid://bxmcq4y0i4hl4" path="res://Resources/NetworkRequestItem_Normal.tres" id="2_normal"] [ext_resource type="StyleBox" uid="uid://clvnmfql36jit" path="res://Resources/NetworkRequestItem_Selected.tres" id="3_selected"] diff --git a/flumi/Scenes/Tab.tscn b/flumi/Scenes/Tab.tscn index 45fd895..1537a28 100644 --- a/flumi/Scenes/Tab.tscn +++ b/flumi/Scenes/Tab.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=14 format=3 uid="uid://sqhcxhcre081"] -[ext_resource type="Script" uid="uid://crpnnfqm3k5xv" path="res://Scripts/Tab.gd" id="1_q3baj"] +[ext_resource type="Script" uid="uid://crpnnfqm3k5xv" path="res://Scripts/Browser/Tab.gd" id="1_q3baj"] [ext_resource type="Texture2D" uid="uid://gq8g7t4s3ryg" path="res://Assets/Icons/x.svg" id="2_pisds"] [ext_resource type="StyleBox" uid="uid://fd1nftmqox32" path="res://Scenes/Styles/TabHoverDefault.tres" id="3_kjcxk"] [ext_resource type="Texture2D" uid="uid://c7u7a1u1v04bx" path="res://Scenes/Styles/TabGradientDefault.tres" id="3_q3baj"] diff --git a/flumi/Scenes/Tags/textarea.tscn b/flumi/Scenes/Tags/textarea.tscn index d4d5be0..02a3070 100644 --- a/flumi/Scenes/Tags/textarea.tscn +++ b/flumi/Scenes/Tags/textarea.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://bmcx7mr4nye6a" path="res://Scripts/Tags/textarea.gd" id="1_textarea"] [ext_resource type="Theme" uid="uid://bn6rbmdy60lhr" path="res://Scenes/Styles/BrowserText.tres" id="2_theme"] -[ext_resource type="Script" uid="uid://c5xpoyqcg1p8k" path="res://Scripts/ResizableTextEdit.gd" id="3_kbdk1"] +[ext_resource type="Script" uid="uid://c5xpoyqcg1p8k" path="res://Scripts/Engine/ResizableTextEdit.gd" id="3_kbdk1"] [node name="textarea" type="Control"] layout_mode = 3 diff --git a/flumi/Scenes/main.tscn b/flumi/Scenes/main.tscn index 8169427..ea471c2 100644 --- a/flumi/Scenes/main.tscn +++ b/flumi/Scenes/main.tscn @@ -2,17 +2,17 @@ [ext_resource type="Script" uid="uid://bg5iqnwic1rio" path="res://Scripts/main.gd" id="1_8q3xr"] [ext_resource type="Texture2D" uid="uid://df1m4j7uxi63v" path="res://Assets/Icons/chevron-down.svg" id="2_6bp64"] -[ext_resource type="Script" uid="uid://cy0c74thgjwok" path="res://Scripts/TabContainer.gd" id="2_hptm8"] +[ext_resource type="Script" uid="uid://cy0c74thgjwok" path="res://Scripts/Browser/TabContainer.gd" id="2_hptm8"] [ext_resource type="Texture2D" uid="uid://bf0vx7qwo28k6" path="res://Assets/Icons/search.svg" id="3_8gbba"] [ext_resource type="Texture2D" uid="uid://bp42ccs2nmbmw" path="res://Assets/Icons/arrow-left.svg" id="3_21xkr"] [ext_resource type="Texture2D" uid="uid://dyyylow47qd0k" path="res://Assets/Icons/arrow-right.svg" id="4_6bp64"] [ext_resource type="PackedScene" uid="uid://sqhcxhcre081" path="res://Scenes/Tab.tscn" id="4_344ge"] [ext_resource type="Texture2D" uid="uid://cu4hjoba6etf" path="res://Assets/Icons/rotate-cw.svg" id="5_344ge"] [ext_resource type="Texture2D" uid="uid://cehbtwq6gq0cn" path="res://Assets/Icons/plus.svg" id="5_ynf5e"] -[ext_resource type="Script" path="res://Scripts/SearchBar.gd" id="9_gt3je"] +[ext_resource type="Script" uid="uid://nve723radqih" path="res://Scripts/Browser/SearchBar.gd" id="9_gt3je"] [ext_resource type="Texture2D" uid="uid://cklatjc4m38dy" path="res://Assets/Icons/ellipsis-vertical.svg" id="10_6iyac"] [ext_resource type="Theme" uid="uid://bn6rbmdy60lhr" path="res://Scenes/Styles/BrowserText.tres" id="11_ee4r6"] -[ext_resource type="Script" uid="uid://vjjhljlftlbk" path="res://Scripts/OptionButton.gd" id="11_gt3je"] +[ext_resource type="Script" uid="uid://vjjhljlftlbk" path="res://Scripts/Browser/OptionButton.gd" id="11_gt3je"] [ext_resource type="Texture2D" uid="uid://du24f6em2nqwq" path="res://Assets/Icons/external-link.svg" id="12_gt3je"] [ext_resource type="Texture2D" uid="uid://81l2fi381yub" path="res://Assets/Icons/square.svg" id="13_3pmx8"] [ext_resource type="Texture2D" uid="uid://dwxquqmmd6dqx" path="res://Assets/Icons/hat-glasses.svg" id="14_u50mg"] diff --git a/flumi/Scripts/BrowserHistory.gd b/flumi/Scripts/Browser/BrowserHistory.gd similarity index 100% rename from flumi/Scripts/BrowserHistory.gd rename to flumi/Scripts/Browser/BrowserHistory.gd diff --git a/flumi/Scripts/BrowserHistory.gd.uid b/flumi/Scripts/Browser/BrowserHistory.gd.uid similarity index 100% rename from flumi/Scripts/BrowserHistory.gd.uid rename to flumi/Scripts/Browser/BrowserHistory.gd.uid diff --git a/flumi/Scripts/CertificateManager.gd b/flumi/Scripts/Browser/CertificateManager.gd similarity index 100% rename from flumi/Scripts/CertificateManager.gd rename to flumi/Scripts/Browser/CertificateManager.gd diff --git a/flumi/Scripts/CertificateManager.gd.uid b/flumi/Scripts/Browser/CertificateManager.gd.uid similarity index 100% rename from flumi/Scripts/CertificateManager.gd.uid rename to flumi/Scripts/Browser/CertificateManager.gd.uid diff --git a/flumi/Scripts/DevTools.gd b/flumi/Scripts/Browser/DevTools.gd similarity index 100% rename from flumi/Scripts/DevTools.gd rename to flumi/Scripts/Browser/DevTools.gd diff --git a/flumi/Scripts/DevTools.gd.uid b/flumi/Scripts/Browser/DevTools.gd.uid similarity index 100% rename from flumi/Scripts/DevTools.gd.uid rename to flumi/Scripts/Browser/DevTools.gd.uid diff --git a/flumi/Scripts/DevToolsConsole.gd b/flumi/Scripts/Browser/DevToolsConsole.gd similarity index 100% rename from flumi/Scripts/DevToolsConsole.gd rename to flumi/Scripts/Browser/DevToolsConsole.gd diff --git a/flumi/Scripts/DevToolsConsole.gd.uid b/flumi/Scripts/Browser/DevToolsConsole.gd.uid similarity index 100% rename from flumi/Scripts/DevToolsConsole.gd.uid rename to flumi/Scripts/Browser/DevToolsConsole.gd.uid diff --git a/flumi/Scripts/GurtProtocol.gd b/flumi/Scripts/Browser/GurtProtocol.gd similarity index 100% rename from flumi/Scripts/GurtProtocol.gd rename to flumi/Scripts/Browser/GurtProtocol.gd diff --git a/flumi/Scripts/GurtProtocol.gd.uid b/flumi/Scripts/Browser/GurtProtocol.gd.uid similarity index 100% rename from flumi/Scripts/GurtProtocol.gd.uid rename to flumi/Scripts/Browser/GurtProtocol.gd.uid diff --git a/flumi/Scripts/LuaSyntaxHighlighter.gd b/flumi/Scripts/Browser/LuaSyntaxHighlighter.gd similarity index 100% rename from flumi/Scripts/LuaSyntaxHighlighter.gd rename to flumi/Scripts/Browser/LuaSyntaxHighlighter.gd diff --git a/flumi/Scripts/LuaSyntaxHighlighter.gd.uid b/flumi/Scripts/Browser/LuaSyntaxHighlighter.gd.uid similarity index 100% rename from flumi/Scripts/LuaSyntaxHighlighter.gd.uid rename to flumi/Scripts/Browser/LuaSyntaxHighlighter.gd.uid diff --git a/flumi/Scripts/NetworkManager.gd b/flumi/Scripts/Browser/NetworkManager.gd similarity index 100% rename from flumi/Scripts/NetworkManager.gd rename to flumi/Scripts/Browser/NetworkManager.gd diff --git a/flumi/Scripts/NetworkManager.gd.uid b/flumi/Scripts/Browser/NetworkManager.gd.uid similarity index 100% rename from flumi/Scripts/NetworkManager.gd.uid rename to flumi/Scripts/Browser/NetworkManager.gd.uid diff --git a/flumi/Scripts/NetworkRequest.gd b/flumi/Scripts/Browser/NetworkRequest.gd similarity index 100% rename from flumi/Scripts/NetworkRequest.gd rename to flumi/Scripts/Browser/NetworkRequest.gd diff --git a/flumi/Scripts/NetworkRequest.gd.uid b/flumi/Scripts/Browser/NetworkRequest.gd.uid similarity index 100% rename from flumi/Scripts/NetworkRequest.gd.uid rename to flumi/Scripts/Browser/NetworkRequest.gd.uid diff --git a/flumi/Scripts/NetworkRequestItem.gd b/flumi/Scripts/Browser/NetworkRequestItem.gd similarity index 100% rename from flumi/Scripts/NetworkRequestItem.gd rename to flumi/Scripts/Browser/NetworkRequestItem.gd diff --git a/flumi/Scripts/NetworkRequestItem.gd.uid b/flumi/Scripts/Browser/NetworkRequestItem.gd.uid similarity index 100% rename from flumi/Scripts/NetworkRequestItem.gd.uid rename to flumi/Scripts/Browser/NetworkRequestItem.gd.uid diff --git a/flumi/Scripts/NetworkTab.gd b/flumi/Scripts/Browser/NetworkTab.gd similarity index 100% rename from flumi/Scripts/NetworkTab.gd rename to flumi/Scripts/Browser/NetworkTab.gd diff --git a/flumi/Scripts/NetworkTab.gd.uid b/flumi/Scripts/Browser/NetworkTab.gd.uid similarity index 100% rename from flumi/Scripts/NetworkTab.gd.uid rename to flumi/Scripts/Browser/NetworkTab.gd.uid diff --git a/flumi/Scripts/OptionButton.gd b/flumi/Scripts/Browser/OptionButton.gd similarity index 100% rename from flumi/Scripts/OptionButton.gd rename to flumi/Scripts/Browser/OptionButton.gd diff --git a/flumi/Scripts/OptionButton.gd.uid b/flumi/Scripts/Browser/OptionButton.gd.uid similarity index 100% rename from flumi/Scripts/OptionButton.gd.uid rename to flumi/Scripts/Browser/OptionButton.gd.uid diff --git a/flumi/Scripts/SearchBar.gd b/flumi/Scripts/Browser/SearchBar.gd similarity index 100% rename from flumi/Scripts/SearchBar.gd rename to flumi/Scripts/Browser/SearchBar.gd diff --git a/flumi/Scripts/SearchBar.gd.uid b/flumi/Scripts/Browser/SearchBar.gd.uid similarity index 100% rename from flumi/Scripts/SearchBar.gd.uid rename to flumi/Scripts/Browser/SearchBar.gd.uid diff --git a/flumi/Scripts/Tab.gd b/flumi/Scripts/Browser/Tab.gd similarity index 100% rename from flumi/Scripts/Tab.gd rename to flumi/Scripts/Browser/Tab.gd diff --git a/flumi/Scripts/Tab.gd.uid b/flumi/Scripts/Browser/Tab.gd.uid similarity index 100% rename from flumi/Scripts/Tab.gd.uid rename to flumi/Scripts/Browser/Tab.gd.uid diff --git a/flumi/Scripts/TabContainer.gd b/flumi/Scripts/Browser/TabContainer.gd similarity index 100% rename from flumi/Scripts/TabContainer.gd rename to flumi/Scripts/Browser/TabContainer.gd diff --git a/flumi/Scripts/TabContainer.gd.uid b/flumi/Scripts/Browser/TabContainer.gd.uid similarity index 100% rename from flumi/Scripts/TabContainer.gd.uid rename to flumi/Scripts/Browser/TabContainer.gd.uid diff --git a/flumi/Scripts/history.gd b/flumi/Scripts/Browser/history.gd similarity index 100% rename from flumi/Scripts/history.gd rename to flumi/Scripts/Browser/history.gd diff --git a/flumi/Scripts/history.gd.uid b/flumi/Scripts/Browser/history.gd.uid similarity index 100% rename from flumi/Scripts/history.gd.uid rename to flumi/Scripts/Browser/history.gd.uid diff --git a/flumi/Scripts/history_entry.gd b/flumi/Scripts/Browser/history_entry.gd similarity index 100% rename from flumi/Scripts/history_entry.gd rename to flumi/Scripts/Browser/history_entry.gd diff --git a/flumi/Scripts/history_entry.gd.uid b/flumi/Scripts/Browser/history_entry.gd.uid similarity index 100% rename from flumi/Scripts/history_entry.gd.uid rename to flumi/Scripts/Browser/history_entry.gd.uid diff --git a/flumi/Scripts/AutoSizingFlexContainer.gd b/flumi/Scripts/Engine/AutoSizingFlexContainer.gd similarity index 100% rename from flumi/Scripts/AutoSizingFlexContainer.gd rename to flumi/Scripts/Engine/AutoSizingFlexContainer.gd diff --git a/flumi/Scripts/AutoSizingFlexContainer.gd.uid b/flumi/Scripts/Engine/AutoSizingFlexContainer.gd.uid similarity index 100% rename from flumi/Scripts/AutoSizingFlexContainer.gd.uid rename to flumi/Scripts/Engine/AutoSizingFlexContainer.gd.uid diff --git a/flumi/Scripts/FontManager.gd b/flumi/Scripts/Engine/FontManager.gd similarity index 100% rename from flumi/Scripts/FontManager.gd rename to flumi/Scripts/Engine/FontManager.gd diff --git a/flumi/Scripts/FontManager.gd.uid b/flumi/Scripts/Engine/FontManager.gd.uid similarity index 100% rename from flumi/Scripts/FontManager.gd.uid rename to flumi/Scripts/Engine/FontManager.gd.uid diff --git a/flumi/Scripts/MaxSizeControl.gd b/flumi/Scripts/Engine/MaxSizeControl.gd similarity index 100% rename from flumi/Scripts/MaxSizeControl.gd rename to flumi/Scripts/Engine/MaxSizeControl.gd diff --git a/flumi/Scripts/MaxSizeControl.gd.uid b/flumi/Scripts/Engine/MaxSizeControl.gd.uid similarity index 100% rename from flumi/Scripts/MaxSizeControl.gd.uid rename to flumi/Scripts/Engine/MaxSizeControl.gd.uid diff --git a/flumi/Scripts/ResizableTextEdit.gd b/flumi/Scripts/Engine/ResizableTextEdit.gd similarity index 100% rename from flumi/Scripts/ResizableTextEdit.gd rename to flumi/Scripts/Engine/ResizableTextEdit.gd diff --git a/flumi/Scripts/ResizableTextEdit.gd.uid b/flumi/Scripts/Engine/ResizableTextEdit.gd.uid similarity index 100% rename from flumi/Scripts/ResizableTextEdit.gd.uid rename to flumi/Scripts/Engine/ResizableTextEdit.gd.uid diff --git a/flumi/Scripts/StyleManager.gd b/flumi/Scripts/Engine/StyleManager.gd similarity index 100% rename from flumi/Scripts/StyleManager.gd rename to flumi/Scripts/Engine/StyleManager.gd diff --git a/flumi/Scripts/StyleManager.gd.uid b/flumi/Scripts/Engine/StyleManager.gd.uid similarity index 100% rename from flumi/Scripts/StyleManager.gd.uid rename to flumi/Scripts/Engine/StyleManager.gd.uid diff --git a/flumi/Scripts/main.gd b/flumi/Scripts/main.gd index ff53d7f..0a5ee42 100644 --- a/flumi/Scripts/main.gd +++ b/flumi/Scripts/main.gd @@ -9,7 +9,7 @@ extends Control @onready var refresh_button: Button = $VBoxContainer/HBoxContainer/RefreshButton const LOADER_CIRCLE = preload("res://Assets/Icons/loader-circle.svg") -const AUTO_SIZING_FLEX_CONTAINER = preload("res://Scripts/AutoSizingFlexContainer.gd") +const AUTO_SIZING_FLEX_CONTAINER = preload("res://Scripts/Engine/AutoSizingFlexContainer.gd") const P = preload("res://Scenes/Tags/p.tscn") const IMG = preload("res://Scenes/Tags/img.tscn") @@ -811,4 +811,3 @@ func update_navigation_buttons() -> void: else: back_button.disabled = true forward_button.disabled = true - diff --git a/flumi/project.godot b/flumi/project.godot index ca5fa3b..507f29a 100644 --- a/flumi/project.godot +++ b/flumi/project.godot @@ -22,8 +22,8 @@ config/icon="uid://ctpe0lbehepen" Constants="*res://Scripts/Constants.gd" Network="*res://Scripts/Network.gd" -NetworkManager="*res://Scripts/NetworkManager.gd" -BrowserHistory="*res://Scripts/BrowserHistory.gd" +NetworkManager="*res://Scripts/Browser/NetworkManager.gd" +BrowserHistory="*res://Scripts/Browser/BrowserHistory.gd" [display]