tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 10:14:42 -04:00
Code Issues Projects Releases Wiki Activity

Removed the Remove Palette button

Browse source 
Users can now just delete the .json files if they want to remove a palette.
This commit is contained in:
OverloadedOrama 2019-12-30 20:29:46 +02:00
parent 870cf8940d
commit 9ba5f6b023
5 changed files with 28 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scripts/Global.gd
View file

@ -207,9 +207,8 @@ var layer_opacity_slider : HSlider
var layer_opacity_spinbox : SpinBox
var add_palette_button : TextureButton
var remove_palette_button : TextureButton
var palette_option_button : OptionButton
var edit_palette_button : BaseButton
var palette_option_button : OptionButton
var palette_container : GridContainer
var edit_palette_popup : WindowDialog
var new_palette_dialog : ConfirmationDialog
@ -324,9 +323,8 @@ func _ready() -> void:
vbox_layer_container = find_node_by_name(layer_stuff_container, "VBoxLayerContainer")
add_palette_button = find_node_by_name(root, "AddPalette")
remove_palette_button = find_node_by_name(root, "RemovePalette")
palette_option_button = find_node_by_name(root, "PaletteOptionButton")
edit_palette_button = find_node_by_name(root, "EditPalette")
palette_option_button = find_node_by_name(root, "PaletteOptionButton")
palette_container = find_node_by_name(root, "PaletteContainer")
edit_palette_popup = find_node_by_name(root, "EditPalettePopup")
new_palette_dialog = find_node_by_name(root, "NewPaletteDialog")

7
Scripts/Main.gd
View file

@ -924,16 +924,13 @@ func _on_QuitDialog_confirmed() -> void:
func _on_AddPalette_pressed() -> void:
Global.add_palette_button.get_child(0).popup(Rect2(Global.add_palette_button.rect_global_position, Vector2.ONE))
func _on_RemovePalette_pressed() -> void:
Global.palette_container.remove_current_palette()
func _on_EditPalette_pressed() -> void:
Global.palette_container.on_edit_palette()
func _on_PaletteOptionButton_item_selected(ID) -> void:
var palette_name = Global.palette_option_button.get_item_metadata(ID)
Global.palette_container.on_palette_select(palette_name)
func _on_EditPalette_pressed() -> void:
Global.palette_container.on_edit_palette()
func add_palette_menu_id_pressed(id) -> void:
match id:
0: # New Empty Palette

24
Scripts/Palette/PaletteContainer.gd
View file

@ -7,7 +7,6 @@ const custom_palettes_path := "Palettes/Custom"
var current_palette = "Default"
var from_palette : Palette
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
_load_palettes()
@ -22,14 +21,9 @@ func _clear_swatches() -> void:
func on_palette_select(palette_name : String) -> void:
_clear_swatches()
if Global.palettes.has(palette_name): #Palette exists in memory
if Global.palettes.has(palette_name): # Palette exists in memory
current_palette = palette_name
var palette : Palette = Global.palettes[palette_name]
Global.remove_palette_button.disabled = true # Cannot remove by default
if palette.editable:
Global.remove_palette_button.disabled = false # Can remove if custom palette
_display_palette(palette)
func on_new_empty_palette() -> void:
@ -189,24 +183,8 @@ func get_palette_files(path : String) -> Array:
results.append(file_name)
dir.list_dir_end()
return results
func remove_current_palette() -> void:
if Global.palettes[current_palette].editable:
_delete_palette_file(current_palette + ".json")
Global.palettes.erase(current_palette)
var selected_index: int = Global.palette_option_button.selected
Global.palette_option_button.remove_item(selected_index)
if(selected_index - 1 >= 0):
Global.palette_option_button.select(selected_index - 1)
on_palette_select(Global.palette_option_button.get_item_metadata(selected_index - 1))
func _delete_palette_file(file_name : String) -> void:
var dir = Directory.new()
dir.remove(custom_palettes_path.plus_file(file_name))
func save_palette(palette_name : String, filename : String) -> void:
var palette = Global.palettes[palette_name]
palette.save_to_file(custom_palettes_path.plus_file(filename))