3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added set_as_owner_drawn() for the code universality

Browse Source
This commit is contained in:
YuSanka 2019-05-03 16:14:26 +02:00
parent 2affa48178
commit 30dc689d35
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ void MainFrame::init_menubar()
// File menu
wxMenu* fileMenu = new wxMenu;
fileMenu->SetOwnerDrawn(true);
set_as_owner_drawn(fileMenu);
{
wxMenuItem* item_open = append_menu_item(fileMenu, wxID_ANY, _(L("&Open Project")) + dots + "\tCtrl+O", _(L("Open a project file")),
[this](wxCommandEvent&) { if (m_plater) m_plater->load_project(); }, menu_icon("open"));
@ -332,7 +332,7 @@ void MainFrame::init_menubar()
fileMenu->AppendSeparator();
wxMenu* import_menu = new wxMenu();
import_menu->SetOwnerDrawn(true);
set_as_owner_drawn(import_menu);
wxMenuItem* item_import_model = append_menu_item(import_menu, wxID_ANY, _(L("Import STL/OBJ/AM&F/3MF")) + dots + "\tCtrl+I", _(L("Load a model")),
[this](wxCommandEvent&) { if (m_plater) m_plater->add_model(); }, menu_icon("import_plater"));
import_menu->AppendSeparator();
@ -346,7 +346,7 @@ void MainFrame::init_menubar()
append_submenu(fileMenu, import_menu, wxID_ANY, _(L("&Import")), "");
wxMenu* export_menu = new wxMenu();
export_menu->SetOwnerDrawn(true);
set_as_owner_drawn(export_menu);
wxMenuItem* item_export_gcode = append_menu_item(export_menu, wxID_ANY, _(L("Export &G-code")) + dots +"\tCtrl+G", _(L("Export current plate as G-code")),
[this](wxCommandEvent&) { if (m_plater) m_plater->export_gcode(); }, menu_icon("export_gcode"));
m_changeable_menu_items.push_back(item_export_gcode);
@ -440,10 +440,10 @@ void MainFrame::init_menubar()
// Edit menu
wxMenu* editMenu = nullptr;
editMenu->SetOwnerDrawn(true);
if (m_plater != nullptr)
{
editMenu = new wxMenu();
set_as_owner_drawn(editMenu);
#ifdef __APPLE__
// Backspace sign
wxString hotkey_delete = "\u232b";
@ -474,7 +474,7 @@ void MainFrame::init_menubar()
// Window menu
auto windowMenu = new wxMenu();
windowMenu->SetOwnerDrawn(true);
set_as_owner_drawn(windowMenu);
{
size_t tab_offset = 0;
if (m_plater) {

8
src/slic3r/GUI/wxExtensions.cpp
View File

@ -25,6 +25,14 @@ using Slic3r::GUI::from_u8;
wxDEFINE_EVENT(wxCUSTOMEVT_TICKSCHANGED, wxEvent);
wxDEFINE_EVENT(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, wxCommandEvent);
void set_as_owner_drawn(wxMenu* menu)
{
#ifdef __WXMSW__
// this function is implemented only for MSW (in Prusa/wxWidgets fork)
menu->SetOwnerDrawn(true);
#endif
}
std::map<int, std::string> menuitem_bitmaps;
static std::string empty_str = "";

11
src/slic3r/GUI/wxExtensions.hpp
View File

@ -20,6 +20,7 @@ namespace Slic3r {
enum class ModelVolumeType : int;
};
void set_as_owner_drawn(wxMenu* menu);
const std::string& get_menuitem_icon_name(const int item_id);
void update_menu_item_icons(wxMenuItem* item);
void msw_rescale_menu(wxMenu* menu);
@ -972,10 +973,16 @@ class MenuWithSeparators : public wxMenu
{
public:
MenuWithSeparators(const wxString& title, long style = 0)
: wxMenu(title, style) {}
: wxMenu(title, style)
{
set_as_owner_drawn(this);
}
MenuWithSeparators(long style = 0)
: wxMenu(style) {}
: wxMenu(style)
{
set_as_owner_drawn(this);
}
~MenuWithSeparators() {}