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 #103 from Schweini07/master

Make the Splash Screen popup optional and German localization UPDATE
This commit is contained in:
Manolis Papadeas 2020-01-01 19:54:15 +02:00 committed by GitHub
commit 9e9dbcb920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 48 deletions

View file

@ -7,9 +7,12 @@
[node name="SplashDialog" type="WindowDialog"] [node name="SplashDialog" type="WindowDialog"]
margin_right = 400.0 margin_right = 400.0
margin_bottom = 380.0 margin_bottom = 399.0
rect_min_size = Vector2( 400, 380 ) rect_min_size = Vector2( 400, 380 )
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Contents" type="VBoxContainer" parent="."] [node name="Contents" type="VBoxContainer" parent="."]
anchor_right = 1.0 anchor_right = 1.0
@ -45,25 +48,32 @@ mouse_default_cursor_shape = 2
text = "Art by Erevoid" text = "Art by Erevoid"
flat = true flat = true
[node name="HSeparator2" type="HSeparator" parent="Contents"] [node name="CheckBox" type="CheckBox" parent="Contents"]
margin_top = 330.0 margin_top = 330.0
margin_right = 400.0 margin_right = 400.0
margin_bottom = 334.0 margin_bottom = 354.0
text = "Don't show on the next startup"
[node name="HSeparator2" type="HSeparator" parent="Contents"]
margin_top = 358.0
margin_right = 400.0
margin_bottom = 362.0
[node name="DevelopedBy" type="Label" parent="Contents"] [node name="DevelopedBy" type="Label" parent="Contents"]
margin_top = 338.0 margin_top = 366.0
margin_right = 400.0 margin_right = 400.0
margin_bottom = 351.0 margin_bottom = 379.0
custom_fonts/font = ExtResource( 4 ) custom_fonts/font = ExtResource( 4 )
text = "Pixelorama v0.6 - Developed by Orama Interactive" text = "Pixelorama v0.6 - Developed by Orama Interactive"
align = 1 align = 1
[node name="Copyright" type="Label" parent="Contents"] [node name="Copyright" type="Label" parent="Contents"]
margin_top = 355.0 margin_top = 383.0
margin_right = 400.0 margin_right = 400.0
margin_bottom = 368.0 margin_bottom = 396.0
custom_fonts/font = ExtResource( 4 ) custom_fonts/font = ExtResource( 4 )
text = "Copyright 2019-2020 Orama Interactive" text = "Copyright 2019-2020 Orama Interactive"
align = 1 align = 1
[connection signal="about_to_show" from="." to="." method="_on_SplashDialog_about_to_show"] [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="pressed" from="Contents/ArtCredits" to="." method="_on_ArtCredits_pressed"]
[connection signal="toggled" from="Contents/CheckBox" to="." method="_on_CheckBox_toggled"]

View file

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

View file

@ -157,6 +157,9 @@ func _ready() -> void:
Import.import_brushes("Brushes") Import.import_brushes("Brushes")
$SplashDialog.popup_centered() # Splash screen $SplashDialog.popup_centered() # Splash screen
if not Global.config_cache.get_value("preferences", "startup"):
$SplashDialog.hide()
OS.set_window_title("(" + tr("untitled") + ") - Pixelorama") OS.set_window_title("(" + tr("untitled") + ") - Pixelorama")
func _input(event : InputEvent) -> void: func _input(event : InputEvent) -> void:
@ -925,4 +928,4 @@ func _on_QuitDialog_confirmed() -> void:
# (it won't respond to user input in this state). # (it won't respond to user input in this state).
modulate = Color(0.5, 0.5, 0.5) modulate = Color(0.5, 0.5, 0.5)
get_tree().quit() get_tree().quit()

View file

