|
|
@@ -42,7 +42,6 @@ wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const
|
|
|
wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
|
|
|
std::function<void(wxCommandEvent& event)> cb, const std::string& icon, wxEvtHandler* event_handler)
|
|
|
{
|
|
|
-// const wxBitmap& bmp = !icon.empty() ? wxBitmap(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG) : wxNullBitmap;
|
|
|
const wxBitmap& bmp = !icon.empty() ? create_scaled_bitmap(icon) : wxNullBitmap;
|
|
|
return append_menu_item(menu, id, string, description, cb, bmp, event_handler);
|
|
|
}
|
|
|
@@ -54,7 +53,6 @@ wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxStrin
|
|
|
|
|
|
wxMenuItem* item = new wxMenuItem(menu, id, string, description);
|
|
|
if (!icon.empty())
|
|
|
-// item->SetBitmap(wxBitmap(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG));
|
|
|
item->SetBitmap(create_scaled_bitmap(icon));
|
|
|
|
|
|
item->SetSubMenu(sub_menu);
|
|
|
@@ -421,11 +419,9 @@ wxBitmap create_scaled_bitmap(const std::string& bmp_name)
|
|
|
}
|
|
|
|
|
|
void PrusaObjectDataViewModelNode::set_object_action_icon() {
|
|
|
-// m_action_icon = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("add_object.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_action_icon = create_scaled_bitmap("add_object.png");
|
|
|
}
|
|
|
void PrusaObjectDataViewModelNode::set_part_action_icon() {
|
|
|
-// m_action_icon = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var(m_type == itVolume ? "cog.png" : "brick_go.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_action_icon = create_scaled_bitmap(m_type == itVolume ? "cog.png" : "brick_go.png");
|
|
|
}
|
|
|
|
|
|
@@ -1440,28 +1436,16 @@ PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent,
|
|
|
SetDoubleBuffered(true);
|
|
|
#endif //__WXOSX__
|
|
|
|
|
|
-// m_bmp_thumb_higher = wxBitmap(style == wxSL_HORIZONTAL ? Slic3r::GUI::from_u8(Slic3r::var("right_half_circle.png")) :
|
|
|
-// Slic3r::GUI::from_u8(Slic3r::var("up_half_circle.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_thumb_lower = wxBitmap(style == wxSL_HORIZONTAL ? Slic3r::GUI::from_u8(Slic3r::var("left_half_circle.png")) :
|
|
|
-// Slic3r::GUI::from_u8(Slic3r::var("down_half_circle.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_bmp_thumb_higher = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "right_half_circle.png" : "up_half_circle.png"));
|
|
|
m_bmp_thumb_lower = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "left_half_circle.png" : "down_half_circle.png"));
|
|
|
m_thumb_size = m_bmp_thumb_lower.GetSize();
|
|
|
|
|
|
-// m_bmp_add_tick_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_add_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_add_tick_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_add_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_del_tick_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_delete_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_del_tick_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_delete_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_bmp_add_tick_on = create_scaled_bitmap("colorchange_add_on.png");
|
|
|
m_bmp_add_tick_off = create_scaled_bitmap("colorchange_add_off.png");
|
|
|
m_bmp_del_tick_on = create_scaled_bitmap("colorchange_delete_on.png");
|
|
|
m_bmp_del_tick_off = create_scaled_bitmap("colorchange_delete_off.png");
|
|
|
m_tick_icon_dim = m_bmp_add_tick_on.GetSize().x;
|
|
|
|
|
|
-// m_bmp_one_layer_lock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_one_layer_lock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_one_layer_unlock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_one_layer_unlock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_bmp_one_layer_lock_on = create_scaled_bitmap("one_layer_lock_on.png");
|
|
|
m_bmp_one_layer_lock_off = create_scaled_bitmap("one_layer_lock_off.png");
|
|
|
m_bmp_one_layer_unlock_on = create_scaled_bitmap("one_layer_unlock_on.png");
|
|
|
@@ -2283,11 +2267,6 @@ PrusaLockButton::PrusaLockButton( wxWindow *parent,
|
|
|
const wxSize& size /*= wxDefaultSize*/):
|
|
|
wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER)
|
|
|
{
|
|
|
-// m_bmp_lock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_lock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_unlock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_on.png")), wxBITMAP_TYPE_PNG);
|
|
|
-// m_bmp_unlock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_off.png")), wxBITMAP_TYPE_PNG);
|
|
|
-
|
|
|
m_bmp_lock_on = create_scaled_bitmap("one_layer_lock_on.png");
|
|
|
m_bmp_lock_off = create_scaled_bitmap("one_layer_lock_off.png");
|
|
|
m_bmp_unlock_on = create_scaled_bitmap("one_layer_unlock_on.png");
|
|
|
@@ -2349,9 +2328,11 @@ PrusaModeButton::PrusaModeButton( wxWindow *parent,
|
|
|
#ifdef __WXMSW__
|
|
|
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
|
|
|
#endif // __WXMSW__
|
|
|
-// m_bmp_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("mode_off_sq.png")), wxBITMAP_TYPE_PNG);
|
|
|
m_bmp_off = create_scaled_bitmap("mode_off_sq.png");
|
|
|
|
|
|
+ m_tt_focused = wxString::Format(_(L("Switch to the %s mode")), mode);
|
|
|
+ m_tt_selected = wxString::Format(_(L("Current mode is %s")), mode);
|
|
|
+
|
|
|
SetBitmap(m_bmp_on);
|
|
|
|
|
|
//button events
|
|
|
@@ -2372,6 +2353,7 @@ void PrusaModeButton::SetState(const bool state)
|
|
|
{
|
|
|
m_is_selected = state;
|
|
|
focus_button(m_is_selected);
|
|
|
+ SetToolTip(state ? m_tt_selected : m_tt_focused);
|
|
|
}
|
|
|
|
|
|
void PrusaModeButton::focus_button(const bool focus)
|
YuSanka