WebSVN – Kolibri OS – Diff – /programs/cmm/iconedit/iconedit.c

 #include "../lib/obj/libimg.h"
 #include "../lib/obj/box_lib.h"
 #include "../lib/patterns/rgb.h"
-#include "../lib/patterns/rgb.h"
+#include "../lib/patterns/toolbar_button.h"
 char edit_menu_items[] =
 "ëà¥§ âì|Ctrl+X
 ®¯¨à®¢ âì|Ctrl+C
 áâ ¢¨âì|Ctrl+V";
 char image_menu_items[] =
-"®«¨ç¥áâ¢® ¨á¯®«ì§®¢ ëå æ¢¥â®¢
+"®áç¨â âì ª®«¨ç¥áâ¢® ã¨ª «ìëå æ¢¥â®¢
- ¬¥¨âì ¢á¥ æ¢¥â  1   2";
+ ¬¥¨âì ¢á¥ æ¢¥â  1   2
+à®¢¥à¨âì ¨ª®ªã";
 ?define T_MENU_IMAGE "ª®ª "
-?define T_TEST_ICON "à®¢¥à¨âì ¨ª®ªã"
+?define T_TEST_ICON "à®¢¥àª  ¨ª®ª¨"
 ?define T_TITLE "¥¤ ªâ®à ¨ª®®ª 0.70a Beta"
 ?define T_UNIC_COLORS_COUNT "'¨ª «ìëå æ¢¥â®¢: %i.' -I"
 ?define T_TOO_BIG_IMAGE_FOR_PREVIEW "'IconEdit
 §®¡à ¦¥¨¥ á«¨èª®¬ ¡®«ìè®¥ ¤«ï ¯à¥¤¯à®á¬®âà !' -tE"
 ?define T_ERROR_CROP_TOOL "'«ï ®¡à¥§ª¨ ¨§®¡à ¦¥¨ï ¢ ç «¥ ã¦® ¢ë¤¥«¨âì ®¡« áâì.' -W"
 char edit_menu_items[] =
 "Cut|Ctrl+X
 Copy|Ctrl+C
 Paste|Ctrl+V";
 char image_menu_items[] =
-"Count colors used
+"Count unic colors used
-Replace all colors equal to 1 by 2";
+Replace all colors equal to 1 by 2
+Test icon";
 ?define T_MENU_IMAGE "Icon"
 ?define T_TEST_ICON "Test Icon"
 ?define T_TITLE "Icon Editor 0.70 Beta"
 ?define T_UNIC_COLORS_COUNT "'Image has %i unique colors.' -I"
 ?define T_TOO_BIG_IMAGE_FOR_PREVIEW "'IconEdit
 selected image is too big to open!' -E"
 #endif
+#define PALLETE_SIZE 116
 #define TOPBAR_H    24+8
-#define LEFTBAR_W 16+5+5+3+3
+#define TOPBAR_H    24+8
-#define PALLETE_SIZE 116
+int leftbar_w;
 #define PAL_ITEMS_X_COUNT 13
 #define COLSIZE 18
 #define RIGHT_BAR_W PAL_ITEMS_X_COUNT*COLSIZE
 #define TO_CANVAS_X(xval) xval - canvas.x/zoom.value
 #define TO_CANVAS_Y(yval) yval - canvas.y/zoom.value
 	load_dll(libimg, #libimg_init, 1);
 	load_dll(boxlib, #box_lib_init,0);
 	top_icons.load("/sys/icons16.png");
+	left_icons.load("/sys/icons16.png");
-	left_icons.load("/sys/icons16.png");
+	leftbar_w = left_icons.w + 16;
 	sc.get();
 			DrawWindow();
 			break;
+	}
+}
-void DrawTopPanelButton(dword _event, _hotkey, _x, _icon_n)
+void DrawTopPanelButton1(dword _event, _hotkey, _x, _icon_n)
+{
 	DrawWideRectangle(_x, 4, 22, 22, 3, semi_white);
 	PutPixel(_x,4,sc.work);
 	PutPixel(_x,4+21,sc.work);
 	PutPixel(_x+21,4,sc.work);
 	PutPixel(_x+21,4+21,sc.work);
 	DefineHiddenButton(_x, 4, 21, 21, button.add(_event));
+	img_draw stdcall(top_icons.image, -top_icons.w+16/2+_x+3, -top_icons.w+16/2+7, left_icons.w,
+		left_icons.w, 0, _icon_n*left_icons.w);
-	img_draw stdcall(top_icons.image, _x+3, 7, 16, 16, 0, _icon_n*16);
+	//DrawTopPanelButton(button.add(_event), _x, 5, _icon_n, false);
 	if (_hotkey) key.add_n(_hotkey, _event);
+}
+}
 void DrawLeftPanelButton(dword _event, _hotkey, _y, _icon_n)
