-## Some background
+## Some Background
-OrcaSlicer was originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+Open-source slicing has always been built on a tradition of collaboration and attribution. [Slic3r](https://github.com/Slic3r/Slic3r), created by Alessandro Ranellucci and the RepRap community, laid the foundation. [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research built on Slic3r and acknowledged that heritage. [Bambu Studio](https://github.com/bambulab/BambuStudio) in turn forked from PrusaSlicer, and [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill extended PrusaSlicer with community-driven enhancements. Each project carried the work of its predecessors forward, crediting those who came before.
-[Bambu Studio](https://github.com/bambulab/BambuStudio) is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
-OrcaSlicer incorporates a lot of features from [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill
-OrcaSlicer's logo is designed by community member Justin Levine (@freejstnalxndr).
+OrcaSlicer began in that same spirit, drawing from BambuStudio, PrusaSlicer, and ideas inspired by CuraSlicer and SuperSlicer. But it has since grown far beyond its origins. Through relentless innovation — introducing advanced calibration tools, precise wall and seam control, tree supports, adaptive slicing, and hundreds of other features — OrcaSlicer has become the most widely used and actively developed open-source slicer in the 3D printing community. Many of its innovations have been adopted by other slicers, making it a driving force for the entire industry.
+
+The OrcaSlicer logo was designed by community member Justin Levine (@freejstnalxndr).
# License
-
-- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3. OrcaSlicer is based on Bambu Studio by BambuLab.
-- **Bambu Studio** is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
-- **PrusaSlicer** is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
-- **Slic3r** is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
+- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3.
- The **GNU Affero General Public License**, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
- OrcaSlicer includes a **pressure advance calibration pattern test** adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
- The **Bambu networking plugin** is based on non-free libraries from BambuLab. It is optional to the OrcaSlicer and provides extended functionalities for Bambulab printer users.
diff --git a/build_flatpak.sh b/build_flatpak.sh
index 94b79b1465..0dd07041be 100755
--- a/build_flatpak.sh
+++ b/build_flatpak.sh
@@ -255,8 +255,8 @@ mkdir -p "$BUILD_DIR"
rm -rf "$BUILD_DIR/build-dir"
# Check if flatpak manifest exists
-if [[ ! -f "./scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml" ]]; then
- echo -e "${RED}Error: Flatpak manifest not found at scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml${NC}"
+if [[ ! -f "./scripts/flatpak/com.orcaslicer.OrcaSlicer.yml" ]]; then
+ echo -e "${RED}Error: Flatpak manifest not found at scripts/flatpak/com.orcaslicer.OrcaSlicer.yml${NC}"
exit 1
fi
@@ -316,11 +316,11 @@ if [[ "$DISABLE_ROFILES_FUSE" == true ]]; then
fi
# Use a temp manifest with no-debuginfo if requested
-MANIFEST="scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml"
+MANIFEST="scripts/flatpak/com.orcaslicer.OrcaSlicer.yml"
if [[ "$NO_DEBUGINFO" == true ]]; then
- MANIFEST="scripts/flatpak/io.github.orcaslicer.OrcaSlicer.no-debug.yml"
+ MANIFEST="scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
sed '/^build-options:/a\ no-debuginfo: true\n strip: true' \
- scripts/flatpak/io.github.orcaslicer.OrcaSlicer.yml > "$MANIFEST"
+ scripts/flatpak/com.orcaslicer.OrcaSlicer.yml > "$MANIFEST"
echo -e "${YELLOW}Debug info disabled (using temp manifest)${NC}"
fi
@@ -330,19 +330,19 @@ if ! flatpak-builder \
"$MANIFEST"; then
echo -e "${RED}Error: flatpak-builder failed${NC}"
echo -e "${YELLOW}Check the build log above for details${NC}"
- rm -f "scripts/flatpak/io.github.orcaslicer.OrcaSlicer.no-debug.yml"
+ rm -f "scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
exit 1
fi
# Clean up temp manifest
-rm -f "scripts/flatpak/io.github.orcaslicer.OrcaSlicer.no-debug.yml"
+rm -f "scripts/flatpak/com.orcaslicer.OrcaSlicer.no-debug.yml"
# Create bundle
echo -e "${YELLOW}Creating Flatpak bundle...${NC}"
if ! flatpak build-bundle \
"$BUILD_DIR/repo" \
"$BUNDLE_NAME" \
- io.github.orcaslicer.OrcaSlicer \
+ com.orcaslicer.OrcaSlicer \
--arch="$ARCH"; then
echo -e "${RED}Error: Failed to create Flatpak bundle${NC}"
exit 1
@@ -361,10 +361,10 @@ echo -e "${BLUE}To install the Flatpak:${NC}"
echo -e "flatpak install --user $BUNDLE_NAME"
echo ""
echo -e "${BLUE}To run OrcaSlicer:${NC}"
-echo -e "flatpak run io.github.orcaslicer.OrcaSlicer"
+echo -e "flatpak run com.orcaslicer.OrcaSlicer"
echo ""
echo -e "${BLUE}To uninstall:${NC}"
-echo -e "flatpak uninstall --user io.github.orcaslicer.OrcaSlicer"
+echo -e "flatpak uninstall --user com.orcaslicer.OrcaSlicer"
echo ""
if [[ "$FORCE_CLEAN" != true ]]; then
echo -e "${BLUE}Cache Management:${NC}"
diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
index 15979c4822..937f29694b 100644
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -11,7 +11,7 @@
https://github.com/OrcaSlicer/OrcaSlicer
" + "" "" "") ).str()); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 04334c73c5..fe7cfbd255 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -372,16 +372,6 @@ public: // Dynamic Text m_action_line_y_position = int(height * 0.83); - - // Based on Text - memDc.SetFont(m_constant_text.based_on_font); - auto bs_version = wxString::Format(_L("Based on PrusaSlicer and BambuStudio")).ToStdString(); - wxSize based_on_ext = memDc.GetTextExtent(bs_version); - wxRect based_on_rect( - wxPoint(0, height - based_on_ext.GetHeight() * 2), - wxPoint(width, height - based_on_ext.GetHeight()) - ); - memDc.DrawLabel(bs_version, based_on_rect, wxALIGN_CENTER); } static wxBitmap MakeBitmap() @@ -484,6 +474,37 @@ private: }; #ifdef __linux__ +static void migrate_flatpak_legacy_datadir(const boost::filesystem::path &data_dir_path) +{ + if(!boost::filesystem::exists("/.flatpak-info")) + return; // Not running as a Flatpak, nothing to migrate. + + namespace fs = boost::filesystem; + + if (fs::exists(data_dir_path)){ + std::cerr << "New Flatpak data dir: " << data_dir_path << std::endl; + return; + } + std::cerr << "Migrating Flatpak data dir: " << data_dir_path << std::endl; + + std::string legacy_data_dir_str = data_dir_path.string(); + boost::replace_first(legacy_data_dir_str, "com.orcaslicer.OrcaSlicer", "io.github.orcaslicer.OrcaSlicer"); + const fs::path legacy_data_dir(legacy_data_dir_str); + + std::cerr << "Legacy Flatpak data dir: " << legacy_data_dir << std::endl; + + if ( ! fs::exists(legacy_data_dir) || ! fs::is_directory(legacy_data_dir)) + return; + std::cerr << "Legacy Flatpak data dir exists: " << legacy_data_dir << std::endl; + + try { + std::cerr << "Migrating Flatpak data dir from " << legacy_data_dir << " to " << data_dir_path << std::endl; + copy_directory_recursively(legacy_data_dir, data_dir_path); + } catch (const std::exception &ex) { + std::cerr << "Failed to migrate Flatpak data dir from " << legacy_data_dir << " to " << data_dir_path << ": " << ex.what() << std::endl; + } +} + bool static check_old_linux_datadir(const wxString& app_name) { // If we are on Linux and the datadir does not exist yet, look into the old // location where the datadir was before version 2.3. If we find it there, @@ -2401,8 +2422,9 @@ void GUI_App::init_app_config() wxString dir; if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() ) dir = wxFileName::GetHomeDir() + wxS("/.config"); - set_data_dir((dir + "/" + GetAppName()).ToUTF8().data()); - data_dir_path = boost::filesystem::path(data_dir()); + data_dir_path = boost::filesystem::path((dir + "/" + GetAppName()).ToUTF8().data()); + migrate_flatpak_legacy_datadir(data_dir_path); + set_data_dir(data_dir_path.string()); #endif if (!boost::filesystem::exists(data_dir_path)){ boost::filesystem::create_directory(data_dir_path); diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index 09d4da31c5..fcdd1a9c88 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -236,11 +236,9 @@ namespace instance_check_internal DBusError err; dbus_uint32_t serial = 0; const char* sigval = message_text.c_str(); - //std::string interface_name = "com.prusa3d.prusaslicer.InstanceCheck"; - std::string interface_name = "com.softfever3d.orca-slicer.InstanceCheck.Object" + version; + std::string interface_name = "com.orcaslicer.OrcaSlicer.InstanceCheck.Object" + version; std::string method_name = "AnotherInstance"; - //std::string object_name = "/com/prusa3d/prusaslicer/InstanceCheck"; - std::string object_name = "/com/softfever3d/OrcaSlicer/InstanceCheck/Object" + version; + std::string object_name = "/com/orcaslicer/OrcaSlicer/InstanceCheck/Object" + version; // initialise the error value @@ -551,7 +549,7 @@ namespace MessageHandlerDBusInternal "