Rename the Lighten/Darken tool to Shading tool
|
@ -779,7 +779,7 @@ msgid "Bucket\n\n"
|
||||||
"%s for right mouse button"
|
"%s for right mouse button"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Lighten/Darken\n\n"
|
msgid "Shading Tool\n\n"
|
||||||
"%s for left mouse button\n"
|
"%s for left mouse button\n"
|
||||||
"%s for right mouse button"
|
"%s for right mouse button"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -1529,7 +1529,7 @@ msgstr ""
|
||||||
msgid "Bucket"
|
msgid "Bucket"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Lighten/Darken"
|
msgid "Shading Tool"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
msgid "Switch Colors"
|
msgid "Switch Colors"
|
||||||
|
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
path="res://.import/lightendarken.png-cc76071888c6b4d42e88f84da5221ccb.stex"
|
path="res://.import/shading.png-5d37c300f283855f8cac6be17f635f82.stex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
source_file="res://assets/graphics/blue_themes/tools/lightendarken.png"
|
source_file="res://assets/graphics/blue_themes/tools/shading.png"
|
||||||
dest_files=[ "res://.import/lightendarken.png-cc76071888c6b4d42e88f84da5221ccb.stex" ]
|
dest_files=[ "res://.import/shading.png-5d37c300f283855f8cac6be17f635f82.stex" ]
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
[remap]
|
|
||||||
|
|
||||||
importer="image"
|
|
||||||
type="Image"
|
|
||||||
path="res://.import/lightendarken_cursor.png-493fce3e226bc2d98934ba7cd89f4589.image"
|
|
||||||
|
|
||||||
[deps]
|
|
||||||
|
|
||||||
source_file="res://assets/graphics/cursor_icons/lightendarken_cursor.png"
|
|
||||||
dest_files=[ "res://.import/lightendarken_cursor.png-493fce3e226bc2d98934ba7cd89f4589.image" ]
|
|
||||||
|
|
||||||
[params]
|
|
||||||
|
|
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 336 B |
13
assets/graphics/cursor_icons/shading_cursor.png.import
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="image"
|
||||||
|
type="Image"
|
||||||
|
path="res://.import/shading_cursor.png-4bcf9d942739aeda75b6ade1e6510ac0.image"
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://assets/graphics/cursor_icons/shading_cursor.png"
|
||||||
|
dest_files=[ "res://.import/shading_cursor.png-4bcf9d942739aeda75b6ade1e6510ac0.image" ]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
path="res://.import/lightendarken.png-c30f64f6f1f40a3ab41399b96d568f4c.stex"
|
path="res://.import/shading.png-7d4de5e218a9590b046b32aa33b02a6f.stex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
source_file="res://assets/graphics/dark_themes/tools/lightendarken.png"
|
source_file="res://assets/graphics/dark_themes/tools/shading.png"
|
||||||
dest_files=[ "res://.import/lightendarken.png-c30f64f6f1f40a3ab41399b96d568f4c.stex" ]
|
dest_files=[ "res://.import/shading.png-7d4de5e218a9590b046b32aa33b02a6f.stex" ]
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="StreamTexture"
|
type="StreamTexture"
|
||||||
path="res://.import/lightendarken.png-3d83685a1fead1fb3733687db3aa5ec7.stex"
|
path="res://.import/shading.png-73285f7dba63c1426103fe5c7ec10d06.stex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
|
|
||||||
source_file="res://assets/graphics/light_themes/tools/lightendarken.png"
|
source_file="res://assets/graphics/light_themes/tools/shading.png"
|
||||||
dest_files=[ "res://.import/lightendarken.png-3d83685a1fead1fb3733687db3aa5ec7.stex" ]
|
dest_files=[ "res://.import/shading.png-73285f7dba63c1426103fe5c7ec10d06.stex" ]
|
||||||
|
|
||||||
[params]
|
[params]
|
||||||
|
|
|
@ -284,12 +284,12 @@ paste={
|
||||||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":86,"unicode":0,"echo":false,"script":null)
|
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":86,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
left_lightdark_tool={
|
left_shading_tool={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"unicode":0,"echo":false,"script":null)
|
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
right_lightdark_tool={
|
right_shading_tool={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"unicode":0,"echo":false,"script":null)
|
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":85,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
|
|
|
@ -560,11 +560,11 @@ Hold %s to make a line""") % [InputMap.get_action_list("left_eraser_tool")[0].as
|
||||||
%s for left mouse button
|
%s for left mouse button
|
||||||
%s for right mouse button""") % [InputMap.get_action_list("left_fill_tool")[0].as_text(), InputMap.get_action_list("right_fill_tool")[0].as_text()]
|
%s for right mouse button""") % [InputMap.get_action_list("left_fill_tool")[0].as_text(), InputMap.get_action_list("right_fill_tool")[0].as_text()]
|
||||||
|
|
||||||
var ld : BaseButton = find_node_by_name(root, "LightenDarken")
|
var ld : BaseButton = find_node_by_name(root, "Shading")
|
||||||
ld.hint_tooltip = tr("""Lighten/Darken
|
ld.hint_tooltip = tr("""Shading Tool
|
||||||
|
|
||||||
%s for left mouse button
|
%s for left mouse button
|
||||||
%s for right mouse button""") % [InputMap.get_action_list("left_lightdark_tool")[0].as_text(), InputMap.get_action_list("right_lightdark_tool")[0].as_text()]
|
%s for right mouse button""") % [InputMap.get_action_list("left_shading_tool")[0].as_text(), InputMap.get_action_list("right_shading_tool")[0].as_text()]
|
||||||
|
|
||||||
var linetool : BaseButton = find_node_by_name(root, "LineTool")
|
var linetool : BaseButton = find_node_by_name(root, "LineTool")
|
||||||
linetool.hint_tooltip = tr("""Line Tool
|
linetool.hint_tooltip = tr("""Line Tool
|
||||||
|
|
|
@ -52,7 +52,7 @@ var _tools = {
|
||||||
"Pencil" : "res://src/Tools/Pencil.tscn",
|
"Pencil" : "res://src/Tools/Pencil.tscn",
|
||||||
"Eraser" : "res://src/Tools/Eraser.tscn",
|
"Eraser" : "res://src/Tools/Eraser.tscn",
|
||||||
"Bucket" : "res://src/Tools/Bucket.tscn",
|
"Bucket" : "res://src/Tools/Bucket.tscn",
|
||||||
"LightenDarken" : "res://src/Tools/LightenDarken.tscn",
|
"Shading" : "res://src/Tools/Shading.tscn",
|
||||||
"LineTool" : "res://src/Tools/LineTool.tscn",
|
"LineTool" : "res://src/Tools/LineTool.tscn",
|
||||||
"RectangleTool" : "res://src/Tools/RectangleTool.tscn",
|
"RectangleTool" : "res://src/Tools/RectangleTool.tscn",
|
||||||
"EllipseTool" : "res://src/Tools/EllipseTool.tscn",
|
"EllipseTool" : "res://src/Tools/EllipseTool.tscn",
|
||||||
|
|
|
@ -969,19 +969,19 @@ margin_top = 132.0
|
||||||
margin_right = 505.0
|
margin_right = 505.0
|
||||||
margin_bottom = 152.0
|
margin_bottom = 152.0
|
||||||
|
|
||||||
[node name="LightenDarkenLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
[node name="ShadingLabel" type="Label" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
||||||
margin_top = 157.0
|
margin_top = 157.0
|
||||||
margin_right = 137.0
|
margin_right = 137.0
|
||||||
margin_bottom = 171.0
|
margin_bottom = 171.0
|
||||||
text = "Lighten/Darken"
|
text = "Shading Tool"
|
||||||
|
|
||||||
[node name="left_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
[node name="left_shading_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
||||||
margin_left = 142.0
|
margin_left = 142.0
|
||||||
margin_top = 154.0
|
margin_top = 154.0
|
||||||
margin_right = 321.0
|
margin_right = 321.0
|
||||||
margin_bottom = 174.0
|
margin_bottom = 174.0
|
||||||
|
|
||||||
[node name="right_lightdark_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
[node name="right_shading_tool" type="Button" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/Shortcuts"]
|
||||||
margin_left = 326.0
|
margin_left = 326.0
|
||||||
margin_top = 154.0
|
margin_top = 154.0
|
||||||
margin_right = 505.0
|
margin_right = 505.0
|
||||||
|
@ -1228,6 +1228,7 @@ valign = 1
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
"_edit_use_anchors_": false
|
"_edit_use_anchors_": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[connection signal="about_to_show" from="." to="." method="_on_PreferencesDialog_about_to_show"]
|
[connection signal="about_to_show" from="." to="." method="_on_PreferencesDialog_about_to_show"]
|
||||||
[connection signal="popup_hide" from="." to="." method="_on_PreferencesDialog_popup_hide"]
|
[connection signal="popup_hide" from="." to="." method="_on_PreferencesDialog_popup_hide"]
|
||||||
[connection signal="item_selected" from="HSplitContainer/List" to="." method="_on_List_item_selected"]
|
[connection signal="item_selected" from="HSplitContainer/List" to="." method="_on_List_item_selected"]
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://src/Tools/Draw.tscn" type="PackedScene" id=1]
|
[ext_resource path="res://src/Tools/Draw.tscn" type="PackedScene" id=1]
|
||||||
[ext_resource path="res://src/Tools/LightenDarken.gd" type="Script" id=2]
|
[ext_resource path="res://src/Tools/Shading.gd" type="Script" id=2]
|
||||||
|
|
||||||
|
|
||||||
[node name="ToolOptions" instance=ExtResource( 1 )]
|
[node name="ToolOptions" instance=ExtResource( 1 )]
|
||||||
script = ExtResource( 2 )
|
script = ExtResource( 2 )
|
|
@ -16,7 +16,7 @@ onready var tools := [
|
||||||
[$Pencil, "pencil"],
|
[$Pencil, "pencil"],
|
||||||
[$Eraser, "eraser"],
|
[$Eraser, "eraser"],
|
||||||
[$Bucket, "fill"],
|
[$Bucket, "fill"],
|
||||||
[$LightenDarken, "lightdark"],
|
[$Shading, "shading"],
|
||||||
[$LineTool, "linetool"],
|
[$LineTool, "linetool"],
|
||||||
[$RectangleTool, "rectangletool"],
|
[$RectangleTool, "rectangletool"],
|
||||||
[$EllipseTool, "ellipsetool"],
|
[$EllipseTool, "ellipsetool"],
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
[ext_resource path="res://assets/graphics/dark_themes/tools/rectselect.png" type="Texture" id=12]
|
[ext_resource path="res://assets/graphics/dark_themes/tools/rectselect.png" type="Texture" id=12]
|
||||||
[ext_resource path="res://assets/graphics/dark_themes/tools/eraser.png" type="Texture" id=13]
|
[ext_resource path="res://assets/graphics/dark_themes/tools/eraser.png" type="Texture" id=13]
|
||||||
[ext_resource path="res://assets/graphics/tool_backgrounds/l.png" type="Texture" id=14]
|
[ext_resource path="res://assets/graphics/tool_backgrounds/l.png" type="Texture" id=14]
|
||||||
[ext_resource path="res://assets/graphics/dark_themes/tools/lightendarken.png" type="Texture" id=15]
|
[ext_resource path="res://assets/graphics/dark_themes/tools/shading.png" type="Texture" id=15]
|
||||||
[ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16]
|
[ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16]
|
||||||
[ext_resource path="res://src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=17]
|
[ext_resource path="res://src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=17]
|
||||||
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18]
|
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18]
|
||||||
|
@ -428,7 +428,7 @@ __meta__ = {
|
||||||
"_edit_use_anchors_": false
|
"_edit_use_anchors_": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[node name="LightenDarken" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[
|
[node name="Shading" type="Button" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons" groups=[
|
||||||
"UIButtons",
|
"UIButtons",
|
||||||
]]
|
]]
|
||||||
margin_top = 468.0
|
margin_top = 468.0
|
||||||
|
@ -438,14 +438,14 @@ rect_min_size = Vector2( 32, 32 )
|
||||||
mouse_default_cursor_shape = 2
|
mouse_default_cursor_shape = 2
|
||||||
button_mask = 3
|
button_mask = 3
|
||||||
|
|
||||||
[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LightenDarken"]
|
[node name="Background" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"]
|
||||||
margin_right = 32.0
|
margin_right = 32.0
|
||||||
margin_bottom = 32.0
|
margin_bottom = 32.0
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
"_edit_use_anchors_": false
|
"_edit_use_anchors_": false
|
||||||
}
|
}
|
||||||
|
|
||||||
[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/LightenDarken"]
|
[node name="ToolIcon" type="TextureRect" parent="ToolsAndCanvas/ToolPanel/PanelContainer/ToolButtons/Shading"]
|
||||||
margin_right = 32.0
|
margin_right = 32.0
|
||||||
margin_bottom = 32.0
|
margin_bottom = 32.0
|
||||||
texture = ExtResource( 15 )
|
texture = ExtResource( 15 )
|
||||||
|
|