3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Object info notification level

Browse source
This commit is contained in:
David Kocik 2021-09-30 14:58:22 +02:00
parent 213add1b2b
commit 117c4a432e
2 changed files with 20 additions and 15 deletions

20
src/slic3r/GUI/NotificationManager.cpp
View file

@ -43,10 +43,10 @@ const NotificationManager::NotificationData NotificationManager::basic_notificat
}, },
{NotificationType::NewAppAvailable, NotificationLevel::ImportantNotificationLevel, 20, _u8L("New version is available."), _u8L("See Releases page."), [](wxEvtHandler* evnthndlr) { {NotificationType::NewAppAvailable, NotificationLevel::ImportantNotificationLevel, 20, _u8L("New version is available."), _u8L("See Releases page."), [](wxEvtHandler* evnthndlr) {
wxGetApp().open_browser_with_warning_dialog("https://github.com/prusa3d/PrusaSlicer/releases"); return true; }}, wxGetApp().open_browser_with_warning_dialog("https://github.com/prusa3d/PrusaSlicer/releases"); return true; }},
{NotificationType::EmptyColorChangeCode, NotificationLevel::RegularNotificationLevel, 10, {NotificationType::EmptyColorChangeCode, NotificationLevel::ObjectInfoNotificationLevel, 10,
_u8L("You have just added a G-code for color change, but its value is empty.\n" _u8L("You have just added a G-code for color change, but its value is empty.\n"
"To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"") }, "To export the G-code correctly, check the \"Color Change G-code\" in \"Printer Settings > Custom G-code\"") },
{NotificationType::EmptyAutoColorChange, NotificationLevel::RegularNotificationLevel, 10, {NotificationType::EmptyAutoColorChange, NotificationLevel::ObjectInfoNotificationLevel, 10,
_u8L("No color change event was added to the print. The print does not look like a sign.") }, _u8L("No color change event was added to the print. The print does not look like a sign.") },
{NotificationType::DesktopIntegrationSuccess, NotificationLevel::RegularNotificationLevel, 10, {NotificationType::DesktopIntegrationSuccess, NotificationLevel::RegularNotificationLevel, 10,
_u8L("Desktop integration was successful.") }, _u8L("Desktop integration was successful.") },
@ -1489,17 +1489,7 @@ void NotificationManager::push_notification(NotificationType type,
std::function<bool(wxEvtHandler*)> callback, std::function<bool(wxEvtHandler*)> callback,
int timestamp) int timestamp)
{ {
int duration = 0; int duration = get_standart_duration(level);
switch (level) {
case NotificationLevel::RegularNotificationLevel: duration = 10; break;
case NotificationLevel::ErrorNotificationLevel: break;
case NotificationLevel::WarningNotificationLevel: break;
case NotificationLevel::ImportantNotificationLevel: break;
case NotificationLevel::ProgressBarNotificationLevel: break;
default:
assert(false);
return;
}
push_notification_data({ type, level, duration, text, hypertext, callback }, timestamp); push_notification_data({ type, level, duration, text, hypertext, callback }, timestamp);
} }
void NotificationManager::push_validate_error_notification(const std::string& text) void NotificationManager::push_validate_error_notification(const std::string& text)
@ -1611,7 +1601,7 @@ void NotificationManager::close_slicing_error_notification(const std::string& te
} }
void NotificationManager::push_simplify_suggestion_notification(const std::string& text, ObjectID object_id, const std::string& hypertext/* = ""*/, std::function<bool(wxEvtHandler*)> callback/* = std::function<bool(wxEvtHandler*)>()*/) void NotificationManager::push_simplify_suggestion_notification(const std::string& text, ObjectID object_id, const std::string& hypertext/* = ""*/, std::function<bool(wxEvtHandler*)> callback/* = std::function<bool(wxEvtHandler*)>()*/)
{ {
NotificationData data{ NotificationType::SimplifySuggestion, NotificationLevel::RegularNotificationLevel, 10, text, hypertext, callback }; NotificationData data{ NotificationType::SimplifySuggestion, NotificationLevel::ObjectInfoNotificationLevel, 10, text, hypertext, callback };
auto notification = std::make_unique<NotificationManager::ObjectIDNotification>(data, m_id_provider, m_evt_handler); auto notification = std::make_unique<NotificationManager::ObjectIDNotification>(data, m_id_provider, m_evt_handler);
notification->object_id = object_id; notification->object_id = object_id;
push_notification_data(std::move(notification), 0); push_notification_data(std::move(notification), 0);
@ -1921,7 +1911,7 @@ void NotificationManager::push_updated_item_info_notification(InfoItemType type)
} }
} }
NotificationData data{ NotificationType::UpdatedItemsInfo, NotificationLevel::RegularNotificationLevel, 5, "" }; NotificationData data{ NotificationType::UpdatedItemsInfo, NotificationLevel::ObjectInfoNotificationLevel, 10, "" };
auto notification = std::make_unique<NotificationManager::UpdatedItemsInfoNotification>(data, m_id_provider, m_evt_handler, type); auto notification = std::make_unique<NotificationManager::UpdatedItemsInfoNotification>(data, m_id_provider, m_evt_handler, type);
if (push_notification_data(std::move(notification), 0)) { if (push_notification_data(std::move(notification), 0)) {
(dynamic_cast<UpdatedItemsInfoNotification*>(m_pop_notifications.back().get()))->add_type(type); (dynamic_cast<UpdatedItemsInfoNotification*>(m_pop_notifications.back().get()))->add_type(type);

15
src/slic3r/GUI/NotificationManager.hpp
View file

@ -121,6 +121,8 @@ public:
HintNotificationLevel, HintNotificationLevel,
// "Good to know" notification, usually but not always with a quick fade-out. // "Good to know" notification, usually but not always with a quick fade-out.
RegularNotificationLevel, RegularNotificationLevel,
// Regular level notifiaction containing info about objects or print. Has Icon.
ObjectInfoNotificationLevel,
// Information notification without a fade-out or with a longer fade-out. // Information notification without a fade-out or with a longer fade-out.
ImportantNotificationLevel, ImportantNotificationLevel,
// Warning, no fade-out. // Warning, no fade-out.
@ -693,6 +695,19 @@ private:
void sort_notifications(); void sort_notifications();
// If there is some error notification active, then the "Export G-code" notification after the slicing is finished is suppressed. // If there is some error notification active, then the "Export G-code" notification after the slicing is finished is suppressed.
bool has_slicing_error_notification(); bool has_slicing_error_notification();
size_t get_standart_duration(NotificationLevel level)
{
switch (level) {
case NotificationLevel::RegularNotificationLevel: return 20;
case NotificationLevel::ErrorNotificationLevel: return 0;
case NotificationLevel::WarningNotificationLevel: return 0;
case NotificationLevel::ImportantNotificationLevel: return 0;
case NotificationLevel::ProgressBarNotificationLevel: return 2;
case NotificationLevel::HintNotificationLevel: return 300;
case NotificationLevel::ObjectInfoNotificationLevel: return 20;
default: return 10;
}
}
// set by init(), until false notifications are only added not updated and frame is not requested after push // set by init(), until false notifications are only added not updated and frame is not requested after push
bool m_initialized{ false }; bool m_initialized{ false };