From 53a9719230853bdedc96f1d6fb8bc204cd45b41e Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Sat, 18 Apr 2020 18:36:29 +0300
Subject: [PATCH] Removed old transparent background & made some tooltip
 changes

The transparent background has been removed both from code and its files. Changed some hint_tooltips and put them in Translations.pot too.
---
 .../Transparent Background Dark.png           | Bin 76 -> 0 bytes
 .../Transparent Background Dark.png.import    |  13 ------------
 .../Transparent Background Godot.png          | Bin 76 -> 0 bytes
 .../Transparent Background Godot.png.import   |  13 ------------
 .../Transparent Background Gold.png           | Bin 76 -> 0 bytes
 .../Transparent Background Gold.png.import    |  13 ------------
 .../Transparent Background Gray.png           | Bin 76 -> 0 bytes
 .../Transparent Background Gray.png.import    |  13 ------------
 .../Transparent Background Light.png          | Bin 71 -> 0 bytes
 .../Transparent Background Light.png.import   |  13 ------------
 Changelog.md                                  |   7 ++++--
 Prefabs/Dialogs/PreferencesDialog.tscn        |  11 +++++-----
 Scripts/Dialogs/AboutDialog.gd                |   3 ++-
 Scripts/Dialogs/PreferencesDialog.gd          |   5 -----
 Scripts/Global.gd                             |   3 ---
 Translations/Translations.pot                 |  20 +++++++++++++++++-
 16 files changed, 32 insertions(+), 82 deletions(-)
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png
 delete mode 100644 Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png
deleted file mode 100644
index e88250d36199214722fa11c3942200ba02c75e77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScwrJzX3_DsCmOSfRn+&ymiMq`=Lf
X#Kv;_%#$7Kfzk|~u6{1-oD!M<S6C9(

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import
deleted file mode 100644
index e8017cb56..000000000
--- a/Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import	
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="image"
-type="Image"
-path="res://.import/Transparent Background Dark.png-76340c38abb38368ba157d6d42537548.image"
-
-[deps]
-
-source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png"
-dest_files=[ "res://.import/Transparent Background Dark.png-76340c38abb38368ba157d6d42537548.image" ]
-
-[params]
-
diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png
deleted file mode 100644
index 6ef7a9d03f9c45f053ae3595b10e20f03c53f45d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScwrJzX3_DsCmecsWy0c=B<EBMxE=
X>TRrR>l7H;fzk|~u6{1-oD!M<cK#DA

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import
deleted file mode 100644
index 191921df3..000000000
--- a/Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import	
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="image"
-type="Image"
-path="res://.import/Transparent Background Godot.png-2ddcbcc731f6af7d3e0a5b1ee5b54844.image"
-
-[deps]
-
-source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png"
-dest_files=[ "res://.import/Transparent Background Godot.png-2ddcbcc731f6af7d3e0a5b1ee5b54844.image" ]
-
-[params]
-
diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png
deleted file mode 100644
index 256f21a5017d3ec405dbb9e3ae3f08988292440e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScwrJzX3_DsCm;*k76#AI-@uz#Pe7
X^n~5`)#b}Sfzk|~u6{1-oD!M<cX$*l

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import
deleted file mode 100644
index 17440251b..000000000
--- a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import	
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="image"
-type="Image"
-path="res://.import/Transparent Background Gold.png-9883f0ee7852c84e58c30fd7ac89dd4d.image"
-
-[deps]
-
-source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png"
-dest_files=[ "res://.import/Transparent Background Gold.png-9883f0ee7852c84e58c30fd7ac89dd4d.image" ]
-
-[params]
-
diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png
deleted file mode 100644
index 7a5543a8f455a73d6988a032c1ea284ca576d7da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScwrJzX3_DsCl5Y)EiSb!BB1V2)(a
X<71orH|KmmP@2Kh)z4*}Q$iB}N3RkI

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import
deleted file mode 100644
index d8bce1ccc..000000000
--- a/Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import	
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="image"
-type="Image"
-path="res://.import/Transparent Background Gray.png-eed3c3f748abdb10b7fbc1cb1016c71f.image"
-
-[deps]
-
-source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png"
-dest_files=[ "res://.import/Transparent Background Gray.png-eed3c3f748abdb10b7fbc1cb1016c71f.image" ]
-
-[params]
-
diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png b/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png
deleted file mode 100644
index 0ce157cba8181d2275a25a736fb60bbe706891c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBpAZ)2K@k1e4Z|jAr*|tKk6qwd{ocC^^AF8
S$oI4fAQhgjelF{r5}E)JrV@n!

