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

Supress desktop integration of gcode viewer at ChromeOS

Browse Source
This commit is contained in:
David Kocik 2021-09-01 12:58:25 +02:00
parent ab84da6c56
commit 73e8f5aed2
1 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/slic3r/GUI/DesktopIntegrationDialog.cpp
View File

@ -382,40 +382,44 @@ void DesktopIntegrationDialog::perform_desktop_integration()
app_config->set("desktop_integration_app_path", GUI::format("%1%/applications/PrusaSlicer%2%.desktop", target_dir_desktop, version_suffix)); app_config->set("desktop_integration_app_path", GUI::format("%1%/applications/PrusaSlicer%2%.desktop", target_dir_desktop, version_suffix));
// Repeat for Gcode viewer - use same paths as for slicer files // Repeat for Gcode viewer - use same paths as for slicer files
// Icon // Do NOT add gcode viewer desktop file on ChromeOS
if (!target_dir_icons.empty()) if (platform_flavor() != PlatformFlavor::LinuxOnChromium) {
{ // Icon
std::string icon_path = GUI::format("%1%/icons/PrusaSlicer-gcodeviewer_192px.png",resources_dir()); if (!target_dir_icons.empty())
std::string dest_path = GUI::format("%1%/icons/%2%PrusaSlicer-gcodeviewer%3%.png", target_dir_icons, icon_theme_path, version_suffix); {
if (copy_icon(icon_path, dest_path)) std::string icon_path = GUI::format("%1%/icons/PrusaSlicer-gcodeviewer_192px.png",resources_dir());
// save path to icon std::string dest_path = GUI::format("%1%/icons/%2%PrusaSlicer-gcodeviewer%3%.png", target_dir_icons, icon_theme_path, version_suffix);
app_config->set("desktop_integration_icon_viewer_path", dest_path); if (copy_icon(icon_path, dest_path))
else // save path to icon
BOOST_LOG_TRIVIAL(error) << "Copying Gcode Viewer icon to icons directory failed."; app_config->set("desktop_integration_icon_viewer_path", dest_path);
} else
BOOST_LOG_TRIVIAL(error) << "Copying Gcode Viewer icon to icons directory failed.";
}
// Desktop file // Desktop file
std::string desktop_file = GUI::format( std::string desktop_file = GUI::format(
"[Desktop Entry]\n" "[Desktop Entry]\n"
"Name=Prusa Gcode Viewer%1%\n" "Name=Prusa Gcode Viewer%1%\n"
"GenericName=3D Printing Software\n" "GenericName=3D Printing Software\n"
"Icon=PrusaSlicer-gcodeviewer%2%\n" "Icon=PrusaSlicer-gcodeviewer%2%\n"
"Exec=\"%3%\" --gcodeviewer %%F\n" "Exec=\"%3%\" --gcodeviewer %%F\n"
"Terminal=false\n" "Terminal=false\n"
"Type=Application\n" "Type=Application\n"
"MimeType=text/x.gcode;\n" "MimeType=text/x.gcode;\n"
"Categories=Graphics;3DGraphics;\n" "Categories=Graphics;3DGraphics;\n"
"Keywords=3D;Printing;Slicer;\n" "Keywords=3D;Printing;Slicer;\n"
"StartupNotify=false\n", name_suffix, version_suffix, excutable_path); "StartupNotify=false\n", name_suffix, version_suffix, excutable_path);
std::string desktop_path = GUI::format("%1%/applications/PrusaSlicerGcodeViewer%2%.desktop", target_dir_desktop, version_suffix); std::string desktop_path = GUI::format("%1%/applications/PrusaSlicerGcodeViewer%2%.desktop", target_dir_desktop, version_suffix);
if (create_desktop_file(desktop_path, desktop_file)) if (create_desktop_file(desktop_path, desktop_file))
// save path to desktop file // save path to desktop file
app_config->set("desktop_integration_app_viewer_path", desktop_path); app_config->set("desktop_integration_app_viewer_path", desktop_path);
else { else {
BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - could not create Gcodeviewer desktop file"; BOOST_LOG_TRIVIAL(error) << "Performing desktop integration failed - could not create Gcodeviewer desktop file";
show_error(nullptr, _L("Performing desktop integration failed - could not create Gcodeviewer desktop file. PrusaSlicer desktop file was probably created successfully.")); show_error(nullptr, _L("Performing desktop integration failed - could not create Gcodeviewer desktop file. PrusaSlicer desktop file was probably created successfully."));
}
} }
wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::DesktopIntegrationSuccess); wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::DesktopIntegrationSuccess);
} }
void DesktopIntegrationDialog::undo_desktop_intgration() void DesktopIntegrationDialog::undo_desktop_intgration()
@ -433,17 +437,20 @@ void DesktopIntegrationDialog::undo_desktop_intgration()
BOOST_LOG_TRIVIAL(debug) << "removing " << path; BOOST_LOG_TRIVIAL(debug) << "removing " << path;
std::remove(path.c_str()); std::remove(path.c_str());
} }
// gcode viwer .desktop // No gcode viewer at ChromeOS
path = std::string(app_config->get("desktop_integration_app_viewer_path")); if (platform_flavor() != PlatformFlavor::LinuxOnChromium) {
if (!path.empty()) { // gcode viewer .desktop
BOOST_LOG_TRIVIAL(debug) << "removing " << path; path = std::string(app_config->get("desktop_integration_app_viewer_path"));
std::remove(path.c_str()); if (!path.empty()) {
} BOOST_LOG_TRIVIAL(debug) << "removing " << path;
// gcode viewer icon std::remove(path.c_str());
path = std::string(app_config->get("desktop_integration_icon_viewer_path")); }
if (!path.empty()) { // gcode viewer icon
BOOST_LOG_TRIVIAL(debug) << "removing " << path; path = std::string(app_config->get("desktop_integration_icon_viewer_path"));
std::remove(path.c_str()); if (!path.empty()) {
BOOST_LOG_TRIVIAL(debug) << "removing " << path;
std::remove(path.c_str());
}
} }
wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::UndoDesktopIntegrationSuccess); wxGetApp().plater()->get_notification_manager()->push_notification(NotificationType::UndoDesktopIntegrationSuccess);
} }