GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 02:21:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #12874 - Ctrl-P does not open preferences in 2.8.0-alpha5

Browse Source
This commit is contained in:
YuSanka 2024-06-24 13:50:12 +02:00 committed by Lukas Matena
parent 1c0cb70faa
commit 7519142b1f
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI_App.cpp
View File

@ -2598,7 +2598,7 @@ void GUI_App::update_mode()
plater()->canvas3D()->update_gizmos_on_off_state(); plater()->canvas3D()->update_gizmos_on_off_state();
} }
wxMenu* GUI_App::get_config_menu() wxMenu* GUI_App::get_config_menu(MainFrame* main_frame)
{ {
auto local_menu = new wxMenu(); auto local_menu = new wxMenu();
wxWindowID config_id_base = wxWindow::NewControlId(int(ConfigMenuCnt)); wxWindowID config_id_base = wxWindow::NewControlId(int(ConfigMenuCnt));
@ -2618,13 +2618,12 @@ wxMenu* GUI_App::get_config_menu()
#endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION) #endif //(__linux__) && defined(SLIC3R_DESKTOP_INTEGRATION)
local_menu->AppendSeparator(); local_menu->AppendSeparator();
} }
local_menu->Append(config_id_base + ConfigMenuPreferences, _L("&Preferences") + dots +
#ifdef __APPLE__ #ifdef __APPLE__
"\tCtrl+,", local_menu->Append(config_id_base + ConfigMenuPreferences, _L("&Preferences") + dots + "\tCtrl+,", _L("Application preferences"));
#else #else
"\tCtrl+P", append_menu_item(local_menu, config_id_base + ConfigMenuPreferences, _L("&Preferences") + "\tCtrl+P", _L("Application preferences"),
[](wxCommandEvent&) { wxGetApp().open_preferences(); }, "", nullptr, []() {return true; }, main_frame);
#endif #endif
_L("Application preferences"));
local_menu->AppendSeparator(); local_menu->AppendSeparator();
local_menu->Append(config_id_base + ConfigMenuLanguage, _L("&Language")); local_menu->Append(config_id_base + ConfigMenuLanguage, _L("&Language"));

2
src/slic3r/GUI/GUI_App.hpp
View File

@ -293,7 +293,7 @@ public:
bool save_mode(const /*ConfigOptionMode*/int mode) ; bool save_mode(const /*ConfigOptionMode*/int mode) ;
void update_mode(); void update_mode();
wxMenu* get_config_menu(); wxMenu* get_config_menu(MainFrame* main_frame);
bool has_unsaved_preset_changes() const; bool has_unsaved_preset_changes() const;
bool has_current_preset_changes() const; bool has_current_preset_changes() const;
void update_saved_preset_from_current_preset(); void update_saved_preset_from_current_preset();

6
src/slic3r/GUI/MainFrame.cpp
View File

@ -1636,7 +1636,7 @@ void MainFrame::init_menubar_as_editor()
if (viewMenu) if (viewMenu)
m_bar_menus.AppendMenuItem(viewMenu, _L("&View")); m_bar_menus.AppendMenuItem(viewMenu, _L("&View"));
m_bar_menus.AppendMenuItem(wxGetApp().get_config_menu(), _L("&Configuration")); m_bar_menus.AppendMenuItem(wxGetApp().get_config_menu(this), _L("&Configuration"));
m_bar_menus.AppendMenuSeparaorItem(); m_bar_menus.AppendMenuSeparaorItem();
@ -1654,7 +1654,7 @@ void MainFrame::init_menubar_as_editor()
m_menubar->Append(windowMenu, _L("&Window")); m_menubar->Append(windowMenu, _L("&Window"));
if (viewMenu) m_menubar->Append(viewMenu, _L("&View")); if (viewMenu) m_menubar->Append(viewMenu, _L("&View"));
// Add additional menus from C++ // Add additional menus from C++
m_menubar->Append(wxGetApp().get_config_menu(), _L("&Configuration")); m_menubar->Append(wxGetApp().get_config_menu(this), _L("&Configuration"));
m_menubar->Append(helpMenu, _L("&Help")); m_menubar->Append(helpMenu, _L("&Help"));
SetMenuBar(m_menubar); SetMenuBar(m_menubar);
@ -1747,7 +1747,7 @@ void MainFrame::init_menubar_as_gcodeviewer()
m_menubar->Append(fileMenu, _L("&File")); m_menubar->Append(fileMenu, _L("&File"));
if (viewMenu != nullptr) m_menubar->Append(viewMenu, _L("&View")); if (viewMenu != nullptr) m_menubar->Append(viewMenu, _L("&View"));
// Add additional menus from C++ // Add additional menus from C++
m_menubar->Append(wxGetApp().get_config_menu(), _L("&Configuration")); m_menubar->Append(wxGetApp().get_config_menu(this), _L("&Configuration"));
m_menubar->Append(helpMenu, _L("&Help")); m_menubar->Append(helpMenu, _L("&Help"));
SetMenuBar(m_menubar); SetMenuBar(m_menubar);