huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Removed old transparent background & made some tooltip changes

Browse source 
The transparent background has been removed both from code and its files. Changed some hint_tooltips and put them in Translations.pot too.
This commit is contained in:
OverloadedOrama 2020-04-18 18:36:29 +03:00
parent 0d25a48642
commit 53a9719230
16 changed files with 32 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 B

13
Assets/Graphics/Canvas Backgrounds/Transparent Background Dark.png.import
View file

@ -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]

BIN
Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 B

13
Assets/Graphics/Canvas Backgrounds/Transparent Background Godot.png.import
View file

@ -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]

BIN
Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 B

13
Assets/Graphics/Canvas Backgrounds/Transparent Background Gold.png.import
View file

@ -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]

BIN
Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 76 B

13
Assets/Graphics/Canvas Backgrounds/Transparent Background Gray.png.import
View file

@ -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]

BIN
Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 71 B

13
Assets/Graphics/Canvas Backgrounds/Transparent Background Light.png.import
View file

@ -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]

7
Changelog.md
View file

@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [v0.7] - Unreleased ## [v0.7] - Unreleased
This update has been brought to you by the contributions of: 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 ### 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. - 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 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. - 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. - 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. - Importing .pngs as palettes is now possible.
- A confirmation message now appears when the user quits Pixelorama, if there are unsaved changes. - 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. - 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. - The export dialog has also been revamped.
- An asterisk is added to the window title if there are unsaved changes. - An asterisk is added to the window title if there are unsaved changes.
- A VSplitContainer has been added between the canvas and the timeline. - 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. - 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). - 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. - 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. - 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. - The Godot theme has changed.
- Visual change, added border outlines to all window dialogs. - 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. - .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. - 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 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 ### 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 - 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

11
Prefabs/Dialogs/PreferencesDialog.tscn
View file

@ -403,7 +403,7 @@ margin_top = 5.0
margin_right = 110.0 margin_right = 110.0
margin_bottom = 19.0 margin_bottom = 19.0
rect_min_size = Vector2( 110, 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 mouse_filter = 0
text = "Checker size:" text = "Checker size:"
@ -411,6 +411,7 @@ text = "Checker size:"
margin_left = 114.0 margin_left = 114.0
margin_right = 188.0 margin_right = 188.0
margin_bottom = 24.0 margin_bottom = 24.0
hint_tooltip = "Size of the transparent checker background"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
min_value = 1.0 min_value = 1.0
max_value = 16384.0 max_value = 16384.0
@ -422,7 +423,7 @@ suffix = "px"
margin_top = 31.0 margin_top = 31.0
margin_right = 110.0 margin_right = 110.0
margin_bottom = 45.0 margin_bottom = 45.0
hint_tooltip = "A color of the grid" hint_tooltip = "First color of the transparent checker background"
mouse_filter = 0 mouse_filter = 0
text = "Checker color 1:" text = "Checker color 1:"
@ -432,7 +433,7 @@ margin_top = 28.0
margin_right = 188.0 margin_right = 188.0
margin_bottom = 48.0 margin_bottom = 48.0
rect_min_size = Vector2( 64, 20 ) 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 mouse_default_cursor_shape = 2
color = Color( 0.7, 0.7, 0.7, 1 ) 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_top = 55.0
margin_right = 110.0 margin_right = 110.0
margin_bottom = 69.0 margin_bottom = 69.0
hint_tooltip = "A color of the grid" hint_tooltip = "Second color of the transparent checker background"
mouse_filter = 0 mouse_filter = 0
text = "Checker color 2:" text = "Checker color 2:"
@ -450,7 +451,7 @@ margin_top = 52.0
margin_right = 188.0 margin_right = 188.0
margin_bottom = 72.0 margin_bottom = 72.0
rect_min_size = Vector2( 64, 20 ) 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 mouse_default_cursor_shape = 2
color = Color( 1, 1, 1, 1 ) color = Color( 1, 1, 1, 1 )

3
Scripts/Dialogs/AboutDialog.gd
View file

@ -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, " Subhang Nanduri (SbNanduri)")
contributors.create_item(contributor_root).set_text(0, " danielnaoexiste") 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, " 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, " Matheus Pesegoginski (MatheusPese)")
contributors.create_item(contributor_root).set_text(0, " sapient_cogbag") 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() var donors_root := donors.create_item()
donors.create_item(donors_root).set_text(0, " pcmxms") donors.create_item(donors_root).set_text(0, " pcmxms")

5
Scripts/Dialogs/PreferencesDialog.gd
View file

