1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-30 23:19:49 +00:00

Created a "UI" folder in src

And a Timeline folder in UI
This commit is contained in:
OverloadedOrama 2020-05-02 01:19:01 +03:00
parent 8d5a673543
commit c35e4b0613
51 changed files with 1444 additions and 1443 deletions

View file

@ -6,11 +6,6 @@
[ext_resource path="res://Assets/themes/dark/icons/hsplit.png" type="Texture" id=4]
[ext_resource path="res://Assets/themes/dark/icons/vsplit.png" type="Texture" id=5]
[sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 5.0
content_margin_right = 5.0

File diff suppressed because one or more lines are too long

View file

@ -6,11 +6,6 @@
[ext_resource path="res://Assets/themes/light/icons/hsplit.png" type="Texture" id=4]
[ext_resource path="res://Assets/themes/light/icons/vsplit.png" type="Texture" id=5]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.219608, 0.211765, 0.168627, 1 )

View file

@ -6,11 +6,6 @@
[ext_resource path="res://Assets/themes/dark/icons/hsplit.png" type="Texture" id=4]
[ext_resource path="res://Assets/themes/dark/icons/grabber_hover.png" type="Texture" id=5]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.517647, 0.517647, 0.517647, 1 )
border_width_left = 4

View file

@ -6,11 +6,6 @@
[ext_resource path="res://Assets/themes/light/icons/hsplit.png" type="Texture" id=4]
[ext_resource path="res://Assets/themes/light/icons/vsplit.png" type="Texture" id=5]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.803922, 0.803922, 0.803922, 1 )
border_width_left = 4

View file