diff --git a/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import b/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import
deleted file mode 100644
index c1a18ee35..000000000
--- a/Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import	
+++ /dev/null
@@ -1,13 +0,0 @@
-[remap]
-
-importer="image"
-type="Image"
-path="res://.import/Transparent Background Light.png-c7ac6073a0483aa35eb1dc260c1a8481.image"
-
-[deps]
-
-source_file="res://Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png"
-dest_files=[ "res://.import/Transparent Background Light.png-c7ac6073a0483aa35eb1dc260c1a8481.image" ]
-
-[params]
-
diff --git a/Changelog.md b/Changelog.md
index 868f7864d..ababa4358 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [v0.7] - Unreleased
 This update has been brought to you by the contributions of:
 
-Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Pesegoginski (MatheusPese), sapient-cogbag
+Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Pesegoginski (MatheusPese), sapient-cogbag, Kinwailo
 
 ### Added
 - Cels are now in the timeline. Each cel refers to a specific layer AND a frame. Frames are a collection of cels for every layer.
@@ -16,7 +16,7 @@ Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Peseg
 - A new rotation method has been added, "Upscale, Rotate and Downscale". It's similar to Rotsprite.
 - A HSV Adjust dialog has been added in the Images menu.
 - Pattern filling is now possible. If the user chooses a brush that is not the pixel or a circle brush and uses the bucket tool, the brush image is used as a pattern that fills the area.
-- Users can change keyboard shortcut binding for tools.
+- Users can now change keyboard shortcut bindings for tools, in the Preferences.
 - Importing .pngs as palettes is now possible.
 - A confirmation message now appears when the user quits Pixelorama, if there are unsaved changes.
 - Templates and a lock aspect ratio option have been added to the "Create new image" dialog.
@@ -33,9 +33,11 @@ Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Peseg
 - The export dialog has also been revamped.
 - An asterisk is added to the window title if there are unsaved changes.
 - A VSplitContainer has been added between the canvas and the timeline.
+- The texture of the transparent checker background is now no longer affected by the zoom value. The users can now also change the texture's colors and the size.
 - Notification text is now black on the gold and light themes.
 - Layer's LineEdit now saves the changes when it loses focus, or when the user presses ESC (or Enter).
 - LineEdits lose focus when the user presses Enter.
+- When cloning a frame, the clone will appear next to the original.
 - Layer visibility is taken into account when exporting the drawing as a .png file. This means that invisible layers will not be included in the final .png file.
 - The Godot theme has changed.
 - Visual change, added border outlines to all window dialogs.
@@ -45,6 +47,7 @@ Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Peseg
 - .pxo files now use ZSTD compression to result in smaller file sizes.
 - Palettes/Brushes get loaded/saved in appropriate locations as specified by the XDG basedir standard, for easier usage of standard linux/bsd packaging methods and for better per-user usability.
 - The splash screen is no longer purple, it now gets affected by the chosen theme.
+- The brush selection popup now closes when a brush is selected.
 
 ### Fixed
 - Chinese characters not being rendered in notifications (the labels that appear when undoing/redoing) and at the splash screen for Platinum & Gold Sponsor Placeholder labels
diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn
index e9eeec784..c92c96038 100644
--- a/Prefabs/Dialogs/PreferencesDialog.tscn
+++ b/Prefabs/Dialogs/PreferencesDialog.tscn
@@ -403,7 +403,7 @@ margin_top = 5.0
 margin_right = 110.0
 margin_bottom = 19.0
 rect_min_size = Vector2( 110, 0 )
-hint_tooltip = "Sets how far apart are vertical lines of the grid"
+hint_tooltip = "Size of the transparent checker background"
 mouse_filter = 0
 text = "Checker size:"
 
@@ -411,6 +411,7 @@ text = "Checker size:"
 margin_left = 114.0
 margin_right = 188.0
 margin_bottom = 24.0
+hint_tooltip = "Size of the transparent checker background"
 mouse_default_cursor_shape = 2
 min_value = 1.0
 max_value = 16384.0
@@ -422,7 +423,7 @@ suffix = "px"
 margin_top = 31.0
 margin_right = 110.0
 margin_bottom = 45.0
-hint_tooltip = "A color of the grid"
+hint_tooltip = "First color of the transparent checker background"
 mouse_filter = 0
 text = "Checker color 1:"
 
@@ -432,7 +433,7 @@ margin_top = 28.0
 margin_right = 188.0
 margin_bottom = 48.0
 rect_min_size = Vector2( 64, 20 )
-hint_tooltip = "First color of the transparent checker"
+hint_tooltip = "First color of the transparent checker background"
 mouse_default_cursor_shape = 2
 color = Color( 0.7, 0.7, 0.7, 1 )
 
@@ -440,7 +441,7 @@ color = Color( 0.7, 0.7, 0.7, 1 )
 margin_top = 55.0
 margin_right = 110.0
 margin_bottom = 69.0
-hint_tooltip = "A color of the grid"
+hint_tooltip = "Second color of the transparent checker background"
 mouse_filter = 0
 text = "Checker color 2:"
 
@@ -450,7 +451,7 @@ margin_top = 52.0
 margin_right = 188.0
 margin_bottom = 72.0
 rect_min_size = Vector2( 64, 20 )
-hint_tooltip = "Second color of the transparent checker"
+hint_tooltip = "Second color of the transparent checker background"
 mouse_default_cursor_shape = 2
 color = Color( 1, 1, 1, 1 )
 
diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd
index e1fde47ce..d906d4b4f 100644
--- a/Scripts/Dialogs/AboutDialog.gd
+++ b/Scripts/Dialogs/AboutDialog.gd
@@ -26,9 +26,10 @@ func _ready() -> void:
 	contributors.create_item(contributor_root).set_text(0, "  Subhang Nanduri (SbNanduri)")
 	contributors.create_item(contributor_root).set_text(0, "  danielnaoexiste")
 	contributors.create_item(contributor_root).set_text(0, "  Noah Burck (haonkrub)")
-	contributors.create_item(contributor_root).set_text(0, "  luiq54")
+	contributors.create_item(contributor_root).set_text(0, "  Darshan Phaldesai (luiq54)")
 	contributors.create_item(contributor_root).set_text(0, "  Matheus Pesegoginski (MatheusPese)")
 	contributors.create_item(contributor_root).set_text(0, "  sapient_cogbag")
+	contributors.create_item(contributor_root).set_text(0, "  Kinwailo")
 
 	var donors_root := donors.create_item()
 	donors.create_item(donors_root).set_text(0, "  pcmxms")
diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd
index 801b0d349..07df4c3b6 100644
--- a/Scripts/Dialogs/PreferencesDialog.gd
+++ b/Scripts/Dialogs/PreferencesDialog.gd
@@ -294,35 +294,30 @@ func change_theme(ID : int) -> void:
 	var ruler_style
 	if ID == 0: # Dark Theme
 		Global.theme_type = "Dark"
