diff --git a/DockerRun.sh b/DockerRun.sh index da49bd3e61..c06628e6be 100755 --- a/DockerRun.sh +++ b/DockerRun.sh @@ -20,6 +20,8 @@ docker run \ --privileged=true \ `# Attach tty for running orca slicer with command line things` \ -ti \ + `# Clean up after yourself` \ + --rm \ `# Pass all parameters from this script to the orca slicer ENTRYPOINT binary` \ orcaslicer $* diff --git a/Dockerfile b/Dockerfile index befcc33de4..868779b0af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,6 +37,7 @@ RUN apt-get update && apt-get install -y \ libsoup2.4-dev \ libssl3 \ libssl-dev \ + libtool \ libudev-dev \ libwayland-dev \ libwebkit2gtk-4.0-dev \ @@ -67,9 +68,8 @@ WORKDIR OrcaSlicer RUN ./BuildLinux.sh -u # Build dependencies in ./deps -RUN ./BuildLinux.sh -d; exit 0 +RUN ./BuildLinux.sh -d -RUN apt-get install -y libcgal-dev # Build slic3r RUN ./BuildLinux.sh -s diff --git a/deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch b/deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch deleted file mode 100644 index e96c1f4d52..0000000000 --- a/deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch +++ /dev/null @@ -1,683 +0,0 @@ -From f4fef135f0a58ca2916c45cd539923ab096935b6 Mon Sep 17 00:00:00 2001 -From: Ocraftyone -Date: Thu, 30 Nov 2023 03:25:54 -0500 -Subject: [PATCH] patch v3.2.1 for OrcaSlicer - ---- - build/cmake/lib/webview/CMakeLists.txt | 4 +- - include/wx/fontutil.h | 15 +++++++- - include/wx/gdicmn.h | 3 ++ - include/wx/generic/grid.h | 4 +- - include/wx/msw/font.h | 2 +- - include/wx/msw/tooltip.h | 4 +- - include/wx/osx/app.h | 2 +- - src/common/combocmn.cpp | 11 +++++- - src/common/datavcmn.cpp | 6 ++- - src/common/dcbufcmn.cpp | 6 +++ - src/common/gdicmn.cpp | 14 +++++++ - src/common/image.cpp | 6 +-- - src/generic/grid.cpp | 50 ++++++++++++++++++++----- - src/msw/bmpcbox.cpp | 9 ++++- - src/msw/font.cpp | 14 +++---- - src/msw/menuitem.cpp | 2 + - src/msw/window.cpp | 52 +++++++++++++++++--------- - src/osx/cocoa/dataview.mm | 26 +++++++++++-- - src/osx/cocoa/settings.mm | 6 +-- - src/osx/cocoa/window.mm | 4 ++ - 20 files changed, 184 insertions(+), 56 deletions(-) - -diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt -index 085381d785..62146abc04 100644 ---- a/build/cmake/lib/webview/CMakeLists.txt -+++ b/build/cmake/lib/webview/CMakeLists.txt -@@ -46,9 +46,9 @@ if(APPLE) - elseif(WXMSW) - if(wxUSE_WEBVIEW_EDGE) - # Update the following variables if updating WebView2 SDK -- set(WEBVIEW2_VERSION "1.0.705.50") -+ set(WEBVIEW2_VERSION "1.0.1418.22") - set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}") -- set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d") -+ set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99") - - set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}") - -diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h -index 30529db8ce..e6a12366d5 100644 ---- a/include/wx/fontutil.h -+++ b/include/wx/fontutil.h -@@ -294,7 +294,11 @@ public: - wxFontEncoding GetEncoding() const; - - void SetPointSize(int pointsize); -- void SetFractionalPointSize(double pointsize); -+ void SetFractionalPointSize(double pointsize -+#if defined(__WXMSW__) -+ , const wxWindow *window = nullptr -+#endif -+ ); - void SetPixelSize(const wxSize& pixelSize); - void SetStyle(wxFontStyle style); - void SetNumericWeight(int weight); -@@ -307,12 +311,19 @@ public: - - // Helper used in many ports: use the normal font size if the input is - // negative, as we handle -1 as meaning this for compatibility. -- void SetSizeOrDefault(double size) -+ void SetSizeOrDefault(double size -+#if defined(__WXMSW__) -+ , const wxWindow *window = nullptr -+#endif -+ ) - { - SetFractionalPointSize - ( - size < 0 ? wxNORMAL_FONT->GetFractionalPointSize() - : size -+#if defined(__WXMSW__) -+ ,window -+#endif - ); - } - -diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h -index 2f5f8ee99f..39e9317d40 100644 ---- a/include/wx/gdicmn.h -+++ b/include/wx/gdicmn.h -@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion; - class WXDLLIMPEXP_FWD_BASE wxString; - class WXDLLIMPEXP_FWD_CORE wxIconBundle; - class WXDLLIMPEXP_FWD_CORE wxPoint; -+class WXDLLIMPEXP_FWD_CORE wxWindow; - - // --------------------------------------------------------------------------- - // constants -@@ -1106,7 +1107,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth(); - - // get the display size - extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height); -+extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(); -+extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window); - extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM(); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI(); -diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h -index 1bd58bbf04..903cb81319 100644 ---- a/include/wx/generic/grid.h -+++ b/include/wx/generic/grid.h -@@ -3029,9 +3029,11 @@ private: - // Update the width/height of the column/row being drag-resized. - // Should be only called when m_dragRowOrCol != -1, i.e. dragging is - // actually in progress. -+ //BBS: add cursor mode for DoGridDragResize's paremeters - void DoGridDragResize(const wxPoint& position, - const wxGridOperations& oper, -- wxGridWindow* gridWindow); -+ wxGridWindow* gridWindow, -+ CursorMode mode); - - // process different clicks on grid cells - void DoGridCellLeftDown(wxMouseEvent& event, -diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h -index 0f9768b44e..094d774918 100644 ---- a/include/wx/msw/font.h -+++ b/include/wx/msw/font.h -@@ -23,7 +23,7 @@ public: - // ctors and such - wxFont() { } - -- wxFont(const wxFontInfo& info); -+ wxFont(const wxFontInfo& info, const wxWindow *window = nullptr); - - wxFont(int size, - wxFontFamily family, -diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h -index 4c3be08cec..96fb378d01 100644 ---- a/include/wx/msw/tooltip.h -+++ b/include/wx/msw/tooltip.h -@@ -91,10 +91,10 @@ private: - // the one and only one tooltip control we use - never access it directly - // but use GetToolTipCtrl() which will create it when needed - static WXHWND ms_hwndTT; -- -+public: - // create the tooltip ctrl if it doesn't exist yet and return its HWND - static WXHWND GetToolTipCtrl(); -- -+private: - // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop - static void DeleteToolTipCtrl(); - -diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h -index 317a0ca96f..58014ec1d4 100644 ---- a/include/wx/osx/app.h -+++ b/include/wx/osx/app.h -@@ -161,7 +161,7 @@ private: - - public: - bool OSXInitWasCalled() { return m_inited; } -- void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; } -+ virtual void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; } - void OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; } - void OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; } - #endif -diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp -index 80408c6677..aa07caebdc 100644 ---- a/src/common/combocmn.cpp -+++ b/src/common/combocmn.cpp -@@ -2061,6 +2061,9 @@ void wxComboCtrlBase::ShowPopup() - - SetFocus(); - -+ //int displayIdx = wxDisplay::GetFromWindow(this); -+ //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry(); -+ - // Space above and below - int screenHeight; - wxPoint scrPos; -@@ -2183,9 +2186,13 @@ void wxComboCtrlBase::ShowPopup() - - int showFlags = CanDeferShow; - -- if ( spaceBelow < szp.y ) -+ int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN); -+ if (// Pop up as asked for by the library user. -+ (anchorSideVertical & wxUP) || -+ // Automatic: Pop up if it does not fit down. -+ (anchorSideVertical == 0 && spaceBelow < szp.y )) - { -- popupY = scrPos.y - szp.y; -+ popupY = scrPos.y - szp.y + displayRect.GetTop(); - showFlags |= ShowAbove; - } - -diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp -index 0a1e43ad51..6c492aedab 100644 ---- a/src/common/datavcmn.cpp -+++ b/src/common/datavcmn.cpp -@@ -1334,7 +1334,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const - - wxDataViewItemArray selections; - GetSelections(selections); -- return selections[0]; -+ // BBS -+ if (!selections.empty()) -+ return selections[0]; -+ else -+ return wxDataViewItem(0); - } - - namespace -diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp -index 9b1c1f3159..ef5865ed4b 100644 ---- a/src/common/dcbufcmn.cpp -+++ b/src/common/dcbufcmn.cpp -@@ -83,9 +83,15 @@ private: - const double scale = dc ? dc->GetContentScaleFactor() : 1.0; - wxBitmap* const buffer = new wxBitmap; - -+#if __WXMSW__ -+ // we must always return a valid bitmap but creating a bitmap of -+ // size 0 would fail, so create a 1*1 bitmap in this case -+ buffer->Create(wxMax(w, 1), wxMax(h, 1), 24); -+#else - // we must always return a valid bitmap but creating a bitmap of - // size 0 would fail, so create a 1*1 bitmap in this case - buffer->CreateWithDIPSize(wxMax(w, 1), wxMax(h, 1), scale); -+#endif - - return buffer; - } -diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp -index db8a01f961..162c1ce2dc 100644 ---- a/src/common/gdicmn.cpp -+++ b/src/common/gdicmn.cpp -@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height) - *height = size.y; - } - -+void wxDisplaySize(const wxWindow *window, int *width, int *height) -+{ -+ const wxSize size = wxGetDisplaySize(window); -+ if ( width ) -+ *width = size.x; -+ if ( height ) -+ *height = size.y; -+} -+ - wxSize wxGetDisplaySize() - { - return wxDisplay().GetGeometry().GetSize(); - } - -+wxSize wxGetDisplaySize(const wxWindow *window) -+{ -+ return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize(); -+} -+ - void wxClientDisplayRect(int *x, int *y, int *width, int *height) - { - const wxRect rect = wxGetClientDisplayRect(); -diff --git a/src/common/image.cpp b/src/common/image.cpp -index 19fe34ec91..a449b60930 100644 ---- a/src/common/image.cpp -+++ b/src/common/image.cpp -@@ -390,11 +390,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const - unsigned char red = pixel[0] ; - unsigned char green = pixel[1] ; - unsigned char blue = pixel[2] ; -- unsigned char alpha = 255 ; -- if ( source_alpha ) -- alpha = *(source_alpha + y_offset + x * xFactor + x1) ; - if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue ) - { -+ unsigned char alpha = 255 ; -+ if ( source_alpha ) -+ alpha = *(source_alpha + y_offset + x * xFactor + x1) ; - if ( alpha > 0 ) - { - avgRed += red ; -diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp -index ed3d988994..d71cda122d 100644 ---- a/src/generic/grid.cpp -+++ b/src/generic/grid.cpp -@@ -4068,7 +4068,8 @@ void wxGrid::ProcessRowColLabelMouseEvent( const wxGridOperations &oper, wxMouse - { - if ( m_cursorMode == oper.GetCursorModeResize() ) - { -- DoGridDragResize(event.GetPosition(), oper, gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), oper, gridWindow, m_cursorMode); - } - else if ( m_cursorMode == oper.GetCursorModeSelect() && line >=0 ) - { -@@ -4691,12 +4692,14 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event, - - case WXGRID_CURSOR_RESIZE_ROW: - if ( m_dragRowOrCol != -1 ) -- DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW); - break; - - case WXGRID_CURSOR_RESIZE_COL: - if ( m_dragRowOrCol != -1 ) -- DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL); - break; - - default: -@@ -4791,6 +4794,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event, - case wxGridSelectCells: - case wxGridSelectRowsOrColumns: - // nothing to do in these cases -+ //BBS: select this cell when first click -+ m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event); - break; - - case wxGridSelectRows: -@@ -5049,9 +5054,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG - } - } - -+//BBS: add cursor mode for DoGridDragResize's paremeters - void wxGrid::DoGridDragResize(const wxPoint& position, - const wxGridOperations& oper, -- wxGridWindow* gridWindow) -+ wxGridWindow* gridWindow, -+ CursorMode mode) - { - wxCHECK_RET( m_dragRowOrCol != -1, - "shouldn't be called when not drag resizing" ); -@@ -5064,10 +5071,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position, - // orthogonal direction. - const int linePos = oper.Dual().Select(logicalPos); - -- const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol); -- oper.SetLineSize(this, m_dragRowOrCol, -+ //BBS: add logic for resize multiplexed cols -+ if (mode == WXGRID_CURSOR_RESIZE_COL) { -+ int col_to_resize = m_dragRowOrCol; -+ int num_rows, num_cols; -+ this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols); -+ if (num_cols < 1) -+ col_to_resize = m_dragRowOrCol - 1; -+ -+ const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol); -+ const int lineSize = oper.GetLineSize(this, col_to_resize); -+ int size = linePos - lineEnd + lineSize; -+ oper.SetLineSize(this, col_to_resize, -+ wxMax(size, -+ oper.GetMinimalLineSize(this, col_to_resize))); -+ } -+ else { -+ const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol); -+ -+ oper.SetLineSize(this, m_dragRowOrCol, - wxMax(linePos - lineStart, - oper.GetMinimalLineSize(this, m_dragRowOrCol))); -+ } - - // TODO: generate RESIZING event, see #10754, if the size has changed. - } -@@ -5090,7 +5115,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const - - void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow) - { -- DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW); - - SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, event); - -@@ -5099,7 +5125,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin - - void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow) - { -- DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL); - - SendGridSizeEvent(wxEVT_GRID_COL_SIZE, m_dragRowOrCol, event); - -@@ -5113,9 +5140,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col) - - void wxGrid::DoHeaderDragResizeCol(int width) - { -+ //BBS: add cursor mode for DoGridDragResize's paremeters - DoGridDragResize(GetPositionForResizeEvent(width), - wxGridColumnOperations(), -- m_gridWin); -+ m_gridWin, WXGRID_CURSOR_RESIZE_COL); - } - - void wxGrid::DoHeaderEndDragResizeCol(int width) -@@ -6013,6 +6041,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) - DisableCellEditControl(); - - MoveCursorDown( event.ShiftDown() ); -+ //BBS: select this cell when first click -+ m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(), -+ m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(), -+ event); - } - break; - -diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp -index 011bd4f534..17e7f18740 100644 ---- a/src/msw/bmpcbox.cpp -+++ b/src/msw/bmpcbox.cpp -@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl() - - wxComboBox::DoClear(); - -- HWND hwnd = GetHwnd(); -+ WNDPROC wndproc_edit = nullptr; -+ WinStruct combobox_info; -+ HWND hwnd = GetHwnd(); -+if (::GetComboBoxInfo(hwnd, &combobox_info)) -+ wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem); - DissociateHandle(); - ::DestroyWindow(hwnd); - - if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) ) - return; - -+if (::GetComboBoxInfo(GetHwnd(), &combobox_info)) -+ wxSetWindowProc(combobox_info.hwndItem, wndproc_edit); -+ - // initialize the controls contents - for ( i = 0; i < numItems; i++ ) - { -diff --git a/src/msw/font.cpp b/src/msw/font.cpp -index 434876939c..91d4603018 100644 ---- a/src/msw/font.cpp -+++ b/src/msw/font.cpp -@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH; - class WXDLLEXPORT wxFontRefData: public wxGDIRefData - { - public: -- wxFontRefData(const wxFontInfo& info = wxFontInfo()); -+ wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr); - - wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0) - { -@@ -324,7 +324,7 @@ protected: - // wxFontRefData - // ---------------------------------------------------------------------------- - --wxFontRefData::wxFontRefData(const wxFontInfo& info) -+wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window) - { - m_hFont = NULL; - -@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info) - } - else - { -- m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize()); -+ m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window); - } - - SetStyle(info.GetStyle()); -@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const - return wxGetFontEncFromCharSet(lf.lfCharSet); - } - --void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew) -+void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window) - { - // We don't have the correct DPI to use here, so use that of the - // primary screen and rely on WXAdjustToPPI() changing it later if - // necessary. -- const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); -+ const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); - lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi); - - pointSize = pointSizeNew; -@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc) - (void)Create(info); - } - --wxFont::wxFont(const wxFontInfo& info) -+wxFont::wxFont(const wxFontInfo& info, const wxWindow *window) - { -- m_refData = new wxFontRefData(info); -+ m_refData = new wxFontRefData(info, window); - } - - bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) -diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp -index 0bd017a36a..3b98bf1678 100644 ---- a/src/msw/menuitem.cpp -+++ b/src/msw/menuitem.cpp -@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window) - // native menu uses small top margin for separator - if ( SeparatorMargin.cyTopHeight >= 2 ) - SeparatorMargin.cyTopHeight -= 2; -+ -+ SeparatorSize.cy = 0; - } - else - #endif // wxUSE_UXTHEME -diff --git a/src/msw/window.cpp b/src/msw/window.cpp -index c529a4fa3b..7e547c64df 100644 ---- a/src/msw/window.cpp -+++ b/src/msw/window.cpp -@@ -4809,33 +4809,49 @@ static wxSize GetWindowDPI(HWND hwnd) - } - - /*extern*/ --int wxGetSystemMetrics(int nIndex, const wxWindow* window) -+int wxGetSystemMetrics(int nIndex, const wxWindow* win) - { - #if wxUSE_DYNLIB_CLASS -- if ( !window ) -- window = wxApp::GetMainTopWindow(); -+ const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win; - -- if ( window ) -+ if (window) - { -- typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi); -- static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL; -- static bool s_initDone = false; -- -- if ( !s_initDone ) -- { -- wxLoadedDLL dllUser32("user32.dll"); -- wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32); -- s_initDone = true; -+#if 1 -+ if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) { -+ HDC hdc = GetDC(window->GetHWND()); -+#if 0 -+ double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES); -+ ReleaseDC(window->GetHWND(), hdc); -+ wxSize dpi = window->GetDPI(); -+ dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y); -+ return int(dim + 0.5); -+#else -+ return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES)); -+#endif - } -- -- if ( s_pfnGetSystemMetricsForDpi ) -+ else -+#endif - { -- const int dpi = window->GetDPI().y; -- return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi); -+ typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi); -+ static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL; -+ static bool s_initDone = false; -+ -+ if ( !s_initDone ) -+ { -+ wxLoadedDLL dllUser32("user32.dll"); -+ wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32); -+ s_initDone = true; -+ } -+ -+ if ( s_pfnGetSystemMetricsForDpi ) -+ { -+ const int dpi = window->GetDPI().y; -+ return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi); -+ } - } - } - #else -- wxUnusedVar(window); -+ wxUnusedVar(win); - #endif // wxUSE_DYNLIB_CLASS - - return ::GetSystemMetrics(nIndex); -diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm -index f188e61089..7b867002d1 100644 ---- a/src/osx/cocoa/dataview.mm -+++ b/src/osx/cocoa/dataview.mm -@@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView - } - } - -+//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl, -+// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl -+// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though. -+- (void)mouseMoved:(NSEvent *)event -+{ -+if (! implementation->DoHandleMouseEvent(event)) -+ [super mouseMoved:event]; -+} -+ - // - // contextual menus - // -@@ -2006,7 +2015,8 @@ void wxCocoaDataViewControl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd - if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) ) - wxWidgetCocoaImpl::keyEvent(event, slf, _cmd); - } -- else -+ //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working. -+ else if (! DoHandleKeyEvent(event)) - { - wxWidgetCocoaImpl::keyEvent(event, slf, _cmd); // all other keys - } -@@ -2540,12 +2550,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent) - - void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const - { -- NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point); -+ NSTableHeaderView *headerView = [m_OutlineView headerView]; -+ if (headerView && point.y < headerView.visibleRect.size.height) { -+ // The point is inside the header area. -+ columnPtr = NULL; -+ item = wxDataViewItem(); -+ return; -+ } -+ // Convert from the window coordinates to the virtual scrolled view coordinates. -+ NSScrollView *scrollView = [m_OutlineView enclosingScrollView]; -+ const NSRect &visibleRect = scrollView.contentView.visibleRect; -+ NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(), -+ wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y)); - - int indexColumn; - int indexRow; - -- - indexColumn = [m_OutlineView columnAtPoint:nativePoint]; - indexRow = [m_OutlineView rowAtPoint: nativePoint]; - if ((indexColumn >= 0) && (indexRow >= 0)) -diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm -index c819deeb0c..dc3c3b0b53 100644 ---- a/src/osx/cocoa/settings.mm -+++ b/src/osx/cocoa/settings.mm -@@ -222,7 +222,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) - // ---------------------------------------------------------------------------- - - // Get a system metric, e.g. scrollbar size --int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win)) -+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win) - { - int value; - -@@ -257,11 +257,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN - // TODO case wxSYS_WINDOWMIN_Y: - - case wxSYS_SCREEN_X: -- wxDisplaySize(&value, NULL); -+ wxDisplaySize(win, &value, NULL); - return value; - - case wxSYS_SCREEN_Y: -- wxDisplaySize(NULL, &value); -+ wxDisplaySize(win, NULL, &value); - return value; - - // TODO case wxSYS_FRAMESIZE_X: -diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm -index 635ea286d4..42ae67e27a 100644 ---- a/src/osx/cocoa/window.mm -+++ b/src/osx/cocoa/window.mm -@@ -191,6 +191,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const - - (BOOL)isEnabled; - - (void)setEnabled:(BOOL)flag; - -+- (BOOL)clipsToBounds; -+- (void)setClipsToBounds:(BOOL)clipsToBounds; -+ - - (void)setImage:(NSImage *)image; - - (void)setControlSize:(NSControlSize)size; - -@@ -2559,6 +2562,7 @@ wxWidgetImpl( peer, flags ) - if ( m_osxView ) - CFRetain(m_osxView); - [m_osxView release]; -+ m_osxView.clipsToBounds = YES; - } - - --- -2.42.0.windows.2 - diff --git a/deps/wxWidgets/0001-wx-3.1.5-patch-for-Orca.patch b/deps/wxWidgets/0001-wx-3.1.5-patch-for-Orca.patch deleted file mode 100644 index 325b933f66..0000000000 --- a/deps/wxWidgets/0001-wx-3.1.5-patch-for-Orca.patch +++ /dev/null @@ -1,743 +0,0 @@ -From 5e82980ed1762338794d06b3f9f22fa10e050622 Mon Sep 17 00:00:00 2001 -From: SoftFever -Date: Sat, 23 Dec 2023 20:08:41 +0800 -Subject: [PATCH] wx 3.1.5 patch for Orca - ---- - build/cmake/init.cmake | 4 ++ - build/cmake/lib/webview/CMakeLists.txt | 4 +- - include/wx/fontutil.h | 15 +++++++- - include/wx/gdicmn.h | 3 ++ - include/wx/generic/grid.h | 4 +- - include/wx/msw/font.h | 2 +- - include/wx/msw/tooltip.h | 4 +- - include/wx/osx/app.h | 2 +- - src/common/combocmn.cpp | 13 +++++-- - src/common/datavcmn.cpp | 6 ++- - src/common/dcbufcmn.cpp | 8 +++- - src/common/gdicmn.cpp | 14 +++++++ - src/common/image.cpp | 6 +-- - src/common/intl.cpp | 7 ++++ - src/generic/grid.cpp | 53 +++++++++++++++++++++----- - src/msw/bmpcbox.cpp | 9 ++++- - src/msw/font.cpp | 14 +++---- - src/msw/menuitem.cpp | 2 + - src/msw/window.cpp | 52 ++++++++++++++++--------- - src/osx/cocoa/dataview.mm | 26 +++++++++++-- - src/osx/cocoa/settings.mm | 6 +-- - src/osx/cocoa/window.mm | 4 ++ - 22 files changed, 199 insertions(+), 59 deletions(-) - -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 0bc4f934b9..479431a69c 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -413,7 +413,11 @@ if(wxUSE_GUI) - else() - find_package(OpenGL) - if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL) -+ if(UNIX AND NOT APPLE) -+ set(OPENGL_LIBRARIES OpenGL EGL) -+ else() - set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::EGL) -+ endif() - find_package(WAYLANDEGL) - if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND) - list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES}) -diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt -index cc3298ff33..aa103ae474 100644 ---- a/build/cmake/lib/webview/CMakeLists.txt -+++ b/build/cmake/lib/webview/CMakeLists.txt -@@ -56,9 +56,9 @@ if(APPLE) - elseif(WXMSW) - if(wxUSE_WEBVIEW_EDGE) - # Update the following variables if updating WebView2 SDK -- set(WEBVIEW2_VERSION "1.0.705.50") -+ set(WEBVIEW2_VERSION "1.0.1418.22") - set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}") -- set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d") -+ set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99") - - set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}") - -diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h -index 09ad8c8ef3..c228e167d7 100644 ---- a/include/wx/fontutil.h -+++ b/include/wx/fontutil.h -@@ -294,7 +294,11 @@ public: - wxFontEncoding GetEncoding() const; - - void SetPointSize(int pointsize); -- void SetFractionalPointSize(double pointsize); -+ void SetFractionalPointSize(double pointsize -+#if defined(__WXMSW__) -+ , const wxWindow *window = nullptr -+#endif -+ ); - void SetPixelSize(const wxSize& pixelSize); - void SetStyle(wxFontStyle style); - void SetNumericWeight(int weight); -@@ -307,12 +311,19 @@ public: - - // Helper used in many ports: use the normal font size if the input is - // negative, as we handle -1 as meaning this for compatibility. -- void SetSizeOrDefault(double size) -+ void SetSizeOrDefault(double size -+#if defined(__WXMSW__) -+ , const wxWindow *window = nullptr -+#endif -+ ) - { - SetFractionalPointSize - ( - size < 0 ? wxNORMAL_FONT->GetFractionalPointSize() - : size -+#if defined(__WXMSW__) -+ ,window -+#endif - ); - } - -diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h -index e29a77627c..dc48cf9451 100644 ---- a/include/wx/gdicmn.h -+++ b/include/wx/gdicmn.h -@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion; - class WXDLLIMPEXP_FWD_BASE wxString; - class WXDLLIMPEXP_FWD_CORE wxIconBundle; - class WXDLLIMPEXP_FWD_CORE wxPoint; -+class WXDLLIMPEXP_FWD_CORE wxWindow; - - // --------------------------------------------------------------------------- - // constants -@@ -1092,7 +1093,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth(); - - // get the display size - extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height); -+extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(); -+extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window); - extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM(); - extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI(); -diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h -index d7a3890764..e4dee51d5a 100644 ---- a/include/wx/generic/grid.h -+++ b/include/wx/generic/grid.h -@@ -2951,9 +2951,11 @@ private: - wxGridWindow* gridWindow); - - // Update the width/height of the column/row being drag-resized. -+ //BBS: add cursor mode for DoGridDragResize's paremeters - void DoGridDragResize(const wxPoint& position, - const wxGridOperations& oper, -- wxGridWindow* gridWindow); -+ wxGridWindow* gridWindow, -+ CursorMode mode); - - // process different clicks on grid cells - void DoGridCellLeftDown(wxMouseEvent& event, -diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h -index 0f9768b44e..094d774918 100644 ---- a/include/wx/msw/font.h -+++ b/include/wx/msw/font.h -@@ -23,7 +23,7 @@ public: - // ctors and such - wxFont() { } - -- wxFont(const wxFontInfo& info); -+ wxFont(const wxFontInfo& info, const wxWindow *window = nullptr); - - wxFont(int size, - wxFontFamily family, -diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h -index 4c3be08cec..96fb378d01 100644 ---- a/include/wx/msw/tooltip.h -+++ b/include/wx/msw/tooltip.h -@@ -91,10 +91,10 @@ private: - // the one and only one tooltip control we use - never access it directly - // but use GetToolTipCtrl() which will create it when needed - static WXHWND ms_hwndTT; -- -+public: - // create the tooltip ctrl if it doesn't exist yet and return its HWND - static WXHWND GetToolTipCtrl(); -- -+private: - // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop - static void DeleteToolTipCtrl(); - -diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h -index 317a0ca96f..58014ec1d4 100644 ---- a/include/wx/osx/app.h -+++ b/include/wx/osx/app.h -@@ -161,7 +161,7 @@ private: - - public: - bool OSXInitWasCalled() { return m_inited; } -- void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; } -+ virtual void OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; } - void OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; } - void OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; } - #endif -diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp -index b61aac35bf..7cfc97d2f8 100644 ---- a/src/common/combocmn.cpp -+++ b/src/common/combocmn.cpp -@@ -2141,7 +2141,7 @@ void wxComboCtrlBase::CreatePopup() - #if !USES_GENERICTLW - m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER ); - #else -- int tlwFlags = wxNO_BORDER; -+ int tlwFlags = wxNO_BORDER | wxSTAY_ON_TOP; - #ifdef wxCC_GENERIC_TLW_IS_FRAME - tlwFlags |= wxFRAME_NO_TASKBAR; - #endif -@@ -2285,6 +2285,9 @@ void wxComboCtrlBase::ShowPopup() - - SetFocus(); - -+ //int displayIdx = wxDisplay::GetFromWindow(this); -+ //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry(); -+ - // Space above and below - int screenHeight; - wxPoint scrPos; -@@ -2407,9 +2410,13 @@ void wxComboCtrlBase::ShowPopup() - - int showFlags = CanDeferShow; - -- if ( spaceBelow < szp.y ) -+ int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN); -+ if (// Pop up as asked for by the library user. -+ (anchorSideVertical & wxUP) || -+ // Automatic: Pop up if it does not fit down. -+ (anchorSideVertical == 0 && spaceBelow < szp.y )) - { -- popupY = scrPos.y - szp.y; -+ popupY = scrPos.y - szp.y + displayRect.GetTop(); - showFlags |= ShowAbove; - } - -diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp -index 1f5fd4d66b..14ea2f8ef1 100644 ---- a/src/common/datavcmn.cpp -+++ b/src/common/datavcmn.cpp -@@ -1322,7 +1322,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const - - wxDataViewItemArray selections; - GetSelections(selections); -- return selections[0]; -+ // BBS -+ if (!selections.empty()) -+ return selections[0]; -+ else -+ return wxDataViewItem(0); - } - - namespace -diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp -index 74958fce10..59844f4526 100644 ---- a/src/common/dcbufcmn.cpp -+++ b/src/common/dcbufcmn.cpp -@@ -82,9 +82,15 @@ private: - const double scale = dc ? dc->GetContentScaleFactor() : 1.0; - wxBitmap* const buffer = new wxBitmap; - -+#if __WXMSW__ - // we must always return a valid bitmap but creating a bitmap of - // size 0 would fail, so create a 1*1 bitmap in this case -- buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale); -+ buffer->Create(wxMax(w, 1), wxMax(h, 1), 24); -+#else -+ // we must always return a valid bitmap but creating a bitmap of -+ // size 0 would fail, so create a 1*1 bitmap in this case -+ buffer->CreateScaled(wxMax(w, 1), wxMax(h, 1), -1, scale); -+#endif - - return buffer; - } -diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp -index 20442bbc73..bc2c35bee6 100644 ---- a/src/common/gdicmn.cpp -+++ b/src/common/gdicmn.cpp -@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height) - *height = size.y; - } - -+void wxDisplaySize(const wxWindow *window, int *width, int *height) -+{ -+ const wxSize size = wxGetDisplaySize(window); -+ if ( width ) -+ *width = size.x; -+ if ( height ) -+ *height = size.y; -+} -+ - wxSize wxGetDisplaySize() - { - return wxDisplay().GetGeometry().GetSize(); - } - -+wxSize wxGetDisplaySize(const wxWindow *window) -+{ -+ return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize(); -+} -+ - void wxClientDisplayRect(int *x, int *y, int *width, int *height) - { - const wxRect rect = wxGetClientDisplayRect(); -diff --git a/src/common/image.cpp b/src/common/image.cpp -index 78fe5b82a3..46db8722ce 100644 ---- a/src/common/image.cpp -+++ b/src/common/image.cpp -@@ -383,11 +383,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const - unsigned char red = pixel[0] ; - unsigned char green = pixel[1] ; - unsigned char blue = pixel[2] ; -- unsigned char alpha = 255 ; -- if ( source_alpha ) -- alpha = *(source_alpha + y_offset + x * xFactor + x1) ; - if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue ) - { -+ unsigned char alpha = 255 ; -+ if ( source_alpha ) -+ alpha = *(source_alpha + y_offset + x * xFactor + x1) ; - if ( alpha > 0 ) - { - avgRed += red ; -diff --git a/src/common/intl.cpp b/src/common/intl.cpp -index 0b0d8798f4..294f542b1f 100644 ---- a/src/common/intl.cpp -+++ b/src/common/intl.cpp -@@ -1628,6 +1628,12 @@ GetInfoFromLCID(LCID lcid, - { - str = buf; - -+//FIXME Vojtech: We forcefully set the locales for a decimal point to "C", but this -+// is not possible for the Win32 locales, therefore there is a discrepancy. -+// It looks like we live with the discrepancy for at least half a year, so we will -+// suppress the assert until we fix Slic3r to properly switch to "C" locales just -+// for file import / export. -+#if 0 - // As we get our decimal point separator from Win32 and not the - // CRT there is a possibility of mismatch between them and this - // can easily happen if the user code called setlocale() -@@ -1641,6 +1647,7 @@ GetInfoFromLCID(LCID lcid, - "Decimal separator mismatch -- did you use setlocale()?" - "If so, use wxLocale to change the locale instead." - ); -+#endif - } - break; - -diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp -index 41fd4524cf..f4a15cb839 100644 ---- a/src/generic/grid.cpp -+++ b/src/generic/grid.cpp -@@ -3824,7 +3824,8 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event, wxGridRowLabelWindo - { - case WXGRID_CURSOR_RESIZE_ROW: - { -- DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW); - } - break; - -@@ -4166,7 +4167,8 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event, wxGridColLabelWindo - switch ( m_cursorMode ) - { - case WXGRID_CURSOR_RESIZE_COL: -- DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL); - break; - - case WXGRID_CURSOR_SELECT_COL: -@@ -4708,11 +4710,13 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event, - return DoGridCellDrag(event, coords, isFirstDrag); - - case WXGRID_CURSOR_RESIZE_ROW: -- DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW); - break; - - case WXGRID_CURSOR_RESIZE_COL: -- DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL); - break; - - default: -@@ -4803,6 +4807,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event, - case wxGridSelectCells: - case wxGridSelectRowsOrColumns: - // nothing to do in these cases -+ //BBS: select this cell when first click -+ m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event); - break; - - case wxGridSelectRows: -@@ -5044,9 +5050,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG - } - } - -+//BBS: add cursor mode for DoGridDragResize's paremeters - void wxGrid::DoGridDragResize(const wxPoint& position, - const wxGridOperations& oper, -- wxGridWindow* gridWindow) -+ wxGridWindow* gridWindow, -+ CursorMode mode) - { - // Get the logical position from the physical one we're passed. - const wxPoint -@@ -5056,10 +5064,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position, - // orthogonal direction. - const int linePos = oper.Dual().Select(logicalPos); - -- const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol); -- oper.SetLineSize(this, m_dragRowOrCol, -+ //BBS: add logic for resize multiplexed cols -+ if (mode == WXGRID_CURSOR_RESIZE_COL) { -+ int col_to_resize = m_dragRowOrCol; -+ int num_rows, num_cols; -+ this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols); -+ if (num_cols < 1) -+ col_to_resize = m_dragRowOrCol - 1; -+ -+ const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol); -+ const int lineSize = oper.GetLineSize(this, col_to_resize); -+ int size = linePos - lineEnd + lineSize; -+ oper.SetLineSize(this, col_to_resize, -+ wxMax(size, -+ oper.GetMinimalLineSize(this, col_to_resize))); -+ } -+ else { -+ const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol); -+ -+ oper.SetLineSize(this, m_dragRowOrCol, - wxMax(linePos - lineStart, - oper.GetMinimalLineSize(this, m_dragRowOrCol))); -+ } - - // TODO: generate RESIZING event, see #10754, if the size has changed. - } -@@ -5082,7 +5108,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const - - void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow) - { -- DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW); - - SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, -1, event); - -@@ -5091,7 +5118,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin - - void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow) - { -- DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow); -+ //BBS: add cursor mode for DoGridDragResize's paremeters -+ DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL); - - SendGridSizeEvent(wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event); - -@@ -5105,9 +5133,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col) - - void wxGrid::DoHeaderDragResizeCol(int width) - { -+ //BBS: add cursor mode for DoGridDragResize's paremeters - DoGridDragResize(GetPositionForResizeEvent(width), - wxGridColumnOperations(), -- m_gridWin); -+ m_gridWin, WXGRID_CURSOR_RESIZE_COL); - } - - void wxGrid::DoHeaderEndDragResizeCol(int width) -@@ -5891,6 +5920,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event ) - DisableCellEditControl(); - - MoveCursorDown( event.ShiftDown() ); -+ //BBS: select this cell when first click -+ m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(), -+ m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(), -+ event); - } - break; - -diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp -index 0a2d167ad7..0aeba45ea9 100644 ---- a/src/msw/bmpcbox.cpp -+++ b/src/msw/bmpcbox.cpp -@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl() - - wxComboBox::DoClear(); - -- HWND hwnd = GetHwnd(); -+ WNDPROC wndproc_edit = nullptr; -+ WinStruct combobox_info; -+ HWND hwnd = GetHwnd(); -+if (::GetComboBoxInfo(hwnd, &combobox_info)) -+ wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem); - DissociateHandle(); - ::DestroyWindow(hwnd); - - if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) ) - return; - -+if (::GetComboBoxInfo(GetHwnd(), &combobox_info)) -+ wxSetWindowProc(combobox_info.hwndItem, wndproc_edit); -+ - // initialize the controls contents - for ( i = 0; i < numItems; i++ ) - { -diff --git a/src/msw/font.cpp b/src/msw/font.cpp -index 0bd240d79f..d38b1b00f5 100644 ---- a/src/msw/font.cpp -+++ b/src/msw/font.cpp -@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH; - class WXDLLEXPORT wxFontRefData: public wxGDIRefData - { - public: -- wxFontRefData(const wxFontInfo& info = wxFontInfo()); -+ wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr); - - wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0) - { -@@ -324,7 +324,7 @@ protected: - // wxFontRefData - // ---------------------------------------------------------------------------- - --wxFontRefData::wxFontRefData(const wxFontInfo& info) -+wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window) - { - m_hFont = NULL; - -@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info) - } - else - { -- m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize()); -+ m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window); - } - - SetStyle(info.GetStyle()); -@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const - return wxGetFontEncFromCharSet(lf.lfCharSet); - } - --void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew) -+void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window) - { - // We don't have the correct DPI to use here, so use that of the - // primary screen and rely on WXAdjustToPPI() changing it later if - // necessary. -- const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); -+ const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY); - lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi); - - pointSize = pointSizeNew; -@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc) - (void)Create(info); - } - --wxFont::wxFont(const wxFontInfo& info) -+wxFont::wxFont(const wxFontInfo& info, const wxWindow *window) - { -- m_refData = new wxFontRefData(info); -+ m_refData = new wxFontRefData(info, window); - } - - bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont) -diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp -index 9bb397d472..30af7154a7 100644 ---- a/src/msw/menuitem.cpp -+++ b/src/msw/menuitem.cpp -@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window) - // native menu uses small top margin for separator - if ( SeparatorMargin.cyTopHeight >= 2 ) - SeparatorMargin.cyTopHeight -= 2; -+ -+ SeparatorSize.cy = 0; - } - else - #endif // wxUSE_UXTHEME -diff --git a/src/msw/window.cpp b/src/msw/window.cpp -index eadc2f5700..f64fea4446 100644 ---- a/src/msw/window.cpp -+++ b/src/msw/window.cpp -@@ -4773,33 +4773,49 @@ static wxSize GetWindowDPI(HWND hwnd) - } - - /*extern*/ --int wxGetSystemMetrics(int nIndex, const wxWindow* window) -+int wxGetSystemMetrics(int nIndex, const wxWindow* win) - { - #if wxUSE_DYNLIB_CLASS -- if ( !window ) -- window = wxApp::GetMainTopWindow(); -+ const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win; - -- if ( window ) -+ if (window) - { -- typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi); -- static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL; -- static bool s_initDone = false; -- -- if ( !s_initDone ) -- { -- wxLoadedDLL dllUser32("user32.dll"); -- wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32); -- s_initDone = true; -+#if 1 -+ if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) { -+ HDC hdc = GetDC(window->GetHWND()); -+#if 0 -+ double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES); -+ ReleaseDC(window->GetHWND(), hdc); -+ wxSize dpi = window->GetDPI(); -+ dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y); -+ return int(dim + 0.5); -+#else -+ return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES)); -+#endif - } -- -- if ( s_pfnGetSystemMetricsForDpi ) -+ else -+#endif - { -- const int dpi = window->GetDPI().y; -- return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi); -+ typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi); -+ static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL; -+ static bool s_initDone = false; -+ -+ if ( !s_initDone ) -+ { -+ wxLoadedDLL dllUser32("user32.dll"); -+ wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32); -+ s_initDone = true; -+ } -+ -+ if ( s_pfnGetSystemMetricsForDpi ) -+ { -+ const int dpi = window->GetDPI().y; -+ return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi); -+ } - } - } - #else -- wxUnusedVar(window); -+ wxUnusedVar(win); - #endif // wxUSE_DYNLIB_CLASS - - return ::GetSystemMetrics(nIndex); -diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm -index 6ff0cc3088..4943f3ea38 100644 ---- a/src/osx/cocoa/dataview.mm -+++ b/src/osx/cocoa/dataview.mm -@@ -1734,12 +1734,22 @@ outlineView:(NSOutlineView*)outlineView - if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) ) - [super keyDown:event]; - } -- else -+ //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working. -+ else if (! implementation->DoHandleKeyEvent(event)) - { - [super keyDown:event]; // all other keys - } - } - -+//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl, -+// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl -+// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though. -+- (void)mouseMoved:(NSEvent *)event -+{ -+if (! implementation->DoHandleMouseEvent(event)) -+ [super mouseMoved:event]; -+} -+ - // - // contextual menus - // -@@ -2672,12 +2682,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent) - - void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const - { -- NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point); -+ NSTableHeaderView *headerView = [m_OutlineView headerView]; -+ if (headerView && point.y < headerView.visibleRect.size.height) { -+ // The point is inside the header area. -+ columnPtr = NULL; -+ item = wxDataViewItem(); -+ return; -+ } -+ // Convert from the window coordinates to the virtual scrolled view coordinates. -+ NSScrollView *scrollView = [m_OutlineView enclosingScrollView]; -+ const NSRect &visibleRect = scrollView.contentView.visibleRect; -+ NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(), -+ wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y)); - - int indexColumn; - int indexRow; - -- - indexColumn = [m_OutlineView columnAtPoint:nativePoint]; - indexRow = [m_OutlineView rowAtPoint: nativePoint]; - if ((indexColumn >= 0) && (indexRow >= 0)) -diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm -index de5f52860c..a9581174a4 100644 ---- a/src/osx/cocoa/settings.mm -+++ b/src/osx/cocoa/settings.mm -@@ -224,7 +224,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) - // ---------------------------------------------------------------------------- - - // Get a system metric, e.g. scrollbar size --int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win)) -+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win) - { - int value; - -@@ -259,11 +259,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN - // TODO case wxSYS_WINDOWMIN_Y: - - case wxSYS_SCREEN_X: -- wxDisplaySize(&value, NULL); -+ wxDisplaySize(win, &value, NULL); - return value; - - case wxSYS_SCREEN_Y: -- wxDisplaySize(NULL, &value); -+ wxDisplaySize(win, NULL, &value); - return value; - - // TODO case wxSYS_FRAMESIZE_X: -diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm -index b322e582c5..79de567333 100644 ---- a/src/osx/cocoa/window.mm -+++ b/src/osx/cocoa/window.mm -@@ -190,6 +190,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const - - (BOOL)isEnabled; - - (void)setEnabled:(BOOL)flag; - -+- (BOOL)clipsToBounds; -+- (void)setClipsToBounds:(BOOL)clipsToBounds; -+ - - (void)setImage:(NSImage *)image; - - (void)setControlSize:(NSControlSize)size; - -@@ -2505,6 +2508,7 @@ wxWidgetImpl( peer, flags ) - if ( m_osxView ) - CFRetain(m_osxView); - [m_osxView release]; -+ m_osxView.clipsToBounds = YES; - } - - --- -2.41.0.windows.2 - diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index f84f9a070f..fdc1abdc9a 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -20,16 +20,6 @@ else () set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF") endif () -set(_wx_orcaslicer_patch "${CMAKE_CURRENT_LIST_DIR}/0001-wx-3.1.5-patch-for-Orca.patch") -if (MSVC) - set(_patch_cmd if not exist WXWIDGETS_PATCHED ( "${GIT_EXECUTABLE}" apply --verbose --ignore-space-change --whitespace=fix ${_wx_orcaslicer_patch} && type nul > WXWIDGETS_PATCHED ) ) -else () - set(_patch_cmd test -f WXWIDGETS_PATCHED || ${PATCH_CMD} ${_wx_orcaslicer_patch} && touch WXWIDGETS_PATCHED) -endif () - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(_patch_cmd ${PATCH_CMD} ${_wx_orcaslicer_patch}) -endif () # Note: for anybody wanting to switch to tarball fetching - this won't just work as # git apply expects a git repo. Either git init empty repo, or change patching method. @@ -44,12 +34,12 @@ endif () orcaslicer_add_cmake_project( wxWidgets - GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets" - GIT_TAG ${_wx_git_tag} + GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets" + # GIT_TAG ${_wx_git_tag} GIT_SHALLOW ON # URL ${_wx_tarball_url} # URL_HASH SHA256=${_wx_tarball_hash} - PATCH_COMMAND ${_patch_cmd} + # PATCH_COMMAND ${_patch_cmd} DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG CMAKE_ARGS -DwxBUILD_PRECOMP=ON diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 870f89f130..bed88115d4 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1885,6 +1885,12 @@ msgstr "" msgid "arrange current plate" msgstr "" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "" @@ -3016,6 +3022,45 @@ msgstr "" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, possible-boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, possible-boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, possible-boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, possible-boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, possible-boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, possible-boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "" @@ -7200,25 +7245,22 @@ msgstr "" msgid "Unsaved Changes" msgstr "" -msgid "Actions For Unsaved Changes" +msgid "Transfer or discard changes" msgstr "" -msgid "Preset Value" +msgid "Old Value" msgstr "" -msgid "Modified Value" +msgid "New Value" msgstr "" -msgid "Transfer Modified Value" +msgid "Transfer" msgstr "" msgid "Don't save" msgstr "" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" +msgid "Discard" msgstr "" msgid "Click the right mouse button to display the full text." @@ -7273,28 +7315,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7312,9 +7348,6 @@ msgstr "" msgid "Select presets to compare" msgstr "" -msgid "Transfer" -msgstr "" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 8fcb6ede72..0275058262 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2024-03-17 22:08+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -1964,6 +1964,12 @@ msgstr "Ordenar" msgid "arrange current plate" msgstr "organitza la placa actual" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Rota automàticament" @@ -3200,6 +3206,45 @@ msgstr "Executant scripts de postprocessament" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Error desconegut en exportar el Codi-G." @@ -7761,26 +7806,23 @@ msgstr "No definit" msgid "Unsaved Changes" msgstr "Canvis no desats" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Transferir o descartar canvis" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Valor antic" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Valor nou" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Transferir" msgid "Don't save" msgstr "No desar" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Descartar" msgid "Click the right mouse button to display the full text." msgstr "Feu clic amb el botó dret del ratolí per mostrar el text complet." @@ -7842,28 +7884,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7881,9 +7917,6 @@ msgstr "Mostra tots els perfils ( inclosos els incompatibles )" msgid "Select presets to compare" msgstr "Seleccioneu els perfils a comparar" -msgid "Transfer" -msgstr "Transferir" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "Només es pot transferir al perfil actiu actual perquè s'ha modificat." @@ -16298,18 +16331,6 @@ msgstr "" #~ "No s'ha pogut realitzar l'operació booleana a les malles del model. Només " #~ "s'exportaran les parts positives." -#~ msgid "Transfer or discard changes" -#~ msgstr "Transferir o descartar canvis" - -#~ msgid "Old Value" -#~ msgstr "Valor antic" - -#~ msgid "New Value" -#~ msgstr "Valor nou" - -#~ msgid "Discard" -#~ msgstr "Descartar" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 839359384c..cb3c5ce17a 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2023-09-30 15:15+0200\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -1918,6 +1918,12 @@ msgstr "Uspořádat" msgid "arrange current plate" msgstr "uspořádat aktuální podložku" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Automatické otáčení" @@ -3140,6 +3146,45 @@ msgstr "Vykonávají se postprodukční skripty" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Neznámá chyba při exportu G-kódu." @@ -7623,26 +7668,23 @@ msgstr "Nedefinováno" msgid "Unsaved Changes" msgstr "Neuložené změny" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Zahodit nebo ponechat změny" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Stará hodnota" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Nová hodnota" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Přenést" msgid "Don't save" msgstr "Neukládat" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Zahodit" msgid "Click the right mouse button to display the full text." msgstr "Kliknutím pravým tlačítkem myši zobrazíte celý text." @@ -7704,28 +7746,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7743,9 +7779,6 @@ msgstr "Zobrazit všechna přednastavení (včetně nekompatibilních)" msgid "Select presets to compare" msgstr "Zvolte přednastavení k porovnání" -msgid "Transfer" -msgstr "Přenést" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15508,18 +15541,6 @@ msgstr "" #~ "Nelze provést logickou operaci nad mashí modelů. Budou exportovány pouze " #~ "kladné části." -#~ msgid "Transfer or discard changes" -#~ msgstr "Zahodit nebo ponechat změny" - -#~ msgid "Old Value" -#~ msgstr "Stará hodnota" - -#~ msgid "New Value" -#~ msgstr "Nová hodnota" - -#~ msgid "Discard" -#~ msgstr "Zahodit" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index e2276b8ae1..985d3be062 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -1963,6 +1963,12 @@ msgstr "Anordnen" msgid "arrange current plate" msgstr "Aktuelle Druckplatte anordnen" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Automatisch rotieren" @@ -3232,6 +3238,45 @@ msgstr "Ausführen von Nachbearbeitungsskripten" msgid "Successfully executed post-processing script" msgstr "Nachbearbeitungsskript erfolgreich ausgeführt" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Unbekannter Fehler beim exportieren des G-Code." @@ -7904,26 +7949,23 @@ msgstr "Undefiniert" msgid "Unsaved Changes" msgstr "Nicht gespeicherte Änderungen" -msgid "Actions For Unsaved Changes" -msgstr "Aktivitäten für nicht gespeicherte Änderungen" +msgid "Transfer or discard changes" +msgstr "Änderungen verwerfen oder beibehalten" -msgid "Preset Value" -msgstr "voreingestellter Wert" +msgid "Old Value" +msgstr "Alter Wert" -msgid "Modified Value" -msgstr "geänderter Wert" +msgid "New Value" +msgstr "Neuer Wert" -msgid "Transfer Modified Value" -msgstr "geänderten Wert übertragen" +msgid "Transfer" +msgstr "Übertragen" msgid "Don't save" msgstr "Nicht speichern" -msgid "Use Preset Value" -msgstr "voreingestellten Wert verwenden" - -msgid "Save Modified Value" -msgstr "geänderten Wert speichern" +msgid "Discard" +msgstr "Verwerfen" msgid "Click the right mouse button to display the full text." msgstr "" @@ -7987,41 +8029,23 @@ msgstr "Sie haben einige Einstellungen des Profils \"%1%\" geändert. " msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" -"\n" -"Möchten Sie diese geänderten Einstellungen (geänderter Wert) speichern?" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -"\n" -"Möchten Sie diese geänderten Einstellungen (geänderter Wert) nach dem " -"Wechsel des Profils beibehalten?" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" -"Sie haben Ihre Einstellungen zuvor geändert und sind dabei, sie durch neue " -"zu überschreiben." msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" -"\n" -"Möchten Sie Ihre aktuellen geänderten Einstellungen beibehalten oder die " -"voreingestellten Einstellungen verwenden?" - -msgid "" -"\n" -"Do you want to save your current modified settings?" -msgstr "" -"\n" -"Möchten Sie Ihre aktuellen geänderten Einstellungen speichern?" msgid "Extruders count" msgstr "Anzahl der Extruder" @@ -8038,9 +8062,6 @@ msgstr "Alle Profile anzeigen (auch inkompatible)" msgid "Select presets to compare" msgstr "Wähle Voreinstellungen zum Vergleich aus" -msgid "Transfer" -msgstr "Übertragen" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16364,6 +16385,63 @@ msgstr "" "wie z.B. ABS, durch eine entsprechende Erhöhung der Heizbetttemperatur die " "Wahrscheinlichkeit von Verwerfungen verringert werden kann." +#~ msgid "Actions For Unsaved Changes" +#~ msgstr "Aktivitäten für nicht gespeicherte Änderungen" + +#~ msgid "Preset Value" +#~ msgstr "voreingestellter Wert" + +#~ msgid "Modified Value" +#~ msgstr "geänderter Wert" + +#~ msgid "Transfer Modified Value" +#~ msgstr "geänderten Wert übertragen" + +#~ msgid "Use Preset Value" +#~ msgstr "voreingestellten Wert verwenden" + +#~ msgid "Save Modified Value" +#~ msgstr "geänderten Wert speichern" + +#~ msgid "" +#~ "\n" +#~ "Would you like to save these changed settings(modified value)?" +#~ msgstr "" +#~ "\n" +#~ "Möchten Sie diese geänderten Einstellungen (geänderter Wert) speichern?" + +#~ msgid "" +#~ "\n" +#~ "Would you like to keep these changed settings(modified value) after " +#~ "switching preset?" +#~ msgstr "" +#~ "\n" +#~ "Möchten Sie diese geänderten Einstellungen (geänderter Wert) nach dem " +#~ "Wechsel des Profils beibehalten?" + +#~ msgid "" +#~ "You have previously modified your settings and are about to overwrite " +#~ "them with new ones." +#~ msgstr "" +#~ "Sie haben Ihre Einstellungen zuvor geändert und sind dabei, sie durch " +#~ "neue zu überschreiben." + +#~ msgid "" +#~ "\n" +#~ "Do you want to keep your current modified settings, or use preset " +#~ "settings?" +#~ msgstr "" +#~ "\n" +#~ "Möchten Sie Ihre aktuellen geänderten Einstellungen beibehalten oder die " +#~ "voreingestellten Einstellungen verwenden?" + +#~ msgid "" +#~ "\n" +#~ "Do you want to save your current modified settings?" +#~ msgstr "" +#~ "\n" +#~ "Möchten Sie Ihre aktuellen geänderten Einstellungen speichern?" + #~ msgid "Unload Filament" #~ msgstr "Entladen" @@ -16525,18 +16603,6 @@ msgstr "" #~ "Eine boolesche Operation kann für Modellnetze nicht ausgeführt werden. Es " #~ "werden nur positive Teile exportiert." -#~ msgid "Transfer or discard changes" -#~ msgstr "Änderungen verwerfen oder beibehalten" - -#~ msgid "Old Value" -#~ msgstr "Alter Wert" - -#~ msgid "New Value" -#~ msgstr "Neuer Wert" - -#~ msgid "Discard" -#~ msgstr "Verwerfen" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index ecc46ba4e3..0e8af19aea 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1893,6 +1893,12 @@ msgstr "Arrange" msgid "arrange current plate" msgstr "Arrange current plate" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Auto Rotate" @@ -3100,6 +3106,45 @@ msgstr "Running post-processing scripts" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Unknown error with G-code export" @@ -7500,26 +7545,23 @@ msgstr "Undefined" msgid "Unsaved Changes" msgstr "unsaved changes" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Transfer or discard changes" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Old value" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "New Value" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Transfer" msgid "Don't save" msgstr "Don't save" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Discard" msgid "Click the right mouse button to display the full text." msgstr "Click the right mouse button to display the full text." @@ -7581,28 +7623,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7620,9 +7656,6 @@ msgstr "Show all presets (including incompatible)" msgid "Select presets to compare" msgstr "Select presets to compare" -msgid "Transfer" -msgstr "Transfer" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -14920,18 +14953,6 @@ msgstr "" #~ "Unable to perform boolean operation on model meshes. Only positive parts " #~ "will be exported." -#~ msgid "Transfer or discard changes" -#~ msgstr "Transfer or discard changes" - -#~ msgid "Old Value" -#~ msgstr "Old value" - -#~ msgid "New Value" -#~ msgstr "New Value" - -#~ msgid "Discard" -#~ msgstr "Discard" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 5e7e22aba2..dcfac06c88 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: Carlos Fco. Caruncho Serrano \n" "Language-Team: \n" @@ -1970,6 +1970,12 @@ msgstr "Organizar" msgid "arrange current plate" msgstr "posicionar la bandeja actual" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Rotación Automática" @@ -3213,6 +3219,45 @@ msgstr "Ejecutando scripts de post-procesado" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Error desconocido al exportar el G-Code." @@ -7801,26 +7846,23 @@ msgstr "No definido" msgid "Unsaved Changes" msgstr "Cambios No guardados" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Descartar o mantener los cambios" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Valor Antiguo" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Nuevo Valor" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Transferir" msgid "Don't save" msgstr "No guardar" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Descartar" msgid "Click the right mouse button to display the full text." msgstr "Pulse el botón derecho del ratón para mostrar el texto completo." @@ -7883,28 +7925,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7922,9 +7958,6 @@ msgstr "Mostrar todos los perfiles (incluyendo los compatibles)" msgid "Select presets to compare" msgstr "Seleccionar perfiles para comparar" -msgid "Transfer" -msgstr "Transferir" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16364,18 +16397,6 @@ msgstr "" #~ "Unable to perform boolean operation on model meshes. Only positive parts " #~ "will be exported." -#~ msgid "Transfer or discard changes" -#~ msgstr "Descartar o mantener los cambios" - -#~ msgid "Old Value" -#~ msgstr "Valor Antiguo" - -#~ msgid "New Value" -#~ msgstr "Nuevo Valor" - -#~ msgid "Discard" -#~ msgstr "Descartar" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 5f8f7f5c08..e68bc4b18c 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Guislain Cyril, Thomas Lété\n" @@ -1978,6 +1978,12 @@ msgstr "Organiser" msgid "arrange current plate" msgstr "organiser la plaque actuelle" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Rotation automatique" @@ -3236,6 +3242,45 @@ msgstr "Exécution de scripts de post-traitement" msgid "Successfully executed post-processing script" msgstr "Le script de post-traitement a été exécuté avec succès" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Erreur inconnue lors de l'exportation du G-code." @@ -7932,26 +7977,23 @@ msgstr "Undef" msgid "Unsaved Changes" msgstr "Modifications non enregistrées" -msgid "Actions For Unsaved Changes" -msgstr "Actions pour les changements non enregistrés" +msgid "Transfer or discard changes" +msgstr "Ignorer ou conserver les modifications" -msgid "Preset Value" -msgstr "Valeur prédéfinie" +msgid "Old Value" +msgstr "Ancienne valeur" -msgid "Modified Value" -msgstr "Valeur modifiée" +msgid "New Value" +msgstr "Nouvelle Valeur" -msgid "Transfer Modified Value" -msgstr "Transfert de la valeur modifiée" +msgid "Transfer" +msgstr "Transférer" msgid "Don't save" msgstr "Ne pas enregistrer" -msgid "Use Preset Value" -msgstr "Utiliser la valeur prédéfinie" - -msgid "Save Modified Value" -msgstr "Enregistrer la valeur modifiée" +msgid "Discard" +msgstr "Ignorer" msgid "Click the right mouse button to display the full text." msgstr "" @@ -8015,41 +8057,23 @@ msgstr "Vous avez modifié certains paramètres du réglage prédéfini « %1% msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" -"\n" -"Souhaitez-vous enregistrer les paramètres modifiés (valeur modifiée) ?" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -"\n" -"Souhaitez-vous conserver ces paramètres modifiés (valeur modifiée) après " -"avoir changé de préréglage ?" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" -"Vous avez précédemment modifié vos paramètres et vous êtes sur le point de " -"les remplacer par de nouveaux." msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" -"\n" -"Souhaitez-vous conserver vos paramètres modifiés actuels ou utiliser des " -"paramètres prédéfinis ?" - -msgid "" -"\n" -"Do you want to save your current modified settings?" -msgstr "" -"\n" -"Souhaitez-vous sauvegarder vos paramètres modifiés actuels ?" msgid "Extruders count" msgstr "Nombre d'extrudeurs" @@ -8066,9 +8090,6 @@ msgstr "Afficher tous les préréglages (y compris incompatibles)" msgid "Select presets to compare" msgstr "Sélectionnez les préréglages à comparer" -msgid "Transfer" -msgstr "Transférer" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16498,6 +16519,63 @@ msgstr "" "déformer, tels que l’ABS, une augmentation appropriée de la température du " "plateau chauffant peut réduire la probabilité de déformation." +#~ msgid "Actions For Unsaved Changes" +#~ msgstr "Actions pour les changements non enregistrés" + +#~ msgid "Preset Value" +#~ msgstr "Valeur prédéfinie" + +#~ msgid "Modified Value" +#~ msgstr "Valeur modifiée" + +#~ msgid "Transfer Modified Value" +#~ msgstr "Transfert de la valeur modifiée" + +#~ msgid "Use Preset Value" +#~ msgstr "Utiliser la valeur prédéfinie" + +#~ msgid "Save Modified Value" +#~ msgstr "Enregistrer la valeur modifiée" + +#~ msgid "" +#~ "\n" +#~ "Would you like to save these changed settings(modified value)?" +#~ msgstr "" +#~ "\n" +#~ "Souhaitez-vous enregistrer les paramètres modifiés (valeur modifiée) ?" + +#~ msgid "" +#~ "\n" +#~ "Would you like to keep these changed settings(modified value) after " +#~ "switching preset?" +#~ msgstr "" +#~ "\n" +#~ "Souhaitez-vous conserver ces paramètres modifiés (valeur modifiée) après " +#~ "avoir changé de préréglage ?" + +#~ msgid "" +#~ "You have previously modified your settings and are about to overwrite " +#~ "them with new ones." +#~ msgstr "" +#~ "Vous avez précédemment modifié vos paramètres et vous êtes sur le point " +#~ "de les remplacer par de nouveaux." + +#~ msgid "" +#~ "\n" +#~ "Do you want to keep your current modified settings, or use preset " +#~ "settings?" +#~ msgstr "" +#~ "\n" +#~ "Souhaitez-vous conserver vos paramètres modifiés actuels ou utiliser des " +#~ "paramètres prédéfinis ?" + +#~ msgid "" +#~ "\n" +#~ "Do you want to save your current modified settings?" +#~ msgstr "" +#~ "\n" +#~ "Souhaitez-vous sauvegarder vos paramètres modifiés actuels ?" + #~ msgid "Unload Filament" #~ msgstr "Déchargement" @@ -16659,18 +16737,6 @@ msgstr "" #~ "Impossible d'effectuer une opération booléenne sur les maillages du " #~ "modèle. Seules les parties positives seront exportées." -#~ msgid "Transfer or discard changes" -#~ msgstr "Ignorer ou conserver les modifications" - -#~ msgid "Old Value" -#~ msgstr "Ancienne valeur" - -#~ msgid "New Value" -#~ msgstr "Nouvelle Valeur" - -#~ msgid "Discard" -#~ msgstr "Ignorer" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index a664257664..2d4d4cd89b 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1897,6 +1897,12 @@ msgstr "Elrendezés" msgid "arrange current plate" msgstr "aktuális tálca elrendezése" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Automatikus forgatás" @@ -3122,6 +3128,45 @@ msgstr "Utófeldolgozási szkriptek futtatása" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Ismeretlen hiba a G-kód exportálásakor." @@ -7546,26 +7591,23 @@ msgstr "Nincs meghatározva" msgid "Unsaved Changes" msgstr "mentetlen változások" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Változások elvetése vagy megtartása" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Régi érték" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Új érték" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Átvitel" msgid "Don't save" msgstr "Ne mentsd" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Elvetés" msgid "Click the right mouse button to display the full text." msgstr "Kattints a jobb egérgombbal a teljes szöveg megjelenítéséhez." @@ -7628,28 +7670,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7667,9 +7703,6 @@ msgstr "Minden beállítás megjelenítése (beleértve az inkompatibiliseket is msgid "Select presets to compare" msgstr "Select presets to compare" -msgid "Transfer" -msgstr "Átvitel" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15012,18 +15045,6 @@ msgstr "" #~ "Unable to perform boolean operation on model meshes. Only positive parts " #~ "will be exported." -#~ msgid "Transfer or discard changes" -#~ msgstr "Változások elvetése vagy megtartása" - -#~ msgid "Old Value" -#~ msgstr "Régi érték" - -#~ msgid "New Value" -#~ msgstr "Új érték" - -#~ msgid "Discard" -#~ msgstr "Elvetés" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 40036ff6ef..55c5d23e32 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1962,6 +1962,12 @@ msgstr "Disponi" msgid "arrange current plate" msgstr "Disponi sul piatto corrente" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Rotazione automatica" @@ -3212,6 +3218,45 @@ msgstr "Esecuzione script di post-elaborazione" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Errore sconosciuto nell'esportazione del G-code." @@ -7782,26 +7827,23 @@ msgstr "Indefinito" msgid "Unsaved Changes" msgstr "Modifiche non salvate" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Scarta o mantieni le modifiche" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Valore precedente" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Nuovo valore" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Trasferisci" msgid "Don't save" msgstr "Non salvare" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Cancella" msgid "Click the right mouse button to display the full text." msgstr "" @@ -7864,28 +7906,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7903,9 +7939,6 @@ msgstr "Mostra tutti i preset (compresi non compatibili)" msgid "Select presets to compare" msgstr "Seleziona i preset da confrontare" -msgid "Transfer" -msgstr "Trasferisci" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16383,18 +16416,6 @@ msgstr "" #~ "Impossibile eseguire operazioni booleane sulle mesh del modello. Verranno " #~ "esportate solo le parti positive." -#~ msgid "Transfer or discard changes" -#~ msgstr "Scarta o mantieni le modifiche" - -#~ msgid "Old Value" -#~ msgstr "Valore precedente" - -#~ msgid "New Value" -#~ msgstr "Nuovo valore" - -#~ msgid "Discard" -#~ msgstr "Cancella" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 413509eb33..eeb821b872 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1885,6 +1885,12 @@ msgstr "レイアウト" msgid "arrange current plate" msgstr "現在のプレートをレイアウト" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "自動回転" @@ -3063,6 +3069,45 @@ msgstr "後処理スクリプトを実行" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "不明なエラー: G-codeエクスポート" @@ -7385,26 +7430,23 @@ msgstr "未定義" msgid "Unsaved Changes" msgstr "未保存の変更" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "変更を破棄または保持" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "古い値" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "新しい値" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "流用" msgid "Don't save" msgstr "保存しない" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "破棄" msgid "Click the right mouse button to display the full text." msgstr "マウスを右クリックして全文を表示します" @@ -7462,28 +7504,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7501,9 +7537,6 @@ msgstr "全てのプリセットを表示" msgid "Select presets to compare" msgstr "Select presets to compare" -msgid "Transfer" -msgstr "流用" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -14619,18 +14652,6 @@ msgstr "" #~ "Unable to perform boolean operation on model meshes. Only positive parts " #~ "will be exported." -#~ msgid "Transfer or discard changes" -#~ msgstr "変更を破棄または保持" - -#~ msgid "Old Value" -#~ msgstr "古い値" - -#~ msgid "New Value" -#~ msgstr "新しい値" - -#~ msgid "Discard" -#~ msgstr "破棄" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 13eb863830..04020c93fc 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2024-04-11 18:46+0900\n" "Last-Translator: Hotsolidinfill <138652683+Hotsolidinfill@users.noreply." "github.com>, crwusiz \n" @@ -1933,6 +1933,12 @@ msgstr "정렬" msgid "arrange current plate" msgstr "현재 플레이트 정렬" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "자동 회전" @@ -3125,6 +3131,45 @@ msgstr "사후 처리 스크립트 실행중" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "G코드를 내보낼 때 알 수 없는 오류가 발생했습니다." @@ -7558,26 +7603,23 @@ msgstr "정의되지 않음" msgid "Unsaved Changes" msgstr "저장되지 않은 변경 사항" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "변경 사항 폐기 또는 유지" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "이전 값" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "새로운 값" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "이전" msgid "Don't save" msgstr "저장하지 않음" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "폐기" msgid "Click the right mouse button to display the full text." msgstr "마우스 오른쪽 버튼을 클릭하여 전체 텍스트를 표시합니다." @@ -7639,28 +7681,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7678,9 +7714,6 @@ msgstr "모든 사전 설정 표시(미 호환 포함)" msgid "Select presets to compare" msgstr "비교할 사전 설정 선택" -msgid "Transfer" -msgstr "이전" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15646,18 +15679,6 @@ msgstr "" #~ msgstr "" #~ "모델 메쉬에 부울 연산을 수행할 수 없습니다. 오직 양수 부품만 내보내집니다." -#~ msgid "Transfer or discard changes" -#~ msgstr "변경 사항 폐기 또는 유지" - -#~ msgid "Old Value" -#~ msgstr "이전 값" - -#~ msgid "New Value" -#~ msgstr "새로운 값" - -#~ msgid "Discard" -#~ msgstr "폐기" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index f589c3343c..a483824300 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1906,6 +1906,12 @@ msgstr "Rangschikken" msgid "arrange current plate" msgstr "Huidig printbed rangschikken" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Automatisch roteren" @@ -3144,6 +3150,45 @@ msgstr "Het uitvoeren van post-processing scripts" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Onbekende fout tijdens het exporteren van de G-code" @@ -7614,26 +7659,23 @@ msgstr "Niet gedefinieerd" msgid "Unsaved Changes" msgstr "niet-opgeslagen wijzigingen" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Verwerp of bewaar aanpassingen" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Oude waarde" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Nieuwe waarde" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Overdracht" msgid "Don't save" msgstr "Niet opslaan" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Verwerpen" msgid "Click the right mouse button to display the full text." msgstr "Klik op de rechtermuisknop om de volledige tekst weer te geven." @@ -7699,28 +7741,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7738,9 +7774,6 @@ msgstr "Toon alle presets (inclusief incompatibele)" msgid "Select presets to compare" msgstr "Select presets to compare" -msgid "Transfer" -msgstr "Overdracht" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15126,18 +15159,6 @@ msgstr "" #~ "Unable to perform boolean operation on model meshes. Only positive parts " #~ "will be exported." -#~ msgid "Transfer or discard changes" -#~ msgstr "Verwerp of bewaar aanpassingen" - -#~ msgid "Old Value" -#~ msgstr "Oude waarde" - -#~ msgid "New Value" -#~ msgstr "Nieuwe waarde" - -#~ msgid "Discard" -#~ msgstr "Verwerpen" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 69f559d8ad..fb4f19c32b 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: OrcaSlicer 2.0\n" +"Project-Id-Version: OrcaSlicer 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: \n" "Last-Translator: Krzysztof Morga \n" "Language-Team: \n" @@ -1950,6 +1950,12 @@ msgstr "Ustaw" msgid "arrange current plate" msgstr "ustaw bieżącą płytę" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Automatyczna rotacja" @@ -2419,10 +2425,10 @@ msgid "AMS not connected" msgstr "AMS niepodłączony" msgid "Load" -msgstr "" +msgstr "Ładuj" msgid "Unload" -msgstr "Wyładowaj" +msgstr "Wyładuj" msgid "Ext Spool" msgstr "Ext Spool" @@ -2487,6 +2493,8 @@ msgid "" "Choose an AMS slot then press \"Load\" or \"Unload\" button to automatically " "load or unload filaments." msgstr "" +"Wybierz Slot AMS, a następnie naciśnij przycisk \"Ładuj\" lub \"Wyładuj\" ," +"aby automatycznie załadować lub wyładować filamenty." msgid "Edit" msgstr "Edytuj" @@ -3122,12 +3130,14 @@ msgstr "" "filamentu, gdy obecny filament się skończy" msgid "Air Printing Detection" -msgstr "" +msgstr "Wykrywanie druku w powietrzu" msgid "" "Detects clogging and filament grinding, halting printing immediately to " "conserve time and filament." msgstr "" +"Wykrywa zatkanie i zacięcie się filamentu, natychmiast zatrzymując " +"drukowanie w celu oszczędzenia czasu i filamentu." msgid "File" msgstr "Plik" @@ -3207,6 +3217,45 @@ msgstr "Uruchamianie skryptu post-procesingu" msgid "Successfully executed post-processing script" msgstr "Pomyślnie wykonano skrypt post-processingu" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Nieznany błąd podczas eksportowania kodu G." @@ -3319,9 +3368,9 @@ msgid "" "Please make sure whether to use the temperature to print.\n" "\n" msgstr "" -"Extruder może być zablokowany, gdy temperatura wykracza poza zalecany " +"Dysza może zostać zablokowana, gdy temperatura wykracza poza zalecany " "zakres.\n" -"Upewnij się, czy temperatura jest odpowiednia do drukowania.\n" +"Upewnij się, czy temperatura do druku jest odpowiednia.\n" "\n" #, c-format, boost-format @@ -4273,7 +4322,7 @@ msgid "Device" msgstr "Urządzenie" msgid "Multi-device" -msgstr "" +msgstr "Wiele-Urządzeń" msgid "Project" msgstr "Projekt" @@ -4316,7 +4365,7 @@ msgid "Send all" msgstr "Wyślij wszystko" msgid "Send to Multi-device" -msgstr "" +msgstr "Wyślij do wielu urządzeń" msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" @@ -5576,10 +5625,12 @@ msgid "Filament Tangle Detect" msgstr "Wykrywanie splątanych filamentów" msgid "Nozzle Clumping Detection" -msgstr "" +msgstr "Wykrywanie \"zalepienia\" się dyszy" msgid "Check if the nozzle is clumping by filament or other foreign objects." msgstr "" +"Sprawdź, czy dysza nie została zatkana filamentem lub innych obcych " +"przedmiotem." msgid "Nozzle Type" msgstr "Rodzaj dyszy" @@ -6042,13 +6093,13 @@ msgid "prepare 3mf file..." msgstr "przygotuj plik 3mf..." msgid "Download failed, unknown file format." -msgstr "" +msgstr "Pobieranie nie powiodło się, nieznany format pliku." msgid "downloading project ..." msgstr "pobieranie projektu ..." msgid "Download failed, File size exception." -msgstr "" +msgstr "Pobieranie nie powiodło się, wyjątek - rozmiar pliku." #, c-format, boost-format msgid "Project downloaded %d%%" @@ -6058,6 +6109,8 @@ msgid "" "Importing to Bambu Studio failed. Please download the file and manually " "import it." msgstr "" +"Importowanie do OrcaSlicer nie powiodło się. Proszę pobrać plik i ręcznie go " +"zaimportować." msgid "Import SLA archive" msgstr "Importuj archiwum SLA" @@ -6336,19 +6389,25 @@ msgid "Units" msgstr "Jednostki" msgid "Allow only one OrcaSlicer instance" -msgstr "" +msgstr "Zezwól tylko na jedną instancję programu OrcaSlicer" msgid "" "On OSX there is always only one instance of app running by default. However " "it is allowed to run multiple instances of same app from the command line. " "In such case this settings will allow only one instance." msgstr "" +"W systemie macOS domyślnie działa tylko jedna instancja aplikacji. Jednak z " +"wiersza poleceń można uruchomić kilka instancji tej samej aplikacji. W takim " +"przypadku te ustawienia umożliwią działanie tylko jednej instancji." msgid "" "If this is enabled, when starting OrcaSlicer and another instance of the " "same OrcaSlicer is already running, that instance will be reactivated " "instead." msgstr "" +"Jeśli ta opcja jest włączona, po uruchomieniu OrcaSlicer, gdy inna instancja " +"tego samego OrcaSlicer jest już uruchomiona, ta instancja zostanie ponownie " +"aktywowana." msgid "Home" msgstr "Strona główna" @@ -6441,11 +6500,14 @@ msgstr "" msgid "Multi-device Management(Take effect after restarting Studio)." msgstr "" +"Obsługa wielu urządzeń (zacznie być aktywna po ponownym uruchomieniu Slicera)" msgid "" "With this option enabled, you can send a task to multiple devices at the " "same time and manage multiple devices." msgstr "" +"Dzięki tej opcji możesz wysyłać zadania do wielu urządzeń jednocześnie i " +"zarządzać nimi." msgid "Network" msgstr "Sieć" @@ -7101,7 +7163,7 @@ msgid "Modifying the device name" msgstr "Modyfikacja nazwy urządzenia" msgid "Bind with Pin Code" -msgstr "" +msgstr "Powiąż za pomocą kodu PIN" msgid "Send to Printer SD card" msgstr "Wysłać na kartę SD drukarki" @@ -7159,21 +7221,23 @@ msgid "" "Please Find the Pin Code in Account page on printer screen,\n" " and type in the Pin Code below." msgstr "" +"Proszę znaleźć kod PIN na ekranie drukarki w zakładce konta\n" +"i wprowadź go poniżej." msgid "Can't find Pin Code?" -msgstr "" +msgstr "Nie możesz odszukać kodu PIN?" msgid "Pin Code" -msgstr "" +msgstr "Kod PIN" msgid "Binding..." -msgstr "" +msgstr "Łączenie..." msgid "Please confirm on the printer screen" -msgstr "" +msgstr "Proszę potwierdzić na ekranie drukarki" msgid "Log in failed. Please check the Pin Code." -msgstr "" +msgstr "Logowanie nie powiodło się. Proszę sprawdzić kod PIN." msgid "Log in printer" msgstr "Zaloguj się do drukarki" @@ -7822,26 +7886,23 @@ msgstr "Niezdefiniowany" msgid "Unsaved Changes" msgstr "Niezapisane zmiany" -msgid "Actions For Unsaved Changes" -msgstr "Działania dotyczące niezapisanych zmian" +msgid "Transfer or discard changes" +msgstr "Przenieść lub odrzucić zmiany" -msgid "Preset Value" -msgstr "Wartość domyślna" +msgid "Old Value" +msgstr "Stara wartość" -msgid "Modified Value" -msgstr "Zmieniona wartość" +msgid "New Value" +msgstr "Nowa wartość" -msgid "Transfer Modified Value" -msgstr "Przenieś zmienioną wartość" +msgid "Transfer" +msgstr "Przenieś" msgid "Don't save" msgstr "Nie zapisuj" -msgid "Use Preset Value" -msgstr "Użyj wartości domyślnej" - -msgid "Save Modified Value" -msgstr "Zapisz zmienione wartości" +msgid "Discard" +msgstr "Odrzuć" msgid "Click the right mouse button to display the full text." msgstr "Kliknij prawym przyciskiem myszy, aby wyświetlić pełny tekst." @@ -7903,41 +7964,23 @@ msgstr "Zmieniono niektóre ustawienia profilu \"%1%\"." msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" -"\n" -"Czy chciałbyś zapisać te zmienione ustawienia (zmodyfikowaną wartość)?" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -"\n" -"\n" -"Czy chciałbyś zachować te zmienione ustawienia (zmodyfikowaną wartość) po " -"przełączeniu profilu?" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" -"Wcześniej zmodyfikowałeś swoje ustawienia i masz zamiar nadpisać je nowymi." msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" -"\n" -"Czy chcesz zachować obecnie zmienione ustawienia, czy może chcesz użyć " -"ustawień domyślnych?" - -msgid "" -"\n" -"Do you want to save your current modified settings?" -msgstr "" -"\n" -"Czy chcesz zapisać obecnie zmodyfikowane ustawienia?" msgid "Extruders count" msgstr "Liczba extruderów" @@ -7954,9 +7997,6 @@ msgstr "Pokaż wszystkie profile (łącznie z niekompatybilnymi)" msgid "Select presets to compare" msgstr "Wybierz profile do porównania" -msgid "Transfer" -msgstr "Przenieś" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -8450,37 +8490,37 @@ msgid "resume" msgstr "wznów" msgid "Resume Printing" -msgstr "" +msgstr "Wznów zadanie drukowania" msgid "Resume Printing(defects acceptable)" -msgstr "" +msgstr "Wznów drukowanie (wady są do zaakceptowania)" msgid "Resume Printing(problem solved)" -msgstr "" +msgstr "Wznów drukowanie (problem został rozwiązany)" msgid "Stop Printing" -msgstr "" +msgstr "Zatrzymaj Drukowanie" msgid "Check Assistant" -msgstr "" +msgstr "Sprawdź Asystenta" msgid "Filament Extruded, Continue" -msgstr "" +msgstr "Ekstruzja filamentu, Kontynuuj" msgid "Not Extruded Yet, Retry" -msgstr "" +msgstr "Jeszcze nie wydrukowano, Spróbuj ponownie" msgid "Finished, Continue" -msgstr "" +msgstr "Zakończono, Kontynuuj" msgid "Load Filament" msgstr "Ładuj" msgid "Filament Loaded, Resume" -msgstr "" +msgstr "Filament załadowany, Wznów" msgid "View Liveview" -msgstr "" +msgstr "Podgląd na żywo" msgid "Confirm and Update Nozzle" msgstr "Potwierdź i zaktualizuj dyszę" @@ -9300,7 +9340,7 @@ msgstr "" "grudek na powierzchni" msgid "Avoid crossing wall - Max detour length" -msgstr "- Maksymalna długość objazdu" +msgstr "Maksymalna długość objazdu" msgid "" "Maximum detour distance for avoiding crossing wall. Don't detour if the " @@ -10799,19 +10839,19 @@ msgid "Honeycomb" msgstr "Plaster miodu" msgid "Adaptive Cubic" -msgstr "Adaptacyjny sześcienny" +msgstr "Sześcian adaptacyjny" msgid "3D Honeycomb" msgstr "3D Plaster miodu" msgid "Support Cubic" -msgstr "Podpora sześcienna" +msgstr "Sześcian podparty" msgid "Lightning" msgstr "Piorun" msgid "Cross Hatch" -msgstr "" +msgstr "Krzyżowy podparty" msgid "Sparse infill anchor length" msgstr "Długość kotwiczenia wypełnienia" @@ -12103,8 +12143,9 @@ msgid "" "Z hop will only come into effect when Z is above this value and is below the " "parameter: \"Z hop upper boundary\"" msgstr "" -"Z-hop będzie działać tylko wtedy, gdy Z jest powyżej tej wartości i poniżej " -"parametru: \"górna granica Z-hop\"" +"Jeśli podana jest dodatnia wartość, oś Z będzie podnosić się tylko poniżej " +"ustawionej tutaj granicy. W ten sposób możesz zablokować podnoszenie się osi " +"Z powyżej ustawionej wysokości." msgid "Z hop upper boundary" msgstr "Górna granica Z-hop" @@ -12113,8 +12154,9 @@ msgid "" "If this value is positive, Z hop will only come into effect when Z is above " "the parameter: \"Z hop lower boundary\" and is below this value" msgstr "" -"Jeśli ta wartość jest dodatnia to Z-hop będzie działał tylko wtedy, gdy oś Z " -"jest powyżej i poniżej parametru: \"dolna granica Z-hop\"" +"Jeśli podano wartość dodatnią, oś Z będzie podnosić się tylko powyżej " +"określonej tutaj wysokości. Dzięki temu możesz wyłączyć podnoszenie osi Z " +"podczas drukowania pierwszych warstw (na początku drukowania)." msgid "Z hop type" msgstr "Typ Z-hop" @@ -12168,7 +12210,7 @@ msgid "Top and Bottom" msgstr "Na górnych i dolnych" msgid "Extra length on restart" -msgstr "Dodatkowa ilość dla powrotu" +msgstr "Dodatkowa długość przed wznowieniem" msgid "" "When the retraction is compensated after the travel move, the extruder will " @@ -12532,7 +12574,8 @@ msgid "" "expressed as a %, it will be computed over nozzle diameter" msgstr "" "Maksymalna odległość przesuwania punktów w XY, aby osiągnąć gładką spiralę. " -"Jeśli wyrażona w procentach, będzie obliczona na podstawie średnicy dyszy" +"Jeśli zostanie wyrażona w procentach, będzie obliczona na podstawie średnicy " +"dyszy" msgid "" "If smooth or traditional mode is selected, a timelapse video will be " @@ -14004,7 +14047,7 @@ msgid "load_obj: failed to parse" msgstr "load_obj: nie udało się przetworzyć" msgid "load mtl in obj: failed to parse" -msgstr "" +msgstr "load_obj: nie udało się przetworzyć" msgid "The file contains polygons with more than 4 vertices." msgstr "Plik zawiera wielokąty z więcej niż 4 wierzchołkami." @@ -14139,6 +14182,10 @@ msgid "" "historical results. \n" "Do you still want to continue the calibration?" msgstr "" +"To urządzenie może przechowywać tylko 16 wyników w historii dla jednej " +"dyszy. Możesz usunąć istniejące wyniki w historii, a następnie rozpocząć " +"kalibrację lub kontynuować, ale nie będzie można tworzyć nowych wyników " +"kalibracji. Czy nadal chcesz kontynuować kalibrację?" msgid "Connecting to printer..." msgstr "Łączenie z drukarką..." @@ -14163,6 +14210,8 @@ msgid "" "This machine type can only hold %d history results per nozzle. This result " "will not be saved." msgstr "" +"To urządzenie może przechowywać tylko %d wyników w historii dla jednej " +"dyszy. Ten wynik nie zostanie zapisany." msgid "Internal Error" msgstr "Błąd wewnętrzny" @@ -14547,12 +14596,13 @@ msgstr "Akcja" #, c-format, boost-format msgid "This machine type can only hold %d history results per nozzle." msgstr "" +"To urządzenie może przechowywać tylko %d wyników w historii dla jednej dyszy." msgid "Edit Flow Dynamics Calibration" msgstr "Edytuj Kalibrację Dynamiki Przepływu" msgid "New Flow Dynamic Calibration" -msgstr "" +msgstr "Nowa Kalibracji Dynamiki Przepływu" msgid "Ok" msgstr "Ok" @@ -15614,30 +15664,45 @@ msgid "" "It has a small layer height, and results in almost negligible layer lines " "and high printing quality. It is suitable for most general printing cases." msgstr "" +"Ta niska wysokość warstwy prowadzi do praktycznie niewidocznych warstw i " +"wysokiej jakości wydruku. Nadaje się do większości standardowych przypadków " +"druku." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has lower speeds " "and acceleration, and the sparse infill pattern is Gyroid. So, it results in " "much higher printing quality, but a much longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.2 mm, ma niższe " +"prędkości i przyspieszenia, a wzorzec rzadkiego wypełnienia to Gyroidalny. " +"Dlatego daje znacznie lepszą jakość druku, ale znacznie wydłuża czas druku." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a slightly " "bigger layer height, and results in almost negligible layer lines, and " "slightly shorter printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.2 mm, ma " +"nieznacznie większą wysokość warstwy, co skutkuje praktycznie " +"niezauważalnymi liniami warstw i nieco krótszym czasem druku." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a bigger layer " "height, and results in slightly visible layer lines, but shorter printing " "time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.2 mm, ma większą " +"wysokość warstwy, co skutkuje lekko widocznymi liniami warstw, ale krótszym " +"czasem druku." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer " "height, and results in almost invisible layer lines and higher printing " "quality, but shorter printing time." msgstr "" +"W porównaniu z domyślnym profilem dyszy o średnicy 0.2 mm, ma mniejszą " +"wysokość warstwy, co prowadzi do praktycznie niewidocznych linii warstw i " +"wyższej jakości druku, ale wydłuża czas druku." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer " @@ -15645,12 +15710,19 @@ msgid "" "Gyroid. So, it results in almost invisible layer lines and much higher " "printing quality, but much longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dyszy 0.2 mm, ma mniejszą wysokość " +"warstwy, niższe prędkości i przyspieszenie, oraz wzór wypełnienia jest " +"gyroidalny. To prowadzi do praktycznie niewidocznych linii warstw i wyższej " +"jakości druku, ale znacznie wydłuża czasu druku." msgid "" "Compared with the default profile of 0.2 mm nozzle, it has a smaller layer " "height, and results in minimal layer lines and higher printing quality, but " "shorter printing time." msgstr "" +"W porównaniu ze standardowym profilem dyszy o średnicy 0.2 mm, ten profil ma " +"mniejszą wysokość warstwy, co prowadzi do praktycznie niewidocznych linii " +"warstw i znacznie wyższa jakość wydruku, ale jednocześnie wydłuża jego czas." msgid "" "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer " @@ -15658,35 +15730,56 @@ msgid "" "Gyroid. So, it results in minimal layer lines and much higher printing " "quality, but much longer printing time." msgstr "" +"W porównaniu ze standardowym profilem dyszy o średnicy 0.2 mm, ma on " +"mniejszą wysokość warstwy, niższe prędkości i przyspieszenia, a także " +"zastosowany jest wzór wypełnienia Gyroid. To prowadzi do praktycznie " +"niewidocznych warstw i znacznie lepszej jakości wydruku, ale jednocześnie " +"wydłuża jego czas." msgid "" "It has a general layer height, and results in general layer lines and " "printing quality. It is suitable for most general printing cases." msgstr "" +"Ta standardowa wysokość warstwy zapewnia normalną jakość druku, odpowiednią " +"dla większości standardowych przypadków druku." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has more wall loops " "and a higher sparse infill density. So, it results in higher strength of the " "prints, but more filament consumption and longer printing time." msgstr "" +"W porównaniu ze standardowym profilem dla dyszy o średnicy 0.4 mm, ten " +"profil ma więcej obwodów i większą gęstość wypełnienia. To zwiększa " +"wytrzymałość wydruku, ale prowadzi także do większego zużycia materiału i " +"dłuższego czasu druku." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer " "height, and results in more apparent layer lines and lower printing quality, " "but slightly shorter printing time." msgstr "" +"W porównaniu ze standardowym profilem dla dyszy o średnicy 0.4 mm, ten " +"profil ma większą wysokość warstwy. W rezultacie warstwy są bardziej " +"widoczne, co obniża jakość druku, ale jednocześnie delikatnie skraca jego " +"czas." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a bigger layer " "height, and results in more apparent layer lines and lower printing quality, " "but shorter printing time." msgstr "" +"W porównaniu ze standardowym profilem dla dyszy o średnicy 0.4 mm, ten " +"profil ma większą wysokość warstwy. W rezultacie warstwy są bardziej " +"widoczne, co obniża jakość druku, ale jednocześnie skraca jego czas." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer " "height, and results in less apparent layer lines and higher printing " "quality, but longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.4 mm, ten profil ma " +"mniejszą wysokość warstwy. W rezultacie warstwy są mniej widoczne, co " +"skutkuje wyższą jakością druku, ale jednocześnie wydłuża się jego czas." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer " @@ -15694,12 +15787,19 @@ msgid "" "Gyroid. So, it results in less apparent layer lines and much higher printing " "quality, but much longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.4 mm, ten profil ma " +"mniejszą wysokość warstwy, niższe prędkości i przyspieszenia, oraz wzór " +"wypełnienia Gyroidalny. W rezultacie warstwy są mniej widoczne, co prowadzi " +"do znacznie wyższej jakości druku, ale zauważalnie dłuższego czasu druku." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer " "height, and results in almost negligible layer lines and higher printing " "quality, but longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.4 mm, ten profil ma " +"mniejszą wysokość warstwy. W rezultacie warstwy są prawie niewidoczne, co " +"prowadzi do wyższej jakości druku, ale wydłużenia jego czas." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer " @@ -15707,64 +15807,103 @@ msgid "" "Gyroid. So, it results in almost negligible layer lines and much higher " "printing quality, but much longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.4 mm, ten profil ma " +"mniejszą wysokość warstwy, niższe prędkości i przyspieszenia, a także " +"zastosowany wzór wypełnienia gyroidalnego. W rezultacie warstwy są prawie " +"niewidoczne, co prowadzi do znacznie wyższej jakości druku, ale wydłuża jego " +"czas." msgid "" "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer " "height, and results in almost negligible layer lines and longer printing " "time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.4 mm, ten profil ma " +"mniejszą wysokość warstwy. W rezultacie warstwy są prawie niewidoczne, co " +"prowadzi do wyższej jakości druku, ale wydłużenia jego czas." msgid "" "It has a big layer height, and results in apparent layer lines and ordinary " "printing quality and printing time." msgstr "" +"Ta wyższa wysokość warstwy, skutkuje widocznymi liniami warstw i zwykłą " +"jakością i czasem druku." msgid "" "Compared with the default profile of a 0.6 mm nozzle, it has more wall loops " "and a higher sparse infill density. So, it results in higher strength of the " "prints, but more filament consumption and longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.6 mm, ten profil ma " +"więcej obwodów i większą gęstość wypełnienia. Skutkuje to zwiększeniem " +"wytrzymałości wydrukowanego elementu, ale zwiększa zużycie materiału i czas " +"wydruku." msgid "" "Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer " "height, and results in more apparent layer lines and lower printing quality, " "but shorter printing time in some printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.6 mm, ten profil ma " +"większą wysokość warstwy. Skutkuje to bardziej zauważalnymi warstwami i " +"obniżeniem jakości druku, chociaż w niektórych przypadkach może skrócić jego " +"czas." msgid "" "Compared with the default profile of a 0.6 mm nozzle, it has a bigger layer " "height, and results in much more apparent layer lines and much lower " "printing quality, but shorter printing time in some printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.6 mm, ten profil ma " +"większą wysokość warstwy. Skutkuje to bardziej zauważalnymi warstwami i " +"znacznym obniżeniem jakości druku, chociaż w niektórych przypadkach może " +"skrócić jego czas." msgid "" "Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer " "height, and results in less apparent layer lines and slight higher printing " "quality, but longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.6 mm, ten profil ma " +"mniejszą wysokość warstwy. W rezultacie warstwy są mniej zauważalne, co " +"powoduje nieznaczny wzrost jakości druku, ale jednocześnie zwiększa czas " +"wydruku." msgid "" "Compared with the default profile of a 0.6 mm nozzle, it has a smaller layer " "height, and results in less apparent layer lines and higher printing " "quality, but longer printing time." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.6 mm, ten profil ma " +"mniejszą wysokość warstwy. W rezultacie warstwy są mniej zauważalne, co " +"prowadzi do wyższej jakości druku, ale wydłuża jego czas." msgid "" "It has a very big layer height, and results in very apparent layer lines, " "low printing quality and general printing time." msgstr "" +"Ta bardzo duża wysokość warstwy skutkuje wyraźnie widocznymi liniami warstw, " +"niską jakością druku, a także standardowym czasem druku." msgid "" "Compared with the default profile of a 0.8 mm nozzle, it has a bigger layer " "height, and results in very apparent layer lines and much lower printing " "quality, but shorter printing time in some printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0.8 mm, ten profil ma " +"nieco większą wysokość warstwy. W rezultacie są to wyraźnie widoczne warstwy " +"i znacznie niższa jakość druku, ale w niektórych przypadkach skraca to czas " +"wydruku." msgid "" "Compared with the default profile of a 0.8 mm nozzle, it has a much bigger " "layer height, and results in extremely apparent layer lines and much lower " "printing quality, but much shorter printing time in some printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0,8 mm, ten profil ma " +"znacznie większą wysokość warstwy. W rezultacie warstwy są bardzej widoczne, " +"a jakość druku znacznie niższa, ale w niektórych przypadkach znacznie skraca " +"się czas wydruku." msgid "" "Compared with the default profile of a 0.8 mm nozzle, it has a slightly " @@ -15772,12 +15911,20 @@ msgid "" "lines and slightly higher printing quality, but longer printing time in some " "printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0,8 mm, ten profil ma " +"nieco mniejszą wysokość warstwy. W rezultacie warstwy są nieco mniej " +"widoczne, a jakość druku jest nieco lepsza, ale w niektórych przypadkach " +"czas druku może się nieco wydłużyć." msgid "" "Compared with the default profile of a 0.8 mm nozzle, it has a smaller layer " "height, and results in less but still apparent layer lines and slightly " "higher printing quality, but longer printing time in some printing cases." msgstr "" +"W porównaniu z domyślnym profilem dla dyszy o średnicy 0,8 mm, ten profil ma " +"mniejszą wysokość warstwy, co prowadzi do mniejszych, ale nadal widocznych " +"warstw i lepszej jakości druku, a w niektórych przypadkach może się wydłużyć " +"czas wydruku." msgid "Connected to Obico successfully!" msgstr "Pomyślnie połączono z SimplyPrint!" @@ -16212,15 +16359,70 @@ msgstr "" "takimi jak ABS, odpowiednie zwiększenie temperatury podgrzewanej płyty może " "zmniejszyć prawdopodobieństwo odkształceń." +#~ msgid "Actions For Unsaved Changes" +#~ msgstr "Działania dotyczące niezapisanych zmian" + +#~ msgid "Preset Value" +#~ msgstr "Wartość domyślna" + +#~ msgid "Modified Value" +#~ msgstr "Zmieniona wartość" + +#~ msgid "Transfer Modified Value" +#~ msgstr "Przenieś zmienioną wartość" + +#~ msgid "Use Preset Value" +#~ msgstr "Użyj wartości domyślnej" + +#~ msgid "Save Modified Value" +#~ msgstr "Zapisz zmienione wartości" + +#~ msgid "" +#~ "\n" +#~ "Would you like to save these changed settings(modified value)?" +#~ msgstr "" +#~ "\n" +#~ "Czy chciałbyś zapisać te zmienione ustawienia (zmodyfikowaną wartość)?" + +#~ msgid "" +#~ "\n" +#~ "Would you like to keep these changed settings(modified value) after " +#~ "switching preset?" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Czy chciałbyś zachować te zmienione ustawienia (zmodyfikowaną wartość) po " +#~ "przełączeniu profilu?" + +#~ msgid "" +#~ "You have previously modified your settings and are about to overwrite " +#~ "them with new ones." +#~ msgstr "" +#~ "Wcześniej zmodyfikowałeś swoje ustawienia i masz zamiar nadpisać je " +#~ "nowymi." + +#~ msgid "" +#~ "\n" +#~ "Do you want to keep your current modified settings, or use preset " +#~ "settings?" +#~ msgstr "" +#~ "\n" +#~ "Czy chcesz zachować obecnie zmienione ustawienia, czy może chcesz użyć " +#~ "ustawień domyślnych?" + +#~ msgid "" +#~ "\n" +#~ "Do you want to save your current modified settings?" +#~ msgstr "" +#~ "\n" +#~ "Czy chcesz zapisać obecnie zmodyfikowane ustawienia?" + #~ msgid "Unload Filament" #~ msgstr "Wyładuj" -#~ msgid "" -#~ "Choose an AMS slot then press \"Load\" or \"Unload\" button to " -#~ "automatically load or unload filiament." +#~ msgid "A problem occured during calibration. Click to view the solution." #~ msgstr "" -#~ "Wybierz Slot AMS, a następnie naciśnij przycisk \"Ładuj\" lub \"Wyładuj" -#~ "\" ,aby automatycznie załadować lub wyładować filament." +#~ "Wystąpił problem podczas kalibracji. Kliknij, aby zobaczyć rozwiązanie." #~ msgid "MC" #~ msgstr "MC (Płytka główna)" @@ -16237,13 +16439,6 @@ msgstr "" #~ msgid "HMS" #~ msgstr "Stan drukarki (HMS)" -#~ msgid "" -#~ "Importing to Orca Slicer failed. Please download the file and manually " -#~ "import it." -#~ msgstr "" -#~ "Import do Orca Slicer nie powiódł się. Pobierz plik i zaimportuj go " -#~ "ręcznie." - #~ msgid "- ℃" #~ msgstr "- ℃" @@ -16253,15 +16448,6 @@ msgstr "" #~ msgid "0.005" #~ msgstr "0.005" -#~ msgid "New Flow Dynamics Calibration" -#~ msgstr "Nowa Kalibracji Dynamiki Przepływu" - -#~ msgid "If you would like to try Bambu Studio Beta, you may click to" -#~ msgstr "Jeśli chciałbyś wypróbować OrcaSlicer Beta, możesz kliknąć tutaj." - -#~ msgid "The 3mf file version is newer than the current Bambu Studio version." -#~ msgstr "Wersja pliku 3MF jest nowsza niż obecna w wersji OrcaSlicer." - #~ msgid "active" #~ msgstr "aktywny" @@ -16370,18 +16556,6 @@ msgstr "" #~ "Nie można wykonywać operacji boolowskich na siatkach modeli. Eksportowane " #~ "będą tylko części dodatnie." -#~ msgid "Transfer or discard changes" -#~ msgstr "Przenieść lub odrzucić zmiany" - -#~ msgid "Old Value" -#~ msgstr "Stara wartość" - -#~ msgid "New Value" -#~ msgstr "Nowa wartość" - -#~ msgid "Discard" -#~ msgstr "Odrzuć" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 71a7e201de..f84e1d99c5 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2024-04-16 11:17-0300\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" @@ -1958,6 +1958,12 @@ msgstr "Organizar" msgid "arrange current plate" msgstr "organizar mesa atual" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Auto-orientação" @@ -3205,6 +3211,45 @@ msgstr "Executando scripts de pós-processamento" msgid "Successfully executed post-processing script" msgstr "Script de pós-processamento executado com êxito" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Erro desconhecido ao exportar G-Code." @@ -7816,26 +7861,23 @@ msgstr "Indefinido" msgid "Unsaved Changes" msgstr "Alterações não salvas" -msgid "Actions For Unsaved Changes" -msgstr "Ações para Alterações Não Salvas" +msgid "Transfer or discard changes" +msgstr "" -msgid "Preset Value" -msgstr "Valor Predefinido" +msgid "Old Value" +msgstr "" -msgid "Modified Value" -msgstr "Valor Modificado" +msgid "New Value" +msgstr "" -msgid "Transfer Modified Value" -msgstr "Transferir Valor Modificado" +msgid "Transfer" +msgstr "Transferir" msgid "Don't save" msgstr "Não salvar" -msgid "Use Preset Value" -msgstr "Usar Valor Predefinido" - -msgid "Save Modified Value" -msgstr "Salvar Valor Modificado" +msgid "Discard" +msgstr "" msgid "Click the right mouse button to display the full text." msgstr "Clique com o botão direito do mouse para exibir o texto completo." @@ -7897,41 +7939,23 @@ msgstr "Você alterou algumas configurações do preset \"%1%\". " msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" -"\n" -"Você gostaria de salvar estas configurações alteradas (valor modificado)?" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -"\n" -"Você gostaria de manter estas configurações alteradas (valores modificados) " -"após mudar o preset?" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" -"Você modificou suas configurações anteriormente e está prestes a substituí-" -"las por novas." msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" -"\n" -"Você quer manter suas configurações atuais modificadas ou usar as " -"configurações predefinidas?" - -msgid "" -"\n" -"Do you want to save your current modified settings?" -msgstr "" -"\n" -"Você quer salvar suas configurações atuais modificadas?" msgid "Extruders count" msgstr "Número de extrusoras" @@ -7948,9 +7972,6 @@ msgstr "Mostrar todos os perfis (incluindo os incompatíveis)" msgid "Select presets to compare" msgstr "Selecione os perfis para comparar" -msgid "Transfer" -msgstr "Transferir" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16195,6 +16216,63 @@ msgstr "" "aumentar adequadamente a temperatura da mesa aquecida pode reduzir a " "probabilidade de empenamento?" +#~ msgid "Actions For Unsaved Changes" +#~ msgstr "Ações para Alterações Não Salvas" + +#~ msgid "Preset Value" +#~ msgstr "Valor Predefinido" + +#~ msgid "Modified Value" +#~ msgstr "Valor Modificado" + +#~ msgid "Transfer Modified Value" +#~ msgstr "Transferir Valor Modificado" + +#~ msgid "Use Preset Value" +#~ msgstr "Usar Valor Predefinido" + +#~ msgid "Save Modified Value" +#~ msgstr "Salvar Valor Modificado" + +#~ msgid "" +#~ "\n" +#~ "Would you like to save these changed settings(modified value)?" +#~ msgstr "" +#~ "\n" +#~ "Você gostaria de salvar estas configurações alteradas (valor modificado)?" + +#~ msgid "" +#~ "\n" +#~ "Would you like to keep these changed settings(modified value) after " +#~ "switching preset?" +#~ msgstr "" +#~ "\n" +#~ "Você gostaria de manter estas configurações alteradas (valores " +#~ "modificados) após mudar o preset?" + +#~ msgid "" +#~ "You have previously modified your settings and are about to overwrite " +#~ "them with new ones." +#~ msgstr "" +#~ "Você modificou suas configurações anteriormente e está prestes a " +#~ "substituí-las por novas." + +#~ msgid "" +#~ "\n" +#~ "Do you want to keep your current modified settings, or use preset " +#~ "settings?" +#~ msgstr "" +#~ "\n" +#~ "Você quer manter suas configurações atuais modificadas ou usar as " +#~ "configurações predefinidas?" + +#~ msgid "" +#~ "\n" +#~ "Do you want to save your current modified settings?" +#~ msgstr "" +#~ "\n" +#~ "Você quer salvar suas configurações atuais modificadas?" + #~ msgid "Unload Filament" #~ msgstr "Descarregar Filamento" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index fc84a34c0e..ea2a0c0088 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer V2.0.0 Official Release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2024-04-12 13:49+0700\n" "Last-Translator: \n" "Language-Team: andylg@yandex.ru\n" @@ -1957,6 +1957,12 @@ msgstr "Расставить" msgid "arrange current plate" msgstr "Расстановка моделей на текущем столе" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Автоповорот" @@ -3209,6 +3215,45 @@ msgstr "Запуск скриптов постобработки" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Неизвестная ошибка при экспорте G-кода." @@ -7808,26 +7853,23 @@ msgstr "Не задано" msgid "Unsaved Changes" msgstr "Несохранённые изменения" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Отклонить или сохранить изменения" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Старое значение" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Новое значение" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Перенести" msgid "Don't save" msgstr "Не сохранять" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Не сохранять" msgid "Click the right mouse button to display the full text." msgstr "Нажмите правой кнопкой мыши, чтобы отобразить полный текст." @@ -7889,28 +7931,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7928,9 +7964,6 @@ msgstr "Показать все профили (включая несовмес msgid "Select presets to compare" msgstr "Выберите профили для сравнения" -msgid "Transfer" -msgstr "Перенести" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16334,18 +16367,6 @@ msgstr "" #~ "Невозможно выполнить булевы операции над сетками модели. Будут " #~ "экспортированы только положительные части." -#~ msgid "Transfer or discard changes" -#~ msgstr "Отклонить или сохранить изменения" - -#~ msgid "Old Value" -#~ msgstr "Старое значение" - -#~ msgid "New Value" -#~ msgstr "Новое значение" - -#~ msgid "Discard" -#~ msgstr "Не сохранять" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 4598ec5a19..edc30815c7 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1892,6 +1892,12 @@ msgstr "Arrangera" msgid "arrange current plate" msgstr "Arrangera plattan" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Auto Rotera" @@ -3110,6 +3116,45 @@ msgstr "Kör efterbearbetnings skript" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Okänt fel vid exportering av G-code." @@ -7527,26 +7572,23 @@ msgstr "Oidentifierad" msgid "Unsaved Changes" msgstr "Ej sparade ändringar" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Överge eller Behåll ändringar" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Gammalt värde" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Nytt värde" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Överför" msgid "Don't save" msgstr "Spara inte" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Överge" msgid "Click the right mouse button to display the full text." msgstr "Högerklicka för att se hela texten." @@ -7608,28 +7650,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7647,9 +7683,6 @@ msgstr "Visa alla inställningar (inklusive inkompatibla)" msgid "Select presets to compare" msgstr "Välj förinställningar att jämföra" -msgid "Transfer" -msgstr "Överför" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -14938,18 +14971,6 @@ msgstr "" #~ "Det går inte att utföra booleska operationer på modell mesh. Endast " #~ "positiva delar kommer att exporteras." -#~ msgid "Transfer or discard changes" -#~ msgstr "Överge eller Behåll ändringar" - -#~ msgid "Old Value" -#~ msgstr "Gammalt värde" - -#~ msgid "New Value" -#~ msgstr "Nytt värde" - -#~ msgid "Discard" -#~ msgstr "Överge" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index d1c387a3af..529332d172 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2024-04-16 03:39+0300\n" "Last-Translator: Olcay ÖREN\n" "Language-Team: \n" @@ -1942,6 +1942,12 @@ msgstr "Hizala" msgid "arrange current plate" msgstr "mevcut plakayı hizala" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Otomatik döndürme" @@ -3172,6 +3178,45 @@ msgstr "İşlem sonrası komut dosyalarını çalıştırma" msgid "Successfully executed post-processing script" msgstr "İşlem sonrası komut dosyası başarıyla çalıştırıldı" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "G kodunu dışa aktarırken bilinmeyen hata." @@ -7738,26 +7783,23 @@ msgstr "Tanımsız" msgid "Unsaved Changes" msgstr "Kaydedilmemiş Değişiklikler" -msgid "Actions For Unsaved Changes" -msgstr "Kaydedilmemiş Değişikliklere İlişkin İşlemler" +msgid "Transfer or discard changes" +msgstr "Değişiklikleri Çıkart veya Sakla" -msgid "Preset Value" -msgstr "Ön ayar değeri" +msgid "Old Value" +msgstr "Eski Değer" -msgid "Modified Value" -msgstr "Değiştirilmiş Değer" +msgid "New Value" +msgstr "Yeni değer" -msgid "Transfer Modified Value" -msgstr "Değiştirilen Değeri Aktar" +msgid "Transfer" +msgstr "Aktar" msgid "Don't save" msgstr "Kaydetme" -msgid "Use Preset Value" -msgstr "Ön Ayar Değerini Kullan" - -msgid "Save Modified Value" -msgstr "Değiştirilen Değeri Kaydet" +msgid "Discard" +msgstr "Çıkart" msgid "Click the right mouse button to display the full text." msgstr "Tam metni görüntülemek için farenin sağ tuşuna tıklayın." @@ -7819,41 +7861,23 @@ msgstr "“%1%” ön ayarının bazı ayarlarını değiştirdiniz." msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" -"\n" -"Bu değişiklik ayarlarını (değiştirilen değer) kaydetmek ister misiniz?" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -"\n" -"Ön ayarı değiştirdikten sonra bu değiştirilen ayarları (değiştirilen değer) " -"korumak ister misiniz?" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" -"Ayarlarınızı daha önce değiştirdiniz ve bunların üzerine yenilerini yazmak " -"üzeresiniz." msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" -"\n" -"Geçerli değiştirilen ayarlarınızı korumak mı yoksa önceden ayarlanmış " -"ayarları mı kullanmak istiyorsunuz?" - -msgid "" -"\n" -"Do you want to save your current modified settings?" -msgstr "" -"\n" -"Geçerli değiştirilen ayarlarınızı kaydetmek istiyor musunuz?" msgid "Extruders count" msgstr "Ekstruder sayısı" @@ -7870,9 +7894,6 @@ msgstr "Tüm ön ayarları göster (uyumsuz olanlar dahil)" msgid "Select presets to compare" msgstr "Karşılaştırılacak ön ayarları seçin" -msgid "Transfer" -msgstr "Aktar" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -16004,6 +16025,63 @@ msgstr "" "sıcaklığının uygun şekilde arttırılmasının bükülme olasılığını " "azaltabileceğini biliyor muydunuz?" +#~ msgid "Actions For Unsaved Changes" +#~ msgstr "Kaydedilmemiş Değişikliklere İlişkin İşlemler" + +#~ msgid "Preset Value" +#~ msgstr "Ön ayar değeri" + +#~ msgid "Modified Value" +#~ msgstr "Değiştirilmiş Değer" + +#~ msgid "Transfer Modified Value" +#~ msgstr "Değiştirilen Değeri Aktar" + +#~ msgid "Use Preset Value" +#~ msgstr "Ön Ayar Değerini Kullan" + +#~ msgid "Save Modified Value" +#~ msgstr "Değiştirilen Değeri Kaydet" + +#~ msgid "" +#~ "\n" +#~ "Would you like to save these changed settings(modified value)?" +#~ msgstr "" +#~ "\n" +#~ "Bu değişiklik ayarlarını (değiştirilen değer) kaydetmek ister misiniz?" + +#~ msgid "" +#~ "\n" +#~ "Would you like to keep these changed settings(modified value) after " +#~ "switching preset?" +#~ msgstr "" +#~ "\n" +#~ "Ön ayarı değiştirdikten sonra bu değiştirilen ayarları (değiştirilen " +#~ "değer) korumak ister misiniz?" + +#~ msgid "" +#~ "You have previously modified your settings and are about to overwrite " +#~ "them with new ones." +#~ msgstr "" +#~ "Ayarlarınızı daha önce değiştirdiniz ve bunların üzerine yenilerini " +#~ "yazmak üzeresiniz." + +#~ msgid "" +#~ "\n" +#~ "Do you want to keep your current modified settings, or use preset " +#~ "settings?" +#~ msgstr "" +#~ "\n" +#~ "Geçerli değiştirilen ayarlarınızı korumak mı yoksa önceden ayarlanmış " +#~ "ayarları mı kullanmak istiyorsunuz?" + +#~ msgid "" +#~ "\n" +#~ "Do you want to save your current modified settings?" +#~ msgstr "" +#~ "\n" +#~ "Geçerli değiştirilen ayarlarınızı kaydetmek istiyor musunuz?" + #~ msgid "Unload Filament" #~ msgstr "Filamenti Çıkarın" @@ -16179,18 +16257,6 @@ msgstr "" #~ "Model ağlarında boole işlemi gerçekleştirilemiyor. Yalnızca pozitif " #~ "parçalar ihraç edilecektir." -#~ msgid "Transfer or discard changes" -#~ msgstr "Değişiklikleri Çıkart veya Sakla" - -#~ msgid "Old Value" -#~ msgstr "Eski Değer" - -#~ msgid "New Value" -#~ msgstr "Yeni değer" - -#~ msgid "Discard" -#~ msgstr "Çıkart" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 1effee350d..4e60a4526c 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2023-08-10 20:25-0400\n" "Last-Translator: \n" "Language-Team: \n" @@ -1904,6 +1904,12 @@ msgstr "Організувати" msgid "arrange current plate" msgstr "упорядкувати поточну табличку" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "Авто-поворот" @@ -3135,6 +3141,45 @@ msgstr "Запуск скриптів постобробки" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "Невідома помилка під час експорту G-коду." @@ -7567,26 +7612,23 @@ msgstr "Undef" msgid "Unsaved Changes" msgstr "Незбережені зміни" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "Відкинути або зберегти зміни" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "Старе значення" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "Нове значення" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "Передача" msgid "Don't save" msgstr "Не зберігати" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "Не зберігати" msgid "Click the right mouse button to display the full text." msgstr "Натисніть праву кнопку миші, щоб відобразити повний текст." @@ -7648,28 +7690,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7687,9 +7723,6 @@ msgstr "Показати всі налаштування (включаючи н msgid "Select presets to compare" msgstr "Виберіть налаштування для порівняння" -msgid "Transfer" -msgstr "Передача" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15094,18 +15127,6 @@ msgstr "" #~ msgid "Load failed [%d]!" #~ msgstr "Завантаження не вдалося [%d]!" -#~ msgid "Transfer or discard changes" -#~ msgstr "Відкинути або зберегти зміни" - -#~ msgid "Old Value" -#~ msgstr "Старе значення" - -#~ msgid "New Value" -#~ msgstr "Нове значення" - -#~ msgid "Discard" -#~ msgstr "Не зберігати" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 30f61de27e..64e4251179 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2023-04-01 13:21+0800\n" "Last-Translator: SoftFever \n" "Language-Team: \n" @@ -1887,6 +1887,12 @@ msgstr "自动摆放" msgid "arrange current plate" msgstr "在当前盘执行自动摆放" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "自动朝向" @@ -3039,6 +3045,45 @@ msgstr "运行后处理脚本" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "导出G-code文件发生未知错误。" @@ -7364,26 +7409,23 @@ msgstr "未定义" msgid "Unsaved Changes" msgstr "未保存的更改" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "放弃或保留更改" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "旧值" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "新值" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "迁移" msgid "Don't save" msgstr "不保存" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "放弃" msgid "Click the right mouse button to display the full text." msgstr "单击鼠标右键显示全文。" @@ -7441,28 +7483,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7480,9 +7516,6 @@ msgstr "显示所有预设(包括不兼容的)" msgid "Select presets to compare" msgstr "选择要比较的预设" -msgid "Transfer" -msgstr "迁移" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -14910,18 +14943,6 @@ msgstr "" #~ "will be exported." #~ msgstr "无法对模型网格执行布尔运算。只有正面部分将被导出。" -#~ msgid "Transfer or discard changes" -#~ msgstr "放弃或保留更改" - -#~ msgid "Old Value" -#~ msgstr "旧值" - -#~ msgid "New Value" -#~ msgstr "新值" - -#~ msgid "Discard" -#~ msgstr "放弃" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index d8c100ce4a..2ddad8f7fa 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 18:11+0800\n" +"POT-Creation-Date: 2024-05-01 00:42+0800\n" "PO-Revision-Date: 2023-11-06 14:37+0800\n" "Last-Translator: ablegods \n" "Language-Team: \n" @@ -1947,6 +1947,12 @@ msgstr "自動擺放" msgid "arrange current plate" msgstr "在列印板執行自動擺放" +msgid "Reload All" +msgstr "" + +msgid "reload all from disk" +msgstr "" + msgid "Auto Rotate" msgstr "自動旋轉方向" @@ -3161,6 +3167,45 @@ msgstr "執行後處理腳本" msgid "Successfully executed post-processing script" msgstr "" +msgid "Unknown error occured during exporting G-code." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. Maybe the SD " +"card is write locked?\n" +"Error message: %1%" +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code to the output G-code failed. There might be " +"problem with target device, please try exporting again or using different " +"device. The corrupted output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Renaming of the G-code after copying to the selected destination folder has " +"failed. Current path is %1%.tmp. Please try exporting again." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the original code at %1% " +"couldn't be opened during copy check. The output G-code is at %2%.tmp." +msgstr "" + +#, boost-format +msgid "" +"Copying of the temporary G-code has finished but the exported code couldn't " +"be opened during copy check. The output G-code is at %1%.tmp." +msgstr "" + +#, boost-format +msgid "G-code file exported to %1%" +msgstr "" + msgid "Unknown error when export G-code." msgstr "匯出 G-code 檔案發生未知錯誤。" @@ -7710,26 +7755,23 @@ msgstr "未定義" msgid "Unsaved Changes" msgstr "未儲存的更改" -msgid "Actions For Unsaved Changes" -msgstr "" +msgid "Transfer or discard changes" +msgstr "放棄或保留更改" -msgid "Preset Value" -msgstr "" +msgid "Old Value" +msgstr "舊值" -msgid "Modified Value" -msgstr "" +msgid "New Value" +msgstr "新值" -msgid "Transfer Modified Value" -msgstr "" +msgid "Transfer" +msgstr "遷移" msgid "Don't save" msgstr "不儲存" -msgid "Use Preset Value" -msgstr "" - -msgid "Save Modified Value" -msgstr "" +msgid "Discard" +msgstr "放棄" msgid "Click the right mouse button to display the full text." msgstr "單擊滑鼠右鍵顯示全文。" @@ -7787,28 +7829,22 @@ msgstr "" msgid "" "\n" -"Would you like to save these changed settings(modified value)?" +"You can save or discard the preset values you have modified." msgstr "" msgid "" "\n" -"Would you like to keep these changed settings(modified value) after " -"switching preset?" +"You can save or discard the preset values you have modified, or choose to " +"transfer the values you have modified to the new preset." msgstr "" -msgid "" -"You have previously modified your settings and are about to overwrite them " -"with new ones." +msgid "You have previously modified your settings." msgstr "" msgid "" "\n" -"Do you want to keep your current modified settings, or use preset settings?" -msgstr "" - -msgid "" -"\n" -"Do you want to save your current modified settings?" +"You can discard the preset values you have modified, or choose to transfer " +"the modified values to the new project" msgstr "" msgid "Extruders count" @@ -7828,9 +7864,6 @@ msgstr "顯示所有預設（包括不相容的）" msgid "Select presets to compare" msgstr "選擇要比較的預設" -msgid "Transfer" -msgstr "遷移" - msgid "" "You can only transfer to current active profile because it has been modified." msgstr "" @@ -15366,18 +15399,6 @@ msgstr "" #~ "will be exported." #~ msgstr "無法對模型網格執行布林運算。只有正面部分將被導出。" -#~ msgid "Transfer or discard changes" -#~ msgstr "放棄或保留更改" - -#~ msgid "Old Value" -#~ msgstr "舊值" - -#~ msgid "New Value" -#~ msgstr "新值" - -#~ msgid "Discard" -#~ msgstr "放棄" - #, boost-format #~ msgid "" #~ "You have changed some settings of preset \"%1%\". \n" diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json index 67939352a5..0f09f22753 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json @@ -17,7 +17,7 @@ "0x220" ], "printable_height": "250", - "nozzle_type": "undefined", + "nozzle_type": "undefine", "auxiliary_fan": "0", "machine_max_acceleration_extruding": [ "2500", diff --git a/resources/profiles/Creality/Creality Ender-3 V3_cover.png b/resources/profiles/Creality/Creality Ender-3 V3_cover.png new file mode 100644 index 0000000000..510f02d214 Binary files /dev/null and b/resources/profiles/Creality/Creality Ender-3 V3_cover.png differ diff --git a/resources/profiles/Creality/creality_ender3v3_buildplate_model.stl b/resources/profiles/Creality/creality_ender3v3_buildplate_model.stl new file mode 100644 index 0000000000..ef159f264b Binary files /dev/null and b/resources/profiles/Creality/creality_ender3v3_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png b/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png new file mode 100644 index 0000000000..2e8d441e67 Binary files /dev/null and b/resources/profiles/Creality/creality_ender3v3_buildplate_texture.png differ diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json index eaad0a146f..4e2ec8c491 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS @Ender-3V3-all.json @@ -12,6 +12,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json index 9a8f1a7731..dfc94c3573 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA @Ender-3V3-all.json @@ -12,6 +12,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json new file mode 100644 index 0000000000..c857a1f8c3 --- /dev/null +++ b/resources/profiles/Creality/filament/Creality Generic PA-CF @Ender-3V3-all.json @@ -0,0 +1,12 @@ +{ + "type": "filament", + "name": "Creality Generic PA-CF @Ender-3V3-all", + "inherits": "Creality Generic PA-CF", + "from": "system", + "setting_id": "GFSN99_01", + "instantiation": "true", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json index 1a5bc133de..45c1b47c05 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG @Ender-3V3-all.json @@ -22,6 +22,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json index 8230c3b931..fb286b690e 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA @Ender-3V3-all.json @@ -20,6 +20,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json index 1c09f3d775..e5ca2eb13c 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @Ender-3V3-all.json @@ -13,6 +13,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json index 3b5d9fabb8..5111e5091d 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @Ender-3V3-all.json @@ -11,6 +11,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json index b735ccfad6..85890efec7 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @Ender-3V3-all.json @@ -11,6 +11,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json index 75c2d8d834..7573352da8 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU @Ender-3V3-all.json @@ -18,6 +18,8 @@ "Creality Ender-3 V3 SE 0.4 nozzle", "Creality Ender-3 V3 SE 0.6 nozzle", "Creality Ender-3 V3 SE 0.8 nozzle", - "Creality Ender-3 V3 KE 0.4 nozzle" + "Creality Ender-3 V3 KE 0.4 nozzle", + "Creality Ender-3 V3 0.4 nozzle", + "Creality Ender-3 V3 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json new file mode 100644 index 0000000000..aa98469f20 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.4 nozzle.json @@ -0,0 +1,134 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-3 V3 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-3 V3", + "gcode_flavor": "klipper", + "printer_structure": "i3", + "default_print_profile": "0.20mm Standard @Creality Ender3V3", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "250", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "1", + "support_air_filtration": "0", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "30", + "30" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.6" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.12" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality Generic PLA @Ender-3V3-all" + ], + "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json new file mode 100644 index 0000000000..9298ddd5ea --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 0.6 nozzle.json @@ -0,0 +1,134 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-3 V3 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-3 V3", + "gcode_flavor": "klipper", + "printer_structure": "i3", + "default_print_profile": "0.30mm Standard @Creality Ender3V3", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6", + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "250", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "1", + "support_air_filtration": "0", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "30", + "30" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.6" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.12" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality Generic PLA @Ender-3V3-all" + ], + "machine_start_gcode": "M140 S0\nM104 S0\nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3.json b/resources/profiles/Creality/machine/Creality Ender-3 V3.json new file mode 100644 index 0000000000..fc5eb11265 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Creality Ender-3 V3", + "model_id": "Creality-Ender3-V3", + "nozzle_diameter": "0.4;0.6", + "machine_tech": "FFF", + "family": "Creality", + "bed_model": "creality_ender3v3_buildplate_model.stl", + "bed_texture": "creality_ender3v3_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Creality Generic ABS @Ender-3V3-all;Creality Generic ASA @Ender-3V3-all;Creality Generic PETG @Ender-3V3-all;Creality Generic PLA @Ender-3V3-all;Creality Generic PLA High Speed @Ender-3V3-all;Creality Generic PLA Matte @Ender-3V3-all;Creality Generic PLA Silk @Ender-3V3-all;Creality Generic TPU @Ender-3V3-all" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3 0.4 nozzle.json b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3 0.4 nozzle.json new file mode 100644 index 0000000000..faf79595ba --- /dev/null +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender3V3 0.4 nozzle.json @@ -0,0 +1,119 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "50", + "internal_bridge_speed": "150%", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "200", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.42", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.12", + "initial_layer_speed": "60", + "gap_infill_speed": "300", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "500", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "100", + "ironing_type": "no ironing", + "layer_height": "0.12", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "300", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "300", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.42", + "top_surface_acceleration": "5000", + "top_surface_speed": "200", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3 0.4 nozzle.json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3 0.4 nozzle.json new file mode 100644 index 0000000000..6e943bce52 --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender3V3 0.4 nozzle.json @@ -0,0 +1,119 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "50", + "internal_bridge_speed": "150%", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "200", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.42", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.16", + "initial_layer_speed": "60", + "gap_infill_speed": "300", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "500", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "100", + "ironing_type": "no ironing", + "layer_height": "0.16", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "300", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "300", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.42", + "top_surface_acceleration": "5000", + "top_surface_speed": "200", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3 0.4 nozzle.json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3 0.4 nozzle.json new file mode 100644 index 0000000000..8601eea963 --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender3V3 0.4 nozzle.json @@ -0,0 +1,119 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "50", + "internal_bridge_speed": "150%", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "200", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.42", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "60", + "gap_infill_speed": "300", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "500", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "100", + "ironing_type": "no ironing", + "layer_height": "0.2", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "300", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "300", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.42", + "top_surface_acceleration": "5000", + "top_surface_speed": "200", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender3V3 0.4 nozzle.json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender3V3 0.4 nozzle.json new file mode 100644 index 0000000000..d39a5b2573 --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender3V3 0.4 nozzle.json @@ -0,0 +1,119 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "50", + "internal_bridge_speed": "150%", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [ + "Creality Ender-3 V3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "200", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.42", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "60", + "gap_infill_speed": "300", + "infill_combination": "0", + "sparse_infill_line_width": "0.45", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "500", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "100", + "ironing_type": "no ironing", + "layer_height": "0.24", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "300", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "300", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.42", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.42", + "top_surface_acceleration": "5000", + "top_surface_speed": "200", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Optimal @Creality Ender3V3 0.6 nozzle.json b/resources/profiles/Creality/process/0.24mm Optimal @Creality Ender3V3 0.6 nozzle.json new file mode 100644 index 0000000000..9387a34a15 --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Optimal @Creality Ender3V3 0.6 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Optimal @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "30", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.62", + "outer_wall_speed": "120", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.62", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.24", + "initial_layer_speed": "50", + "gap_infill_speed": "50", + "infill_combination": "0", + "sparse_infill_line_width": "0.65", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "150", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.24", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.65", + "inner_wall_speed": "150", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.62", + "internal_solid_infill_speed": "150", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.62", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.62", + "top_surface_acceleration": "5000", + "top_surface_speed": "150", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0", + "compatible_printers": [ + "Creality Ender-3 V3 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.30mm Standard @Creality Ender3V3 0.6 nozzle.json b/resources/profiles/Creality/process/0.30mm Standard @Creality Ender3V3 0.6 nozzle.json new file mode 100644 index 0000000000..7735633a3c --- /dev/null +++ b/resources/profiles/Creality/process/0.30mm Standard @Creality Ender3V3 0.6 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Standard @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "30", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.62", + "outer_wall_speed": "120", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.62", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "50", + "gap_infill_speed": "50", + "infill_combination": "0", + "sparse_infill_line_width": "0.65", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "150", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.3", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.65", + "inner_wall_speed": "150", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.62", + "internal_solid_infill_speed": "150", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.62", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.62", + "top_surface_acceleration": "5000", + "top_surface_speed": "150", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0", + "compatible_printers": [ + "Creality Ender-3 V3 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Draft @Creality Ender3V3 0.6 nozzle.json b/resources/profiles/Creality/process/0.36mm Draft @Creality Ender3V3 0.6 nozzle.json new file mode 100644 index 0000000000..b286de423b --- /dev/null +++ b/resources/profiles/Creality/process/0.36mm Draft @Creality Ender3V3 0.6 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Draft @Creality Ender-3 V3", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_flow": "1", + "bridge_speed": "30", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "12000", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "outer_wall_line_width": "0.62", + "outer_wall_speed": "120", + "outer_wall_acceleration": "5000", + "inner_wall_acceleration": "5000", + "wall_infill_order": "inner wall/outer wall/infill", + "line_width": "0.62", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "grid", + "internal_bridge_support_thickness": "0.8", + "initial_layer_acceleration": "500", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.36", + "initial_layer_speed": "50", + "gap_infill_speed": "50", + "infill_combination": "0", + "sparse_infill_line_width": "0.65", + "infill_wall_overlap": "15%", + "sparse_infill_speed": "150", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.36", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "only_one_wall_top": "1", + "inner_wall_line_width": "0.65", + "inner_wall_speed": "150", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "0.62", + "internal_solid_infill_speed": "150", + "spiral_mode": "0", + "initial_layer_infill_speed": "105", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_style": "default", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_line_width": "0.62", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_expansion": "0", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_diameter": "2", + "tree_support_branch_angle": "45", + "tree_support_wall_count": "1", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_surface_line_width": "0.62", + "top_surface_acceleration": "5000", + "top_surface_speed": "150", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "travel_acceleration": "12000", + "travel_speed": "500", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "gcode_label_objects": "0", + "compatible_printers": [ + "Creality Ender-3 V3 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index 0a04225405..92284f4157 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -100,7 +100,7 @@ "default_filament_profile": [ "Qidi Generic PLA" ], - "machine_start_gcode": "G28\nG92 E0\nG0 X5 Y5 Z0.3 F3600\n", + "machine_start_gcode": "G28\nG92 E0\nG0 X300 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-19\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", "scan_first_layer": "0" } \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index ce361e8f2c..5ef98e7853 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -100,7 +100,7 @@ "default_filament_profile": [ "Qidi Generic PLA" ], - "machine_start_gcode": "G28\nG92 E0\nG0 X5 Y5 Z0.3 F3600\n", + "machine_start_gcode": "G28\nG92 E0\nG0 X270 Y5 Z50 F3600\nM190 S[bed_temperature_initial_layer_single]\nM109 S[first_layer_temperature]\nG92 E-16\n", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E0\nG1 E-3 F300\nG28\nM84\n", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 14fa20763b..e3cec4e55e 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -1490,6 +1490,17 @@ void MenuFactory::create_plate_menu() }, m_parent); + // reload all objects on current plate + append_menu_item( + menu, wxID_ANY, _L("Reload All"), _L("reload all from disk"), + [](wxCommandEvent&) { + PartPlate* plate = plater()->get_partplate_list().get_selected_plate(); + assert(plate); + plater()->set_prepare_state(Job::PREPARE_STATE_MENU); + plater()->reload_all_from_disk(); + }, + "", nullptr, []() { return !plater()->get_partplate_list().get_selected_plate()->get_objects().empty(); }, m_parent); + // orient objects on current plate append_menu_item(menu, wxID_ANY, _L("Auto Rotate"), _L("auto rotate current plate"), [](wxCommandEvent&) { diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 2e23d64e66..4d455038cd 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -924,29 +924,6 @@ void MainFrame::show_publish_button(bool show) // Layout(); } -void MainFrame::show_calibration_button(bool show) -{ -// #ifdef __APPLE__ -// bool shown = m_menubar->FindMenu(_L("Calibration")) != wxNOT_FOUND; -// if (shown == show) -// ; -// else if (show) -// m_menubar->Insert(3, m_calib_menu, wxString::Format("&%s", _L("Calibration"))); -// else -// m_menubar->Remove(3); -// #else -// topbar()->ShowCalibrationButton(show); -// #endif - show = !show; - auto shown2 = m_tabpanel->FindPage(m_calibration) != wxNOT_FOUND; - if (shown2 == show) - ; - else if (show) - m_tabpanel->InsertPage(tpCalibration, m_calibration, _L("Calibration"), std::string("tab_monitor_active"), std::string("tab_monitor_active"), false); - else - m_tabpanel->RemovePage(tpCalibration); -} - void MainFrame::update_title_colour_after_set_title() { #ifdef __APPLE__ @@ -1111,37 +1088,77 @@ void MainFrame::init_tabpanel() { // SoftFever void MainFrame::show_device(bool bBBLPrinter) { - if (m_tabpanel->GetPage(tpMonitor) != m_monitor && - m_tabpanel->GetPage(tpMonitor) != m_printer_view) { - BOOST_LOG_TRIVIAL(error) << "Failed to find device tab"; - return; - } - if (bBBLPrinter) { - if (m_tabpanel->GetPage(tpMonitor) != m_monitor) { - m_printer_view->Hide(); - m_monitor->Show(true); - m_tabpanel->RemovePage(tpMonitor); - m_tabpanel->InsertPage(tpMonitor, m_monitor, _L("Device"), - std::string("tab_monitor_active"), - std::string("tab_monitor_active")); - //m_tabpanel->SetSelection(tp3DEditor); - } - } else { - if (m_tabpanel->GetPage(tpMonitor) != m_printer_view) { - m_printer_view->Show(); + auto idx = -1; + if (bBBLPrinter) { + if (m_tabpanel->FindPage(m_monitor) != wxNOT_FOUND) + return; + // Remove printer view + if ((idx = m_tabpanel->FindPage(m_printer_view)) != wxNOT_FOUND) { + m_printer_view->Show(false); + m_tabpanel->RemovePage(idx); + } + + // Create/insert monitor page + if (!m_monitor) { + m_monitor = new MonitorPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_monitor->SetBackgroundColour(*wxWHITE); + } + m_monitor->Show(false); + m_tabpanel->InsertPage(tpMonitor, m_monitor, _L("Device"), std::string("tab_monitor_active"), std::string("tab_monitor_active")); + + if (wxGetApp().is_enable_multi_machine()) { + if (!m_multi_machine) { + m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_multi_machine->SetBackgroundColour(*wxWHITE); + } + // TODO: change the bitmap + m_multi_machine->Show(false); + m_tabpanel->InsertPage(tpMultiDevice, m_multi_machine, _L("Multi-device"), std::string("tab_multi_active"), + std::string("tab_multi_active"), false); + } + if (!m_calibration) { + m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); + m_calibration->SetBackgroundColour(*wxWHITE); + } + m_calibration->Show(false); + m_tabpanel->InsertPage(tpCalibration, m_calibration, _L("Calibration"), std::string("tab_calibration_active"), + std::string("tab_calibration_active"), false); + +#ifdef _MSW_DARK_MODE + wxGetApp().UpdateDarkUIWin(this); +#endif // _MSW_DARK_MODE + + } else { + if (m_tabpanel->FindPage(m_printer_view) != wxNOT_FOUND) + return; + + if ((idx = m_tabpanel->FindPage(m_calibration)) != wxNOT_FOUND) { + m_calibration->Show(false); + m_tabpanel->RemovePage(idx); + } + if ((idx = m_tabpanel->FindPage(m_multi_machine)) != wxNOT_FOUND) { + m_multi_machine->Show(false); + m_tabpanel->RemovePage(idx); + } + if ((idx = m_tabpanel->FindPage(m_monitor)) != wxNOT_FOUND) { m_monitor->Show(false); - m_tabpanel->RemovePage(tpMonitor); - m_tabpanel->InsertPage(tpMonitor, m_printer_view, _L("Device"), - std::string("tab_monitor_active"), - std::string("tab_monitor_active")); - //m_tabpanel->SetSelection(tp3DEditor); + m_tabpanel->RemovePage(idx); + } + if (m_printer_view == nullptr) { + m_printer_view = new PrinterWebView(m_tabpanel); + Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent& evt) { + wxString url = evt.GetString(); + wxString key = evt.GetAPIkey(); + // select_tab(MainFrame::tpMonitor); + m_printer_view->load_url(url, key); + }); + } + m_printer_view->Show(false); + m_tabpanel->InsertPage(tpMonitor, m_printer_view, _L("Device"), std::string("tab_monitor_active"), + std::string("tab_monitor_active")); } - } - - } - bool MainFrame::preview_only_hint() { if (m_plater && (m_plater->only_gcode_mode() || (m_plater->using_exported_file()))) { @@ -2012,9 +2029,12 @@ void MainFrame::on_dpi_changed(const wxRect& suggested_rect) //if (m_layout != ESettingsLayout::Dlg) // Do not update tabs if the Settings are in the separated dialog m_param_panel->msw_rescale(); m_project->msw_rescale(); - m_monitor->msw_rescale(); - m_multi_machine->msw_rescale(); - m_calibration->msw_rescale(); + if(m_monitor) + m_monitor->msw_rescale(); + if(m_multi_machine) + m_multi_machine->msw_rescale(); + if(m_calibration) + m_calibration->msw_rescale(); // BBS #if 0 @@ -2072,8 +2092,10 @@ void MainFrame::on_sys_color_changed() // update Plater wxGetApp().plater()->sys_color_changed(); - m_monitor->on_sys_color_changed(); - m_calibration->on_sys_color_changed(); + if(m_monitor) + m_monitor->on_sys_color_changed(); + if(m_calibration) + m_calibration->on_sys_color_changed(); // update Tabs for (auto tab : wxGetApp().tabs_list) tab->sys_color_changed(); @@ -3321,12 +3343,16 @@ void MainFrame::select_tab(wxPanel* panel) //BBS void MainFrame::jump_to_monitor(std::string dev_id) { + if(!m_monitor) + return; m_tabpanel->SetSelection(tpMonitor); ((MonitorPanel*)m_monitor)->select_machine(dev_id); } void MainFrame::jump_to_multipage() { + if(!m_multi_machine) + return; m_tabpanel->SetSelection(tpMultiDevice); ((MultiMachinePage*)m_multi_machine)->jump_to_send_page(); } diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 7c267f498c..18682a2071 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -259,7 +259,6 @@ public: void set_max_recent_count(int max); void show_publish_button(bool show); - void show_calibration_button(bool show); void update_title_colour_after_set_title(); void show_option(bool show); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index f3f2ef310a..4b8dac6345 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1200,9 +1200,7 @@ void Sidebar::update_all_preset_comboboxes() bool is_bbl_vendor = preset_bundle.is_bbl_vendor(); const bool use_bbl_network = preset_bundle.use_bbl_network(); - // Orca:: show device tab based on vendor type auto p_mainframe = wxGetApp().mainframe; - p_mainframe->show_device(use_bbl_network); auto cfg = preset_bundle.printers.get_edited_preset().config; if (use_bbl_network) { @@ -1268,7 +1266,9 @@ void Sidebar::update_all_preset_comboboxes() if (p->combo_printer) p->combo_printer->update(); - p_mainframe->m_tabpanel->SetSelection(p_mainframe->m_tabpanel->GetSelection()); + // Orca:: show device tab based on vendor type + p_mainframe->show_device(use_bbl_network); + p_mainframe->select_tab(MainFrame::tp3DEditor); } void Sidebar::update_presets(Preset::Type preset_type) @@ -1337,9 +1337,6 @@ void Sidebar::update_presets(Preset::Type preset_type) } Preset& printer_preset = wxGetApp().preset_bundle->printers.get_edited_preset(); - bool isBBL = preset_bundle.use_bbl_network(); - wxGetApp().mainframe->show_calibration_button(!isBBL); - if (auto printer_structure_opt = printer_preset.config.option>("printer_structure")) { wxGetApp().plater()->get_current_canvas3D()->get_arrange_settings().align_to_y_axis = (printer_structure_opt->value == PrinterStructure::psI3); } @@ -7084,7 +7081,7 @@ void Plater::priv::on_tab_selection_changing(wxBookCtrlEvent& e) if (new_sel == MainFrame::tpMonitor && wxGetApp().preset_bundle != nullptr) { auto cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config; wxString url = cfg.opt_string("print_host_webui").empty() ? cfg.opt_string("print_host") : cfg.opt_string("print_host_webui"); - if (url.empty()) { + if (main_frame->m_printer_view && url.empty()) { // It's missing_connection page, reload so that we can replay the gif image main_frame->m_printer_view->reload(); } diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 221d8db9df..a0ca677065 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -810,7 +810,7 @@ UnsavedChangesDialog::UnsavedChangesDialog(Preset::Type type, PresetCollection * : m_new_selected_preset_name(new_selected_preset) , DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY, - _L("Actions For Unsaved Changes"), + _L("Transfer or discard changes"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX) @@ -896,7 +896,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ wxBoxSizer *top_title_oldv = new wxBoxSizer(wxVERTICAL); wxBoxSizer *top_title_oldv_h = new wxBoxSizer(wxHORIZONTAL); - static_oldv_title = new wxStaticText(m_panel_oldv, wxID_ANY, _L("Preset Value"), wxDefaultPosition, wxDefaultSize, 0); + static_oldv_title = new wxStaticText(m_panel_oldv, wxID_ANY, _L("Old Value"), wxDefaultPosition, wxDefaultSize, 0); static_oldv_title->SetFont(::Label::Body_13); static_oldv_title->Wrap(-1); static_oldv_title->SetForegroundColour(*wxWHITE); @@ -915,7 +915,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ wxBoxSizer *top_title_newv = new wxBoxSizer(wxVERTICAL); wxBoxSizer *top_title_newv_h = new wxBoxSizer(wxHORIZONTAL); - static_newv_title = new wxStaticText(m_panel_newv, wxID_ANY, _L("Modified Value"), wxDefaultPosition, wxDefaultSize, 0); + static_newv_title = new wxStaticText(m_panel_newv, wxID_ANY, _L("New Value"), wxDefaultPosition, wxDefaultSize, 0); static_newv_title->SetFont(::Label::Body_13); static_newv_title->Wrap(-1); static_newv_title->SetForegroundColour(*wxWHITE); @@ -1011,19 +1011,19 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ if (dependent_presets && switched_presets && (type == dependent_presets->type() ? dependent_presets->get_edited_preset().printer_technology() == dependent_presets->find_preset(new_selected_preset)->printer_technology() : switched_presets->get_edited_preset().printer_technology() == switched_presets->find_preset(new_selected_preset)->printer_technology())) - add_btn(&m_transfer_btn, m_move_btn_id, "menu_paste", Action::Transfer, /*switched_presets->get_edited_preset().name == new_selected_preset ? */_L("Transfer Modified Value"), true); + add_btn(&m_transfer_btn, m_move_btn_id, "menu_paste", Action::Transfer, switched_presets->get_edited_preset().name == new_selected_preset ? _L("Transfer") : _L("Transfer"), true); } if (!m_transfer_btn && (ActionButtons::KEEP & m_buttons)) - add_btn(&m_transfer_btn, m_move_btn_id, "menu_paste", Action::Transfer, _L("Transfer Modified Value"), true); + add_btn(&m_transfer_btn, m_move_btn_id, "menu_paste", Action::Transfer, _L("Transfer"), true); { // "Don't save" / "Discard" button std::string btn_icon = (ActionButtons::DONT_SAVE & m_buttons) ? "" : (dependent_presets || (ActionButtons::KEEP & m_buttons)) ? "blank_16" : "exit"; - wxString btn_label = (ActionButtons::DONT_SAVE & m_buttons) ? _L("Don't save") : _L("Use Preset Value"); + wxString btn_label = (ActionButtons::DONT_SAVE & m_buttons) ? _L("Don't save") : _L("Discard"); add_btn(&m_discard_btn, m_continue_btn_id, btn_icon, Action::Discard, btn_label, false); } // "Save" button - if (ActionButtons::SAVE & m_buttons) add_btn(&m_save_btn, m_save_btn_id, "save", Action::Save, _L("Save Modified Value"), false); + if (ActionButtons::SAVE & m_buttons) add_btn(&m_save_btn, m_save_btn_id, "save", Action::Save, _L("Save"), false); /* ScalableButton *cancel_btn = new ScalableButton(this, wxID_CANCEL, "cross", _L("Cancel"), wxDefaultSize, wxDefaultPosition, wxBORDER_DEFAULT, true, 24); buttons->Add(cancel_btn, 1, wxLEFT | wxRIGHT, 5); @@ -1429,18 +1429,18 @@ void UnsavedChangesDialog::update(Preset::Type type, PresetCollection* dependent if (dependent_presets) { action_msg = format_wxstr(_L("You have changed some settings of preset \"%1%\". "), dependent_presets->get_edited_preset().name); if (!m_transfer_btn) { - action_msg += _L("\nWould you like to save these changed settings(modified value)?"); + action_msg += _L("\nYou can save or discard the preset values you have modified."); } else { - action_msg += _L("\nWould you like to keep these changed settings(modified value) after switching preset?"); + action_msg += _L("\nYou can save or discard the preset values you have modified, or choose to transfer the values you have modified to the new preset."); } } else { - action_msg = _L("You have previously modified your settings and are about to overwrite them with new ones."); + action_msg = _L("You have previously modified your settings."); if (m_transfer_btn) - action_msg += _L("\nDo you want to keep your current modified settings, or use preset settings?"); + action_msg += _L("\nYou can discard the preset values you have modified, or choose to transfer the modified values to the new project"); else - action_msg += _L("\nDo you want to save your current modified settings?"); + action_msg += _L("\nYou can save or discard the preset values you have modified."); } - + m_action_line->SetLabel(action_msg); update_tree(type, presets); diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index 36778f6816..25835c8858 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -106,6 +106,10 @@ int TabCtrl::AppendItem(const wxString &item, btn->SetBackgroundColor(StateColor()); btn->SetCornerRadius(0); btn->SetPaddingSize({TAB_BUTTON_PADDING}); + wxClientDC dc(this); // ORCA calculate tab width from bold font to prevent tab movements on tab change + dc.SetFont(this->bold); + btn->SetMinSize(wxSize(dc.GetTextExtent(item).x + TAB_BUTTON_PADDING_X * 2, btn->GetSize().GetHeight())); + dc.Clear(); btns.push_back(btn); if (btns.size() > 1) sizer->GetItem(sizer->GetItemCount() - 1)->SetMinSize({0, 0}); @@ -304,7 +308,7 @@ void TabCtrl::doRender(wxDC& dc) #else dc.SetPen(wxPen(border_color.colorForStates(states), border_width)); dc.DrawLine(0, size.y - BS2, size.x, size.y - BS2); - wxColour c(0xf2, 0x75, 0x4e, 0xff); + wxColour c = wxColour("#009688"); // ORCA: Controls under line color on selected tab dc.SetPen(wxPen(c, 1)); dc.SetBrush(c); dc.DrawRoundedRectangle(x1 - radius, size.y - BS2 - border_width * 3, x2 + radius * 2 - x1, border_width * 3, radius);