END\r
\r
\r
-IDD_ABOUTBOX DIALOGEX 22,16,190,182\r
+IDD_ABOUTBOX DIALOGEX 22,16,210,182\r
CAPTION "About ImageSoft"\r
FONT 8,"Tahoma",0,0\r
STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME\r
//EXSTYLE WS_EX_LAYERED\r
BEGIN\r
- LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26\r
+ LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek@reactos.org)\nGed Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 150, 36\r
PUSHBUTTON "Close", IDOK, 75, 162, 44, 15\r
ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30\r
- EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE\r
+ EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE\r
END\r
\r
+\r
+IDD_IMAGE_PROP DIALOGEX 6,6,194,107\r
+CAPTION "Image Properties"\r
+FONT 8,"MS Sans Serif",0,0\r
+STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME\r
+BEGIN\r
+ CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 50, 5, 76, 54\r
+ EDITTEXT IDC_RES_EDIT, 50, 22, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP\r
+ EDITTEXT IDC_WIDTH_EDIT, 50, 38, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP\r
+ EDITTEXT IDC_HEIGHT_EDIT, 50, 55,32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP\r
+ CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 50, 72, 54, 50\r
+ PUSHBUTTON "OK", IDOK, 134, 7, 54, 13\r
+ PUSHBUTTON "Cancel", IDCANCEL, 134, 27, 54, 13\r
+ LTEXT "Image type:", IDC_STATIC, 4, 7, 42, 9\r
+ LTEXT "Resolution:", IDC_STATIC, 4, 24, 42, 9\r
+ LTEXT "Width:", IDC_STATIC, 4, 40, 42, 9\r
+ LTEXT "Height:", IDC_STATIC, 4, 57, 42, 9\r
+ LTEXT "Unit:", IDC_STATIC, 4, 73, 42, 9\r
+ LTEXT "Image size:", IDC_STATIC, 4, 92, 42, 9\r
+ LTEXT "", IDC_RES_STAT, 86, 24, 40, 9\r
+ LTEXT "", IDC_WIDTH_STAT, 86, 40, 40, 9\r
+ LTEXT "", IDC_HEIGHT_STAT, 86, 57, 40, 9\r
+ LTEXT "", IDC_MEMORY, 54, 92, 54, 9\r
+END\r
+\r
+\r
/* floating toolbar */\r
IDD_TOOLBAR DIALOGEX 1, 19, 32, 112\r
STYLE WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_VISIBLE\r
IDS_APPNAME "ImageSoft"\r
IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."\r
IDS_READY " Ready."\r
- \r
+\r
IDS_TOOLBAR_STANDARD "Standard"\r
IDS_TOOLBAR_TEST "Test"\r
IDS_IMAGE_NAME "Image %1!u!"\r
END\r
\r
+/* imageprop.c */\r
+STRINGTABLE DISCARDABLE\r
+BEGIN\r
+ IDS_IMAGE_MONOCHROME "Monochrome (1 bit)"\r
+ IDS_IMAGE_GREYSCALE "Greyscale (8 bit)"\r
+ IDS_IMAGE_PALETTE "Palette or 256 color (8 bit)"\r
+ IDS_IMAGE_TRUECOLOR "True color (24 bit)"\r
+\r
+ IDS_UNIT_CM "Cm"\r
+ IDS_UNIT_INCHES "Inches"\r
+ IDS_UNIT_PIXELS "Pixels"\r
+ IDS_UNIT_DOTSCM "Dots / Cm"\r
+ IDS_UNIT_DPI "DPI"\r
+END\r
+\r
/* Tooltips */\r
STRINGTABLE DISCARDABLE\r
BEGIN\r
\r
#define IMAGE_FRAME_SIZE 1\r
\r
+\r
static VOID\r
EditWndUpdateScrollInfo(PEDIT_WND_INFO Info)\r
{\r
static BOOL\r
InitEditWnd(PEDIT_WND_INFO Info)\r
{\r
+ HDC hDC;\r
+ LONG cxBitmap, cyBitmap;\r
+\r
Info->Zoom = 100;\r
\r
if (Info->OpenInfo != NULL)\r
{\r
+ /* set bitmap dimensions */\r
+ cxBitmap = Info->OpenInfo->New.Width;\r
+ cyBitmap = Info->OpenInfo->New.Height;\r
+\r
+ /* create bitmap */\r
+ hDC = GetDC(Info->hSelf);\r
+ Info->hBitmap = CreateCompatibleBitmap(hDC, cxBitmap, cyBitmap);\r
+ Info->hDCMem = CreateCompatibleDC(hDC);\r
+ ReleaseDC(Info->hSelf, hDC);\r
+\r
+ if (!Info->hBitmap)\r
+ {\r
+ DeleteDC(Info->hDCMem);\r
+ return FALSE;\r
+ }\r
+\r
if (Info->OpenInfo->CreateNew)\r
{\r
+ /* what is this for? Does Info->OpenInfo become obsolete? */\r
Info->Width = Info->OpenInfo->New.Width;\r
Info->Height = Info->OpenInfo->New.Height;\r
+\r
+ SelectObject(Info->hDCMem, Info->hBitmap);\r
+ PatBlt(Info->hDCMem, 0, 0, cxBitmap, cxBitmap, WHITENESS);\r
}\r
else\r
{\r
HDC hDC,\r
LPPAINTSTRUCT lpps)\r
{\r
- /* FIXME */\r
+ BitBlt(hDC, 0, 0, Info->Width, Info->Height, Info->hDCMem, 0, 0, SRCCOPY);\r
}\r
\r
static LRESULT CALLBACK\r
WS_HSCROLL | WS_VSCROLL,\r
CW_USEDEFAULT,\r
CW_USEDEFAULT,\r
- CW_USEDEFAULT,\r
- CW_USEDEFAULT,\r
+ OpenInfo->New.Width,\r
+ OpenInfo->New.Height,\r
MainWnd->hMdiClient,\r
hInstance,\r
(LPARAM)Info);\r
wc.hIcon = LoadIcon(hInstance,\r
MAKEINTRESOURCE(IDI_ICON));\r
wc.hCursor = LoadCursor(NULL,\r
- IDC_ARROW);\r
- wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);\r
+ IDC_CROSS);\r
+ wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);\r
wc.lpszClassName = szImageEditWndClass;\r
wc.hIconSm = (HICON)LoadImage(hInstance,\r
MAKEINTRESOURCE(IDI_ICON),\r