[bfreisen] 60850: [PAINT] * apply patch from [#CORE-7521] (paint fails silently if a file could not be opened) * apply patch from [#CORE-7311] (fix and improve resource and UI) in modified form New...
Author: bfreisen Date: Sun Nov 3 14:37:42 2013 New Revision: 60850
URL: http://svn.reactos.org/svn/reactos?rev=60850&view=rev Log: [PAINT] * apply patch from [#CORE-7521] (paint fails silently if a file could not be opened) * apply patch from [#CORE-7311] (fix and improve resource and UI) in modified form New resource strings are involved => please check translations
Modified: trunk/reactos/base/applications/mspaint/definitions.h trunk/reactos/base/applications/mspaint/lang/bg-BG.rc trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc trunk/reactos/base/applications/mspaint/lang/de-DE.rc trunk/reactos/base/applications/mspaint/lang/en-GB.rc trunk/reactos/base/applications/mspaint/lang/en-US.rc trunk/reactos/base/applications/mspaint/lang/es-ES.rc trunk/reactos/base/applications/mspaint/lang/eu-ES.rc trunk/reactos/base/applications/mspaint/lang/fr-FR.rc trunk/reactos/base/applications/mspaint/lang/he-IL.rc trunk/reactos/base/applications/mspaint/lang/hu-HU.rc trunk/reactos/base/applications/mspaint/lang/it-IT.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mspaint/lang/nl-NL.rc trunk/reactos/base/applications/mspaint/lang/no-NO.rc trunk/reactos/base/applications/mspaint/lang/pl-PL.rc trunk/reactos/base/applications/mspaint/lang/pt-BR.rc trunk/reactos/base/applications/mspaint/lang/pt-PT.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ru-RU.rc trunk/reactos/base/applications/mspaint/lang/sk-SK.rc trunk/reactos/base/applications/mspaint/lang/sv-SE.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/uk-UA.rc trunk/reactos/base/applications/mspaint/lang/zh-CN.rc trunk/reactos/base/applications/mspaint/lang/zh-TW.rc trunk/reactos/base/applications/mspaint/winproc.c
Modified: trunk/reactos/base/applications/mspaint/definitions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/d... ============================================================================== --- trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/definitions.h [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -203,3 +203,5 @@ #define IDS_INTNUMBERS 930 #define IDS_PERCENTAGE 931 #define IDS_ANGLE 932 + +#define IDS_LOADERRORTEXT 933
Modified: trunk/reactos/base/applications/mspaint/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/bg-BG.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/cs-CZ.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/de-DE.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Bitte geben Sie nur ganze Zahlen ein!" IDS_PERCENTAGE, "Der Prozentsatz muss zwischen 1 und 500 liegen." IDS_ANGLE, "Der Winkel muss zwischen -89 und 89 liegen." -END + IDS_LOADERRORTEXT, "Die Datei %s konnte nicht geladen werden." +END
Modified: trunk/reactos/base/applications/mspaint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-GB.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -26,32 +26,32 @@
POPUP "&Edit" BEGIN - MENUITEM "Undo\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Redo\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "Cut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "Delete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invert selection", IDM_EDITINVERTSELECTION - MENUITEM "Select all\tCtrl+A", IDM_EDITSELECTALL - MENUITEM SEPARATOR - MENUITEM "Copy to...", IDM_EDITCOPYTO - MENUITEM "Paste from...", IDM_EDITPASTEFROM + MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Redo\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE + MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invert selection", IDM_EDITINVERTSELECTION + MENUITEM "Select &all\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "C&opy to...", IDM_EDITCOPYTO + MENUITEM "Paste &from...", IDM_EDITPASTEFROM END
POPUP "&View" BEGIN - MENUITEM "Tool box\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "Color palette\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED - MENUITEM "Status bar", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "Text Toolbar", IDM_FORMATICONBAR, CHECKED, GRAYED - MENUITEM SEPARATOR - POPUP "Zoom" + MENUITEM "&Tool box\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "&Color palette\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&Status bar", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "T&ext Toolbar", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "&Zoom" BEGIN - POPUP "User defined" + POPUP "&User defined" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "12.5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 MENUITEM "50%", IDM_VIEWZOOM50 MENUITEM "100%", IDM_VIEWZOOM100 @@ -60,26 +60,26 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "Show grid\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE + MENUITEM "Show &grid\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "S&how miniature", IDM_VIEWSHOWMINIATURE END - MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "&Full screen\tCtrl+F", IDM_VIEWFULLSCREEN END
POPUP "&Image" BEGIN - MENUITEM "Rotate/Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Crop", IDM_IMAGECROP - MENUITEM "Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END
POPUP "&Colors" BEGIN - MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE + MENUITEM "&Edit palette...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE @@ -87,9 +87,9 @@
POPUP "&?" BEGIN - MENUITEM "Help topics", IDM_HELPHELPTOPICS - MENUITEM SEPARATOR - MENUITEM "Info", IDM_HELPINFO + MENUITEM "&Help topics", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Info", IDM_HELPINFO END END
@@ -122,12 +122,12 @@ CAPTION "Rotate and mirror image" BEGIN GROUPBOX "Rotate or mirror", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 - AUTORADIOBUTTON "Mirror horizontally", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP - AUTORADIOBUTTON "Mirror vertically", IDD_MIRRORROTATERB2, 12, 30, 100, 10 - AUTORADIOBUTTON "Rotate by an angle of", IDD_MIRRORROTATERB3, 12, 42, 100, 10 - AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED - AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED - AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + AUTORADIOBUTTON "Mirror &horizontally", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Mirror &vertically", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "&Rotate by an angle of", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 125, 24, 48, 14 END @@ -139,21 +139,21 @@ BEGIN EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 - LTEXT "Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 - LTEXT "File date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "File size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "File &date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "File &size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "&Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 GROUPBOX "Units", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Inches", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&Inches", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Colors", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Colors", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Co&lors", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "Default", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/es-ES.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/eu-ES.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/fr-FR.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/he-IL.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/hu-HU.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/it-IT.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ja-JP.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -3,7 +3,7 @@ * LICENSE: unknown (LGPL assumed) * FILE: base/applications/mspaint/lang/ja-JP.rc * PURPOSE: Japanese Language resource file - * TRANSLATORS: pcds90net, Tomoya Kitagawa + * TRANSLATORS: pcds90net, Tomoya Kitagawa, Katayama Hirofumi MZ */
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT @@ -26,32 +26,32 @@
POPUP "ç·¨é(&E)" BEGIN - MENUITEM "å ã«æ»ã\tCtrl+Z", IDM_EDITUNDO - MENUITEM "ããç´ã\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "åãåã\tCtrl+X", IDM_EDITCUT - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDITCOPY - MENUITEM "è²¼ãä»ã\tCtrl+V", IDM_EDITPASTE - MENUITEM "é¸æç¯å²ã®åé¤\tDel", IDM_EDITDELETESELECTION - MENUITEM "é¸æç¯å²ã®æ¿å ¥", IDM_EDITINVERTSELECTION - MENUITEM "ãã¹ã¦é¸æ\tCtrl+A", IDM_EDITSELECTALL - MENUITEM SEPARATOR - MENUITEM "ãã¡ã¤ã«ã¸ã³ãã¼", IDM_EDITCOPYTO - MENUITEM "ãã¡ã¤ã«ããè²¼ãä»ã", IDM_EDITPASTEFROM + MENUITEM "å ã«æ»ã(&U)\tCtrl+Z", IDM_EDITUNDO + MENUITEM "ããç´ã(&R)\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "åãåã(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "é¸æç¯å²ã®åé¤(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "é¸æç¯å²ã®å転(&I)", IDM_EDITINVERTSELECTION + MENUITEM "ãã¹ã¦é¸æ(&A)\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "ãã¡ã¤ã«ã¸ã³ãã¼(&O)", IDM_EDITCOPYTO + MENUITEM "ãã¡ã¤ã«ããè²¼ãä»ã(&F)", IDM_EDITPASTEFROM END
POPUP "表示(&V)" BEGIN - MENUITEM "ãã¼ã« ããã¯ã¹\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "ã«ã©ã¼ ãã¬ãã\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED - MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "ããã¹ã ãã¼ã« ãã¼", IDM_FORMATICONBAR, CHECKED, GRAYED - MENUITEM SEPARATOR - POPUP "æ¡å¤§" + MENUITEM "ãã¼ã« ããã¯ã¹(&T)\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "ã«ã©ã¼ ãã¬ãã(&C)\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼(&S)", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "ããã¹ã ãã¼ã« ãã¼(&E)", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "æ¡å¤§(&Z)" BEGIN - POPUP "ã¦ã¼ã¶ã¼å®ç¾©" + POPUP "ã¦ã¼ã¶ã¼å®ç¾©(&U)" BEGIN - MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "12.5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 MENUITEM "50%", IDM_VIEWZOOM50 MENUITEM "100%", IDM_VIEWZOOM100 @@ -60,26 +60,26 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "ã°ãªããã表示\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "å®å¯¸è¡¨ç¤º", IDM_VIEWSHOWMINIATURE + MENUITEM "ã°ãªããã表示(&G)\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "å®å¯¸è¡¨ç¤º(&H)", IDM_VIEWSHOWMINIATURE END - MENUITEM "å ¨ç»é¢è¡¨ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "å ¨ç»é¢è¡¨ç¤º(&F)\tCtrl+F", IDM_VIEWFULLSCREEN END
POPUP "ç»å(&I)" BEGIN - MENUITEM "å転ã¨å転\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "åãåã", IDM_IMAGECROP - MENUITEM "è²ã®å転\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "ç»åã®å±æ§\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "å転ã¨å転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Stretch/Skew(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "åãåã(&C)", IDM_IMAGECROP + MENUITEM "è²ã®å転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "ç»åã®å±æ§(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "ç»åã®åé¤\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "ä¸éæè²ãæç»ãã", IDM_IMAGEDRAWOPAQUE + MENUITEM "ä¸éæè²ãæç»ãã(&D)", IDM_IMAGEDRAWOPAQUE END
POPUP "è²(&C)" BEGIN - MENUITEM "ãã¬ããã®ç·¨é", IDM_COLORSEDITPALETTE + MENUITEM "ãã¬ããã®ç·¨é(&E)", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE MENUITEM "Old palette", IDM_COLORSOLDPALETTE @@ -87,9 +87,9 @@
POPUP "&?" BEGIN - MENUITEM "ãã«ã ãããã¯", IDM_HELPHELPTOPICS - MENUITEM SEPARATOR - MENUITEM "æ å ±", IDM_HELPINFO + MENUITEM "ãã«ã ãããã¯(&H)", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "æ å ±(&I)", IDM_HELPINFO END END
@@ -122,12 +122,12 @@ CAPTION "å転ã¨å転" BEGIN GROUPBOX "å転ã¨å転", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 - AUTORADIOBUTTON "æ°´å¹³æ¹åã«å転", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP - AUTORADIOBUTTON "åç´æ¹åã«å転", IDD_MIRRORROTATERB2, 12, 30, 100, 10 - AUTORADIOBUTTON "è§åº¦ãæå®", IDD_MIRRORROTATERB3, 12, 42, 100, 10 - AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED - AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED - AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + AUTORADIOBUTTON "æ°´å¹³æ¹åã«å転(&H)", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "åç´æ¹åã«å転(&V)", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "è§åº¦ãæå®(&R)", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "&90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "&180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "&270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 125, 24, 48, 14 END @@ -139,21 +139,21 @@ BEGIN EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "å¹ :", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 - LTEXT "é«ã:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 - LTEXT "ãã¡ã¤ã«ã®æ¥ä»:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "ãã¡ã¤ã«ã®ãµã¤ãº:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "解å度:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 + LTEXT "å¹ (&W):", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "é«ã(&H):", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "ãã¡ã¤ã«ã®æ¥ä»(&D):", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "ãã¡ã¤ã«ã®ãµã¤ãº(&S):", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "解å度(&R):", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT6, 75, 5, 90, 10 + LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT7, 75, 15, 90, 10 + LTEXT "å©ç¨ä¸å¯è½", IDD_ATTRIBUTESTEXT8, 75, 25, 90, 10 GROUPBOX "åä½", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "ã¤ã³ã", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "ãã¯ã»ã«", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "ã¤ã³ã(&I)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "ãã¯ã»ã«(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "è²", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "ç½é»", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "ã«ã©ã¼", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "ç½é»(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "ã«ã©ã¼(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "ããã©ã«ã", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/nl-NL.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/no-NO.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pl-PL.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -219,4 +219,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-BR.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/pt-PT.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -219,4 +219,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ru-RU.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sk-SK.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -219,4 +219,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/sv-SE.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/tr-TR.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Buraya yalnızca tamsayı girilmelidir." IDS_PERCENTAGE, "Buradaki deÄer 1 ilâ 500 olmalıdır." IDS_ANGLE, "Buradaki deÄer -89 ilâ 89 olmalıdır." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/uk-UA.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/l... ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-TW.rc [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -218,4 +218,5 @@ IDS_INTNUMBERS, "Please enter integral numbers only!" IDS_PERCENTAGE, "The percentage must be between 1 and 500." IDS_ANGLE, "The angle must be between -89 and 89." -END + IDS_LOADERRORTEXT, "The file %s could not be loaded." +END
Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/w... ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Sun Nov 3 14:37:42 2013 @@ -433,8 +433,8 @@ if (hwnd == hMainWnd) { MINMAXINFO *mm = (LPMINMAXINFO) lParam; - (*mm).ptMinTrackSize.x = 330; - (*mm).ptMinTrackSize.y = 430; + mm->ptMinTrackSize.x = 330; + mm->ptMinTrackSize.y = 430; } break;
@@ -792,6 +792,16 @@ SetWindowText(hMainWnd, tempstr); clearHistory(); isAFile = TRUE; + } + else + { + TCHAR programname[20]; + TCHAR loaderrortext[100]; + TCHAR temptext[500]; + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); + _stprintf(temptext, loaderrortext, ofn.lpstrFile); + MessageBox(hwnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); } } break;
-
bfreisen＠svn.reactos.org