Subversion Repositories Kolibri OS

Rev

Rev 7264 | Rev 7266 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7264 Rev 7265
Line 30... Line 30...
30 
//                                                   //
 30 
//                                                   //
31 
//                       DATA                        //
 31 
//                       DATA                        //
32 
//                                                   //
 32 
//                                                   //
33 
//===================================================//
 33 
//===================================================//
Line 34... Line 34...
34 
 
 34 
 
Line 35... Line 35...
35 
#define T_TITLE "Icon Editor 0.52 Alpha"
 35 
#define T_TITLE "Icon Editor 0.53 Alpha"
36 
 
 36 
 
37 
#define TOOLBAR_H    24+8
 37 
#define TOOLBAR_H    24+8
38 
#define PANEL_LEFT_W 16+5+5+3+3
 38 
#define PANEL_LEFT_W 16+5+5+3+3
Line 74... Line 74...
74 
	BTN_MOVE_DOWN,
 74 
	BTN_MOVE_DOWN,
75 
	BTN_FLIP_HOR,
 75 
	BTN_FLIP_HOR,
76 
	BTN_FLIP_VER,
 76 
	BTN_FLIP_VER,
77 
	BTN_ROTATE_LEFT,
 77 
	BTN_ROTATE_LEFT,
78 
	BTN_ROTATE_RIGHT,
 78 
	BTN_ROTATE_RIGHT,
- 
 
 79 
	BTN_TEST_ICON,
79 
	BTN_PENCIL,
 80 
	BTN_PENCIL,
80 
	BTN_PICK,
 81 
	BTN_PICK,
81 
	BTN_FILL,
 82 
	BTN_FILL,
82 
	BTN_LINE,
 83 
	BTN_LINE,
83 
	BTN_RECT,
 84 
	BTN_RECT,
Line 262... Line 263...
262 
					break;
 263 
					break;
263 
				case BTN_FLIP_HOR:
 264 
				case BTN_FLIP_HOR:
264 
					image.move(FLIP_HOR);
 265 
					image.move(FLIP_HOR);
265 
					DrawCanvas();
 266 
					DrawCanvas();
266 
					break;
 267 
					break;
- 
 
 268 
				case BTN_TEST_ICON:
- 
 
 269 
					EventTestIcon();
- 
 
 270 
					break;
267 
				case BTN_PENCIL:
 271 
				case BTN_PENCIL:
268 
					setCurrentTool(TOOL_PENCIL);
 272 
					setCurrentTool(TOOL_PENCIL);
269 
					break;
 273 
					break;
270 
				case BTN_PICK:
 274 
				case BTN_PICK:
271 
					setCurrentTool(TOOL_PIPETTE);
 275 
					setCurrentTool(TOOL_PIPETTE);
Line 307... Line 311...
307 
			if (key_scancode == SCAN_CODE_KEY_L) setCurrentTool(TOOL_LINE);
 311 
			if (key_scancode == SCAN_CODE_KEY_L) setCurrentTool(TOOL_LINE);
308 
			if (key_scancode == SCAN_CODE_KEY_R) setCurrentTool(TOOL_RECT);
 312 
			if (key_scancode == SCAN_CODE_KEY_R) setCurrentTool(TOOL_RECT);
309 
			if (key_scancode == SCAN_CODE_KEY_B) setCurrentTool(TOOL_BAR);
 313 
			if (key_scancode == SCAN_CODE_KEY_B) setCurrentTool(TOOL_BAR);
310 
			if (key_scancode == SCAN_CODE_KEY_S) setCurrentTool(TOOL_SELECT);
 314 
			if (key_scancode == SCAN_CODE_KEY_S) setCurrentTool(TOOL_SELECT);
Line -... Line 315...
- 
 
 315 
 
- 
 
 316 
			if (key_scancode == SCAN_CODE_KEY_T) EventTestIcon();
311 
 
 317 
 
312 
			if (key_scancode == SCAN_CODE_KEY_Z) && (key_modifier&KEY_LCTRL) actionsHistory.undoLastAction();
 318 
			if (key_scancode == SCAN_CODE_KEY_Z) && (key_modifier&KEY_LCTRL) actionsHistory.undoLastAction();
Line 313... Line 319...
313 
			if (key_scancode == SCAN_CODE_KEY_Y) && (key_modifier&KEY_LCTRL) actionsHistory.redoLastAction();
 319 
			if (key_scancode == SCAN_CODE_KEY_Y) && (key_modifier&KEY_LCTRL) actionsHistory.redoLastAction();
314 
 
 320 
 
Line 369... Line 375...
369 
	DrawToolbarButton(BTN_MOVE_UP,    tx.inc(TB_ICON_PADDING),   32);
 375 
	DrawToolbarButton(BTN_MOVE_UP,    tx.inc(TB_ICON_PADDING),   32);
