Brush shortcut cleanup

ouroperations.c

@@ -4586,7 +4586,7 @@ void ourRegisterEverything(){
     laCreateOperatorType("OUR_move_brush","Move Brush","Remove this brush",0,0,0,ourinv_MoveBrush,0,0,0);
     laCreateOperatorType("OUR_brush_quick_switch","Brush Quick Switch","Brush quick switch",0,0,0,ourinv_BrushQuickSwitch,0,0,0);
     laCreateOperatorType("OUR_brush_resize","Brush Resize","Brush resize",0,0,0,ourinv_BrushResize,0,0,0);
-    laCreateOperatorType("OUR_set_brush_number","Set Brush Number","Choose a numbered brush",0,0,0,ourinv_BrushSetNumber,0,0,0);
+    laCreateOperatorType("OUR_set_brush_size_number","Set Brush Number","Choose a numbered size for a brush",0,0,0,ourinv_BrushSetNumber,0,0,0);
     laCreateOperatorType("OUR_action","Action","Doing action on a layer",0,0,0,ourinv_Action,ourmod_Action,0,LA_EXTRA_TO_PANEL);
     laCreateOperatorType("OUR_pick","Pick color","Pick color on the widget",0,0,0,ourinv_PickColor,ourmod_PickColor,0,LA_EXTRA_TO_PANEL);
     laCreateOperatorType("OUR_adjust_brush","Adjust brush","Adjust brush",0,0,0,ourinv_AdjustBrush,ourmod_AdjustBrushSize,0,LA_EXTRA_TO_PANEL);
@@ -4979,22 +4979,23 @@ void ourRegisterEverything(){
     km=&MAIN.KeyMap; char buf[128];
     for(int i=0;i<=9;i++){
         sprintf(buf,"binding=%d",i); laAssignNewKey(km, 0, "OUR_brush_quick_switch", 0, 0, LA_KEY_DOWN, '0'+i, buf);
+        sprintf(buf,"binding=%d",i); laAssignNewKey(km, 0, "OUR_brush_quick_switch", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_ID_0+i, buf);
     }
     laAssignNewKey(km, 0, "OUR_brush_resize", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_BRUSH_SMALLER, "direction=smaller");
     laAssignNewKey(km, 0, "OUR_brush_resize", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_BRUSH_BIGGER, "direction=bigger");
     laAssignNewKey(km, 0, "OUR_toggle_erasing", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_TOGGLE_ERASING, 0);
     laAssignNewKey(km, 0, "OUR_cycle_sketch", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_TOGGLE_SKETCH, 0);
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_0, "number=0");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_1, "number=1");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_2, "number=2");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_3, "number=3");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_4, "number=4");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_5, "number=5");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_6, "number=6");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_7, "number=7");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_8, "number=8");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_NUMBER_9, "number=9");
-    laAssignNewKey(km, 0, "OUR_set_brush_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_FREE, "number=#");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_0, "number=0");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_1, "number=1");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_2, "number=2");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_3, "number=3");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_4, "number=4");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_5, "number=5");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_6, "number=6");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_7, "number=7");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_8, "number=8");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_9, "number=9");
+    laAssignNewKey(km, 0, "OUR_set_brush_size_number", 0, 0, LA_SIGNAL_EVENT, OUR_SIGNAL_SELECT_BRUSH_SIZE_FREE, "number=#");
 
     laNewCustomSignal("our.pick",OUR_SIGNAL_PICK);
     laNewCustomSignal("our.move",OUR_SIGNAL_MOVE);
@@ -5004,17 +5005,27 @@ void ourRegisterEverything(){
     laNewCustomSignal("our.zoom_out",OUR_SIGNAL_ZOOM_OUT);
     laNewCustomSignal("our.brush_bigger",OUR_SIGNAL_BRUSH_BIGGER);
     laNewCustomSignal("our.brush_smaller",OUR_SIGNAL_BRUSH_SMALLER);
-    laNewCustomSignal("our.brush_number_0",OUR_SIGNAL_SELECT_BRUSH_NUMBER_0);
-    laNewCustomSignal("our.brush_number_1",OUR_SIGNAL_SELECT_BRUSH_NUMBER_1);
-    laNewCustomSignal("our.brush_number_2",OUR_SIGNAL_SELECT_BRUSH_NUMBER_2);
-    laNewCustomSignal("our.brush_number_3",OUR_SIGNAL_SELECT_BRUSH_NUMBER_3);
-    laNewCustomSignal("our.brush_number_4",OUR_SIGNAL_SELECT_BRUSH_NUMBER_4);
-    laNewCustomSignal("our.brush_number_5",OUR_SIGNAL_SELECT_BRUSH_NUMBER_5);
-    laNewCustomSignal("our.brush_number_6",OUR_SIGNAL_SELECT_BRUSH_NUMBER_6);
-    laNewCustomSignal("our.brush_number_7",OUR_SIGNAL_SELECT_BRUSH_NUMBER_7);
-    laNewCustomSignal("our.brush_number_8",OUR_SIGNAL_SELECT_BRUSH_NUMBER_8);
-    laNewCustomSignal("our.brush_number_9",OUR_SIGNAL_SELECT_BRUSH_NUMBER_9);
-    laNewCustomSignal("our.brush_free",OUR_SIGNAL_SELECT_BRUSH_FREE);
+    laNewCustomSignal("our.brush_size_0",OUR_SIGNAL_SELECT_BRUSH_SIZE_0);
+    laNewCustomSignal("our.brush_size_1",OUR_SIGNAL_SELECT_BRUSH_SIZE_1);
+    laNewCustomSignal("our.brush_size_2",OUR_SIGNAL_SELECT_BRUSH_SIZE_2);
+    laNewCustomSignal("our.brush_size_3",OUR_SIGNAL_SELECT_BRUSH_SIZE_3);
+    laNewCustomSignal("our.brush_size_4",OUR_SIGNAL_SELECT_BRUSH_SIZE_4);
+    laNewCustomSignal("our.brush_size_5",OUR_SIGNAL_SELECT_BRUSH_SIZE_5);
+    laNewCustomSignal("our.brush_size_6",OUR_SIGNAL_SELECT_BRUSH_SIZE_6);
+    laNewCustomSignal("our.brush_size_7",OUR_SIGNAL_SELECT_BRUSH_SIZE_7);
+    laNewCustomSignal("our.brush_size_8",OUR_SIGNAL_SELECT_BRUSH_SIZE_8);
+    laNewCustomSignal("our.brush_size_9",OUR_SIGNAL_SELECT_BRUSH_SIZE_9);
+    laNewCustomSignal("our.brush_free",OUR_SIGNAL_SELECT_BRUSH_SIZE_FREE);
+    laNewCustomSignal("our.brush_id_0",OUR_SIGNAL_SELECT_BRUSH_ID_0);
+    laNewCustomSignal("our.brush_id_1",OUR_SIGNAL_SELECT_BRUSH_ID_1);
+    laNewCustomSignal("our.brush_id_2",OUR_SIGNAL_SELECT_BRUSH_ID_2);
+    laNewCustomSignal("our.brush_id_3",OUR_SIGNAL_SELECT_BRUSH_ID_3);
+    laNewCustomSignal("our.brush_id_4",OUR_SIGNAL_SELECT_BRUSH_ID_4);
+    laNewCustomSignal("our.brush_id_5",OUR_SIGNAL_SELECT_BRUSH_ID_5);
+    laNewCustomSignal("our.brush_id_6",OUR_SIGNAL_SELECT_BRUSH_ID_6);
+    laNewCustomSignal("our.brush_id_7",OUR_SIGNAL_SELECT_BRUSH_ID_7);
+    laNewCustomSignal("our.brush_id_8",OUR_SIGNAL_SELECT_BRUSH_ID_8);
+    laNewCustomSignal("our.brush_id_9",OUR_SIGNAL_SELECT_BRUSH_ID_9);
     laNewCustomSignal("our.adjust",OUR_SIGNAL_ADJUST);
 
     laInputMapping* im=MAIN.InputMapping->CurrentInputMapping;
@@ -5026,17 +5037,27 @@ void ourRegisterEverything(){
     laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Space",0,OUR_SIGNAL_MOVE);
     laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"s",0,OUR_SIGNAL_TOGGLE_SKETCH);
     laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"e",0,OUR_SIGNAL_TOGGLE_ERASING);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num0",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_0);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num1",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_1);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num2",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_2);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num3",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_3);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num4",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_4);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num5",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_5);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num6",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_6);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num7",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_7);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num8",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_8);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num9",0,OUR_SIGNAL_SELECT_BRUSH_NUMBER_9);
