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

 //                                                   //
 //===================================================//
 #ifdef LANG_RUS
 #define T_NOTIFY_OPEN "'IconEdit
- ¤ ë© ¬®¬¥â IconEdit ¬®¦¥â ®âªàë¢ âì â®«ìª® ¨ª®ª¨, á®§¤ ë¥ ¢ á ¬®¬ à¥¤ ªâ®à¥.
+‚ ¤ ë© ¬®¬¥â IconEdit ¬®¦¥â ®âªàë¢ âì â®«ìª® ¨ª®ª¨, á®§¤ ë¥ ¢ á ¬®¬ à¥¤ ªâ®à¥.
-á«¨ ã¦® ®âªàëâì ¤àã£®¥ ¨§®¡à ¦¥¨¥, ¢®á¯®«ì§ã©â¥áì ¨áâàã¬¥â®¬ <®â® ¯¯ à â>
+…á«¨ ã¦® ®âªàëâì ¤àã£®¥ ¨§®¡à ¦¥¨¥, ¢®á¯®«ì§ã©â¥áì ¨áâàã¬¥â®¬ <”®â® ¯¯ à â>
 ¤«ï § å¢ â  ª àâ¨ª¨ á íªà  .' -Wt"
 #else
 #define T_NOTIFY_OPEN "'IconEdit
 You can open only files created in IconEdit for now!
 In other case please use  tool to get an image from screen.' -Wt"
 #endif
-#define T_TITLE "Icon Editor 0.56 Alpha"
+#define T_TITLE "Icon Editor 0.57b Alpha"
 block canvas = { NULL, NULL, NULL, NULL };
 block wrapper = { LEFTBAR_W, TOPBAR_H, NULL, NULL };
+block right_bar = { NULL, 10+TOPBAR_H, RIGHT_BAR_W+10, NULL };
-block right_bar = { NULL, 10+TOPBAR_H, RIGHT_BAR_W+10, NULL };
+dword linear_gradient[RIGHT_BAR_W];
+block b_color_gradient = {NULL, 40+TOPBAR_H, RIGHT_BAR_W, 25};
-block b_color_gradient = {NULL, 40+TOPBAR_H, RIGHT_BAR_W, 30};
+//block b_opacity_gradient = {NULL, 75+TOPBAR_H, RIGHT_BAR_W, 15};
+block b_last_colors = {NULL, 75+TOPBAR_H, RIGHT_BAR_W, COLSIZE};
-block b_last_colors = {NULL, 80+TOPBAR_H, RIGHT_BAR_W, COLSIZE*2};
+block b_default_palette = {NULL, COLSIZE+10+75+TOPBAR_H, RIGHT_BAR_W, COLSIZE*9};
 block b_default_palette = {NULL, COLSIZE*2+10+80+TOPBAR_H, RIGHT_BAR_W, COLSIZE*9};
 dword transparent = 0xBFCAD2;
 dword color1 = 0x000000;
 	BTNS_LAST_USED_COLORS = 400
 };
 proc_info Form;
+dword semi_white;
-dword semi_white;
+bool bg_dark=false;
 more_less_box zoom = { 11, 1, 40, "Zoom" };
 xFFFF66,0xB2FF66,0x66FF66,0x66FFB2,0x66FFFF,0x66B2FF,0x6666FF,0xB266FF,0xFF66FF,0xFF66B2,
 xC0C0C0,0xFF9999,0xFFCC99,0xFFFF99,0xCCFF99,0x99FF99,0x99FFCC,0x99FFFF,0x99CCFF,0x9999FF,
 xCC99FF,0xFF99FF,0xFF99CC,0xE0E0E0,0xFFCCCC,0xFFE5CC,0xFFFFCC,0xE5FFCC,0xCCFFCC,0xCCFFE5,
 xCCFFFF,0xCCE5FF,0xCCCCFF,0xE5CCFF,0xFFCCFF,0xFFCCE5,0xFFFFFF
 };
