pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

prusaslicer: Update to release 2.4.2

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Thu Apr 28 11:25:57 2022 +1000
Changeset:	4a32e1d7a6f5588b42816b8041600c122245d2a5

Modified Files:
	prusaslicer/Makefile
	prusaslicer/PLIST
	prusaslicer/distinfo
	prusaslicer/patches/patch-CMakeLists.txt
	prusaslicer/patches/patch-src_CMakeLists_txt
	prusaslicer/patches/patch-src_libslic3r_CMakeLists.txt
	prusaslicer/patches/patch-src_slic3r_CMakeLists.txt
	prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp

Log Message:
prusaslicer: Update to release 2.4.2

PrusaSlicer 2.4.2-rc2

Bugs fixed

- When opening files through macOS finder on latest macOS, the model was not
  displayed in the scene until further action (e.g. slicing) #8170
- Fixed a crash when Unsaved Changes dialog attempted to show a modified
  config option which is not available in current mode (e.g. Start G-Code in
  Simple mode). #7905
- Fixed a bug that when the user was closing the application and replied 'Yes'
  in the dialog asking about unsaved project while also checking 'Remember my
  choice', it made it impossible to close PrusaSlicer in the next runs when
  there were no objects in the plater #8076, #8122
- Loading of a G-Code in G-Code Viewer or loading config from G-Code file
  sometimes failed because of a bug in parsing of the configuration block at
  the end.
- Fixed incorrect rendering of some characters used in the recently updated
  Simplified Chinese translation #8171
- Fixed incorrect number of toolchanges reported in "Sliced Info" box when
  wipe tower was used. The annotations of toolchanges in G-Code were also
  numbered wrong #8186
- Fixed a crash when using the "Import SL1 Archive" function and either
  cancelling the dialog or confirming a non-existing file #8175

Other

- Recycling symbols in Shape Gallery were mirrored so the user does not have
  to flip them when using them as negative volumes at the base of the print
  (which is the usual use case). Also, PLA recycling symbol was added #7800

PrusaSlicer 2.4.2-rc1

Bugs fixed