@ -17,12 +17,12 @@ _global_script_classes=[ {
"base": "Line2D",
"class": "Guide",
"language": "GDScript",
"path": "res://src/Rulers/Guides.gd"
"path": "res://src/UI/Rulers/Guides.gd"
}, {
"base": "Button",
"base": "Reference",
"class": "LayerButton",
"language": "GDScript",
"path": "res://src/LayerButton.gd"
"path": "res://src/UI/Timeline/LayerButton.gd"
}, {
"base": "Reference",
"class": "Palette",

View file

@ -412,7 +412,7 @@ func find_node_by_name(root, node_name) -> Node:
func notification_label(text : String) -> void:
var notification : Label = load("res://src/NotificationLabel.tscn").instance()
var notification : Label = load("res://src/UI/NotificationLabel.tscn").instance()
notification.text = tr(text)
notification.rect_position = Vector2(240, OS.window_size.y - animation_timeline.rect_size.y - 20)
notification.theme = control.theme
@ -525,7 +525,7 @@ func canvases_changed(value : Array) -> void:
frame_ids.add_child(label)
for i in range(layers.size() - 1, -1, -1):
var cel_button = load("res://src/CelButton.tscn").instance()
var cel_button = load("res://src/UI/Timeline/CelButton.tscn").instance()
cel_button.frame = j
cel_button.layer = i
cel_button.get_child(0).texture = Global.canvases[j].layers[i][1]
@ -581,7 +581,7 @@ func layers_changed(value : Array) -> void:
frames_container.remove_child(container)
for i in range(layers.size() - 1, -1, -1):
var layer_container = load("res://src/LayerButton.tscn").instance()
var layer_container = load("res://src/UI/Timeline/LayerButton.tscn").instance()
layer_container.i = i
if !layers[i][0]:
layers[i][0] = tr("Layer") + " %s" % i
@ -592,7 +592,7 @@ func layers_changed(value : Array) -> void:
frames_container.add_child(layers[i][3])
for j in range(canvases.size()):
var cel_button = load("res://src/CelButton.tscn").instance()
var cel_button = load("res://src/UI/Timeline/CelButton.tscn").instance()
cel_button.frame = j
cel_button.layer = i
cel_button.get_child(0).texture = Global.canvases[j].layers[i][1]
@ -698,7 +698,7 @@ func animation_tags_changed(value : Array) -> void:
child.queue_free()
for tag in animation_tags:
var tag_c : Container = load("res://src/AnimationTag.tscn").instance()
var tag_c : Container = load("res://src/UI/Timeline/AnimationTag.tscn").instance()
tag_container.add_child(tag_c)
var tag_position := tag_container.get_child_count() - 1
tag_container.move_child(tag_c, tag_position)
@ -807,7 +807,7 @@ Hold %s to make a line""") % [InputMap.get_action_list("left_eraser_tool")[0].as
func create_brush_button(brush_img : Image, brush_type := Brush_Types.CUSTOM, hint_tooltip := "") -> void:
var brush_container
var brush_button = load("res://src/BrushButton.tscn").instance()
var brush_button = load("res://src/UI/BrushButton.tscn").instance()
brush_button.brush_type = brush_type
brush_button.custom_brush_index = custom_brushes.size() - 1
if brush_type == Brush_Types.FILE || brush_type == Brush_Types.RANDOM_FILE:

View file

@ -237,7 +237,7 @@ func import_patterns(priority_ordered_search_path: Array) -> void:
image.convert(Image.FORMAT_RGBA8)
Global.patterns.append(image)
var pattern_button : BaseButton = load("res://src/PatternButton.tscn").instance()
var pattern_button : BaseButton = load("res://src/UI/PatternButton.tscn").instance()
pattern_button.image = image
var pattern_tex := ImageTexture.new()
pattern_tex.create_from_image(image, 0)

View file

@ -13,40 +13,40 @@
[ext_resource path="res://Assets/Graphics/Dark Themes/Misc/Color defaults.png" type="Texture" id=11]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=12]
[ext_resource path="res://Assets/themes/dark/ruler_style.tres" type="StyleBox" id=13]
[ext_resource path="res://src/Rulers/HorizontalRuler.gd" type="Script" id=14]
[ext_resource path="res://src/Rulers/VerticalRuler.gd" type="Script" id=15]
[ext_resource path="res://src/UI/Rulers/HorizontalRuler.gd" type="Script" id=14]
[ext_resource path="res://src/UI/Rulers/VerticalRuler.gd" type="Script" id=15]
[ext_resource path="res://src/Canvas.tscn" type="PackedScene" id=16]
[ext_resource path="res://src/CameraMovement.gd" type="Script" id=17]
[ext_resource path="res://src/SelectionRectangle.gd" type="Script" id=18]
[ext_resource path="res://src/SecondViewport.gd" type="Script" id=19]
[ext_resource path="res://src/AnimationTimeline.tscn" type="PackedScene" id=20]
[ext_resource path="res://src/UI/SecondViewport.gd" type="Script" id=19]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=20]
[ext_resource path="res://Assets/Graphics/Dark Themes/Palette/Add_Palette.png" type="Texture" id=21]
[ext_resource path="res://Assets/Graphics/Dark Themes/Palette/Add_Palette_Hover.png" type="Texture" id=22]
[ext_resource path="res://Assets/Graphics/Dark Themes/Palette/Edit_Palette.png" type="Texture" id=23]
[ext_resource path="res://Assets/Graphics/Dark Themes/Palette/Edit_Palette_Hover.png" type="Texture" id=24]
[ext_resource path="res://src/Palette/PaletteContainer.gd" type="Script" id=25]
[ext_resource path="res://src/BrushButton.tscn" type="PackedScene" id=26]
[ext_resource path="res://src/Dialogs/SplashDialog.tscn" type="PackedScene" id=27]
[ext_resource path="res://src/Dialogs/CreateNewImage.tscn" type="PackedScene" id=28]
[ext_resource path="res://src/Dialogs/ImportSprites.tscn" type="PackedScene" id=29]
[ext_resource path="res://src/UI/BrushButton.tscn" type="PackedScene" id=26]
[ext_resource path="res://src/UI/Dialogs/SplashDialog.tscn" type="PackedScene" id=27]
[ext_resource path="res://src/UI/Dialogs/CreateNewImage.tscn" type="PackedScene" id=28]
[ext_resource path="res://src/UI/Dialogs/ImportSprites.tscn" type="PackedScene" id=29]
[ext_resource path="res://Assets/Graphics/Dark Themes/Tools/Horizontal_Mirror_Off.png" type="Texture" id=30]
[ext_resource path="res://src/Dialogs/ScaleImage.tscn" type="PackedScene" id=31]
[ext_resource path="res://src/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=32]
[ext_resource path="res://src/Dialogs/OutlineDialog.tscn" type="PackedScene" id=33]
[ext_resource path="res://src/Dialogs/AboutDialog.tscn" type="PackedScene" id=34]
[ext_resource path="res://src/UI/Dialogs/ScaleImage.tscn" type="PackedScene" id=31]
[ext_resource path="res://src/UI/Dialogs/PreferencesDialog.tscn" type="PackedScene" id=32]
[ext_resource path="res://src/UI/Dialogs/OutlineDialog.tscn" type="PackedScene" id=33]
[ext_resource path="res://src/UI/Dialogs/AboutDialog.tscn" type="PackedScene" id=34]
[ext_resource path="res://src/Palette/EditPalettePopup.tscn" type="PackedScene" id=35]
[ext_resource path="res://src/Palette/NewPaletteDialog.tscn" type="PackedScene" id=36]
[ext_resource path="res://src/Palette/PaletteImportFileDialog.tscn" type="PackedScene" id=37]
[ext_resource path="res://src/Dialogs/RotateImage.tscn" type="PackedScene" id=38]
[ext_resource path="res://src/Dialogs/ExportDialog.tscn" type="PackedScene" id=39]
[ext_resource path="res://src/UI/Dialogs/RotateImage.tscn" type="PackedScene" id=38]
[ext_resource path="res://src/UI/Dialogs/ExportDialog.tscn" type="PackedScene" id=39]
[ext_resource path="res://Assets/Graphics/Dark Themes/Tools/Horizontal_Mirror_On.png" type="Texture" id=40]
[ext_resource path="res://Assets/Graphics/Dark Themes/Tools/Vertical_Mirror_On.png" type="Texture" id=41]
[ext_resource path="res://Assets/Graphics/Dark Themes/Tools/Vertical_Mirror_Off.png" type="Texture" id=42]
[ext_resource path="res://Assets/Graphics/Dark Themes/Tools/Zoom.png" type="Texture" id=43]
[ext_resource path="res://src/Dialogs/HSVDialog.tscn" type="PackedScene" id=44]
[ext_resource path="res://src/TransparentChecker.gd" type="Script" id=45]
[ext_resource path="res://src/Dialogs/OpenLastProjectAlertDialog.tscn" type="PackedScene" id=46]
[ext_resource path="res://src/Dialogs/NoProjectEditedOrCreatedAlertDialog.tscn" type="PackedScene" id=47]
[ext_resource path="res://src/UI/Dialogs/HSVDialog.tscn" type="PackedScene" id=44]
[ext_resource path="res://src/UI/TransparentChecker.gd" type="Script" id=45]
[ext_resource path="res://src/UI/Dialogs/OpenLastProjectAlertDialog.tscn" type="PackedScene" id=46]
[ext_resource path="res://src/UI/Dialogs/NoProjectEditedOrCreatedAlertDialog.tscn" type="PackedScene" id=47]
[sub_resource type="Shader" id=1]
code = "shader_type canvas_item;

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=1]
[ext_resource path="res://src/BrushButton.gd" type="Script" id=2]
[ext_resource path="res://src/UI/BrushButton.gd" type="Script" id=2]
[sub_resource type="Image" id=3]

View file

@ -1,12 +1,13 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://src/Dialogs/AboutDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/AboutDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/icon_64x64.png" type="Texture" id=2]
[ext_resource path="res://Assets/Fonts/Roboto-Italic.tres" type="DynamicFont" id=3]
[ext_resource path="res://Assets/Graphics/orama_64x64.png" type="Texture" id=4]
[ext_resource path="res://Assets/Fonts/Roboto-Small.tres" type="DynamicFont" id=5]
[node name="AboutDialog" type="WindowDialog"]
margin_right = 512.0
margin_bottom = 288.0

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/CreateNewImage.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/CreateNewImage.gd" type="Script" id=1]
[node name="CreateNewImage" type="ConfirmationDialog"]

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://src/Dialogs/ExportDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/ExportDialog.gd" type="Script" id=1]
[ext_resource path="res://addons/godot-gifexporter/src/GifExporter.gd" type="Script" id=2]
[node name="ExportDialog" type="AcceptDialog"]
margin_right = 532.0
margin_bottom = 530.0

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://src/Dialogs/FrameTagDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/FrameTagDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/new_frame.png" type="Texture" id=2]
[node name="FrameTagDialog" type="AcceptDialog"]
margin_right = 83.0
margin_bottom = 58.0

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/HSVDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/HSVDialog.gd" type="Script" id=1]
[node name="HSVDialog" type="WindowDialog"]

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/ImportSprites.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/ImportSprites.gd" type="Script" id=1]
[node name="ImportSprites" type="FileDialog"]

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/OutlineDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/OutlineDialog.gd" type="Script" id=1]
[node name="OutlineDialog" type="ConfirmationDialog"]

View file

@ -1,10 +1,11 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/Dialogs/PreferencesDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/PreferencesDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Fonts/Roboto-Regular.tres" type="DynamicFont" id=2]
[ext_resource path="res://Assets/Fonts/CJK/NotoSansCJKtc-Regular.tres" type="DynamicFont" id=3]
[node name="PreferencesDialog" type="AcceptDialog"]
margin_left = -3.0
margin_top = 9.0

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/RotateImage.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/RotateImage.gd" type="Script" id=1]
[node name="RotateImage" type="ConfirmationDialog"]

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/Dialogs/ScaleImage.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/ScaleImage.gd" type="Script" id=1]
[node name="ScaleImage" type="ConfirmationDialog"]

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=12 format=2]
[ext_resource path="res://src/Dialogs/SplashDialog.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Dialogs/SplashDialog.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/Pixelorama Logo.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/Become a patron.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/Become a patron_Hover.png" type="Texture" id=4]
@ -13,6 +13,7 @@
[ext_resource path="res://Assets/Graphics/Patreon_Mark_White.png" type="Texture" id=11]
[node name="SplashDialog" type="WindowDialog"]
margin_right = 614.0
margin_bottom = 590.0

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/NotificationLabel.gd" type="Script" id=2]
[ext_resource path="res://src/UI/NotificationLabel.gd" type="Script" id=2]
[node name="NotificationLabel" type="Label"]

View file

@ -6,7 +6,7 @@ var image_size : Vector2
var texture : ImageTexture
func _ready():
func _ready() -> void:
if image:
image_size = image.get_size()
texture = ImageTexture.new()

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Assets/Graphics/Brush_button.png" type="Texture" id=1]
[ext_resource path="res://src/PatternButton.gd" type="Script" id=2]
[ext_resource path="res://src/UI/PatternButton.gd" type="Script" id=2]
[node name="PatternButton" type="TextureButton"]

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=51 format=2]
[ext_resource path="res://src/AnimationTimeline.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/New_Layer.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/New_Layer_Hover.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Delete_Layer.png" type="Texture" id=4]
@ -17,7 +17,7 @@
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down.png" type="Texture" id=15]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Hover.png" type="Texture" id=16]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Merge_Down_Disabled.png" type="Texture" id=17]
[ext_resource path="res://src/LayerButton.tscn" type="PackedScene" id=18]
[ext_resource path="res://src/UI/Timeline/LayerButton.tscn" type="PackedScene" id=18]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/new_frame.png" type="Texture" id=19]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/remove_frame.png" type="Texture" id=20]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/go_to_first_frame.png" type="Texture" id=21]
@ -31,7 +31,11 @@
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/onion_skinning_off.png" type="Texture" id=29]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/expandable.png" type="Texture" id=30]
[ext_resource path="res://Assets/Graphics/Dark Themes/Timeline/loop.png" type="Texture" id=31]
[ext_resource path="res://src/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42]
[ext_resource path="res://src/UI/Dialogs/FrameTagDialog.tscn" type="PackedScene" id=42]

View file

@ -1,6 +1,8 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://src/CelButton.gd" type="Script" id=1]
[ext_resource path="res://src/UI/Timeline/CelButton.gd" type="Script" id=1]
[node name="CelButton" type="Button"]
margin_top = 18.0

View file

@ -1,12 +1,13 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlinked_Layer.png" type="Texture" id=1]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlock_Hover.png" type="Texture" id=2]
[ext_resource path="res://src/UI/Timeline/LayerButton.gd" type="Script" id=1]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Layer_Visible_Hover.png" type="Texture" id=2]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlock.png" type="Texture" id=3]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlinked_Layer_Hover.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlinked_Layer.png" type="Texture" id=4]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Layer_Visible.png" type="Texture" id=5]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Layer_Visible_Hover.png" type="Texture" id=6]
[ext_resource path="res://src/LayerButton.gd" type="Script" id=7]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlock_Hover.png" type="Texture" id=6]
[ext_resource path="res://Assets/Graphics/Dark Themes/Layers/Unlinked_Layer_Hover.png" type="Texture" id=7]
[node name="LayerContainer" type="Button"]
margin_right = 210.0
@ -15,7 +16,7 @@ rect_min_size = Vector2( 212, 36 )
size_flags_horizontal = 0
toggle_mode = true
action_mode = 0
script = ExtResource( 7 )
script = ExtResource( 1 )
__meta__ = {
"_edit_horizontal_guides_": [ ],
"_edit_use_anchors_": false
@ -45,7 +46,7 @@ mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 5 )
texture_hover = ExtResource( 6 )
texture_hover = ExtResource( 2 )
[node name="LockButton" type="TextureButton" parent="HBoxContainer/LayerButtons" groups=[
"UIButtons",
@ -60,7 +61,7 @@ mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 3 )
texture_hover = ExtResource( 2 )
texture_hover = ExtResource( 6 )
[node name="LinkButton" type="TextureButton" parent="HBoxContainer/LayerButtons" groups=[
"UIButtons",
@ -76,8 +77,8 @@ focus_mode = 0
mouse_default_cursor_shape = 2
size_flags_horizontal = 0
size_flags_vertical = 4
texture_normal = ExtResource( 1 )
texture_hover = ExtResource( 4 )
texture_normal = ExtResource( 4 )
texture_hover = ExtResource( 7 )
[node name="LayerName" type="HBoxContainer" parent="HBoxContainer"]
margin_left = 108.0