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

OSX specific: Switching to a G-code viewer if the Finder opens Slicer

Browse source 
with a G-code file argument.
This commit is contained in:
Vojtech Bubnik 2020-10-06 15:09:38 +02:00
parent c4951c5efc
commit eed45eddd6
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_App.cpp
View file

@ -1626,6 +1626,9 @@ bool GUI_App::OnExceptionInMainLoop()
} }
#ifdef __APPLE__ #ifdef __APPLE__
// This callback is called from wxEntry()->wxApp::CallOnInit()->NSApplication run
// that is, before GUI_App::OnInit(), so we have a chance to switch GUI_App
// to a G-code viewer.
void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames) void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames)
{ {
wxArrayString other_files; wxArrayString other_files;
@ -1642,6 +1645,7 @@ void GUI_App::OSXStoreOpenFiles(const wxArrayString &fileNames)
// Drag & Dropping a G-code onto PrusaSlicer. Switch PrusaSlicer to G-code viewer mode. // Drag & Dropping a G-code onto PrusaSlicer. Switch PrusaSlicer to G-code viewer mode.
//FIXME Switch application to G-code viewer mode? //FIXME Switch application to G-code viewer mode?
wxMessageBox("PrusaSlicer on early startup", wxString::Format("Switching to G-code viewer for %s", gcode_files.front()), wxICON_INFORMATION); wxMessageBox("PrusaSlicer on early startup", wxString::Format("Switching to G-code viewer for %s", gcode_files.front()), wxICON_INFORMATION);
m_app_mode = EAppMode::GCodeViewer;
} }
wxApp::OSXStoreOpenFiles(other_files); wxApp::OSXStoreOpenFiles(other_files);
} }
@ -1671,9 +1675,12 @@ void GUI_App::MacOpenFiles(const wxArrayString &fileNames)
start_new_gcodeviewer(&filename); start_new_gcodeviewer(&filename);
} else if (! gcode_files.empty()) { } else if (! gcode_files.empty()) {
assert(! m_mac_initialized); assert(! m_mac_initialized);
assert(m_app_mode == EAppMode::GCodeViewer);
// Drag & Dropping a G-code onto PrusaSlicer. Switch PrusaSlicer to G-code viewer mode. // Drag & Dropping a G-code onto PrusaSlicer. Switch PrusaSlicer to G-code viewer mode.
//FIXME Switch application to G-code viewer mode? //FIXME Switch application to G-code viewer mode?
wxMessageBox("PrusaSlicer on startup", wxString::Format("Switching to G-code viewer for %s", gcode_files.front()), wxICON_INFORMATION); wxMessageBox("PrusaSlicer on startup", wxString::Format("Switching to G-code viewer for %s", gcode_files.front()), wxICON_INFORMATION);
// Load the G-code into the G-code viewer.
this->plater()->load_gcode(paths.front());
} }
m_mac_initialized = true; m_mac_initialized = true;
} }