From fc1054c61d74a25327552bb1d7c400052589101d Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 11 Aug 2021 16:16:57 +0200 Subject: [PATCH] Restored info icon replaced by mistake --- resources/icons/info.svg | 86 +++++++++++++++++++++----- resources/icons/objlist_info.svg | 17 +++++ src/slic3r/GUI/MsgDialog.cpp | 2 +- src/slic3r/GUI/ObjectDataViewModel.cpp | 2 +- 4 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 resources/icons/objlist_info.svg diff --git a/resources/icons/info.svg b/resources/icons/info.svg index 6e11a9b77..276b26061 100644 --- a/resources/icons/info.svg +++ b/resources/icons/info.svg @@ -1,17 +1,71 @@ - - - - - + +image/svg+xml + + + + + + + + + diff --git a/resources/icons/objlist_info.svg b/resources/icons/objlist_info.svg new file mode 100644 index 000000000..6e11a9b77 --- /dev/null +++ b/resources/icons/objlist_info.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 92b31cc52..28bb9cc93 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -202,7 +202,7 @@ MessageDialog::MessageDialog(wxWindow* parent, if (style & wxCANCEL) add_btn(wxID_CANCEL); logo->SetBitmap(create_scaled_bitmap(style & wxICON_WARNING ? "exclamation" : - style & wxICON_INFORMATION ? "info.png" : + style & wxICON_INFORMATION ? "info" : style & wxICON_QUESTION ? "question" : "PrusaSlicer_192px_grayscale.png", this, 84)); wxGetApp().UpdateDlgDarkUI(this); diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index 3a114fd2c..df2e1a13b 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -37,7 +37,7 @@ void ObjectDataViewModelNode::init_container() static constexpr char LayerRootIcon[] = "edit_layers_all"; static constexpr char LayerIcon[] = "edit_layers_some"; static constexpr char WarningIcon[] = "exclamation"; -static constexpr char InfoIcon[] = "info"; +static constexpr char InfoIcon[] = "objlist_info"; ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const wxString& sub_obj_name,