+#define LAST_USED_MAX 13
-dword last_used_colors[13*2] = {
+dword last_used_colors[LAST_USED_MAX] = {
-xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,
 xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,
-xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF,0xFFFFFF
+xFFFFFF,0xFFFFFF,0xFFFFFF
 };
 CustomCursor Cursor;
 dword CursorBar = FROM "cursors/bar.cur";
 void main()
+{
 	word btn;
+	libimg_image open_image;
-	libimg_image open_image;
+	dword tmp_bg_col;
 	load_dll(libio,  #libio_init,  1);
 	load_dll(libimg, #libimg_init, 1);
 	load_dll(boxlib, #box_lib_init,0);
+	Libimg_LoadImage(#top_icons, "/sys/icons16.png");
-	Libimg_LoadImage(#top_icons, "/sys/icons16.png");
+	Libimg_LoadImage(#left_icons, "/sys/icons16.png");
 	Libimg_LoadImage(#left_icons, "/sys/icons16.png");
 	system.color.get();
 	system.color.get();
 	semi_white = MixColors(system.color.work, 0xFFFfff, 96);
+	Libimg_ReplaceColor(top_icons.image, top_icons.w, top_icons.h, 0xffFFFfff, semi_white);
+	Libimg_ReplaceColor(top_icons.image, top_icons.w, top_icons.h, 0xffCACBD6, MixColors(semi_white, 0, 220));
+	Libimg_ReplaceColor(left_icons.image, left_icons.w, left_icons.h, 0xffFFFfff, system.color.work);
+	Libimg_ReplaceColor(left_icons.image, left_icons.w, left_icons.h, 0xffCACBD6, MixColors(system.color.work, 0, 200));
-	Libimg_ReplaceColor(top_icons.image, top_icons.w, top_icons.h, 0xffFFFfff, semi_white);
+	//fix line and rectandle color for dark skins
-	Libimg_ReplaceColor(top_icons.image, top_icons.w, top_icons.h, 0xffCACBD6, MixColors(semi_white, 0, 220));
+	if (GrayScaleImage(#system.color.work,1,1)<65) bg_dark=true; else bg_dark=false;
 	if (bg_dark) Libimg_ReplaceColor(left_icons.image, left_icons.w, left_icons.h, 0xff545454, 0xffD3D3D4);
 	Libimg_ReplaceColor(left_icons.image, left_icons.w, left_icons.h, 0xffFFFfff, system.color.work);
-	Libimg_ReplaceColor(left_icons.image, left_icons.w, left_icons.h, 0xffCACBD6, MixColors(system.color.work, 0, 200));
+	EventSetActiveColor(1, color1);
 		if (open_image.w*open_image.h>MAX_CELL_SIZE*MAX_CELL_SIZE) {
 			notify("'Hey, this is just an icon editor,\nselected image is too big to open!' -E");
 			ExitProcess();
+		}
 		else {
-			image.create(open_image.w, open_image.h);
+			image.create(open_image.h, open_image.w);
 			image.set_image(open_image.imgsrc);
+		}
+	}
+			{
 				case BTN_NEW:
 					EventCreateNewIcon();
 					break;
 				case BTN_OPEN:
-					notify(T_NOTIFY_OPEN);
+					EventOpenIcon();
-					RunProgram("/sys/lod", sprintf(#param, "*png* %s",#program_path));
 					break;
 				case BTN_SAVE:
 					EventSaveIconToFile();
 					break;
 				case BTN_MOVE_LEFT:
 			break;
 		case evKey:
 			GetKeys();
+			if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL)
+			{
+				switch(key_scancode)
+				{
+					case SCAN_CODE_KEY_S:
+						EventSaveIconToFile();
+						break;
+					case SCAN_CODE_KEY_O:
+						EventOpenIcon();
+						break;
+				}
 			if (currentTool != TOOL_NONE) && (tools[currentTool].onKeyEvent != 0)
+			if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
+				if (key_scancode == SCAN_CODE_DEL) EventCleanCanvas();
+			}
 				tools[currentTool].onKeyEvent(key_scancode);
 			if (currentTool != TOOL_NONE) && (tools[currentTool].onKeyEvent != 0)
-			if (key_scancode == SCAN_CODE_DEL) EventCleanCanvas();
+				tools[currentTool].onKeyEvent(key_scancode);
 	//canvas{
 	canvas.w = image.columns * zoom.value;
 	canvas.h = image.rows * zoom.value;
 	if (canvas.w+2 > wrapper.w) || (canvas.h+2 > wrapper.h) {
 		zoom.value--;
+		if (zoom.x) zoom.redraw();
 		DrawEditArea();
 		return;
+	}
 	canvas.x = -zoom.value*image.columns+wrapper.w/2 + wrapper.x;
 	canvas.y = -zoom.value*image.rows+wrapper.h/2 + wrapper.y;
 	#define CELL 20
 	static dword outy;
 	if (iny != NULL) outy = iny;
 	DrawFrame(right_bar.x, outy, CELL, CELL, NULL);
 	DrawBar(right_bar.x+2, outy+2, CELL-4, CELL-4, color1);
-	sprintf(#param, "%A", color1);
-	WriteTextWithBg(right_bar.x+30, outy+3, 0xD0, system.color.work_text, #param+4, system.color.work);
-	DrawFrame(right_bar.x+110, outy, CELL, CELL, NULL);
+	DrawFrame(right_bar.x+CELL+5, outy, CELL, CELL, NULL);
+	DrawBar(right_bar.x+CELL+5+2, outy+2, CELL-4, CELL-4, color2);
-	DrawBar(right_bar.x+110+2, outy+2, CELL-4, CELL-4, color2);
-	sprintf(#param, "%A", color2);
+	//sprintf(#param, "%A", color1);
-	WriteTextWithBg(right_bar.x+30+110, outy+3, 0xD0, system.color.work_text, #param+4, system.color.work);
+	//WriteTextWithBg(right_bar.x+30, outy+3, 0xD0, system.color.work_text, #param+4, system.color.work);
-	DrawCurrentColorGradientByLightness();
+	DrawCurrentColorGradient();
+}
+int lmax;
+void GenerateCurrentColorGradient()
+{
+	int i, avg, rmax;
+	rgb.DwordToRgb(color1);
+	avg = 255 - calc(rgb.r + rgb.g + rgb.b / 3);
+	lmax = b_color_gradient.w *avg/255 | 1;
+	rmax = b_color_gradient.w - lmax | 1;
+	if (lmax == 0) lmax=1;
+	if (rmax == 0) rmax=1;
+	for (i=0; i
+		linear_gradient[i] = MixColors(color1,0xFFFfff,255*i/lmax);
+	}
+	for (i=0 ; i<=rmax; i++) {
+		linear_gradient[lmax+rmax - i] = MixColors(color1,0x000000,255*i/rmax);
+	}
 }
-void DrawCurrentColorGradientByLightness()
+void DrawCurrentColorGradient()
 {
-	int i;
-	int w = right_bar.w-10/2;
+	int i;
-	for (i=0; i
+	dword hitch_color=system.color.work;
+	int hitch_x = b_color_gradient.x+lmax-1;
+	if (lmax>b_color_gradient.w-2) hitch_x=b_color_gradient.x+b_color_gradient.w-3;
-		DrawBar(b_color_gradient.x+i, b_color_gradient.y,
+	for (i=0 ; i
-, b_color_gradient.h, MixColors(color1,0xFFFfff,255*i/w));
+		DrawBar(b_color_gradient.x+i, b_color_gradient.y, 1, b_color_gradient.h, linear_gradient[i]);
-	//current color marker
+	}
-	DrawBar(b_color_gradient.x+i-1, b_color_gradient.y-2, 3,2, 0x000000);
+	//current color marker
 	DrawBar( b_color_gradient.x-1, b_color_gradient.y-2, b_color_gradient.w+4, 2, system.color.work);
 	for (i=0 ; i<=w; i++)
-		DrawBar(b_color_gradient.x+w+w-i, b_color_gradient.y,
+	if (bg_dark) hitch_color=0xFFFfff; else hitch_color=0;
-, b_color_gradient.h, MixColors(color1,0x000000,255*i/w));
+	DrawBar(hitch_x, b_color_gradient.y-2, 3,2, hitch_color);
+}
 void DrawColorPallets()
+{
 	int r, c, i=0;
 	//Last used colors
-	for (r = 0; r < 2; r++)
+	for (r = 0; r < LAST_USED_MAX/PAL_ITEMS_X_COUNT; r++)
 		image.columns, image.rows, image.get_image_with_replaced_color(color2, _col_to));
+}
 void ShowWindow_TestIcon()
+{
+	if (image.rows>=preview_size) || (image.columns>=preview_size) {
+		notify("'IconEdit\nImage is too big for preview!' -tE");
+		return;
+	}
 	loop() switch(WaitEvent())
+	{
 		case evButton:
 			if (GetButtonID()) ExitProcess();
+{
 	EventSaveIconToFile();
 	Window_CanvasReSize.create();
+}
+void EventOpenIcon()
+{
+	//notify(T_NOTIFY_OPEN);
+	RunProgram("/sys/lod", sprintf(#param, "*png* %s",#program_path));
+}
 void EventSaveIconToFile()
+{
 	int i=0;
 	char save_file_name[4096];
+}
 void EventSetActiveColor(int _number, _color)
+{
+	int i;
-	int i;
+	if (last_used_colors[0] == _color) return;
-	for (i=13*2-1; i>0; i--) {
+	for (i=LAST_USED_MAX-1; i>0; i--) {
 		last_used_colors[i] = last_used_colors[i-1];
+	}
 	last_used_colors[0] = _color;
+	if (_number == 1) color1 = _color;
+	if (_number == 2) color2 = _color;
+	if (b_color_gradient.hovered()) {
+		lmax = mouse.x - b_color_gradient.x;
+	}
-	if (_number == 1) color1 = _color;
+	else {
-	if (_number == 2) color2 = _color;
+		GenerateCurrentColorGradient();
+	}
 	DrawActiveColor(NULL);

Subversion Repositories Kolibri OS

(root)/programs/cmm/iconedit/iconedit.c – Rev 7373 → 7422