@ -50,10 +50,10 @@ msgstr "Ansicht"
#, fuzzy #, fuzzy
msgid "Image" msgid "Image"
msgstr "Bildgröße" msgstr "Bild"
msgid "Effects" msgid "Effects"
msgstr "" msgstr "Effekte"
msgid "Help" msgid "Help"
msgstr "Hilfe" msgstr "Hilfe"
@ -148,10 +148,10 @@ msgid "Export Sprite"
msgstr "Exportiere Sprite" msgstr "Exportiere Sprite"
msgid "File Exists, Overwrite?" msgid "File Exists, Overwrite?"
msgstr "" msgstr "Datei existiert schon, überschreiben?"
msgid "Resize:" msgid "Resize:"
msgstr "" msgstr "Größe verändern"
#, fuzzy #, fuzzy
msgid "EXPORT_CURRENT_FRAME_LABEL" msgid "EXPORT_CURRENT_FRAME_LABEL"
@ -166,10 +166,10 @@ msgid "EXPORT_FRAMES_AS_SPRITESHEET_LABEL"
msgstr "Vertikales Spritesheet" msgstr "Vertikales Spritesheet"
msgid "Columns" msgid "Columns"
msgstr "" msgstr "Spalten"
msgid "Rows" msgid "Rows"
msgstr "" msgstr "Reihen"
msgid "Path:" msgid "Path:"
msgstr "Pfad:" msgstr "Pfad:"
@ -178,7 +178,7 @@ msgid "Directories & Files:"
msgstr "Verzeichnisse & Dateien:" msgstr "Verzeichnisse & Dateien:"
msgid "Create Folder" msgid "Create Folder"
msgstr "" msgstr "Erstelle Ordner"
msgid "File:" msgid "File:"
msgstr "Datei:" msgstr "Datei:"
@ -203,18 +203,18 @@ msgid "Language"
msgstr "Sprache:" msgstr "Sprache:"
msgid "Themes" msgid "Themes"
msgstr "" msgstr "Designs"
msgid "Guides & Grid" msgid "Guides & Grid"
msgstr "" msgstr "Guides & Gitter"
#, fuzzy #, fuzzy
msgid "Language options" msgid "Language options"
msgstr "Sprache:" msgstr "Sprachoptionen"
#, fuzzy #, fuzzy
msgid "Theme options" msgid "Theme options"
msgstr "Gitter Optionen" msgstr "Design Optionen"
msgid "Grid options" msgid "Grid options"
msgstr "Gitter Optionen" msgstr "Gitter Optionen"
@ -223,7 +223,7 @@ msgid "Color:"
msgstr "Farbe:" msgstr "Farbe:"
msgid "Guide color:" msgid "Guide color:"
msgstr "" msgstr "Guidefarbe"
msgid "System Language" msgid "System Language"
msgstr "Systemsprache" msgstr "Systemsprache"
@ -243,31 +243,31 @@ msgid "Light"
msgstr "Erhellen" msgstr "Erhellen"
msgid "Invert colors" msgid "Invert colors"
msgstr "" msgstr "Kehre Farben um"
msgid "Desaturation" msgid "Desaturation"
msgstr "" msgstr "Entsättigung"
msgid "Outline" msgid "Outline"
msgstr "" msgstr "Umriss"
msgid "Diagonal" msgid "Diagonal"
msgstr "" msgstr "Diagonal"
msgid "Place inside image" msgid "Place inside image"
msgstr "" msgstr "Platziere in Bild"
msgid "Thickness:" msgid "Thickness:"
msgstr "" msgstr "Dicke:"
msgid "View Splash Screen" msgid "View Splash Screen"
msgstr "" msgstr "Zeige Splash Screen"
msgid "Issue Tracker" msgid "Issue Tracker"
msgstr "" msgstr "Issue Tracker"
msgid "Changelog" msgid "Changelog"
msgstr "" msgstr "Änderungsprotokoll"
msgid "About Pixelorama" msgid "About Pixelorama"
msgstr "Über Pixelorama" msgstr "Über Pixelorama"
@ -282,32 +282,32 @@ msgid "Donate"
msgstr "Spenden" msgstr "Spenden"
msgid "Developers" msgid "Developers"
msgstr "" msgstr "Entwickler"
msgid "Contributors" msgid "Contributors"
msgstr "" msgstr "Beitragende"
msgid "Donors" msgid "Donors"
msgstr "" msgstr "Spender"
msgid "Development Team" msgid "Development Team"
msgstr "" msgstr "Entwicklerteam"
msgid "GitHub Contributors" msgid "GitHub Contributors"
msgstr "" msgstr "Github Beitragende"
msgid "Art by" msgid "Art by"
msgstr "" msgstr "Kunst von"
msgid "untitled" msgid "untitled"
msgstr "" msgstr "unbenannt"
#, fuzzy #, fuzzy
msgid "imported" msgid "imported"
msgstr "Datei exportiert" msgstr "Datei exportiert"
msgid "copy" msgid "copy"
msgstr "" msgstr "kopiere"
msgid "QUIT_LABEL" msgid "QUIT_LABEL"
msgstr "Möchten sie Pixelorama wirklich verlassen?" msgstr "Möchten sie Pixelorama wirklich verlassen?"
@ -574,25 +574,25 @@ msgid "LAYERMERGE_HT"
msgstr "Führe Ebene mit der darunter zusammen" msgstr "Führe Ebene mit der darunter zusammen"
msgid "Opacity:" msgid "Opacity:"
msgstr "" msgstr "Deckkraft"
msgid "LAYERVISIBILITY_HT" msgid "LAYERVISIBILITY_HT"
msgstr "Ändere die Sichtbarkeit der Ebene" msgstr "Ändere die Sichtbarkeit der Ebene"
msgid "Palette" msgid "Palette"
msgstr "" msgstr "Palette"
msgid "Palettes" msgid "Palettes"
msgstr "" msgstr "Paletten"
msgid "NEWPALETTE_HT" msgid "NEWPALETTE_HT"
msgstr "" msgstr "Füge eine neue Palette hinzu"
msgid "EDITPALETTE_HT" msgid "EDITPALETTE_HT"
msgstr "" msgstr "Bearbeite ausgewählte Palette"
msgid "CHOOSEPALETTE_HT" msgid "CHOOSEPALETTE_HT"
msgstr "" msgstr "Wähle Palette"
msgid "Undo: Draw" msgid "Undo: Draw"
msgstr "Rückgängig: Zeichen" msgstr "Rückgängig: Zeichen"
@ -670,23 +670,23 @@ msgid "File exported"
msgstr "Datei exportiert" msgstr "Datei exportiert"
msgid "New Empty Palette" msgid "New Empty Palette"
msgstr "" msgstr "Neue leere Palette"
msgid "Import Palette" msgid "Import Palette"
msgstr "" msgstr "Importiere Palette"
msgid "Palette Name:" msgid "Palette Name:"
msgstr "" msgstr "Palettenname"
#, fuzzy #, fuzzy
msgid "Color Name:" msgid "Color Name:"
msgstr "Farbe:" msgstr "Farbe:"
msgid "Create a new empty palette?" msgid "Create a new empty palette?"
msgstr "" msgstr "Erstelle eine neue leere Palette"
msgid "Edit Palette" msgid "Edit Palette"
msgstr "" msgstr "Bearbeite Palette"
#~ msgid "Language:" #~ msgid "Language:"
#~ msgstr "Sprache:" #~ msgstr "Sprache:"