juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-23 19:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tombstone resolution for 409 status code with error code -3 (#14116)

Browse Source 
* fix: tombstone resolution for 409 status code with error code -3

* fix: add resolution for undefined conflicts

* fix: generate setting id if it is empty for 409 tombstone

* fix: force push empty setting_id preset on 409 tombstone

* clearner solution
This commit is contained in:
Ian Chua
2026-06-10 22:23:12 +08:00
committed by GitHub
parent 3be36bdea4
commit 847807adac
5 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/NotificationManager.hpp
View File

@@ -279,6 +279,7 @@ public:
// Shared profiles available for selected printer
void push_shared_profiles_notification(const std::string& explore_url);
void push_orca_sync_conflict_notification(const std::string& text,
int conflict_code,
std::function<bool(wxEvtHandler*)> pull_callback,
std::function<bool(wxEvtHandler*)> force_push_callback);
@@ -905,10 +906,12 @@ private:
public:
OrcaSyncConflictNotification(const NotificationData& n, NotificationIDProvider& id_provider, wxEvtHandler* evt_handler,
std::function<bool(wxEvtHandler*)> pull_callback,
std::function<bool(wxEvtHandler*)> force_push_callback)
std::function<bool(wxEvtHandler*)> force_push_callback,
int conflict_code)
: PopNotification(n, id_provider, evt_handler)
, m_pull_callback(std::move(pull_callback))
, m_force_push_callback(std::move(force_push_callback))
, conflict_code(conflict_code)
{
m_multiline = true;
}
@@ -920,6 +923,7 @@ private:
std::function<bool(wxEvtHandler*)> m_pull_callback;
std::function<bool(wxEvtHandler*)> m_force_push_callback;
int conflict_code;
};
class SlicingProgressNotification;