From 5959be0518f7dc197c46f9e44ce729558ad62281 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Wed, 25 Apr 2018 11:18:22 +0000
Subject: [PATCH] IconEdit 0.49: draw bar tool (filled rectangle)

git-svn-id: svn://kolibrios.org@7259 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/common/icons16.png                     | Bin 7514 -> 7526 bytes
 programs/cmm/easyshot/easyshot.c            |  11 ++--
 programs/cmm/iconedit/colors_mas.h          |   4 +-
 programs/cmm/iconedit/iconedit.c            |  13 ++--
 programs/cmm/iconedit/tools.h               |  63 +++++++++---------
 programs/cmm/iconedit/tools/simple_figure.h |  67 ++++++++++++--------
 6 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/data/common/icons16.png b/data/common/icons16.png
index 658884953f42d80ff868f398cfd02dd5536ad215..4caaf873941df726aa792a132a0ca653ed50b5a2 100644
GIT binary patch
delta 7012
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
Ca908V

delta 6999
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

diff --git a/programs/cmm/easyshot/easyshot.c b/programs/cmm/easyshot/easyshot.c
index 70fe5fe158..6e7d511ae2 100644
--- a/programs/cmm/easyshot/easyshot.c
+++ b/programs/cmm/easyshot/easyshot.c
@@ -14,22 +14,24 @@
 
 /* === TRANSLATIONS === */
 
-#define T_WTITLE "EasyShot v1.0"
+#define T_WTITLE "EasyShot v1.1"
 
 #ifdef LANG_RUS
 	?define T_TAKE_SCREENSHOT "  Сделать скриншот"
 	?define T_SETTINGS "Настройки"
 	?define T_EDITBOX_FRAME " Путь сохранения скриншота "
-	?define T_DELAY "Задержка в секундах"
 	?define T_MINIMIZE "Свернуть окно при снимке"
+	?define T_CONTINUOUS_SHOOTING "Continuous shooting"
+	?define T_DELAY "Задержка в секундах"
 	?define T_NO_DIR "'Папка не существует!' -E"
 	?define T_SET_PATH "Задать"
 #else
 	?define T_TAKE_SCREENSHOT "  Take a screenshot"
 	?define T_SETTINGS "Settings"
 	?define T_EDITBOX_FRAME " Save path "
-	?define T_DELAY "Delay in seconds"
 	?define T_MINIMIZE "Minimize window"
+	?define T_CONTINUOUS_SHOOTING "Continuous shooting"
+	?define T_DELAY "Delay in seconds"
 	?define T_NO_DIR "'Directory does not exists!' -E"
 	?define T_SET_PATH "Set"
 #endif
