mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:replace reset icon to unlock 

Change-Id: Id46e9aad3b31c67d48651478525cc4a5dc512382
This commit is contained in:
liz.li 2022-07-29 14:30:08 +08:00 committed by Lane.Wei
parent 2dba113512
commit 1ce994fda3
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/images/lock_normal.svg
View File

@ -1,6 +1,3 @@
<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<defs><style>.cls-1{fill:none;}.cls-2,.cls-3{fill:#2b3436;}.cls-2{fill-rule:evenodd;}</style></defs> <path fill-rule="evenodd" clip-rule="evenodd" d="M4.74854 4.55113C4.74854 2.71071 6.2405 1.21875 8.08092 1.21875C9.92134 1.21875 11.4133 2.71071 11.4133 4.55113V5.09345C11.4133 5.3696 11.1894 5.59345 10.9133 5.59345C10.6372 5.59345 10.4133 5.3696 10.4133 5.09345V4.55113C10.4133 3.26299 9.36906 2.21875 8.08092 2.21875C6.79278 2.21875 5.74854 3.26299 5.74854 4.55113V7.20312H12.2007C12.4768 7.20312 12.7007 7.42698 12.7007 7.70312V13.7798C12.7007 14.0559 12.4768 14.2798 12.2007 14.2798H3.79883C3.52269 14.2798 3.29883 14.0559 3.29883 13.7798V7.70312C3.29883 7.42698 3.52269 7.20312 3.79883 7.20312H4.74854V4.55113Z" fill="#FF6F00"/>
<title>Slice 41</title> </svg>
<path fill="#F1754E" d="M12.33,7.47A5,5,0,0,0,7.43,3,5,5,0,0,0,2.51,8a5,5,0,0,0,4.38,5v1A6,6,0,0,1,1.51,8,6,6,0,0,1,7.43,2a6,6,0,0,1,5.9,5.47Z"/>
<path fill="#F1754E" d="M12.82,10.75,10.48,7.47h4.67Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 737 B

8
resources/images/plate_close.svg
View File

@ -1,6 +1,6 @@
<svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M36.9008 39.7008H4.70074C3.10074 39.7008 1.80078 38.4008 1.80078 36.8008V4.70078C1.80078 3.10078 3.10074 1.80078 4.70074 1.80078H36.9008C38.5008 1.80078 39.8008 3.10078 39.8008 4.70078V36.9008C39.8008 38.4008 38.5008 39.7008 36.9008 39.7008Z" fill="#DDDDDD"/> <path d="M36.9008 39.7008H4.70074C3.10074 39.7008 1.80078 38.4008 1.80078 36.8008V4.70078C1.80078 3.10078 3.10074 1.80078 4.70074 1.80078H36.9008C38.5008 1.80078 39.8008 3.10078 39.8008 4.70078V36.9008C39.8008 38.4008 38.5008 39.7008 36.9008 39.7008Z" fill="#E9E9E9"/>
<path d="M36.9 40.6H4.70001C2.60001 40.6 1 38.9 1 36.9V4.7C1 2.6 2.70001 1 4.70001 1H36.9C39 1 40.6 2.7 40.6 4.7V36.9C40.7 38.9 39 40.6 36.9 40.6ZM4.80005 2.7C3.70005 2.7 2.80005 3.6 2.80005 4.7V36.9C2.80005 38 3.70005 38.9 4.80005 38.9H36.9C38 38.9 38.9 38 38.9 36.9V4.7C38.9 3.6 38 2.7 36.9 2.7H4.80005Z" fill="#5E5E5E"/> <path d="M36.9 40.6H4.70001C2.60001 40.6 1 38.9 1 36.9V4.7C1 2.6 2.70001 1 4.70001 1H36.9C39 1 40.6 2.7 40.6 4.7V36.9C40.7 38.9 39 40.6 36.9 40.6ZM4.80005 2.7C3.70005 2.7 2.80005 3.6 2.80005 4.7V36.9C2.80005 38 3.70005 38.9 4.80005 38.9H36.9C38 38.9 38.9 38 38.9 36.9V4.7C38.9 3.6 38 2.7 36.9 2.7H4.80005Z" fill="#545454"/>
<path d="M31.6992 33.0992C31.2992 33.0992 30.8992 32.9992 30.5992 32.6992L8.89922 10.9992C8.29922 10.3992 8.29922 9.49922 8.89922 8.89922C9.49922 8.29922 10.3992 8.29922 10.9992 8.89922L32.6992 30.5992C33.2992 31.1992 33.2992 32.0992 32.6992 32.6992C32.4992 32.9992 32.0992 33.0992 31.6992 33.0992Z" fill="#EA6000"/> <path d="M31.6992 33.0992C31.2992 33.0992 30.8992 32.9992 30.5992 32.6992L8.89922 10.9992C8.29922 10.3992 8.29922 9.49922 8.89922 8.89922C9.49922 8.29922 10.3992 8.29922 10.9992 8.89922L32.6992 30.5992C33.2992 31.1992 33.2992 32.0992 32.6992 32.6992C32.4992 32.9992 32.0992 33.0992 31.6992 33.0992Z" fill="#545454"/>
<path d="M9.99919 33.0992C9.59919 33.0992 9.19922 32.9992 8.89922 32.6992C8.29922 32.0992 8.29922 31.1992 8.89922 30.5992L30.5992 8.89922C31.1992 8.29922 32.0992 8.29922 32.6992 8.89922C33.2992 9.49922 33.2992 10.3992 32.6992 10.9992L10.9992 32.6992C10.7992 32.9992 10.3992 33.0992 9.99919 33.0992Z" fill="#EA6000"/> <path d="M9.99919 33.0992C9.59919 33.0992 9.19922 32.9992 8.89922 32.6992C8.29922 32.0992 8.29922 31.1992 8.89922 30.5992L30.5992 8.89922C31.1992 8.29922 32.0992 8.29922 32.6992 8.89922C33.2992 9.49922 33.2992 10.3992 32.6992 10.9992L10.9992 32.6992C10.7992 32.9992 10.3992 33.0992 9.99919 33.0992Z" fill="#545454"/>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

8
resources/images/plate_close_hover.svg
View File

@ -1,6 +1,6 @@
<svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M36.9008 39.7008H4.70074C3.10074 39.7008 1.80078 38.4008 1.80078 36.8008V4.70078C1.80078 3.10078 3.10074 1.80078 4.70074 1.80078H36.9008C38.5008 1.80078 39.8008 3.10078 39.8008 4.70078V36.9008C39.8008 38.4008 38.5008 39.7008 36.9008 39.7008Z" fill="#DDDDDD"/> <path d="M36.9008 39.7008H4.70074C3.10074 39.7008 1.80078 38.4008 1.80078 36.8008V4.70078C1.80078 3.10078 3.10074 1.80078 4.70074 1.80078H36.9008C38.5008 1.80078 39.8008 3.10078 39.8008 4.70078V36.9008C39.8008 38.4008 38.5008 39.7008 36.9008 39.7008Z" fill="#D6D6D6"/>
<path d="M36.9 40.6H4.70001C2.60001 40.6 1 38.9 1 36.9V4.7C1 2.6 2.70001 1 4.70001 1H36.9C39 1 40.6 2.7 40.6 4.7V36.9C40.7 38.9 39 40.6 36.9 40.6ZM4.80005 2.7C3.70005 2.7 2.80005 3.6 2.80005 4.7V36.9C2.80005 38 3.70005 38.9 4.80005 38.9H36.9C38 38.9 38.9 38 38.9 36.9V4.7C38.9 3.6 38 2.7 36.9 2.7H4.80005Z" fill="#909090"/> <path d="M36.9 40.6H4.70001C2.60001 40.6 1 38.9 1 36.9V4.7C1 2.6 2.70001 1 4.70001 1H36.9C39 1 40.6 2.7 40.6 4.7V36.9C40.7 38.9 39 40.6 36.9 40.6ZM4.80005 2.7C3.70005 2.7 2.80005 3.6 2.80005 4.7V36.9C2.80005 38 3.70005 38.9 4.80005 38.9H36.9C38 38.9 38.9 38 38.9 36.9V4.7C38.9 3.6 38 2.7 36.9 2.7H4.80005Z" fill="#545454"/>
<path d="M31.6992 33.0992C31.2992 33.0992 30.8992 32.9992 30.5992 32.6992L8.89922 10.9992C8.29922 10.3992 8.29922 9.49922 8.89922 8.89922C9.49922 8.29922 10.3992 8.29922 10.9992 8.89922L32.6992 30.5992C33.2992 31.1992 33.2992 32.0992 32.6992 32.6992C32.4992 32.9992 32.0992 33.0992 31.6992 33.0992Z" fill="#FF7C21"/> <path d="M31.6992 33.0992C31.2992 33.0992 30.8992 32.9992 30.5992 32.6992L8.89922 10.9992C8.29922 10.3992 8.29922 9.49922 8.89922 8.89922C9.49922 8.29922 10.3992 8.29922 10.9992 8.89922L32.6992 30.5992C33.2992 31.1992 33.2992 32.0992 32.6992 32.6992C32.4992 32.9992 32.0992 33.0992 31.6992 33.0992Z" fill="#545454"/>
<path d="M9.99919 33.0992C9.59919 33.0992 9.19922 32.9992 8.89922 32.6992C8.29922 32.0992 8.29922 31.1992 8.89922 30.5992L30.5992 8.89922C31.1992 8.29922 32.0992 8.29922 32.6992 8.89922C33.2992 9.49922 33.2992 10.3992 32.6992 10.9992L10.9992 32.6992C10.7992 32.9992 10.3992 33.0992 9.99919 33.0992Z" fill="#FF7C21"/> <path d="M9.99919 33.0992C9.59919 33.0992 9.19922 32.9992 8.89922 32.6992C8.29922 32.0992 8.29922 31.1992 8.89922 30.5992L30.5992 8.89922C31.1992 8.29922 32.0992 8.29922 32.6992 8.89922C33.2992 9.49922 33.2992 10.3992 32.6992 10.9992L10.9992 32.6992C10.7992 32.9992 10.3992 33.0992 9.99919 33.0992Z" fill="#545454"/>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

2
src/slic3r/GUI/GUI_ObjectTable.cpp
View File

@ -2445,7 +2445,7 @@ ObjectTablePanel::ObjectTablePanel( wxWindow* parent, wxWindowID id, const wxPoi
int ObjectTablePanel::init_bitmap() 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(); m_color_bitmaps = get_extruder_color_icons();
return 0; return 0;

4
src/slic3r/GUI/GUI_ObjectTableSettings.cpp
View File

@ -66,8 +66,8 @@ ObjectTableSettings::ObjectTableSettings(wxWindow* parent, ObjectGridTable* tabl
m_settings_list_sizer = new wxBoxSizer(wxVERTICAL); m_settings_list_sizer = new wxBoxSizer(wxVERTICAL);
m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5); m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5);
m_bmp_reset = ScalableBitmap(parent, "undo"); m_bmp_reset = ScalableBitmap(parent, "lock_normal");
m_bmp_reset_focus = ScalableBitmap(parent, "undo"); m_bmp_reset_focus = ScalableBitmap(parent, "lock_normal");
//TODO, adjust later //TODO, adjust later
m_bmp_reset_disable = ScalableBitmap(parent, "dot"); m_bmp_reset_disable = ScalableBitmap(parent, "dot");
} }

2
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@ -196,7 +196,7 @@ void ObjectDataViewModelNode::set_printable_icon(PrintIndicator printable)
void ObjectDataViewModelNode::set_action_icon(bool enable) void ObjectDataViewModelNode::set_action_icon(bool enable)
{ {
m_action_enable = 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_action_icon_name = m_type & itPlate ? "dot" :
m_type & itObject ? undo : m_type & itObject ? undo :
m_type & (itVolume | itLayer) ? undo : /*m_type & itInstance*/ "set_separate_obj"; m_type & (itVolume | itLayer) ? undo : /*m_type & itInstance*/ "set_separate_obj";