-		Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png"), 0)
 		VisualServer.set_default_clear_color(Color(0.247059, 0.25098, 0.247059))
 		main_theme = preload("res://Themes & Styles/Dark Theme/Dark Theme.tres")
 		top_menu_style = preload("res://Themes & Styles/Dark Theme/DarkTopMenuStyle.tres")
 		ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres")
 	elif ID == 1: # Gray Theme
 		Global.theme_type = "Dark"
-		Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png"), 0)
 		VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961))
 		main_theme = preload("res://Themes & Styles/Gray Theme/Gray Theme.tres")
 		top_menu_style = preload("res://Themes & Styles/Gray Theme/GrayTopMenuStyle.tres")
 		ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres")
 	elif ID == 2: # Godot's Theme
 		Global.theme_type = "Dark"
-		Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png"), 0)
 		VisualServer.set_default_clear_color(Color(0.27451, 0.278431, 0.305882))
 		main_theme = preload("res://Themes & Styles/Godot\'s Theme/Godot\'s Theme.tres")
 		top_menu_style = preload("res://Themes & Styles/Godot\'s Theme/TopMenuStyle.tres")
 		ruler_style = preload("res://Themes & Styles/Godot\'s Theme/RulerStyle.tres")
 	elif ID == 3: # Gold Theme
 		Global.theme_type = "Gold"
-		Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png"), 0)
 		VisualServer.set_default_clear_color(Color(0.694118, 0.619608, 0.458824))
 		main_theme = preload("res://Themes & Styles/Gold Theme/Gold Theme.tres")
 		top_menu_style = preload("res://Themes & Styles/Gold Theme/GoldTopMenuStyle.tres")
 		ruler_style = preload("res://Themes & Styles/Gold Theme/GoldRulerStyle.tres")
 	elif ID == 4: # Light Theme
 		Global.theme_type = "Light"
-		Global.transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png"), 0)
 		VisualServer.set_default_clear_color(Color(0.705882, 0.705882, 0.705882))
 		main_theme = preload("res://Themes & Styles/Light Theme/Light Theme.tres")
 		top_menu_style = preload("res://Themes & Styles/Light Theme/LightTopMenuStyle.tres")
diff --git a/Scripts/Global.gd b/Scripts/Global.gd
index e9d3234dd..acd0ad862 100644
--- a/Scripts/Global.gd
+++ b/Scripts/Global.gd
@@ -49,7 +49,6 @@ var smooth_zoom := true
 var cursor_image = preload("res://Assets/Graphics/Cursor.png")
 var left_cursor_tool_texture : ImageTexture
 var right_cursor_tool_texture : ImageTexture
-var transparent_background : ImageTexture
 # warning-ignore:unused_class_variable
 var selected_pixels := []
 var image_clipboard : Image
@@ -303,8 +302,6 @@ func _ready() -> void:
 	directory_module = XDGDataPaths.new()
 
 	undo_redo = UndoRedo.new()
-	transparent_background = ImageTexture.new()
-	transparent_background.create_from_image(preload("res://Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png"), 0)
 	image_clipboard = Image.new()
 
 	var root = get_tree().get_root()
diff --git a/Translations/Translations.pot b/Translations/Translations.pot
index 7086e92fd..03675d6eb 100644
--- a/Translations/Translations.pot
+++ b/Translations/Translations.pot
@@ -260,7 +260,7 @@ msgstr ""
 msgid "Themes"
 msgstr ""
 
-msgid "Guides & Grid"
+msgid "Canvas"
 msgstr ""
 
 msgid "Shortcuts"
@@ -546,6 +546,24 @@ msgstr ""
 msgid "A color of the grid"
 msgstr ""
 
+msgid "Checker size"
+msgstr ""
+
+msgid "Size of the transparent checker background"
+msgstr ""
+
+msgid "Checker color 1"
+msgstr ""
+
+msgid "First color of the transparent checker background"
+msgstr ""
+
+msgid "Checker color 2"
+msgstr ""
+
+msgid "Second color of the transparent checker background"
+msgstr ""
+
 msgid "Only custom preset can be modified"
 msgstr ""