3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-27 00:24:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MSW specific: Hide "Use system menu for application" option in Preferences for system older then Windows 10

Browse source 
(related to the fix of #7355 - PrusaSlicer 2.4.0-beta-2+win64 will not start on Windows 7 64-bit )

+ Updated URL_HASH SHA256 in wxWidgets.cmake in respect to the 51c824019e98fc97b0bcdd4d9f4ed4cb523a7cac in wxWidgets-v3.1.4-patched
This commit is contained in:
YuSanka 2021-11-29 21:00:43 +01:00
parent 56d5a340ce
commit f5cf3cb81d
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deps/wxWidgets/wxWidgets.cmake vendored
View file

@ -13,7 +13,7 @@ prusaslicer_add_cmake_project(wxWidgets
# GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets" # GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
# GIT_TAG tm_cross_compile #${_wx_git_tag} # GIT_TAG tm_cross_compile #${_wx_git_tag}
URL https://github.com/prusa3d/wxWidgets/archive/refs/heads/v3.1.4-patched.zip URL https://github.com/prusa3d/wxWidgets/archive/refs/heads/v3.1.4-patched.zip
URL_HASH SHA256=21ed12eb5c215b00999f0374af652be0a6f785df10d18d0dfec8d81ed4abaea3 URL_HASH SHA256=ed36a2159c781cce07b06378664e683ebd8cb2f51914aba9acd3bfca3d63d7d3
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
CMAKE_ARGS CMAKE_ARGS
-DwxBUILD_PRECOMP=ON -DwxBUILD_PRECOMP=ON

4
src/slic3r/GUI/Preferences.cpp
View file

@ -481,6 +481,9 @@ void PreferencesDialog::build(size_t selected_tab)
option = Option(def, "dark_color_mode"); option = Option(def, "dark_color_mode");
m_optgroup_dark_mode->append_single_option_line(option); m_optgroup_dark_mode->append_single_option_line(option);
if (wxPlatformInfo::Get().GetOSMajorVersion() >= 10) // Use system menu just for Window newer then Windows 10
// Use menu with ownerdrawn items by default on systems older then Windows 10
{
def.label = L("Use system menu for application"); def.label = L("Use system menu for application");
def.type = coBool; def.type = coBool;
def.tooltip = L("If enabled, application will use the standart Windows system menu,\n" def.tooltip = L("If enabled, application will use the standart Windows system menu,\n"
@ -489,6 +492,7 @@ void PreferencesDialog::build(size_t selected_tab)
def.set_default_value(new ConfigOptionBool{ app_config->get("sys_menu_enabled") == "1" }); def.set_default_value(new ConfigOptionBool{ app_config->get("sys_menu_enabled") == "1" });
option = Option(def, "sys_menu_enabled"); option = Option(def, "sys_menu_enabled");
m_optgroup_dark_mode->append_single_option_line(option); m_optgroup_dark_mode->append_single_option_line(option);
}
activate_options_tab(m_optgroup_dark_mode); activate_options_tab(m_optgroup_dark_mode);
} }