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

 /*
  * Icon Editor for KolibriOS
- * Authors: Leency,
+ * Authors: Leency, Nicolas
  * Licence: GPL v2
 */
 /*
 //                                                   //
 //                       DATA                        //
 //                                                   //
 //===================================================//
-#define T_TITLE "Icon Editor 0.3"
+#define T_TITLE "Icon Editor 0.31"
 #define TOOLBAR_H    24+8
+#define PANEL_LEFT_W 16+5+5+3+3
+#define PALLETE_SIZE 116
-#define TOOLBAR_H    24+8
+#define TB_ICON_PADDING 26
 #define PALLETE_SIZE 116
-rect wrapper = { 10, TOOLBAR_H, NULL, NULL };
+rect wrapper = { PANEL_LEFT_W, TOOLBAR_H, NULL, NULL };
 rect right_bar = { NULL, TOOLBAR_H, 280, NULL };
 	BTN_MOVE_DOWN,
 	BTN_FLIP_HOR,
 	BTN_FLIP_VER,
 	BTN_ROTATE_LEFT,
 	BTN_ROTATE_RIGHT,
+	BTN_PENCIL,
 	BTN_PICK,
 	BTN_FILL,
 	BTN_LINE,
 	BTN_RECT,
 	BTN_ZOOM_IN,
 	BTNS_LAST_USED_COLORS = 400
 };
 proc_info Form;
-more_less_box zoom = { NULL, NULL, 11, 1, 40, BTN_ZOOM_IN, BTN_ZOOM_OUT, "Zoom" };
+more_less_box zoom = { PANEL_LEFT_W, -100, 11, 1, 40, BTN_ZOOM_IN, BTN_ZOOM_OUT, "Zoom" };
 dword default_palette[] = {
 xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF
 };
-_image image;
-libimg_image tools_icons;
+_image image;
 libimg_image open_image;
 enum {
 	TOOL_NONE = -1,
-	TOOL_FILL = 0,
+	TOOL_PENCIL,
-	TOOL_PIPETTE = 1,
+	TOOL_PIPETTE,
-	TOOL_PENCIL = 2,
+	TOOL_FILL,
-	TOOL_LINE = 3,
+	TOOL_LINE,
-	TOOL_RECT = 4,
+	TOOL_RECT,
 	if ((index != TOOL_NONE) && (tools[index].activate != 0))
 		tools[index].activate();
 	currentTool = index;
-	currentTool = index;
+	DrawLeftPanel();
+}
+	}
+}
 void initTools()
 {
-	tools[0].id = TOOL_FILL;
+	tools[0].id = TOOL_PENCIL;
-	tools[0].onMouseEvent = #FillTool_onMouseEvent;
+	tools[0].onMouseEvent = #PencilTool_onMouseEvent;
 	tools[1].id = TOOL_PIPETTE;
 	tools[1].activate = #PipetteTool_activate;
 	tools[1].onMouseEvent = #PipetteTool_onMouseEvent;
-	tools[2].id = TOOL_PENCIL;
+	tools[2].id = TOOL_FILL;
-	tools[2].onMouseEvent = #PencilTool_onMouseEvent;
+	tools[2].onMouseEvent = #FillTool_onMouseEvent;
 	word btn;
 	load_dll(libio,  #libio_init,  1);
 	load_dll(libimg, #libimg_init, 1);
-	Libimg_LoadImage(#skin, "/sys/icons16.png");
-	Libimg_LoadImage(#tools_icons, abspath("paint_tools.png"));
+	Libimg_LoadImage(#skin, "/sys/icons16.png");
 	//system.color.get();
-	//Libimg_ReplaceColor(skin.image, skin.w, skin.h, 0xFFfffFFF, system.color.work_text);
+	//Libimg_ReplaceColor(tools_img.image, tools_img.w, tools_img.h, 0xFFF8C0D0, system.color.work);
 	image.create(32, 32);
 					break;
 				case BTN_FLIP_HOR:
 					image.move(FLIP_HOR);
 					DrawCanvas();
 					break;
+				case BTN_PENCIL:
+					setCurrentTool(TOOL_PENCIL);
+					break;
 				case BTN_PICK:
 					setCurrentTool(TOOL_PIPETTE);
 					//EventPickActivate();
 					break;
 				case BTN_FILL:
 			break;
 		case evKey:
 			GetKeys();
+			if (key_scancode == SCAN_CODE_ESC) setCurrentTool(TOOL_PENCIL);
-			if (key_scancode == SCAN_CODE_ESC) setCurrentTool(TOOL_PENCIL);
+			if (key_scancode == SCAN_CODE_KEY_P) setCurrentTool(TOOL_PENCIL);
 			if (key_scancode == SCAN_CODE_KEY_I) setCurrentTool(TOOL_PIPETTE);
+			if (key_scancode == SCAN_CODE_KEY_F) setCurrentTool(TOOL_FILL);
+			if (key_scancode == SCAN_CODE_KEY_L) setCurrentTool(TOOL_LINE);
-			//if (key_scancode == SCAN_CODE_KEY_F) EventFillActivate();
+			if (key_scancode == SCAN_CODE_KEY_R) setCurrentTool(TOOL_RECT);
 			if (key_scancode == SCAN_CODE_MINUS) {zoom.click(BTN_ZOOM_OUT); DrawEditArea();}
 			if (key_scancode == SCAN_CODE_PLUS)  {zoom.click(BTN_ZOOM_IN);  DrawEditArea();}
 			break;
 	DrawWideRectangle(_x, 4, 22, 22, 3, 0xFFFfff);
 	DefineHiddenButton(_x, 4, 21, 21, _id);
 	img_draw stdcall(skin.image, _x+3, 7, 16, 16, 0, _icon_n*16);
+}
+void DrawLeftPanelButton(dword _id, _y, _icon_n)
+{
+	int x = 5;
+	DrawWideRectangle(x, _y, 22, 22, 3, 0xFFFfff);
+	DefineHiddenButton(x, _y, 21, 21, _id);
+	img_draw stdcall(skin.image, x+3, _y+3, 16, 16, 0, _icon_n*16);
+}
 void DrawStatusBar()
+{
 	zoom.y = wrapper.y + wrapper.h + 6;
 	zoom.x = wrapper.x;
 	WriteText(wrapper.x+wrapper.w-calc(strlen(#param)*8), zoom.y+2, 0x90, system.color.work_text, #param);
+}
 void draw_window()
-{
 	#define TB_ICON_PADDING 26
 	incn tx;
 	system.color.get();
 	DefineAndDrawWindow(115+random(100), 50+random(100), 700, 540, 0x33, system.color.work, T_TITLE, 0);
 	GetProcessInfo(#Form, SelfInfo);
 	DrawToolbarButton(BTN_FLIP_HOR,   tx.inc(TB_ICON_PADDING+8), 34);
 	DrawToolbarButton(BTN_FLIP_VER,   tx.inc(TB_ICON_PADDING),   35);
 	// DrawToolbarButton(BTN_ROTATE_LEFT,   tx.inc(TB_ICON_PADDING), 36); //not implemented
 	// DrawToolbarButton(BTN_ROTATE_RIGHT,  tx.inc(TB_ICON_PADDING), 37); //not implemented
-	DrawToolbarButton(BTN_PICK,   tx.inc(TB_ICON_PADDING+8), 38);
-	DrawToolbarButton(BTN_FILL,   tx.inc(TB_ICON_PADDING), 39);
-	DrawToolbarButton(BTN_LINE,   tx.inc(TB_ICON_PADDING), 40);
-	DrawToolbarButton(BTN_RECT,   tx.inc(TB_ICON_PADDING), 41);
+	DrawLeftPanel();
 	DrawEditArea();
 	DrawActiveColor(right_bar.y);
+	DrawColorPallets(right_bar.x, right_bar.y + 30);
+	DrawStatusBar();
+}
+void DrawLeftPanel()
+{
+	incn ty;
+	ty.n = TOOLBAR_H-TB_ICON_PADDING;
+	DrawLeftPanelButton(BTN_PENCIL, ty.inc(TB_ICON_PADDING), 38);
+	DrawLeftPanelButton(BTN_PICK,   ty.inc(TB_ICON_PADDING), 39);
+	DrawLeftPanelButton(BTN_FILL,   ty.inc(TB_ICON_PADDING), 40);
-	DrawColorPallets(right_bar.x, right_bar.y + 30);
+	DrawLeftPanelButton(BTN_LINE,   ty.inc(TB_ICON_PADDING), 41);
 	DrawLeftPanelButton(BTN_RECT,   ty.inc(TB_ICON_PADDING), 42);
-	DrawStatusBar();
+	DrawRectangle3D(5, currentTool*TB_ICON_PADDING+TOOLBAR_H, 16+3+2, 16+3+2, 0x333333, 0x777777);
+}
 void DrawEditArea()
+{
 	dword color1=0xC0C0C0;
 	int top_side;
 	int left_side;

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/iconedit.c – Rev 7186 → 7187