tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-07-06 19:04:44 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into text-tool

Browse source
This commit is contained in:
OverloadedOrama 2020-10-16 23:35:55 +03:00
commit e16a4f14fa
45 changed files with 1089 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Palette/PaletteContainer.gd
View file

@ -9,6 +9,7 @@ var current_palette = "Default"
var from_palette : Palette
onready var palette_from_sprite_dialog = $"../../../../PaletteFromSpriteDialog"
onready var remove_palette_warning = $"../../../../RemovePaletteWarning"
func _ready() -> void:
@ -411,7 +412,8 @@ func _on_NewPaletteDialog_popup_hide() -> void:
func _on_RemovePalette_pressed() -> void:
remove_palette(current_palette)
remove_palette_warning.popup_centered()
Global.dialog_open(true)
func _on_PaletteFromSpriteDialog_confirmed() -> void:
@ -420,3 +422,11 @@ func _on_PaletteFromSpriteDialog_confirmed() -> void:
func _on_PaletteFromSpriteDialog_popup_hide() -> void:
Global.dialog_open(false)
func _on_RemovePaletteWarning_confirmed() -> void:
remove_palette(current_palette)
func _on_RemovePaletteWarning_popup_hide() -> void:
Global.dialog_open(false)

7
src/Palette/PalettePanelContainer.tscn
View file

@ -244,6 +244,11 @@ mouse_default_cursor_shape = 2
text = "Current cel"
items = [ "Current cel", null, false, 0, null, "Current frame", null, false, 1, null, "All frames", null, false, 2, null ]
selected = 0
[node name="RemovePaletteWarning" type="ConfirmationDialog" parent="."]
margin_right = 200.0
margin_bottom = 70.0
dialog_text = "Are you sure you want to remove this palette? (Cannot be undone)"
[connection signal="pressed" from="PaletteVBoxContainer/CenterContainer/PaletteButtons/AddPalette" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_AddPalette_pressed"]
[connection signal="pressed" from="PaletteVBoxContainer/CenterContainer/PaletteButtons/EditPalette" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="on_edit_palette"]
[connection signal="pressed" from="PaletteVBoxContainer/CenterContainer/PaletteButtons/RemovePalette" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_RemovePalette_pressed"]
@ -254,3 +259,5 @@ selected = 0
[connection signal="popup_hide" from="PaletteImportFileDialog" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_NewPaletteDialog_popup_hide"]
[connection signal="confirmed" from="PaletteFromSpriteDialog" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_PaletteFromSpriteDialog_confirmed"]
[connection signal="popup_hide" from="PaletteFromSpriteDialog" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_PaletteFromSpriteDialog_popup_hide"]
[connection signal="confirmed" from="RemovePaletteWarning" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_RemovePaletteWarning_confirmed"]
[connection signal="popup_hide" from="RemovePaletteWarning" to="PaletteVBoxContainer/ScrollPalette/CenterPalette/PaletteContainer" method="_on_RemovePaletteWarning_popup_hide"]

4
src/UI/Dialogs/AboutDialog.gd
View file

@ -31,6 +31,7 @@ func _ready() -> void:
contributors.create_item(contributor_root).set_text(0, " sapient_cogbag")
contributors.create_item(contributor_root).set_text(0, " Matthew Paul (matthewpaul-us)")
contributors.create_item(contributor_root).set_text(0, " danielnaoexiste")
contributors.create_item(contributor_root).set_text(0, " PinyaColada")
contributors.create_item(contributor_root).set_text(0, " Subhang Nanduri (SbNanduri)")
contributors.create_item(contributor_root).set_text(0, " Dávid Gábor BODOR (dragonfi)")
contributors.create_item(contributor_root).set_text(0, " John Jerome Romero (Wishdream)")
@ -38,7 +39,6 @@ func _ready() -> void:
contributors.create_item(contributor_root).set_text(0, " Aaron Franke (aaronfranke)")
contributors.create_item(contributor_root).set_text(0, " rob-a-bolton")
contributors.create_item(contributor_root).set_text(0, " Vriska Weaver (henlo-birb)")
contributors.create_item(contributor_root).set_text(0, " PinyaColada")
var donors_root := donors.create_item()
donors.create_item(donors_root).set_text(0, " pcmxms - https://www.nonamefornowsoft.com.br/")
@ -93,6 +93,7 @@ func _on_AboutDialog_about_to_show() -> void:
translators.create_item(translators_root).set_text(0, " IagoAndrade - " + tr("Brazilian Portuguese"))
translators.create_item(translators_root).set_text(0, " chacal_exodius - " + tr("Brazilian Portuguese"))
translators.create_item(translators_root).set_text(0, " Lucas Santiago (lu.santi.oli) - " + tr("Brazilian Portuguese"))
translators.create_item(translators_root).set_text(0, " TheNoobPro44 - " + tr("Brazilian Portuguese"))
translators.create_item(translators_root).set_text(0, " Andreev Andrei - " + tr("Russian"))
translators.create_item(translators_root).set_text(0, " ax trifonov (ax34) - " + tr("Russian"))
translators.create_item(translators_root).set_text(0, " Artem (blinovartem) - " + tr("Russian"))
@ -114,6 +115,7 @@ func _on_AboutDialog_about_to_show() -> void:
translators.create_item(translators_root).set_text(0, " Aninuscsalas - " + tr("Hungarian"))
translators.create_item(translators_root).set_text(0, " jaehyeon1090 - " + tr("Korean"))
translators.create_item(translators_root).set_text(0, " sfun_G - " + tr("Korean"))
translators.create_item(translators_root).set_text(0, " KripC2160 - " + tr("Korean"))
translators.create_item(translators_root).set_text(0, " M. Gabriel Lup - " + tr("Romanian"))

2
src/UI/TopMenuContainer.gd
View file

@ -382,7 +382,7 @@ func help_menu_id_pressed(id : int) -> void:
if OS.get_name() == "OSX":
OS.shell_open("https://github.com/Orama-Interactive/Pixelorama/blob/master/CHANGELOG.md")
else:
OS.shell_open("https://github.com/Orama-Interactive/Pixelorama/blob/master/CHANGELOG.md#v08---2020-09-23")
OS.shell_open("https://github.com/Orama-Interactive/Pixelorama/blob/master/CHANGELOG.md#v08---2020-10-14")
4: # About Pixelorama
Global.control.get_node("Dialogs/AboutDialog").popup_centered()
Global.dialog_open(true)