Author: bfreisen
Date: Fri Jul 31 17:33:21 2015
New Revision: 68584
URL:
http://svn.reactos.org/svn/reactos?rev=68584&view=rev
Log:
[MSPAINT_NEW]
- use optimal buffer size to load null terminated strings using LoadString
- add printing-related menu entries and dialogs (no printing functionality yet)
Modified:
trunk/reactos/base/applications/mspaint_new/definitions.h
trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc
trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc
trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc
trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc
trunk/reactos/base/applications/mspaint_new/lang/en-US.rc
trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc
trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc
trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc
trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc
trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc
trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc
trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc
trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc
trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc
trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc
trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc
trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc
trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc
trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc
trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc
trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc
trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc
trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc
trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc
trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc
trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc
trunk/reactos/base/applications/mspaint_new/winproc.cpp
Modified: trunk/reactos/base/applications/mspaint_new/definitions.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/definitions.h [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -50,11 +50,15 @@
#define IDM_FILESAVE 203
#define IDM_FILESAVEAS 204
+#define IDM_FILEPAGEVIEW 206
+#define IDM_FILEPAGESETUP 207
+#define IDM_FILEPRINT 208
+
#define IDM_FILEASWALLPAPERPLANE 210
#define IDM_FILEASWALLPAPERCENTERED 211
#define IDM_FILEASWALLPAPERSTRETCHED 212
-#define IDM_FILEEXIT 205
+#define IDM_FILEEXIT 215
#define IDM_EDITUNDO 220
#define IDM_EDITREDO 221
Modified: trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/bg-BG.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&ÐÑваÑÑне...\tAlt+tCtrl+O", IDM_FILEOPEN
MENUITEM "&ÐапиÑ\tCtrl+S", IDM_FILESAVE
MENUITEM "ÐÐ°Ð¿Ð¸Ñ &каÑо...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "ÐоÑÑавÑне каÑо ÑÐ°Ð¿ÐµÑ (наÑÑелено)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "ÐоÑÑавÑне каÑо ÑÐ°Ð¿ÐµÑ (в ÑÑедаÑа)",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/cs-CZ.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&OtevÅÃt...\tCtrl+O", IDM_FILEOPEN
MENUITEM "Uložit\tCtrl+S", IDM_FILESAVE
MENUITEM "Uložit jako...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Nastavit jako pozadà (vedle sebe)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Nastavit jako pozadà (na stÅed)",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/de-DE.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "Ãffnen...\tStrg+O", IDM_FILEOPEN
MENUITEM "Speichern\tStrg+S", IDM_FILESAVE
MENUITEM "Speichern unter...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Seitenansicht", IDM_FILEPAGEVIEW
+ MENUITEM "Seite einrichten...", IDM_FILEPAGESETUP
+ MENUITEM "Drucken...\tStrg+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Als Hintergrund (Fläche)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Als Hintergrund (Zentriert)", IDM_FILEASWALLPAPERCENTERED
Modified: trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/en-GB.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Open...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Save\tCtrl+S", IDM_FILESAVE
MENUITEM "Save &as...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED
Modified: trunk/reactos/base/applications/mspaint_new/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/en-US.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Open...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Save\tCtrl+S", IDM_FILESAVE
MENUITEM "Save &as...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED
Modified: trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/es-ES.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -17,6 +17,10 @@
MENUITEM "Abrir...\tCtrl+O", IDM_FILEOPEN
MENUITEM "Guardar\tCtrl+S", IDM_FILESAVE
MENUITEM "Guardar como...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Fondo de pantalla (normal)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Fondo de pantalla (centrado)", IDM_FILEASWALLPAPERCENTERED
@@ -215,4 +219,5 @@
IDS_PERCENTAGE "El porcentaje debe de estar entre 1 y 500."
IDS_ANGLE "El ángulo debe de estar entre -89 y 89."
IDS_LOADERRORTEXT "No se pudo cargar el archivo %s."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/eu-ES.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "Ireki...\tCtrl+O", IDM_FILEOPEN
MENUITEM "Gorde\tCtrl+S", IDM_FILESAVE
MENUITEM "Gorde honela...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Ezarri azteko plano gisa (Lauza moduan)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Ezarri azteko plano gisa (erdian)",
IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/fr-FR.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "&Ouvrir...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Enregistrer\tCtrl+S", IDM_FILESAVE
MENUITEM "Enregistrer &sous...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Choisir comme image d'arrière-plan (mosaïque)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Choisir comme image d'arrière-plan (centrée)",
IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE "Le pourcentage doit être entre 1 et 500."
IDS_ANGLE "L'angle doit être entre -89 et 89."
IDS_LOADERRORTEXT "Le fichier %s n'a pas pu être chargé."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/he-IL.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "&פת×\tCtrl+O", IDM_FILEOPEN
MENUITEM "&ש××ר\tCtrl+S", IDM_FILESAVE
MENUITEM "ש××ר ×ש&×...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "ק××¢ ×רקע ש×××× ××¢×××× (פר×ש)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "ק××¢ ×רקע ש×××× ××¢×××× (×ר××)",
IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE, "The percentage must be between 1 and 500."
IDS_ANGLE, "The angle must be between -89 and 89."
IDS_LOADERRORTEXT, "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/hu-HU.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "Meg&nyitás...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Mentés\tCtrl+S", IDM_FILESAVE
MENUITEM "Mentés má&sként...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "BeállÃtás tapétaként (mozaik)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "BeállÃtás tapétaként (középre)",
IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/it-IT.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "Apri...\tCtrl+F12", IDM_FILEOPEN
MENUITEM "Salva\tMaiusc+F12", IDM_FILESAVE
MENUITEM "Salva con nome...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Imposta come sfondo (normale)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Imposta come sfondo (centrata)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "La percentuale deve essere compresa tra 1 e 500."
IDS_ANGLE "L'angolo deve essere compreso tra -89 e 89."
IDS_LOADERRORTEXT "l file %s non può essere caricato."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/ja-JP.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "éã(&O)\tCtrl+O", IDM_FILEOPEN
MENUITEM "ä¸æ¸ãä¿å(&S)\tCtrl+S", IDM_FILESAVE
MENUITEM "ååãä»ãã¦ä¿å(&A)...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "èæ¯ã«è¨å® (並ã¹ã¦è¡¨ç¤º)", IDM_FILEASWALLPAPERPLANE
MENUITEM "èæ¯ã«è¨å® (ä¸å¤®ã«è¡¨ç¤º)",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/nl-NL.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "Openen...\tCtrl+O", IDM_FILEOPEN
MENUITEM "Opslaan\tCtrl+S", IDM_FILESAVE
MENUITEM "Opslaan als...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Als achtergrond instellen (naast elkaar)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Als achtergrond instellen (gecentreerd)",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/no-NO.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Ã
pne...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Lagre\tCtrl+S", IDM_FILESAVE
MENUITEM "Lagre &som...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Bruk som bakgrunn (sidestilt)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Bruk som bakgrunn (midstilt)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/pl-PL.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -17,6 +17,10 @@
MENUITEM "&Otwórz...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Zapisz\tCtrl+S", IDM_FILESAVE
MENUITEM "Zapisz &jako...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Ustaw jako tapetÄ (sÄ
siadujÄ
ce)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Ustaw jako tapetÄ (wyÅrodkowana)",
IDM_FILEASWALLPAPERCENTERED
@@ -215,4 +219,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/pt-BR.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "A&brir...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Salvar\tCtrl+S", IDM_FILESAVE
MENUITEM "Salvar &como...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Definir como plano de fundo (Lado a lado)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Definir como plano de fundo (Centralizado)",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/pt-PT.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Abrir...\tCtrl+A", IDM_FILEOPEN
MENUITEM "&Guardar\tCtrl+G", IDM_FILESAVE
MENUITEM "Guardar &como...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Definir como fundo (Mosaico)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Definir como fundo (Centrado)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/ro-RO.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Deschidereâ¦\tCtrl+O", IDM_FILEOPEN
MENUITEM "&PÄstreazÄ\tCtrl+S", IDM_FILESAVE
MENUITEM "PÄst&rare înâ¦", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Decor de birou (¢rat)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "Procentajul trebuie sÄ fie între 1 Èi 500."
IDS_ANGLE "Unghiul trebuie sÄ fie între -89 Èi 89."
IDS_LOADERRORTEXT "FiÈierul %s nu poate fi încÄrcat."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/ru-RU.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "&ÐÑкÑÑÑÑ...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&СоÑ
ÑаниÑÑ\tCtrl+S", IDM_FILESAVE
MENUITEM "СоÑ
ÑаниÑÑ &как...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "СделаÑÑ ÑоновÑм ÑиÑÑнком
(&замоÑÑиÑÑ)", IDM_FILEASWALLPAPERPLANE
MENUITEM "СделаÑÑ ÑоновÑм ÑиÑÑнком (по
Ñ&енÑÑÑ)", IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE, "ÐÑоÑÐµÐ½Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ бÑÑÑ Ð² инÑеÑвале оÑ
1 до 500."
IDS_ANGLE, "Угол должен бÑÑÑ Ð² инÑеÑвале Ð¾Ñ -89 до
89."
IDS_LOADERRORTEXT, "Ðевозможно загÑÑзиÑÑ Ñайл %s."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/sk-SK.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -17,6 +17,10 @@
MENUITEM "&Otvoriť...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Uložiť\tCtrl+S", IDM_FILESAVE
MENUITEM "Uložiť &ako...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Nastaviť ako pozadie (vydláždené)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Nastaviť ako pozadie (v strede)",
IDM_FILEASWALLPAPERCENTERED
@@ -215,4 +219,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/sq-AL.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Hap...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Ruaj\tCtrl+S", IDM_FILESAVE
MENUITEM "Ruaj &si...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Vere si wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Vere si wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "Përqindja duhet të jetë në mes 1 dhe 500."
IDS_ANGLE "Këndi duhet të jetë në mes -89 dhe 89."
IDS_LOADERRORTEXT "Dokumenti %s nuk mund te ngarkohej."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/sv-SE.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -8,6 +8,10 @@
MENUITEM "&Ãppna...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Spara\tCtrl+S", IDM_FILESAVE
MENUITEM "Spara so&m...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "Ange som skrivbordsbakgrund (kakelklädd)",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Ange som skrivbordsbakgrund (centrerad)",
IDM_FILEASWALLPAPERCENTERED
@@ -206,4 +210,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/tr-TR.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "&Aç...\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Sakla\tCtrl+S", IDM_FILESAVE
MENUITEM "Ay&rı Sakla...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "&DöÅeyerek Duvar KaÄıdı Yap",
IDM_FILEASWALLPAPERPLANE
MENUITEM "&Ortalayarak Duvar KaÄıdı Yap",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "Yüzde 1'den 500'e dek olmalıdır."
IDS_ANGLE "Açı -89'dan 89'a dek olmalıdır."
IDS_LOADERRORTEXT "%s kütüÄü yüklenemedi."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/uk-UA.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "Ð&ÑдкÑиÑи...\tCtrl+O", IDM_FILEOPEN
MENUITEM "Ð&беÑегÑи\tCtrl+S", IDM_FILESAVE
MENUITEM "ÐбеÑегÑи &Ñк...", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "&ÐамоÑÑиÑи ÑобоÑий ÑÑÑл Windows",
IDM_FILEASWALLPAPERPLANE
MENUITEM "Ðо Ñ&енÑÑÑ ÑобоÑого ÑÑола Windows",
IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/zh-CN.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "æå¼... (&O)\tCtrl+O", IDM_FILEOPEN
MENUITEM "ä¿å(&S)\tCtrl+S", IDM_FILESAVE
MENUITEM "å¦å为... (&A)", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "ä¿å为å£çº¸ (æ®é)", IDM_FILEASWALLPAPERPLANE
MENUITEM "ä¿å为å£çº¸ (å±
ä¸)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "ç¾åæ¯å¿
é¡»å¨1è³500ä¹é´ã"
IDS_ANGLE "该è§åº¦å¿
é¡»å¨-89ä¸89ä¹é´ã"
IDS_LOADERRORTEXT "该æ件 %s æ æ³å è½½ã"
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/lang/zh-TW.rc [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -16,6 +16,10 @@
MENUITEM "éå... (&O)\tCtrl+O", IDM_FILEOPEN
MENUITEM "å²å(&S)\tCtrl+S", IDM_FILESAVE
MENUITEM "å¦åçº... (&A)", IDM_FILESAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Page View", IDM_FILEPAGEVIEW
+ MENUITEM "Page Setup...", IDM_FILEPAGESETUP
+ MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT
MENUITEM SEPARATOR
MENUITEM "å²åçºå£ç´ (æ®é)", IDM_FILEASWALLPAPERPLANE
MENUITEM "å²åçºå£ç´ (å±
ä¸)", IDM_FILEASWALLPAPERCENTERED
@@ -214,4 +218,5 @@
IDS_PERCENTAGE "The percentage must be between 1 and 500."
IDS_ANGLE "The angle must be between -89 and 89."
IDS_LOADERRORTEXT "The file %s could not be loaded."
-END
+ IDS_ENLARGEPROMPTTEXT "The image in the clipboard is larger than the
bitmap.\nWould you like the bitmap enlarged?"
+END
Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_…
==============================================================================
--- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Fri Jul 31
17:33:21 2015
@@ -196,11 +196,14 @@
{
if (!imageModel.IsImageSaved())
{
- TCHAR programname[20];
- TCHAR saveprompttext[100];
- TCHAR temptext[500];
- LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname));
- LoadString(hProgInstance, IDS_SAVEPROMPTTEXT, saveprompttext,
SIZEOF(saveprompttext));
+ TCHAR* tempptr;
+ TCHAR programname[LoadString(hProgInstance, IDS_PROGRAMNAME,
(LPTSTR)&tempptr, 0) + 1];
+ CopyMemory(programname, tempptr, sizeof(programname) - sizeof(TCHAR));
+ programname[SIZEOF(programname) - 1] = (TCHAR)'\0';
+ TCHAR saveprompttext[LoadString(hProgInstance, IDS_SAVEPROMPTTEXT,
(LPTSTR)&tempptr, 0) + 1];
+ CopyMemory(saveprompttext, tempptr, sizeof(saveprompttext) - sizeof(TCHAR));
+ saveprompttext[SIZEOF(saveprompttext) - 1] = (TCHAR)'\0';
+ TCHAR temptext[SIZEOF(saveprompttext) + _tcslen(filename)];
_stprintf(temptext, saveprompttext, filename);
switch (MessageBox(temptext, programname, MB_YESNOCANCEL | MB_ICONQUESTION))
{
@@ -393,6 +396,22 @@
break;
case IDM_FILESAVEAS:
saveImage(FALSE);
+ break;
+ case IDM_FILEPAGESETUP:
+ // DUMMY: Shows the dialog only, no functionality
+ PAGESETUPDLG psd;
+ ZeroMemory(&psd, sizeof(psd));
+ psd.lStructSize = sizeof(psd);
+ psd.hwndOwner = m_hWnd;
+ PageSetupDlg(&psd);
+ break;
+ case IDM_FILEPRINT:
+ // DUMMY: Shows the dialog only, no functionality
+ PRINTDLG pd;
+ ZeroMemory(&pd, sizeof(pd));
+ pd.lStructSize = sizeof(pd);
+ pd.hwndOwner = m_hWnd;
+ PrintDlg(&pd);
break;
case IDM_FILEASWALLPAPERPLANE:
SetWallpaper(filepathname, 1, 1);