mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-19 12:47:50 -06:00
Fixes for new icons (#5221)
* Sidebar > Height range > Add / Delete range icons * Add icon for Object list > Layers (Height Range) * Add icon for Object list > Range (Hight Range item) * Add icon for Object list > Support / Color painting * File Renamed for Calibration Tab * Update Sidebar icons * Add icon for CrossHatch fill pattern * Delete leftover icons from previous commit * Update Filament Settings icons * Update Machine Settings icons * Update plaholders editor icons * Fix for Printer Setting > Extruder icons and Add support for icons for its tabs * Update undefined category icon on compare window with low res compatible one * Update toolbar > variable layer height icon * Fix warning icon on Emboss & SVG gizmo * Delete leftover icons from previous commit * Gizmos > Keyboard cheat sheet icon resolution fix * Combo box arrow resolution fix * Delete leftover icons from previous commit * Update plate & toolbar icons * Fix: ComboBox > Dropdown menu checkmark not visible on light theme * Delete leftover icons from previous commit * Restore icons for plate rename * Swap directions of notification expand / collapse icons * Mixed • Increases contrast of icons on light theme • Removes opacity from edit, delete, search... icons • Fixes different color for advanced toggle on dark mode • Fixes checkboxes not aligned with other boxes • Style fixes for checkboxes * Fix some colors not changing * Slightly changed color paint icon Spray icon is now taller and fits better with brush icon on seam / support paint * Minor changes on seam and support related icons * Fix blurry icons that vertically centered on gizmos * Update warning icon on dialogs * Fix plate icons rendering issue * Update icons for Gap fill and Fill on color paint and add icon for Skirt --------- Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
parent
f08e75efaa
commit
34d3409951
118 changed files with 179 additions and 795 deletions
|
@ -215,7 +215,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"), "print-time");
|
||||
wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "custom-gcode_time");
|
||||
for (const auto& [opt_key, def] : cgp_timestamps_config_def.options)
|
||||
m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
|
||||
}
|
||||
|
@ -271,7 +271,16 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()
|
|||
auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const set<string>& preset_keys){
|
||||
set extra_keys(preset_keys);
|
||||
for (const auto& page : tab->m_pages) {
|
||||
wxDataViewItem subgroup = m_params_list->AppendSubGroup(parent, page->title(), "empty");
|
||||
// ORCA: Pull icons from tabs for subgroups, icons are hidden on tabs
|
||||
std::string icon_name = "empty"; // use empty icon if not defined
|
||||
for (const auto& icons_list : tab->m_icon_index) {
|
||||
if (icons_list.second == page->iconID()) {
|
||||
icon_name = icons_list.first;
|
||||
break;
|
||||
}
|
||||
}
|
||||
wxDataViewItem subgroup = m_params_list->AppendSubGroup(parent, page->title(), icon_name); // Use icon instead empty icon
|
||||
|
||||
std::set<std::string> opt_keys;
|
||||
for (const auto& optgroup : page->m_optgroups)
|
||||
for (const auto& opt : optgroup->opt_map())
|
||||
|
@ -290,7 +299,7 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()
|
|||
|
||||
wxDataViewItem group = m_params_list->AppendGroup(_L("Presets"), "cog");
|
||||
|
||||
wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
|
||||
wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "process");
|
||||
init_from_tab(print, tab_print, print_options);
|
||||
|
||||
wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "filament" : "resin");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue