From 4257ffddde3917954875f1d4f66fc10d8040cd8b Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 14 Jul 2021 17:41:37 +0200 Subject: [PATCH] GalleryDialog: Changes the paths to the system and custom galleries --- .../gallery/system/OTHER_recycling_symbol.png | Bin 14272 -> 0 bytes .../gallery/system/PETG_recycling_symbol.png | Bin 13757 -> 0 bytes resources/gallery/system/box.png | Bin 4127 -> 0 bytes resources/gallery/system/cylinder.png | Bin 5091 -> 0 bytes resources/gallery/system/pyramid.png | Bin 3265 -> 0 bytes resources/gallery/system/sphere.png | Bin 13418 -> 0 bytes .../OTHER_recycling_symbol.stl | Bin .../PETG_recycling_symbol.stl | Bin resources/{gallery/system => shapes}/box.stl | Bin .../{gallery/system => shapes}/bunny.stl | Bin .../{gallery/system => shapes}/cylinder.stl | Bin .../{gallery/system => shapes}/pyramid.stl | Bin .../{gallery/system => shapes}/sphere.stl | Bin src/PrusaSlicer.cpp | 2 +- src/libslic3r/PresetBundle.cpp | 1 + src/libslic3r/Utils.hpp | 6 ++-- src/libslic3r/utils.cpp | 10 +++---- src/slic3r/GUI/GalleryDialog.cpp | 26 ++++++++++-------- 18 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 resources/gallery/system/OTHER_recycling_symbol.png delete mode 100644 resources/gallery/system/PETG_recycling_symbol.png delete mode 100644 resources/gallery/system/box.png delete mode 100644 resources/gallery/system/cylinder.png delete mode 100644 resources/gallery/system/pyramid.png delete mode 100644 resources/gallery/system/sphere.png rename resources/{gallery/system => shapes}/OTHER_recycling_symbol.stl (100%) rename resources/{gallery/system => shapes}/PETG_recycling_symbol.stl (100%) rename resources/{gallery/system => shapes}/box.stl (100%) rename resources/{gallery/system => shapes}/bunny.stl (100%) rename resources/{gallery/system => shapes}/cylinder.stl (100%) rename resources/{gallery/system => shapes}/pyramid.stl (100%) rename resources/{gallery/system => shapes}/sphere.stl (100%) diff --git a/resources/gallery/system/OTHER_recycling_symbol.png b/resources/gallery/system/OTHER_recycling_symbol.png deleted file mode 100644 index 7dde1945834fb33f489e19021e1d240c28729c8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14272 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 BG$jB4 diff --git a/resources/gallery/system/box.png b/resources/gallery/system/box.png deleted file mode 100644 index 6df18fbc12093fe9a83298294079b3e3f435ebff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4127 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

