mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 01:56:37 -04:00
ae9787cdfb
Adapted patch provided from Jesper Schmitz Mouridsen PR: 284821 Reported by: Torfinn Ingolfsen Approved by: teodorsigaev@
63 lines
3.4 KiB
C++
63 lines
3.4 KiB
C++
--- src/slic3r/GUI/ConfigWizard.cpp.orig 2024-12-20 11:54:34 UTC
|
|
+++ src/slic3r/GUI/ConfigWizard.cpp
|
|
@@ -616,7 +616,7 @@ void PageWelcome::set_run_reason(ConfigWizard::RunReas
|
|
const bool data_empty = run_reason == ConfigWizard::RR_DATA_EMPTY;
|
|
welcome_text->Show(data_empty);
|
|
cbox_reset->Show(!data_empty);
|
|
-#if defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
if (!DesktopIntegrationDialog::is_integrated())
|
|
cbox_integrate->Show(true);
|
|
else
|
|
@@ -1674,7 +1674,7 @@ PageDownloader::PageDownloader(ConfigWizard* parent)
|
|
));
|
|
}
|
|
|
|
-#if defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
append_text(wxString::Format(_L(
|
|
"On Linux systems the process of registration also creates desktop integration files for this version of application."
|
|
)));
|
|
@@ -1692,7 +1692,7 @@ bool PageDownloader::on_finish_downloader() const
|
|
return m_downloader->on_finish();
|
|
}
|
|
|
|
-#ifdef __linux__
|
|
+#if defined(__linux__) || defined(__FreeBSD__)
|
|
bool DownloaderUtils::Worker::perform_registration_linux = false;
|
|
#endif // __linux__
|
|
|
|
@@ -1741,10 +1741,10 @@ bool DownloaderUtils::Worker::perform_url_register()
|
|
}
|
|
//key_full = "\"C:\\Program Files\\Prusa3D\\PrusaSlicer\\prusa-slicer-console.exe\" \"%1\"";
|
|
key_full = key_string;
|
|
-#elif __APPLE__
|
|
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
|
// Apple registers for custom url in info.plist thus it has to be already registered since build.
|
|
// The url will always trigger opening of prusaslicer and we have to check that user has allowed it. (GUI_App::MacOpenURL is the triggered method)
|
|
-#elif defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION
|
|
// the performation should be called later during desktop integration
|
|
perform_registration_linux = true;
|
|
#endif
|
|
@@ -1760,9 +1760,9 @@ void DownloaderUtils::Worker::deregister()
|
|
return;
|
|
}
|
|
key_full = key_string;
|
|
-#elif __APPLE__
|
|
+#elif defined(__APPLE__) || defined(__FreeBSD__)
|
|
// TODO
|
|
-#elif defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION
|
|
BOOST_LOG_TRIVIAL(debug) << "DesktopIntegrationDialog::undo_downloader_registration";
|
|
DesktopIntegrationDialog::undo_downloader_registration();
|
|
perform_registration_linux = false;
|
|
@@ -3405,7 +3405,7 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_c
|
|
if ((check_unsaved_preset_changes = install_bundles.size() > 0))
|
|
header = _L_PLURAL("A new vendor was installed and one of its printers will be activated", "New vendors were installed and one of theirs printers will be activated", install_bundles.size());
|
|
|
|
-#if defined(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
+#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SLIC3R_DESKTOP_INTEGRATION)
|
|
// Desktop integration on Linux
|
|
BOOST_LOG_TRIVIAL(debug) << "ConfigWizard::priv::apply_config integrate_desktop" << page_welcome->integrate_desktop() << " perform_registration_linux " << DownloaderUtils::Worker::perform_registration_linux;
|
|
if (page_welcome->integrate_desktop())
|