juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert clang-format changes then reapplied chagnes for Plater/PresetBundle. Fixed extruder masking incorrectness. Fix warning notifications stacking

Browse Source
This commit is contained in:
Lam Wei Lun
2026-09-03 13:17:13 +08:00
parent 686b7f66ac
commit 8c7160079e
8 changed files with 7286 additions and 7208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/NotificationManager.cpp
+3 -33
View File
@@ -3343,17 +3343,7 @@ size_t NotificationManager::get_notification_count() const
void NotificationManager::bbl_show_plateinfo_notification(const std::string &text)
{
NotificationData data{NotificationType::BBLPlateInfo, NotificationLevel::PrintInfoNotificationLevel, BBL_NOTICE_MAX_INTERVAL, text};
for (std::unique_ptr<PopNotification> &notification : m_pop_notifications) {
if (notification->get_type() == NotificationType::BBLPlateInfo) {
notification->reinit();
notification->update(data);
return;
}
}
auto notification = std::make_unique<NotificationManager::PopNotification>(data, m_id_provider, m_evt_handler);
push_notification_data(std::move(notification), 0);
push_notification_data(data, 0);
}
void NotificationManager::bbl_close_3mf_warn_notification()
@@ -3367,17 +3357,7 @@ void NotificationManager::bbl_close_3mf_warn_notification()
void NotificationManager::bbl_show_3mf_warn_notification(const std::string &text, NotificationLevel level)
{
NotificationData data{NotificationType::BBL3MFInfo, level, BBL_NOTICE_MAX_INTERVAL, text};
for (std::unique_ptr<PopNotification> &notification : m_pop_notifications) {
if (notification->get_type() == NotificationType::BBL3MFInfo) {
notification->reinit();
notification->update(data);
return;
}
}
auto notification = std::make_unique<NotificationManager::PopNotification>(data, m_id_provider, m_evt_handler);
push_notification_data(std::move(notification), 0);
push_notification_data(data, 0);
}
void NotificationManager::bbl_close_plateinfo_notification()
@@ -3392,17 +3372,7 @@ void NotificationManager::bbl_close_plateinfo_notification()
void NotificationManager::bbl_show_preview_only_notification(const std::string &text)
{
NotificationData data{NotificationType::BBLPreviewOnlyMode, NotificationLevel::WarningNotificationLevel, 0, text};
for (std::unique_ptr<PopNotification> &notification : m_pop_notifications) {
if (notification->get_type() == NotificationType::BBLPreviewOnlyMode) {
notification->reinit();
notification->update(data);
return;
}
}
auto notification = std::make_unique<NotificationManager::PopNotification>(data, m_id_provider, m_evt_handler);
push_notification_data(std::move(notification), 0);
push_notification_data(data, 0);
}
void NotificationManager::bbl_close_preview_only_notification()
src/slic3r/GUI/NotificationManager.hpp
+4 -1
View File
@@ -1083,7 +1083,10 @@ private:
NotificationType::ProgressBar,
NotificationType::PrintHostUpload,
NotificationType::SimplifySuggestion,
NotificationType::ValidateWarning
NotificationType::ValidateWarning,
// A published file load can produce several distinct 3MF warnings (invalid values,
// skipped settings, changed slots); let them stack rather than clobber each other.
NotificationType::BBL3MFInfo
};
//prepared (basic) notifications
// non-static so its not loaded too early. If static, the translations wont load correctly.
src/slic3r/GUI/Plater.cpp
+5388 -5208
View File
File diff suppressed because it is too large Load Diff