+{
 	int x = 5;
-	DrawRectangle(x, _y, 22-1, 22-1, sc.work);
+	DrawRectangle(x, _y, left_icons.w + 5, left_icons.w + 5, sc.work);
-	DefineHiddenButton(x, _y, 21, 21, button.add(_event));
+	DefineHiddenButton(x, _y, left_icons.w + 5, left_icons.w + 5, button.add(_event));
+	img_draw stdcall(left_icons.image, x+3, _y+3, left_icons.w,
-	img_draw stdcall(left_icons.image, x+3, _y+3, 16, 16, 0, _icon_n*16);
+		left_icons.w, 0, _icon_n*left_icons.w);
 	key.add_n(_hotkey, _event);
+}
 void DrawStatusBar()
+{
 void DrawWindow()
+{
 	#define GAPH 27
+	#define GAPV 28
+	#define GAP_S 26+5
-	#define GAPV 28
+	#define GAP_B 26+18
 	#define BLOCK_SPACE 10
 	incn tx;
 	incn ty;
 	sc.get();
 	right_bar.x = Form.cwidth - right_bar.w;
 	b_color_gradient.x = b_last_colors.x = b_default_palette.x = right_bar.x;
 	DrawBar(0, 0, Form.cwidth, TOPBAR_H-1, sc.work);
 	DrawBar(0, TOPBAR_H-1, Form.cwidth, 1, sc.work_graph);
-	DrawTopPanelButton(#EventCreateNewIcon,  ECTRL + SCAN_CODE_KEY_N, tx.set(5),    2);
+	DrawTopPanelButton1(#EventCreateNewIcon,  ECTRL + SCAN_CODE_KEY_N, tx.set(5),    2);
-	DrawTopPanelButton(#EventOpenIcon,       ECTRL + SCAN_CODE_KEY_O, tx.inc(GAPH), 0);
+	DrawTopPanelButton1(#EventOpenIcon,       ECTRL + SCAN_CODE_KEY_O, tx.inc(GAP_S), 0);
-	DrawTopPanelButton(#EventSaveIconToFile, ECTRL + SCAN_CODE_KEY_S, tx.inc(GAPH), 5);
+	DrawTopPanelButton1(#EventSaveIconToFile, ECTRL + SCAN_CODE_KEY_S, tx.inc(GAP_S), 5);
-	DrawTopPanelButton(#EventMoveLeft,       ECTRL + SCAN_CODE_LEFT,  tx.inc(GAPH+BLOCK_SPACE), 30);
+	DrawTopPanelButton1(#EventMoveLeft,       ECTRL + SCAN_CODE_LEFT,  tx.inc(GAP_B), 30);
-	DrawTopPanelButton(#EventMoveRight,      ECTRL + SCAN_CODE_RIGHT, tx.inc(GAPH), 31);
+	DrawTopPanelButton1(#EventMoveRight,      ECTRL + SCAN_CODE_RIGHT, tx.inc(GAP_S), 31);
-	DrawTopPanelButton(#EventMoveUp,         ECTRL + SCAN_CODE_UP,    tx.inc(GAPH), 32);
+	DrawTopPanelButton1(#EventMoveUp,         ECTRL + SCAN_CODE_UP,    tx.inc(GAP_S), 32);
-	DrawTopPanelButton(#EventMoveDown,       ECTRL + SCAN_CODE_DOWN,  tx.inc(GAPH), 33);
+	DrawTopPanelButton1(#EventMoveDown,       ECTRL + SCAN_CODE_DOWN,  tx.inc(GAP_S), 33);
-	DrawTopPanelButton(#EventFlipHor,        0, tx.inc(GAPH+BLOCK_SPACE), 34);
+	DrawTopPanelButton1(#EventFlipHor,        0, tx.inc(GAP_B), 34);
-	DrawTopPanelButton(#EventFlipVer,        0, tx.inc(GAPH), 35);
+	DrawTopPanelButton1(#EventFlipVer,        0, tx.inc(GAP_S), 35);
-	DrawTopPanelButton(#EventRotateLeft,     ECTRL + SCAN_CODE_KEY_L, tx.inc(GAPH), 37);
+	DrawTopPanelButton1(#EventRotateLeft,     ECTRL + SCAN_CODE_KEY_L, tx.inc(GAP_S), 37);
-	DrawTopPanelButton(#EventRotateRight,    ECTRL + SCAN_CODE_KEY_R, tx.inc(GAPH), 36);
-	DrawTopPanelButton(#EventTestIcon,       ECTRL + SCAN_CODE_KEY_T, tx.inc(GAPH+BLOCK_SPACE), 12);
+	DrawTopPanelButton1(#EventRotateRight,    ECTRL + SCAN_CODE_KEY_R, tx.inc(GAP_S), 36);
-	DrawTopPanelButton(#EventCrop,           0, tx.inc(GAPH+BLOCK_SPACE), 46);
+	DrawTopPanelButton1(#EventCrop,           0, tx.inc(GAP_B), 46);
-	image_menu_btn.x = tx.inc(GAPH+BLOCK_SPACE);
+	image_menu_btn.x = tx.inc(GAP_B);
 	image_menu_btn.w = DrawFlatPanelButton(button.add(#EventShowImageMenu), image_menu_btn.x, image_menu_btn.y, T_MENU_IMAGE);
 	//tx.inc(image_menu_btn.w + BLOCK_SPACE);
 	DrawEditArea();
 	DrawLeftPanelButton(#EventSelectToolSelect, SCAN_CODE_KEY_S, ty.inc(GAPV), 44);
 	DrawLeftPanelButton(#EventSelectToolScrCopy,SCAN_CODE_KEY_Q, ty.inc(GAPV), 45);
 	DrawLeftPanelSelection();
+	button.add_n(1, #EventExitIconEdit);
-	button.add_n(1, #EventExitIconEdit);
+	key.add_n(ECTRL + SCAN_CODE_KEY_T, #EventTestIcon);
 	DrawBar(wrapper.x+wrapper.w, TOPBAR_H, Form.cwidth-wrapper.x-wrapper.w,
 		Form.cheight - TOPBAR_H, sc.work);
 	DrawActiveColor(right_bar.y);
 	DrawColorPallets();
 	DrawPreview();
-	DrawBar(LEFTBAR_W-1, wrapper.y + wrapper.h, wrapper.w+1,
+	DrawBar(leftbar_w-1, wrapper.y + wrapper.h, wrapper.w+1,
 		Form.cheight - wrapper.y - wrapper.h, sc.work);
 	DrawStatusBar();
 }
 void DrawLeftPanelSelection()
+{
-	if (previousTool!=-1) DrawRectangle3D(5, previousTool*GAPV+right_bar.y-2, 16+3+2, 16+3+2, sc.work, sc.work);
+	if (previousTool!=-1) DrawRectangle3D(5, previousTool*GAPV+right_bar.y-2, left_icons.w+5, left_icons.w+5, sc.work, sc.work);
-	DrawRectangle3D(5, currentTool*GAPV+right_bar.y-2, 16+3+2, 16+3+2, 0x333333, 0x777777);
+	DrawRectangle3D(5, currentTool*GAPV+right_bar.y-2, left_icons.w+5, left_icons.w+5, 0x333333, 0x777777);
+}
+void DrawEditArea()
 void DrawEditArea()
 	dword color1=0xC0C0C0;
-	dword color1=0xC0C0C0;
+	int top_side;
-	int top_side;
+	int left_side;
 			EventCountColorsUsed();
 			break;
 		case 2:
 			EventReplaceImageColors(color1, color2);
 			break;
+		case 3:
+			EventTestIcon();
+			break;
+	}
+}
 void EventCountColorsUsed()

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/iconedit.c – Rev 8389 → 8822