[gedmurphy] 21552: Add buttons to the floating tool window. They don't do anything yet apart from look pretty. Give some order to the resource.h file tool.
Author: gedmurphy Date: Tue Apr 11 23:47:04 2006 New Revision: 21552
URL: http://svn.reactos.ru/svn/reactos?rev=21552&view=rev Log: Add buttons to the floating tool window. They don't do anything yet apart from look pretty. Give some order to the resource.h file tool.
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/ trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/ trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp (with props) Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCopyIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainCutIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainNewIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainOpenIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPasteIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPrintIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainPrintPreIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainRedoIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainSaveIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/MainUndoIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp Modified: trunk/reactos/base/applications/imagesoft/about.c trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/misc.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h
Modified: trunk/reactos/base/applications/imagesoft/about.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/about.c (original) +++ trunk/reactos/base/applications/imagesoft/about.c Tue Apr 11 23:47:04 2006 @@ -15,7 +15,7 @@ case WM_INITDIALOG:
hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16,
Modified: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (original) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Tue Apr 11 23:47:04 2006 @@ -3,6 +3,33 @@ static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass");
#define ID_TIMER 1 + +TBBUTTON ToolsButtons[] = { +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_RECTSEL, ID_RECTSEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_MOVESEL, ID_MOVESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_LASOO, ID_LASOO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* cut */ + {TBICON_MOVE, ID_MOVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* undo */ + {TBICON_ECLIPSESEL, ID_ECLIPSESEL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + {TBICON_ZOOM, ID_ZOOM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_MAGICWAND, ID_MAGICWAND, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* paste */ + {TBICON_TEXT, ID_TEXT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_PAINTBRUSH, ID_PAINTBRUSH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ERASER, ID_ERASER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print */ + {TBICON_PENCIL, ID_PENCIL, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_COLORPICKER, ID_COLORPICKER, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_CLONESTAMP, ID_CLONESTAMP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_RECOLORING, ID_RECOLORING, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_PAINTBUCKET, ID_PAINTBUCKET, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_LINE, ID_LINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* copy */ + {TBICON_RECTANGLE, ID_RECTANGLE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ROUNDRECT, ID_ROUNDRECT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* redo */ + {TBICON_ECLIPSE, ID_ECLIPSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {TBICON_FREEFORM, ID_FREEFORM, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, +}; +
BOOL ShowHideWindow(HWND hwnd) @@ -15,6 +42,77 @@ return Hidden; }
+ +VOID +FloatToolbarCreateToolsGui(PFLT_WND FltTools) +{ + HWND hTb; + HIMAGELIST hImageList; + INT NumButtons; + + NumButtons = sizeof(ToolsButtons) / sizeof(ToolsButtons[0]); + + hTb = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | CCS_NODIVIDER, + 0, 0, 32, 200, + FltTools->hSelf, + NULL, + hInstance, + NULL); + + SendMessage(hTb, + TB_SETEXTENDEDSTYLE, + 0, + TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + SendMessage(hTb, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolsButtons[0]), + 0); + + SendMessage(hTb, + TB_SETBITMAPSIZE, + 0, + (LPARAM)MAKELONG(16, 16)); + + hImageList = InitImageList(20, + IDB_TOOLSRECTSEL); + + ImageList_Destroy((HIMAGELIST)SendMessage(hTb, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList)); + + SendMessage(hTb, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)ToolsButtons); + + SendMessage(hTb, + TB_AUTOSIZE, + 0, + 0); + + return; +} + + +VOID +FloatToolbarCreateColorsGui(PFLT_WND FltColors) +{ + + return; +} + + +VOID +FloatToolbarCreateHistoryGui(PFLT_WND FltHistory) +{ + + return; +}
LRESULT CALLBACK FloatToolbarWndProc(HWND hwnd, @@ -112,9 +210,33 @@
switch(LOWORD(wParam)) { - case IDC_PRESS: - MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), - MB_OK | MB_ICONEXCLAMATION); + case ID_NEW: + MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), MB_OK | MB_ICONEXCLAMATION); + break; + + case ID_CLONESTAMP: + case ID_COLORPICKER: + case ID_ECLIPSE: + case ID_ECLIPSESEL: + case ID_ERASER: + case ID_FREEFORM: + case ID_LASOO: + case ID_LINE: + case ID_MAGICWAND: + case ID_MOVE: + case ID_MOVESEL: + case ID_PAINTBRUSH: + case ID_PAINTBUCKET: + case ID_PENCIL: + case ID_RECOLORING: + case ID_RECTANGLE: + case ID_ROUNDRECT: + case ID_TEXT: + case ID_ZOOM: + /*SendMessage(Info->hSelf, + LOWORD(wParam), + wParam, + lParam);*/ break; } break;
Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Tue Apr 11 23:47:04 2006 @@ -32,7 +32,7 @@ return 1; }
- len = _tcslen(lpAppName) + _tcslen(lpVersion); + len = (int)_tcslen(lpAppName) + (int)_tcslen(lpVersion); lpTitle = HeapAlloc(ProcessHeap, 0, (len + 2) * sizeof(TCHAR));
Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Tue Apr 11 23:47:04 2006 @@ -10,36 +10,56 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 24 DISCARDABLE "manifest.xml" - + STRINGTABLE DISCARDABLE BEGIN IDS_APPNAME "ImageSoft" IDS_VERSION "v0.1" END
-IDI_ICON ICON "res/imagesoft.ico" +IDI_IMAGESOFTICON ICON "res/imagesoft.ico"
/* main toolbar icons */ -IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/MainCopyIcon.bmp" -IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/MainCutIcon.bmp" -IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/MainPasteIcon.bmp" -IDB_MAINREDOICON BITMAP DISCARDABLE "res/icons/MainRedoIcon.bmp" -IDB_MAINUNDOICON BITMAP DISCARDABLE "res/icons/MainUndoIcon.bmp" -IDB_MAINNEWICON BITMAP DISCARDABLE "res/icons/MainNewIcon.bmp" -IDB_MAINOPENICON BITMAP DISCARDABLE "res/icons/MainOpenIcon.bmp" -IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/MainPrintIcon.bmp" -IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/MainPrintPreIcon.bmp" -IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/MainSaveIcon.bmp" +IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" +IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" +IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" +IDB_MAINREDOICON BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" +IDB_MAINUNDOICON BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" +IDB_MAINNEWICON BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" +IDB_MAINOPENICON BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" +IDB_MAINPRINTICON BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" +IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" +IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp"
/* text toolbar icons */ -IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/TextBoldIcon.bmp" -IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/TextItalicIcon.bmp" -IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/TextUnderlineIcon.bmp" -IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/TextAlignLeftIcon.bmp" -IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/TextAlignCenterIcon.bmp" -IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/TextAlignRightIcon.bmp" +IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/text/TextBoldIcon.bmp" +IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/text/TextItalicIcon.bmp" +IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/text/TextUnderlineIcon.bmp" +IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/text/TextAlignLeftIcon.bmp" +IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/text/TextAlignCenterIcon.bmp" +IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/text/TextAlignRightIcon.bmp"
/* tools window icons */ +IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" +IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" +IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" +IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" +IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" +IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" +IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" +IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" +IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" +IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" +IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" +IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" +IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" +IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" +IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" +IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" +IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" +IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" +IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" +IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp"
/* cursors */
Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Tue Apr 11 23:47:04 2006 @@ -511,13 +511,13 @@ wc.lpfnWndProc = ImageEditWndProc; wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, - MAKEINTRESOURCE(IDI_ICON)); + MAKEINTRESOURCE(IDI_IMAGESOFTICON)); wc.hCursor = LoadCursor(hInstance, MAKEINTRESOURCE(IDC_PAINTBRUSHCURSOR)); wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); wc.lpszClassName = szImageEditWndClass; wc.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16,
Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Tue Apr 11 23:47:04 2006 @@ -71,9 +71,9 @@ };
static FLT_WND FloatingWindow[NUM_FLT_WND] = { - {NULL, NULL, 0, 0, 55, 300}, - {NULL, NULL, 0, 0, 200, 200}, - {NULL, NULL, 0, 0, 150, 150} + {NULL, NULL, 0, 0, 53, 300}, /* tools */ + {NULL, NULL, 0, 0, 200, 200}, /* colors */ + {NULL, NULL, 0, 0, 150, 150} /* history */ };
@@ -95,55 +95,6 @@ {ID_TOOLBAR_TEXT, szToolbarText, IDS_TOOLBAR_TEXT, TOP_DOCK}, };
- -static HIMAGELIST -InitImageList(UINT NumButtons, UINT StartResource) -{ - HBITMAP hBitmap; - HIMAGELIST hImageList; - INT i, k, Ret; - - - /* Create the toolbar icon image list */ - hImageList = ImageList_Create(TB_BMP_WIDTH, - TB_BMP_HEIGHT, - ILC_MASK | ILC_COLOR24, - NumButtons, - 0); - if (! hImageList) - return NULL; - - /* Add all icons to the image list */ - for (i = StartResource, k = 0; k < NumButtons; i++, k++) - { - hBitmap = LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - TB_BMP_WIDTH, - TB_BMP_HEIGHT, - LR_LOADTRANSPARENT); - - Ret = ImageList_AddMasked(hImageList, - hBitmap, - RGB(255, 255, 254)); - - DeleteObject(hBitmap); - } - - return hImageList; - -} - -/* -static BOOL -DestroyImageList(HIMAGELIST hImageList) -{ - if (! ImageList_Destroy(hImageList)) - return FALSE; - else - return TRUE; -} -*/
static BOOL CALLBACK MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, @@ -530,9 +481,8 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info) { RECT rect; - const TBBUTTON *Buttons = NULL; - UINT Res, NumButtons = 2; - INT i = 0; + UINT Res; + INT i = TOOLS;
if (! GetWindowRect(Info->hMdiClient, &rect)) @@ -541,16 +491,16 @@ }
/* tools datum */ - FloatingWindow[0].x = rect.left + 5; - FloatingWindow[0].y = rect.top + 5; + FloatingWindow[TOOLS].x = rect.left + 5; + FloatingWindow[TOOLS].y = rect.top + 5;
/* colors datum */ - FloatingWindow[1].x = rect.left + 5; - FloatingWindow[1].y = rect.bottom - FloatingWindow[1].Height - 5; + FloatingWindow[COLORS].x = rect.left + 5; + FloatingWindow[COLORS].y = rect.bottom - FloatingWindow[1].Height - 5;
/* history datum */ - FloatingWindow[2].x = rect.right - FloatingWindow[2].Width - 5; - FloatingWindow[2].y = rect.top + 5; + FloatingWindow[HISTORY].x = rect.right - FloatingWindow[2].Width - 5; + FloatingWindow[HISTORY].y = rect.top + 5;
for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_WND; Res++, i++) { @@ -561,8 +511,6 @@ FloatingWindow[i].lpName = NULL; }
- - /* create the 'tools' toolbar */ FloatingWindow[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, TEXT("ImageSoftFloatWndClass"), FloatingWindow[i].lpName, @@ -578,39 +526,21 @@ }
- if (Info->hFloatTools != NULL) - { - HIMAGELIST hFloatToolsImageList; - - SendMessage(Info->hFloatTools, - TB_SETEXTENDEDSTYLE, - 0, - TBSTYLE_EX_HIDECLIPPEDBUTTONS); - - /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ - SendMessage(Info->hFloatTools, - TB_BUTTONSTRUCTSIZE, - sizeof(Buttons[0]), - 0); - - SendMessage(Info->hFloatTools, - TB_SETBITMAPSIZE, - 0, - (LPARAM)MAKELONG(TB_BMP_WIDTH, TB_BMP_HEIGHT)); - - hFloatToolsImageList = InitImageList(2, - IDB_MAINNEWICON); - - SendMessage(Info->hFloatTools, - TB_SETIMAGELIST, - 0, - (LPARAM)hFloatToolsImageList); - - SendMessage(Info->hFloatTools, - TB_ADDBUTTONS, - NumButtons, - (LPARAM)&StdButtons); - + + + if (FloatingWindow[TOOLS].hSelf != NULL) + { + FloatToolbarCreateToolsGui(&FloatingWindow[TOOLS]); + } + + if (FloatingWindow[COLORS].hSelf != NULL) + { + FloatToolbarCreateColorsGui(&FloatingWindow[COLORS]); + } + + if (FloatingWindow[HISTORY].hSelf != NULL) + { + FloatToolbarCreateHistoryGui(&FloatingWindow[HISTORY]); }
} @@ -846,6 +776,9 @@
CreateImageEditWindow(Info, &OpenInfo); + + /* FIXME: move flt wnd's if scroll bars show + MainWndResetFloatingWindows(Info->hMdiClient); */ }
} @@ -998,7 +931,7 @@ lParam); break;
- case WM_NCLBUTTONUP : + case WM_NCLBUTTONUP:
bLBMouseDown = FALSE; DefWindowProc(hwnd, @@ -1325,14 +1258,14 @@ wc.lpfnWndProc = MainWndProc; wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, - MAKEINTRESOURCE(IDI_ICON)); + MAKEINTRESOURCE(IDI_IMAGESOFTICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); wc.lpszClassName = szMainWndClass; wc.hIconSm = (HICON)LoadImage(hInstance, - MAKEINTRESOURCE(IDI_ICON), + MAKEINTRESOURCE(IDI_IMAGESOFTICON), IMAGE_ICON, 16, 16,
Modified: trunk/reactos/base/applications/imagesoft/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/misc.c (original) +++ trunk/reactos/base/applications/imagesoft/misc.c Tue Apr 11 23:47:04 2006 @@ -203,10 +203,6 @@ }
-VOID MessageBoxInt(INT num) -{ - MessageBox(NULL, _itot(num, NULL, 10), NULL, 0); -}
/* * Toolbar custom control routines @@ -373,3 +369,53 @@
return FALSE; } + + +HIMAGELIST +InitImageList(UINT NumImages, UINT StartResource) +{ + HBITMAP hBitmap; + HIMAGELIST hImageList; + INT i, k, Ret; + + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(TB_BMP_WIDTH, + TB_BMP_HEIGHT, + ILC_MASK | ILC_COLOR24, + NumImages, + 0); + if (! hImageList) + return NULL; + + /* Add all icons to the image list */ + for (i = StartResource, k = 0; k < NumImages; i++, k++) + { + hBitmap = LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + TB_BMP_WIDTH, + TB_BMP_HEIGHT, + LR_LOADTRANSPARENT); + + Ret = ImageList_AddMasked(hImageList, + hBitmap, + RGB(255, 255, 254)); + + DeleteObject(hBitmap); + } + + return hImageList; + +} + +/* +static BOOL +DestroyImageList(HIMAGELIST hImageList) +{ + if (! ImageList_Destroy(hImageList)) + return FALSE; + else + return TRUE; +} +*/
Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Tue Apr 11 23:47:04 2006 @@ -28,6 +28,10 @@ #define NUM_MAINTB_IMAGES 10 #define TB_BMP_WIDTH 16 #define TB_BMP_HEIGHT 16 + +#define TOOLS 0 +#define COLORS 1 +#define HISTORY 2
#define MONOCHROMEBITS 1 #define GREYSCALEBITS 8 @@ -338,8 +342,6 @@
VOID GetError(DWORD err);
-VOID MessageBoxInt(INT num); - BOOL ToolbarDeleteControlSpace(HWND hWndToolbar, const TBBUTTON *ptbButton);
@@ -355,9 +357,14 @@ INT iCmd, BOOL HideVertical);
+HIMAGELIST InitImageList(UINT NumButtons, + UINT StartResource); + /* opensave.c */ VOID FileInitialize(HWND hwnd); -BOOL DoOpenFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpName); +BOOL DoOpenFile(HWND hwnd, + LPTSTR lpFileName, + LPTSTR lpName); BOOL DoSaveFile(HWND hwnd);
/* floattoolbar.c */ @@ -372,6 +379,9 @@ BOOL bOpaque; } FLT_WND, *PFLT_WND;
+VOID FloatToolbarCreateToolsGui(PFLT_WND FltTools); +VOID FloatToolbarCreateColorsGui(PFLT_WND FltColors); +VOID FloatToolbarCreateHistoryGui(PFLT_WND FltHistory); BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); BOOL ShowHideWindow(HWND hwnd);
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCopyIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainCutIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainNewIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainOpenIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPasteIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPrintIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainPrintPreIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainRedoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainSaveIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/MainUndoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCopyIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainCutIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainNewIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainOpenIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPasteIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainRedoIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainSaveIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/std/MainUndoIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextBoldIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextItalicIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsEraser.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsLine.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMove.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsPencil.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsText.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/base/applications/imagesoft/res/icons/tools/ToolsZoom.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft/... ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Tue Apr 11 23:47:04 2006 @@ -1,55 +1,180 @@ #define IDC_STATIC -1
-#define IDC_TOOLBAR 1001 -#define IDC_FLOATTOOLBAR 1002 -#define IDC_STATUSBAR 1003 -#define IDC_MAIN_MDI 1004 - -#define IDD_FLOATTOOLS 1100 -#define IDC_PRESS 1101 -#define IDC_OTHER 1102 - -#define ID_NEW 2000 -#define ID_OPEN 2001 -#define ID_CLOSE 2002 -#define ID_CLOSEALL 2003 -#define ID_SAVE 2004 -#define ID_SAVEAS 2005 -#define ID_PRINTPRE 2006 -#define ID_PRINT 2007 -#define ID_PROP 2008 -#define ID_CUT 2009 -#define ID_COPY 2010 -#define ID_PASTE 2011 -#define ID_PASTENEWIMAGE 2012 -#define ID_UNDO 2013 -#define ID_REDO 2014 -#define ID_SELALL 2015 -#define ID_EXIT 2016 -#define ID_EDITCOLOURS 2017 -#define ID_TOOLS 2018 -#define ID_STATUSBAR 2019 -#define ID_BOLD 2030 -#define ID_ITALIC 2031 -#define ID_ULINE 2032 -#define ID_TXTLEFT 2033 -#define ID_TXTCENTER 2034 -#define ID_TXTRIGHT 2035 -#define ID_TXTFONTNAME 2036 - -#define ID_REFRESH 3000 -#define ID_HELP 3001 -#define ID_WINDOW_TILE_HORZ 3002 -#define ID_WINDOW_TILE_VERT 3003 -#define ID_WINDOW_CASCADE 3004 -#define ID_WINDOW_NEXT 3005 -#define ID_WINDOW_ARRANGE 3006 - -/* Menu */ -#define IDR_MAINMENU 102 -#define IDR_POPUP 103 -#define ID_ABOUT 4031 - +/* Main Windows */ +#define IDC_TOOLBAR 10 +#define IDC_STATUSBAR 11 +#define IDC_MAIN_MDI 12 +/* these need to be kept consecutive */ +#define IDS_FLT_TOOLS 20 +#define IDS_FLT_COLORS 21 +#define IDS_FLT_HISTORY 22 + +/* Program icon */ +#define IDI_IMAGESOFTICON 50 + +/* Menus */ +#define IDR_MAINMENU 102 +#define IDR_POPUP 103 + +/* COMMANDS */ +/* main */ +#define ID_NEW 2000 +#define ID_OPEN 2001 +#define ID_CLOSE 2002 +#define ID_CLOSEALL 2003 +#define ID_SAVE 2004 +#define ID_SAVEAS 2005 +#define ID_PRINTPRE 2006 +#define ID_PRINT 2007 +#define ID_PROP 2008 +#define ID_CUT 2009 +#define ID_COPY 2010 +#define ID_PASTE 2011 +#define ID_PASTENEWIMAGE 2012 +#define ID_UNDO 2013 +#define ID_REDO 2014 +#define ID_SELALL 2015 +#define ID_EXIT 2016 +#define ID_EDITCOLOURS 2017 +#define ID_TOOLS 2018 +#define ID_STATUSBAR 2019 + +/* text */ +#define ID_BOLD 2030 +#define ID_ITALIC 2031 +#define ID_ULINE 2032 +#define ID_TXTLEFT 2033 +#define ID_TXTCENTER 2034 +#define ID_TXTRIGHT 2035 +#define ID_TXTFONTNAME 2036 + +/* tools */ +#define ID_CLONESTAMP 2050 +#define ID_COLORPICKER 2051 +#define ID_ECLIPSE 2052 +#define ID_ECLIPSESEL 2053 +#define ID_ERASER 2054 +#define ID_FREEFORM 2055 +#define ID_LASOO 2056 +#define ID_LINE 2057 +#define ID_MAGICWAND 2058 +#define ID_MOVE 2059 +#define ID_MOVESEL 2060 +#define ID_PAINTBRUSH 2061 +#define ID_PAINTBUCKET 2062 +#define ID_PENCIL 2063 +#define ID_RECOLORING 2064 +#define ID_RECTANGLE 2065 +#define ID_RECTSEL 2066 +#define ID_ROUNDRECT 2067 +#define ID_TEXT 2068 +#define ID_ZOOM 2069 + +#define ID_ABOUT 2100 + +#define ID_REFRESH 3000 +#define ID_HELP 3001 +#define ID_WINDOW_TILE_HORZ 3002 +#define ID_WINDOW_TILE_VERT 3003 +#define ID_WINDOW_CASCADE 3004 +#define ID_WINDOW_NEXT 3005 +#define ID_WINDOW_ARRANGE 3006 + +/* menu hints */ +#define IDS_HINT_EXIT 20001 + +/* system menu hints */ +#define IDS_HINT_SYS_RESTORE 21001 +#define IDS_HINT_SYS_MOVE 21002 +#define IDS_HINT_SYS_SIZE 21003 +#define IDS_HINT_SYS_MINIMIZE 21004 +#define IDS_HINT_SYS_MAXIMIZE 21005 +#define IDS_HINT_SYS_CLOSE 21006 +#define IDS_HINT_SYS_NEXT 21007 + + +/* Toolbar button bitmaps. + * These must be numbered consecutively + * See loop in InitImageList (misc.c) + */ +#define IDB_MAINNEWICON 10000 +#define IDB_MAINOPENICON 10001 +#define IDB_MAINSAVEICON 10002 +#define IDB_MAINPRINTICON 10003 +#define IDB_MAINPRINTPREICON 10004 +#define IDB_MAINCUTICON 10005 +#define IDB_MAINCOPYICON 10006 +#define IDB_MAINPASTEICON 10007 +#define IDB_MAINUNDOICON 10008 +#define IDB_MAINREDOICON 10009 + +#define IDB_TEXTBOLD 10020 +#define IDB_TEXTITALIC 10021 +#define IDB_TEXTULINE 10022 +#define IDB_TEXTLEFT 10023 +#define IDB_TEXTCENTER 10024 +#define IDB_TEXTRIGHT 10025 + +#define IDB_TOOLSRECTSEL 10030 +#define IDB_TOOLSMOVESEL 10031 +#define IDB_TOOLSLASOO 10032 +#define IDB_TOOLSMOVE 10033 +#define IDB_TOOLSECLIPSESEL 10034 +#define IDB_TOOLSZOOM 10035 +#define IDB_TOOLSMAGICWAND 10036 +#define IDB_TOOLSTEXT 10037 +#define IDB_TOOLSPAINTBRUSH 10038 +#define IDB_TOOLSERASER 10039 +#define IDB_TOOLSPENCIL 10040 +#define IDB_TOOLSCOLORPICKER 10041 +#define IDB_TOOLSCLONESTAMP 10042 +#define IDB_TOOLSRECOLORING 10043 +#define IDB_TOOLSPAINTBUCKET 10044 +#define IDB_TOOLSLINE 10045 +#define IDB_TOOLSRECTANGLE 10046 +#define IDB_TOOLSROUNDRECT 10047 +#define IDB_TOOLSECLIPSE 10048 +#define IDB_TOOLSFREEFORM 10049 + +/* toolbar buttons */ +#define TBICON_NEW 0 +#define TBICON_OPEN 1 +#define TBICON_SAVE 2 +#define TBICON_PRINT 3 +#define TBICON_PRINTPRE 4 +#define TBICON_CUT 5 +#define TBICON_COPY 6 +#define TBICON_PASTE 7 +#define TBICON_UNDO 8 +#define TBICON_REDO 9 + +#define TBICON_BOLD 0 +#define TBICON_ITALIC 1 +#define TBICON_ULINE 2 +#define TBICON_TXTLEFT 3 +#define TBICON_TXTCENTER 4 +#define TBICON_TXTRIGHT 5 + +#define TBICON_RECTSEL 0 +#define TBICON_MOVESEL 1 +#define TBICON_LASOO 2 +#define TBICON_MOVE 3 +#define TBICON_ECLIPSESEL 4 +#define TBICON_ZOOM 5 +#define TBICON_MAGICWAND 6 +#define TBICON_TEXT 7 +#define TBICON_PAINTBRUSH 8 +#define TBICON_ERASER 9 +#define TBICON_PENCIL 10 +#define TBICON_COLORPICKER 11 +#define TBICON_CLONESTAMP 12 +#define TBICON_RECOLORING 13 +#define TBICON_PAINTBUCKET 14 +#define TBICON_LINE 15 +#define TBICON_RECTANGLE 16 +#define TBICON_ROUNDRECT 17 +#define TBICON_ECLIPSE 18 +#define TBICON_FREEFORM 19
/* tooltips */ #define IDS_TOOLTIP_NEW 6000 @@ -63,58 +188,12 @@ #define IDS_TOOLTIP_UNDO 6008 #define IDS_TOOLTIP_REDO 6009
-#define IDI_ICON 50 -#define IDB_BUTTONS 51 - -/* these need to be kept consecutive */ -#define IDS_FLT_TOOLS 60 -#define IDS_FLT_COLORS 61 -#define IDS_FLT_HISTORY 62 - -/* toolbar buttons */ -#define TBICON_PROP 0 -#define TBICON_REFRESH 1 -#define TBICON_EXPORT 2 -#define TBICON_CREATE 3 -#define TBICON_START 4 -#define TBICON_STOP 5 -#define TBICON_PAUSE 6 -#define TBICON_RESTART 7 -#define TBICON_HELP 8 -#define TBICON_EXIT 9 - -#define TBICON_BOLD 0 -#define TBICON_ITALIC 1 -#define TBICON_ULINE 2 -#define TBICON_TXTLEFT 3 -#define TBICON_TXTCENTER 4 -#define TBICON_TXTRIGHT 5 - -/* about box info */ -#define IDD_ABOUTBOX 200 -#define IDC_LICENSE_EDIT 201 - -#define IDS_APPNAME 101 -#define IDS_VERSION 102 -#define IDS_LICENSE 103 -#define IDS_READY 104 -#define IDS_TOOLBAR_STANDARD 201 -#define IDS_TOOLBAR_TEST 202 -#define IDS_TOOLBAR_TEXT 203 -#define IDS_IMAGE_NAME 210 - -/* menu hints */ -#define IDS_HINT_EXIT 20001 - -/* system menu hints */ -#define IDS_HINT_SYS_RESTORE 21001 -#define IDS_HINT_SYS_MOVE 21002 -#define IDS_HINT_SYS_SIZE 21003 -#define IDS_HINT_SYS_MINIMIZE 21004 -#define IDS_HINT_SYS_MAXIMIZE 21005 -#define IDS_HINT_SYS_CLOSE 21006 -#define IDS_HINT_SYS_NEXT 21007 - +/* cursors */ +#define IDC_PAINTBRUSHCURSOR 20001 +#define IDC_PAINTBRUSHCURSORMOUSEDOWN 20002 + + +/* DIALOGS */
/* image property dialog */ #define IDD_IMAGE_PROP 4000 @@ -140,41 +219,14 @@ #define IDS_UNIT_MB 4109 #define IDS_UNIT_KB 4110
- -/* toolbar buttons resources - * these must be numbered consecutively - * see loop in InitImageList */ -#define IDB_MAINNEWICON 10000 -#define IDB_MAINOPENICON 10001 -#define IDB_MAINSAVEICON 10002 -#define IDB_MAINPRINTICON 10003 -#define IDB_MAINPRINTPREICON 10004 -#define IDB_MAINCUTICON 10005 -#define IDB_MAINCOPYICON 10006 -#define IDB_MAINPASTEICON 10007 -#define IDB_MAINUNDOICON 10008 -#define IDB_MAINREDOICON 10009 -#define IDB_TEXTBOLD 10020 -#define IDB_TEXTITALIC 10021 -#define IDB_TEXTULINE 10022 -#define IDB_TEXTLEFT 10023 -#define IDB_TEXTCENTER 10024 -#define IDB_TEXTRIGHT 10025 - - -/* toolbar buttons */ -#define TBICON_NEW 0 -#define TBICON_OPEN 1 -#define TBICON_SAVE 2 -#define TBICON_PRINT 3 -#define TBICON_PRINTPRE 4 -#define TBICON_CUT 5 -#define TBICON_COPY 6 -#define TBICON_PASTE 7 -#define TBICON_UNDO 8 -#define TBICON_REDO 9 - - -/* cursors */ -#define IDC_PAINTBRUSHCURSOR 20001 -#define IDC_PAINTBRUSHCURSORMOUSEDOWN 20002 +/* about box info */ +#define IDD_ABOUTBOX 4200 +#define IDC_LICENSE_EDIT 4201 +#define IDS_APPNAME 4202 +#define IDS_VERSION 4203 +#define IDS_LICENSE 4204 +#define IDS_READY 4205 +#define IDS_TOOLBAR_STANDARD 4206 +#define IDS_TOOLBAR_TEST 4207 +#define IDS_TOOLBAR_TEXT 4208 +#define IDS_IMAGE_NAME 4209
-
gedmurphy＠svn.reactos.org