diff --git a/app/assets/new_textures/home.svg b/app/assets/new_textures/home.svg deleted file mode 100644 index b9deddc..0000000 --- a/app/assets/new_textures/home.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/assets/new_textures/home.svg.import b/app/assets/new_textures/home.svg.import deleted file mode 100644 index 1937a19..0000000 --- a/app/assets/new_textures/home.svg.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://mgtj316adcja" -path.s3tc="res://.godot/imported/home.svg-030ca5f1db8a755cd4cb191482f98ae3.s3tc.ctex" -path.etc2="res://.godot/imported/home.svg-030ca5f1db8a755cd4cb191482f98ae3.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://assets/new_textures/home.svg" -dest_files=["res://.godot/imported/home.svg-030ca5f1db8a755cd4cb191482f98ae3.s3tc.ctex", "res://.godot/imported/home.svg-030ca5f1db8a755cd4cb191482f98ae3.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=2.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/minimize.svg b/app/assets/new_textures/minimize.svg deleted file mode 100644 index c7ee7e4..0000000 --- a/app/assets/new_textures/minimize.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/assets/new_textures/minimize.svg.import b/app/assets/new_textures/minimize.svg.import deleted file mode 100644 index b2a071c..0000000 --- a/app/assets/new_textures/minimize.svg.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d1ehc1xs5hwyn" -path.s3tc="res://.godot/imported/minimize.svg-bf11b0ef58693122101df5c2c5a5870c.s3tc.ctex" -path.etc2="res://.godot/imported/minimize.svg-bf11b0ef58693122101df5c2c5a5870c.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://assets/new_textures/minimize.svg" -dest_files=["res://.godot/imported/minimize.svg-bf11b0ef58693122101df5c2c5a5870c.s3tc.ctex", "res://.godot/imported/minimize.svg-bf11b0ef58693122101df5c2c5a5870c.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=2.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/search.svg b/app/assets/new_textures/search.svg deleted file mode 100644 index eba6fbf..0000000 --- a/app/assets/new_textures/search.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/app/assets/new_textures/search.svg.import b/app/assets/new_textures/search.svg.import deleted file mode 100644 index 53078c0..0000000 --- a/app/assets/new_textures/search.svg.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://byrcelmfy6r3l" -path.s3tc="res://.godot/imported/search.svg-843f43a72ccd4c8691b9f946ce93c3a0.s3tc.ctex" -path.etc2="res://.godot/imported/search.svg-843f43a72ccd4c8691b9f946ce93c3a0.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://assets/new_textures/search.svg" -dest_files=["res://.godot/imported/search.svg-843f43a72ccd4c8691b9f946ce93c3a0.s3tc.ctex", "res://.godot/imported/search.svg-843f43a72ccd4c8691b9f946ce93c3a0.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=2.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/star.svg b/app/assets/new_textures/star.svg deleted file mode 100644 index 34f2288..0000000 --- a/app/assets/new_textures/star.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/app/assets/new_textures/star.svg.import b/app/assets/new_textures/star.svg.import deleted file mode 100644 index 93a7216..0000000 --- a/app/assets/new_textures/star.svg.import +++ /dev/null @@ -1,39 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c7ljriip50hte" -path.s3tc="res://.godot/imported/star.svg-cd2a204af5c7598db5a70a08e6fab43f.s3tc.ctex" -path.etc2="res://.godot/imported/star.svg-cd2a204af5c7598db5a70a08e6fab43f.etc2.ctex" -metadata={ -"imported_formats": ["s3tc_bptc", "etc2_astc"], -"vram_texture": true -} - -[deps] - -source_file="res://assets/new_textures/star.svg" -dest_files=["res://.godot/imported/star.svg-cd2a204af5c7598db5a70a08e6fab43f.s3tc.ctex", "res://.godot/imported/star.svg-cd2a204af5c7598db5a70a08e6fab43f.etc2.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=2.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/styles/text.tres b/app/assets/styles/text.tres index 0129f8b..dd2fd9a 100644 --- a/app/assets/styles/text.tres +++ b/app/assets/styles/text.tres @@ -4,5 +4,5 @@ [resource] font = ExtResource("1_lfwid") -font_size = 14 +font_size = 15 font_color = Color(0.831373, 0.831373, 0.831373, 1) diff --git a/app/assets/textures/Reload.svg b/app/assets/textures/Reload.svg deleted file mode 100644 index 5a33b6b..0000000 --- a/app/assets/textures/Reload.svg +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/assets/textures/Reload.svg.import b/app/assets/textures/Reload.svg.import deleted file mode 100644 index 403d4e5..0000000 --- a/app/assets/textures/Reload.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://8wvea7j0v0rx" -path="res://.godot/imported/Reload.svg-b5541461986b6f83943237d5c0533a5e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/textures/Reload.svg" -dest_files=["res://.godot/imported/Reload.svg-b5541461986b6f83943237d5c0533a5e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=5.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/arrow-left.svg b/app/assets/textures/arrow-left.svg similarity index 100% rename from app/assets/new_textures/arrow-left.svg rename to app/assets/textures/arrow-left.svg diff --git a/app/assets/new_textures/arrow-left.svg.import b/app/assets/textures/arrow-left.svg.import similarity index 62% rename from app/assets/new_textures/arrow-left.svg.import rename to app/assets/textures/arrow-left.svg.import index 9913d17..148bf8a 100644 --- a/app/assets/new_textures/arrow-left.svg.import +++ b/app/assets/textures/arrow-left.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://c4dxov80fjvaq" -path.s3tc="res://.godot/imported/arrow-left.svg-ec7ffec9a23e7e531fec72a04db83a5c.s3tc.ctex" -path.etc2="res://.godot/imported/arrow-left.svg-ec7ffec9a23e7e531fec72a04db83a5c.etc2.ctex" +path.s3tc="res://.godot/imported/arrow-left.svg-e09e97557315f22f98ac515f27eb476f.s3tc.ctex" +path.etc2="res://.godot/imported/arrow-left.svg-e09e97557315f22f98ac515f27eb476f.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/arrow-left.svg" -dest_files=["res://.godot/imported/arrow-left.svg-ec7ffec9a23e7e531fec72a04db83a5c.s3tc.ctex", "res://.godot/imported/arrow-left.svg-ec7ffec9a23e7e531fec72a04db83a5c.etc2.ctex"] +source_file="res://assets/textures/arrow-left.svg" +dest_files=["res://.godot/imported/arrow-left.svg-e09e97557315f22f98ac515f27eb476f.s3tc.ctex", "res://.godot/imported/arrow-left.svg-e09e97557315f22f98ac515f27eb476f.etc2.ctex"] [params] diff --git a/app/assets/new_textures/arrow-right.svg b/app/assets/textures/arrow-right.svg similarity index 100% rename from app/assets/new_textures/arrow-right.svg rename to app/assets/textures/arrow-right.svg diff --git a/app/assets/new_textures/arrow-right.svg.import b/app/assets/textures/arrow-right.svg.import similarity index 62% rename from app/assets/new_textures/arrow-right.svg.import rename to app/assets/textures/arrow-right.svg.import index fdeb732..f8d1ffc 100644 --- a/app/assets/new_textures/arrow-right.svg.import +++ b/app/assets/textures/arrow-right.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bo1pkhkdscf6v" -path.s3tc="res://.godot/imported/arrow-right.svg-3933a822bf7a3f5cf855cc96699d0030.s3tc.ctex" -path.etc2="res://.godot/imported/arrow-right.svg-3933a822bf7a3f5cf855cc96699d0030.etc2.ctex" +path.s3tc="res://.godot/imported/arrow-right.svg-4ad5148b07e26c82e77e4e1faad77fe5.s3tc.ctex" +path.etc2="res://.godot/imported/arrow-right.svg-4ad5148b07e26c82e77e4e1faad77fe5.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/arrow-right.svg" -dest_files=["res://.godot/imported/arrow-right.svg-3933a822bf7a3f5cf855cc96699d0030.s3tc.ctex", "res://.godot/imported/arrow-right.svg-3933a822bf7a3f5cf855cc96699d0030.etc2.ctex"] +source_file="res://assets/textures/arrow-right.svg" +dest_files=["res://.godot/imported/arrow-right.svg-4ad5148b07e26c82e77e4e1faad77fe5.s3tc.ctex", "res://.godot/imported/arrow-right.svg-4ad5148b07e26c82e77e4e1faad77fe5.etc2.ctex"] [params] diff --git a/app/assets/textures/arrow.svg b/app/assets/textures/arrow.svg deleted file mode 100644 index 9000ee3..0000000 --- a/app/assets/textures/arrow.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/assets/textures/arrow.svg.import b/app/assets/textures/arrow.svg.import deleted file mode 100644 index 21cf1bd..0000000 --- a/app/assets/textures/arrow.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://byvigfpu44dnu" -path="res://.godot/imported/arrow.svg-96514f4c69ac07b2d55a84372671b571.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/textures/arrow.svg" -dest_files=["res://.godot/imported/arrow.svg-96514f4c69ac07b2d55a84372671b571.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=5.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/textures/background.png.import b/app/assets/textures/background.png.import index 190882b..cf826d8 100644 --- a/app/assets/textures/background.png.import +++ b/app/assets/textures/background.png.import @@ -15,14 +15,14 @@ dest_files=["res://.godot/imported/background.png-db55ec47224fbca7de3496d6823058 [params] -compress/mode=0 -compress/high_quality=false +compress/mode=3 +compress/high_quality=true compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true -mipmaps/limit=-1 +mipmaps/limit=6 roughness/mode=0 roughness/src_normal="" process/fix_alpha_border=true diff --git a/app/assets/new_textures/close-tab.svg b/app/assets/textures/close-tab.svg similarity index 100% rename from app/assets/new_textures/close-tab.svg rename to app/assets/textures/close-tab.svg diff --git a/app/assets/new_textures/close-tab.svg.import b/app/assets/textures/close-tab.svg.import similarity index 62% rename from app/assets/new_textures/close-tab.svg.import rename to app/assets/textures/close-tab.svg.import index f3860ef..2f0058d 100644 --- a/app/assets/new_textures/close-tab.svg.import +++ b/app/assets/textures/close-tab.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://cli88m5w3op6l" -path.s3tc="res://.godot/imported/close-tab.svg-081e0c7b6a2589a52623872d7ed88949.s3tc.ctex" -path.etc2="res://.godot/imported/close-tab.svg-081e0c7b6a2589a52623872d7ed88949.etc2.ctex" +path.s3tc="res://.godot/imported/close-tab.svg-516e7099d42ee02293c9bbb925a39767.s3tc.ctex" +path.etc2="res://.godot/imported/close-tab.svg-516e7099d42ee02293c9bbb925a39767.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/close-tab.svg" -dest_files=["res://.godot/imported/close-tab.svg-081e0c7b6a2589a52623872d7ed88949.s3tc.ctex", "res://.godot/imported/close-tab.svg-081e0c7b6a2589a52623872d7ed88949.etc2.ctex"] +source_file="res://assets/textures/close-tab.svg" +dest_files=["res://.godot/imported/close-tab.svg-516e7099d42ee02293c9bbb925a39767.s3tc.ctex", "res://.godot/imported/close-tab.svg-516e7099d42ee02293c9bbb925a39767.etc2.ctex"] [params] diff --git a/app/assets/new_textures/close.svg b/app/assets/textures/close.svg similarity index 100% rename from app/assets/new_textures/close.svg rename to app/assets/textures/close.svg diff --git a/app/assets/new_textures/close.svg.import b/app/assets/textures/close.svg.import similarity index 64% rename from app/assets/new_textures/close.svg.import rename to app/assets/textures/close.svg.import index a01103e..dd974b6 100644 --- a/app/assets/new_textures/close.svg.import +++ b/app/assets/textures/close.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bevejhgdw7mey" -path.s3tc="res://.godot/imported/close.svg-09a5670b0b96b24cacc6a368b5b7116d.s3tc.ctex" -path.etc2="res://.godot/imported/close.svg-09a5670b0b96b24cacc6a368b5b7116d.etc2.ctex" +path.s3tc="res://.godot/imported/close.svg-2bbf7d638476fa1634995c035148cdeb.s3tc.ctex" +path.etc2="res://.godot/imported/close.svg-2bbf7d638476fa1634995c035148cdeb.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/close.svg" -dest_files=["res://.godot/imported/close.svg-09a5670b0b96b24cacc6a368b5b7116d.s3tc.ctex", "res://.godot/imported/close.svg-09a5670b0b96b24cacc6a368b5b7116d.etc2.ctex"] +source_file="res://assets/textures/close.svg" +dest_files=["res://.godot/imported/close.svg-2bbf7d638476fa1634995c035148cdeb.s3tc.ctex", "res://.godot/imported/close.svg-2bbf7d638476fa1634995c035148cdeb.etc2.ctex"] [params] diff --git a/app/assets/textures/exit.svg b/app/assets/textures/exit.svg deleted file mode 100644 index 8f6b5a2..0000000 --- a/app/assets/textures/exit.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/assets/textures/exit.svg.import b/app/assets/textures/exit.svg.import deleted file mode 100644 index a06e039..0000000 --- a/app/assets/textures/exit.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dystd8vvbqwo2" -path="res://.godot/imported/exit.svg-d9eb6c22208dcb72b1740164ae580603.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/textures/exit.svg" -dest_files=["res://.godot/imported/exit.svg-d9eb6c22208dcb72b1740164ae580603.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=7.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/textures/gate.svg b/app/assets/textures/gate.svg index efd0459..32da17c 100644 --- a/app/assets/textures/gate.svg +++ b/app/assets/textures/gate.svg @@ -2,59 +2,21 @@ - + style="display:inline;fill:none;stroke:#ffffff;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:40.2195;stroke-opacity:1" + d="m 10.784163,59.8 c 0,0 0,-27.947178 0,-32.369232 C 10.784163,23.00872 12.209211,7.2 29.736165,7.2 47.337671,7.2 48.688163,23.00535 48.688163,27.430768 V 59.8" + id="path1246" /> diff --git a/app/assets/textures/gate.svg.import b/app/assets/textures/gate.svg.import index 5519d9d..3918af8 100644 --- a/app/assets/textures/gate.svg.import +++ b/app/assets/textures/gate.svg.import @@ -3,19 +3,21 @@ importer="texture" type="CompressedTexture2D" uid="uid://cx3xxaqo3s3eq" -path="res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.ctex" +path.s3tc="res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.s3tc.ctex" +path.etc2="res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/textures/gate.svg" -dest_files=["res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.ctex"] +dest_files=["res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.s3tc.ctex", "res://.godot/imported/gate.svg-b8b56b580c46301f31585d4c8a52c812.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 +svg/scale=2.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/help.svg b/app/assets/textures/help.svg similarity index 100% rename from app/assets/new_textures/help.svg rename to app/assets/textures/help.svg diff --git a/app/assets/new_textures/help.svg.import b/app/assets/textures/help.svg.import similarity index 64% rename from app/assets/new_textures/help.svg.import rename to app/assets/textures/help.svg.import index e1baa45..710a231 100644 --- a/app/assets/new_textures/help.svg.import +++ b/app/assets/textures/help.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://dy5lmm2egk4w1" -path.s3tc="res://.godot/imported/help.svg-a1330b4d6a176079d8d31b3e339b5805.s3tc.ctex" -path.etc2="res://.godot/imported/help.svg-a1330b4d6a176079d8d31b3e339b5805.etc2.ctex" +path.s3tc="res://.godot/imported/help.svg-5d318400ba147d34234c00bf256aa56a.s3tc.ctex" +path.etc2="res://.godot/imported/help.svg-5d318400ba147d34234c00bf256aa56a.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/help.svg" -dest_files=["res://.godot/imported/help.svg-a1330b4d6a176079d8d31b3e339b5805.s3tc.ctex", "res://.godot/imported/help.svg-a1330b4d6a176079d8d31b3e339b5805.etc2.ctex"] +source_file="res://assets/textures/help.svg" +dest_files=["res://.godot/imported/help.svg-5d318400ba147d34234c00bf256aa56a.s3tc.ctex", "res://.godot/imported/help.svg-5d318400ba147d34234c00bf256aa56a.etc2.ctex"] [params] diff --git a/app/assets/textures/home.svg b/app/assets/textures/home.svg index ba7477a..b9deddc 100644 --- a/app/assets/textures/home.svg +++ b/app/assets/textures/home.svg @@ -2,44 +2,22 @@ + xmlns:svg="http://www.w3.org/2000/svg"> + + + + + diff --git a/app/assets/textures/home.svg.import b/app/assets/textures/home.svg.import index 10cbebb..43f5792 100644 --- a/app/assets/textures/home.svg.import +++ b/app/assets/textures/home.svg.import @@ -2,20 +2,22 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bmju020v33vrv" -path="res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.ctex" +uid="uid://mgtj316adcja" +path.s3tc="res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.s3tc.ctex" +path.etc2="res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/textures/home.svg" -dest_files=["res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.ctex"] +dest_files=["res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.s3tc.ctex", "res://.godot/imported/home.svg-7020e35469bd96bdbace0b1620fa75bf.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 +svg/scale=2.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/icon-round.svg b/app/assets/textures/icon-round.svg similarity index 100% rename from app/assets/new_textures/icon-round.svg rename to app/assets/textures/icon-round.svg diff --git a/app/assets/new_textures/icon-round.svg.import b/app/assets/textures/icon-round.svg.import similarity index 62% rename from app/assets/new_textures/icon-round.svg.import rename to app/assets/textures/icon-round.svg.import index 3aa6b05..abd4803 100644 --- a/app/assets/new_textures/icon-round.svg.import +++ b/app/assets/textures/icon-round.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bw1cffhlt112i" -path.bptc="res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.bptc.ctex" -path.astc="res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.astc.ctex" +path.bptc="res://.godot/imported/icon-round.svg-960dde2a3cd6f3751096cc6c33335de2.bptc.ctex" +path.astc="res://.godot/imported/icon-round.svg-960dde2a3cd6f3751096cc6c33335de2.astc.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/icon-round.svg" -dest_files=["res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.bptc.ctex", "res://.godot/imported/icon-round.svg-14ecefe0ad7176f64ce7c5eb12e7883d.astc.ctex"] +source_file="res://assets/textures/icon-round.svg" +dest_files=["res://.godot/imported/icon-round.svg-960dde2a3cd6f3751096cc6c33335de2.bptc.ctex", "res://.godot/imported/icon-round.svg-960dde2a3cd6f3751096cc6c33335de2.astc.ctex"] [params] diff --git a/app/assets/new_textures/maximaze.svg b/app/assets/textures/maximaze.svg similarity index 100% rename from app/assets/new_textures/maximaze.svg rename to app/assets/textures/maximaze.svg diff --git a/app/assets/new_textures/maximaze.svg.import b/app/assets/textures/maximaze.svg.import similarity index 63% rename from app/assets/new_textures/maximaze.svg.import rename to app/assets/textures/maximaze.svg.import index 38846cb..dea58f2 100644 --- a/app/assets/new_textures/maximaze.svg.import +++ b/app/assets/textures/maximaze.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://csjqc48oqb0kc" -path.s3tc="res://.godot/imported/maximaze.svg-829cd6f33cf65ae215e9c6dff80ba14f.s3tc.ctex" -path.etc2="res://.godot/imported/maximaze.svg-829cd6f33cf65ae215e9c6dff80ba14f.etc2.ctex" +path.s3tc="res://.godot/imported/maximaze.svg-1abee8513fb0a5381e9c922be2a32ac6.s3tc.ctex" +path.etc2="res://.godot/imported/maximaze.svg-1abee8513fb0a5381e9c922be2a32ac6.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/maximaze.svg" -dest_files=["res://.godot/imported/maximaze.svg-829cd6f33cf65ae215e9c6dff80ba14f.s3tc.ctex", "res://.godot/imported/maximaze.svg-829cd6f33cf65ae215e9c6dff80ba14f.etc2.ctex"] +source_file="res://assets/textures/maximaze.svg" +dest_files=["res://.godot/imported/maximaze.svg-1abee8513fb0a5381e9c922be2a32ac6.s3tc.ctex", "res://.godot/imported/maximaze.svg-1abee8513fb0a5381e9c922be2a32ac6.etc2.ctex"] [params] diff --git a/app/assets/new_textures/menu.svg b/app/assets/textures/menu.svg similarity index 100% rename from app/assets/new_textures/menu.svg rename to app/assets/textures/menu.svg diff --git a/app/assets/new_textures/menu.svg.import b/app/assets/textures/menu.svg.import similarity index 64% rename from app/assets/new_textures/menu.svg.import rename to app/assets/textures/menu.svg.import index a579211..0869ccd 100644 --- a/app/assets/new_textures/menu.svg.import +++ b/app/assets/textures/menu.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://yn1l3ybpr7qv" -path.s3tc="res://.godot/imported/menu.svg-6cefa8073d7f17b6fe1a01334d816602.s3tc.ctex" -path.etc2="res://.godot/imported/menu.svg-6cefa8073d7f17b6fe1a01334d816602.etc2.ctex" +path.s3tc="res://.godot/imported/menu.svg-c73b5f81f5b5e8b51e5be4983b436a57.s3tc.ctex" +path.etc2="res://.godot/imported/menu.svg-c73b5f81f5b5e8b51e5be4983b436a57.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/menu.svg" -dest_files=["res://.godot/imported/menu.svg-6cefa8073d7f17b6fe1a01334d816602.s3tc.ctex", "res://.godot/imported/menu.svg-6cefa8073d7f17b6fe1a01334d816602.etc2.ctex"] +source_file="res://assets/textures/menu.svg" +dest_files=["res://.godot/imported/menu.svg-c73b5f81f5b5e8b51e5be4983b436a57.s3tc.ctex", "res://.godot/imported/menu.svg-c73b5f81f5b5e8b51e5be4983b436a57.etc2.ctex"] [params] diff --git a/app/assets/textures/minimize.svg b/app/assets/textures/minimize.svg index d3fb980..c7ee7e4 100644 --- a/app/assets/textures/minimize.svg +++ b/app/assets/textures/minimize.svg @@ -1,39 +1,23 @@ + + - - + id="defs1" /> + + + diff --git a/app/assets/textures/minimize.svg.import b/app/assets/textures/minimize.svg.import index 5398e77..e61e51d 100644 --- a/app/assets/textures/minimize.svg.import +++ b/app/assets/textures/minimize.svg.import @@ -2,20 +2,22 @@ importer="texture" type="CompressedTexture2D" -uid="uid://ba0x5hoq2ihbh" -path="res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.ctex" +uid="uid://d1ehc1xs5hwyn" +path.s3tc="res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.s3tc.ctex" +path.etc2="res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/textures/minimize.svg" -dest_files=["res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.ctex"] +dest_files=["res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.s3tc.ctex", "res://.godot/imported/minimize.svg-da0875c5f49c7e85702b1ddd89b760c9.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=7.0 +svg/scale=2.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/plus.svg b/app/assets/textures/plus.svg similarity index 100% rename from app/assets/new_textures/plus.svg rename to app/assets/textures/plus.svg diff --git a/app/assets/new_textures/plus.svg.import b/app/assets/textures/plus.svg.import similarity index 64% rename from app/assets/new_textures/plus.svg.import rename to app/assets/textures/plus.svg.import index e3223db..867e17f 100644 --- a/app/assets/new_textures/plus.svg.import +++ b/app/assets/textures/plus.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://c80732g67qmvx" -path.s3tc="res://.godot/imported/plus.svg-84def2db8674e2257a4f00e5946ff6f1.s3tc.ctex" -path.etc2="res://.godot/imported/plus.svg-84def2db8674e2257a4f00e5946ff6f1.etc2.ctex" +path.s3tc="res://.godot/imported/plus.svg-1e729e0158e3f0f3340726d96bd7fa20.s3tc.ctex" +path.etc2="res://.godot/imported/plus.svg-1e729e0158e3f0f3340726d96bd7fa20.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/plus.svg" -dest_files=["res://.godot/imported/plus.svg-84def2db8674e2257a4f00e5946ff6f1.s3tc.ctex", "res://.godot/imported/plus.svg-84def2db8674e2257a4f00e5946ff6f1.etc2.ctex"] +source_file="res://assets/textures/plus.svg" +dest_files=["res://.godot/imported/plus.svg-1e729e0158e3f0f3340726d96bd7fa20.s3tc.ctex", "res://.godot/imported/plus.svg-1e729e0158e3f0f3340726d96bd7fa20.etc2.ctex"] [params] diff --git a/app/assets/new_textures/reload.svg b/app/assets/textures/reload.svg similarity index 100% rename from app/assets/new_textures/reload.svg rename to app/assets/textures/reload.svg diff --git a/app/assets/new_textures/reload.svg.import b/app/assets/textures/reload.svg.import similarity index 63% rename from app/assets/new_textures/reload.svg.import rename to app/assets/textures/reload.svg.import index 73ee1c5..acdccbb 100644 --- a/app/assets/new_textures/reload.svg.import +++ b/app/assets/textures/reload.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://dapysvexbecnd" -path.s3tc="res://.godot/imported/reload.svg-2fb9f77ab544444ab75e850c1447705d.s3tc.ctex" -path.etc2="res://.godot/imported/reload.svg-2fb9f77ab544444ab75e850c1447705d.etc2.ctex" +path.s3tc="res://.godot/imported/reload.svg-49e4e4e7f844f8800574945a0b3ed387.s3tc.ctex" +path.etc2="res://.godot/imported/reload.svg-49e4e4e7f844f8800574945a0b3ed387.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/reload.svg" -dest_files=["res://.godot/imported/reload.svg-2fb9f77ab544444ab75e850c1447705d.s3tc.ctex", "res://.godot/imported/reload.svg-2fb9f77ab544444ab75e850c1447705d.etc2.ctex"] +source_file="res://assets/textures/reload.svg" +dest_files=["res://.godot/imported/reload.svg-49e4e4e7f844f8800574945a0b3ed387.s3tc.ctex", "res://.godot/imported/reload.svg-49e4e4e7f844f8800574945a0b3ed387.etc2.ctex"] [params] diff --git a/app/assets/new_textures/search-96.svg b/app/assets/textures/search-96.svg similarity index 100% rename from app/assets/new_textures/search-96.svg rename to app/assets/textures/search-96.svg diff --git a/app/assets/new_textures/search-96.svg.import b/app/assets/textures/search-96.svg.import similarity index 62% rename from app/assets/new_textures/search-96.svg.import rename to app/assets/textures/search-96.svg.import index a6bc5b9..c91bfeb 100644 --- a/app/assets/new_textures/search-96.svg.import +++ b/app/assets/textures/search-96.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://ckkmluvnrorek" -path.s3tc="res://.godot/imported/search-96.svg-178abc1b1873745ef5ffe0806b7583ea.s3tc.ctex" -path.etc2="res://.godot/imported/search-96.svg-178abc1b1873745ef5ffe0806b7583ea.etc2.ctex" +path.s3tc="res://.godot/imported/search-96.svg-5f88151b43aebc072005e9200afb56b2.s3tc.ctex" +path.etc2="res://.godot/imported/search-96.svg-5f88151b43aebc072005e9200afb56b2.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/search-96.svg" -dest_files=["res://.godot/imported/search-96.svg-178abc1b1873745ef5ffe0806b7583ea.s3tc.ctex", "res://.godot/imported/search-96.svg-178abc1b1873745ef5ffe0806b7583ea.etc2.ctex"] +source_file="res://assets/textures/search-96.svg" +dest_files=["res://.godot/imported/search-96.svg-5f88151b43aebc072005e9200afb56b2.s3tc.ctex", "res://.godot/imported/search-96.svg-5f88151b43aebc072005e9200afb56b2.etc2.ctex"] [params] diff --git a/app/assets/textures/search.svg b/app/assets/textures/search.svg index 68e2b7b..eba6fbf 100644 --- a/app/assets/textures/search.svg +++ b/app/assets/textures/search.svg @@ -1,61 +1,29 @@ + + - + id="defs1" /> - - - + id="g1" + transform="matrix(0.88571432,0,0,0.88571432,3.657142,3.657142)" + style="stroke-width:1.12903"> + + diff --git a/app/assets/textures/search.svg.import b/app/assets/textures/search.svg.import index 49affcb..09b3789 100644 --- a/app/assets/textures/search.svg.import +++ b/app/assets/textures/search.svg.import @@ -2,20 +2,22 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c28surtqjf4st" -path="res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.ctex" +uid="uid://byrcelmfy6r3l" +path.s3tc="res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.s3tc.ctex" +path.etc2="res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/textures/search.svg" -dest_files=["res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.ctex"] +dest_files=["res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.s3tc.ctex", "res://.godot/imported/search.svg-e1c1dd5f4f7968f8ab58b74915019629.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 +svg/scale=2.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/star-color.svg b/app/assets/textures/star-color.svg similarity index 100% rename from app/assets/new_textures/star-color.svg rename to app/assets/textures/star-color.svg diff --git a/app/assets/new_textures/star-color.svg.import b/app/assets/textures/star-color.svg.import similarity index 60% rename from app/assets/new_textures/star-color.svg.import rename to app/assets/textures/star-color.svg.import index 65e062c..dbe749c 100644 --- a/app/assets/new_textures/star-color.svg.import +++ b/app/assets/textures/star-color.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://itloduvrh00o" -path.s3tc="res://.godot/imported/star-color.svg-dfde8e1f9218594b0bba75b1098fc6ad.s3tc.ctex" -path.etc2="res://.godot/imported/star-color.svg-dfde8e1f9218594b0bba75b1098fc6ad.etc2.ctex" +path.s3tc="res://.godot/imported/star-color.svg-953ce029d419abf92f2c067ac0ea9908.s3tc.ctex" +path.etc2="res://.godot/imported/star-color.svg-953ce029d419abf92f2c067ac0ea9908.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/star-color.svg" -dest_files=["res://.godot/imported/star-color.svg-dfde8e1f9218594b0bba75b1098fc6ad.s3tc.ctex", "res://.godot/imported/star-color.svg-dfde8e1f9218594b0bba75b1098fc6ad.etc2.ctex"] +source_file="res://assets/textures/star-color.svg" +dest_files=["res://.godot/imported/star-color.svg-953ce029d419abf92f2c067ac0ea9908.s3tc.ctex", "res://.godot/imported/star-color.svg-953ce029d419abf92f2c067ac0ea9908.etc2.ctex"] [params] @@ -28,7 +28,7 @@ mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" process/fix_alpha_border=true -process/premult_alpha=false +process/premult_alpha=true process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false diff --git a/app/assets/textures/star.svg b/app/assets/textures/star.svg index 912fa79..34f2288 100644 --- a/app/assets/textures/star.svg +++ b/app/assets/textures/star.svg @@ -3,39 +3,20 @@ - - + id="defs1" /> + + + diff --git a/app/assets/textures/star.svg.import b/app/assets/textures/star.svg.import index 2e35dde..d135bf4 100644 --- a/app/assets/textures/star.svg.import +++ b/app/assets/textures/star.svg.import @@ -2,20 +2,22 @@ importer="texture" type="CompressedTexture2D" -uid="uid://btn6ytky782a2" -path="res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.ctex" +uid="uid://c7ljriip50hte" +path.s3tc="res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.s3tc.ctex" +path.etc2="res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.etc2.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc", "etc2_astc"], +"vram_texture": true } [deps] source_file="res://assets/textures/star.svg" -dest_files=["res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.ctex"] +dest_files=["res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.s3tc.ctex", "res://.godot/imported/star.svg-8291fc775f0fdf63f866e08da04fee34.etc2.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 @@ -32,6 +34,6 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=5.0 +svg/scale=2.0 editor/scale_with_editor_scale=false editor/convert_colors_with_editor_theme=false diff --git a/app/assets/textures/star_filled.svg b/app/assets/textures/star_filled.svg deleted file mode 100644 index 5ebf76e..0000000 --- a/app/assets/textures/star_filled.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - diff --git a/app/assets/textures/star_filled.svg.import b/app/assets/textures/star_filled.svg.import deleted file mode 100644 index 3516aae..0000000 --- a/app/assets/textures/star_filled.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://lxx36xkotvh1" -path="res://.godot/imported/star_filled.svg-9715ef8a800e58d18abf5d987bd427ca.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/textures/star_filled.svg" -dest_files=["res://.godot/imported/star_filled.svg-9715ef8a800e58d18abf5d987bd427ca.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=5.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/app/assets/new_textures/starred.svg b/app/assets/textures/starred.svg similarity index 100% rename from app/assets/new_textures/starred.svg rename to app/assets/textures/starred.svg diff --git a/app/assets/new_textures/starred.svg.import b/app/assets/textures/starred.svg.import similarity index 63% rename from app/assets/new_textures/starred.svg.import rename to app/assets/textures/starred.svg.import index 52820b7..367b7d1 100644 --- a/app/assets/new_textures/starred.svg.import +++ b/app/assets/textures/starred.svg.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://bal06qnhvdupj" -path.s3tc="res://.godot/imported/starred.svg-571da30ea8a2316e21c196850e14b0a5.s3tc.ctex" -path.etc2="res://.godot/imported/starred.svg-571da30ea8a2316e21c196850e14b0a5.etc2.ctex" +path.s3tc="res://.godot/imported/starred.svg-36a0f7cc2494fdef5752549b66f18b79.s3tc.ctex" +path.etc2="res://.godot/imported/starred.svg-36a0f7cc2494fdef5752549b66f18b79.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/new_textures/starred.svg" -dest_files=["res://.godot/imported/starred.svg-571da30ea8a2316e21c196850e14b0a5.s3tc.ctex", "res://.godot/imported/starred.svg-571da30ea8a2316e21c196850e14b0a5.etc2.ctex"] +source_file="res://assets/textures/starred.svg" +dest_files=["res://.godot/imported/starred.svg-36a0f7cc2494fdef5752549b66f18b79.s3tc.ctex", "res://.godot/imported/starred.svg-36a0f7cc2494fdef5752549b66f18b79.etc2.ctex"] [params] diff --git a/app/scenes/components/hint.tscn b/app/scenes/components/hint.tscn index ecfd92f..6c38183 100644 --- a/app/scenes/components/hint.tscn +++ b/app/scenes/components/hint.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=8 format=3 uid="uid://m622v03jydnq"] +[gd_scene load_steps=7 format=3 uid="uid://m622v03jydnq"] [ext_resource type="Script" path="res://scripts/ui/hint.gd" id="1_mhnl1"] -[ext_resource type="Texture2D" uid="uid://byvigfpu44dnu" path="res://assets/textures/arrow.svg" id="2_amrir"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7wdcy"] bg_color = Color(0.22, 0.22, 0.22, 0.631373) @@ -82,25 +81,6 @@ label_settings = SubResource("LabelSettings_8td41") horizontal_alignment = 1 vertical_alignment = 1 -[node name="TextureRect" type="TextureRect" parent="AnimRoot"] -modulate = Color(1, 1, 0, 1) -layout_mode = 1 -anchors_preset = 7 -anchor_left = 0.5 -anchor_top = 1.0 -anchor_right = 0.5 -anchor_bottom = 1.0 -offset_left = -16.0 -offset_top = -7.0 -offset_right = 16.0 -offset_bottom = 25.0 -grow_horizontal = 2 -grow_vertical = 0 -rotation = 1.5708 -pivot_offset = Vector2(16, 16) -texture = ExtResource("2_amrir") -expand_mode = 1 - [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_l0m26") diff --git a/app/scenes/components/prompt.tscn b/app/scenes/components/prompt.tscn index 25b208f..bcca784 100644 --- a/app/scenes/components/prompt.tscn +++ b/app/scenes/components/prompt.tscn @@ -1,46 +1,35 @@ -[gd_scene load_steps=7 format=3 uid="uid://b57n6cvtqn5b7"] +[gd_scene load_steps=8 format=3 uid="uid://b57n6cvtqn5b7"] [ext_resource type="Script" path="res://scripts/ui/search/prompt.gd" id="1_7xv44"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_33m26"] -[ext_resource type="Texture2D" uid="uid://c28surtqjf4st" path="res://assets/textures/search.svg" id="2_tk8hn"] - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wbjg7"] -bg_color = Color(0.25098, 0.25098, 0.25098, 0) -corner_radius_top_left = 6 -corner_radius_top_right = 6 -corner_radius_bottom_right = 6 -corner_radius_bottom_left = 6 +[ext_resource type="LabelSettings" uid="uid://bo2334w4lf3ug" path="res://assets/styles/text.tres" id="3_rbghg"] +[ext_resource type="Texture2D" uid="uid://byrcelmfy6r3l" path="res://assets/textures/search.svg" id="4_5kbr3"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_srt8r"] -bg_color = Color(0, 0, 0, 0.25098) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color(0, 0, 0, 0) -border_blend = true -corner_radius_top_left = 6 -corner_radius_top_right = 6 -corner_radius_bottom_right = 6 -corner_radius_bottom_left = 6 -shadow_color = Color(0, 0, 0, 0) +bg_color = Color(0.172549, 0.184314, 0.239216, 1) +corner_radius_top_left = 15 +corner_radius_top_right = 15 +corner_radius_bottom_right = 15 +corner_radius_bottom_left = 15 + +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_l81vq"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_6fg0o"] content_margin_left = 40.0 [node name="prompt" type="Button" node_paths=PackedStringArray("prompt_text")] -custom_minimum_size = Vector2(0, 40) +custom_minimum_size = Vector2(0, 32) anchors_preset = 14 anchor_top = 0.5 anchor_right = 1.0 anchor_bottom = 0.5 offset_top = -20.0 -offset_bottom = 20.0 +offset_bottom = 12.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/normal = SubResource("StyleBoxFlat_wbjg7") theme_override_styles/hover = SubResource("StyleBoxFlat_srt8r") theme_override_styles/pressed = SubResource("StyleBoxFlat_srt8r") +theme_override_styles/normal = SubResource("StyleBoxEmpty_l81vq") script = ExtResource("1_7xv44") gate_events = ExtResource("2_33m26") prompt_text = NodePath("Label") @@ -53,14 +42,13 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_font_sizes/font_size = 20 theme_override_styles/normal = SubResource("StyleBoxEmpty_6fg0o") text = "prompt" +label_settings = ExtResource("3_rbghg") vertical_alignment = 1 text_overrun_behavior = 3 [node name="SearchStatus" type="Control" parent="."] -self_modulate = Color(1, 1, 1, 0.8) layout_mode = 1 anchors_preset = 4 anchor_top = 0.5 @@ -73,14 +61,14 @@ grow_vertical = 2 mouse_filter = 1 [node name="Search" type="TextureRect" parent="SearchStatus"] -self_modulate = Color(1, 1, 1, 0.8) +self_modulate = Color(0.831373, 0.831373, 0.831373, 1) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("2_tk8hn") +texture = ExtResource("4_5kbr3") expand_mode = 1 [connection signal="pressed" from="." to="." method="_on_button_pressed"] diff --git a/app/scenes/components/round_button.tscn b/app/scenes/components/round_button.tscn index 60134d5..4520f5d 100644 --- a/app/scenes/components/round_button.tscn +++ b/app/scenes/components/round_button.tscn @@ -2,7 +2,7 @@ [ext_resource type="StyleBox" uid="uid://b4j4kd2p3aypx" path="res://assets/styles/button.stylebox" id="1_6dhuv"] [ext_resource type="StyleBox" uid="uid://ck127amfs72dv" path="res://assets/styles/button_hover.stylebox" id="2_3cilb"] -[ext_resource type="Texture2D" uid="uid://bevejhgdw7mey" path="res://assets/new_textures/close.svg" id="3_t5vxw"] +[ext_resource type="Texture2D" uid="uid://bevejhgdw7mey" path="res://assets/textures/close.svg" id="3_t5vxw"] [ext_resource type="Script" path="res://scripts/ui/menu/round_button.gd" id="4_7t145"] [node name="RoundButton" type="Button"] diff --git a/app/scenes/components/search.tscn b/app/scenes/components/search.tscn index 33fe476..377e51e 100644 --- a/app/scenes/components/search.tscn +++ b/app/scenes/components/search.tscn @@ -1,34 +1,34 @@ -[gd_scene load_steps=22 format=3 uid="uid://ctam0fxigbefk"] +[gd_scene load_steps=20 format=3 uid="uid://ctam0fxigbefk"] [ext_resource type="Script" path="res://scripts/ui/search.gd" id="1_7ivk2"] [ext_resource type="FontFile" uid="uid://do40418waa8w3" path="res://assets/fonts/Inter-Regular.otf" id="1_cimak"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="2_13io8"] -[ext_resource type="Texture2D" uid="uid://c28surtqjf4st" path="res://assets/textures/search.svg" id="3_1rllf"] [ext_resource type="Script" path="res://scripts/ui/search/search_status.gd" id="3_3p1re"] -[ext_resource type="Script" path="res://scripts/ui/search_go.gd" id="3_eayvw"] -[ext_resource type="Texture2D" uid="uid://byvigfpu44dnu" path="res://assets/textures/arrow.svg" id="5_dqxpp"] +[ext_resource type="Texture2D" uid="uid://byrcelmfy6r3l" path="res://assets/textures/search.svg" id="5_553np"] [ext_resource type="Script" path="res://scripts/ui/search/download_animation.gd" id="6_fn1n3"] [ext_resource type="Script" path="res://scripts/ui/menu/star.gd" id="6_iyikx"] [ext_resource type="Texture2D" uid="uid://cx3xxaqo3s3eq" path="res://assets/textures/gate.svg" id="6_twd8p"] [ext_resource type="Resource" uid="uid://bewhdj6jugt6q" path="res://resources/bookmarks.tres" id="7_2mijb"] -[ext_resource type="Texture2D" uid="uid://dystd8vvbqwo2" path="res://assets/textures/exit.svg" id="7_jllve"] -[ext_resource type="Texture2D" uid="uid://btn6ytky782a2" path="res://assets/textures/star.svg" id="8_b00p6"] -[ext_resource type="Texture2D" uid="uid://lxx36xkotvh1" path="res://assets/textures/star_filled.svg" id="9_2en0l"] +[ext_resource type="Texture2D" uid="uid://cli88m5w3op6l" path="res://assets/textures/close-tab.svg" id="8_sk5cp"] +[ext_resource type="Texture2D" uid="uid://c7ljriip50hte" path="res://assets/textures/star.svg" id="13_ojxfq"] [ext_resource type="Script" path="res://scripts/ui/search/prompt_results.gd" id="14_0lofv"] +[ext_resource type="Texture2D" uid="uid://itloduvrh00o" path="res://assets/textures/star-color.svg" id="14_fpi5q"] [ext_resource type="Script" path="res://scripts/ui/search/prompt_navigation.gd" id="14_h86vl"] [ext_resource type="Script" path="res://scripts/ui/search/fix_promt_position.gd" id="15_35wcy"] [ext_resource type="Resource" uid="uid://cjcdum6fm4ta0" path="res://resources/api_settings.tres" id="15_uafyh"] [ext_resource type="PackedScene" uid="uid://b57n6cvtqn5b7" path="res://scenes/components/prompt.tscn" id="16_lbcsd"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hyysn"] -content_margin_left = 40.0 -content_margin_right = 40.0 +content_margin_left = 32.0 +content_margin_top = 3.0 +content_margin_right = 30.0 bg_color = Color(0.0862745, 0.0901961, 0.117647, 1) border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 border_color = Color(0.0823529, 0.0823529, 0.105882, 1) +border_blend = true corner_radius_top_left = 15 corner_radius_top_right = 15 corner_radius_bottom_right = 15 @@ -36,16 +36,17 @@ corner_radius_bottom_left = 15 corner_detail = 10 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mh73y"] -bg_color = Color(0.207843, 0.164706, 0.47451, 1) +bg_color = Color(0.0862745, 0.0901961, 0.117647, 1) border_width_left = 1 border_width_top = 1 border_width_right = 1 border_width_bottom = 1 -border_color = Color(0.176471, 0.14902, 0.352941, 1) -corner_radius_top_left = 6 -corner_radius_top_right = 6 -corner_radius_bottom_right = 6 -corner_radius_bottom_left = 6 +border_color = Color(0.0823529, 0.0823529, 0.105882, 1) +border_blend = true +corner_radius_top_left = 15 +corner_radius_top_right = 15 +corner_radius_bottom_right = 15 +corner_radius_bottom_left = 15 corner_detail = 10 [node name="Search" type="LineEdit" node_paths=PackedStringArray("prompt_panel")] @@ -65,23 +66,23 @@ focus_mode = 1 theme_override_colors/font_placeholder_color = Color(0.431373, 0.435294, 0.494118, 1) theme_override_colors/font_color = Color(0.831373, 0.831373, 0.831373, 1) theme_override_fonts/font = ExtResource("1_cimak") -theme_override_font_sizes/font_size = 14 +theme_override_font_sizes/font_size = 15 theme_override_styles/focus = SubResource("StyleBoxFlat_hyysn") theme_override_styles/normal = SubResource("StyleBoxFlat_hyysn") -placeholder_text = "Search or enter address" +placeholder_text = "Search or type URL" script = ExtResource("1_7ivk2") gate_events = ExtResource("2_13io8") prompt_panel = NodePath("Prompt/Panel") [node name="SearchStatus" type="Control" parent="." node_paths=PackedStringArray("search_line_edit", "search", "downloading", "success", "error")] -self_modulate = Color(0.831373, 0.831373, 0.831373, 1) +modulate = Color(0.431373, 0.435294, 0.494118, 1) layout_mode = 1 anchors_preset = 4 anchor_top = 0.5 anchor_bottom = 0.5 -offset_left = 12.0 +offset_left = 10.0 offset_top = -8.0 -offset_right = 28.0 +offset_right = 26.0 offset_bottom = 8.0 grow_vertical = 2 mouse_filter = 1 @@ -92,21 +93,21 @@ search = NodePath("Search") downloading = NodePath("Downloading") success = NodePath("Success") error = NodePath("Error") +white = Color(0.831373, 0.831373, 0.831373, 1) +gray = Color(0.431373, 0.435294, 0.494118, 1) [node name="Search" type="TextureRect" parent="SearchStatus"] -self_modulate = Color(1, 1, 1, 0.8) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("3_1rllf") +texture = ExtResource("5_553np") expand_mode = 1 [node name="Downloading" type="TextureRect" parent="SearchStatus"] visible = false -self_modulate = Color(1, 1, 1, 0.8) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -117,13 +118,12 @@ pivot_offset = Vector2(8, 8) texture = ExtResource("6_twd8p") expand_mode = 1 script = ExtResource("6_fn1n3") +start_scale = 1.0 +end_scale = 0.5 duration = 0.5 -start_scale = 0.5 -end_scale = 1.0 [node name="Success" type="TextureRect" parent="SearchStatus"] visible = false -self_modulate = Color(1, 1, 1, 0.8) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -135,17 +135,35 @@ expand_mode = 1 [node name="Error" type="TextureRect" parent="SearchStatus"] visible = false -self_modulate = Color(1, 1, 1, 0.8) layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("7_jllve") +texture = ExtResource("8_sk5cp") expand_mode = 1 -[node name="Go" type="BaseButton" parent="."] +[node name="Bookmark" type="Control" parent="." node_paths=PackedStringArray("star", "unstar")] +layout_mode = 1 +anchors_preset = 6 +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +offset_left = -28.0 +offset_top = -10.0 +offset_right = -8.0 +offset_bottom = 10.0 +grow_horizontal = 0 +grow_vertical = 2 +script = ExtResource("6_iyikx") +gate_events = ExtResource("2_13io8") +bookmarks = ExtResource("7_2mijb") +star = NodePath("Star") +unstar = NodePath("Unstar") + +[node name="Star" type="BaseButton" parent="Bookmark"] _import_path = NodePath("") unique_name_in_owner = false process_mode = 0 @@ -174,20 +192,20 @@ clip_contents = false custom_minimum_size = Vector2(0, 0) layout_direction = 0 layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 +anchors_preset = 15 +anchor_left = 0.0 +anchor_top = 0.0 anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -30.0 -offset_top = -10.0 -offset_right = -10.0 -offset_bottom = 10.0 -grow_horizontal = 0 +anchor_bottom = 1.0 +offset_left = 0.0 +offset_top = 0.0 +offset_right = 0.0 +offset_bottom = 0.0 +grow_horizontal = 2 grow_vertical = 2 rotation = 0.0 scale = Vector2(1, 1) -pivot_offset = Vector2(20, 20) +pivot_offset = Vector2(0, 0) size_flags_horizontal = 1 size_flags_vertical = 1 size_flags_stretch_ratio = 1.0 @@ -215,39 +233,20 @@ button_group = null shortcut = null shortcut_feedback = true shortcut_in_tooltip = true -script = ExtResource("3_eayvw") -gate_events = ExtResource("2_13io8") +script = null -[node name="TextureRect" type="TextureRect" parent="Go"] -self_modulate = Color(1, 1, 1, 0.8) -layout_mode = 0 +[node name="TextureRect" type="TextureRect" parent="Bookmark/Star"] +self_modulate = Color(0.831373, 0.831373, 0.831373, 1) +layout_mode = 1 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("5_dqxpp") +texture = ExtResource("13_ojxfq") expand_mode = 1 -[node name="Bookmark" type="Control" parent="." node_paths=PackedStringArray("star", "unstar")] -layout_mode = 1 -anchors_preset = 6 -anchor_left = 1.0 -anchor_top = 0.5 -anchor_right = 1.0 -anchor_bottom = 0.5 -offset_left = -30.0 -offset_top = -10.0 -offset_right = -10.0 -offset_bottom = 10.0 -grow_horizontal = 0 -grow_vertical = 2 -script = ExtResource("6_iyikx") -gate_events = ExtResource("2_13io8") -bookmarks = ExtResource("7_2mijb") -star = NodePath("Star") -unstar = NodePath("Unstar") - -[node name="Star" type="BaseButton" parent="Bookmark"] +[node name="Unstar" type="BaseButton" parent="Bookmark"] _import_path = NodePath("") unique_name_in_owner = false process_mode = 0 @@ -319,88 +318,6 @@ shortcut_feedback = true shortcut_in_tooltip = true script = null -[node name="TextureRect" type="TextureRect" parent="Bookmark/Star"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -texture = ExtResource("8_b00p6") -expand_mode = 1 - -[node name="Unstar" type="BaseButton" parent="Bookmark"] -_import_path = NodePath("") -unique_name_in_owner = false -process_mode = 0 -process_priority = 0 -process_physics_priority = 0 -process_thread_group = 0 -physics_interpolation_mode = 2 -auto_translate_mode = 1 -editor_description = "" -visible = false -modulate = Color(1, 1, 1, 1) -self_modulate = Color(1, 1, 1, 1) -show_behind_parent = false -top_level = false -clip_children = 0 -light_mask = 1 -visibility_layer = 1 -z_index = 0 -z_as_relative = true -y_sort_enabled = false -texture_filter = 0 -texture_repeat = 0 -material = null -use_parent_material = false -clip_contents = false -custom_minimum_size = Vector2(0, 0) -layout_direction = 0 -layout_mode = 1 -anchors_preset = 15 -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 0.0 -offset_bottom = 0.0 -grow_horizontal = 2 -grow_vertical = 2 -rotation = 0.0 -scale = Vector2(1, 1) -pivot_offset = Vector2(0, 0) -size_flags_horizontal = 1 -size_flags_vertical = 1 -size_flags_stretch_ratio = 1.0 -localize_numeral_system = true -tooltip_text = "" -focus_neighbor_left = NodePath("") -focus_neighbor_top = NodePath("") -focus_neighbor_right = NodePath("") -focus_neighbor_bottom = NodePath("") -focus_next = NodePath("") -focus_previous = NodePath("") -focus_mode = 2 -mouse_filter = 0 -mouse_force_pass_scroll_events = true -mouse_default_cursor_shape = 2 -theme = null -theme_type_variation = &"" -disabled = false -toggle_mode = false -button_pressed = false -action_mode = 1 -button_mask = 1 -keep_pressed_outside = false -button_group = null -shortcut = null -shortcut_feedback = true -shortcut_in_tooltip = true -script = null - [node name="TextureRect" type="TextureRect" parent="Bookmark/Unstar"] layout_mode = 1 anchors_preset = 15 @@ -408,7 +325,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("9_2en0l") +texture = ExtResource("14_fpi5q") expand_mode = 1 [node name="Prompt" type="Control" parent="." node_paths=PackedStringArray("search", "prompt_results")] @@ -421,8 +338,7 @@ script = ExtResource("14_h86vl") search = NodePath("..") prompt_results = NodePath("Panel/VBoxContainer") -[node name="Panel" type="Panel" parent="Prompt"] -visible = false +[node name="Panel" type="Panel" parent="Prompt" node_paths=PackedStringArray("search_le")] top_level = true layout_mode = 1 anchors_preset = 5 @@ -435,6 +351,7 @@ offset_bottom = 860.0 grow_horizontal = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_mh73y") script = ExtResource("15_35wcy") +search_le = NodePath("../..") [node name="VBoxContainer" type="VBoxContainer" parent="Prompt/Panel" node_paths=PackedStringArray("panel")] layout_mode = 1 @@ -450,9 +367,7 @@ api = ExtResource("15_uafyh") result_scene = ExtResource("16_lbcsd") panel = NodePath("..") -[connection signal="text_changed" from="." to="Go" method="_on_search_text_changed"] [connection signal="text_changed" from="." to="Prompt/Panel/VBoxContainer" method="_on_search_text_changed"] [connection signal="text_submitted" from="." to="." method="_on_text_submitted"] -[connection signal="pressed" from="Go" to="." method="_on_go_pressed"] [connection signal="pressed" from="Bookmark/Star" to="Bookmark" method="_on_star_pressed"] [connection signal="pressed" from="Bookmark/Unstar" to="Bookmark" method="_on_unstar_pressed"] diff --git a/app/scenes/components/tab.tscn b/app/scenes/components/tab.tscn index e39f533..9d5cce8 100644 --- a/app/scenes/components/tab.tscn +++ b/app/scenes/components/tab.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=9 format=3 uid="uid://dkfy3rcfbxqc6"] [ext_resource type="StyleBox" uid="uid://cf4jgdfsjmjxl" path="res://assets/styles/tab.stylebox" id="1_8hbf0"] -[ext_resource type="Texture2D" uid="uid://bw1cffhlt112i" path="res://assets/new_textures/icon-round.svg" id="1_jc4ra"] +[ext_resource type="Texture2D" uid="uid://bw1cffhlt112i" path="res://assets/textures/icon-round.svg" id="1_jc4ra"] [ext_resource type="LabelSettings" uid="uid://bo2334w4lf3ug" path="res://assets/styles/text.tres" id="2_gll4d"] -[ext_resource type="Texture2D" uid="uid://cli88m5w3op6l" path="res://assets/new_textures/close-tab.svg" id="2_y6odh"] +[ext_resource type="Texture2D" uid="uid://cli88m5w3op6l" path="res://assets/textures/close-tab.svg" id="2_y6odh"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_33kce"] corner_radius_top_left = 10 @@ -49,7 +49,7 @@ theme_override_constants/margin_right = 10 [node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"] layout_mode = 2 -theme_override_constants/separation = 6 +theme_override_constants/separation = 7 [node name="Panel" type="Panel" parent="MarginContainer/HBoxContainer"] clip_children = 1 @@ -71,7 +71,13 @@ texture = ExtResource("1_jc4ra") expand_mode = 1 stretch_mode = 4 -[node name="Label" type="Label" parent="MarginContainer/HBoxContainer"] +[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 4 +theme_override_constants/margin_top = 2 + +[node name="Label" type="Label" parent="MarginContainer/HBoxContainer/MarginContainer"] layout_mode = 2 size_flags_horizontal = 3 text = "New Tab" diff --git a/app/scenes/menu.tscn b/app/scenes/menu.tscn index fafc008..174d4df 100644 --- a/app/scenes/menu.tscn +++ b/app/scenes/menu.tscn @@ -5,19 +5,19 @@ [ext_resource type="PackedScene" uid="uid://dkfy3rcfbxqc6" path="res://scenes/components/tab.tscn" id="3_atekt"] [ext_resource type="Resource" uid="uid://b1xvdym0qh6td" path="res://resources/gate_events.res" id="3_m632k"] [ext_resource type="Resource" uid="uid://bqgikyax6jfqa" path="res://resources/history.tres" id="3_wi554"] -[ext_resource type="Texture2D" uid="uid://c80732g67qmvx" path="res://assets/new_textures/plus.svg" id="4_rdyyc"] +[ext_resource type="Texture2D" uid="uid://c80732g67qmvx" path="res://assets/textures/plus.svg" id="4_rdyyc"] [ext_resource type="PackedScene" uid="uid://ctam0fxigbefk" path="res://scenes/components/search.tscn" id="5_li2do"] [ext_resource type="PackedScene" uid="uid://xagbhqfidf2" path="res://scenes/components/round_button.tscn" id="6_gxcmo"] [ext_resource type="Script" path="res://scripts/ui/fullscreen_animation.gd" id="7_1hi62"] -[ext_resource type="Texture2D" uid="uid://d1ehc1xs5hwyn" path="res://assets/new_textures/minimize.svg" id="7_ab04l"] +[ext_resource type="Texture2D" uid="uid://d1ehc1xs5hwyn" path="res://assets/textures/minimize.svg" id="7_ab04l"] [ext_resource type="Resource" uid="uid://crjhix0osmtnf" path="res://resources/ui_events.res" id="8_8dnbq"] -[ext_resource type="Texture2D" uid="uid://csjqc48oqb0kc" path="res://assets/new_textures/maximaze.svg" id="8_yoyw7"] +[ext_resource type="Texture2D" uid="uid://csjqc48oqb0kc" path="res://assets/textures/maximaze.svg" id="8_yoyw7"] [ext_resource type="Script" path="res://scripts/ui/menu/window_buttons.gd" id="10_0d0if"] -[ext_resource type="Texture2D" uid="uid://c4dxov80fjvaq" path="res://assets/new_textures/arrow-left.svg" id="12_5rx3j"] -[ext_resource type="Texture2D" uid="uid://bo1pkhkdscf6v" path="res://assets/new_textures/arrow-right.svg" id="12_nihkw"] -[ext_resource type="Texture2D" uid="uid://dapysvexbecnd" path="res://assets/new_textures/reload.svg" id="13_hwfo2"] -[ext_resource type="Texture2D" uid="uid://yn1l3ybpr7qv" path="res://assets/new_textures/menu.svg" id="13_ncruo"] -[ext_resource type="Texture2D" uid="uid://mgtj316adcja" path="res://assets/new_textures/home.svg" id="14_gbcfo"] +[ext_resource type="Texture2D" uid="uid://c4dxov80fjvaq" path="res://assets/textures/arrow-left.svg" id="12_5rx3j"] +[ext_resource type="Texture2D" uid="uid://bo1pkhkdscf6v" path="res://assets/textures/arrow-right.svg" id="12_nihkw"] +[ext_resource type="Texture2D" uid="uid://dapysvexbecnd" path="res://assets/textures/reload.svg" id="13_hwfo2"] +[ext_resource type="Texture2D" uid="uid://yn1l3ybpr7qv" path="res://assets/textures/menu.svg" id="13_ncruo"] +[ext_resource type="Texture2D" uid="uid://mgtj316adcja" path="res://assets/textures/home.svg" id="14_gbcfo"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pveoh"] bg_color = Color(0.0980392, 0.101961, 0.133333, 1) diff --git a/app/scripts/ui/search/download_animation.gd b/app/scripts/ui/search/download_animation.gd index a5fd1a1..2ac1512 100644 --- a/app/scripts/ui/search/download_animation.gd +++ b/app/scripts/ui/search/download_animation.gd @@ -1,8 +1,8 @@ extends TextureRect -@export var duration: float @export var start_scale: float @export var end_scale: float +@export var duration: float @onready var start := Vector2(start_scale, start_scale) @onready var end := Vector2(end_scale, end_scale) diff --git a/app/scripts/ui/search/fix_promt_position.gd b/app/scripts/ui/search/fix_promt_position.gd index 87ad307..b79f97a 100644 --- a/app/scripts/ui/search/fix_promt_position.gd +++ b/app/scripts/ui/search/fix_promt_position.gd @@ -1,6 +1,12 @@ extends Control +@export var search_le: LineEdit + func _ready() -> void: - await get_tree().process_frame + search_le.resized.connect(change_size) + + +func change_size() -> void: global_position = get_parent().global_position + size.x = search_le.size.x diff --git a/app/scripts/ui/search/prompt_results.gd b/app/scripts/ui/search/prompt_results.gd index d9a3761..a5d6dde 100644 --- a/app/scripts/ui/search/prompt_results.gd +++ b/app/scripts/ui/search/prompt_results.gd @@ -9,6 +9,7 @@ class_name PromptResults var prompt_size: float var result_str: String +var last_query: String func _ready() -> void: @@ -21,9 +22,11 @@ func _ready() -> void: func _on_search_text_changed(query: String) -> void: + last_query = query if query.is_empty(): clear(); return await prompt_request(query) + if query != last_query: return clear() var prompts = JSON.parse_string(result_str) diff --git a/app/scripts/ui/search/search_status.gd b/app/scripts/ui/search/search_status.gd index 9dd0874..79a718a 100644 --- a/app/scripts/ui/search/search_status.gd +++ b/app/scripts/ui/search/search_status.gd @@ -8,6 +8,9 @@ extends Control @export var success: Control @export var error: Control +@export var white: Color +@export var gray: Color + func _ready() -> void: search_line_edit.text_changed.connect(func(_text): switch_to(search)) @@ -24,6 +27,11 @@ func switch_to(_state: Control) -> void: disable([search, downloading, success, error]) _state.visible = true _state.process_mode = Node.PROCESS_MODE_INHERIT + change_color.call_deferred() + + +func change_color() -> void: + modulate = gray if search_line_edit.text.is_empty() else white func disable(states: Array[Control]) -> void: diff --git a/app/scripts/ui/search_go.gd b/app/scripts/ui/search_go.gd deleted file mode 100644 index 2b4c035..0000000 --- a/app/scripts/ui/search_go.gd +++ /dev/null @@ -1,12 +0,0 @@ -extends BaseButton - -@export var gate_events: GateEvents - - -func _ready() -> void: - visible = false - - -func _on_search_text_changed(_url: String) -> void: - #visible = true if not _url.is_empty() else false - pass