diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 42f2605da..369b569cc 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -779,7 +779,7 @@ msgid "Bucket\n\n" "%s for right mouse button" msgstr "" -msgid "Lighten/Darken\n\n" +msgid "Shading Tool\n\n" "%s for left mouse button\n" "%s for right mouse button" msgstr "" @@ -1529,7 +1529,7 @@ msgstr "" msgid "Bucket" msgstr "" -msgid "Lighten/Darken" +msgid "Shading Tool" msgstr "" msgid "Switch Colors" diff --git a/assets/graphics/blue_themes/tools/lightendarken.png b/assets/graphics/blue_themes/tools/shading.png similarity index 100% rename from assets/graphics/blue_themes/tools/lightendarken.png rename to assets/graphics/blue_themes/tools/shading.png diff --git a/assets/graphics/blue_themes/tools/lightendarken.png.import b/assets/graphics/blue_themes/tools/shading.png.import similarity index 66% rename from assets/graphics/blue_themes/tools/lightendarken.png.import rename to assets/graphics/blue_themes/tools/shading.png.import index f5a55b42d..dca195566 100644 --- a/assets/graphics/blue_themes/tools/lightendarken.png.import +++ b/assets/graphics/blue_themes/tools/shading.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/lightendarken.png-cc76071888c6b4d42e88f84da5221ccb.stex" +path="res://.import/shading.png-5d37c300f283855f8cac6be17f635f82.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/blue_themes/tools/lightendarken.png" -dest_files=[ "res://.import/lightendarken.png-cc76071888c6b4d42e88f84da5221ccb.stex" ] +source_file="res://assets/graphics/blue_themes/tools/shading.png" +dest_files=[ "res://.import/shading.png-5d37c300f283855f8cac6be17f635f82.stex" ] [params] diff --git a/assets/graphics/cursor_icons/lightendarken_cursor.png.import b/assets/graphics/cursor_icons/lightendarken_cursor.png.import deleted file mode 100644 index 4300e2f95..000000000 --- a/assets/graphics/cursor_icons/lightendarken_cursor.png.import +++ /dev/null @@ -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] - diff --git a/assets/graphics/cursor_icons/lightendarken_cursor.png b/assets/graphics/cursor_icons/shading_cursor.png similarity index 100% rename from assets/graphics/cursor_icons/lightendarken_cursor.png rename to assets/graphics/cursor_icons/shading_cursor.png diff --git a/assets/graphics/cursor_icons/shading_cursor.png.import b/assets/graphics/cursor_icons/shading_cursor.png.import new file mode 100644 index 000000000..2f947339b --- /dev/null +++ b/assets/graphics/cursor_icons/shading_cursor.png.import @@ -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] + diff --git a/assets/graphics/dark_themes/tools/lightendarken.png b/assets/graphics/dark_themes/tools/shading.png similarity index 100% rename from assets/graphics/dark_themes/tools/lightendarken.png rename to assets/graphics/dark_themes/tools/shading.png diff --git a/assets/graphics/dark_themes/tools/lightendarken.png.import b/assets/graphics/dark_themes/tools/shading.png.import similarity index 66% rename from assets/graphics/dark_themes/tools/lightendarken.png.import rename to assets/graphics/dark_themes/tools/shading.png.import index fdfcec581..b0140ebc5 100644 --- a/assets/graphics/dark_themes/tools/lightendarken.png.import +++ b/assets/graphics/dark_themes/tools/shading.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/lightendarken.png-c30f64f6f1f40a3ab41399b96d568f4c.stex" +path="res://.import/shading.png-7d4de5e218a9590b046b32aa33b02a6f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/dark_themes/tools/lightendarken.png" -dest_files=[ "res://.import/lightendarken.png-c30f64f6f1f40a3ab41399b96d568f4c.stex" ] +source_file="res://assets/graphics/dark_themes/tools/shading.png" +dest_files=[ "res://.import/shading.png-7d4de5e218a9590b046b32aa33b02a6f.stex" ] [params] diff --git a/assets/graphics/light_themes/tools/lightendarken.png b/assets/graphics/light_themes/tools/shading.png similarity index 100% rename from assets/graphics/light_themes/tools/lightendarken.png rename to assets/graphics/light_themes/tools/shading.png diff --git a/assets/graphics/light_themes/tools/lightendarken.png.import b/assets/graphics/light_themes/tools/shading.png.import similarity index 66% rename from assets/graphics/light_themes/tools/lightendarken.png.import rename to assets/graphics/light_themes/tools/shading.png.import index b453df1f9..ac8c6d2a3 100644 --- a/assets/graphics/light_themes/tools/lightendarken.png.import +++ b/assets/graphics/light_themes/tools/shading.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/lightendarken.png-3d83685a1fead1fb3733687db3aa5ec7.stex" +path="res://.import/shading.png-73285f7dba63c1426103fe5c7ec10d06.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/graphics/light_themes/tools/lightendarken.png" -dest_files=[ "res://.import/lightendarken.png-3d83685a1fead1fb3733687db3aa5ec7.stex" ] +source_file="res://assets/graphics/light_themes/tools/shading.png" +dest_files=[ "res://.import/shading.png-73285f7dba63c1426103fe5c7ec10d06.stex" ] [params] diff --git a/project.godot b/project.godot index e32b6233d..9f11a8a4c 100644 --- a/project.godot +++ b/project.godot @@ -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) ] } -left_lightdark_tool={ +left_shading_tool={ "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) ] } -right_lightdark_tool={ +right_shading_tool={ "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) ] diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 7547d73f0..c3cdb9461 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -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 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") - ld.hint_tooltip = tr("""Lighten/Darken + var ld : BaseButton = find_node_by_name(root, "Shading") + ld.hint_tooltip = tr("""Shading Tool %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") linetool.hint_tooltip = tr("""Line Tool diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd index 618f9bbd5..cedb9f5c1 100644 --- a/src/Autoload/Tools.gd +++ b/src/Autoload/Tools.gd @@ -52,7 +52,7 @@ var _tools = { "Pencil" : "res://src/Tools/Pencil.tscn", "Eraser" : "res://src/Tools/Eraser.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", "RectangleTool" : "res://src/Tools/RectangleTool.tscn", "EllipseTool" : "res://src/Tools/EllipseTool.tscn", diff --git a/src/Preferences/PreferencesDialog.tscn b/src/Preferences/PreferencesDialog.tscn index 1fd3fbbcb..4a493afc3 100644 --- a/src/Preferences/PreferencesDialog.tscn +++ b/src/Preferences/PreferencesDialog.tscn @@ -969,19 +969,19 @@ margin_top = 132.0 margin_right = 505.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_right = 137.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_top = 154.0 margin_right = 321.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_top = 154.0 margin_right = 505.0 @@ -1228,6 +1228,7 @@ valign = 1 __meta__ = { "_edit_use_anchors_": false } + [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="item_selected" from="HSplitContainer/List" to="." method="_on_List_item_selected"] diff --git a/src/Tools/LightenDarken.gd b/src/Tools/Shading.gd similarity index 100% rename from src/Tools/LightenDarken.gd rename to src/Tools/Shading.gd diff --git a/src/Tools/LightenDarken.tscn b/src/Tools/Shading.tscn similarity index 99% rename from src/Tools/LightenDarken.tscn rename to src/Tools/Shading.tscn index 8d39f0cf4..eff647b65 100644 --- a/src/Tools/LightenDarken.tscn +++ b/src/Tools/Shading.tscn @@ -1,7 +1,8 @@ [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/LightenDarken.gd" type="Script" id=2] +[ext_resource path="res://src/Tools/Shading.gd" type="Script" id=2] + [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/src/UI/ToolButtons.gd b/src/UI/ToolButtons.gd index e7e65a7a8..f65c82636 100644 --- a/src/UI/ToolButtons.gd +++ b/src/UI/ToolButtons.gd @@ -16,7 +16,7 @@ onready var tools := [ [$Pencil, "pencil"], [$Eraser, "eraser"], [$Bucket, "fill"], - [$LightenDarken, "lightdark"], + [$Shading, "shading"], [$LineTool, "linetool"], [$RectangleTool, "rectangletool"], [$EllipseTool, "ellipsetool"], diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index c1a4f5798..627c4485d 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -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/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/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/ColorAndToolOptions.tscn" type="PackedScene" id=17] [ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18] @@ -428,7 +428,7 @@ __meta__ = { "_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", ]] margin_top = 468.0 @@ -438,14 +438,14 @@ rect_min_size = Vector2( 32, 32 ) mouse_default_cursor_shape = 2 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_bottom = 32.0 __meta__ = { "_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_bottom = 32.0 texture = ExtResource( 15 )