@ -294,35 +294,30 @@ func change_theme(ID : int) -> void:
var ruler_style var ruler_style
if ID == 0: # Dark Theme if ID == 0: # Dark Theme
Global.theme_type = "Dark" 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)) VisualServer.set_default_clear_color(Color(0.247059, 0.25098, 0.247059))
main_theme = preload("res://Themes & Styles/Dark Theme/Dark Theme.tres") main_theme = preload("res://Themes & Styles/Dark Theme/Dark Theme.tres")
top_menu_style = preload("res://Themes & Styles/Dark Theme/DarkTopMenuStyle.tres") top_menu_style = preload("res://Themes & Styles/Dark Theme/DarkTopMenuStyle.tres")
ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres") ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres")
elif ID == 1: # Gray Theme elif ID == 1: # Gray Theme
Global.theme_type = "Dark" 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)) VisualServer.set_default_clear_color(Color(0.301961, 0.301961, 0.301961))
main_theme = preload("res://Themes & Styles/Gray Theme/Gray Theme.tres") main_theme = preload("res://Themes & Styles/Gray Theme/Gray Theme.tres")
top_menu_style = preload("res://Themes & Styles/Gray Theme/GrayTopMenuStyle.tres") top_menu_style = preload("res://Themes & Styles/Gray Theme/GrayTopMenuStyle.tres")
ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres") ruler_style = preload("res://Themes & Styles/Dark Theme/DarkRulerStyle.tres")
elif ID == 2: # Godot's Theme elif ID == 2: # Godot's Theme
Global.theme_type = "Dark" 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)) 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") 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") top_menu_style = preload("res://Themes & Styles/Godot\'s Theme/TopMenuStyle.tres")
ruler_style = preload("res://Themes & Styles/Godot\'s Theme/RulerStyle.tres") ruler_style = preload("res://Themes & Styles/Godot\'s Theme/RulerStyle.tres")
elif ID == 3: # Gold Theme elif ID == 3: # Gold Theme
Global.theme_type = "Gold" 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)) VisualServer.set_default_clear_color(Color(0.694118, 0.619608, 0.458824))
main_theme = preload("res://Themes & Styles/Gold Theme/Gold Theme.tres") main_theme = preload("res://Themes & Styles/Gold Theme/Gold Theme.tres")
top_menu_style = preload("res://Themes & Styles/Gold Theme/GoldTopMenuStyle.tres") top_menu_style = preload("res://Themes & Styles/Gold Theme/GoldTopMenuStyle.tres")
ruler_style = preload("res://Themes & Styles/Gold Theme/GoldRulerStyle.tres") ruler_style = preload("res://Themes & Styles/Gold Theme/GoldRulerStyle.tres")
elif ID == 4: # Light Theme elif ID == 4: # Light Theme
Global.theme_type = "Light" 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)) VisualServer.set_default_clear_color(Color(0.705882, 0.705882, 0.705882))
main_theme = preload("res://Themes & Styles/Light Theme/Light Theme.tres") main_theme = preload("res://Themes & Styles/Light Theme/Light Theme.tres")
top_menu_style = preload("res://Themes & Styles/Light Theme/LightTopMenuStyle.tres") top_menu_style = preload("res://Themes & Styles/Light Theme/LightTopMenuStyle.tres")

3
Scripts/Global.gd
View file

@ -49,7 +49,6 @@ var smooth_zoom := true
var cursor_image = preload("res://Assets/Graphics/Cursor.png") var cursor_image = preload("res://Assets/Graphics/Cursor.png")
var left_cursor_tool_texture : ImageTexture var left_cursor_tool_texture : ImageTexture
var right_cursor_tool_texture : ImageTexture var right_cursor_tool_texture : ImageTexture
var transparent_background : ImageTexture
# warning-ignore:unused_class_variable # warning-ignore:unused_class_variable
var selected_pixels := [] var selected_pixels := []
var image_clipboard : Image var image_clipboard : Image
@ -303,8 +302,6 @@ func _ready() -> void:
directory_module = XDGDataPaths.new() directory_module = XDGDataPaths.new()
undo_redo = UndoRedo.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() image_clipboard = Image.new()
var root = get_tree().get_root() var root = get_tree().get_root()

20
Translations/Translations.pot
View file

@ -260,7 +260,7 @@ msgstr ""
msgid "Themes" msgid "Themes"
msgstr "" msgstr ""
msgid "Guides & Grid" msgid "Canvas"
msgstr "" msgstr ""
msgid "Shortcuts" msgid "Shortcuts"
@ -546,6 +546,24 @@ msgstr ""
msgid "A color of the grid" msgid "A color of the grid"
msgstr "" 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" msgid "Only custom preset can be modified"
msgstr "" msgstr ""