4&A` 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⁣qWqa1Or#?++P*(VszW;4l8U)zZIzj}2Yne# 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 diff --git a/resources/gallery/system/OTHER_recycling_symbol.stl b/resources/shapes/OTHER_recycling_symbol.stl similarity index 100% rename from resources/gallery/system/OTHER_recycling_symbol.stl rename to resources/shapes/OTHER_recycling_symbol.stl diff --git a/resources/gallery/system/PETG_recycling_symbol.stl b/resources/shapes/PETG_recycling_symbol.stl similarity index 100% rename from resources/gallery/system/PETG_recycling_symbol.stl rename to resources/shapes/PETG_recycling_symbol.stl diff --git a/resources/gallery/system/box.stl b/resources/shapes/box.stl similarity index 100% rename from resources/gallery/system/box.stl rename to resources/shapes/box.stl diff --git a/resources/gallery/system/bunny.stl b/resources/shapes/bunny.stl similarity index 100% rename from resources/gallery/system/bunny.stl rename to resources/shapes/bunny.stl diff --git a/resources/gallery/system/cylinder.stl b/resources/shapes/cylinder.stl similarity index 100% rename from resources/gallery/system/cylinder.stl rename to resources/shapes/cylinder.stl diff --git a/resources/gallery/system/pyramid.stl b/resources/shapes/pyramid.stl similarity index 100% rename from resources/gallery/system/pyramid.stl rename to resources/shapes/pyramid.stl diff --git a/resources/gallery/system/sphere.stl b/resources/shapes/sphere.stl similarity index 100% rename from resources/gallery/system/sphere.stl rename to resources/shapes/sphere.stl diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 45072b107..04df43496 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -661,7 +661,7 @@ bool CLI::setup(int argc, char **argv) set_resources_dir(path_resources.string()); set_var_dir((path_resources / "icons").string()); set_local_dir((path_resources / "localization").string()); - set_gallery_dir((path_resources / "gallery").string()); + set_sys_shapes_dir((path_resources / "shapes").string()); // Parse all command line options into a DynamicConfig. // If any option is unsupported, print usage and abort immediately. diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 6f0b2e4d3..b2e35fa2e 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -159,6 +159,7 @@ void PresetBundle::setup_directories() data_dir, data_dir / "vendor", data_dir / "cache", + data_dir / "shapes", #ifdef SLIC3R_PROFILE_USE_PRESETS_SUBDIR // Store the print/filament/printer presets into a "presets" directory. data_dir / "presets", diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp index 5c3ed684a..330f05ec8 100644 --- a/src/libslic3r/Utils.hpp +++ b/src/libslic3r/Utils.hpp @@ -46,9 +46,9 @@ void set_local_dir(const std::string &path); const std::string& localization_dir(); // Set a path with shapes gallery files. -void set_gallery_dir(const std::string &path); -// Return a full path to the gallery directory. -const std::string& gallery_dir(); +void set_sys_shapes_dir(const std::string &path); +// Return a full path to the system shapes gallery directory. +const std::string& sys_shapes_dir(); // Set a path with preset files. void set_data_dir(const std::string &path); diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index f40e7de89..8f1cf07f2 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -175,16 +175,16 @@ const std::string& localization_dir() return g_local_dir; } -static std::string g_gallery_dir; +static std::string g_sys_shapes_dir; -void set_gallery_dir(const std::string &dir) +void set_sys_shapes_dir(const std::string &dir) { - g_gallery_dir = dir; + g_sys_shapes_dir = dir; } -const std::string& gallery_dir() +const std::string& sys_shapes_dir() { - return g_gallery_dir; + return g_sys_shapes_dir; } // Translate function callback, to call wxWidgets translate function to convert non-localized UTF8 string to a localized one. diff --git a/src/slic3r/GUI/GalleryDialog.cpp b/src/slic3r/GUI/GalleryDialog.cpp index 73f2c42e6..adc21ed0b 100644 --- a/src/slic3r/GUI/GalleryDialog.cpp +++ b/src/slic3r/GUI/GalleryDialog.cpp @@ -160,7 +160,7 @@ static void add_lock(wxImage& image) #ifdef __APPLE__ lock_sz /= mac_max_scaling_factor(); #endif - wxBitmap bmp = create_scaled_bitmap("lock", nullptr, 22); + wxBitmap bmp = create_scaled_bitmap("lock", nullptr, lock_sz); wxImage lock_image = bmp.ConvertToImage(); if (!lock_image.IsOk() || lock_image.GetWidth() == 0 || lock_image.GetHeight() == 0) @@ -214,12 +214,14 @@ static void add_default_image(wxImageList* img_list, bool is_system) static fs::path get_dir(bool sys_dir) { - return fs::absolute(fs::path(gallery_dir()) / (sys_dir ? "system" : "custom")).make_preferred(); + if (sys_dir) + return fs::absolute(fs::path(sys_shapes_dir())).make_preferred(); + return fs::absolute(fs::path(data_dir()) / "shapes").make_preferred(); } static bool custom_exists() { - return fs::exists(fs::absolute(fs::path(gallery_dir()) / "custom").make_preferred()); + return fs::exists(get_dir(false)); } static std::string get_dir_path(bool sys_dir) @@ -382,20 +384,22 @@ void GalleryDialog::add_custom_shapes(wxEvent& event) void GalleryDialog::del_custom_shapes(wxEvent& event) { - auto dest_dir = get_dir(false); + auto custom_dir = get_dir(false); - for (const Item& item : m_selected_items) { - std::string filename = item.name + ".stl"; - - if (!fs::exists(dest_dir / filename)) - continue; + auto remove_file = [custom_dir](const std::string& name) { + if (!fs::exists(custom_dir / name)) + return; try { - fs::remove(dest_dir / filename); + fs::remove(custom_dir / name); } catch (fs::filesystem_error const& e) { std::cerr << e.what() << '\n'; - return; } + }; + + for (const Item& item : m_selected_items) { + remove_file(item.name + ".stl"); + remove_file(item.name + ".png"); } update();