-    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"NumDot",0,OUR_SIGNAL_SELECT_BRUSH_FREE);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num0",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_0);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num1",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_1);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num2",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_2);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num3",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_3);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num4",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_4);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num5",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_5);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num6",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_6);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num7",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_7);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num8",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_8);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"Num9",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_9);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"NumDot",0,OUR_SIGNAL_SELECT_BRUSH_SIZE_FREE);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"0",0,OUR_SIGNAL_SELECT_BRUSH_ID_0);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"1",0,OUR_SIGNAL_SELECT_BRUSH_ID_1);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"2",0,OUR_SIGNAL_SELECT_BRUSH_ID_2);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"3",0,OUR_SIGNAL_SELECT_BRUSH_ID_3);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"4",0,OUR_SIGNAL_SELECT_BRUSH_ID_4);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"5",0,OUR_SIGNAL_SELECT_BRUSH_ID_5);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"6",0,OUR_SIGNAL_SELECT_BRUSH_ID_6);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"7",0,OUR_SIGNAL_SELECT_BRUSH_ID_7);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"8",0,OUR_SIGNAL_SELECT_BRUSH_ID_8);
+    laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"9",0,OUR_SIGNAL_SELECT_BRUSH_ID_9);
     laNewInputMappingEntryP(im,LA_INPUT_DEVICE_KEYBOARD,0,"f",0,OUR_SIGNAL_ADJUST);
 
     laAssignNewKey(km, 0, "LA_undo", 0, LA_KEY_CTRL, LA_KEY_DOWN, ']', 0);