370 
	DrawToolbarButton(BTN_MOVE_DOWN,  tx.inc(TB_ICON_PADDING),   33);
 376 
	DrawToolbarButton(BTN_MOVE_DOWN,  tx.inc(TB_ICON_PADDING),   33);
Line 371... Line 377...
371
377
372 
	DrawToolbarButton(BTN_FLIP_HOR,   tx.inc(TB_ICON_PADDING+8), 34);
 378 
	DrawToolbarButton(BTN_FLIP_HOR,   tx.inc(TB_ICON_PADDING+8), 34);
- 
 
 379 
	DrawToolbarButton(BTN_FLIP_VER,   tx.inc(TB_ICON_PADDING),   35);
- 
 
 380 
 
373 
	DrawToolbarButton(BTN_FLIP_VER,   tx.inc(TB_ICON_PADDING),   35);
 381 
	DrawToolbarButton(BTN_TEST_ICON,  tx.inc(TB_ICON_PADDING+8), 12);
374 
	// DrawToolbarButton(BTN_ROTATE_LEFT,   tx.inc(TB_ICON_PADDING), 36); //not implemented
 382 
	// DrawToolbarButton(BTN_ROTATE_LEFT,   tx.inc(TB_ICON_PADDING), 36); //not implemented
Line 375... Line 383...
375 
	// DrawToolbarButton(BTN_ROTATE_RIGHT,  tx.inc(TB_ICON_PADDING), 37); //not implemented
 383 
	// DrawToolbarButton(BTN_ROTATE_RIGHT,  tx.inc(TB_ICON_PADDING), 37); //not implemented
Line 538... Line 546...
538 
dword GetPixelUnderMouse()
 546 
dword GetPixelUnderMouse()
539 
{
 547 
{
540 
	return GetPixelColorFromScreen(mouse.x + Form.left + 5, mouse.y + Form.top + skin_height);
 548 
	return GetPixelColorFromScreen(mouse.x + Form.left + 5, mouse.y + Form.top + skin_height);
541 
}
 549 
}
Line -... Line 550...
- 
 
 550 
 
- 
 
 551 
int preview_size = 128;
- 
 
 552 
void DrawImageWithBg(dword _x, _y, _col_to)
- 
 
 553 
{
- 
 
 554 
	_x *= preview_size;
- 
 
 555 
	_y *= preview_size;
- 
 
 556 
	DrawWideRectangle(_x,_y, preview_size, preview_size, preview_size-image.columns/2, _col_to);
- 
 
 557 
	_PutImage(preview_size - image.columns / 2 + _x, preview_size - image.rows / 2 + _y,
- 
 
 558 
		image.columns, image.rows, image.get_image_with_replaced_color(color2, _col_to));
- 
 
 559 
}
- 
 
 560 
 
- 
 
 561 
void ShowWindow_TestIcon()
- 
 
 562 
{
- 
 
 563 
	loop() switch(WaitEvent())
- 
 
 564 
	{
- 
 
 565 
		case evButton:
- 
 
 566 
			if (GetButtonID()) ExitProcess();
- 
 
 567 
			break;
- 
 
 568
- 
 
 569 
		case evKey:
- 
 
 570 
			GetKeys();
- 
 
 571 
			if (key_scancode == SCAN_CODE_ESC) ExitProcess();
- 
 
 572 
			break;
- 
 
 573
- 
 
 574 
		case evReDraw:
- 
 
 575 
			DefineAndDrawWindow(Form.left+100, Form.top+100, preview_size*2+9,
- 
 
 576 
				preview_size*2+skin_height+4, 0x74, NULL, "Test Icon", 0);
- 
 
 577 
			DrawImageWithBg(0, 0, 0x000000);
- 
 
 578 
			DrawImageWithBg(1, 0, 0xFFFfff);
- 
 
 579 
			DrawImageWithBg(0, 1, GetPixelColorFromScreen(0, 0));
- 
 
 580 
			DrawImageWithBg(1, 1, system.color.work);
- 
 
 581 
			break;
- 
 
 582 
	}
- 
 
 583 
}
542 
 
 584 
 
543 
//===================================================//
 585 
//===================================================//
544 
//                                                   //
 586 
//                                                   //
545 
//                      EVENTS                       //
 587 
//                      EVENTS                       //
546 
//                                                   //
 588 
//                                                   //
Line 585... Line 627...
585 
 
 627 
 
586 
	DrawActiveColor(NULL);
 628 
	DrawActiveColor(NULL);
587 
	DrawColorPallets();
 629 
	DrawColorPallets();
Line -... Line 630...
- 
 
 630 
}
- 
 
 631 
 
- 
 
 632 
void EventTestIcon()
- 
 
 633 
{
- 
 
 634 
	CreateThread(#ShowWindow_TestIcon, #test_icon_stak+4092);
- 
 
 635 
}
- 
 
 636 
 
- 
 
 637 
stop: