Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2020-02-07 16:15:09 +0300
committerYuSanka <yusanka@gmail.com>2020-02-07 16:16:04 +0300
commit10ade4192cbf3ed810a991d3bbb774e3c1a2a3b7 (patch)
tree6afdf74f1b939dfb7bbabd3eb09897d59cdc8365 /src/slic3r/GUI/PresetBundle.cpp
parentb8c898bf40fc1429aa5af39bb444e9456f28f8a1 (diff)
Added separate icon for the SLA printer presets
DoubleSlider: + fixed bug with un-hidden tooltip when OneLayerLock is on + MultiAsSingle mode : Show context menu on Cog icon after L/RButtonClick
Diffstat (limited to 'src/slic3r/GUI/PresetBundle.cpp')
-rw-r--r--src/slic3r/GUI/PresetBundle.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp
index 0c187e871..ebfe6e40e 100644
--- a/src/slic3r/GUI/PresetBundle.cpp
+++ b/src/slic3r/GUI/PresetBundle.cpp
@@ -1678,7 +1678,23 @@ void PresetBundle::update_plater_filament_ui(unsigned int idx_extruder, GUI::Pre
}
}
- ui->set_label_marker(ui->Append(PresetCollection::separator(L("Add/Remove filaments")), wxNullBitmap), GUI::PresetComboBox::LABEL_ITEM_WIZARD_FILAMENTS);
+ std::string bitmap_key = "";
+ if (wide_icons)
+ bitmap_key += "wide,";
+ bitmap_key += "edit_preset_list";
+ wxBitmap* bmp = m_bitmapCache->find(bitmap_key);
+ if (bmp == nullptr) {
+ // Create the bitmap with color bars.
+ std::vector<wxBitmap> bmps;
+ if (wide_icons)
+ // Paint a red flag for incompatible presets.
+ bmps.emplace_back(m_bitmapCache->mkclear(normal_icon_width, icon_height));
+ // Paint the color bars + a lock at the system presets.
+ bmps.emplace_back(m_bitmapCache->mkclear(wide_icon_width+space_icon_width, icon_height));
+ bmps.emplace_back(create_scaled_bitmap("edit_uni"));
+ bmp = m_bitmapCache->insert(bitmap_key, bmps);
+ }
+ ui->set_label_marker(ui->Append(PresetCollection::separator(L("Add/Remove filaments")), *bmp), GUI::PresetComboBox::LABEL_ITEM_WIZARD_FILAMENTS);
/* But, if selected_preset_item is still equal to INT_MAX, it means that
* there is no presets added to the list.