From 1ce994fda36fcb4e684e1e53ae8ead2e8847efdb Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Fri, 29 Jul 2022 14:30:08 +0800 Subject: [PATCH] ENH:replace reset icon to unlock Change-Id: Id46e9aad3b31c67d48651478525cc4a5dc512382 --- resources/images/lock_normal.svg | 9 +++------ resources/images/plate_close.svg | 8 ++++---- resources/images/plate_close_hover.svg | 8 ++++---- src/slic3r/GUI/GUI_ObjectTable.cpp | 2 +- src/slic3r/GUI/GUI_ObjectTableSettings.cpp | 4 ++-- src/slic3r/GUI/ObjectDataViewModel.cpp | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/resources/images/lock_normal.svg b/resources/images/lock_normal.svg index fb8e0803a..6fc103822 100644 --- a/resources/images/lock_normal.svg +++ b/resources/images/lock_normal.svg @@ -1,6 +1,3 @@ - - - Slice 41 - - - \ No newline at end of file + + + diff --git a/resources/images/plate_close.svg b/resources/images/plate_close.svg index 926727ae2..235e135d7 100644 --- a/resources/images/plate_close.svg +++ b/resources/images/plate_close.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/resources/images/plate_close_hover.svg b/resources/images/plate_close_hover.svg index b2df06611..2208d4502 100644 --- a/resources/images/plate_close_hover.svg +++ b/resources/images/plate_close_hover.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index 175515e4c..3d6406443 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -2445,7 +2445,7 @@ ObjectTablePanel::ObjectTablePanel( wxWindow* parent, wxWindowID id, const wxPoi int ObjectTablePanel::init_bitmap() { - m_undo_bitmap = create_scaled_bitmap("undo", nullptr, 24); + m_undo_bitmap = create_scaled_bitmap("lock_normal", nullptr, 24); m_color_bitmaps = get_extruder_color_icons(); return 0; diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp index 4d6486a2a..10fd7f2dd 100644 --- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp @@ -66,8 +66,8 @@ ObjectTableSettings::ObjectTableSettings(wxWindow* parent, ObjectGridTable* tabl m_settings_list_sizer = new wxBoxSizer(wxVERTICAL); m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5); - m_bmp_reset = ScalableBitmap(parent, "undo"); - m_bmp_reset_focus = ScalableBitmap(parent, "undo"); + m_bmp_reset = ScalableBitmap(parent, "lock_normal"); + m_bmp_reset_focus = ScalableBitmap(parent, "lock_normal"); //TODO, adjust later m_bmp_reset_disable = ScalableBitmap(parent, "dot"); } diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index ec8837324..12aa398b6 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -196,7 +196,7 @@ void ObjectDataViewModelNode::set_printable_icon(PrintIndicator printable) void ObjectDataViewModelNode::set_action_icon(bool enable) { m_action_enable = enable; - auto undo = enable ? "undo" : "dot"; + auto undo = enable ? "lock_normal" : "dot"; m_action_icon_name = m_type & itPlate ? "dot" : m_type & itObject ? undo : m_type & (itVolume | itLayer) ? undo : /*m_type & itInstance*/ "set_separate_obj";