From 5fc6301520da2df7d06a56e7da6ee04bce189c46 Mon Sep 17 00:00:00 2001 From: Ocraftyone Date: Wed, 27 Dec 2023 01:48:27 -0500 Subject: [PATCH] Update Icons Add new icons from PS and update to use Orca color scheme Original Commit: prusa3d/PrusaSlicer@37afe79 Co-authored-by: YuSanka --- resources/images/custom-gcode_gcode.svg | 2 ++ resources/images/custom-gcode_measure.svg | 1 + resources/images/custom-gcode_object-info.svg | 1 + resources/images/custom-gcode_single.svg | 1 + .../images/custom-gcode_slicing-state.svg | 1 + .../custom-gcode_slicing-state_global.svg | 3 +++ resources/images/custom-gcode_stats.svg | 1 + .../images/custom-gcode_vector-index.svg | 1 + resources/images/custom-gcode_vector.svg | 1 + src/slic3r/GUI/EditGCodeDialog.cpp | 22 +++++++++---------- 10 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 resources/images/custom-gcode_gcode.svg create mode 100644 resources/images/custom-gcode_measure.svg create mode 100644 resources/images/custom-gcode_object-info.svg create mode 100644 resources/images/custom-gcode_single.svg create mode 100644 resources/images/custom-gcode_slicing-state.svg create mode 100644 resources/images/custom-gcode_slicing-state_global.svg create mode 100644 resources/images/custom-gcode_stats.svg create mode 100644 resources/images/custom-gcode_vector-index.svg create mode 100644 resources/images/custom-gcode_vector.svg diff --git a/resources/images/custom-gcode_gcode.svg b/resources/images/custom-gcode_gcode.svg new file mode 100644 index 0000000000..38bcd21729 --- /dev/null +++ b/resources/images/custom-gcode_gcode.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/resources/images/custom-gcode_measure.svg b/resources/images/custom-gcode_measure.svg new file mode 100644 index 0000000000..3c13dd7cc7 --- /dev/null +++ b/resources/images/custom-gcode_measure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_object-info.svg b/resources/images/custom-gcode_object-info.svg new file mode 100644 index 0000000000..2c24bdc8a2 --- /dev/null +++ b/resources/images/custom-gcode_object-info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_single.svg b/resources/images/custom-gcode_single.svg new file mode 100644 index 0000000000..d177860bc9 --- /dev/null +++ b/resources/images/custom-gcode_single.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_slicing-state.svg b/resources/images/custom-gcode_slicing-state.svg new file mode 100644 index 0000000000..4b4bef6ecf --- /dev/null +++ b/resources/images/custom-gcode_slicing-state.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_slicing-state_global.svg b/resources/images/custom-gcode_slicing-state_global.svg new file mode 100644 index 0000000000..7f4e685a1b --- /dev/null +++ b/resources/images/custom-gcode_slicing-state_global.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/custom-gcode_stats.svg b/resources/images/custom-gcode_stats.svg new file mode 100644 index 0000000000..96dfe8decf --- /dev/null +++ b/resources/images/custom-gcode_stats.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_vector-index.svg b/resources/images/custom-gcode_vector-index.svg new file mode 100644 index 0000000000..68aef590bb --- /dev/null +++ b/resources/images/custom-gcode_vector-index.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/custom-gcode_vector.svg b/resources/images/custom-gcode_vector.svg new file mode 100644 index 0000000000..396f0e7b82 --- /dev/null +++ b/resources/images/custom-gcode_vector.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp index 5e7a0f564a..de76150e6c 100644 --- a/src/slic3r/GUI/EditGCodeDialog.cpp +++ b/src/slic3r/GUI/EditGCodeDialog.cpp @@ -129,7 +129,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add slicing states placeholders - wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "re_slice"); + wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "custom-gcode_slicing-state_global"); if (!cgp_ro_slicing_states_config_def.empty()) { wxDataViewItem read_only = m_params_list->AppendSubGroup(slicing_state, _L("Read Only"), "lock_closed"); for (const auto& [opt_key, def]: cgp_ro_slicing_states_config_def.options) @@ -144,7 +144,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // add other universal params, which are related to slicing state if (!cgp_other_slicing_states_config_def.empty()) { - slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "re_slice"); + slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "custom-gcode_slicing-state"); for (const auto& [opt_key, def] : cgp_other_slicing_states_config_def.options) m_params_list->AppendParam(slicing_state, get_type(opt_key, def), opt_key); } @@ -155,7 +155,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add print statistics subgroup if (!cgp_print_statistics_config_def.empty()) { - wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "info"); + wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "custom-gcode_stats"); for (const auto& [opt_key, def] : cgp_print_statistics_config_def.options) m_params_list->AppendParam(statistics, get_type(opt_key, def), opt_key); } @@ -163,7 +163,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add objects info subgroup if (!cgp_objects_info_config_def.empty()) { - wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "advanced_plus"); + wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "custom-gcode_object-info"); for (const auto& [opt_key, def] : cgp_objects_info_config_def.options) m_params_list->AppendParam(objects_info, get_type(opt_key, def), opt_key); } @@ -171,7 +171,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add dimensions subgroup if (!cgp_dimensions_config_def.empty()) { - wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "measure"); + wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "custom-gcode_measure"); for (const auto& [opt_key, def] : cgp_dimensions_config_def.options) m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key); } @@ -179,7 +179,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add timestamp subgroup if (!cgp_timestamps_config_def.empty()) { - wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "time"); + wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "print-time"); for (const auto& [opt_key, def] : cgp_timestamps_config_def.options) m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key); } @@ -188,7 +188,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name) // Add specific placeholders if (!specific_params.empty()) { - wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "add_gcode"); + wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "custom-gcode_gcode"); for (const auto& opt_key : specific_params) if (custom_gcode_specific_config_def.has(opt_key)) { auto def = custom_gcode_specific_config_def.get(opt_key); @@ -226,7 +226,7 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders() if (const ConfigOption *optptr = full_config.optptr(opt)) m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt); - wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "spool" : "resin"); + wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "filament" : "resin"); for (const auto&opt : material_options) if (const ConfigOption *optptr = full_config.optptr(opt)) m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt); @@ -444,9 +444,9 @@ wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags) const std::map ParamsInfo { // Type BitmapName - { ParamType::Scalar, "scalar_param" }, - { ParamType::Vector, "vector_param" }, - { ParamType::FilamentVector,"vector_filament_param" }, + { ParamType::Scalar, "custom-gcode_single" }, + { ParamType::Vector, "custom-gcode_vector" }, + { ParamType::FilamentVector,"custom-gcode_vector-index" }, }; static void make_bold(wxString& str)