1 Jul
2009
1 Jul
'09
7:24 p.m.
Author: bfreisen
Date: Wed Jul 1 23:24:17 2009
New Revision: 41728
URL: http://svn.reactos.org/svn/reactos?rev=41728&view=rev
Log:
Paint:
- Fixed new bug in palette drawing (replacing a + by a -)
- Added "Show grid" and "Show miniature" functions
- Therefore changed the menus -> please check translations
Modified:
trunk/reactos/base/applications/paint/definitions.h
trunk/reactos/base/applications/paint/globalvar.h
trunk/reactos/base/applications/paint/lang/cs-CZ.rc
trunk/reactos/base/applications/paint/lang/de-DE.rc
trunk/reactos/base/applications/paint/lang/en-GB.rc
trunk/reactos/base/applications/paint/lang/en-US.rc
trunk/reactos/base/applications/paint/lang/es-ES.rc
trunk/reactos/base/applications/paint/lang/fr-FR.rc
trunk/reactos/base/applications/paint/lang/it-IT.rc
trunk/reactos/base/applications/paint/lang/nl-NL.rc
trunk/reactos/base/applications/paint/lang/no-NO.rc
trunk/reactos/base/applications/paint/lang/pl-PL.rc
trunk/reactos/base/applications/paint/lang/pt-BR.rc
trunk/reactos/base/applications/paint/lang/pt-PT.rc
trunk/reactos/base/applications/paint/lang/ro-RO.rc
trunk/reactos/base/applications/paint/lang/ru-RU.rc
trunk/reactos/base/applications/paint/lang/sk-SK.rc
trunk/reactos/base/applications/paint/lang/uk-UA.rc
trunk/reactos/base/applications/paint/main.c
trunk/reactos/base/applications/paint/palette.c
trunk/reactos/base/applications/paint/rsrc.rc
trunk/reactos/base/applications/paint/winproc.c
Modified: trunk/reactos/base/applications/paint/definitions.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/de…
==============================================================================
--- trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/definitions.h [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -60,6 +60,8 @@
#define IDM_VIEWZOOM400 239
#define IDM_VIEWZOOM800 240
#define IDM_VIEWFULLSCREEN 241
+#define IDM_VIEWSHOWGRID 242
+#define IDM_VIEWSHOWMINIATURE 243
#define IDM_IMAGEROTATEMIRROR 250
#define IDM_IMAGECHANGESIZE 251
@@ -140,6 +142,7 @@
#define IDS_INFOTEXT 903
#define IDS_SAVEPROMPTTEXT 904
#define IDS_DEFAULTFILENAME 905
+#define IDS_MINIATURETITLE 906
#define IDS_TOOLTIP1 910
#define IDS_TOOLTIP2 911
#define IDS_TOOLTIP3 912
Modified: trunk/reactos/base/applications/paint/globalvar.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/gl…
==============================================================================
--- trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/globalvar.h [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -71,3 +71,8 @@
extern TCHAR filename[256];
extern TCHAR filepathname[1000];
extern BOOL isAFile;
+
+extern BOOL showGrid;
+extern BOOL showMiniature;
+
+extern HWND hwndMiniature;
Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Lupa"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "ReactOS Malování je dostupné pod licencí GNU Lesser General
Public License (LGPL) verze 3 (viz. www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Chcete uloit provedené zmìny v %s?"
IDS_DEFAULTFILENAME, "Bez názvu.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Volný výbìr"
IDS_TOOLTIP2, "Výbìr"
IDS_TOOLTIP3, "Guma"
Modified: trunk/reactos/base/applications/paint/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "Benutzerdefiniert"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Raster anzeigen", IDM_VIEWSHOWGRID
+ MENUITEM "Miniaturansicht anzeigen", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Gesamtbild\tStrg+G", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint für ReactOS steht unter der GNU Lesser General Public
License (LGPL) Version 3. (siehe www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Möchten Sie die Änderungen an %s speichern?"
IDS_DEFAULTFILENAME, "Unbenannt.bmp"
+ IDS_MINIATURETITLE, "Miniaturansicht"
IDS_TOOLTIP1, "Freie Auswahl"
IDS_TOOLTIP2, "Auswahl"
IDS_TOOLTIP3, "Radierer"
Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?"
IDS_DEFAULTFILENAME, "Unnamed.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Free selection"
IDS_TOOLTIP2, "Selection"
IDS_TOOLTIP3, "Rubber"
Modified: trunk/reactos/base/applications/paint/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Full screen\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?"
IDS_DEFAULTFILENAME, "Unnamed.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Free selection"
IDS_TOOLTIP2, "Selection"
IDS_TOOLTIP3, "Rubber"
Modified: trunk/reactos/base/applications/paint/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Ver en pantalla completa\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?"
IDS_DEFAULTFILENAME, "Unnamed.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Free selection"
IDS_TOOLTIP2, "Selection"
IDS_TOOLTIP3, "Rubber"
Modified: trunk/reactos/base/applications/paint/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Plein écran\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint pour ReactOS est mise à disposition sous la Licence
publique générale limitée GNU (LGPL) version 3 (voir www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Voulez-vous enregistrer les modifications de %s?"
IDS_DEFAULTFILENAME, "Sans titre.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Sélection libre"
IDS_TOOLTIP2, "Sélection"
IDS_TOOLTIP3, "Gomme"
Modified: trunk/reactos/base/applications/paint/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Visualizza a schermo intero\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint per ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Volete salvare le modifiche a %s?"
IDS_DEFAULTFILENAME, "SenzaNome.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Selezione libera"
IDS_TOOLTIP2, "Selezione"
IDS_TOOLTIP3, "Gomma"
Modified: trunk/reactos/base/applications/paint/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "In-/uitzoomen"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Volledig scherm\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Wilt u de wijzigingen die zijn aangebracht in %s
opslaan?"
IDS_DEFAULTFILENAME, "Naamloos.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Vrij selecteren"
IDS_TOOLTIP2, "Selecteren"
IDS_TOOLTIP3, "Gum"
Modified: trunk/reactos/base/applications/paint/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Forstørre"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Full skjerm\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint for ReactOS er nå tilgjengelig under GNU Lesser General
Public License (LGPL) versjon 3 (se http://www.gnu.org/home.nb.html)"
IDS_SAVEPROMPTTEXT, "Vil du lagre endringene til %s?"
IDS_DEFAULTFILENAME, "Utennavn.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Frihåndmerking"
IDS_TOOLTIP2, "Merk"
IDS_TOOLTIP3, "Viskelær"
Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Powiêkszenie"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Pe³ny ekran\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint dla ReactOS jest dostêpny na licencji GNU Lesser General
Public License (LGPL) wersja 3 (www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Czy chcesz zapisaæ zmiany do %s?"
IDS_DEFAULTFILENAME, "Nienazwany.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Zaznaczenie dowolne"
IDS_TOOLTIP2, "Zaznaczenie"
IDS_TOOLTIP3, "Gumka"
Modified: trunk/reactos/base/applications/paint/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "&Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "E&xibir bitmap\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint para ReactOS está disponível sob a licença GNU Lesser
General Public License (LGPL) versão 3 (visite www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Salvar as alterações em %s?"
IDS_DEFAULTFILENAME, "Imagem.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Selecionar forma livre"
IDS_TOOLTIP2, "Selecionar"
IDS_TOOLTIP3, "Apagador/Apagador de cor"
Modified: trunk/reactos/base/applications/paint/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "&Zoom"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "&Ver mapa de bits\tCtrl+B", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint para ReactOS está disponível sob a licença GNU Lesser
General Public License (LGPL) versão 3 (visite www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Pretende guardar as alterações a %s?"
IDS_DEFAULTFILENAME, "Imagem.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Selecionar forma livre"
IDS_TOOLTIP2, "Selecionar"
IDS_TOOLTIP3, "Borracha/Apagar cor"
Modified: trunk/reactos/base/applications/paint/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -46,13 +46,19 @@
MENUITEM SEPARATOR
POPUP "Panoramare"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Pe tot ecranul\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -172,6 +178,7 @@
IDS_INFOTEXT, "Paint pentru ReactOS este disponibil sub licenþa GNU Lesser
General Public versiunea 3 (vedeþi www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Vreþi sã salvaþi schimbãrile la %s?"
IDS_DEFAULTFILENAME, "FãrãNume.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Golire selecþie"
IDS_TOOLTIP2, "Selecþie"
IDS_TOOLTIP3, "Radierã"
Modified: trunk/reactos/base/applications/paint/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -41,13 +41,19 @@
MENUITEM SEPARATOR
POPUP "Ìàñ&øòàá"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Ïîëíûé ýêðàí\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -167,6 +173,7 @@
IDS_INFOTEXT, "Paint äëÿ ReactOS ðàñïðîñòðàíÿåòñÿ ïîä ëèöåíçèåé GNU Lesser
General Public License (LGPL) âåðñèè 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Ñîõðàíèòü èçìåíåíèÿ â %s?"
IDS_DEFAULTFILENAME, "Áåç_èìåíè.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Âûäåëåíèå ïðîèçâîëüíîé îáëàñòè"
IDS_TOOLTIP2, "Âûäåëåíèå"
IDS_TOOLTIP3, "Ëàñòèê"
Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -47,13 +47,19 @@
MENUITEM SEPARATOR
POPUP "Lupa" //Zoom
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -173,6 +179,7 @@
IDS_INFOTEXT, "Skicár systému ReactOS je dostupný za podmienok GNU Lesser
General Public License (LGPL) verzia 3 (viï www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Chcete uloi vykonané zmeny do %s?"
IDS_DEFAULTFILENAME, "Bez názvu.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Vo¾ný výber"
IDS_TOOLTIP2, "Výber"
IDS_TOOLTIP3, "Guma"
Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la…
==============================================================================
--- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Wed Jul 1 23:24:17
2009
@@ -47,13 +47,19 @@
MENUITEM SEPARATOR
POPUP "Ìàñøòàá"
BEGIN
- MENUITEM "12,5%", IDM_VIEWZOOM125
- MENUITEM "25%", IDM_VIEWZOOM25
- MENUITEM "50%", IDM_VIEWZOOM50
- MENUITEM "100%", IDM_VIEWZOOM100
- MENUITEM "200%", IDM_VIEWZOOM200
- MENUITEM "400%", IDM_VIEWZOOM400
- MENUITEM "800%", IDM_VIEWZOOM800
+ POPUP "User defined"
+ BEGIN
+ MENUITEM "12,5%", IDM_VIEWZOOM125
+ MENUITEM "25%", IDM_VIEWZOOM25
+ MENUITEM "50%", IDM_VIEWZOOM50
+ MENUITEM "100%", IDM_VIEWZOOM100
+ MENUITEM "200%", IDM_VIEWZOOM200
+ MENUITEM "400%", IDM_VIEWZOOM400
+ MENUITEM "800%", IDM_VIEWZOOM800
+ END
+ MENUITEM SEPARATOR
+ MENUITEM "Show grid", IDM_VIEWSHOWGRID
+ MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
END
MENUITEM "Íà âåñü åêðàí\tCtrl+F", IDM_VIEWFULLSCREEN
END
@@ -173,6 +179,7 @@
IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General
Public License (LGPL) version 3 (see www.gnu.org)"
IDS_SAVEPROMPTTEXT, "Çáåðåãòè çì³íè äî %s?"
IDS_DEFAULTFILENAME, "Áåç_³ìåí³.bmp"
+ IDS_MINIATURETITLE, "Miniature"
IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³"
IDS_TOOLTIP2, "Âèä³ëåííÿ"
IDS_TOOLTIP3, "Ëàñòèê"
Modified: trunk/reactos/base/applications/paint/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma…
==============================================================================
--- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Wed Jul 1 23:24:17 2009
@@ -101,6 +101,11 @@
TCHAR filename[256];
TCHAR filepathname[1000];
BOOL isAFile = FALSE;
+
+BOOL showGrid = FALSE;
+BOOL showMiniature = FALSE;
+
+HWND hwndMiniature;
int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR
lpszArgument, int nFunsterStil)
{
@@ -214,12 +219,15 @@
LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename));
LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr));
_stprintf(progtitle, resstr, filename);
+ TCHAR miniaturetitle[100];
+ LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle,
SIZEOF(miniaturetitle));
/* create main window */
hwnd = CreateWindowEx (0, _T("WindowsApp"), progtitle, WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, CW_USEDEFAULT, 544, 375, HWND_DESKTOP, NULL, hThisInstance, NULL);
hMainWnd = hwnd;
+ hwndMiniature = CreateWindowEx(WS_EX_PALETTEWINDOW, _T("WindowsApp"),
miniaturetitle, WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, 180, 200, 120,
100, hwnd, NULL, hThisInstance, NULL);
/* loading and setting the window menu from resource */
menu = LoadMenu(hThisInstance, MAKEINTRESOURCE(ID_MENU));
Modified: trunk/reactos/base/applications/paint/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/pa…
==============================================================================
--- trunk/reactos/base/applications/paint/palette.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/palette.c [iso-8859-1] Wed Jul 1 23:24:17 2009
@@ -57,7 +57,7 @@
DrawEdge(hDC, &rc, BDR_SUNKENOUTER, BF_RECT);
oldPen = SelectObject(hDC, CreatePen(PS_NULL, 0, 0));
oldBrush = SelectObject(hDC, CreateSolidBrush(palColors[i]));
- Rectangle(hDC, rc.left + 2,rc.top + 2,rc.right + 1, rc.bottom - 1);
+ Rectangle(hDC, rc.left + 2,rc.top + 2,rc.right - 1, rc.bottom - 1);
DeleteObject(SelectObject(hDC, oldBrush));
DeleteObject(SelectObject(hDC, oldPen));
}
Modified: trunk/reactos/base/applications/paint/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs…
==============================================================================
--- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Wed Jul 1 23:24:17 2009
@@ -33,7 +33,6 @@
#include "lang/ru-RU.rc"
#include "lang/uk-UA.rc"
-
//
// SUPPORT FOR WINDOWS XP THEMES:
// THIS WILL MAKE THE PROGRAM USE THE COMMON CONTROLS
Modified: trunk/reactos/base/applications/paint/winproc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi…
==============================================================================
--- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Wed Jul 1 23:24:17 2009
@@ -60,6 +60,12 @@
PostQuitMessage (0); /* send a WM_QUIT to the message queue */
break;
case WM_CLOSE:
+ if (hwnd==hwndMiniature)
+ {
+ ShowWindow(hwndMiniature, SW_HIDE);
+ showMiniature = FALSE;
+ break;
+ }
if (undoSteps>0)
{
TCHAR programname[20];
@@ -144,6 +150,44 @@
CheckMenuItem(GetMenu(hMainWnd), IDM_IMAGEDRAWOPAQUE,
MF_UNCHECKED | MF_BYCOMMAND);
break;
}
+ if (showGrid)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWGRID, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (showMiniature)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWSHOWMINIATURE, MF_UNCHECKED |
MF_BYCOMMAND);
+
+ if (zoom==125)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM125, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==250)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM25, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==500)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM50, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==1000)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM100, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==2000)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM200, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==4000)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM400, MF_UNCHECKED |
MF_BYCOMMAND);
+ if (zoom==8000)
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800, MF_CHECKED |
MF_BYCOMMAND);
+ else
+ CheckMenuItem(GetMenu(hMainWnd), IDM_VIEWZOOM800, MF_UNCHECKED |
MF_BYCOMMAND);
+
break;
case WM_SIZE:
if (hwnd==hMainWnd)
@@ -218,8 +262,34 @@
{
HDC hdc = GetDC(hImageArea);
StretchBlt(hdc, 0, 0, imgXRes*zoom/1000, imgYRes*zoom/1000, hDrawingDC,
0, 0, imgXRes, imgYRes, SRCCOPY);
+ if (showGrid && (zoom>=4000))
+ {
+ HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0));
+ int counter;
+ for (counter = 0; counter <= imgYRes; counter++)
+ {
+ MoveToEx(hdc, 0, counter*zoom/1000, NULL);
+ LineTo(hdc, imgXRes*zoom/1000, counter*zoom/1000);
+ }
+ for (counter = 0; counter <= imgXRes; counter++)
+ {
+ MoveToEx(hdc, counter*zoom/1000, 0, NULL);
+ LineTo(hdc, counter*zoom/1000, imgYRes*zoom/1000);
+ }
+ DeleteObject(SelectObject(hdc, oldPen));
+ }
ReleaseDC(hImageArea, hdc);
SendMessage(hSelection, WM_PAINT, 0, 0);
+ SendMessage(hwndMiniature, WM_PAINT, 0, 0);
+ }else
+ if (hwnd==hwndMiniature)
+ {
+ long mclient[4];
+ GetClientRect(hwndMiniature, (LPRECT)&mclient);
+ HDC hdc = GetDC(hwndMiniature);
+ BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC,
min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]),
+ min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000,
imgYRes-mclient[3]), SRCCOPY);
+ ReleaseDC(hwndMiniature, hdc);
}
break;
@@ -546,6 +616,17 @@
insertReversible(CopyImage(hSelBm, IMAGE_BITMAP, 0, 0,
LR_COPYRETURNORG));
updateCanvasAndScrollbars();
break;
+
+ case IDM_VIEWSHOWGRID:
+ showGrid = !showGrid;
+ break;
+ case IDM_VIEWSHOWMINIATURE:
+ showMiniature = !showMiniature;
+ if (showMiniature)
+ ShowWindow(hwndMiniature, SW_SHOW);
+ else
+ ShowWindow(hwndMiniature, SW_HIDE);
+ break;
case IDM_VIEWZOOM125:
ZoomTo(125);