Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/slic3r/GUI/GUI_App.cpp')
-rw-r--r--src/slic3r/GUI/GUI_App.cpp1385
1 files changed, 1174 insertions, 211 deletions
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index cc6c06690..1be2495ca 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1,14 +1,19 @@
+#include "libslic3r/Technologies.hpp"
#include "GUI_App.hpp"
+#include "GUI_Init.hpp"
#include "GUI_ObjectList.hpp"
#include "GUI_ObjectManipulation.hpp"
+#include "format.hpp"
#include "I18N.hpp"
#include <algorithm>
#include <iterator>
#include <exception>
#include <cstdlib>
-#include <boost/lexical_cast.hpp>
+#include <regex>
#include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include <boost/nowide/convert.hpp>
@@ -23,21 +28,30 @@
#include <wx/wupdlock.h>
#include <wx/filefn.h>
#include <wx/sysopt.h>
-#include <wx/msgdlg.h>
+#include <wx/richmsgdlg.h>
#include <wx/log.h>
#include <wx/intl.h>
+#include <wx/dialog.h>
+#include <wx/textctrl.h>
+#include <wx/splash.h>
+#include <wx/fontutil.h>
+
#include "libslic3r/Utils.hpp"
#include "libslic3r/Model.hpp"
#include "libslic3r/I18N.hpp"
+#include "libslic3r/PresetBundle.hpp"
#include "GUI.hpp"
#include "GUI_Utils.hpp"
-#include "AppConfig.hpp"
-#include "PresetBundle.hpp"
+#include "3DScene.hpp"
+#include "MainFrame.hpp"
+#include "Plater.hpp"
+#include "GLCanvas3D.hpp"
#include "../Utils/PresetUpdater.hpp"
#include "../Utils/PrintHost.hpp"
+#include "../Utils/Process.hpp"
#include "../Utils/MacDarkMode.hpp"
#include "slic3r/Config/Snapshot.hpp"
#include "ConfigSnapshotDialog.hpp"
@@ -47,11 +61,19 @@
#include "SysInfoDialog.hpp"
#include "KBShortcutsDialog.hpp"
#include "UpdateDialogs.hpp"
+#include "Mouse3DController.hpp"
#include "RemovableDriveManager.hpp"
+#include "InstanceCheck.hpp"
+#include "NotificationManager.hpp"
+#include "UnsavedChangesDialog.hpp"
+#include "SavePresetDialog.hpp"
+#include "PrintHostDialogs.hpp"
+
+#include "BitmapCache.hpp"
#ifdef __WXMSW__
-#include <Shlobj.h>
#include <dbt.h>
+#include <shlobj.h>
#endif // __WXMSW__
#if ENABLE_THUMBNAIL_GENERATOR_DEBUG
@@ -64,6 +86,330 @@ namespace GUI {
class MainFrame;
+class SplashScreen : public wxSplashScreen
+{
+public:
+ SplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxPoint pos = wxDefaultPosition)
+ : wxSplashScreen(bitmap, splashStyle, milliseconds, static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, wxDefaultPosition, wxDefaultSize,
+#ifdef __APPLE__
+ wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP
+#else
+ wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR
+#endif // !__APPLE__
+ )
+ {
+ wxASSERT(bitmap.IsOk());
+
+ int init_dpi = get_dpi_for_window(this);
+ this->SetPosition(pos);
+ this->CenterOnScreen();
+ int new_dpi = get_dpi_for_window(this);
+
+ m_scale = (float)(new_dpi) / (float)(init_dpi);
+ m_main_bitmap = bitmap;
+
+ scale_bitmap(m_main_bitmap, m_scale);
+
+ // init constant texts and scale fonts
+ init_constant_text();
+
+ // this font will be used for the action string
+ m_action_font = m_constant_text.credits_font.Bold();
+
+ // draw logo and constant info text
+ Decorate(m_main_bitmap);
+ }
+
+ void SetText(const wxString& text)
+ {
+ set_bitmap(m_main_bitmap);
+ if (!text.empty()) {
+ wxBitmap bitmap(m_main_bitmap);
+
+ wxMemoryDC memDC;
+ memDC.SelectObject(bitmap);
+
+ memDC.SetFont(m_action_font);
+ memDC.SetTextForeground(wxColour(237, 107, 33));
+ memDC.DrawText(text, int(m_scale * 60), m_action_line_y_position);
+
+ memDC.SelectObject(wxNullBitmap);
+ set_bitmap(bitmap);
+#ifdef __WXOSX__
+ // without this code splash screen wouldn't be updated under OSX
+ wxYield();
+#endif
+ }
+ }
+
+ static wxBitmap MakeBitmap(wxBitmap bmp)
+ {
+ if (!bmp.IsOk())
+ return wxNullBitmap;
+
+ // create dark grey background for the splashscreen
+ // It will be 5/3 of the weight of the bitmap
+ int width = lround((double)5 / 3 * bmp.GetWidth());
+ int height = bmp.GetHeight();
+
+ wxImage image(width, height);
+ unsigned char* imgdata_ = image.GetData();
+ for (int i = 0; i < width * height; ++i) {
+ *imgdata_++ = 51;
+ *imgdata_++ = 51;
+ *imgdata_++ = 51;
+ }
+
+ wxBitmap new_bmp(image);
+
+ wxMemoryDC memDC;
+ memDC.SelectObject(new_bmp);
+ memDC.DrawBitmap(bmp, width - bmp.GetWidth(), 0, true);
+
+ return new_bmp;
+ }
+
+ void Decorate(wxBitmap& bmp)
+ {
+ if (!bmp.IsOk())
+ return;
+
+ // draw text to the box at the left of the splashscreen.
+ // this box will be 2/5 of the weight of the bitmap, and be at the left.
+ int width = lround(bmp.GetWidth() * 0.4);
+
+ // load bitmap for logo
+ BitmapCache bmp_cache;
+ int logo_size = lround(width * 0.25);
+ wxBitmap logo_bmp = *bmp_cache.load_svg(wxGetApp().is_editor() ? "prusa_slicer_logo" : "add_gcode", logo_size, logo_size);
+
+ wxCoord margin = int(m_scale * 20);
+
+ wxRect banner_rect(wxPoint(0, logo_size), wxPoint(width, bmp.GetHeight()));
+ banner_rect.Deflate(margin, 2 * margin);
+
+ // use a memory DC to draw directly onto the bitmap
+ wxMemoryDC memDc(bmp);
+
+ // draw logo
+ memDc.DrawBitmap(logo_bmp, margin, margin, true);
+
+ // draw the (white) labels inside of our black box (at the left of the splashscreen)
+ memDc.SetTextForeground(wxColour(255, 255, 255));
+
+ memDc.SetFont(m_constant_text.title_font);
+ memDc.DrawLabel(m_constant_text.title, banner_rect, wxALIGN_TOP | wxALIGN_LEFT);
+
+ int title_height = memDc.GetTextExtent(m_constant_text.title).GetY();
+ banner_rect.SetTop(banner_rect.GetTop() + title_height);
+ banner_rect.SetHeight(banner_rect.GetHeight() - title_height);
+
+ memDc.SetFont(m_constant_text.version_font);
+ memDc.DrawLabel(m_constant_text.version, banner_rect, wxALIGN_TOP | wxALIGN_LEFT);
+ int version_height = memDc.GetTextExtent(m_constant_text.version).GetY();
+
+ memDc.SetFont(m_constant_text.credits_font);
+ memDc.DrawLabel(m_constant_text.credits, banner_rect, wxALIGN_BOTTOM | wxALIGN_LEFT);
+ int credits_height = memDc.GetMultiLineTextExtent(m_constant_text.credits).GetY();
+ int text_height = memDc.GetTextExtent("text").GetY();
+
+ // calculate position for the dynamic text
+ int logo_and_header_height = margin + logo_size + title_height + version_height;
+ m_action_line_y_position = logo_and_header_height + 0.5 * (bmp.GetHeight() - margin - credits_height - logo_and_header_height - text_height);
+ }
+
+private:
+ wxBitmap m_main_bitmap;
+ wxFont m_action_font;
+ int m_action_line_y_position;
+ float m_scale {1.0};
+
+ struct ConstantText
+ {
+ wxString title;
+ wxString version;
+ wxString credits;
+
+ wxFont title_font;
+ wxFont version_font;
+ wxFont credits_font;
+
+ void init(wxFont init_font)
+ {
+ // title
+ title = wxGetApp().is_editor() ? SLIC3R_APP_NAME : GCODEVIEWER_APP_NAME;
+
+ // dynamically get the version to display
+ version = _L("Version") + " " + std::string(SLIC3R_VERSION);
+
+ // credits infornation
+ credits = title + " " +
+ _L("is based on Slic3r by Alessandro Ranellucci and the RepRap community.") + "\n\n" +
+ title + " " + _L("is licensed under the") + " " + _L("GNU Affero General Public License, version 3") + "\n\n" +
+ _L("Contributions by Vojtech Bubnik, Enrico Turri, Oleksandra Iushchenko, Tamas Meszaros, Lukas Matena, Vojtech Kral, David Kocik and numerous others.") + "\n\n" +
+ _L("Artwork model by Nora Al-Badri and Jan Nikolai Nelles");
+
+ title_font = version_font = credits_font = init_font;
+ }
+ }
+ m_constant_text;
+
+ void init_constant_text()
+ {
+ m_constant_text.init(get_default_font(this));
+
+ // As default we use a system font for current display.
+ // Scale fonts in respect to banner width
+
+ int text_banner_width = lround(0.4 * m_main_bitmap.GetWidth()) - roundl(m_scale * 50); // banner_width - margins
+
+ float title_font_scale = (float)text_banner_width / GetTextExtent(m_constant_text.title).GetX();
+ scale_font(m_constant_text.title_font, title_font_scale > 3.5f ? 3.5f : title_font_scale);
+
+ float version_font_scale = (float)text_banner_width / GetTextExtent(m_constant_text.version).GetX();
+ scale_font(m_constant_text.version_font, version_font_scale > 2.f ? 2.f : version_font_scale);
+
+ // The width of the credits information string doesn't respect to the banner width some times.
+ // So, scale credits_font in the respect to the longest string width
+ int longest_string_width = word_wrap_string(m_constant_text.credits);
+ float font_scale = (float)text_banner_width / longest_string_width;
+ scale_font(m_constant_text.credits_font, font_scale);
+ }
+
+ void set_bitmap(wxBitmap& bmp)
+ {
+ m_window->SetBitmap(bmp);
+ m_window->Refresh();
+ m_window->Update();
+ }
+
+ void scale_bitmap(wxBitmap& bmp, float scale)
+ {
+ if (scale == 1.0)
+ return;
+
+ wxImage image = bmp.ConvertToImage();
+ if (!image.IsOk() || image.GetWidth() == 0 || image.GetHeight() == 0)
+ return;
+
+ int width = int(scale * image.GetWidth());
+ int height = int(scale * image.GetHeight());
+ image.Rescale(width, height, wxIMAGE_QUALITY_BILINEAR);
+
+ bmp = wxBitmap(std::move(image));
+ }
+
+ void scale_font(wxFont& font, float scale)
+ {
+#ifdef __WXMSW__
+ // Workaround for the font scaling in respect to the current active display,
+ // not for the primary display, as it's implemented in Font.cpp
+ // See https://github.com/wxWidgets/wxWidgets/blob/master/src/msw/font.cpp
+ // void wxNativeFontInfo::SetFractionalPointSize(float pointSizeNew)
+ wxNativeFontInfo nfi= *font.GetNativeFontInfo();
+ float pointSizeNew = scale * font.GetPointSize();
+ nfi.lf.lfHeight = nfi.GetLogFontHeightAtPPI(pointSizeNew, get_dpi_for_window(this));
+ nfi.pointSize = pointSizeNew;
+ font = wxFont(nfi);
+#else
+ font.Scale(scale);
+#endif //__WXMSW__
+ }
+
+ // wrap a string for the strings no longer then 55 symbols
+ // return extent of the longest string
+ int word_wrap_string(wxString& input)
+ {
+ size_t line_len = 55;// count of symbols in one line
+ int idx = -1;
+ size_t cur_len = 0;
+
+ wxString longest_sub_string;
+ auto get_longest_sub_string = [longest_sub_string, input](wxString &longest_sub_str, int cur_len, size_t i) {
+ if (cur_len > longest_sub_str.Len())
+ longest_sub_str = input.SubString(i - cur_len + 1, i);
+ };
+
+ for (size_t i = 0; i < input.Len(); i++)
+ {
+ cur_len++;
+ if (input[i] == ' ')
+ idx = i;
+ if (input[i] == '\n')
+ {
+ get_longest_sub_string(longest_sub_string, cur_len, i);
+ idx = -1;
+ cur_len = 0;
+ }
+ if (cur_len >= line_len && idx >= 0)
+ {
+ get_longest_sub_string(longest_sub_string, cur_len, i);
+ input[idx] = '\n';
+ cur_len = i - static_cast<size_t>(idx);
+ }
+ }
+
+ return GetTextExtent(longest_sub_string).GetX();
+ }
+};
+
+
+#ifdef __linux__
+bool static check_old_linux_datadir(const wxString& app_name) {
+ // If we are on Linux and the datadir does not exist yet, look into the old
+ // location where the datadir was before version 2.3. If we find it there,
+ // tell the user that he might wanna migrate to the new location.
+ // (https://github.com/prusa3d/PrusaSlicer/issues/2911)
+ // To be precise, the datadir should exist, it is created when single instance
+ // lock happens. Instead of checking for existence, check the contents.
+
+ namespace fs = boost::filesystem;
+
+ std::string new_path = Slic3r::data_dir();
+
+ wxString dir;
+ if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
+ dir = wxFileName::GetHomeDir() + wxS("/.config");
+ std::string default_path = (dir + "/" + app_name).ToUTF8().data();
+
+ if (new_path != default_path) {
+ // This happens when the user specifies a custom --datadir.
+ // Do not show anything in that case.
+ return true;
+ }
+
+ fs::path data_dir = fs::path(new_path);
+ if (! fs::is_directory(data_dir))
+ return true; // This should not happen.
+
+ int file_count = std::distance(fs::directory_iterator(data_dir), fs::directory_iterator());
+
+ if (file_count <= 1) { // just cache dir with an instance lock
+ std::string old_path = wxStandardPaths::Get().GetUserDataDir().ToUTF8().data();
+
+ if (fs::is_directory(old_path)) {
+ wxString msg = from_u8((boost::format(_u8L("Starting with %1% 2.3, configuration "
+ "directory on Linux has changed (according to XDG Base Directory Specification) to \n%2%.\n\n"
+ "This directory did not exist yet (maybe you run the new version for the first time).\nHowever, "
+ "an old %1% configuration directory was detected in \n%3%.\n\n"
+ "Consider moving the contents of the old directory to the new location in order to access "
+ "your profiles, etc.\nNote that if you decide to downgrade %1% in future, it will use the old "
+ "location again.\n\n"
+ "What do you want to do now?")) % SLIC3R_APP_NAME % new_path % old_path).str());
+ wxString caption = from_u8((boost::format(_u8L("%s - BREAKING CHANGE")) % SLIC3R_APP_NAME).str());
+ wxRichMessageDialog dlg(nullptr, msg, caption, wxYES_NO);
+ dlg.SetYesNoLabels(_L("Quit, I will move my data now"), _L("Start the application"));
+ if (dlg.ShowModal() != wxID_NO)
+ return false;
+ }
+ } else {
+ // If the new directory exists, be silent. The user likely already saw the message.
+ }
+ return true;
+}
+#endif
+
+
wxString file_wildcards(FileType file_type, const std::string &custom_extension)
{
static const std::string defaults[FT_SIZE] = {
@@ -100,6 +446,7 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension)
static std::string libslic3r_translate_callback(const char *s) { return wxGetTranslation(wxString(s, wxConvUTF8)).utf8_str().data(); }
#ifdef WIN32
+#if !wxVERSION_EQUAL_OR_GREATER_THAN(3,1,3)
static void register_win32_dpi_event()
{
enum { WM_DPICHANGED_ = 0x02e0 };
@@ -115,13 +462,12 @@ static void register_win32_dpi_event()
return true;
});
}
+#endif // !wxVERSION_EQUAL_OR_GREATER_THAN
static GUID GUID_DEVINTERFACE_HID = { 0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 };
static void register_win32_device_notification_event()
{
- enum { WM_DPICHANGED_ = 0x02e0 };
-
wxWindow::MSWRegisterMessageHandler(WM_DEVICECHANGE, [](wxWindow *win, WXUINT /* nMsg */, WXWPARAM wParam, WXLPARAM lParam) {
// Some messages are sent to top level windows by default, some messages are sent to only registered windows, and we explictely register on MainFrame only.
auto main_frame = dynamic_cast<MainFrame*>(win);
@@ -158,6 +504,65 @@ static void register_win32_device_notification_event()
}
return true;
});
+
+ wxWindow::MSWRegisterMessageHandler(MainFrame::WM_USER_MEDIACHANGED, [](wxWindow *win, WXUINT /* nMsg */, WXWPARAM wParam, WXLPARAM lParam) {
+ // Some messages are sent to top level windows by default, some messages are sent to only registered windows, and we explictely register on MainFrame only.
+ auto main_frame = dynamic_cast<MainFrame*>(win);
+ auto plater = (main_frame == nullptr) ? nullptr : main_frame->plater();
+ if (plater == nullptr)
+ // Maybe some other top level window like a dialog or maybe a pop-up menu?
+ return true;
+ wchar_t sPath[MAX_PATH];
+ if (lParam == SHCNE_MEDIAINSERTED || lParam == SHCNE_MEDIAREMOVED) {
+ struct _ITEMIDLIST* pidl = *reinterpret_cast<struct _ITEMIDLIST**>(wParam);
+ if (! SHGetPathFromIDList(pidl, sPath)) {
+ BOOST_LOG_TRIVIAL(error) << "MediaInserted: SHGetPathFromIDList failed";
+ return false;
+ }
+ }
+ switch (lParam) {
+ case SHCNE_MEDIAINSERTED:
+ {
+ //printf("SHCNE_MEDIAINSERTED %S\n", sPath);
+ plater->GetEventHandler()->AddPendingEvent(VolumeAttachedEvent(EVT_VOLUME_ATTACHED));
+ break;
+ }
+ case SHCNE_MEDIAREMOVED:
+ {
+ //printf("SHCNE_MEDIAREMOVED %S\n", sPath);
+ plater->GetEventHandler()->AddPendingEvent(VolumeDetachedEvent(EVT_VOLUME_DETACHED));
+ break;
+ }
+ default:
+// printf("Unknown\n");
+ break;
+ }
+ return true;
+ });
+
+ wxWindow::MSWRegisterMessageHandler(WM_INPUT, [](wxWindow *win, WXUINT /* nMsg */, WXWPARAM wParam, WXLPARAM lParam) {
+ auto main_frame = dynamic_cast<MainFrame*>(Slic3r::GUI::find_toplevel_parent(win));
+ auto plater = (main_frame == nullptr) ? nullptr : main_frame->plater();
+// if (wParam == RIM_INPUTSINK && plater != nullptr && main_frame->IsActive()) {
+ if (wParam == RIM_INPUT && plater != nullptr && main_frame->IsActive()) {
+ RAWINPUT raw;
+ UINT rawSize = sizeof(RAWINPUT);
+ ::GetRawInputData((HRAWINPUT)lParam, RID_INPUT, &raw, &rawSize, sizeof(RAWINPUTHEADER));
+ if (raw.header.dwType == RIM_TYPEHID && plater->get_mouse3d_controller().handle_raw_input_win32(raw.data.hid.bRawData, raw.data.hid.dwSizeHid))
+ return true;
+ }
+ return false;
+ });
+
+ wxWindow::MSWRegisterMessageHandler(WM_COPYDATA, [](wxWindow* win, WXUINT /* nMsg */, WXWPARAM wParam, WXLPARAM lParam) {
+ COPYDATASTRUCT* copy_data_structure = { 0 };
+ copy_data_structure = (COPYDATASTRUCT*)lParam;
+ if (copy_data_structure->dwData == 1) {
+ LPCWSTR arguments = (LPCWSTR)copy_data_structure->lpData;
+ Slic3r::GUI::wxGetApp().other_instance_message_handler()->handle_message(boost::nowide::narrow(arguments));
+ }
+ return true;
+ });
}
#endif // WIN32
@@ -181,12 +586,20 @@ static void generic_exception_handle()
} catch (const std::bad_alloc& ex) {
// bad_alloc in main thread is most likely fatal. Report immediately to the user (wxLogError would be delayed)
// and terminate the app so it is at least certain to happen now.
- wxString errmsg = wxString::Format(_(L("%s has encountered an error. It was likely caused by running out of memory. "
+ wxString errmsg = wxString::Format(_L("%s has encountered an error. It was likely caused by running out of memory. "
"If you are sure you have enough RAM on your system, this may also be a bug and we would "
- "be glad if you reported it.\n\nThe application will now terminate.")), SLIC3R_APP_NAME);
- wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _(L("Fatal error")), wxOK | wxICON_ERROR);
+ "be glad if you reported it.\n\nThe application will now terminate."), SLIC3R_APP_NAME);
+ wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _L("Fatal error"), wxOK | wxICON_ERROR);
BOOST_LOG_TRIVIAL(error) << boost::format("std::bad_alloc exception: %1%") % ex.what();
std::terminate();
+ } catch (const boost::io::bad_format_string& ex) {
+ wxString errmsg = _L("PrusaSlicer has encountered a localization error. "
+ "Please report to PrusaSlicer team, what language was active and in which scenario "
+ "this issue happened. Thank you.\n\nThe application will now terminate.");
+ wxMessageBox(errmsg + "\n\n" + wxString(ex.what()), _L("Critical error"), wxOK | wxICON_ERROR);
+ BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
+ std::terminate();
+ throw;
} catch (const std::exception& ex) {
wxLogError("Internal error: %s", ex.what());
BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
@@ -194,15 +607,52 @@ static void generic_exception_handle()
}
}
+void GUI_App::post_init()
+{
+ assert(initialized());
+ if (! this->initialized())
+ throw Slic3r::RuntimeError("Calling post_init() while not yet initialized");
+
+ if (this->init_params->start_as_gcodeviewer) {
+ if (! this->init_params->input_files.empty())
+ this->plater()->load_gcode(wxString::FromUTF8(this->init_params->input_files[0].c_str()));
+ }
+ else {
+#if 0
+ // Load the cummulative config over the currently active profiles.
+ //FIXME if multiple configs are loaded, only the last one will have an effect.
+ // We need to decide what to do about loading of separate presets (just print preset, just filament preset etc).
+ // As of now only the full configs are supported here.
+ if (!m_print_config.empty())
+ this->gui->mainframe->load_config(m_print_config);
+#endif
+ if (! this->init_params->load_configs.empty())
+ // Load the last config to give it a name at the UI. The name of the preset may be later
+ // changed by loading an AMF or 3MF.
+ //FIXME this is not strictly correct, as one may pass a print/filament/printer profile here instead of a full config.
+ this->mainframe->load_config_file(this->init_params->load_configs.back());
+ // If loading a 3MF file, the config is loaded from the last one.
+ if (! this->init_params->input_files.empty())
+ this->plater()->load_files(this->init_params->input_files, true, true);
+ if (! this->init_params->extra_config.empty())
+ this->mainframe->load_config(this->init_params->extra_config);
+ }
+}
+
IMPLEMENT_APP(GUI_App)
-GUI_App::GUI_App()
+GUI_App::GUI_App(EAppMode mode)
: wxApp()
+ , m_app_mode(mode)
, m_em_unit(10)
, m_imgui(new ImGuiWrapper())
, m_wizard(nullptr)
, m_removable_drive_manager(std::make_unique<RemovableDriveManager>())
-{}
+ , m_other_instance_message_handler(std::make_unique<OtherInstanceMessageHandler>())
+{
+ //app config initializes early becasuse it is used in instance checking in PrusaSlicer.cpp
+ this->init_app_config();
+}
GUI_App::~GUI_App()
{
@@ -216,6 +666,83 @@ GUI_App::~GUI_App()
delete preset_updater;
}
+std::string GUI_App::get_gl_info(bool format_as_html, bool extensions)
+{
+ return OpenGLManager::get_gl_info().to_string(format_as_html, extensions);
+}
+
+wxGLContext* GUI_App::init_glcontext(wxGLCanvas& canvas)
+{
+ return m_opengl_mgr.init_glcontext(canvas);
+}
+
+bool GUI_App::init_opengl()
+{
+#ifdef __linux__
+ bool status = m_opengl_mgr.init_gl();
+ m_opengl_initialized = true;
+ return status;
+#else
+ return m_opengl_mgr.init_gl();
+#endif
+}
+
+void GUI_App::init_app_config()
+{
+ // Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release.
+ SetAppName(SLIC3R_APP_KEY);
+// SetAppName(SLIC3R_APP_KEY "-beta");
+// SetAppDisplayName(SLIC3R_APP_NAME);
+
+ // Set the Slic3r data directory at the Slic3r XS module.
+ // Unix: ~/ .Slic3r
+ // Windows : "C:\Users\username\AppData\Roaming\Slic3r" or "C:\Documents and Settings\username\Application Data\Slic3r"
+ // Mac : "~/Library/Application Support/Slic3r"
+
+ if (data_dir().empty()) {
+ #ifndef __linux__
+ set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
+ #else
+ // Since version 2.3, config dir on Linux is in ${XDG_CONFIG_HOME}.
+ // https://github.com/prusa3d/PrusaSlicer/issues/2911
+ wxString dir;
+ if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
+ dir = wxFileName::GetHomeDir() + wxS("/.config");
+ set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
+ #endif
+ }
+
+ if (!app_config)
+ app_config = new AppConfig(is_editor() ? AppConfig::EAppMode::Editor : AppConfig::EAppMode::GCodeViewer);
+
+ // load settings
+ m_app_conf_exists = app_config->exists();
+ if (m_app_conf_exists) {
+ std::string error = app_config->load();
+ if (!error.empty()) {
+ // Error while parsing config file. We'll customize the error message and rethrow to be displayed.
+ if (is_editor()) {
+ throw Slic3r::RuntimeError(
+ _u8L("Error parsing PrusaSlicer config file, it is probably corrupted. "
+ "Try to manually delete the file to recover from the error. Your user profiles will not be affected.") +
+ "\n\n" + app_config->config_path() + "\n\n" + error);
+ }
+ else {
+ throw Slic3r::RuntimeError(
+ _u8L("Error parsing PrusaGCodeViewer config file, it is probably corrupted. "
+ "Try to manually delete the file to recover from the error.") +
+ "\n\n" + app_config->config_path() + "\n\n" + error);
+ }
+ }
+ }
+}
+
+void GUI_App::init_single_instance_checker(const std::string &name, const std::string &path)
+{
+ BOOST_LOG_TRIVIAL(debug) << "init wx instance checker " << name << " "<< path;
+ m_single_instance_checker = std::make_unique<wxSingleInstanceChecker>(boost::nowide::widen(name), boost::nowide::widen(path));
+}
+
bool GUI_App::OnInit()
{
try {
@@ -233,51 +760,106 @@ bool GUI_App::on_init_inner()
wxCHECK_MSG(wxDirExists(resources_dir), false,
wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir));
- // Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release.
- SetAppName(SLIC3R_APP_KEY);
-// SetAppName(SLIC3R_APP_KEY "-beta");
- SetAppDisplayName(SLIC3R_APP_NAME);
+#ifdef __linux__
+ if (! check_old_linux_datadir(GetAppName())) {
+ std::cerr << "Quitting, user chose to move their data to new location." << std::endl;
+ return false;
+ }
+#endif
-// Enable this to get the default Win32 COMCTRL32 behavior of static boxes.
+ // Enable this to get the default Win32 COMCTRL32 behavior of static boxes.
// wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0);
-// Enable this to disable Windows Vista themes for all wxNotebooks. The themes seem to lead to terrible
-// performance when working on high resolution multi-display setups.
+ // Enable this to disable Windows Vista themes for all wxNotebooks. The themes seem to lead to terrible
+ // performance when working on high resolution multi-display setups.
// wxSystemOptions::SetOption("msw.notebook.themed-background", 0);
// Slic3r::debugf "wxWidgets version %s, Wx version %s\n", wxVERSION_STRING, wxVERSION;
- // Set the Slic3r data directory at the Slic3r XS module.
- // Unix: ~/ .Slic3r
- // Windows : "C:\Users\username\AppData\Roaming\Slic3r" or "C:\Documents and Settings\username\Application Data\Slic3r"
- // Mac : "~/Library/Application Support/Slic3r"
- if (data_dir().empty())
- set_data_dir(wxStandardPaths::Get().GetUserDataDir().ToUTF8().data());
+ if (is_editor()) {
+ std::string msg = Http::tls_global_init();
+ std::string ssl_cert_store = app_config->get("tls_accepted_cert_store_location");
+ bool ssl_accept = app_config->get("tls_cert_store_accepted") == "yes" && ssl_cert_store == Http::tls_system_cert_store();
+
+ if (!msg.empty() && !ssl_accept) {
+ wxRichMessageDialog
+ dlg(nullptr,
+ wxString::Format(_L("%s\nDo you want to continue?"), msg),
+ "PrusaSlicer", wxICON_QUESTION | wxYES_NO);
+ dlg.ShowCheckBox(_L("Remember my choice"));
+ if (dlg.ShowModal() != wxID_YES) return false;
+
+ app_config->set("tls_cert_store_accepted",
+ dlg.IsCheckBoxChecked() ? "yes" : "no");
+ app_config->set("tls_accepted_cert_store_location",
+ dlg.IsCheckBoxChecked() ? Http::tls_system_cert_store() : "");
+ }
+ }
+
+ app_config->set("version", SLIC3R_VERSION);
+ app_config->save();
+
+ wxInitAllImageHandlers();
+
+ SplashScreen* scrn = nullptr;
+ if (app_config->get("show_splash_screen") == "1") {
+ // make a bitmap with dark grey banner on the left side
+ wxBitmap bmp = SplashScreen::MakeBitmap(wxBitmap(from_u8(var(is_editor() ? "splashscreen.jpg" : "splashscreen-gcodepreview.jpg")), wxBITMAP_TYPE_JPEG));
+
+ // Detect position (display) to show the splash screen
+ // Now this position is equal to the mainframe position
+ wxPoint splashscreen_pos = wxDefaultPosition;
+ if (app_config->has("window_mainframe")) {
+ auto metrics = WindowMetrics::deserialize(app_config->get("window_mainframe"));
+ if (metrics)
+ splashscreen_pos = metrics->get_rect().GetPosition();
+ }
+
+ // create splash screen with updated bmp
+ scrn = new SplashScreen(bmp.IsOk() ? bmp : create_scaled_bitmap("prusa_slicer_logo", nullptr, 400),
+ wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_TIMEOUT, 4000, splashscreen_pos);
+#ifndef __linux__
+ wxYield();
+#endif
+ scrn->SetText(_L("Loading configuration")+ dots);
+ }
- app_config = new AppConfig();
preset_bundle = new PresetBundle();
// just checking for existence of Slic3r::data_dir is not enough : it may be an empty directory
// supplied as argument to --datadir; in that case we should still run the wizard
preset_bundle->setup_directories();
- // load settings
- app_conf_exists = app_config->exists();
- if (app_conf_exists) {
- app_config->load();
- }
-
- app_config->set("version", SLIC3R_VERSION);
- app_config->save();
-
-#ifdef __WXMSW__
- associate_3mf_files();
+ if (is_editor()) {
+#ifdef __WXMSW__
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ if (app_config->get("associate_3mf") == "1")
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ associate_3mf_files();
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ if (app_config->get("associate_stl") == "1")
+ associate_stl_files();
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
#endif // __WXMSW__
- preset_updater = new PresetUpdater();
- Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent &evt) {
- app_config->set("version_online", into_u8(evt.GetString()));
- app_config->save();
- });
+ preset_updater = new PresetUpdater();
+ Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent& evt) {
+ app_config->set("version_online", into_u8(evt.GetString()));
+ app_config->save();
+ if (this->plater_ != nullptr) {
+ if (*Semver::parse(SLIC3R_VERSION) < *Semver::parse(into_u8(evt.GetString()))) {
+ this->plater_->get_notification_manager()->push_notification(NotificationType::NewAppAvailable);
+ }
+ }
+ });
+ }
+ else {
+#ifdef __WXMSW__
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ if (app_config->get("associate_gcode") == "1")
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ associate_gcode_files();
+#endif // __WXMSW__
+ }
// initialize label colors and fonts
init_label_colours();
@@ -295,7 +877,9 @@ bool GUI_App::on_init_inner()
}
#ifdef WIN32
+#if !wxVERSION_EQUAL_OR_GREATER_THAN(3,1,3)
register_win32_dpi_event();
+#endif // !wxVERSION_EQUAL_OR_GREATER_THAN
register_win32_device_notification_event();
#endif // WIN32
@@ -303,59 +887,92 @@ bool GUI_App::on_init_inner()
Slic3r::I18N::set_translate_callback(libslic3r_translate_callback);
// application frame
- if (wxImage::FindHandler(wxBITMAP_TYPE_PNG) == nullptr)
- wxImage::AddHandler(new wxPNGHandler());
+ if (scrn && is_editor())
+ scrn->SetText(_L("Preparing settings tabs") + dots);
+
mainframe = new MainFrame();
+ // hide settings tabs after first Layout
+ if (is_editor())
+ mainframe->select_tab(size_t(0));
+
sidebar().obj_list()->init_objects(); // propagate model objects to object list
// update_mode(); // !!! do that later
SetTopWindow(mainframe);
m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
+ if (is_gcode_viewer()) {
+ mainframe->update_layout();
+ if (plater_ != nullptr)
+ // ensure the selected technology is ptFFF
+ plater_->set_printer_technology(ptFFF);
+ }
+ else
+ load_current_presets();
+ mainframe->Show(true);
+
+ obj_list()->set_min_height();
+
+ update_mode(); // update view mode after fix of the object_list size
+
+#ifdef __APPLE__
+ other_instance_message_handler()->bring_instance_forward();
+#endif //__APPLE__
Bind(wxEVT_IDLE, [this](wxIdleEvent& event)
{
if (! plater_)
return;
+
if (app_config->dirty() && app_config->get("autosave") == "1")
app_config->save();
this->obj_manipul()->update_if_dirty();
- // Preset updating & Configwizard are done after the above initializations,
- // and after MainFrame is created & shown.
- // The extra CallAfter() is needed because of Mac, where this is the only way
- // to popup a modal dialog on start without screwing combo boxes.
- // This is ugly but I honestly found no better way to do it.
- // Neither wxShowEvent nor wxWindowCreateEvent work reliably.
+ static bool update_gui_after_init = true;
+
+ // An ugly solution to GH #5537 in which GUI_App::init_opengl (normally called from events wxEVT_PAINT
+ // and wxEVT_SET_FOCUS before GUI_App::post_init is called) wasn't called before GUI_App::post_init and OpenGL wasn't initialized.
+#ifdef __linux__
+ if (update_gui_after_init && m_opengl_initialized) {
+#else
+ if (update_gui_after_init) {
+#endif
+ update_gui_after_init = false;
+#ifdef WIN32
+ this->mainframe->register_win32_callbacks();
+#endif
+ this->post_init();
+ }
+
+ // Preset updating & Configwizard are done after the above initializations,
+ // and after MainFrame is created & shown.
+ // The extra CallAfter() is needed because of Mac, where this is the only way
+ // to popup a modal dialog on start without screwing combo boxes.
+ // This is ugly but I honestly found no better way to do it.
+ // Neither wxShowEvent nor wxWindowCreateEvent work reliably.
static bool once = true;
if (once) {
once = false;
- check_updates(false);
- CallAfter([this] {
- config_wizard_startup();
- preset_updater->slic3r_update_notify();
- preset_updater->sync(preset_bundle);
- });
- }
- });
-
- load_current_presets();
+ if (preset_updater != nullptr) {
+ check_updates(false);
- mainframe->Show(true);
-
- /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
- * change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
- * after first whole Mainframe updating/layouting
- */
- const int list_min_height = 15 * em_unit();
- if (obj_list()->GetMinSize().GetY() > list_min_height)
- obj_list()->SetMinSize(wxSize(-1, list_min_height));
+ CallAfter([this] {
+ config_wizard_startup();
+ preset_updater->slic3r_update_notify();
+ preset_updater->sync(preset_bundle);
+ });
+ }
- update_mode(); // update view mode after fix of the object_list size
+#ifdef _WIN32
+ //sets window property to mainframe so other instances can indentify it
+ OtherInstanceMessageHandler::init_windows_properties(mainframe, m_instance_hash_int);
+#endif //WIN32
+ }
+ });
m_initialized = true;
return true;
@@ -426,6 +1043,11 @@ void GUI_App::init_fonts()
m_small_font.SetPointSize(11);
m_bold_font.SetPointSize(13);
#endif /*__WXMAC__*/
+
+ // wxSYS_OEM_FIXED_FONT and wxSYS_ANSI_FIXED_FONT use the same as
+ // DEFAULT in wxGtk. Use the TELETYPE family as a work-around
+ m_code_font = wxFont(wxFontInfo().Family(wxFONTFAMILY_TELETYPE));
+ m_code_font.SetPointSize(m_normal_font.GetPointSize());
}
void GUI_App::update_fonts(const MainFrame *main_frame)
@@ -441,6 +1063,7 @@ void GUI_App::update_fonts(const MainFrame *main_frame)
m_small_font = m_normal_font;
m_bold_font = main_frame->normal_font().Bold();
m_em_unit = main_frame->em_unit();
+ m_code_font.SetPointSize(m_normal_font.GetPointSize());
}
void GUI_App::set_label_clr_modified(const wxColour& clr) {
@@ -459,6 +1082,11 @@ void GUI_App::set_label_clr_sys(const wxColour& clr) {
app_config->save();
}
+wxSize GUI_App::get_min_size() const
+{
+ return wxSize(76*m_em_unit, 49 * m_em_unit);
+}
+
float GUI_App::toolbar_icon_scale(const bool is_limited/* = false*/) const
{
#ifdef __APPLE__
@@ -469,50 +1097,88 @@ float GUI_App::toolbar_icon_scale(const bool is_limited/* = false*/) const
const std::string& use_val = app_config->get("use_custom_toolbar_size");
const std::string& val = app_config->get("custom_toolbar_size");
+ const std::string& auto_val = app_config->get("auto_toolbar_size");
- if (val.empty() || use_val.empty() || use_val == "0")
+ if (val.empty() || auto_val.empty() || use_val.empty())
return icon_sc;
- int int_val = atoi(val.c_str());
+ int int_val = use_val == "0" ? 100 : atoi(val.c_str());
+ // correct value in respect to auto_toolbar_size
+ int_val = std::min(atoi(auto_val.c_str()), int_val);
+
if (is_limited && int_val < 50)
int_val = 50;
return 0.01f * int_val * icon_sc;
}
-void GUI_App::recreate_GUI()
+void GUI_App::set_auto_toolbar_icon_scale(float scale) const
+{
+#ifdef __APPLE__
+ const float icon_sc = 1.0f; // for Retina display will be used its own scale
+#else
+ const float icon_sc = m_em_unit * 0.1f;
+#endif // __APPLE__
+
+ long int_val = std::min(int(std::lround(scale / icon_sc * 100)), 100);
+ std::string val = std::to_string(int_val);
+
+ app_config->set("auto_toolbar_size", val);
+}
+
+// check user printer_presets for the containing information about "Print Host upload"
+void GUI_App::check_printer_presets()
{
+ std::vector<std::string> preset_names = PhysicalPrinter::presets_with_print_host_information(preset_bundle->printers);
+ if (preset_names.empty())
+ return;
+
+ wxString msg_text = _L("You have the following presets with saved options for \"Print Host upload\"") + ":";
+ for (const std::string& preset_name : preset_names)
+ msg_text += "\n \"" + from_u8(preset_name) + "\",";
+ msg_text.RemoveLast();
+ msg_text += "\n\n" + _L("But since this version of PrusaSlicer we don't show this information in Printer Settings anymore.\n"
+ "Settings will be available in physical printers settings.") + "\n\n" +
+ _L("By default new Printer devices will be named as \"Printer N\" during its creation.\n"
+ "Note: This name can be changed later from the physical printers settings");
+
+ wxMessageDialog(nullptr, msg_text, _L("Information"), wxOK | wxICON_INFORMATION).ShowModal();
+
+ preset_bundle->physical_printers.load_printers_from_presets(preset_bundle->printers);
+}
+
+void GUI_App::recreate_GUI(const wxString& msg_name)
+{
+ m_is_recreating_gui = true;
+
mainframe->shutdown();
- const auto msg_name = _(L("Changing of an application language")) + dots;
- wxProgressDialog dlg(msg_name, msg_name);
+ wxProgressDialog dlg(msg_name, msg_name, 100, nullptr, wxPD_AUTO_HIDE);
dlg.Pulse();
- dlg.Update(10, _(L("Recreating")) + dots);
+ dlg.Update(10, _L("Recreating") + dots);
MainFrame *old_main_frame = mainframe;
mainframe = new MainFrame();
+ if (is_editor())
+ // hide settings tabs after first Layout
+ mainframe->select_tab(size_t(0));
// Propagate model objects to object list.
sidebar().obj_list()->init_objects();
SetTopWindow(mainframe);
- dlg.Update(30, _(L("Recreating")) + dots);
+ dlg.Update(30, _L("Recreating") + dots);
old_main_frame->Destroy();
// For this moment ConfigWizard is deleted, invalidate it.
m_wizard = nullptr;
- dlg.Update(80, _(L("Loading of current presets")) + dots);
+ dlg.Update(80, _L("Loading of current presets") + dots);
m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
load_current_presets();
mainframe->Show(true);
- dlg.Update(90, _(L("Loading of a mode view")) + dots);
- /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
- * change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
- * after first whole Mainframe updating/layouting
- */
- const int list_min_height = 15 * em_unit();
- if (obj_list()->GetMinSize().GetY() > list_min_height)
- obj_list()->SetMinSize(wxSize(-1, list_min_height));
+ dlg.Update(90, _L("Loading of a mode view") + dots);
+
+ obj_list()->set_min_height();
update_mode();
// #ys_FIXME_delete_after_testing Do we still need this ?
@@ -520,6 +1186,8 @@ void GUI_App::recreate_GUI()
// // Run the config wizard, don't offer the "reset user profile" checkbox.
// config_wizard_startup(true);
// });
+
+ m_is_recreating_gui = false;
}
void GUI_App::system_info()
@@ -559,9 +1227,9 @@ void fatal_error(wxWindow* parent)
// Called after the Preferences dialog is closed and the program settings are saved.
// Update the UI based on the current preferences.
-void GUI_App::update_ui_from_settings()
+void GUI_App::update_ui_from_settings(bool apply_free_camera_correction)
{
- mainframe->update_ui_from_settings();
+ mainframe->update_ui_from_settings(apply_free_camera_correction);
}
void GUI_App::persist_window_geometry(wxTopLevelWindow *window, bool default_maximized)
@@ -584,7 +1252,7 @@ void GUI_App::load_project(wxWindow *parent, wxString& input_file) const
{
input_file.Clear();
wxFileDialog dialog(parent ? parent : GetTopWindow(),
- _(L("Choose one file (3MF/AMF):")),
+ _L("Choose one file (3MF/AMF):"),
app_config->get_last_dir(), "",
file_wildcards(FT_PROJECT), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
@@ -596,7 +1264,7 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files) const
{
input_files.Clear();
wxFileDialog dialog(parent ? parent : GetTopWindow(),
- _(L("Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):")),
+ _L("Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"),
from_u8(app_config->get_last_dir()), "",
file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST);
@@ -604,16 +1272,101 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files) const
dialog.GetPaths(input_files);
}
+void GUI_App::load_gcode(wxWindow* parent, wxString& input_file) const
+{
+ input_file.Clear();
+ wxFileDialog dialog(parent ? parent : GetTopWindow(),
+ _L("Choose one file (GCODE/.GCO/.G/.ngc/NGC):"),
+ app_config->get_last_dir(), "",
+ file_wildcards(FT_GCODE), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+
+ if (dialog.ShowModal() == wxID_OK)
+ input_file = dialog.GetPath();
+}
+
bool GUI_App::switch_language()
{
if (select_language()) {
- recreate_GUI();
+ recreate_GUI(_L("Changing of an application language") + dots);
return true;
} else {
return false;
}
}
+#ifdef __linux__
+static const wxLanguageInfo* linux_get_existing_locale_language(const wxLanguageInfo* language,
+ const wxLanguageInfo* system_language)
+{
+ constexpr size_t max_len = 50;
+ char path[max_len] = "";
+ std::vector<std::string> locales;
+ const std::string lang_prefix = into_u8(language->CanonicalName.BeforeFirst('_'));
+
+ // Call locale -a so we can parse the output to get the list of available locales
+ // We expect lines such as "en_US.utf8". Pick ones starting with the language code
+ // we are switching to. Lines with different formatting will be removed later.
+ FILE* fp = popen("locale -a", "r");
+ if (fp != NULL) {
+ while (fgets(path, max_len, fp) != NULL) {
+ std::string line(path);
+ line = line.substr(0, line.find('\n'));
+ if (boost::starts_with(line, lang_prefix))
+ locales.push_back(line);
+ }
+ pclose(fp);
+ }
+
+ // locales now contain all candidates for this language.
+ // Sort them so ones containing anything about UTF-8 are at the end.
+ std::sort(locales.begin(), locales.end(), [](const std::string& a, const std::string& b)
+ {
+ auto has_utf8 = [](const std::string & s) {
+ auto S = boost::to_upper_copy(s);
+ return S.find("UTF8") != std::string::npos || S.find("UTF-8") != std::string::npos;
+ };
+ return ! has_utf8(a) && has_utf8(b);
+ });
+
+ // Remove the suffix behind a dot, if there is one.
+ for (std::string& s : locales)
+ s = s.substr(0, s.find("."));
+
+ // We just hope that dear Linux "locale -a" returns country codes
+ // in ISO 3166-1 alpha-2 code (two letter) format.
+ // https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+ // To be sure, remove anything not looking as expected
+ // (any number of lowercase letters, underscore, two uppercase letters).
+ locales.erase(std::remove_if(locales.begin(),
+ locales.end(),
+ [](const std::string& s) {
+ return ! std::regex_match(s,
+ std::regex("^[a-z]+_[A-Z]{2}$"));
+ }),
+ locales.end());
+
+ // Is there a candidate matching a country code of a system language? Move it to the end,
+ // while maintaining the order of matches, so that the best match ends up at the very end.
+ std::string system_country = "_" + into_u8(system_language->CanonicalName.AfterFirst('_')).substr(0, 2);
+ int cnt = locales.size();
+ for (int i=0; i<cnt; ++i)
+ if (locales[i].find(system_country) != std::string::npos) {
+ locales.emplace_back(std::move(locales[i]));
+ locales[i].clear();
+ }
+
+ // Now try them one by one.
+ for (auto it = locales.rbegin(); it != locales.rend(); ++ it)
+ if (! it->empty()) {
+ const std::string &locale = *it;
+ const wxLanguageInfo* lang = wxLocale::FindLanguageInfo(from_u8(locale));
+ if (wxLocale::IsAvailable(lang->Language))
+ return lang;
+ }
+ return language;
+}
+#endif
+
// select language from the list of installed languages
bool GUI_App::select_language()
{
@@ -657,19 +1410,20 @@ bool GUI_App::select_language()
// This is the language to highlight in the choice dialog initially.
init_selection_default = init_selection;
- const long index = wxGetSingleChoiceIndex(_(L("Select the language")), _(L("Language")), names, init_selection_default);
+ const long index = wxGetSingleChoiceIndex(_L("Select the language"), _L("Language"), names, init_selection_default);
// Try to load a new language.
if (index != -1 && (init_selection == -1 || init_selection != index)) {
const wxLanguageInfo *new_language_info = language_infos[index];
- if (new_language_info == m_language_info_best || new_language_info == m_language_info_system) {
- // The newly selected profile matches user's default profile exactly. That's great.
- } else if (m_language_info_best != nullptr && new_language_info->CanonicalName.BeforeFirst('_') == m_language_info_best->CanonicalName.BeforeFirst('_'))
- new_language_info = m_language_info_best;
- else if (m_language_info_system != nullptr && new_language_info->CanonicalName.BeforeFirst('_') == m_language_info_system->CanonicalName.BeforeFirst('_'))
- new_language_info = m_language_info_system;
if (this->load_language(new_language_info->CanonicalName, false)) {
// Save language at application config.
- app_config->set("translation_language", m_wxLocale->GetCanonicalName().ToUTF8().data());
+ // Which language to save as the selected dictionary language?
+ // 1) Hopefully the language set to wxTranslations by this->load_language(), but that API is weird and we don't want to rely on its
+ // stability in the future:
+ // wxTranslations::Get()->GetBestTranslation(SLIC3R_APP_KEY, wxLANGUAGE_ENGLISH);
+ // 2) Current locale language may not match the dictionary name, see GH issue #3901
+ // m_wxLocale->GetCanonicalName()
+ // 3) new_language_info->CanonicalName is a safe bet. It points to a valid dictionary name.
+ app_config->set("translation_language", new_language_info->CanonicalName.ToUTF8().data());
app_config->save();
return true;
}
@@ -698,7 +1452,6 @@ bool GUI_App::load_language(wxString language, bool initial)
BOOST_LOG_TRIVIAL(trace) << boost::format("System language detected (user locales and such): %1%") % m_language_info_system->CanonicalName.ToUTF8().data();
}
}
-#if defined(__WXMSW__) || defined(__WXOSX__)
{
// Allocating a temporary locale will switch the default wxTranslations to its internal wxTranslations instance.
wxLocale temp_locale;
@@ -714,8 +1467,15 @@ bool GUI_App::load_language(wxString language, bool initial)
m_language_info_best = wxLocale::FindLanguageInfo(best_language);
BOOST_LOG_TRIVIAL(trace) << boost::format("Best translation language detected (may be different from user locales): %1%") % m_language_info_best->CanonicalName.ToUTF8().data();
}
+ #ifdef __linux__
+ wxString lc_all;
+ if (wxGetEnv("LC_ALL", &lc_all) && ! lc_all.IsEmpty()) {
+ // Best language returned by wxWidgets on Linux apparently does not respect LC_ALL.
+ // Disregard the "best" suggestion in case LC_ALL is provided.
+ m_language_info_best = nullptr;
+ }
+ #endif
}
-#endif
}
const wxLanguageInfo *language_info = language.empty() ? nullptr : wxLocale::FindLanguageInfo(language);
@@ -731,6 +1491,7 @@ bool GUI_App::load_language(wxString language, bool initial)
}
if (language_info == nullptr) {
+ // PrusaSlicer does not support the Right to Left languages yet.
if (m_language_info_system != nullptr && m_language_info_system->LayoutDirection != wxLayout_RightToLeft)
language_info = m_language_info_system;
if (m_language_info_best != nullptr && m_language_info_best->LayoutDirection != wxLayout_RightToLeft)
@@ -749,6 +1510,27 @@ bool GUI_App::load_language(wxString language, bool initial)
BOOST_LOG_TRIVIAL(trace) << "Using Czech dictionaries for Slovak language";
}
+ // Select language for locales. This language may be different from the language of the dictionary.
+ if (language_info == m_language_info_best || language_info == m_language_info_system) {
+ // The current language matches user's default profile exactly. That's great.
+ } else if (m_language_info_best != nullptr && language_info->CanonicalName.BeforeFirst('_') == m_language_info_best->CanonicalName.BeforeFirst('_')) {
+ // Use whatever the operating system recommends, if it the language code of the dictionary matches the recommended language.
+ // This allows a Swiss guy to use a German dictionary without forcing him to German locales.
+ language_info = m_language_info_best;
+ } else if (m_language_info_system != nullptr && language_info->CanonicalName.BeforeFirst('_') == m_language_info_system->CanonicalName.BeforeFirst('_'))
+ language_info = m_language_info_system;
+
+#ifdef __linux__
+ // If we can't find this locale , try to use different one for the language
+ // instead of just reporting that it is impossible to switch.
+ if (! wxLocale::IsAvailable(language_info->Language)) {
+ std::string original_lang = into_u8(language_info->CanonicalName);
+ language_info = linux_get_existing_locale_language(language_info, m_language_info_system);
+ BOOST_LOG_TRIVIAL(trace) << boost::format("Can't switch language to %1% (missing locales). Using %2% instead.")
+ % original_lang % language_info->CanonicalName.ToUTF8().data();
+ }
+#endif
+
if (! wxLocale::IsAvailable(language_info->Language)) {
// Loading the language dictionary failed.
wxString message = "Switching PrusaSlicer to language " + language_info->CanonicalName + " failed.";
@@ -775,9 +1557,9 @@ bool GUI_App::load_language(wxString language, bool initial)
wxTranslations::Get()->SetLanguage(language_dict);
m_wxLocale->AddCatalog(SLIC3R_APP_KEY);
m_imgui->set_language(into_u8(language_info->CanonicalName));
- //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
+ //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
wxSetlocale(LC_NUMERIC, "C");
- Preset::update_suffix_modified();
+ Preset::update_suffix_modified((" (" + _L("modified") + ")").ToUTF8().data());
return true;
}
@@ -817,6 +1599,7 @@ void GUI_App::update_mode()
tab->update_mode();
plater()->update_object_menu();
+ plater()->canvas3D()->update_gizmos_on_off_state();
}
void GUI_App::add_config_menu(wxMenuBar *menu)
@@ -827,34 +1610,42 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
const auto config_wizard_name = _(ConfigWizard::name(true));
const auto config_wizard_tooltip = from_u8((boost::format(_utf8(L("Run %s"))) % config_wizard_name).str());
// Cmd+, is standard on OS X - what about other operating systems?
- local_menu->Append(config_id_base + ConfigMenuWizard, config_wizard_name + dots, config_wizard_tooltip);
- local_menu->Append(config_id_base + ConfigMenuSnapshots, _(L("&Configuration Snapshots")) + dots, _(L("Inspect / activate configuration snapshots")));
- local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _(L("Take Configuration &Snapshot")), _(L("Capture a configuration snapshot")));
- local_menu->Append(config_id_base + ConfigMenuUpdate, _(L("Check for updates")), _(L("Check for configuration updates")));
- local_menu->AppendSeparator();
- local_menu->Append(config_id_base + ConfigMenuPreferences, _(L("&Preferences")) + dots +
+ if (is_editor()) {
+ local_menu->Append(config_id_base + ConfigMenuWizard, config_wizard_name + dots, config_wizard_tooltip);
+ local_menu->Append(config_id_base + ConfigMenuSnapshots, _L("&Configuration Snapshots") + dots, _L("Inspect / activate configuration snapshots"));
+ local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _L("Take Configuration &Snapshot"), _L("Capture a configuration snapshot"));
+ local_menu->Append(config_id_base + ConfigMenuUpdate, _L("Check for updates"), _L("Check for configuration updates"));
+ local_menu->AppendSeparator();
+ }
+ local_menu->Append(config_id_base + ConfigMenuPreferences, _L("&Preferences") + dots +
#ifdef __APPLE__
"\tCtrl+,",
#else
"\tCtrl+P",
#endif
- _(L("Application preferences")));
- local_menu->AppendSeparator();
- auto mode_menu = new wxMenu();
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _(L("Simple")), _(L("Simple View Mode")));
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _(L("Advanced")), _(L("Advanced View Mode")));
- mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _(L("Expert")), _(L("Expert View Mode")));
- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comSimple) evt.Check(true); }, config_id_base + ConfigMenuModeSimple);
- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comAdvanced) evt.Check(true); }, config_id_base + ConfigMenuModeAdvanced);
- Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if(get_mode() == comExpert) evt.Check(true); }, config_id_base + ConfigMenuModeExpert);
-
- local_menu->AppendSubMenu(mode_menu, _(L("Mode")), wxString::Format(_(L("%s View Mode")), SLIC3R_APP_NAME));
- local_menu->AppendSeparator();
- local_menu->Append(config_id_base + ConfigMenuLanguage, _(L("&Language")));
+ _L("Application preferences"));
+ wxMenu* mode_menu = nullptr;
+ if (is_editor()) {
+ local_menu->AppendSeparator();
+ mode_menu = new wxMenu();
+ mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeSimple, _L("Simple"), _L("Simple View Mode"));
+// mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _L("Advanced"), _L("Advanced View Mode"));
+ mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeAdvanced, _CTX(L_CONTEXT("Advanced", "Mode"), "Mode"), _L("Advanced View Mode"));
+ mode_menu->AppendRadioItem(config_id_base + ConfigMenuModeExpert, _L("Expert"), _L("Expert View Mode"));
+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if (get_mode() == comSimple) evt.Check(true); }, config_id_base + ConfigMenuModeSimple);
+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if (get_mode() == comAdvanced) evt.Check(true); }, config_id_base + ConfigMenuModeAdvanced);
+ Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { if (get_mode() == comExpert) evt.Check(true); }, config_id_base + ConfigMenuModeExpert);
+
+ local_menu->AppendSubMenu(mode_menu, _L("Mode"), wxString::Format(_L("%s View Mode"), SLIC3R_APP_NAME));
+ }
local_menu->AppendSeparator();
- local_menu->Append(config_id_base + ConfigMenuFlashFirmware, _(L("Flash printer &firmware")), _(L("Upload a firmware image into an Arduino based printer")));
- // TODO: for when we're able to flash dictionaries
- // local_menu->Append(config_id_base + FirmwareMenuDict, _(L("Flash language file")), _(L("Upload a language dictionary file into a Prusa printer")));
+ local_menu->Append(config_id_base + ConfigMenuLanguage, _L("&Language"));
+ if (is_editor()) {
+ local_menu->AppendSeparator();
+ local_menu->Append(config_id_base + ConfigMenuFlashFirmware, _L("Flash printer &firmware"), _L("Upload a firmware image into an Arduino based printer"));
+ // TODO: for when we're able to flash dictionaries
+ // local_menu->Append(config_id_base + FirmwareMenuDict, _L("Flash language file"), _L("Upload a language dictionary file into a Prusa printer"));
+ }
local_menu->Bind(wxEVT_MENU, [this, config_id_base](wxEvent &event) {
switch (event.GetId() - config_id_base) {
@@ -867,7 +1658,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
case ConfigMenuTakeSnapshot:
// Take a configuration snapshot.
if (check_unsaved_changes()) {
- wxTextEntryDialog dlg(nullptr, _(L("Taking configuration snapshot")), _(L("Snapshot name")));
+ wxTextEntryDialog dlg(nullptr, _L("Taking configuration snapshot"), _L("Snapshot name"));
// set current normal font for dialog children,
// because of just dlg.SetFont(normal_font()) has no result;
@@ -888,20 +1679,52 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
ConfigSnapshotDialog dlg(Slic3r::GUI::Config::SnapshotDB::singleton(), on_snapshot);
dlg.ShowModal();
if (!dlg.snapshot_to_activate().empty()) {
- if (!Config::SnapshotDB::singleton().is_on_snapshot(*app_config))
+ if (! Config::SnapshotDB::singleton().is_on_snapshot(*app_config))
Config::SnapshotDB::singleton().take_snapshot(*app_config, Config::Snapshot::SNAPSHOT_BEFORE_ROLLBACK);
- app_config->set("on_snapshot",
- Config::SnapshotDB::singleton().restore_snapshot(dlg.snapshot_to_activate(), *app_config).id);
- preset_bundle->load_presets(*app_config);
- // Load the currently selected preset into the GUI, update the preset selection box.
- load_current_presets();
+ try {
+ app_config->set("on_snapshot", Config::SnapshotDB::singleton().restore_snapshot(dlg.snapshot_to_activate(), *app_config).id);
+ preset_bundle->load_presets(*app_config);
+ // Load the currently selected preset into the GUI, update the preset selection box.
+ load_current_presets();
+ } catch (std::exception &ex) {
+ GUI::show_error(nullptr, _L("Failed to activate configuration snapshot.") + "\n" + into_u8(ex.what()));
+ }
}
}
break;
case ConfigMenuPreferences:
{
- PreferencesDialog dlg(mainframe);
- dlg.ShowModal();
+ bool app_layout_changed = false;
+ {
+ // the dialog needs to be destroyed before the call to recreate_GUI()
+ // or sometimes the application crashes into wxDialogBase() destructor
+ // so we put it into an inner scope
+ PreferencesDialog dlg(mainframe);
+ dlg.ShowModal();
+ app_layout_changed = dlg.settings_layout_changed();
+ if (dlg.seq_top_layer_only_changed())
+ this->plater_->refresh_print();
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+#ifdef _WIN32
+ if (is_editor()) {
+ if (app_config->get("associate_3mf") == "1")
+ associate_3mf_files();
+ if (app_config->get("associate_stl") == "1")
+ associate_stl_files();
+ }
+ else {
+ if (app_config->get("associate_gcode") == "1")
+ associate_gcode_files();
+ }
+#endif // _WIN32
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+ }
+ if (app_layout_changed) {
+ // hide full main_sizer for mainFrame
+ mainframe->GetSizer()->Show(false);
+ mainframe->update_layout();
+ mainframe->select_tab(size_t(0));
+ }
break;
}
case ConfigMenuLanguage:
@@ -913,11 +1736,13 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
// the dialog needs to be destroyed before the call to switch_language()
// or sometimes the application crashes into wxDialogBase() destructor
// so we put it into an inner scope
+ wxString title = is_editor() ? wxString(SLIC3R_APP_NAME) : wxString(GCODEVIEWER_APP_NAME);
+ title += " - " + _L("Language selection");
wxMessageDialog dialog(nullptr,
- _(L("Switching the language will trigger application restart.\n"
- "You will lose content of the plater.")) + "\n\n" +
- _(L("Do you want to proceed?")),
- wxString(SLIC3R_APP_NAME) + " - " + _(L("Language selection")),
+ _L("Switching the language will trigger application restart.\n"
+ "You will lose content of the plater.") + "\n\n" +
+ _L("Do you want to proceed?"),
+ title,
wxICON_QUESTION | wxOK | wxCANCEL);
if (dialog.ShowModal() == wxID_CANCEL)
return;
@@ -935,42 +1760,77 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
});
using std::placeholders::_1;
-
- auto modfn = [this](int mode, wxCommandEvent&) { if(get_mode() != mode) save_mode(mode); };
- mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comSimple, _1), config_id_base + ConfigMenuModeSimple);
- mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comAdvanced, _1), config_id_base + ConfigMenuModeAdvanced);
- mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comExpert, _1), config_id_base + ConfigMenuModeExpert);
- menu->Append(local_menu, _(L("&Configuration")));
+ if (mode_menu != nullptr) {
+ auto modfn = [this](int mode, wxCommandEvent&) { if (get_mode() != mode) save_mode(mode); };
+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comSimple, _1), config_id_base + ConfigMenuModeSimple);
+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comAdvanced, _1), config_id_base + ConfigMenuModeAdvanced);
+ mode_menu->Bind(wxEVT_MENU, std::bind(modfn, comExpert, _1), config_id_base + ConfigMenuModeExpert);
+ }
+
+ menu->Append(local_menu, _L("&Configuration"));
}
// This is called when closing the application, when loading a config file or when starting the config wizard
// to notify the user whether he is aware that some preset changes will be lost.
bool GUI_App::check_unsaved_changes(const wxString &header)
{
- wxString dirty;
PrinterTechnology printer_technology = preset_bundle->printers.get_edited_preset().printer_technology();
- for (Tab *tab : tabs_list)
+
+ bool has_unsaved_changes = false;
+ for (Tab* tab : tabs_list)
if (tab->supports_printer_technology(printer_technology) && tab->current_preset_is_dirty()) {
- if (dirty.empty())
- dirty = tab->title();
- else
- dirty += wxString(", ") + tab->title();
+ has_unsaved_changes = true;
+ break;
}
- if (dirty.empty())
- // No changes, the application may close or reload presets.
+ if (has_unsaved_changes)
+ {
+ UnsavedChangesDialog dlg(header);
+ if (wxGetApp().app_config->get("default_action_on_close_application") == "none" && dlg.ShowModal() == wxID_CANCEL)
+ return false;
+
+ if (dlg.save_preset()) // save selected changes
+ {
+ for (const std::pair<std::string, Preset::Type>& nt : dlg.get_names_and_types())
+ preset_bundle->save_changes_for_preset(nt.first, nt.second, dlg.get_unselected_options(nt.second));
+
+ // if we saved changes to the new presets, we should to
+ // synchronize config.ini with the current selections.
+ preset_bundle->export_selections(*app_config);
+
+ wxMessageBox(_L("The preset(s) modifications are successfully saved"));
+ }
+ }
+
+ return true;
+}
+
+bool GUI_App::check_print_host_queue()
+{
+ wxString dirty;
+ std::vector<std::pair<std::string, std::string>> jobs;
+ // Get ongoing jobs from dialog
+ mainframe->m_printhost_queue_dlg->get_active_jobs(jobs);
+ if (jobs.empty())
return true;
- // Ask the user.
+ // Show dialog
+ wxString job_string = wxString();
+ for (const auto& job : jobs) {
+ job_string += format_wxstr(" %1% : %2% \n", job.first, job.second);
+ }
wxString message;
- if (! header.empty())
- message = header + "\n\n";
- message += _(L("The presets on the following tabs were modified")) + ": " + dirty + "\n\n" + _(L("Discard changes and continue anyway?"));
+ message += _(L("The uploads are still ongoing")) + ":\n\n" + job_string +"\n" + _(L("Stop them and continue anyway?"));
wxMessageDialog dialog(mainframe,
message,
- wxString(SLIC3R_APP_NAME) + " - " + _(L("Unsaved Presets")),
+ wxString(SLIC3R_APP_NAME) + " - " + _(L("Ongoing uploads")),
wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
- return dialog.ShowModal() == wxID_YES;
+ if (dialog.ShowModal() == wxID_YES)
+ return true;
+
+ // TODO: If already shown, bring forward
+ mainframe->m_printhost_queue_dlg->Show();
+ return false;
}
bool GUI_App::checked_tab(Tab* tab)
@@ -982,8 +1842,13 @@ bool GUI_App::checked_tab(Tab* tab)
}
// Update UI / Tabs to reflect changes in the currently loaded presets
-void GUI_App::load_current_presets()
+void GUI_App::load_current_presets(bool check_printer_presets_ /*= true*/)
{
+ // check printer_presets for the containing information about "Print Host upload"
+ // and create physical printer from it, if any exists
+ if (check_printer_presets_)
+ check_printer_presets();
+
PrinterTechnology printer_technology = preset_bundle->printers.get_edited_preset().printer_technology();
this->plater()->set_printer_technology(printer_technology);
for (Tab *tab : tabs_list)
@@ -1004,13 +1869,64 @@ bool GUI_App::OnExceptionInMainLoop()
}
#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)
+{
+ size_t num_gcodes = 0;
+ for (const wxString &filename : fileNames)
+ if (is_gcode_file(into_u8(filename)))
+ ++ num_gcodes;
+ if (fileNames.size() == num_gcodes) {
+ // Opening PrusaSlicer by drag & dropping a G-Code onto PrusaSlicer icon in Finder,
+ // just G-codes were passed. Switch to G-code viewer mode.
+ m_app_mode = EAppMode::GCodeViewer;
+ unlock_lockfile(get_instance_hash_string() + ".lock", data_dir() + "/cache/");
+ if(app_config != nullptr)
+ delete app_config;
+ app_config = nullptr;
+ init_app_config();
+ }
+ wxApp::OSXStoreOpenFiles(fileNames);
+}
// wxWidgets override to get an event on open files.
void GUI_App::MacOpenFiles(const wxArrayString &fileNames)
{
std::vector<std::string> files;
- for (size_t i = 0; i < fileNames.GetCount(); ++ i)
- files.emplace_back(fileNames[i].ToUTF8().data());
- this->plater()->load_files(files, true, true);
+ std::vector<wxString> gcode_files;
+ std::vector<wxString> non_gcode_files;
+ for (const auto& filename : fileNames) {
+ if (is_gcode_file(into_u8(filename)))
+ gcode_files.emplace_back(filename);
+ else {
+ files.emplace_back(into_u8(filename));
+ non_gcode_files.emplace_back(filename);
+ }
+ }
+ if (m_app_mode == EAppMode::GCodeViewer) {
+ // Running in G-code viewer.
+ // Load the first G-code into the G-code viewer.
+ // Or if no G-codes, send other files to slicer.
+ if (! gcode_files.empty())
+ this->plater()->load_gcode(gcode_files.front());
+ if (!non_gcode_files.empty())
+ start_new_slicer(non_gcode_files, true);
+ } else {
+ if (! files.empty()) {
+#if ENABLE_DRAG_AND_DROP_FIX
+ wxArrayString input_files;
+ for (size_t i = 0; i < non_gcode_files.size(); ++i) {
+ input_files.push_back(non_gcode_files[i]);
+ }
+ this->plater()->load_files(input_files);
+#else
+ this->plater()->load_files(files, true, true);
+#endif
+ }
+ for (const wxString &filename : gcode_files)
+ start_new_gcodeviewer(&filename);
+ }
}
#endif /* __APPLE */
@@ -1086,6 +2002,7 @@ wxString GUI_App::current_language_code_safe() const
{ "pl", "pl_PL", },
{ "uk", "uk_UA", },
{ "zh", "zh_CN", },
+ { "ru", "ru_RU", },
};
wxString language_code = this->current_language_code().BeforeFirst('_');
auto it = mapping.find(language_code);
@@ -1117,9 +2034,9 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
if (preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA
&& Slic3r::model_has_multi_part_objects(wxGetApp().model())) {
GUI::show_info(nullptr,
- _(L("It's impossible to print multi-part object(s) with SLA technology.")) + "\n\n" +
- _(L("Please check and fix your object list.")),
- _(L("Attention!")));
+ _L("It's impossible to print multi-part object(s) with SLA technology.") + "\n\n" +
+ _L("Please check and fix your object list."),
+ _L("Attention!"));
}
}
@@ -1136,7 +2053,7 @@ void GUI_App::gcode_thumbnails_debug()
unsigned int width = 0;
unsigned int height = 0;
- wxFileDialog dialog(GetTopWindow(), _(L("Select a gcode file:")), "", "", "G-code files (*.gcode)|*.gcode;*.GCODE;", wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+ wxFileDialog dialog(GetTopWindow(), _L("Select a gcode file:"), "", "", "G-code files (*.gcode)|*.gcode;*.GCODE;", wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if (dialog.ShowModal() != wxID_OK)
return;
@@ -1218,7 +2135,9 @@ void GUI_App::window_pos_restore(wxTopLevelWindow* window, const std::string &na
return;
}
- window->SetSize(metrics->get_rect());
+ const wxRect& rect = metrics->get_rect();
+ window->SetPosition(rect.GetPosition());
+ window->SetSize(rect.GetSize());
window->Maximize(metrics->get_maximized());
}
@@ -1242,7 +2161,7 @@ void GUI_App::window_pos_sanitize(wxTopLevelWindow* window)
bool GUI_App::config_wizard_startup()
{
- if (!app_conf_exists || preset_bundle->printers.size() <= 1) {
+ if (!m_app_conf_exists || preset_bundle->printers.size() <= 1) {
run_wizard(ConfigWizard::RR_DATA_EMPTY);
return true;
} else if (get_app_config()->legacy_datadir()) {
@@ -1259,19 +2178,17 @@ bool GUI_App::config_wizard_startup()
}
void GUI_App::check_updates(const bool verbose)
-{
-
+{
PresetUpdater::UpdateResult updater_result;
try {
- updater_result = preset_updater->config_update(app_config->orig_version());
+ updater_result = preset_updater->config_update(app_config->orig_version(), verbose);
if (updater_result == PresetUpdater::R_INCOMPAT_EXIT) {
mainframe->Close();
}
else if (updater_result == PresetUpdater::R_INCOMPAT_CONFIGURED) {
- app_conf_exists = true;
+ m_app_conf_exists = true;
}
- else if(verbose && updater_result == PresetUpdater::R_NOOP)
- {
+ else if (verbose && updater_result == PresetUpdater::R_NOOP) {
MsgNoUpdates dlg;
dlg.ShowModal();
}
@@ -1279,9 +2196,8 @@ void GUI_App::check_updates(const bool verbose)
catch (const std::exception & ex) {
show_error(nullptr, ex.what());
}
-
-
}
+
// static method accepting a wxWindow object as first parameter
// void warning_catcher{
// my($self, $message_dialog) = @_;
@@ -1309,50 +2225,47 @@ void GUI_App::check_updates(const bool verbose)
#ifdef __WXMSW__
-void GUI_App::associate_3mf_files()
+static bool set_into_win_registry(HKEY hkeyHive, const wchar_t* pszVar, const wchar_t* pszValue)
{
// see as reference: https://stackoverflow.com/questions/20245262/c-program-needs-an-file-association
+ wchar_t szValueCurrent[1000];
+ DWORD dwType;
+ DWORD dwSize = sizeof(szValueCurrent);
- auto reg_set = [](HKEY hkeyHive, const wchar_t* pszVar, const wchar_t* pszValue)->bool
- {
- wchar_t szValueCurrent[1000];
- DWORD dwType;
- DWORD dwSize = sizeof(szValueCurrent);
+ int iRC = ::RegGetValueW(hkeyHive, pszVar, nullptr, RRF_RT_ANY, &dwType, szValueCurrent, &dwSize);
- int iRC = ::RegGetValueW(hkeyHive, pszVar, nullptr, RRF_RT_ANY, &dwType, szValueCurrent, &dwSize);
+ bool bDidntExist = iRC == ERROR_FILE_NOT_FOUND;
- bool bDidntExist = iRC == ERROR_FILE_NOT_FOUND;
+ if ((iRC != ERROR_SUCCESS) && !bDidntExist)
+ // an error occurred
+ return false;
- if ((iRC != ERROR_SUCCESS) && !bDidntExist)
- // an error occurred
+ if (!bDidntExist) {
+ if (dwType != REG_SZ)
+ // invalid type
return false;
- if (!bDidntExist)
- {
- if (dwType != REG_SZ)
- // invalid type
- return false;
-
- if (::wcscmp(szValueCurrent, pszValue) == 0)
- // value already set
- return false;
- }
+ if (::wcscmp(szValueCurrent, pszValue) == 0)
+ // value already set
+ return false;
+ }
- DWORD dwDisposition;
- HKEY hkey;
- iRC = ::RegCreateKeyExW(hkeyHive, pszVar, 0, 0, 0, KEY_ALL_ACCESS, nullptr, &hkey, &dwDisposition);
- bool ret = false;
+ DWORD dwDisposition;
+ HKEY hkey;
+ iRC = ::RegCreateKeyExW(hkeyHive, pszVar, 0, 0, 0, KEY_ALL_ACCESS, nullptr, &hkey, &dwDisposition);
+ bool ret = false;
+ if (iRC == ERROR_SUCCESS) {
+ iRC = ::RegSetValueExW(hkey, L"", 0, REG_SZ, (BYTE*)pszValue, (::wcslen(pszValue) + 1) * sizeof(wchar_t));
if (iRC == ERROR_SUCCESS)
- {
- iRC = ::RegSetValueExW(hkey, L"", 0, REG_SZ, (BYTE*)pszValue, (::wcslen(pszValue) + 1) * sizeof(wchar_t));
- if (iRC == ERROR_SUCCESS)
- ret = true;
- }
+ ret = true;
+ }
- RegCloseKey(hkey);
- return ret;
- };
+ RegCloseKey(hkey);
+ return ret;
+}
+void GUI_App::associate_3mf_files()
+{
wchar_t app_path[MAX_PATH];
::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
@@ -1366,9 +2279,59 @@ void GUI_App::associate_3mf_files()
std::wstring reg_prog_id_command = reg_prog_id + L"\\Shell\\Open\\Command";
bool is_new = false;
- is_new |= reg_set(HKEY_CURRENT_USER, reg_extension.c_str(), prog_id.c_str());
- is_new |= reg_set(HKEY_CURRENT_USER, reg_prog_id.c_str(), prog_desc.c_str());
- is_new |= reg_set(HKEY_CURRENT_USER, reg_prog_id_command.c_str(), prog_command.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_extension.c_str(), prog_id.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id.c_str(), prog_desc.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id_command.c_str(), prog_command.c_str());
+
+ if (is_new)
+ // notify Windows only when any of the values gets changed
+ ::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+}
+
+#if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+void GUI_App::associate_stl_files()
+{
+ wchar_t app_path[MAX_PATH];
+ ::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
+
+ std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
+ std::wstring prog_id = L"Prusa.Slicer.1";
+ std::wstring prog_desc = L"PrusaSlicer";
+ std::wstring prog_command = prog_path + L" \"%1\"";
+ std::wstring reg_base = L"Software\\Classes";
+ std::wstring reg_extension = reg_base + L"\\.stl";
+ std::wstring reg_prog_id = reg_base + L"\\" + prog_id;
+ std::wstring reg_prog_id_command = reg_prog_id + L"\\Shell\\Open\\Command";
+
+ bool is_new = false;
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_extension.c_str(), prog_id.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id.c_str(), prog_desc.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id_command.c_str(), prog_command.c_str());
+
+ if (is_new)
+ // notify Windows only when any of the values gets changed
+ ::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+}
+#endif // ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN
+
+void GUI_App::associate_gcode_files()
+{
+ wchar_t app_path[MAX_PATH];
+ ::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
+
+ std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
+ std::wstring prog_id = L"PrusaSlicer.GCodeViewer.1";
+ std::wstring prog_desc = L"PrusaSlicerGCodeViewer";
+ std::wstring prog_command = prog_path + L" \"%1\"";
+ std::wstring reg_base = L"Software\\Classes";
+ std::wstring reg_extension = reg_base + L"\\.gcode";
+ std::wstring reg_prog_id = reg_base + L"\\" + prog_id;
+ std::wstring reg_prog_id_command = reg_prog_id + L"\\Shell\\Open\\Command";
+
+ bool is_new = false;
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_extension.c_str(), prog_id.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id.c_str(), prog_desc.c_str());
+ is_new |= set_into_win_registry(HKEY_CURRENT_USER, reg_prog_id_command.c_str(), prog_command.c_str());
if (is_new)
// notify Windows only when any of the values gets changed