2.4.58 beta

CMakeLists.txt

@@ -512,17 +512,40 @@ add_custom_target(gettext_merge_po_with_pot
 )
 file(GLOB L10N_PO_FILES "${L10N_DIR}/*/${SLIC3R_APP_KEY}*.po")
 foreach(po_file ${L10N_PO_FILES})
-    GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
-    SET(po_new_file "${po_dir}/${SLIC3R_APP_KEY}_.po")
+    #GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
+    #SET(po_new_file "${po_dir}/${SLIC3R_APP_KEY}_.po")
     add_custom_command(
         TARGET gettext_merge_po_with_pot PRE_BUILD
         COMMAND msgmerge -N -o ${po_file} ${po_file} "${L10N_DIR}/${SLIC3R_APP_KEY}.pot"
+        # delete obsolete lines from resulting PO to avoid conflicts after a merging of it with wxWidgets.po
+        COMMAND msgattrib --no-obsolete -o ${po_file} ${po_file}
         DEPENDS ${po_file}
     )
 endforeach()
+
+add_custom_target(gettext_concat_wx_po_with_po
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    COMMENT "Concatenate and merge wxWidgets localization po with Slic3r po file"
+)
+file(GLOB L10N_PO_FILES "${L10N_DIR}/*/${SLIC3R_APP_KEY}*.po")
+file(GLOB L10N_WX_PO_FILES "${L10N_DIR}/*/${SLIC3R_APP_KEY}*.po")
+foreach(po_file ${L10N_PO_FILES})
+    GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
+    GET_FILENAME_COMPONENT(po_dir_name "${po_dir}" NAME)
+    SET(wx_po_file "${L10N_DIR}/wx_locale/${po_dir_name}.po")
+    #SET(po_new_file "${po_dir}/${SLIC3R_APP_KEY}_.po")
+    add_custom_command(
+        TARGET gettext_concat_wx_po_with_po PRE_BUILD
+        COMMAND msgcat --use-first -o ${po_file} ${po_file} ${wx_po_file}
+        # delete obsolete lines from resulting PO
+        COMMAND msgattrib --no-obsolete -o ${po_file} ${po_file}
+        DEPENDS ${po_file}
+    )
+endforeach()
+
 add_custom_target(gettext_po_to_mo
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-    COMMENT "Generate localization po files (binary) from mo files (texts)"
+    COMMENT "Generate localization mo files (binary) from po files (texts)"
 )
 file(GLOB L10N_PO_FILES "${L10N_DIR}/*/Slic3r.po")
 foreach(po_file ${L10N_PO_FILES})
@@ -557,6 +580,21 @@ else ()
                    "OpenVDB installation with the OPENVDB_FIND_MODULE_PATH cache variable.")
 endif ()
 
+find_path(SPNAV_INCLUDE_DIR spnav.h)
+if (SPNAV_INCLUDE_DIR)
+    find_library(HAVE_SPNAV spnav)
+    if (HAVE_SPNAV)
+        add_definitions(-DHAVE_SPNAV)
+        add_library(libspnav SHARED IMPORTED)
+        target_link_libraries(libspnav INTERFACE spnav)
+        message(STATUS "SPNAV library found")
+    else()
+        message(STATUS "SPNAV library NOT found, Spacenavd not supported")
+    endif()
+else()
+    message(STATUS "SPNAV library NOT found, Spacenavd not supported")
+endif()
+
 set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
 function(prusaslicer_copy_dlls target)
     if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")

build_win.bat

@@ -10,6 +10,7 @@
 @ECHO                  [-PRODUCT ^<product^>] [-DESTDIR ^<directory^>]
 @ECHO                  [-STEPS ^<all^|all-dirty^|app^|app-dirty^|deps^|deps-dirty^>]
 @ECHO                  [-RUN ^<console^|custom^|none^|viewer^|window^>]
+@ECHO                  [-PRIORITY ^<normal^|low^>]
 @ECHO.
 @ECHO  -a -ARCH      Target processor architecture
 @ECHO                Default: %PS_ARCH_HOST%
@@ -38,6 +39,8 @@
 @ECHO  -d -DESTDIR   Deps destination directory
 @ECHO                Warning: Changing destdir path will not delete the old destdir.
 @ECHO                Default: %PS_DESTDIR_DEFAULT_MSG%
+@ECHO  -p -PRIORITY  Build CPU priority
+@ECHO                Default: normal
 @ECHO.
 @ECHO  Examples:
 @ECHO.
@@ -86,6 +89,7 @@ SET PS_RUN=none
 SET PS_DESTDIR=
 SET PS_VERSION=
 SET PS_PRODUCT=%PS_PRODUCT_DEFAULT%
+SET PS_PRIORITY=normal
 CALL :RESOLVE_DESTDIR_CACHE
 
 REM Set up parameters used by help menu
@@ -99,7 +103,7 @@ SET EXIT_STATUS=1
 SET PS_CURRENT_STEP=arguments
 SET PARSER_STATE=
 SET PARSER_FAIL=