ourpaint.h

@@ -73,18 +73,28 @@ extern const char OUR_PIGMENT_COMMON[];
 #define OUR_SIGNAL_BRUSH_BIGGER 7
 #define OUR_SIGNAL_BRUSH_SMALLER 8
 #define OUR_SIGNAL_TOGGLE_SKETCH 9
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_0 10
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_1 11
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_2 12
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_3 13
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_4 14
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_5 15
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_6 16
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_7 17
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_8 18
-#define OUR_SIGNAL_SELECT_BRUSH_NUMBER_9 19
-#define OUR_SIGNAL_SELECT_BRUSH_FREE 20
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_0 10
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_1 11
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_2 12
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_3 13
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_4 14
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_5 15
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_6 16
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_7 17
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_8 18
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_9 19
+#define OUR_SIGNAL_SELECT_BRUSH_SIZE_FREE 20
 #define OUR_SIGNAL_ADJUST 21
+#define OUR_SIGNAL_SELECT_BRUSH_ID_0 22
+#define OUR_SIGNAL_SELECT_BRUSH_ID_1 23
+#define OUR_SIGNAL_SELECT_BRUSH_ID_2 24
+#define OUR_SIGNAL_SELECT_BRUSH_ID_3 25
+#define OUR_SIGNAL_SELECT_BRUSH_ID_4 26
+#define OUR_SIGNAL_SELECT_BRUSH_ID_5 27
+#define OUR_SIGNAL_SELECT_BRUSH_ID_6 28
+#define OUR_SIGNAL_SELECT_BRUSH_ID_7 29
+#define OUR_SIGNAL_SELECT_BRUSH_ID_8 30
+#define OUR_SIGNAL_SELECT_BRUSH_ID_9 31
 
 extern laWidget* OUR_WIDGET_PIGMENT;
 extern laUiType* _OUR_UI_PIGMENT;