formatpicker when saving palettes, fix remove fav.

counter185 · counter185 · commit 75fabb05b105 · 2026-03-24T18:21:14.000+01:00
diff --git a/freesprite/FileIO.cpp b/freesprite/FileIO.cpp
@@ -3153,8 +3153,8 @@ void g_setupIO() {
     PaletteExporter
         * exVOIDPLT,
         * exHexPLT;
-    g_paletteExporters.push_back(exVOIDPLT = PaletteExporter::paletteExporter("voidsprite palette", ".voidplt", &writePltVOIDPLT));
-    g_paletteExporters.push_back(exHexPLT = PaletteExporter::paletteExporter("Hex palette", ".hex", &writePltHEX));
+    g_paletteExporters.push_back(exVOIDPLT = PaletteExporter::paletteExporter("voidsprite palette", ".voidplt", TL("vsp.export.palette.voidplt"), &writePltVOIDPLT));
+    g_paletteExporters.push_back(exHexPLT = PaletteExporter::paletteExporter("Hex palette", ".hex", TL("vsp.export.palette.hex"), &writePltHEX));
 
     g_paletteImporters.push_back(PaletteImporter::paletteImporter("voidsprite palette", ".voidplt", &readPltVOIDPLT, NULL, exVOIDPLT));
     g_paletteImporters.push_back(PaletteImporter::paletteImporter("Hex palette", ".hex", &readPltHEX, NULL, exHexPLT));
diff --git a/freesprite/FileIO.h b/freesprite/FileIO.h
@@ -318,9 +318,12 @@ class FileImporter : public FileOperation {
 
 class PaletteImporter : public FileOperation {
 public:
-    static PaletteImporter* paletteImporter(std::string name, std::string extension, 
+    static PaletteImporter* paletteImporter(
+        std::string name, 
+        std::string extension, 
         std::function<std::pair<bool, std::vector<uint32_t>>(PlatformNativePathString)> importFunction,
-        std::function<bool(PlatformNativePathString)> canImport = NULL, PaletteExporter* reverse = NULL) {
+        std::function<bool(PlatformNativePathString)> canImport = NULL, PaletteExporter* reverse = NULL) 
+    {
 
         PaletteImporter* ret = new PaletteImporter();
         ret->_name = name;
@@ -348,10 +351,16 @@ class PaletteImporter : public FileOperation {
 class PaletteExporter : public FileOperation {
 
 public:
-    static PaletteExporter* paletteExporter(std::string name, std::string extension, std::function<bool(PlatformNativePathString, std::vector<u32>)> exportFunction) {
+    static PaletteExporter* paletteExporter(
+        std::string name, 
+        std::string extension,
+        std::string description,
+        std::function<bool(PlatformNativePathString, std::vector<u32>)> exportFunction) 
+    {
         PaletteExporter* ret = new PaletteExporter();
         ret->_name = name;
         ret->_extension = extension;
+        ret->description = description;
         ret->_exportFunction = exportFunction;
         return ret;
     }
diff --git a/freesprite/PalettizedEditorColorPicker.cpp b/freesprite/PalettizedEditorColorPicker.cpp
@@ -8,6 +8,7 @@
 #include "TabbedView.h"
 #include "UILabel.h"
 #include "MainEditorPalettized.h"
+#include "PopupChooseFormat.h"
 
 PalettizedEditorColorPicker::PalettizedEditorColorPicker(MainEditorPalettized* c)
 {
@@ -48,7 +49,15 @@ PalettizedEditorColorPicker::PalettizedEditorColorPicker(MainEditorPalettized* c
     buttonSavePalette->wxWidth = 120;
     buttonSavePalette->wxHeight = 30;
     buttonSavePalette->onClickCallback = [this](UIButton*) {
-        platformTrySaveOtherFile(this, { {".voidplt", "voidsprite palette"} }, "save palette", EVENT_PALETTECOLORPICKER_SAVEPALETTE);
+        PopupChooseFormat* popup = PopupChooseFormat::withDefaultPaletteExportFormats("Choose format", "");
+        popup->chooseFormatAndDoFileSavePrompt("save palette", [this](FormatDef* f, PlatformNativePathString path) {
+            if (((PaletteExporter*)f->udata)->exportData(path, &caller->palette)) {
+                g_addNotification(SuccessNotification("Success", "Palette file saved"));
+            }
+            else {
+                g_addNotification(ErrorNotification(TL("vsp.cmn.error"), "Could not save palette file"));
+            }
+        });
     };
     colorPaletteTabs->tabs[1].wxs.addDrawable(buttonSavePalette);
 
@@ -151,28 +160,6 @@ void PalettizedEditorColorPicker::eventDropdownItemSelected(int evt_id, int inde
     }
 }
 
-void PalettizedEditorColorPicker::eventFileSaved(int evt_id, PlatformNativePathString name, int exporterIndex)
-{
-    if (evt_id == EVENT_PALETTECOLORPICKER_SAVEPALETTE) {
-        FILE* f = platformOpenFile(name, PlatformFileModeWB);
-        if (f != NULL) {
-            fwrite("VOIDPLT", 7, 1, f);
-            uint8_t fileversion = 1;
-            fwrite(&fileversion, 1, 1, f);
-            uint32_t count = caller->palette.size();
-            fwrite(&count, 1, 4, f);
-            for (uint32_t col : caller->palette) {
-                fwrite(&col, 1, 4, f);
-            }
-            fclose(f);
-            g_addNotification(SuccessNotification("Success", "Palette file saved"));
-        }
-        else {
-            g_addNotification(ErrorNotification("Error", "Could not save palette file"));
-        }
-    }
-}
-
 void PalettizedEditorColorPicker::eventFileOpen(int evt_id, PlatformNativePathString name, int importerIndex)
 {
     if (evt_id == EVENT_PALETTECOLORPICKER_LOADPALETTE) {
diff --git a/freesprite/PalettizedEditorColorPicker.h b/freesprite/PalettizedEditorColorPicker.h
@@ -43,7 +43,6 @@ class PalettizedEditorColorPicker :
     void renderAfterBG(XY position) override;
 
     void eventDropdownItemSelected(int evt_id, int index, std::string name) override;
-    void eventFileSaved(int evt_id, PlatformNativePathString name, int importerIndex = -1) override;
     void eventFileOpen(int evt_id, PlatformNativePathString name, int importerIndex = -1) override;
 
     void updateForcedColorPaletteButtons();
diff --git a/freesprite/PopupChooseFormat.cpp b/freesprite/PopupChooseFormat.cpp
@@ -24,6 +24,7 @@ void PopupChooseFormat::buildFormatList() {
             bool isFav = stringStartsWithIgnoreCase(f.name, "\xE2\x98\x85");
 
             std::string name = f.name;
+            std::string originalName = f.originalName;
 
             UIButton* btn = new UIButton(name);
             btn->position = { 0,0 };
@@ -44,13 +45,18 @@ void PopupChooseFormat::buildFormatList() {
             }
 
             if (isFav) {
-                btn->onRightClickCallback = [this, name](...) {
+                btn->onRightClickCallback = [this, originalName](...) {
                     g_addPopup(new PopupContextMenu({
-                        {"Remove from favourites", [this, name]() {
-                            auto indexAt = std::find(g_config.favExportFormats.begin(), g_config.favExportFormats.end(), name);
-                            g_config.favExportFormats.erase(indexAt);
-                            g_saveConfig();
-                            filterList(filterQuery);
+                        {"Remove from favourites", [this, originalName]() {
+                            auto indexAt = std::find(g_config.favExportFormats.begin(), g_config.favExportFormats.end(), originalName);
+                            if (indexAt != g_config.favExportFormats.end()) {
+                                g_config.favExportFormats.erase(indexAt);
+                                g_saveConfig();
+                                filterList(filterQuery);
+                            }
+                            else {
+                                logerr("failed to remove fav format");
+                            }
                         }}
                     }));
                 };
@@ -59,10 +65,10 @@ void PopupChooseFormat::buildFormatList() {
                 priority1Buttons.push_back(newButton);
             }
             else {
-                btn->onRightClickCallback = [this, name](...) {
+                btn->onRightClickCallback = [this, originalName](...) {
                     g_addPopup(new PopupContextMenu({
-                        {"Add to favourites", [this, name]() {
-                            g_config.favExportFormats.push_back(name);
+                        {"Add to favourites", [this, originalName]() {
+                            g_config.favExportFormats.push_back(originalName);
                             g_saveConfig();
                             filterList(filterQuery);
                         }}
@@ -148,9 +154,28 @@ PopupChooseFormat* PopupChooseFormat::withDefaultIndexedExportFormats(std::strin
     return withDefaultExportFormats(tt, tx, FORMAT_PALETTIZED);
 }
 
+PopupChooseFormat* PopupChooseFormat::withDefaultPaletteExportFormats(std::string tt, std::string tx)
+{
+    std::vector<FormatDef> ff;
+    for (PaletteExporter* f : g_paletteExporters) {
+        ff.push_back({
+            .name = f->name(),
+            .extension = f->extension(),
+            .description = f->description,
+            .udata = (void*)f
+        });
+    }
+    std::vector<FormatDef> ff2 = processFavouriteFormats(ff);
+    PopupChooseFormat* ret = new PopupChooseFormat(tt, tx, ff2);
+    ret->hasDefaultFormats = true;
+    ret->defaultFormats = ff;
+    return ret;
+}
+
 std::vector<FormatDef> PopupChooseFormat::processFavouriteFormats(std::vector<FormatDef> srcList) {
     std::vector<FormatDef> ret;
     for (auto& f : srcList) {
+        f.originalName = f.name;
         if (std::find(g_config.favExportFormats.begin(), g_config.favExportFormats.end(), f.name) != g_config.favExportFormats.end()) {
             f.name = "\xE2\x98\x85 " + f.name;
             ret.insert(ret.begin(), f);
diff --git a/freesprite/PopupChooseFormat.h b/freesprite/PopupChooseFormat.h
@@ -7,6 +7,8 @@ struct FormatDef {
     std::string extension;
     std::string description;
     void* udata;
+
+    std::string originalName = "";
 };
 
 class PopupChooseFormat : public BasePopup, EventCallbackListener
@@ -35,6 +37,8 @@ class PopupChooseFormat : public BasePopup, EventCallbackListener
     static PopupChooseFormat* withDefaultRGBExportFormats(std::string tt, std::string tx);
     static PopupChooseFormat* withDefaultIndexedExportFormats(std::string tt, std::string tx);
 
+    static PopupChooseFormat* withDefaultPaletteExportFormats(std::string tt, std::string tx);
+
     static std::vector<FormatDef> processFavouriteFormats(std::vector<FormatDef> srcList);
 
     void filterList(std::string search);
diff --git a/freesprite/UIColorPicker.cpp b/freesprite/UIColorPicker.cpp
@@ -12,6 +12,7 @@
 #include "UIHueWheel.h"
 #include "UIColorInputField.h"
 #include "PopupContextMenu.h"
+#include "PopupChooseFormat.h"
 #include "io/io_voidsprite.h"
 
 #if VSP_PLATFORM == VSP_PLATFORM_WIN32
@@ -573,25 +574,7 @@ void UIColorPicker::reloadColorLists()
     newPaletteButton->position = XY{ 5, 60 };
     newPaletteButton->wxWidth = 140;
     newPaletteButton->onClickCallback = [this](UIButton*) {
-        PopupTextBox* popup = new PopupTextBox(TL("vsp.maineditor.panel.colorpicker.tab.palettes.newpalette.popup.title"),
-            TL("vsp.maineditor.panel.colorpicker.tab.palettes.newpalette.popup.desc"), "");
-        popup->onTextInputConfirmedCallback = [this](PopupTextBox*, std::string name) {
-            if (name.find_first_of("/\\") == std::string::npos) {
-                PlatformNativePathString newPalettePath = platformEnsureDirAndGetConfigFilePath() + convertStringOnWin32("/palettes/" + name + ".voidplt");
-                if (writePltVOIDPLT(newPalettePath, {})) {
-                    g_reloadColorMap();
-                    reloadColorLists();
-                }
-                else {
-                    g_addNotification(ErrorNotification(TL("vsp.cmn.error"), TL("vsp.cmn.error.exportfail")));
-                }
-            }
-            else {
-                //invalid characters in name
-                g_addNotification(ErrorNotification(TL("vsp.cmn.error"), TL("vsp.cmn.error.exportfail")));
-            }
-        };
-        g_addPopup(popup);
+        g_promptCreateNewPalette({}, [this]() { reloadColorLists(); });
     };
     otherButtons->subWidgets.addDrawable(newPaletteButton);
 
diff --git a/freesprite/colors.cpp b/freesprite/colors.cpp
@@ -5,6 +5,8 @@
 #include "colors.h"
 #include "background_operation.h"
 #include "Notification.h"
+#include "PopupTextBox.h"
+#include "PopupChooseFormat.h"
 #include "io/io_voidsprite.h"
 
 std::vector<NamedColorPalette> g_baseNamedColorMap = {
@@ -520,6 +522,34 @@ void g_downloadAndInstallPaletteFromLospec(std::string url)
     }
 }
 
+void g_promptCreateNewPalette(std::vector<u32> newPalette, std::function<void()> onSuccessCallback)
+{
+    PopupTextBox* popup = new PopupTextBox(TL("vsp.maineditor.panel.colorpicker.tab.palettes.newpalette.popup.title"),
+        TL("vsp.maineditor.panel.colorpicker.tab.palettes.newpalette.popup.desc"), "");
+    popup->onTextInputConfirmedCallback = [newPalette, onSuccessCallback](PopupTextBox*, std::string name) {
+        if (name.find_first_of("/\\") == std::string::npos) {
+
+            PopupChooseFormat* popup2 = PopupChooseFormat::withDefaultPaletteExportFormats("Choose format", "");
+            popup2->onFormatChosenCallback = [newPalette, name, onSuccessCallback](FormatDef* f) {
+                PlatformNativePathString newPalettePath = platformEnsureDirAndGetConfigFilePath() + convertStringOnWin32("/palettes/" + name + f->extension);
+                if (((PaletteExporter*)f->udata)->exportData(newPalettePath, (void*)&newPalette)) {
+                    g_reloadColorMap();
+                    onSuccessCallback();
+                }
+                else {
+                    g_addNotification(ErrorNotification(TL("vsp.cmn.error"), TL("vsp.cmn.error.exportfail")));
+                }
+            };
+            g_addPopup(popup2);
+        }
+        else {
+            //invalid characters in name
+            g_addNotification(ErrorNotification(TL("vsp.cmn.error"), "Invalid characters in name"));
+        }
+        };
+    g_addPopup(popup);
+}
+
 bool NamedColorPalette::save() {
     if (correspondingExporter != NULL && !path.empty()) {
         std::vector<u32> colors;
diff --git a/freesprite/colors.h b/freesprite/colors.h
@@ -88,4 +88,5 @@ inline std::vector<NamedColorPalette> g_namedColorMap = {};
 void g_generateColorMap();
 void g_reloadColorMap();
 IPalette* g_paletteByName(std::string name);
-void g_downloadAndInstallPaletteFromLospec(std::string url);
+void g_downloadAndInstallPaletteFromLospec(std::string url);
+void g_promptCreateNewPalette(std::vector<u32> newPalette, std::function<void()> onSuccessCallback);
diff --git a/freesprite/io/io_palettes.cpp b/freesprite/io/io_palettes.cpp
@@ -78,9 +78,13 @@ std::pair<bool, std::vector<uint32_t>> readPltHEX(PlatformNativePathString name)
     std::ifstream f(std::filesystem::path(name), std::ios::in);
     if (f.is_open()) {
         std::pair<bool, std::vector<uint32_t>> ret;
+        bool anyNonEmptyLine = false;
         while (!f.eof()) {
             std::string line;
             std::getline(f, line);
+            if (line.size() > 0) {
+                anyNonEmptyLine = true;
+            }
             if (line.size() == 6 || line.size() == 8) {
                 std::string r = line.substr(0, 2);
                 std::string g = line.substr(2, 2);
@@ -94,7 +98,8 @@ std::pair<bool, std::vector<uint32_t>> readPltHEX(PlatformNativePathString name)
             }
         }
         f.close();
-        ret.first = ret.second.size() > 0;
+        //allow empty files so that creating a new .hex palette works
+        ret.first = !anyNonEmptyLine || ret.second.size() > 0;
         return ret;
     }
     return { false,{} };
diff --git a/freesprite/localization/localization_english.txt b/freesprite/localization/localization_english.txt
@@ -53,6 +53,9 @@
     {"vsp.export.python", "Export the image as a 2D array of pixels that can be used in a Python script."},
     {"vsp.export.html", "Export the image as a PNG encoded into Base64 for an inline <img> tag for HTML."},
 
+    {"vsp.export.palette.voidplt", "Native palette format of voidsprite."},
+    {"vsp.export.palette.hex", "Text file with colors in hex (RRGGBB) format, separated by newlines."},
+
     // common navbar strings
     {"vsp.nav.file", "File"},
     {"vsp.nav.open", "Open"},