-FOR %%I in (%*) DO CALL :PARSE_OPTION "ARCH CONFIG DESTDIR STEPS RUN VERSION PRODUCT" PARSER_STATE "%%~I"
+FOR %%I in (%*) DO CALL :PARSE_OPTION "ARCH CONFIG DESTDIR STEPS RUN VERSION PRODUCT PRIORITY" PARSER_STATE "%%~I"
 IF "%PARSER_FAIL%" NEQ "" (
     @ECHO ERROR: Invalid switch: %PARSER_FAIL% 1>&2
     GOTO :HELP
@@ -114,6 +118,9 @@ CALL :TOLOWER PS_ARCH
 SET PS_ARCH=%PS_ARCH:amd64=x64%
 CALL :PARSE_OPTION_VALUE %PS_CONFIG_LIST:;= % PS_CONFIG
 IF "%PS_CONFIG%" EQU "" GOTO :HELP
+CALL :PARSE_OPTION_VALUE "normal low" PS_PRIORITY
+SET PS_PRIORITY=%PS_PRIORITY:normal= %
+SET PS_PRIORITY=%PS_PRIORITY:low=-low% 
 REM RESOLVE_DESTDIR_CACHE must go after PS_ARCH and PS_CONFIG, but before PS STEPS
 CALL :RESOLVE_DESTDIR_CACHE
 IF "%PS_STEPS%" EQU "" SET PS_STEPS=%PS_STEPS_DEFAULT%
@@ -200,7 +207,7 @@ IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (
     (del CMakeCache.txt && cmake.exe .. -DDESTDIR="%PS_DESTDIR%") || GOTO :END
 ) ELSE GOTO :END
 (echo %PS_DESTDIR%)> "%PS_DEPS_PATH_FILE%"
-msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG%  /v:quiet || GOTO :END
+msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet %PS_PRIORITY% || GOTO :END
 cd ..\..
 IF /I "%PS_STEPS:~0,4%" EQU "deps" GOTO :RUN_APP
 
@@ -223,7 +230,7 @@ IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (
     (del CMakeCache.txt && cmake.exe .. -DCMAKE_PREFIX_PATH="%PS_DESTDIR%\usr\local" -DCMAKE_CONFIGURATION_TYPES=%PS_CONFIG_LIST%) || GOTO :END
 ) ELSE GOTO :END
 REM Skip the build step if we're using the undocumented app-cmake to regenerate the full config from inside devenv
-IF "%PS_STEPS%" NEQ "app-cmake" msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet || GOTO :END
+IF "%PS_STEPS%" NEQ "app-cmake" msbuild /m ALL_BUILD.vcxproj /p:Configuration=%PS_CONFIG% /v:quiet %PS_PRIORITY% || GOTO :END
 (echo %PS_DESTDIR%)> "%PS_DEPS_PATH_FILE_FOR_CONFIG%"
 
 REM Run app

resources/data/hints.ini

@@ -123,7 +123,7 @@ hypertext_settings_category = Infill
 disabled_tags = SLA; simple
 
 [hint:Variable layer height]
-text = Variable layer height\nDid you know that you can print different regions of your model with a different layer height and smooth the transitions between them? Try the<a>Variable layer height tool.</a>(Not available for SLA printers.)
+text = Variable layer height\nDid you know that you can print different regions of your model with a different layer height and smooth the transitions between them? Try the<a>Variable layer height tool</a>. (Not available for SLA printers.)
 hypertext_type = plater
 hypertext_plater_item = layersediting
 disabled_tags = SLA
@@ -139,7 +139,7 @@ documentation_link= https://help.prusa3d.com/en/article/per-model-settings_1674
 disabled_tags = SLA
 
 [hint:Solid infill threshold area]
-text = Solid infill threshold area\nDid you know that you can make parts of your model with a small cross-section be filled with solid infill automatically? Set the<a>Solid infill threshold area</a>.(Expert mode only.)
+text = Solid infill threshold area\nDid you know that you can make parts of your model with a small cross-section be filled with solid infill automatically? Set the<a>Solid infill threshold area</a>. (Expert mode only.)
 hypertext_type = settings
 hypertext_settings_opt = solid_infill_below_area
 hypertext_settings_type = 1
@@ -197,7 +197,7 @@ documentation_link = https://help.prusa3d.com/en/article/insert-pause-or-custom-
 disabled_tags = SLA
 
 [hint:Configuration snapshots]
-text = Configuration snapshots\nDid you know that roll back to a complete backup of all system and user profiles? You can view and move back and forth between snapshots using the Configuration - <a>Configuration snapshots menu</a>.
+text = Configuration snapshots\nDid you know that you can roll back to a complete backup of all system and user profiles? You can view and move back and forth between snapshots using the Configuration - <a>Configuration snapshots menu</a>.
 documentation_link = https://help.prusa3d.com/en/article/configuration-snapshots_1776
 hypertext_type = menubar
 hypertext_menubar_menu_name = Configuration