From ebb7afde8b6b767c0f2698cf32fa3509fe8cb173 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Fri, 23 Feb 2018 10:32:02 -0300
Subject: [PATCH] Add option to change default file format (.aseprite is the
 new default)

---
 data/pref.xml                    |  1 +
 data/strings/en.ini              |  1 +
 data/widgets/options.xml         |  4 ++++
 src/app/commands/cmd_options.cpp | 16 ++++++++++++++++
 src/app/file_selector.cpp        | 10 ++++++++++
 src/app/ui/file_selector.cpp     |  8 +++++++-
 src/app/ui/file_selector.h       |  2 ++
 7 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/data/pref.xml b/data/pref.xml
index c12466846..77ce1c691 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -255,6 +255,7 @@
     <section id="save_file">
       <option id="show_file_format_doesnt_support_alert" type="bool" default="true" />
       <option id="show_export_animation_in_sequence_alert" type="bool" default="true" />
+      <option id="default_extension" type="std::string" default="&quot;aseprite&quot;" />
     </section>
     <section id="gif">
       <option id="show_alert" type="bool" default="true" />
diff --git a/data/strings/en.ini b/data/strings/en.ini
index 8330fa28b..e5bf951d2 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -838,6 +838,7 @@ show_full_path_tooltip = <<<END
 Uncheck this option if you would prefer to hide
 full path on UI (e.g. useful for live streaming)
 END
+default_extension = Default extension when saving files
 locate_file = Locate Configuration File
 locate_crash_folder = Locate Crash Folder
 wheel_zoom = Zoom with scroll wheel
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 89a8303f4..78fcc8330 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -73,6 +73,10 @@
           <check id="show_full_path"
 		 text="@.show_full_path"
 		 tooltip="@.show_full_path_tooltip" />
+          <hbox>
+            <label text="@.default_extension" />
+            <combobox id="default_extension" />
+          </hbox>
           <separator horizontal="true" />
           <link id="locate_file" text="@.locate_file" />
           <link id="locate_crash_folder" text="@.locate_crash_folder" />
diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 0e40cb81e..755ac3305 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -13,6 +13,7 @@
 #include "app/console.h"
 #include "app/context.h"
 #include "app/extensions.h"
+#include "app/file/file.h"
 #include "app/file_selector.h"
 #include "app/i18n/strings.h"
 #include "app/ini_file.h"
@@ -140,6 +141,17 @@ public:
   {
     sectionListbox()->Change.connect(base::Bind<void>(&OptionsWindow::onChangeSection, this));
 
+    // Default extension to save files
+    {
+      std::string defExt = m_pref.saveFile.defaultExtension();
+      base::paths exts = get_writable_extensions();
+      for (const auto& e : exts) {
+        int index = defaultExtension()->addItem(e);
+        if (base::utf8_icmp(e, defExt) == 0)
+          defaultExtension()->setSelectedItemIndex(index);
+      }
+    }
+
     // Alerts
     fileFormatDoesntSupportAlert()->setSelected(m_pref.saveFile.showFileFormatDoesntSupportAlert());
     exportAnimationInSequenceAlert()->setSelected(m_pref.saveFile.showExportAnimationInSequenceAlert());
@@ -376,6 +388,10 @@ public:
     m_pref.general.rewindOnStop(rewindOnStop()->isSelected());
     m_globPref.timeline.firstFrame(firstFrame()->textInt());
     m_pref.general.showFullPath(showFullPath()->isSelected());
+    {
+      Widget* defExt = defaultExtension()->getSelectedItem();
+      m_pref.saveFile.defaultExtension(defExt ? defExt->text(): std::string());
+    }
 
     bool expandOnMouseover = expandMenubarOnMouseover()->isSelected();
     m_pref.general.expandMenubarOnMouseover(expandOnMouseover);
diff --git a/src/app/file_selector.cpp b/src/app/file_selector.cpp
index 0df9bcc9a..df8dd1488 100644
--- a/src/app/file_selector.cpp
+++ b/src/app/file_selector.cpp
@@ -27,6 +27,9 @@ bool show_file_selector(
   base::paths& output,
   FileSelectorDelegate* delegate)
 {
+  const std::string defExtension =
+    Preferences::instance().saveFile.defaultExtension();
+
   if (Preferences::instance().experimental.useNativeFileDialog() &&
       she::instance()->nativeDialogs()) {
     she::FileDialog* dlg =
@@ -53,6 +56,9 @@ bool show_file_selector(
       for (const auto& ext : extensions)
         dlg->addFilter(ext, ext + " files (*." + ext + ")");
 
+      if (!defExtension.empty())
+        dlg->setDefaultExtension(defExtension);
+
       bool res = dlg->show(she::instance()->defaultDisplay());
       if (res) {
         if (type == FileSelectorType::OpenMultiple)
@@ -66,6 +72,10 @@ bool show_file_selector(
   }
 
   FileSelector fileSelector(type, delegate);
+
+  if (!defExtension.empty())
+    fileSelector.setDefaultExtension(defExtension);
+
   return fileSelector.show(title, initialPath, extensions, output);
 }
 
diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 5d8083efe..730748fe5 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -385,6 +385,11 @@ FileSelector::FileSelector(FileSelectorType type, FileSelectorDelegate* delegate
   updateExtraLabel();
 }
 
+void FileSelector::setDefaultExtension(const std::string& extension)
+{
+  m_defExtension = extension;
+}
+
 FileSelector::~FileSelector()
 {
   delete m_extras;
@@ -495,7 +500,8 @@ bool FileSelector::show(
   fileType()->removeAllItems();
 
   // Get the default extension from the given initial file name
-  m_defExtension = initialExtension;
+  if (m_defExtension.empty())
+    m_defExtension = initialExtension;
 
   // File type for all formats
   fileType()->addItem(
diff --git a/src/app/ui/file_selector.h b/src/app/ui/file_selector.h
index 4f3959e1e..f764b22ba 100644
--- a/src/app/ui/file_selector.h
+++ b/src/app/ui/file_selector.h
@@ -32,6 +32,8 @@ namespace app {
     FileSelector(FileSelectorType type, FileSelectorDelegate* delegate);
     ~FileSelector();
 
+    void setDefaultExtension(const std::string& extension);
+
     void goBack();
     void goForward();
     void goUp();