1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00

Merge pull request #2 from Orama-Interactive/master

Update from Origin
This commit is contained in:
Schweini07 2020-01-02 13:20:45 +01:00 committed by GitHub
commit 978c11431e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 34 additions and 6 deletions

View file

@ -1672,7 +1672,6 @@ current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρι
[node name="ScaleImage" parent="." instance=ExtResource( 63 )]
[node name="PreferencesDialog" parent="." instance=ExtResource( 64 )]
visible = false
[node name="OutlineDialog" parent="." instance=ExtResource( 65 )]

View file

@ -48,7 +48,7 @@ mouse_default_cursor_shape = 2
text = "Art by Erevoid"
flat = true
[node name="CheckBox" type="CheckBox" parent="Contents"]
[node name="ShowOnStartup" type="CheckBox" parent="Contents"]
margin_top = 330.0
margin_right = 400.0
margin_bottom = 354.0
@ -76,4 +76,4 @@ text = "Copyright 2019-2020 Orama Interactive"
align = 1
[connection signal="about_to_show" from="." to="." method="_on_SplashDialog_about_to_show"]
[connection signal="pressed" from="Contents/ArtCredits" to="." method="_on_ArtCredits_pressed"]
[connection signal="toggled" from="Contents/CheckBox" to="." method="_on_CheckBox_toggled"]
[connection signal="toggled" from="Contents/ShowOnStartup" to="." method="_on_ShowOnStartup_toggled"]

View file

@ -10,8 +10,8 @@ func _on_SplashDialog_about_to_show() -> void:
func _on_ArtCredits_pressed() -> void:
OS.shell_open("https://www.instagram.com/erevos_art")
func _on_CheckBox_toggled(pressed) -> void:
func _on_ShowOnStartup_toggled(pressed : bool) -> void:
if pressed:
Global.config_cache.set_value("preferences", "startup", false)
else:
Global.config_cache.set_value("preferences", "startup", true)
Global.config_cache.set_value("preferences", "startup", true)

View file

@ -157,9 +157,11 @@ func _ready() -> void:
Import.import_brushes("Brushes")
$SplashDialog.popup_centered() # Splash screen
if not Global.config_cache.has_section_key("preferences", "startup"):
Global.config_cache.set_value("preferences", "startup", true)
if not Global.config_cache.get_value("preferences", "startup"):
$SplashDialog.hide()
OS.set_window_title("(" + tr("untitled") + ") - Pixelorama")
func _input(event : InputEvent) -> void:

View file

@ -605,4 +605,7 @@ msgid "Create a new empty palette?"
msgstr ""
msgid "Edit Palette"
msgstr ""
msgid "Don't show on the next startup"
msgstr ""

View file

@ -688,6 +688,9 @@ msgstr "Erstelle eine neue leere Palette"
msgid "Edit Palette"
msgstr "Bearbeite Palette"
msgid "Don't show on the next startup"
msgstr ""
#~ msgid "Language:"
#~ msgstr "Sprache:"

View file

@ -670,6 +670,9 @@ msgstr "Δημιουργία νέας κενής παλέττας;"
msgid "Edit Palette"
msgstr "Επεξεργασία Παλέττας"
msgid "Don't show on the next startup"
msgstr "Να μην εμφανιστεί στην επόμενη εκκίνηση"
#~ msgid "Language:"
#~ msgstr "Γλώσσα:"

View file

@ -662,6 +662,9 @@ msgstr "Create a new empty palette?"
msgid "Edit Palette"
msgstr "Edit Palette"
msgid "Don't show on the next startup"
msgstr "Don't show on the next startup"
#~ msgid "Language:"
#~ msgstr "Language:"

View file

@ -690,6 +690,9 @@ msgstr ""
msgid "Edit Palette"
msgstr ""
msgid "Don't show on the next startup"
msgstr ""
#~ msgid "Language:"
#~ msgstr "Langue :"

View file

@ -679,6 +679,9 @@ msgstr ""
msgid "Edit Palette"
msgstr ""
msgid "Don't show on the next startup"
msgstr ""
#~ msgid "Language:"
#~ msgstr "Język:"

View file

@ -670,3 +670,6 @@ msgstr "Criar uma nova paleta vazia?"
msgid "Edit Palette"
msgstr "Editar Paleta"
msgid "Don't show on the next startup"
msgstr ""

View file

@ -678,6 +678,9 @@ msgstr ""
msgid "Edit Palette"
msgstr ""
msgid "Don't show on the next startup"
msgstr ""
#~ msgid "Language:"
#~ msgstr "Язык:"

View file

@ -678,6 +678,9 @@ msgstr ""
msgid "Edit Palette"
msgstr ""
msgid "Don't show on the next startup"
msgstr ""
#~ msgid "Language:"
#~ msgstr "語言:"