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

When making a new palette or importing one and its name already exists, Pixelorama will add a number to its name.

Browse source 
For example, "Palette_Name" would become "Palette_Name (2)", "Palette_Name (3)", etc.
This commit is contained in:
OverloadedOrama 2020-06-24 20:02:03 +03:00
parent 90d02ad75b
commit 5df25c21c6
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ Darshan Phaldesai (luiq54), Igor Santarek (jegor377), rob-a-bolton, Kinwailo
- Pixel perfect is no longer enabled when the brush size is bigger than 1px. - Pixel perfect is no longer enabled when the brush size is bigger than 1px.
- The .pxo file structure has been changed. It's now consisted of a JSON-structured metadata part, where all the data that can be stored as text are, and a binary part, that contain all the actual image data for each cel and project brush. - The .pxo file structure has been changed. It's now consisted of a JSON-structured metadata part, where all the data that can be stored as text are, and a binary part, that contain all the actual image data for each cel and project brush.
- When making a straight line, a preview of how the line's pixels will look is now being shown. ([#260](https://github.com/Orama-Interactive/Pixelorama/pull/260)) - When making a straight line, a preview of how the line's pixels will look is now being shown. ([#260](https://github.com/Orama-Interactive/Pixelorama/pull/260))
- When making a new palette or importing one and its name already exists, Pixelorama will add a number to its name. For example, "Palette_Name" would become "Palette_Name (2)", "Palette_Name (3)", etc.
- Language and theme checkboxes are now radio buttons. - Language and theme checkboxes are now radio buttons.
- The Blue theme has more similar margins and seperations with the rest of the themes. - The Blue theme has more similar margins and seperations with the rest of the themes.

3
Translations/Translations.pot
View file

@ -1029,9 +1029,6 @@ msgstr ""
msgid "Error: Palette must have a valid name." msgid "Error: Palette must have a valid name."
msgstr "" msgstr ""
msgid "Error: Palette named '%s' already exists!"
msgstr ""
msgid "Invalid Palette file!" msgid "Invalid Palette file!"
msgstr "" msgstr ""

45
src/Palette/PaletteContainer.gd
View file

@ -54,18 +54,14 @@ func on_palette_import_file_selected(path : String) -> void:
palette = Import.import_png_palette(path) palette = Import.import_png_palette(path)
if palette: if palette:
if not Global.palettes.has(palette.name): palette.name = palette_name_replace(palette.name)
Global.palettes[palette.name] = palette Global.palettes[palette.name] = palette
Global.palette_option_button.add_item(palette.name) Global.palette_option_button.add_item(palette.name)
var index: int = Global.palette_option_button.get_item_count() - 1 var index: int = Global.palette_option_button.get_item_count() - 1
Global.palette_option_button.set_item_metadata(index, palette.name) Global.palette_option_button.set_item_metadata(index, palette.name)
Global.palette_option_button.select(index) Global.palette_option_button.select(index)
on_palette_select(palette.name) on_palette_select(palette.name)
save_palette(palette.name, palette.name + ".json") save_palette(palette.name, palette.name + ".json")
else:
Global.error_dialog.set_text(tr("Error: Palette named '%s' already exists!") % palette.name)
Global.error_dialog.popup_centered()
Global.dialog_open(true)
else: else:
Global.error_dialog.set_text("Invalid Palette file!") Global.error_dialog.set_text("Invalid Palette file!")
Global.error_dialog.popup_centered() Global.error_dialog.popup_centered()
@ -87,10 +83,10 @@ func on_new_palette_confirmed() -> void:
func add_palette_menu_id_pressed(id : int) -> void: func add_palette_menu_id_pressed(id : int) -> void:
match id: match id:
0: # New Empty Palette 0: # New Empty Palette
Global.palette_container.on_new_empty_palette() on_new_empty_palette()
1: # Import Palette 1: # Import Palette
Global.palette_container.on_import_palette() on_import_palette()
func create_new_palette(name : String, _from_palette : Palette) -> String: # Returns empty string, else error string func create_new_palette(name : String, _from_palette : Palette) -> String: # Returns empty string, else error string
@ -99,8 +95,8 @@ func create_new_palette(name : String, _from_palette : Palette) -> String: # Ret
# Check if new name is valid # Check if new name is valid
if name.empty(): if name.empty():
return tr("Error: Palette must have a valid name.") return tr("Error: Palette must have a valid name.")
if Global.palettes.has(name):
return tr("Error: Palette named '%s' already exists!") % name name = palette_name_replace(name)
new_palette.name = name new_palette.name = name
# Check if source palette has data # Check if source palette has data
@ -122,6 +118,19 @@ func create_new_palette(name : String, _from_palette : Palette) -> String: # Ret
return "" return ""
# Checks if the palette name already exists
# If it does, add a number to its name, for example
# "Palette_Name" will become "Palette_Name (2)", "Palette_Name (3)", etc.
func palette_name_replace(name : String) -> String:
var i := 1
var temp_name := name
while Global.palettes.has(temp_name):
i += 1
temp_name = name + " (%s)" % i
name = temp_name
return name
func on_edit_palette() -> void: func on_edit_palette() -> void:
var palette : Palette = Global.palettes[current_palette] var palette : Palette = Global.palettes[current_palette]