From 25d9aca0c48bfb15d1c146d4ade7b711a287aa0a Mon Sep 17 00:00:00 2001
From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com>
Date: Wed, 17 Jun 2020 16:47:24 +0300
Subject: [PATCH] Drag and drop palette files to open them

---
 Translations/Translations.pot     | 3 +++
 src/Autoload/OpenSave.gd          | 7 +++++--
 src/UI/Dialogs/PreviewDialog.gd   | 7 ++-----
 src/UI/Dialogs/PreviewDialog.tscn | 1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Translations/Translations.pot b/Translations/Translations.pot
index b4c95630e..e924d8929 100644
--- a/Translations/Translations.pot
+++ b/Translations/Translations.pot
@@ -139,6 +139,9 @@ msgstr ""
 msgid "Open File(s)"
 msgstr ""
 
+msgid "Import Options"
+msgstr ""
+
 msgid "Import as:"
 msgstr ""
 
diff --git a/src/Autoload/OpenSave.gd b/src/Autoload/OpenSave.gd
index 31ef7ce15..299b21d60 100644
--- a/src/Autoload/OpenSave.gd
+++ b/src/Autoload/OpenSave.gd
@@ -20,9 +20,12 @@ func _ready() -> void:
 func handle_loading_files(files : PoolStringArray) -> void:
 	for file in files:
 		file = file.replace("\\", "/")
-		if file.get_extension().to_lower() == "pxo":
+		var file_ext : String = file.get_extension().to_lower()
+		if file_ext == "pxo": # Pixelorama project file
 			open_pxo_file(file)
-		else:
+		elif file_ext == "json" or file_ext == "gpl": # Palettes
+			Global.palette_container.on_palette_import_file_selected(file)
+		else: # Image files
 			var image := Image.new()
 			var err := image.load(file)
 			if err != OK: # An error occured
diff --git a/src/UI/Dialogs/PreviewDialog.gd b/src/UI/Dialogs/PreviewDialog.gd
index 530eddfa0..55c748ac3 100644
--- a/src/UI/Dialogs/PreviewDialog.gd
+++ b/src/UI/Dialogs/PreviewDialog.gd
@@ -13,15 +13,12 @@ onready var texture_rect : TextureRect = $VBoxContainer/CenterContainer/TextureR
 onready var spritesheet_options = $VBoxContainer/HBoxContainer/SpritesheetOptions
 
 
-func _ready() -> void:
-	spritesheet_options.get_node("HorizontalFrames").max_value = min(spritesheet_options.get_node("HorizontalFrames").max_value, image.get_size().x)
-	spritesheet_options.get_node("VerticalFrames").max_value = min(spritesheet_options.get_node("VerticalFrames").max_value, image.get_size().y)
-
-
 func _on_PreviewDialog_about_to_show() -> void:
 	var img_texture := ImageTexture.new()
 	img_texture.create_from_image(image)
 	texture_rect.texture = img_texture
+	spritesheet_options.get_node("HorizontalFrames").max_value = min(spritesheet_options.get_node("HorizontalFrames").max_value, image.get_size().x)
+	spritesheet_options.get_node("VerticalFrames").max_value = min(spritesheet_options.get_node("VerticalFrames").max_value, image.get_size().y)
 
 
 func _on_PreviewDialog_popup_hide() -> void:
diff --git a/src/UI/Dialogs/PreviewDialog.tscn b/src/UI/Dialogs/PreviewDialog.tscn
index a3889a421..720509031 100644
--- a/src/UI/Dialogs/PreviewDialog.tscn
+++ b/src/UI/Dialogs/PreviewDialog.tscn
@@ -7,6 +7,7 @@ margin_right = 200.0
 margin_bottom = 70.0
 rect_min_size = Vector2( 550, 70 )
 popup_exclusive = true
+window_title = "Import Options"
 resizable = true
 script = ExtResource( 1 )
 __meta__ = {