@@ -58,6 +60,7 @@ edit_box edit_save = {250,25,100,0xffffff,0x94AECE,0xFFFfff,0xffffff,
 
 more_less_box delay = { 1, 0, 64, T_DELAY };
 checkbox minimize = { T_MINIMIZE, true };
+checkbox continuous_shooting = { T_CONTINUOUS_SHOOTING, true };
 
 
 opendialog open_folder_dialog = 
@@ -128,7 +131,7 @@ void main()
 void DrawMainContent()
 {
 	int take_scr_btn_width;
-	take_scr_btn_width = DrawIconButton(PD, PD, BTN_MAKE_SCREENSHOT, T_TAKE_SCREENSHOT, 44);
+	take_scr_btn_width = DrawIconButton(PD, PD, BTN_MAKE_SCREENSHOT, T_TAKE_SCREENSHOT, 45);
 	DrawIconButton(PD+take_scr_btn_width, PD, BTN_SETTINGS, " ", 10);	
 }
 
diff --git a/programs/cmm/iconedit/colors_mas.h b/programs/cmm/iconedit/colors_mas.h
index 81efe0c926..026fba0c84 100644
--- a/programs/cmm/iconedit/colors_mas.h
+++ b/programs/cmm/iconedit/colors_mas.h
@@ -6,8 +6,8 @@
 //                                                                                  //
 //////////////////////////////////////////////////////////////////////////////////////
 
-//The 'draw[]' in the array which holds the states should we draw a pixel or not.
-//Is need to decrese redraw when using some tools like line, rectangle and selection.
+//The 'draw[]' is the array which holds the states should we draw a pixel or not.
+//Is need to decrease redraw when using some tools like line, rectangle and selection.
 
 struct _pixel_state
 {
diff --git a/programs/cmm/iconedit/iconedit.c b/programs/cmm/iconedit/iconedit.c
index e58899c11d..48629f10e7 100644
--- a/programs/cmm/iconedit/iconedit.c
+++ b/programs/cmm/iconedit/iconedit.c
@@ -31,7 +31,7 @@ pipet aside color view
 //                                                   //
 //===================================================//
 
-#define T_TITLE "Icon Editor 0.48 Alpha"
+#define T_TITLE "Icon Editor 0.49 Alpha"
 
 #define TOOLBAR_H    24+8
 #define PANEL_LEFT_W 16+5+5+3+3
@@ -80,7 +80,9 @@ enum {
 	BTN_FILL,
 	BTN_LINE,
 	BTN_RECT,
+	BTN_BAR,
 	BTN_SELECT,
+	BTN_SCREEN,
 	BTN_ZOOM_IN,
 	BTN_ZOOM_OUT,
 	BTNS_PALETTE_COLOR_MAS = 100,
@@ -254,11 +256,9 @@ void main()
 					break;
 				case BTN_PICK:
 					setCurrentTool(TOOL_PIPETTE);
-					//EventPickActivate();
 					break;
 				case BTN_FILL:
 					setCurrentTool(TOOL_FILL);
-					//EventFillActivate();
 					break;
 				case BTN_LINE:
 					setCurrentTool(TOOL_LINE);
@@ -266,6 +266,9 @@ void main()
 				case BTN_RECT:
 					setCurrentTool(TOOL_RECT);
 					break;
+				case BTN_BAR:
+					setCurrentTool(TOOL_BAR);
+					break;
 				case BTN_SELECT:
 					setCurrentTool(TOOL_SELECT);
 					break;
@@ -372,7 +375,9 @@ void DrawLeftPanel()
 	DrawLeftPanelButton(BTN_FILL,   ty.inc(TB_ICON_PADDING), 40);
 	DrawLeftPanelButton(BTN_LINE,   ty.inc(TB_ICON_PADDING), 41);
 	DrawLeftPanelButton(BTN_RECT,   ty.inc(TB_ICON_PADDING), 42);
-	DrawLeftPanelButton(BTN_SELECT,   ty.inc(TB_ICON_PADDING), 43);
+	DrawLeftPanelButton(BTN_BAR,    ty.inc(TB_ICON_PADDING), 43);
+	DrawLeftPanelButton(BTN_SELECT, ty.inc(TB_ICON_PADDING), 44);
+	//DrawLeftPanelButton(BTN_SCREEN, ty.inc(TB_ICON_PADDING), 45);
 	DrawRectangle3D(5, currentTool*TB_ICON_PADDING+right_bar.y, 16+3+2, 16+3+2, 0x333333, 0x777777);
 }
 
diff --git a/programs/cmm/iconedit/tools.h b/programs/cmm/iconedit/tools.h
index cff9e35342..d1f4fb78d3 100644
--- a/programs/cmm/iconedit/tools.h
+++ b/programs/cmm/iconedit/tools.h
@@ -13,7 +13,7 @@ struct Tool {
 
 int previousTool = -1;
 int currentTool = -1;
-Tool tools[6];
+Tool tools[7];
 
 enum {
 	TOOL_NONE = -1,
@@ -22,6 +22,7 @@ enum {
 	TOOL_FILL,
 	TOOL_LINE,
 	TOOL_RECT,
+	TOOL_BAR,
 	TOOL_SELECT
 };
 #include "tools/pencil.h";
@@ -33,35 +34,41 @@ enum {
 
 void initTools() 
 {
-	tools[0].id = TOOL_PENCIL;
-	tools[0].onMouseEvent = #PencilTool_onMouseEvent;
-	tools[0].deactivate = #PencilTool_reset;
+	tools[TOOL_PENCIL].id = TOOL_PENCIL;
+	tools[TOOL_PENCIL].onMouseEvent = #PencilTool_onMouseEvent;
+	tools[TOOL_PENCIL].deactivate = #PencilTool_reset;
 	
-	tools[1].id = TOOL_PIPETTE;
-	tools[1].activate = #PipetteTool_activate;
-	tools[1].onMouseEvent = #PipetteTool_onMouseEvent;
+	tools[TOOL_PIPETTE].id = TOOL_PIPETTE;
+	tools[TOOL_PIPETTE].activate = #PipetteTool_activate;
+	tools[TOOL_PIPETTE].onMouseEvent = #PipetteTool_onMouseEvent;
 	
-	tools[2].id = TOOL_FILL;
-	tools[2].onMouseEvent = #FillTool_onMouseEvent;
+	tools[TOOL_FILL].id = TOOL_FILL;
+	tools[TOOL_FILL].onMouseEvent = #FillTool_onMouseEvent;
 	
-	tools[3].id = TOOL_LINE;
-	tools[3].activate = #SimpleFigureTool_Reset;
-	tools[3].deactivate = #SimpleFigureTool_Reset;
-	tools[3].onMouseEvent = #SimpleFigureTool_onMouseEvent;
-	tools[3].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;
+	tools[TOOL_LINE].id = TOOL_LINE;
+	tools[TOOL_LINE].activate = #SimpleFigureTool_Reset;
+	tools[TOOL_LINE].deactivate = #SimpleFigureTool_Reset;
+	tools[TOOL_LINE].onMouseEvent = #SimpleFigureTool_onMouseEvent;
+	tools[TOOL_LINE].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;
 	
-	tools[4].id = TOOL_RECT;
-	tools[4].activate = #SimpleFigureTool_Reset;
-	tools[4].deactivate = #SimpleFigureTool_Reset;
-	tools[4].onMouseEvent = #SimpleFigureTool_onMouseEvent;
-	tools[4].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;	
+	tools[TOOL_RECT].id = TOOL_RECT;
+	tools[TOOL_RECT].activate = #SimpleFigureTool_Reset;
+	tools[TOOL_RECT].deactivate = #SimpleFigureTool_Reset;
+	tools[TOOL_RECT].onMouseEvent = #SimpleFigureTool_onMouseEvent;
+	tools[TOOL_RECT].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;	
 
-	tools[5].id = TOOL_SELECT;
-	tools[5].activate = #SelectTool_activate;
-	tools[5].deactivate = #SelectTool_deactivate;
-	tools[5].onMouseEvent = #SelectTool_onMouseEvent;
-	tools[5].onCanvasDraw = #SelectTool_onCanvasDraw;	
-	tools[5].onKeyEvent = #SelectTool_onKeyEvent;	
+	tools[TOOL_BAR].id = TOOL_BAR;
+	tools[TOOL_BAR].activate = #SimpleFigureTool_Reset;
+	tools[TOOL_BAR].deactivate = #SimpleFigureTool_Reset;
+	tools[TOOL_BAR].onMouseEvent = #SimpleFigureTool_onMouseEvent;
+	tools[TOOL_BAR].onCanvasDraw = #SimpleFigureTool_onCanvasDraw;	
+
+	tools[TOOL_SELECT].id = TOOL_SELECT;
+	tools[TOOL_SELECT].activate = #SelectTool_activate;
+	tools[TOOL_SELECT].deactivate = #SelectTool_deactivate;
+	tools[TOOL_SELECT].onMouseEvent = #SelectTool_onMouseEvent;
+	tools[TOOL_SELECT].onCanvasDraw = #SelectTool_onCanvasDraw;	
+	tools[TOOL_SELECT].onKeyEvent = #SelectTool_onKeyEvent;	
 }
 
 
@@ -85,9 +92,3 @@ void setCurrentTool(int index) {
 	DrawCanvas();
 }
 
-//===================================================//
-//                                                   //
-//                    FUNTIONS                       //
-//                                                   //
-//===================================================//
-
diff --git a/programs/cmm/iconedit/tools/simple_figure.h b/programs/cmm/iconedit/tools/simple_figure.h
index 7d74b04825..567b30845e 100644
--- a/programs/cmm/iconedit/tools/simple_figure.h
+++ b/programs/cmm/iconedit/tools/simple_figure.h
@@ -23,6 +23,8 @@ int mouseY_last;
 bool first_click_in_canvas = false;
 
 void SimpleFigureTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
+	int x1, y1, x2, y2;
+
 	if (mouse.down) && (canvas.hovered()) first_click_in_canvas = true;
 	if (first_click_in_canvas)
 	{
@@ -50,21 +52,21 @@ void SimpleFigureTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
 		if (mouse.up) {
 			if ((figTool.startX >= 0) 
 			&& (figTool.startY >= 0)) {
+
+				x1 = figTool.startX - canvas.x/zoom.value;
+				y1 = figTool.startY - canvas.y/zoom.value;
+				x2 = mouseX - canvas.x/zoom.value;
+				y2 = mouseY - canvas.y/zoom.value;
+
 				// Draw line from start position to current position
 				if (currentTool == TOOL_LINE) {
-					DrawLineIcon(figTool.startX - canvas.x/zoom.value, 
-						figTool.startY - canvas.y/zoom.value, 
-						mouseX - canvas.x/zoom.value, 
-						mouseY - canvas.y/zoom.value, 
-						tool_color, 
-						TOIMAGE);
+					DrawLineIcon(x1, y1, x2, y2, tool_color, TOIMAGE);
 				}
 				else if (currentTool == TOOL_RECT) {
-					DrawRectangleIcon(figTool.startX - canvas.x/zoom.value, 
-						figTool.startY - canvas.y/zoom.value, 
-						mouseX - canvas.x/zoom.value, 
-						mouseY - canvas.y/zoom.value, tool_color, 
-						TOIMAGE);
+					DrawRectangleIcon(x1, y1, x2, y2, tool_color, TOIMAGE);
+				}
+				else if (currentTool == TOOL_BAR) {
+					DrawBarIcon(x1, y1, x2, y2, tool_color, TOIMAGE);
 				}
 
 				DrawCanvas();
@@ -82,24 +84,21 @@ void SimpleFigureTool_onMouseEvent(int mouseX, int mouseY, int lkm, int pkm) {
 }
 
 void SimpleFigureTool_onCanvasDraw() {
-	if ((figTool.startX >= 0) 
+	int x1, y1, x2, y2;
+ 	if ((figTool.startX >= 0) 
 	&& (figTool.startY >= 0) && (mouse.key)) {
-		if (currentTool == TOOL_LINE) {
-			DrawLineIcon(figTool.startX - canvas.x/zoom.value, 
-				figTool.startY - canvas.y/zoom.value, 
-				mouseX_last - canvas.x/zoom.value, 
-				mouseY_last - canvas.y/zoom.value, 
-				tool_color, 
-				TOCANVAS);
-		}
-		else if (currentTool == TOOL_RECT) {
-			DrawRectangleIcon(figTool.startX - canvas.x/zoom.value, 
-				figTool.startY - canvas.y/zoom.value, 
-				mouseX_last - canvas.x/zoom.value, 
-				mouseY_last - canvas.y/zoom.value, 
-				tool_color, 
-				TOCANVAS);
-		}
+
+		x1 = figTool.startX - canvas.x/zoom.value;
+		y1 = figTool.startY - canvas.y/zoom.value;
+		x2 = mouseX_last - canvas.x/zoom.value;
+		y2 = mouseY_last - canvas.y/zoom.value;
+
+		if (currentTool == TOOL_LINE)
+			DrawLineIcon(x1, y1, x2, y2, tool_color, TOCANVAS);
+		else if (currentTool == TOOL_RECT)
+			DrawRectangleIcon(x1, y1, x2, y2, tool_color, TOCANVAS);
+		else if (currentTool == TOOL_BAR)
+			DrawBarIcon(x1, y1, x2, y2, tool_color, TOCANVAS);
 
 		figTool.lastTempPosX = mouseX_last - canvas.x/zoom.value;
 		figTool.lastTempPosY = mouseY_last - canvas.y/zoom.value;
@@ -178,3 +177,15 @@ void DrawRectangleIcon(int x1, int y1, int x2, int y2, dword color, int target)
 	DrawLineIcon(x1, y2, x1, y1, color, target);
 }
 
+void DrawBarIcon(int x1, int y1, int x2, int y2, dword color, int target) {
+	signed signY;
+	if (y1 < y2)
+		signY = 1;
+	else
+		signY = -1;
+
+	while (y1 != y2+signY) {
+		DrawLineIcon(x1, y1, x2, y1, color, target);
+		y1 += signY;
+	}
+}
\ No newline at end of file