From 00ae7c52f94850e1fb3c48130b30747545f8d68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 26 Sep 2021 02:43:00 +0200 Subject: [PATCH] [IMAGESOFT] Reorganize the bitmap resource IDs. - Moving the IDB_* with their corresponding TBICON_* defines. - Reordering the BITMAP resources in the same order the defines are defined. - Fixing values for IDS_READY and IDS_TOOLBAR_TEXT. --- .../applications/imagesoft/imagesoft.rc | 86 ++++++------ .../rosapps/applications/imagesoft/mainwnd.c | 2 +- .../rosapps/applications/imagesoft/resource.h | 128 +++++++++--------- 3 files changed, 111 insertions(+), 105 deletions(-) diff --git a/modules/rosapps/applications/imagesoft/imagesoft.rc b/modules/rosapps/applications/imagesoft/imagesoft.rc index c1b7c8d9ef0..24a1fd72da5 100644 --- a/modules/rosapps/applications/imagesoft/imagesoft.rc +++ b/modules/rosapps/applications/imagesoft/imagesoft.rc @@ -13,60 +13,60 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_IMAGESOFTICON ICON "res/imagesoft.ico" /* main toolbar icons */ -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" +IDB_MAINNEW BITMAP DISCARDABLE "res/icons/std/MainNewIcon.bmp" +IDB_MAINOPEN BITMAP DISCARDABLE "res/icons/std/MainOpenIcon.bmp" +IDB_MAINSAVE BITMAP DISCARDABLE "res/icons/std/MainSaveIcon.bmp" +IDB_MAINPRINT BITMAP DISCARDABLE "res/icons/std/MainPrintIcon.bmp" +IDB_MAINPRINTPRE BITMAP DISCARDABLE "res/icons/std/MainPrintPreIcon.bmp" +IDB_MAINCUT BITMAP DISCARDABLE "res/icons/std/MainCutIcon.bmp" +IDB_MAINCOPY BITMAP DISCARDABLE "res/icons/std/MainCopyIcon.bmp" +IDB_MAINPASTE BITMAP DISCARDABLE "res/icons/std/MainPasteIcon.bmp" +IDB_MAINUNDO BITMAP DISCARDABLE "res/icons/std/MainUndoIcon.bmp" +IDB_MAINREDO BITMAP DISCARDABLE "res/icons/std/MainRedoIcon.bmp" /* text toolbar icons */ -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" +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" +IDB_TOOLSRECTSEL BITMAP DISCARDABLE "res/icons/tools/ToolsRectangleSelect.bmp" +IDB_TOOLSMOVESEL BITMAP DISCARDABLE "res/icons/tools/ToolsMoveSelection.bmp" +IDB_TOOLSLASOO BITMAP DISCARDABLE "res/icons/tools/ToolsLassoSelect.bmp" +IDB_TOOLSMOVE BITMAP DISCARDABLE "res/icons/tools/ToolsMove.bmp" +IDB_TOOLSECLIPSESEL BITMAP DISCARDABLE "res/icons/tools/ToolsEllipseSelect.bmp" +IDB_TOOLSZOOM BITMAP DISCARDABLE "res/icons/tools/ToolsZoom.bmp" +IDB_TOOLSMAGICWAND BITMAP DISCARDABLE "res/icons/tools/ToolsMagicWand.bmp" +IDB_TOOLSTEXT BITMAP DISCARDABLE "res/icons/tools/ToolsText.bmp" +IDB_TOOLSPAINTBRUSH BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBrush.bmp" +IDB_TOOLSERASER BITMAP DISCARDABLE "res/icons/tools/ToolsEraser.bmp" +IDB_TOOLSPENCIL BITMAP DISCARDABLE "res/icons/tools/ToolsPencil.bmp" +IDB_TOOLSCOLORPICKER BITMAP DISCARDABLE "res/icons/tools/ToolsColorPicker.bmp" +IDB_TOOLSCLONESTAMP BITMAP DISCARDABLE "res/icons/tools/ToolsCloneStamp.bmp" +IDB_TOOLSRECOLORING BITMAP DISCARDABLE "res/icons/tools/ToolsRecoloring.bmp" +IDB_TOOLSPAINTBUCKET BITMAP DISCARDABLE "res/icons/tools/ToolsPaintBucket.bmp" +IDB_TOOLSLINE BITMAP DISCARDABLE "res/icons/tools/ToolsLine.bmp" +IDB_TOOLSRECTANGLE BITMAP DISCARDABLE "res/icons/tools/ToolsRectangle.bmp" +IDB_TOOLSROUNDRECT BITMAP DISCARDABLE "res/icons/tools/ToolsRoundedRectangle.bmp" +IDB_TOOLSECLIPSE BITMAP DISCARDABLE "res/icons/tools/ToolsEllipse.bmp" +IDB_TOOLSFREEFORM BITMAP DISCARDABLE "res/icons/tools/ToolsFreeformShape.bmp" /* history window icons */ -IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" -IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" -IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" +IDB_HISTBACK BITMAP DISCARDABLE "res/icons/hist/HistBack.bmp" +IDB_HISTUNDO BITMAP DISCARDABLE "res/icons/hist/HistUndo.bmp" +IDB_HISTREDO BITMAP DISCARDABLE "res/icons/hist/HistRedo.bmp" IDB_HISTFORWARD BITMAP DISCARDABLE "res/icons/hist/HistForward.bmp" IDB_HISTDELETE BITMAP DISCARDABLE "res/icons/hist/HistDelete.bmp" /* colors window icons */ -IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" -IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" +IDB_COLORSMORE BITMAP DISCARDABLE "res/icons/color/ColorMore.bmp" +IDB_COLORSLESS BITMAP DISCARDABLE "res/icons/color/ColorLess.bmp" /* cursors */ -IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" -IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" +IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" +IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" #include "rsrc.rc" diff --git a/modules/rosapps/applications/imagesoft/mainwnd.c b/modules/rosapps/applications/imagesoft/mainwnd.c index b3373af9cf3..86b0b3f10cf 100644 --- a/modules/rosapps/applications/imagesoft/mainwnd.c +++ b/modules/rosapps/applications/imagesoft/mainwnd.c @@ -130,7 +130,7 @@ MainWndCreateToolbarClient(struct _TOOLBAR_DOCKS *TbDocks, { Buttons = StdButtons; NumButtons = ARRAYSIZE(StdButtons); - StartImageRes = IDB_MAINNEWICON; + StartImageRes = IDB_MAINNEW; NumImages = 10; break; } diff --git a/modules/rosapps/applications/imagesoft/resource.h b/modules/rosapps/applications/imagesoft/resource.h index 43baef251f9..e18fe1f28a3 100644 --- a/modules/rosapps/applications/imagesoft/resource.h +++ b/modules/rosapps/applications/imagesoft/resource.h @@ -17,6 +17,7 @@ #define IDR_POPUP 103 /* COMMANDS */ + /* main */ #define ID_NEW 2000 #define ID_OPEN 2001 @@ -129,20 +130,42 @@ #define IDS_HINT_SYS_CLOSE 21006 -/* Toolbar button bitmaps. +/* 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 + +/* standard */ +#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 IDB_MAINNEW 10000 +#define IDB_MAINOPEN 10001 +#define IDB_MAINSAVE 10002 +#define IDB_MAINPRINT 10003 +#define IDB_MAINPRINTPRE 10004 +#define IDB_MAINCUT 10005 +#define IDB_MAINCOPY 10006 +#define IDB_MAINPASTE 10007 +#define IDB_MAINUNDO 10008 +#define IDB_MAINREDO 10009 + + +/* text */ +#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 IDB_TEXTBOLD 10020 #define IDB_TEXTITALIC 10021 @@ -151,6 +174,29 @@ #define IDB_TEXTCENTER 10024 #define IDB_TEXTRIGHT 10025 + +/* tools */ +#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 + #define IDB_TOOLSRECTSEL 10030 #define IDB_TOOLSMOVESEL 10031 #define IDB_TOOLSLASOO 10032 @@ -172,6 +218,14 @@ #define IDB_TOOLSECLIPSE 10048 #define IDB_TOOLSFREEFORM 10049 + +/* history */ +#define TBICON_BACKSM 0 +#define TBICON_UNDOSM 1 +#define TBICON_REDOSM 2 +#define TBICON_FORWARDSM 3 +#define TBICON_DELETESM 4 + #define IDB_HISTBACK 10060 #define IDB_HISTUNDO 10061 #define IDB_HISTREDO 10062 @@ -181,54 +235,6 @@ #define IDB_COLORSMORE 10080 #define IDB_COLORSLESS 10081 -/* TOOLBAR BITMAPS */ - -/* standard */ -#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 -/* text */ -#define TBICON_BOLD 0 -#define TBICON_ITALIC 1 -#define TBICON_ULINE 2 -#define TBICON_TXTLEFT 3 -#define TBICON_TXTCENTER 4 -#define TBICON_TXTRIGHT 5 -/* tools */ -#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 -/* history */ -#define TBICON_BACKSM 0 -#define TBICON_UNDOSM 1 -#define TBICON_REDOSM 2 -#define TBICON_FORWARDSM 3 -#define TBICON_DELETESM 4 - /* tooltips */ #define IDS_TOOLTIP_NEW 6000 @@ -290,8 +296,8 @@ #define IDS_APPNAME 4202 #define IDS_VERSION 4203 #define IDS_LICENSE 4204 -#define IDS_READY 42050 +#define IDS_READY 4205 #define IDS_TOOLBAR_STANDARD 4206 #define IDS_TOOLBAR_TEST 4207 -#define IDS_TOOLBAR_TEXT 4205 +#define IDS_TOOLBAR_TEXT 4208 #define IDS_IMAGE_NAME 4209