Ros-diffs June 2023

ros-diffs@reactos.org

20 participants
155 discussions

[reactos] 01/01: [MSPAINT] Realize Masked Skew

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9afcbea24e25f1ee46dd8… commit 9afcbea24e25f1ee46dd85fe28772dba8bd5ec09 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 09:56:02 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 09:56:02 2023 +0900 [MSPAINT] Realize Masked Skew - Add CreateMonoBitmap and CopyMonoImage functions to dib.cpp. - Add bMono parameter to SkewDIB function. - Add hbmMask parameter to InsertFromHBITMAP function. - Add ToolsModel::IsSelection. CORE-18867 --- base/applications/mspaint/canvas.cpp | 2 +- base/applications/mspaint/dib.cpp | 57 ++++++++++++++++++++++++++- base/applications/mspaint/dib.h | 5 ++- base/applications/mspaint/selectionmodel.cpp | 58 ++++++++++++++++++++-------- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/toolsmodel.cpp | 5 +++ base/applications/mspaint/toolsmodel.h | 2 + base/applications/mspaint/winproc.cpp | 7 +--- 8 files changed, 111 insertions(+), 27 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 8588aa76522..85b53df3273 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -449,7 +449,7 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL { toolsModel.OnMouseMove(TRUE, pt.x, pt.y); Invalidate(FALSE); - if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) + if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || toolsModel.IsSelection()) { CString strSize; if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index cb34859bd56..d72136f79d6 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -36,6 +36,26 @@ CreateDIBWithProperties(int width, int height) return CreateDIBSection(NULL, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); } +HBITMAP +CreateMonoBitmap(int width, int height, BOOL bWhite) +{ + HBITMAP hbm = CreateBitmap(width, height, 1, 1, NULL); + if (hbm == NULL) + return NULL; + + if (bWhite) + { + HDC hdc = CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = SelectObject(hdc, hbm); + RECT rc = { 0, 0, width, height }; + FillRect(hdc, &rc, (HBRUSH)GetStockObject(WHITE_BRUSH)); + SelectObject(hdc, hbmOld); + DeleteDC(hdc); + } + + return hbm; +} + HBITMAP CreateColorDIB(int width, int height, COLORREF rgb) { @@ -59,6 +79,34 @@ CreateColorDIB(int width, int height, COLORREF rgb) return ret; } +HBITMAP CopyMonoImage(HBITMAP hbm, INT cx, INT cy) +{ + BITMAP bm; + if (!GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + if (cx == 0 || cy == 0) + { + cx = bm.bmWidth; + cy = bm.bmHeight; + } + + HBITMAP hbmNew = CreateBitmap(cx, cy, 1, 1, NULL); + if (!hbmNew) + return NULL; + + HDC hdc1 = CreateCompatibleDC(NULL); + HDC hdc2 = CreateCompatibleDC(NULL); + HGDIOBJ hbm1Old = SelectObject(hdc1, hbm); + HGDIOBJ hbm2Old = SelectObject(hdc2, hbmNew); + StretchBlt(hdc2, 0, 0, cx, cy, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + SelectObject(hdc1, hbm1Old); + SelectObject(hdc1, hbm2Old); + DeleteDC(hdc1); + DeleteDC(hdc2); + return hbmNew; +} + HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight) { if (minimalWidth <= 0) @@ -283,7 +331,7 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) #define M_PI 3.14159265 #endif -HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { if (nDegree == 0) return CopyDIBImage(hbm); @@ -301,7 +349,11 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) if (dx == 0 && dy == 0) return CopyDIBImage(hbm); - HBITMAP hbmNew = CreateColorDIB(cx + dx, cy + dy, RGB(255, 255, 255)); + HBITMAP hbmNew; + if (bMono) + hbmNew = CreateMonoBitmap(cx + dx, cy + dy, FALSE); + else + hbmNew = CreateColorDIB(cx + dx, cy + dy, RGB(255, 255, 255)); if (!hbmNew) return NULL; @@ -329,6 +381,7 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) BitBlt(hDC2, delta, y, cx, 1, hDC1, 0, y, SRCCOPY); } } + SelectObject(hDC2, hbm2Old); DeleteDC(hDC2); return hbmNew; diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 4958f612673..0aa6fa41796 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -9,9 +9,12 @@ #pragma once HBITMAP CreateDIBWithProperties(int width, int height); +HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); + static inline HBITMAP CopyDIBImage(HBITMAP hbm, INT cx = 0, INT cy = 0) { return (HBITMAP)CopyImage(hbm, IMAGE_BITMAP, cx, cy, LR_COPYRETURNORG | LR_CREATEDIBSECTION); @@ -31,7 +34,7 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono); -HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical); +HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono = FALSE); float PpcmFromDpi(float dpi); diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index fb28ad5033a..b96213313b1 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -209,19 +209,27 @@ void SelectionModel::Landing() HideSelection(); } -void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) +void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP hbmMask) { ::DeleteObject(m_hbmColor); - m_hbmColor = CopyDIBImage(hBm); + m_hbmColor = CopyDIBImage(hbmColor); m_rc.left = x; m_rc.top = y; - m_rc.right = x + GetDIBWidth(hBm); - m_rc.bottom = y + GetDIBHeight(hBm); + m_rc.right = x + GetDIBWidth(hbmColor); + m_rc.bottom = y + GetDIBHeight(hbmColor); - NotifyContentChanged(); + if (hbmMask) + { + ::DeleteObject(m_hbmMask); + m_hbmMask = CopyMonoImage(hbmMask); + } + else + { + ClearMask(); + } - ClearMask(); + NotifyContentChanged(); } void SelectionModel::FlipHorizontally() @@ -336,29 +344,45 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int INT newWidth = oldWidth * nStretchPercentX / 100; INT newHeight = oldHeight * nStretchPercentY / 100; + HBITMAP hbmColor, hbmMask; + HGDIOBJ hbmOld; + + if (m_hbmMask == NULL) + m_hbmMask = CreateMonoBitmap(newWidth, newHeight, TRUE); + if (oldWidth != newWidth || oldHeight != newHeight) { - HBITMAP hbm0 = CopyDIBImage(m_hbmColor, newWidth, newHeight); - InsertFromHBITMAP(hbm0, m_rc.left, m_rc.top); - ::DeleteObject(hbm0); + hbmColor = CopyDIBImage(m_hbmColor, newWidth, newHeight); + hbmMask = CopyMonoImage(m_hbmMask, newWidth, newHeight); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } HDC hDC = ::CreateCompatibleDC(NULL); if (nSkewDegX) { - ::SelectObject(hDC, m_hbmColor); - HBITMAP hbm1 = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); - InsertFromHBITMAP(hbm1, m_rc.left, m_rc.top); - ::DeleteObject(hbm1); + hbmOld = ::SelectObject(hDC, m_hbmColor); + hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); + ::SelectObject(hDC, m_hbmMask); + hbmMask = SkewDIB(hDC, m_hbmMask, nSkewDegX, FALSE, TRUE); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::SelectObject(hDC, hbmOld); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } if (nSkewDegY) { - ::SelectObject(hDC, m_hbmColor); - HBITMAP hbm2 = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); - InsertFromHBITMAP(hbm2, m_rc.left, m_rc.top); - ::DeleteObject(hbm2); + hbmOld = ::SelectObject(hDC, m_hbmColor); + hbmColor = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); + ::SelectObject(hDC, m_hbmMask); + hbmMask = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE, TRUE); + InsertFromHBITMAP(hbmColor, m_rc.left, m_rc.top, hbmMask); + ::SelectObject(hDC, hbmOld); + ::DeleteObject(hbmColor); + ::DeleteObject(hbmMask); } ::DeleteDC(hDC); diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 230c87dfdf5..248ae03f0d6 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -47,7 +47,7 @@ public: void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); void DrawBackgroundRect(HDC hDCImage, COLORREF crBg); void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); - void InsertFromHBITMAP(HBITMAP hBm, INT x = 0, INT y = 0); + void InsertFromHBITMAP(HBITMAP hbmColor, INT x = 0, INT y = 0, HBITMAP hbmMask = NULL); // operation void FlipHorizontally(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 76a123513b5..7593bc964c4 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -40,6 +40,11 @@ ToolBase *ToolsModel::GetOrCreateTool(TOOLTYPE nTool) return m_tools[nTool]; } +BOOL ToolsModel::IsSelection() const +{ + return (GetActiveTool() == TOOL_RECTSEL || GetActiveTool() == TOOL_FREESEL); +} + int ToolsModel::GetLineWidth() const { return m_lineWidth; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b8c819590a7..b31183b3584 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -82,6 +82,8 @@ private: public: ToolsModel(); ~ToolsModel(); + + BOOL IsSelection() const; int GetLineWidth() const; void SetLineWidth(int nLineWidth); int GetShapeStyle() const; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 72947626a8c..7a22b153794 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -419,9 +419,7 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HMENU menu = (HMENU)wParam; - BOOL trueSelection = - (selectionModel.m_bShow && - ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL trueSelection = (selectionModel.m_bShow && toolsModel.IsSelection()); BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); DWORD dwStart = 0, dwEnd = 0; if (textShown) @@ -667,8 +665,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } if (selectionModel.m_bShow) { - if (toolsModel.GetActiveTool() == TOOL_RECTSEL || - toolsModel.GetActiveTool() == TOOL_FREESEL) + if (toolsModel.IsSelection()) { canvasWindow.cancelDrawing(); break;

1 year, 4 months

[reactos] 01/01: [MSPAINT] Don't show canvas size boxes if textEditWindow is shown

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6bd638b4de41253e0a39… commit f6bd638b4de41253e0a39cc6e34eaa5a65ddcc79 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 08:36:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 08:36:45 2023 +0900 [MSPAINT] Don't show canvas size boxes if textEditWindow is shown CORE-18867 --- base/applications/mspaint/canvas.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 45c182cf3bd..8588aa76522 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -96,6 +96,8 @@ VOID CCanvasWindow::GetImageRect(RECT& rc) CANVAS_HITTEST CCanvasWindow::CanvasHitTest(POINT pt) { + if (selectionModel.m_bShow || ::IsWindowVisible(textEditWindow)) + return HIT_INNER; RECT rcBase = GetBaseRect(); return getSizeBoxHitTest(pt, &rcBase); } @@ -112,7 +114,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) // Draw the sizeboxes if necessary RECT rcBase = GetBaseRect(); - if (!selectionModel.m_bShow) + if (!selectionModel.m_bShow && !::IsWindowVisible(textEditWindow)) drawSizeBoxes(hdcMem0, &rcBase, FALSE, &rcPaint); // Calculate image size

1 year, 4 months

[reactos] 01/01: [MSPAINT] Smartly restrict CTextEditWindow's size and position

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17bdf554743f08a32c940… commit 17bdf554743f08a32c940a1185cef4fb5a05fc38 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 08:24:17 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 19 08:25:23 2023 +0900 [MSPAINT] Smartly restrict CTextEditWindow's size and position ...by using WM_SIZING and WM_MOVING. CORE-18867 --- base/applications/mspaint/selectionmodel.cpp | 1 + base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/textedit.cpp | 117 +++++++++++++++++++++------ base/applications/mspaint/textedit.h | 5 +- 4 files changed, 97 insertions(+), 28 deletions(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 1137453dd3f..fb28ad5033a 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -18,6 +18,7 @@ SelectionModel::SelectionModel() , m_hbmMask(NULL) , m_ptStack(NULL) , m_iPtSP(0) + , m_rgbBack(RGB(255, 255, 255)) , m_bShow(FALSE) , m_bContentChanged(FALSE) { diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index c2ec6bffbc2..230c87dfdf5 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -18,7 +18,7 @@ private: int m_iPtSP; public: - COLORREF m_rgbBack = RGB(255, 255, 255); + COLORREF m_rgbBack; BOOL m_bShow; BOOL m_bContentChanged; CRect m_rc; // in image pixel coordinates diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 6d84a12c285..8ec1155d1c9 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -200,12 +200,6 @@ LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT ret = DefWindowProc(nMsg, wParam, lParam); - - if (m_nAppIsMovingOrSizing == 0) - { - Reposition(); - InvalidateEditRect(); - } return ret; } @@ -218,12 +212,6 @@ LRESULT CTextEditWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b SendMessage(EM_SETRECTNP, 0, (LPARAM)&rc); SendMessage(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0)); - if (m_nAppIsMovingOrSizing == 0) - { - Reposition(); - InvalidateEditRect(); - } - return ret; } @@ -400,27 +388,104 @@ void CTextEditWindow::ValidateEditRect(LPCRECT prc OPTIONAL) --m_nAppIsMovingOrSizing; } -void CTextEditWindow::Reposition() +LRESULT CTextEditWindow::OnMoving(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - CRect rc; - GetWindowRect(&rc); - ::MapWindowPoints(NULL, canvasWindow, (LPPOINT)&rc, 2); - canvasWindow.CanvasToImage(rc); + // Restrict the window position to the image area + LPRECT prcMoving = (LPRECT)lParam; + CRect rcMoving = *prcMoving; CRect rcImage; canvasWindow.GetImageRect(rcImage); + canvasWindow.ImageToCanvas(rcImage); + canvasWindow.MapWindowPoints(NULL, &rcImage); - // FIXME: Smartly restrict the position and size by using WM_WINDOWPOSCHANGING - if (rc.left < 0) - ::OffsetRect(&rc, -rc.left, 0); - if (rc.top < 0) - ::OffsetRect(&rc, 0, -rc.top); + CRect rcWnd; + GetWindowRect(&rcWnd); + INT cx = rcWnd.Width(), cy = rcWnd.Height(); - canvasWindow.ImageToCanvas(rc); + if (rcMoving.left < rcImage.left) + { + rcMoving.left = rcImage.left; + rcMoving.right = rcImage.left + cx; + } + else if (rcMoving.right > rcImage.right) + { + rcMoving.right = rcImage.right; + rcMoving.left = rcImage.right - cx; + } - ++m_nAppIsMovingOrSizing; - MoveWindow(rc.left, rc.top, rc.Width(), rc.Height(), TRUE); - --m_nAppIsMovingOrSizing; + if (rcMoving.top < rcImage.top) + { + rcMoving.top = rcImage.top; + rcMoving.bottom = rcImage.top + cy; + } + else if (rcMoving.bottom > rcImage.bottom) + { + rcMoving.bottom = rcImage.bottom; + rcMoving.top = rcImage.bottom - cy; + } + + *prcMoving = rcMoving; + Invalidate(TRUE); + return TRUE; +} + +LRESULT CTextEditWindow::OnSizing(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Restrict the window size to the image area + LPRECT prcSizing = (LPRECT)lParam; + CRect rcSizing = *prcSizing; + + CRect rcImage; + canvasWindow.GetImageRect(rcImage); + canvasWindow.ImageToCanvas(rcImage); + canvasWindow.MapWindowPoints(NULL, &rcImage); + + // Horizontally + switch (wParam) + { + case WMSZ_BOTTOMLEFT: + case WMSZ_LEFT: + case WMSZ_TOPLEFT: + if (rcSizing.left < rcImage.left) + rcSizing.left = rcImage.left; + break; + case WMSZ_BOTTOMRIGHT: + case WMSZ_RIGHT: + case WMSZ_TOPRIGHT: + if (rcSizing.right > rcImage.right) + rcSizing.right = rcImage.right; + break; + case WMSZ_TOP: + case WMSZ_BOTTOM: + default: + break; + } + + // Vertically + switch (wParam) + { + case WMSZ_BOTTOM: + case WMSZ_BOTTOMLEFT: + case WMSZ_BOTTOMRIGHT: + if (rcSizing.bottom > rcImage.bottom) + rcSizing.bottom = rcImage.bottom; + break; + case WMSZ_TOP: + case WMSZ_TOPLEFT: + case WMSZ_TOPRIGHT: + if (rcSizing.top < rcImage.top) + rcSizing.top = rcImage.top; + break; + case WMSZ_LEFT: + case WMSZ_RIGHT: + default: + break; + } + + *prcSizing = rcSizing; + Invalidate(TRUE); + return TRUE; } LRESULT CTextEditWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 95fb3e6ca45..7060919cae6 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -32,6 +32,8 @@ public: MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) + MESSAGE_HANDLER(WM_MOVING, OnMoving) + MESSAGE_HANDLER(WM_SIZING, OnSizing) MESSAGE_HANDLER(WM_CHAR, OnChar) MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkGnd) @@ -56,6 +58,8 @@ public: LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnMoving(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSizing(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnChar(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -82,5 +86,4 @@ protected: INT DoHitTest(RECT& rc, POINT pt); void DrawGrip(HDC hDC, RECT& rc); - void Reposition(); };

1 year, 4 months

[reactos] 01/01: [MSPAINT] Realize context menu on canvas (#5352)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7aadc1e1feaf6cadd5362… commit 7aadc1e1feaf6cadd536223230f461b24619c6d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 19 07:51:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 19 07:51:19 2023 +0900 [MSPAINT] Realize context menu on canvas (#5352) - Add actions on Right-Click. - Add ID_POPUPMENU resource menu. - Use TrackPopupMenu to show the context menu. - Improve CMainWindow::OnInitMenuPopup to display context menu. - Add SelectionModel::m_bContentChanged flag to indicate whether the selection content is changed. - Fix IDM_IMAGEINVERTCOLORS and IDM_IMAGEROTATEMIRROR commands. CORE-18867 --- base/applications/mspaint/canvas.cpp | 5 ++ base/applications/mspaint/lang/bg-BG.rc | 19 +++++ base/applications/mspaint/lang/cs-CZ.rc | 19 +++++ base/applications/mspaint/lang/de-DE.rc | 19 +++++ base/applications/mspaint/lang/en-GB.rc | 19 +++++ base/applications/mspaint/lang/en-US.rc | 19 +++++ base/applications/mspaint/lang/es-ES.rc | 19 +++++ base/applications/mspaint/lang/et-EE.rc | 19 +++++ base/applications/mspaint/lang/eu-ES.rc | 19 +++++ base/applications/mspaint/lang/fr-FR.rc | 19 +++++ base/applications/mspaint/lang/he-IL.rc | 19 +++++ base/applications/mspaint/lang/hu-HU.rc | 19 +++++ base/applications/mspaint/lang/id-ID.rc | 19 +++++ base/applications/mspaint/lang/it-IT.rc | 19 +++++ base/applications/mspaint/lang/ja-JP.rc | 21 +++++- base/applications/mspaint/lang/nl-NL.rc | 19 +++++ base/applications/mspaint/lang/no-NO.rc | 19 +++++ base/applications/mspaint/lang/pl-PL.rc | 19 +++++ base/applications/mspaint/lang/pt-BR.rc | 19 +++++ base/applications/mspaint/lang/pt-PT.rc | 19 +++++ base/applications/mspaint/lang/ro-RO.rc | 19 +++++ base/applications/mspaint/lang/ru-RU.rc | 19 +++++ base/applications/mspaint/lang/sk-SK.rc | 19 +++++ base/applications/mspaint/lang/sq-AL.rc | 19 +++++ base/applications/mspaint/lang/sv-SE.rc | 19 +++++ base/applications/mspaint/lang/tr-TR.rc | 19 +++++ base/applications/mspaint/lang/uk-UA.rc | 19 +++++ base/applications/mspaint/lang/vi-VN.rc | 19 +++++ base/applications/mspaint/lang/zh-CN.rc | 19 +++++ base/applications/mspaint/lang/zh-HK.rc | 19 +++++ base/applications/mspaint/lang/zh-TW.rc | 19 +++++ base/applications/mspaint/mouse.cpp | 29 ++++++-- base/applications/mspaint/resource.h | 1 + base/applications/mspaint/selectionmodel.cpp | 74 ++++++++++++++----- base/applications/mspaint/selectionmodel.h | 5 ++ base/applications/mspaint/winproc.cpp | 102 +++++++++++++++++---------- base/applications/mspaint/winproc.h | 1 + 37 files changed, 726 insertions(+), 63 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 68a91b5d250..45c182cf3bd 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -272,6 +272,11 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam CanvasToImage(pt); StartSelectionDrag(hitSelection, pt); } + else + { + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } return 0; } diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index e5d1a5eb4b5..8f829673e75 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index e7175cfb789..82cfb95c87a 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index c037f76a5bd..4ac9271762b 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 6275fa87c6e..f60d1580bfb 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index e81466d7177..2db7b63f035 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 313b56435c6..85fc44b03b9 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -102,6 +102,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 3895c6266b1..2f49611d46a 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 1d5565cb184..782c29f274f 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index c2428c63a4a..9067efb323c 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index b5a6e494d7a..1ef77c72fe9 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index c80bcc33d6b..913b4aa4c08 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 312ef62a3de..134bd6cc6a1 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 8d54f0c5c01..72978cacb4e 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 8e6bac2e22e..498c603aa55 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -78,7 +78,7 @@ BEGIN POPUP "画像(&I)" BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "伸縮/傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "切り取り(&C)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "切り取り(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "コピー(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼り付け(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "選択範囲の削除(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "すべて選択(&A)\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "ファイルへコピー(&O)...", IDM_EDITCOPYTO + MENUITEM "ファイルから貼り付け(&F)...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 4b3285670bc..aabc54497c9 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 30a2a258863..c8e12864b8f 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 62191b61216..34213677b47 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 28a0e26eaeb..b6e462d741e 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 561a5f774a4..9921db6a996 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^O", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 4aba57be15f..42c9e2a4169 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index e7b08265148..940044ff0a2 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index d728044f8a2..58ac2345492 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -101,6 +101,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index b749bd24c3a..ad639839f2c 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 79f30dcae74..0aef5bdd6d9 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -92,6 +92,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index d299c5b40ba..d8f0d9e0953 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index d7eb147c950..7a0eafc3873 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 247f547ef17..aa1df3c5488 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 69216e71489..896cfd81663 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -102,6 +102,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 0577111e768..d200513e5d7 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 2c4675630ef..f266ba59d9d 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -100,6 +100,25 @@ BEGIN END END +ID_POPUPMENU MENU +BEGIN + POPUP "Popup #0" + BEGIN + MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT + MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM SEPARATOR + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + END +END + ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index b16ae6190b8..2ba45a2d0e2 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -181,6 +181,12 @@ struct FreeSelTool : ToolBase } imageModel.NotifyImageChanged(); } + else + { + POINT pt = { x, y }; + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } } void OnFinishDraw() override @@ -249,14 +255,19 @@ struct RectSelTool : ToolBase void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { + POINT pt = { x, y }; if (bLeftButton) { - POINT pt = { x, y }; imageModel.Bound(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); imageModel.NotifyImageChanged(); } + else + { + canvasWindow.ClientToScreen(&pt); + mainWindow.TrackPopupMenu(pt, 0); + } } void OnFinishDraw() override @@ -565,10 +576,13 @@ struct TextTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); - if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) + if (bTextBoxShown) { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); @@ -611,8 +625,11 @@ struct TextTool : ToolBase void OnFinishDraw() override { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } quit(); ToolBase::OnFinishDraw(); } diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 53f17d4c715..ce91b33238b 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -30,6 +30,7 @@ #define IDI_VERTSKEW 538 #define ID_MENU 501 +#define ID_POPUPMENU 502 #define IDM_FILENEW 201 #define IDM_FILEOPEN 202 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index bfa4501d5fc..1137453dd3f 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -19,6 +19,7 @@ SelectionModel::SelectionModel() , m_ptStack(NULL) , m_iPtSP(0) , m_bShow(FALSE) + , m_bContentChanged(FALSE) { ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); @@ -123,6 +124,14 @@ void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) Rect(hDCImage, m_rcOld.left, m_rcOld.top, m_rcOld.right, m_rcOld.bottom, crBg, crBg, 0, 1); } +void SelectionModel::DrawBackground(HDC hDCImage) +{ + if (toolsModel.GetActiveTool() == TOOL_FREESEL) + DrawBackgroundPoly(hDCImage, paletteModel.GetBgColor()); + else + DrawBackgroundRect(hDCImage, paletteModel.GetBgColor()); +} + void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) { CRect rc = m_rc; @@ -187,7 +196,8 @@ void SelectionModel::Landing() m_bShow = FALSE; - if (!::EqualRect(m_rc, m_rcOld) && !::IsRectEmpty(m_rc) && !::IsRectEmpty(m_rcOld)) + if (m_bContentChanged || + (!::EqualRect(m_rc, m_rcOld) && !::IsRectEmpty(m_rc) && !::IsRectEmpty(m_rcOld))) { imageModel.PushImageForUndo(); @@ -208,9 +218,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) m_rc.right = x + GetDIBWidth(hBm); m_rc.bottom = y + GetDIBHeight(hBm); - // If m_rc and m_rcOld were same, the image cannot be pasted to the canvas. - // See also SelectionModel::Landing - ::SetRect(&m_rcOld, -2, -2, -1, -1); // Outside of image + NotifyContentChanged(); ClearMask(); } @@ -234,7 +242,7 @@ void SelectionModel::FlipHorizontally() } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::FlipVertically() @@ -256,7 +264,7 @@ void SelectionModel::FlipVertically() } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::RotateNTimes90Degrees(int iN) @@ -267,9 +275,10 @@ void SelectionModel::RotateNTimes90Degrees(int iN) switch (iN) { - case 1: - case 3: + case 1: /* rotate 90 degrees */ + case 3: /* rotate 270 degrees */ TakeOff(); + if (m_hbmColor) { hbmOld = ::SelectObject(hdcMem, m_hbmColor); @@ -286,10 +295,13 @@ void SelectionModel::RotateNTimes90Degrees(int iN) ::DeleteObject(m_hbmMask); m_hbmMask = hbm; } + + SwapWidthAndHeight(); break; - case 2: + case 2: /* rotate 180 degrees */ TakeOff(); + if (m_hbmColor) { hbmOld = ::SelectObject(hdcMem, m_hbmColor); @@ -308,7 +320,7 @@ void SelectionModel::RotateNTimes90Degrees(int iN) } ::DeleteDC(hdcMem); - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) @@ -351,7 +363,7 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int ::DeleteDC(hDC); m_bShow = TRUE; - imageModel.NotifyImageChanged(); + NotifyContentChanged(); } HBITMAP SelectionModel::CopyBitmap() @@ -442,12 +454,11 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { - m_bShow = FALSE; + m_bShow = m_bContentChanged = FALSE; ClearColor(); ClearMask(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); - imageModel.NotifyImageChanged(); } @@ -457,12 +468,39 @@ void SelectionModel::DeleteSelection() return; TakeOff(); - imageModel.PushImageForUndo(); - if (toolsModel.GetActiveTool() == TOOL_FREESEL) - DrawBackgroundPoly(imageModel.GetDC(), paletteModel.GetBgColor()); - else - DrawBackgroundRect(imageModel.GetDC(), paletteModel.GetBgColor()); + DrawBackground(imageModel.GetDC()); HideSelection(); } + +void SelectionModel::InvertSelection() +{ + TakeOff(); + + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + + HDC hdc = ::CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = ::SelectObject(hdc, m_hbmColor); + RECT rc = { 0, 0, bm.bmWidth, bm.bmHeight }; + ::InvertRect(hdc, &rc); + ::SelectObject(hdc, hbmOld); + ::DeleteDC(hdc); + + NotifyContentChanged(); +} + +void SelectionModel::NotifyContentChanged() +{ + m_bContentChanged = TRUE; + imageModel.NotifyImageChanged(); +} + +void SelectionModel::SwapWidthAndHeight() +{ + INT cx = m_rc.Width(); + INT cy = m_rc.Height(); + m_rc.right = m_rc.left + cy; + m_rc.bottom = m_rc.top + cx; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index f68a740d18f..c2ec6bffbc2 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -20,6 +20,7 @@ private: public: COLORREF m_rgbBack = RGB(255, 255, 255); BOOL m_bShow; + BOOL m_bContentChanged; CRect m_rc; // in image pixel coordinates POINT m_ptHit; // in image pixel coordinates CRect m_rcOld; // in image pixel coordinates @@ -42,6 +43,7 @@ public: HBITMAP CopyBitmap(); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); + void DrawBackground(HDC hDCImage); void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); void DrawBackgroundRect(HDC hDCImage, COLORREF crBg); void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); @@ -52,14 +54,17 @@ public: void FlipVertically(); void RotateNTimes90Degrees(int iN); void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY); + void InvertSelection(); void Dragging(CANVAS_HITTEST hit, POINT pt); void ClearMask(); void ClearColor(); + void NotifyContentChanged(); private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); void ShiftPtStack(INT dx, INT dy); + void SwapWidthAndHeight(); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index c3fa27d6445..72947626a8c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -424,47 +424,44 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); DWORD dwStart = 0, dwEnd = 0; - if (::IsWindowVisible(textEditWindow)) + if (textShown) textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); BOOL hasTextSel = (dwStart < dwEnd); - switch (lParam) + // + // File menu + // + if (::GetSubMenu(GetMenu(), 0) == menu) { - case 0: /* File menu */ - ProcessFileMenu((HMENU)wParam); - break; - case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, - ENABLED_IF(textShown ? textEditWindow.SendMessage(EM_CANUNDO) : imageModel.CanUndo())); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(textShown ? FALSE : imageModel.CanRedo())); - EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITDELETESELECTION, - ENABLED_IF(textShown ? hasTextSel : trueSelection)); - EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); - EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection)); - EnableMenuItem(menu, IDM_EDITPASTE, - ENABLED_IF(textShown ? ::IsClipboardFormatAvailable(CF_UNICODETEXT) : - ::IsClipboardFormatAvailable(CF_ENHMETAFILE) || - ::IsClipboardFormatAvailable(CF_DIB) || - ::IsClipboardFormatAvailable(CF_BITMAP))); - break; - case 2: /* View menu */ - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(g_hStatusBar))); - CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); - EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); - - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(g_showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(registrySettings.ShowThumbnail)); - break; - case 3: /* Image menu */ - EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionModel.m_bShow)); - CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); - break; + ProcessFileMenu(menu); } + // + // Edit menu + // + EnableMenuItem(menu, IDM_EDITUNDO, + ENABLED_IF(textShown ? textEditWindow.SendMessage(EM_CANUNDO) : imageModel.CanUndo())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(textShown ? FALSE : imageModel.CanRedo())); + EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITDELETESELECTION, + ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITPASTE, + ENABLED_IF(textShown ? ::IsClipboardFormatAvailable(CF_UNICODETEXT) : + ::IsClipboardFormatAvailable(CF_ENHMETAFILE) || + ::IsClipboardFormatAvailable(CF_DIB) || + ::IsClipboardFormatAvailable(CF_BITMAP))); + + // + // View menu + // + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(g_hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(toolsModel.GetZoom() == 125)); CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(toolsModel.GetZoom() == 250)); CheckMenuItem(menu, IDM_VIEWZOOM50, CHECKED_IF(toolsModel.GetZoom() == 500)); @@ -472,7 +469,19 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CheckMenuItem(menu, IDM_VIEWZOOM200, CHECKED_IF(toolsModel.GetZoom() == 2000)); CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(toolsModel.GetZoom() == 4000)); CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(toolsModel.GetZoom() == 8000)); - + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(g_showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(registrySettings.ShowThumbnail)); + + // + // Image menu + // + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionModel.m_bShow)); + EnableMenuItem(menu, IDM_IMAGEDELETEIMAGE, ENABLED_IF(!selectionModel.m_bShow)); + CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); + + // + // Palette menu + // CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_MODERN)); CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_OLDTYPE)); return 0; @@ -858,7 +867,10 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_IMAGEINVERTCOLORS: { - imageModel.InvertColors(); + if (selectionModel.m_bShow) + selectionModel.InvertSelection(); + else + imageModel.InvertColors(); break; } case IDM_IMAGEDELETEIMAGE: @@ -997,8 +1009,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH // Create and show the fullscreen window fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); - ShowWindow(SW_HIDE); break; } return 0; } + +VOID CMainWindow::TrackPopupMenu(POINT ptScreen, INT iSubMenu) +{ + HMENU hMenu = ::LoadMenuW(g_hinstExe, MAKEINTRESOURCEW(ID_POPUPMENU)); + HMENU hSubMenu = ::GetSubMenu(hMenu, iSubMenu); + + ::SetForegroundWindow(m_hWnd); + INT_PTR id = ::TrackPopupMenu(hSubMenu, TPM_RIGHTBUTTON | TPM_RETURNCMD, + ptScreen.x, ptScreen.y, 0, m_hWnd, NULL); + PostMessage(WM_NULL); + if (id != 0) + PostMessage(WM_COMMAND, id); + + ::DestroyMenu(hMenu); +} diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 5ec12f23f0f..71fe89282d2 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -34,6 +34,7 @@ public: BOOL GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); BOOL GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); BOOL ChooseColor(IN OUT COLORREF *prgbColor); + VOID TrackPopupMenu(POINT ptScreen, INT iSubMenu); private: HMENU m_hMenu;

1 year, 4 months

[reactos] 01/01: [NTOS:PNP] Assert the presence of a device extension when handling PnP root power IRPs

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0972f71d9abb1a7e88660… commit 0972f71d9abb1a7e88660cbfbe8e2d564bb1e102 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Jun 16 00:13:30 2023 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 18 20:44:13 2023 +0200 [NTOS:PNP] Assert the presence of a device extension when handling PnP root power IRPs Handling PnP root driver power IRPs requires that a device object must come up with a device extension to determine whether it is a function driver and if so, handle the IRP accordingly. CORE-18989 --- ntoskrnl/io/pnpmgr/pnproot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index c41844b64d3..58d740b7d3b 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -1473,6 +1473,12 @@ PnpRootPowerControl( Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); + /* + * We must handle power IRPs based on whether it is a function driver + * or not from the device extension, so it cannot be NULL. + */ + ASSERT(DeviceExtension); + if (DeviceExtension->Common.IsFDO) { ASSERT(!DeviceExtension->Common.IsFDO);

1 year, 4 months

[reactos] 03/03: [MSPAINT] Improve wording of IDS_CANTPASTE message

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89ecf32e0b0101e469e90… commit 89ecf32e0b0101e469e9084519841a98f739897d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jun 18 19:16:17 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 18 19:16:17 2023 +0300 [MSPAINT] Improve wording of IDS_CANTPASTE message Follow-up of #5349 (9f56e67). CORE-18867 --- base/applications/mspaint/lang/bg-BG.rc | 2 +- base/applications/mspaint/lang/cs-CZ.rc | 2 +- base/applications/mspaint/lang/de-DE.rc | 2 +- base/applications/mspaint/lang/en-GB.rc | 2 +- base/applications/mspaint/lang/en-US.rc | 2 +- base/applications/mspaint/lang/es-ES.rc | 2 +- base/applications/mspaint/lang/et-EE.rc | 2 +- base/applications/mspaint/lang/eu-ES.rc | 2 +- base/applications/mspaint/lang/fr-FR.rc | 2 +- base/applications/mspaint/lang/he-IL.rc | 2 +- base/applications/mspaint/lang/hu-HU.rc | 2 +- base/applications/mspaint/lang/id-ID.rc | 2 +- base/applications/mspaint/lang/it-IT.rc | 2 +- base/applications/mspaint/lang/nl-NL.rc | 2 +- base/applications/mspaint/lang/no-NO.rc | 2 +- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 2 +- base/applications/mspaint/lang/pt-PT.rc | 2 +- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 2 +- base/applications/mspaint/lang/sk-SK.rc | 2 +- base/applications/mspaint/lang/sq-AL.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/tr-TR.rc | 2 +- base/applications/mspaint/lang/uk-UA.rc | 2 +- base/applications/mspaint/lang/vi-VN.rc | 2 +- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-HK.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 49fdda7a16b..e5d1a5eb4b5 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Подчертан" IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 40d16e29cf5..e7175cfb789 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 6901a9ce68e..c037f76a5bd 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index c2590081acb..6275fa87c6e 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 408a60bc505..e81466d7177 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 782968cbd1b..313b56435c6 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -244,5 +244,5 @@ BEGIN IDS_UNDERLINE "Subrayado" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 16a381596b8..3895c6266b1 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 066460512df..1d5565cb184 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -234,5 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 147b939fb58..c2428c63a4a 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -234,5 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 9a381bc4ff4..b5a6e494d7a 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -237,5 +237,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index ac16396730f..c80bcc33d6b 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -234,5 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 6e082265cbf..312ef62a3de 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 0ee7d4f8457..8d54f0c5c01 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 5cb77b29837..4b3285670bc 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 83434aa1a35..30a2a258863 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 86f1c53bef8..62191b61216 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -243,5 +243,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index db0e4a0b2a0..28a0e26eaeb 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 638eabfe402..561a5f774a4 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Sublinhado" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index e6349714f3d..4aba57be15f 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -243,5 +243,5 @@ BEGIN IDS_UNDERLINE "Subliniat" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index f65543435cb..e7b08265148 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -234,5 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 1abab0cd683..d728044f8a2 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -243,5 +243,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index d77521cae5e..b749bd24c3a 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 8301fe01424..79f30dcae74 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -234,5 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 227c35fe17b..d299c5b40ba 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Altı Çizgili" IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 00a9e8ea90c..d7eb147c950 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index b826a9270bd..247f547ef17 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 8aea3b4c409..69216e71489 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -244,5 +244,5 @@ BEGIN IDS_UNDERLINE "下划线" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index ca0db48b6d0..0577111e768 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "底線" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 1ed27e4ec36..2c4675630ef 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -242,5 +242,5 @@ BEGIN IDS_UNDERLINE "底線" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" - IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." + IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." END

1 year, 4 months

[reactos] 02/03: [EXPLORER] Update copyright headers

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d614d62b09472e6a7f543… commit d614d62b09472e6a7f5433fa34105f092ef17601 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jun 18 18:48:04 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 18 18:52:02 2023 +0300 [EXPLORER] Update copyright headers --- base/shell/explorer/lang/bg-BG.rc | 8 ++++++++ base/shell/explorer/lang/cs-CZ.rc | 7 ++++--- base/shell/explorer/lang/de-DE.rc | 11 +++++++++++ base/shell/explorer/lang/en-US.rc | 7 +++++++ base/shell/explorer/lang/es-ES.rc | 17 ++++++++--------- base/shell/explorer/lang/et-EE.rc | 8 ++++---- base/shell/explorer/lang/eu-ES.rc | 2 +- base/shell/explorer/lang/fi-FI.rc | 7 +++++++ base/shell/explorer/lang/fr-FR.rc | 8 ++++++++ base/shell/explorer/lang/he-IL.rc | 7 +++++++ base/shell/explorer/lang/hi-IN.rc | 7 +++++++ base/shell/explorer/lang/hu-HU.rc | 7 +++++++ base/shell/explorer/lang/id-ID.rc | 8 ++++++++ base/shell/explorer/lang/it-IT.rc | 8 ++++++++ base/shell/explorer/lang/ja-JP.rc | 9 +++++++++ base/shell/explorer/lang/lt-LT.rc | 7 ++++++- base/shell/explorer/lang/ms-MY.rc | 7 ++++++- base/shell/explorer/lang/nl-NL.rc | 8 ++++++++ base/shell/explorer/lang/no-NO.rc | 7 +++++++ base/shell/explorer/lang/pl-PL.rc | 15 +++++++-------- base/shell/explorer/lang/pt-BR.rc | 8 +++++++- base/shell/explorer/lang/pt-PT.rc | 9 ++++++++- base/shell/explorer/lang/ru-RU.rc | 11 ++++++++++- base/shell/explorer/lang/sk-SK.rc | 8 +++++--- base/shell/explorer/lang/sq-AL.rc | 9 ++++++--- base/shell/explorer/lang/tr-TR.rc | 11 +++++++---- base/shell/explorer/lang/uk-UA.rc | 13 ++++++++----- 27 files changed, 189 insertions(+), 45 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index d9d1ff619c9..6bf40cd0ca3 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATORS: Copyright 2007 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + * Copyright 2022 Nikolay Dimitrov <delphipro(a)gmail.com> + */ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 5890a4583de..087b85b75fc 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -1,7 +1,8 @@ /* - * FILE: base/shell/explorer/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2015-04-12 + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Czech resource file + * TRANSLATOR: Copyright 2008-2015 Radek Liška aka Black_Fox <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 0f582a20a76..2a7a898923e 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2008 Fabian Maurer <dark_shadow(a)gmx.at> + * Copyright 2010 Sven Knurr (tux.) <forenkrams(a)tuxproject.de> + * Copyright 2016 Joachim Henze <joachim.henze(a)reactos.org> + * Copyright 2018 Robert Naumann <gonzomdx(a)gmail.com> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index 2fd043fd994..d71ba82e66f 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2006-2007 Thomas Weidenmueller <w3seek(a)reactos.org> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 1626c620650..e11e13b7521 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -1,13 +1,12 @@ /* - * PROJECT: ReactOS Explorer - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/shell/explorer/lang/es-ES.rc - * PURPOSE: Spanish Language File for ReactOS Explorer - * TRANSLATOR: 2007 Marc Piulachs (marc [dot] piulachs [at] codexchange [dot] net) - * UPDATED: 2009-07 Gabriel Ilardi (gabrielilardi [at] hotmail [dot] it) - * UPDATED: 2014-12-31 Ismael Ferreras Morezuelas (swyterzone [plus] ros [at] gmail [dot] com) - * UPDATED: 2018-08-01 Julio Carchi Ruiz (contacto [at] julcar [dot] info [dot] tm) - * UPDATED: 2020-03-06 Julen Urizar Compains (julenuri [at] hotmail [dot] com) + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Spanish (Spain) resource file + * TRANSLATORS: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * Copyright 2009 Gabriel Ilardi <gabrielilardi(a)hotmail.it> + * Copyright 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright 2018 Julio Carchi Ruiz <contacto(a)julcar.info.tm> + * Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 4769d34e826..39f1169661c 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -1,8 +1,8 @@ /* - * PROJECT: EXPLORER for ReactOS - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Estonian Language resource file - * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Estonian resource file + * TRANSLATOR: Copyright 2018 Joann Mõndresku <joannmondresku(a)gmail.com> */ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index 6a29c041c51..d6b4a5d4f8c 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Explorer - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Spanish (Basque) resource file * TRANSLATOR: Copyright 2021 Julen Urizar Compains <julenuri(a)hotmail.com> */ diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index ce29db6b61b..3e89bd40504 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Finnish resource file + * TRANSLATOR: Copyright 2017 Lauri Ojansivu <x(a)xet7.org> + */ + LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 5323bf42d94..10893af41fd 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: French resource file + * TRANSLATORS: Copyright 2007-2018 Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2013-2018 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index a3765b9ed9c..7511e1d8f3a 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hebrew resource file + * TRANSLATOR: Copyright 2013 Baruch Rutman <peterooch(a)gmail.com> + */ + LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 7238f7c0793..1d4a751949d 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hindi (India) resource file + * TRANSLATOR: Copyright 2018 Arnav Bhatt <arnavbhatt288(a)gmail.com> + */ + LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index 8f236550e4a..73243d68662 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATOR: Copyright 2020 Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> + */ + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index 154cdbd6b1d..f76f8b5bd04 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATORS: Copyright 2019 Mas Ahmad Muhammad <m.charly81(a)gmail.com> + * Copyright 2022 Wilson Simanjuntak <wilsontulus5(a)gmail.com> + */ + LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index 7df443353af..b1c079b4b99 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2007 Paolo Devoti <devotip(a)tiscali.it> + * Copyright 2013 Ivan Di Francesco (oswetto) <ivan.difrancesco(a)yahoo.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 8bb0f845ea7..bda368f7eae 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Japanese resource file + * TRANSLATORS: Copyright 2009 pcds90net <ds200xnet-ros(a)yahoo.co.jp> + * Copyright 2009 Tomoya Kitagawa <jptomoya(a)yahoo.co.jp> + * Copyright 2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 05645847a0e..7a7600c8e2d 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -1,4 +1,9 @@ -/* Translation by Vytis "CMan" Girdžijauskas (cman(a)cman.us) */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Lithuanian resource file + * TRANSLATOR: Copyright 2008 Vytis Girdžijauskas <cman(a)cman.us> + */ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 40cd9d8440c..bab8c6a7ac5 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -1,4 +1,9 @@ -/* Malay translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Malay resource file + * TRANSLATOR: Copyright 2015 Henry Tang Ih <henrytang2(a)hotmail.com> + */ LANGUAGE LANG_MALAY, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index f79fd75e3d8..bf22dbfd0bc 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Dutch resource file + * TRANSLATORS: Copyright 2009 Jan Roeloffzen (jansssens) <jroeloffzen(a)hotmail.com> + * Copyright 2022 Milan Raymakers <milan.raymakers(a)gmail.com> + */ + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index fcdb0042501..db333409033 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATOR: Copyright 2008-2009 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDM_TRAYWND MENU diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 61ff49d92ee..20b947b0b33 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -1,12 +1,11 @@ /* - * Translated by Caemyr - Olaf Siejka (Jun, 2007) - * Use ReactOS forum PM or IRC to contact me - * https://reactos.org/ - * IRC: irc.freenode.net #reactos-pl; - * Updated by niski - Maciej Bialas (bjauy(a)o2.pl), July 2009 - * UTF-8 conversion by Caemyr (May, 2011) - * Updated by Marcin Mikołajczak <me(a)m4sk.in> (September, 2017) - * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (August, 2020) + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2007 Olaf Siejka <caemyr(a)gmail.com> + * Copyright 2009 Maciej Bialas <bjauy(a)o2.pl> + * Copyright 2017 Marcin Mikołajczak <me(a)m4sk.in> + * Copyright 2020 Piotr Hetnarowicz <piotrhwz(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index f9106431638..a0702db0aeb 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -1,4 +1,10 @@ -/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Brazilian) resource file + * TRANSLATORS: Copyright 2011-2012 Matheus Macabu <mkbu95(a)gmail.com> + * Copyright 2019 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index bbc370a3ca2..25bf0b31a0d 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -1,4 +1,11 @@ -/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATORS: Copyright 2011-2012 Matheus Macabu <mkbu95(a)gmail.com> + * Copyright 2019 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + * Copyright 2021 Gabriel Aguiar <fgsoftwarestudio(a)gmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index f82251a6ade..545b98f06bf 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -1,4 +1,13 @@ -/* Russian translation by Lentin 2007-06-10 & tower 2009 jul 14 */ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007-2016 Dmitry Chapyshev (Lentin) <lentind(a)yandex.ru> + * Copyright 2009 Igor Koshpaev <tower(a)reactos.org> + * Copyright 2011 Igor Paliychuk <mansonigor(a)gmail.com> + * Copyright 2014 Alexey Gorgurov <leha-bot(a)ya.ru> + * Copyright 2016 Sergey Stopkin <stopkin.sergey(a)gmail.com> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 8e3606ba092..83c2f77fbaf 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -1,6 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 20-07-2007 - * LAST UPDATE: 26-07-2010 +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2007-2010 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 8941c1ed26e..4b94bcc57a7 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -1,6 +1,9 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index d753e2e98e8..7ff3b2a4d29 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -1,7 +1,10 @@ -/* TRANSLATOR: -2013-2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), -2021 Süleyman Poyraz (zaryob [dot] dev [at] gmail [dot] com) -*/ +/* + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2013-2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index b5327772944..e341f929b55 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -1,9 +1,12 @@ /* - * PROJECT: ReactOS Explorer-New - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/shell/explorer/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for ReactOS Explorer-New - * TRANSLATORS: Artem Reznikov & Sakara Yevhen & Yaroslav Kibysh + * PROJECT: ReactOS Explorer + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATORS: Copyright 2007 Artem Reznikov <temarez(a)yandex.ru> + * Copyright 2010 Sakara Yevhen <eresid(a)gmail.com> + * Copyright 2010-2011 Igor Paliychuk <mansonigor(a)gmail.com> + * Copyright 2015 Yaroslav Fedoryako <yaroslav.fedoryako(a)gmail.com> + * Copyright 2019 Yaroslav Kibysh <yanet.prod(a)gmail.com> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

1 year, 4 months

[reactos] 01/03: [IPCONFIG] Update copyright headers

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21f0095cc4ec214427840… commit 21f0095cc4ec214427840308c6c5f7e09f56737f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jun 18 15:42:18 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jun 18 18:34:39 2023 +0300 [IPCONFIG] Update copyright headers --- base/applications/network/ipconfig/ipconfig.c | 5 ++--- base/applications/network/ipconfig/lang/bg-BG.rc | 7 +++++++ base/applications/network/ipconfig/lang/de-DE.rc | 9 +++++++++ base/applications/network/ipconfig/lang/el-GR.rc | 7 +++++++ base/applications/network/ipconfig/lang/en-US.rc | 7 +++++++ base/applications/network/ipconfig/lang/es-ES.rc | 10 ++++++++-- base/applications/network/ipconfig/lang/fr-FR.rc | 9 +++++++++ base/applications/network/ipconfig/lang/id-ID.rc | 7 +++++++ base/applications/network/ipconfig/lang/it-IT.rc | 7 ++++++- base/applications/network/ipconfig/lang/no-NO.rc | 7 +++++++ base/applications/network/ipconfig/lang/pl-PL.rc | 10 ++++++---- base/applications/network/ipconfig/lang/ro-RO.rc | 7 ++++--- base/applications/network/ipconfig/lang/ru-RU.rc | 8 +++++++- base/applications/network/ipconfig/lang/sk-SK.rc | 7 +++++-- base/applications/network/ipconfig/lang/sq-AL.rc | 9 ++++++--- base/applications/network/ipconfig/lang/sv-SE.rc | 9 +++++---- base/applications/network/ipconfig/lang/tr-TR.rc | 8 +++++++- base/applications/network/ipconfig/lang/uk-UA.rc | 10 +++++----- base/applications/network/ipconfig/lang/zh-CN.rc | 8 +++++++- base/applications/network/ipconfig/lang/zh-TW.rc | 8 +++++++- 20 files changed, 128 insertions(+), 31 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 3a5702d065d..7a151f2559f 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -1,9 +1,8 @@ /* * PROJECT: ReactOS ipconfig utility - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/network/ipconfig/ipconfig.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Display IP info for net adapters - * PROGRAMMERS: Copyright 2005 - 2006 Ged Murphy (gedmurphy(a)gmail.com) + * COPYRIGHT: Copyright 2005-2006 Ged Murphy <gedmurphy(a)gmail.com> */ /* * TODO: diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index 55f6b37d01d..cfa706418a1 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATOR: Copyright 2007-2009 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + */ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index efe249db721..b7136810f79 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> + * Copyright 2010 Sven Knurr (tux.) <forenkrams(a)tuxproject.de> + * Copyright 2014 Zehnvor <sixlivezehn(a)googlemail.com> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index 8754fbac37c..d7e7a1585a3 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Greek resource file + * TRANSLATOR: Copyright 2007 Apostolos Alexiadis aka Dj Apal <djapal(a)gmail.com> + */ + LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index 78543bd0792..8d33d506eb0 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2005-2006 Ged Murphy <gedmurphy(a)gmail.com> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index 5beceaaa09c..bdb3e1dfa9c 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -1,5 +1,11 @@ -/* Spanish Language resource file. - * Translated by: ?? and Ismael Ferreras Morezuelas (Swyter) <2014-11-07> */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish (Spain) resource file + * TRANSLATORS: Copyright 2011 Jeisson Toscano aka JanusMagnus <jasongenie(a)gmail.com> + * Copyright 2011 Javier Fernandez <elhoir(a)gmail.com> + * Copyright 2014-2015 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index 618589c78e0..88d297a961d 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATORS: Copyright 2006 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2009 Amine Khaldi <amine.khaldi(a)reactos.org> + * Copyright 2009 Pierre Schweitzer <pierre(a)reactos.org> + */ + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index d3f67e51368..f442fae3711 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATOR: Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> + */ + LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index f2c00981247..45b57227c72 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -1,4 +1,9 @@ -/* Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-11) */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATOR: Copyright 2007 Paolo Devoti <devotip(a)tiscali.it> + */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index d3b7938d8ea..c907d5e658e 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATOR: Copyright 2008 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index bcedb0468d0..8c2c462ba7f 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -1,8 +1,10 @@ /* - * Translated by TestamenT - * testament(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2007 Konrad Chielecki aka TestamenT <testament(a)users.sourceforge.net> + * Copyright 2011 Adam Stachowicz <saibamenppl(a)gmail.com> + * Copyright 2018 Adam Słaboń <asaillen456esx(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 3c6a4678f67..6c5acb0bdeb 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -1,7 +1,8 @@ /* - * FILE: base/applications/network/ipconfig/lang/ro-RO.rc - * ReactOS Project (https://reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATOR: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index 794f3c84776..aac83b8b48b 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -1,4 +1,10 @@ -/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2014-2015 Kudratov Olimjon <olim98(a)bk.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index aba51b31816..4b8731c998c 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -1,5 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 07-05-2008 +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2008 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index bce64b609a5..edbe6c993ea 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -1,6 +1,9 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index 36deb5fb754..bdc504bef09 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS IPCONFIG - * FILE: base/applications/network/ipconfig/lang/sv-SE.rc - * PURPOSE: Swedish resource file - * TRANSLATOR: Jaix Bly + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2011 Jan Blomqvist Kinander (Jaix Bly) <jaixbly(a)spray.se> + * Copyright 2017 Markus Gothe <nietzsche(a)lysator.liu.se> */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index f9b4376e6ae..49a28b2b5de 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -1,4 +1,10 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index 3200f6ca9c9..36284eb5983 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS IpConfig Network Command - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/network/ipconfig/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for IpConfig Network Command - * TRANSLATOR: Rostislav Zabolotny + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATORS: Copyright 2007 Rostislav Zabolotny <rstzab(a)yandex.ru> + * Copyright 2011 Igor Paliychuk <mansonigor(a)gmail.com> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index e24fcb60741..a10faa26b45 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -1,4 +1,10 @@ -/* Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + * Copyright 2018 Li Keqing <forucial(a)icloud.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 5ba939ea4b6..70c9e3d5bfe 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -1,4 +1,10 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Traditional) resource file + * TRANSLATORS: Copyright 2015 Henry Tang Ih <henrytang2(a)hotmail.com> + * Copyright 2021 Chan Chilung <eason066(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 year, 4 months

[reactos] 01/01: [MSPAINT] Follow-up of #5349 (9f56e67); Avoid assertion failure

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ba330ead276cd1c1bdb8… commit 8ba330ead276cd1c1bdb8dd728e109db557b9a49 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 18 20:34:49 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Jun 18 20:34:49 2023 +0900 [MSPAINT] Follow-up of #5349 (9f56e67); Avoid assertion failure CORE-18867 --- base/applications/mspaint/winproc.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ec714193b7c..c3fa27d6445 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -423,8 +423,9 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO (selectionModel.m_bShow && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); - DWORD dwStart, dwEnd; - textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + DWORD dwStart = 0, dwEnd = 0; + if (::IsWindowVisible(textEditWindow)) + textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); BOOL hasTextSel = (dwStart < dwEnd); switch (lParam)

1 year, 4 months

[reactos] 01/01: [MSPAINT] Use CF_DIB instead of CF_BITMAP (#5349)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f56e67bc2f25b21ce787… commit 9f56e67bc2f25b21ce7870f922855945acb8895a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jun 18 19:48:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 18 19:48:20 2023 +0900 [MSPAINT] Use CF_DIB instead of CF_BITMAP (#5349) CF_BITMAP is not recommended format for copying. In fact, Win10 won't accept it. - Use CF_DIB clipboard format instead of CF_BITMAP in copying. - Use CF_ENHMETAFILE, CF_DIB, or CF_BITMAP in pasting. - Add BitmapToClipboardDIB, BitmapFromClipboardDIB, and BitmapFromHEMF helper functions to dib.cpp. - Re-enable paste by fixing the bug that is embugged in the previous commit. - Enable Cut, Copy, Paste, and Delete on text editing box by modifying OnInitMenuPopup. - Add IDS_CANTPASTE resource string to show message on paste failure. CORE-18867 --- base/applications/mspaint/dib.cpp | 132 +++++++++++++++++++++++++ base/applications/mspaint/dib.h | 4 + base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/mouse.cpp | 9 +- base/applications/mspaint/resource.h | 1 + base/applications/mspaint/selectionmodel.cpp | 8 +- base/applications/mspaint/textedit.cpp | 29 ++++-- base/applications/mspaint/textedit.h | 6 ++ base/applications/mspaint/winproc.cpp | 142 +++++++++++++++++++++------ 38 files changed, 318 insertions(+), 43 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 85472994639..cb34859bd56 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -333,3 +333,135 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical) DeleteDC(hDC2); return hbmNew; } + +struct BITMAPINFODX : BITMAPINFO +{ + RGBQUAD bmiColorsAdditional[256 - 1]; +}; + +HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) +{ + BITMAP bm; + if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) + return NULL; + + BITMAPINFODX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = bm.bmBitsPixel; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = bm.bmWidthBytes * bm.bmHeight; + + INT cColors; + if (bm.bmBitsPixel < 16) + cColors = 1 << bm.bmBitsPixel; + else + cColors = 0; + + HDC hDC = CreateCompatibleDC(NULL); + + if (cColors) + { + HGDIOBJ hbmOld = SelectObject(hDC, hBitmap); + cColors = GetDIBColorTable(hDC, 0, cColors, bmi.bmiColors); + SelectObject(hDC, hbmOld); + } + + DWORD cbColors = cColors * sizeof(RGBQUAD); + DWORD dwSize = sizeof(BITMAPINFOHEADER) + cbColors + bmi.bmiHeader.biSizeImage; + HGLOBAL hGlobal = GlobalAlloc(GHND | GMEM_SHARE, dwSize); + if (hGlobal) + { + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); + if (pb) + { + CopyMemory(pb, &bmi, sizeof(BITMAPINFOHEADER)); + pb += sizeof(BITMAPINFOHEADER); + + CopyMemory(pb, bmi.bmiColors, cbColors); + pb += cbColors; + + GetDIBits(hDC, hBitmap, 0, bm.bmHeight, pb, &bmi, DIB_RGB_COLORS); + + GlobalUnlock(hGlobal); + } + else + { + GlobalFree(hGlobal); + hGlobal = NULL; + } + } + + DeleteDC(hDC); + + return hGlobal; +} + +HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) +{ + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); + if (!pb) + return NULL; + + LPBITMAPINFO pbmi = (LPBITMAPINFO)pb; + pb += pbmi->bmiHeader.biSize; + + INT cColors = 0, cbColors = 0; + if (pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + LPBITMAPCOREINFO pbmci = (LPBITMAPCOREINFO)pbmi; + WORD BitCount = pbmci->bmciHeader.bcBitCount; + if (BitCount < 16) + { + cColors = (1 << BitCount); + cbColors = cColors * sizeof(RGBTRIPLE); + pb += cbColors; + } + } + else if (pbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) + { + WORD BitCount = pbmi->bmiHeader.biBitCount; + if (BitCount < 16) + { + cColors = (1 << BitCount); + cbColors = cColors * sizeof(RGBQUAD); + pb += cbColors; + } + } + + HDC hDC = CreateCompatibleDC(NULL); + HBITMAP hBitmap = CreateDIBSection(hDC, pbmi, DIB_RGB_COLORS, NULL, NULL, 0); + if (hBitmap) + { + SetDIBits(hDC, hBitmap, 0, labs(pbmi->bmiHeader.biHeight), pb, pbmi, DIB_RGB_COLORS); + } + DeleteDC(hDC); + + GlobalUnlock(hGlobal); + + return hBitmap; +} + +HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) +{ + ENHMETAHEADER header; + if (!GetEnhMetaFileHeader(hEMF, sizeof(header), &header)) + return NULL; + + CRect rc = *(LPRECT)&header.rclBounds; + INT cx = rc.Width(), cy = rc.Height(); + HBITMAP hbm = CreateColorDIB(cx, cy, RGB(255, 255, 255)); + if (!hbm) + return NULL; + + HDC hDC = CreateCompatibleDC(NULL); + HGDIOBJ hbmOld = SelectObject(hDC, hbm); + PlayEnhMetaFile(hDC, hEMF, &rc); + SelectObject(hDC, hbmOld); + DeleteDC(hDC); + + return hbm; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index f4043d83ca3..4958f612673 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -36,3 +36,7 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical); float PpcmFromDpi(float dpi); #define ROUND(x) (INT)((x) + 0.5) + +HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap); +HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal); +HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 5c0e13f0f1c..49fdda7a16b 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Подчертан" IDS_VERTICAL "Вертикален" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 134b16d83e5..40d16e29cf5 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index b4479752bd2..6901a9ce68e 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index afe0dac8147..c2590081acb 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 2f28cbe4bec..408a60bc505 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d dots per inch" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 29eca278eca..782968cbd1b 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -244,4 +244,5 @@ BEGIN IDS_UNDERLINE "Subrayado" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 0320598596f..16a381596b8 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 3078614dac8..066460512df 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -234,4 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 92e2af66317..147b939fb58 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -234,4 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 352f668177e..9a381bc4ff4 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -237,4 +237,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 8f193665862..ac16396730f 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -234,4 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 0113573158a..6e082265cbf 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 1e880516ac1..0ee7d4f8457 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index d771a81e70b..8e6bac2e22e 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "下線" IDS_VERTICAL "縦書き" IDS_PRINTRES "%d x %d ピクセル/cm" + IDS_CANTPASTE "申し訳ありませんが、このデータを貼り付けできません。データ形式が間違っているか、対応していません。" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 3de457f22b6..5cb77b29837 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 549d3ae938c..83434aa1a35 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index bd61c31ef89..86f1c53bef8 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -243,4 +243,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index 075558c43d9..db0e4a0b2a0 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index ef8a793a3c1..638eabfe402 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Sublinhado" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index a92ec1d6913..e6349714f3d 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -243,4 +243,5 @@ BEGIN IDS_UNDERLINE "Subliniat" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index b241a712aa2..f65543435cb 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -234,4 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index e2acdc15642..1abab0cd683 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -243,4 +243,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 368a59c9369..d77521cae5e 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 55ad9f1953c..8301fe01424 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -234,4 +234,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 532af08a2e5..227c35fe17b 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Altı Çizgili" IDS_VERTICAL "Düşey" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 160830d6e6d..00a9e8ea90c 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index b5741ae9c96..b826a9270bd 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "Underline" IDS_VERTICAL "Vertical" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 2bc72542710..8aea3b4c409 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -244,4 +244,5 @@ BEGIN IDS_UNDERLINE "下划线" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 3f4cf0d1073..ca0db48b6d0 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "底線" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index b404dec54c9..1ed27e4ec36 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -242,4 +242,5 @@ BEGIN IDS_UNDERLINE "底線" IDS_VERTICAL "垂直" IDS_PRINTRES "%d x %d pixel/cm" + IDS_CANTPASTE "Sorry, this application cannot paste this data. The data format is either incorrect or not supported." END diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 97359f0ce68..b16ae6190b8 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -547,7 +547,6 @@ struct TextTool : ToolBase // Draw the text INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1); - imageModel.PushImageForUndo(); Text(hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText, textEditWindow.GetFont(), style); } @@ -568,12 +567,11 @@ struct TextTool : ToolBase BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) { + imageModel.PushImageForUndo(); draw(m_hdc); - - if (selectionModel.m_rc.IsRectEmpty()) + if (::IsRectEmpty(&selectionModel.m_rc)) { - textEditWindow.ShowWindow(SW_HIDE); - textEditWindow.SetWindowText(NULL); + quit(); return; } } @@ -613,6 +611,7 @@ struct TextTool : ToolBase void OnFinishDraw() override { + imageModel.PushImageForUndo(); draw(m_hdc); quit(); ToolBase::OnFinishDraw(); diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 3be802ced8c..53f17d4c715 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -219,3 +219,4 @@ #define IDS_UNDERLINE 937 #define IDS_VERTICAL 938 #define IDS_PRINTRES 939 +#define IDS_CANTPASTE 940 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 9497cef153f..bfa4501d5fc 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -205,8 +205,12 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) m_rc.left = x; m_rc.top = y; - m_rc.right = m_rc.left + GetDIBWidth(hBm); - m_rc.bottom = m_rc.top + GetDIBHeight(hBm); + m_rc.right = x + GetDIBWidth(hBm); + m_rc.bottom = y + GetDIBHeight(hBm); + + // If m_rc and m_rcOld were same, the image cannot be pasted to the canvas. + // See also SelectionModel::Landing + ::SetRect(&m_rcOld, -2, -2, -1, -1); // Outside of image ClearMask(); } diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index bf0ab2ce4fb..6d84a12c285 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -410,15 +410,9 @@ void CTextEditWindow::Reposition() CRect rcImage; canvasWindow.GetImageRect(rcImage); - if (rc.bottom > rcImage.bottom) - ::OffsetRect(&rc, 0, rcImage.Height()); - - if (rc.right > rcImage.right) - ::OffsetRect(&rc, rcImage.Width(), 0); - + // FIXME: Smartly restrict the position and size by using WM_WINDOWPOSCHANGING if (rc.left < 0) ::OffsetRect(&rc, -rc.left, 0); - if (rc.top < 0) ::OffsetRect(&rc, 0, -rc.top); @@ -433,3 +427,24 @@ LRESULT CTextEditWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, B { return ::SendMessage(GetParent(), nMsg, wParam, lParam); } + +LRESULT CTextEditWindow::OnCut(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + Invalidate(TRUE); // Redraw + return ret; +} + +LRESULT CTextEditWindow::OnPaste(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + FixEditPos(NULL); + return ret; +} + +LRESULT CTextEditWindow::OnClear(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + LRESULT ret = DefWindowProc(nMsg, wParam, lParam); + Invalidate(TRUE); // Redraw + return ret; +} diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index a227ce25714..95fb3e6ca45 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -45,6 +45,9 @@ public: MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown); MESSAGE_HANDLER(EM_SETSEL, OnSetSel); MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel); + MESSAGE_HANDLER(WM_CUT, OnCut); + MESSAGE_HANDLER(WM_PASTE, OnPaste); + MESSAGE_HANDLER(WM_CLEAR, OnClear); END_MSG_MAP() LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); @@ -66,6 +69,9 @@ public: LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetSel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCut(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnPaste(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClear(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); protected: HWND m_hwndParent; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 29bc32b9327..ec714193b7c 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -200,9 +200,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) } } - HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); - toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); + toolsModel.SetActiveTool(TOOL_RECTSEL); imageModel.PushImageForUndo(); selectionModel.InsertFromHBITMAP(bitmap, 0, 0); @@ -424,6 +422,10 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO BOOL trueSelection = (selectionModel.m_bShow && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); + DWORD dwStart, dwEnd; + textEditWindow.SendMessage(EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + BOOL hasTextSel = (dwStart < dwEnd); switch (lParam) { @@ -431,16 +433,20 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO ProcessFileMenu((HMENU)wParam); break; case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.CanUndo())); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.CanRedo())); - EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); - EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); - EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection)); + EnableMenuItem(menu, IDM_EDITUNDO, + ENABLED_IF(textShown ? textEditWindow.SendMessage(EM_CANUNDO) : imageModel.CanUndo())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(textShown ? FALSE : imageModel.CanRedo())); + EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(textShown ? hasTextSel : trueSelection)); + EnableMenuItem(menu, IDM_EDITDELETESELECTION, + ENABLED_IF(textShown ? hasTextSel : trueSelection)); EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection)); - OpenClipboard(); - EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(IsClipboardFormatAvailable(CF_BITMAP))); - CloseClipboard(); + EnableMenuItem(menu, IDM_EDITPASTE, + ENABLED_IF(textShown ? ::IsClipboardFormatAvailable(CF_UNICODETEXT) : + ::IsClipboardFormatAvailable(CF_ENHMETAFILE) || + ::IsClipboardFormatAvailable(CF_DIB) || + ::IsClipboardFormatAvailable(CF_BITMAP))); break; case 2: /* View menu */ CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer))); @@ -503,7 +509,7 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (canvasWindow.m_hWnd == hwndCapture || fullscreenWindow.m_hWnd == hwndCapture) { - SendMessage(hwndCapture, nMsg, wParam, lParam); + ::SendMessage(hwndCapture, nMsg, wParam, lParam); } } else if (selectionModel.m_bShow) @@ -528,6 +534,8 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case VK_DOWN: canvasWindow.MoveSelection(0, +1); break; + default: + break; } return 0; } @@ -549,6 +557,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH return 0; } + BOOL textShown = (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)); switch (LOWORD(wParam)) { case IDM_HELPINFO: @@ -641,7 +650,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_EDITUNDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) + if (textShown) { textEditWindow.PostMessage(WM_UNDO, 0, 0); break; @@ -663,8 +672,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.Undo(); break; case IDM_EDITREDO: - if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) + if (textShown) + { + // There is no "WM_REDO". Do nothing break; + } if (ToolBase::pointSP != 0) // drawing something? { canvasWindow.finishDrawing(); @@ -673,38 +685,110 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.Redo(); break; case IDM_EDITCOPY: - // FIXME: We should use CF_DIB in the future - if (OpenClipboard()) + if (textShown) { - EmptyClipboard(); - if (selectionModel.m_bShow) - { - selectionModel.TakeOff(); - SetClipboardData(CF_BITMAP, selectionModel.CopyBitmap()); - } - else + textEditWindow.SendMessage(WM_COPY); + break; + } + if (!selectionModel.m_bShow || !OpenClipboard()) + break; + + EmptyClipboard(); + + selectionModel.TakeOff(); + + { + HBITMAP hbm = selectionModel.CopyBitmap(); + if (hbm) { - SetClipboardData(CF_BITMAP, imageModel.CopyBitmap()); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbm); + if (hGlobal) + ::SetClipboardData(CF_DIB, hGlobal); + ::DeleteObject(hbm); } - CloseClipboard(); } + + CloseClipboard(); break; case IDM_EDITCUT: + if (textShown) + { + textEditWindow.SendMessage(WM_CUT); + break; + } /* Copy */ SendMessage(WM_COMMAND, IDM_EDITCOPY, 0); /* Delete selection */ SendMessage(WM_COMMAND, IDM_EDITDELETESELECTION, 0); break; case IDM_EDITPASTE: - OpenClipboard(); - if (IsClipboardFormatAvailable(CF_BITMAP)) + if (textShown) { - InsertSelectionFromHBITMAP((HBITMAP) GetClipboardData(CF_BITMAP), m_hWnd); + textEditWindow.SendMessage(WM_PASTE); + break; } + + if (!OpenClipboard()) + break; + + // In many cases, CF_ENHMETAFILE provides a better image than CF_DIB + if (::IsClipboardFormatAvailable(CF_ENHMETAFILE)) + { + HENHMETAFILE hEMF = (HENHMETAFILE)::GetClipboardData(CF_ENHMETAFILE); + if (hEMF) + { + HBITMAP hbm = BitmapFromHEMF(hEMF); + ::DeleteEnhMetaFile(hEMF); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + } + + // In many cases, CF_DIB provides a better image than CF_BITMAP + if (::IsClipboardFormatAvailable(CF_DIB)) + { + HBITMAP hbm = BitmapFromClipboardDIB(::GetClipboardData(CF_DIB)); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + + // The last resort + if (::IsClipboardFormatAvailable(CF_BITMAP)) + { + HBITMAP hbm = (HBITMAP)::GetClipboardData(CF_BITMAP); + if (hbm) + { + InsertSelectionFromHBITMAP(hbm, m_hWnd); + CloseClipboard(); + break; + } + } + + // Failed to paste + { + CString strText, strTitle; + strText.LoadString(IDS_CANTPASTE); + strTitle.LoadString(IDS_PROGRAMNAME); + MessageBox(strText, strTitle, MB_ICONINFORMATION); + } + CloseClipboard(); break; case IDM_EDITDELETESELECTION: { + if (textShown) + { + textEditWindow.SendMessage(WM_CLEAR); + break; + } switch (toolsModel.GetActiveTool()) { case TOOL_FREESEL: @@ -722,7 +806,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITSELECTALL: { - if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) + if (textShown) { textEditWindow.SendMessage(EM_SETSEL, 0, -1); break;

1 year, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2023