- SLA mode incorrectly handled 3MFs from 3rd party software, resulting in
  misplaced SLA support points and holes in some cases (#6100, #7359, #7189,
  #7826, #7659). This is very old issue.
- Vase mode preview did not show in cases when Custom Start G-Code lacked
  moves in Z #8032
- When loading a 3rd party 3MF using drag and drop. PrusaSlicer no longer asks
  if the 3MF shall be loaded as a project (which makes no sense since it
  contains no config) and loads the geometry only
- Using the Layer Height Modifier with the wipe tower was impossible with
  multiple objects. The wipe tower reported that the layer height profile is
  different, even though it was in fact set the same on all objects (#7711,
  #7903, #8044)
- Fixed a crash on "Convert from/to units" when several objects were selected
- Automatic color change for logo crashed PrusaSlicer in certain cases (when a
  one-layer object was present) #8156
- macOS specific: It is now possible to restore PrusaSlicer by clicking the
  dock icon after minimizing it. Partial fix was already in 2.4.1, this
  release should fix it for good on all macOS versions both Intel and ARM
  (#6364, related to #7981).
- Linux specific: Fixed a crash on opening projects in some cases (#8078,
  #8097)

Localization

- Fixed minor errors in German translation #8024
- Updated Simplified Chinese localization (#8105 - thanks @kang-kang)

Profiles

- Added Snapmaker bundle (Snapmaker A250, Snapmaker A350). Based on
  https://github.com/nivekmai/snapmaker-prusa by @nivekmai, @WilliamBosacker,
  @mrworf
- Added profiles for Zonestar printers (Z5, Z6, Z5X, Z8, Z9), based on
  slic3r/slic3r-profiles#19 by @ZONESTAR3D

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4a32e1d7a6f5588b42816b8041600c122245d2a5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 prusaslicer/Makefile                               |  2 +-
 prusaslicer/PLIST                                  | 25 ++++++++++++++++++++++
 prusaslicer/distinfo                               | 16 +++++++-------
 prusaslicer/patches/patch-CMakeLists.txt           | 14 +-----------
 prusaslicer/patches/patch-src_CMakeLists_txt       |  2 +-
 .../patches/patch-src_libslic3r_CMakeLists.txt     |  2 +-
 .../patches/patch-src_slic3r_CMakeLists.txt        |  2 +-
 .../patches/patch-src_slic3r_GUI_GUI__App.cpp      | 24 ++++++++++-----------
 8 files changed, 50 insertions(+), 37 deletions(-)

diffs:
diff --git a/prusaslicer/Makefile b/prusaslicer/Makefile
index befd0e72b3..c4f2dca414 100644
--- a/prusaslicer/Makefile
+++ b/prusaslicer/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGVERSION=	2.4.1
+PKGVERSION=	2.4.2
 PKGNAME=	prusaslicer-${PKGVERSION}
 DISTNAME=	PrusaSlicer-${PKGVERSION:S/rc/-rc/}
 CATEGORIES=	cad
diff --git a/prusaslicer/PLIST b/prusaslicer/PLIST
index 0c331e97a9..2388953c54 100644
--- a/prusaslicer/PLIST
+++ b/prusaslicer/PLIST
@@ -471,6 +471,14 @@ share/PrusaSlicer/profiles/RatRig/rr-vc-500.stl
 share/PrusaSlicer/profiles/RatRig/rr-vc-500.svg
 share/PrusaSlicer/profiles/RatRig/rr-vminion.stl
 share/PrusaSlicer/profiles/RatRig/rr-vminion.svg
+share/PrusaSlicer/profiles/Snapmaker.idx
+share/PrusaSlicer/profiles/Snapmaker.ini
+share/PrusaSlicer/profiles/Snapmaker/A250_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/A250_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/A250_thumbnail.png
+share/PrusaSlicer/profiles/Snapmaker/A350_bed.stl
+share/PrusaSlicer/profiles/Snapmaker/A350_texture.svg
+share/PrusaSlicer/profiles/Snapmaker/A350_thumbnail.png
 share/PrusaSlicer/profiles/TriLAB.idx
 share/PrusaSlicer/profiles/TriLAB.ini
 share/PrusaSlicer/profiles/TriLAB/AQI_thumbnail.png
@@ -496,6 +504,7 @@ share/PrusaSlicer/profiles/Voron.ini
 share/PrusaSlicer/profiles/Voron/Voron_v0_120_thumbnail.png
 share/PrusaSlicer/profiles/Voron/Voron_v1_250_afterburner_thumbnail.png
 share/PrusaSlicer/profiles/Voron/Voron_v1_300_afterburner_thumbnail.png
+share/PrusaSlicer/profiles/Voron/Voron_v1_350_afterburner_thumbnail.png
 share/PrusaSlicer/profiles/Voron/Voron_v2_250_afterburner_thumbnail.png
 share/PrusaSlicer/profiles/Voron/Voron_v2_250_thumbnail.png
 share/PrusaSlicer/profiles/Voron/Voron_v2_300_afterburner_thumbnail.png
@@ -511,9 +520,23 @@ share/PrusaSlicer/profiles/Voron/bedtexture-v2-350.png
 share/PrusaSlicer/profiles/Voron/printbed-v0-120.stl
 share/PrusaSlicer/profiles/Voron/printbed-v1-250.stl
 share/PrusaSlicer/profiles/Voron/printbed-v1-300.stl
+share/PrusaSlicer/profiles/Voron/printbed-v1-350.stl
 share/PrusaSlicer/profiles/Voron/printbed-v2-250.stl
 share/PrusaSlicer/profiles/Voron/printbed-v2-300.stl
 share/PrusaSlicer/profiles/Voron/printbed-v2-350.stl
+share/PrusaSlicer/profiles/Zonestar.idx
+share/PrusaSlicer/profiles/Zonestar.ini
+share/PrusaSlicer/profiles/Zonestar/150_texture.svg
+share/PrusaSlicer/profiles/Zonestar/220_texture.svg
+share/PrusaSlicer/profiles/Zonestar/310_texture.svg
+share/PrusaSlicer/profiles/Zonestar/Z5X_thumbnail.png
+share/PrusaSlicer/profiles/Zonestar/Z5_thumbnail.png
+share/PrusaSlicer/profiles/Zonestar/Z6_thumbnail.png
+share/PrusaSlicer/profiles/Zonestar/Z8_thumbnail.png
+share/PrusaSlicer/profiles/Zonestar/Z9_thumbnail.png
+share/PrusaSlicer/profiles/Zonestar/bed_150.stl
+share/PrusaSlicer/profiles/Zonestar/bed_220.stl
+share/PrusaSlicer/profiles/Zonestar/bed_310.stl
 share/PrusaSlicer/profiles/gCreate.idx
 share/PrusaSlicer/profiles/gCreate.ini
 share/PrusaSlicer/profiles/gCreate/GMAX15P_thumbnail.png
@@ -554,6 +577,8 @@ share/PrusaSlicer/shapes/OTHER_recycling_symbol.png
 share/PrusaSlicer/shapes/OTHER_recycling_symbol.stl
 share/PrusaSlicer/shapes/PETG_recycling_symbol.png
 share/PrusaSlicer/shapes/PETG_recycling_symbol.stl
+share/PrusaSlicer/shapes/PLA_recycling_symbol.png
+share/PrusaSlicer/shapes/PLA_recycling_symbol.stl
 share/PrusaSlicer/shapes/box.png
 share/PrusaSlicer/shapes/box.stl
 share/PrusaSlicer/shapes/bunny.png
diff --git a/prusaslicer/distinfo b/prusaslicer/distinfo
index 40ae354707..25b862470e 100644
--- a/prusaslicer/distinfo
+++ b/prusaslicer/distinfo
@@ -1,28 +1,28 @@
 $NetBSD$
 
-BLAKE2s (PrusaSlicer-2.4.1.tar.gz) = 9049b61a662e314312c5ec74961864d9f9068896e63c1056c1fe6a23bf1b1d28
-SHA512 (PrusaSlicer-2.4.1.tar.gz) = 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
-Size (PrusaSlicer-2.4.1.tar.gz) = 55572739 bytes
-SHA1 (patch-CMakeLists.txt) = 4a986df0bcf0628116b5370498b6c23ba62dff71
+BLAKE2s (PrusaSlicer-2.4.2.tar.gz) = 5ef613e17f15177e1f9438a619eb1a4937186821845cb0d5e6878de43766c94f
+SHA512 (PrusaSlicer-2.4.2.tar.gz) = d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
+Size (PrusaSlicer-2.4.2.tar.gz) = 47752224 bytes
+SHA1 (patch-CMakeLists.txt) = 33eb39d85ba7b33226f2cc022250872c3ffa28d8
 SHA1 (patch-cmake_modules_FindOpenVDB.cmake) = 4f2afc423a70fe60617b33ff7f26859b39775faa
-SHA1 (patch-src_CMakeLists_txt) = 8075d2af2ee1b730d522e5b4776358a848836dc1
+SHA1 (patch-src_CMakeLists_txt) = 0931dccf0bd1d94544f7dc855475cc2627a9a76b
 SHA1 (patch-src_avrdude_arduino.c) = ff02a4cab1c2d8c82ec7b22c7447ed5ec360ac57
 SHA1 (patch-src_avrdude_libavrdude.h) = 62d48054b147985249664f257dbd8bbd670df233
-SHA1 (patch-src_libslic3r_CMakeLists.txt) = 449b59f6cf5ca3f104e5faa5527b0ef23a00f4c9
+SHA1 (patch-src_libslic3r_CMakeLists.txt) = bc82a71633adcb23dca4850d1076f99340030f2b
 SHA1 (patch-src_libslic3r_GCodeSender.cpp) = 07dde2f6762c9ef180512ea20f735fb4d96a8f2c
 SHA1 (patch-src_libslic3r_LocalesUtils.cpp) = 33a473cadbc05eba7f0c218110e53babea36568c
 SHA1 (patch-src_libslic3r_LocalesUtils.hpp) = 7339ef576cbd16f30271c13b706d2487ae78b457
 SHA1 (patch-src_libslic3r_Platform.cpp) = 3066585efc98ba4963e41bda5952df38a7b095a0
 SHA1 (patch-src_libslic3r_Platform.hpp) = 5626058616d04396bff6c8550951d04fe03249e4
 SHA1 (patch-src_libslic3r_Thread.cpp) = 2e6e81e77e3efef5657ac55fb6b834b2ebec5d9a
-SHA1 (patch-src_slic3r_CMakeLists.txt) = b0a8a0ca0da0db7dafb8097d2db2d40cac23583c
+SHA1 (patch-src_slic3r_CMakeLists.txt) = 32058caf991b20993c1afecf12154a923db28416
 SHA1 (patch-src_slic3r_GUI_ConfigWizard.cpp) = 523d2eeb26c9f580ccdeb034743c301dcc56c727
 SHA1 (patch-src_slic3r_GUI_ConfigWizard__private.hpp) = 7ac3e3a9a67ebe7c99fbfc17ed9c0b2750d96974
 SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.cpp) = d61919d6f053cd598741255bffc29e80c79863df
 SHA1 (patch-src_slic3r_GUI_DesktopIntegrationDialog.hpp) = dd35d8a5c0ccaae50b969352f0f23f974a2ee89f
 SHA1 (patch-src_slic3r_GUI_ExtraRenderers.cpp) = ac803510123ff016b8fa6f22d491c898166e0929
 SHA1 (patch-src_slic3r_GUI_GLCanvas3D.cpp) = 7abaef0d1ffd79fd1fc2de5e8dc445a073386353
-SHA1 (patch-src_slic3r_GUI_GUI__App.cpp) = 1df0066ab3b240e909c5341696aff5dbcbf9050a
+SHA1 (patch-src_slic3r_GUI_GUI__App.cpp) = 8542df80bc371945db4ef67da58be103221ef4ce
 SHA1 (patch-src_slic3r_GUI_GUI__App.hpp) = 9a4e30158b67fb6b73fc1b5ce45c458fb60c60a4
 SHA1 (patch-src_slic3r_GUI_GUI__Preview.cpp) = 8555c73aa6aa3d65b4d34fc93ccb1fbb2957a76f
 SHA1 (patch-src_slic3r_GUI_GUI__Preview.hpp) = 904556d0f85f28a8174845089647bb3691783f37
diff --git a/prusaslicer/patches/patch-CMakeLists.txt b/prusaslicer/patches/patch-CMakeLists.txt
index 34beb39192..50be1a61de 100644
--- a/prusaslicer/patches/patch-CMakeLists.txt
+++ b/prusaslicer/patches/patch-CMakeLists.txt
@@ -1,10 +1,8 @@
 $NetBSD$
 
 Use GTK3, since that's how we build wxWidgets.
-Use namespaces to link against libcereal >= 1.3.1 from:
-https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 
---- CMakeLists.txt.orig	2022-03-10 10:35:03.000000000 +0000
+--- CMakeLists.txt.orig	2022-04-22 11:01:19.000000000 +0000
 +++ CMakeLists.txt
 @@ -38,7 +38,7 @@ CMAKE_DEPENDENT_OPTION(SLIC3R_DESKTOP_IN
  
@@ -15,13 +13,3 @@ https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1
  
  set(IS_CROSS_COMPILE FALSE)
  
-@@ -474,6 +474,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/prusaslicer/patches/patch-src_CMakeLists_txt b/prusaslicer/patches/patch-src_CMakeLists_txt
index e87051b5bc..129db1a478 100644
--- a/prusaslicer/patches/patch-src_CMakeLists_txt
+++ b/prusaslicer/patches/patch-src_CMakeLists_txt
@@ -6,7 +6,7 @@ Allow use of stable track wxWidgets on NetBSD.
 Use namespaces to link against libcereal >= 1.3.1 from:
 https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 
---- src/CMakeLists.txt.orig	2022-03-10 10:35:03.000000000 +0000
+--- src/CMakeLists.txt.orig	2022-04-22 11:01:19.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -22,8 +22,6 @@ add_subdirectory(libslic3r)
  
diff --git a/prusaslicer/patches/patch-src_libslic3r_CMakeLists.txt b/prusaslicer/patches/patch-src_libslic3r_CMakeLists.txt
index 0e6834d2cd..4cc315dc72 100644
--- a/prusaslicer/patches/patch-src_libslic3r_CMakeLists.txt
+++ b/prusaslicer/patches/patch-src_libslic3r_CMakeLists.txt
@@ -3,7 +3,7 @@ $NetBSD$
 Use namespaces to link against libcereal >= 1.3.1 from:
 https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 
---- src/libslic3r/CMakeLists.txt.orig	2022-03-10 10:35:03.000000000 +0000
+--- src/libslic3r/CMakeLists.txt.orig	2022-04-22 11:01:19.000000000 +0000
 +++ src/libslic3r/CMakeLists.txt
 @@ -337,7 +337,7 @@ target_include_directories(libslic3r PUB
  target_link_libraries(libslic3r
diff --git a/prusaslicer/patches/patch-src_slic3r_CMakeLists.txt b/prusaslicer/patches/patch-src_slic3r_CMakeLists.txt
index 63f21fedfc..7194bb83d2 100644
--- a/prusaslicer/patches/patch-src_slic3r_CMakeLists.txt
+++ b/prusaslicer/patches/patch-src_slic3r_CMakeLists.txt
@@ -3,7 +3,7 @@ $NetBSD$
 Use namespaces to link against libcereal >= 1.3.1 from:
 https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 
---- src/slic3r/CMakeLists.txt.orig	2022-03-10 10:35:03.000000000 +0000
+--- src/slic3r/CMakeLists.txt.orig	2022-04-22 11:01:19.000000000 +0000
 +++ src/slic3r/CMakeLists.txt
 @@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
  
diff --git a/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp b/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
index f5173126af..c6da70dc46 100644
--- a/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
+++ b/prusaslicer/patches/patch-src_slic3r_GUI_GUI__App.cpp
@@ -2,7 +2,7 @@ $NetBSD$
 
 Treat NetBSD like Linux.
 
---- src/slic3r/GUI/GUI_App.cpp.orig	2022-03-10 10:35:03.000000000 +0000
+--- src/slic3r/GUI/GUI_App.cpp.orig	2022-04-22 11:01:19.000000000 +0000
 +++ src/slic3r/GUI/GUI_App.cpp
 @@ -374,7 +374,7 @@ private:
  };
@@ -31,7 +31,7 @@ Treat NetBSD like Linux.
              set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
          #else
              // Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
-@@ -1072,7 +1072,7 @@ bool GUI_App::on_init_inner()
+@@ -1070,7 +1070,7 @@ bool GUI_App::on_init_inner()
      wxCHECK_MSG(wxDirExists(resources_dir), false,
          wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir));
  
@@ -40,7 +40,7 @@ Treat NetBSD like Linux.
      if (! check_old_linux_datadir(GetAppName())) {
          std::cerr << "Quitting, user chose to move their data to new location." << std::endl;
          return false;
-@@ -1173,7 +1173,7 @@ bool GUI_App::on_init_inner()
+@@ -1171,7 +1171,7 @@ bool GUI_App::on_init_inner()
          if (!default_splashscreen_pos)
              // revert "restore_win_position" value if application wasn't crashed
              get_app_config()->set("restore_win_position", "1");
@@ -49,16 +49,16 @@ Treat NetBSD like Linux.
          wxYield();
  #endif
          scrn->SetText(_L("Loading configuration")+ dots);
-@@ -1313,7 +1313,7 @@ bool GUI_App::on_init_inner()
+@@ -1311,7 +1311,7 @@ bool GUI_App::on_init_inner()
  
          // An ugly solution to GH #5537 in which GUI_App::init_opengl (normally called from events wxEVT_PAINT
          // and wxEVT_SET_FOCUS before GUI_App::post_init is called) wasn't called before GUI_App::post_init and OpenGL wasn't initialized.
 -#ifdef __linux__
 +#if defined(__linux__) || defined(__NetBSD__)
-         if (update_gui_after_init && m_opengl_initialized) {
+         if (! m_post_initialized && m_opengl_initialized) {
  #else
-         if (update_gui_after_init) {
-@@ -1899,7 +1899,7 @@ bool GUI_App::switch_language()
+         if (! m_post_initialized) {
+@@ -1897,7 +1897,7 @@ bool GUI_App::switch_language()
      }
  }
  
@@ -67,7 +67,7 @@ Treat NetBSD like Linux.
  static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguageInfo* language,
                                                                  const wxLanguageInfo* system_language)
  {
-@@ -2088,7 +2088,7 @@ bool GUI_App::load_language(wxString lan
+@@ -2086,7 +2086,7 @@ bool GUI_App::load_language(wxString lan
  				m_language_info_best = wxLocale::FindLanguageInfo(best_language);
  	        	BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
  			}
@@ -76,7 +76,7 @@ Treat NetBSD like Linux.
              wxString lc_all;
              if (wxGetEnv("LC_ALL", &lc_all) && ! lc_all.IsEmpty()) {
                  // Best language returned by wxWidgets on Linux apparently does not respect LC_ALL.
-@@ -2141,7 +2141,7 @@ bool GUI_App::load_language(wxString lan
+@@ -2139,7 +2139,7 @@ bool GUI_App::load_language(wxString lan
      } else if (m_language_info_system != nullptr && language_info->CanonicalName.BeforeFirst('_') == m_language_info_system->CanonicalName.BeforeFirst('_'))
          language_info = m_language_info_system;
  
@@ -85,7 +85,7 @@ Treat NetBSD like Linux.
      // If we can't find this locale , try to use different one for the language
      // instead of just reporting that it is impossible to switch.
      if (! wxLocale::IsAvailable(language_info->Language)) {
-@@ -2241,7 +2241,7 @@ void GUI_App::add_config_menu(wxMenuBar 
+@@ -2239,7 +2239,7 @@ void GUI_App::add_config_menu(wxMenuBar 
          local_menu->Append(config_id_base + ConfigMenuSnapshots, _L("&Configuration Snapshots") + dots, _L("Inspect / activate configuration snapshots"));
          local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _L("Take Configuration &Snapshot"), _L("Capture a configuration snapshot"));
          local_menu->Append(config_id_base + ConfigMenuUpdate, _L("Check for Configuration Updates"), _L("Check for configuration updates"));
@@ -94,7 +94,7 @@ Treat NetBSD like Linux.
          //if (DesktopIntegrationDialog::integration_possible())
          local_menu->Append(config_id_base + ConfigMenuDesktopIntegration, _L("Desktop Integration"), _L("Desktop Integration"));    
  #endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)        
-@@ -2285,7 +2285,7 @@ void GUI_App::add_config_menu(wxMenuBar 
+@@ -2283,7 +2283,7 @@ void GUI_App::add_config_menu(wxMenuBar 
  		case ConfigMenuUpdate:
  			check_updates(true);
  			break;
@@ -103,7 +103,7 @@ Treat NetBSD like Linux.
          case ConfigMenuDesktopIntegration:
              show_desktop_integration_dialog();
              break;
-@@ -2899,7 +2899,7 @@ bool GUI_App::run_wizard(ConfigWizard::R
+@@ -2905,7 +2905,7 @@ bool GUI_App::run_wizard(ConfigWizard::R
  
  void GUI_App::show_desktop_integration_dialog()
  {
Home | Main Index | Thread Index | Old Index