From b16160f0003ffbb3e770c4fc70dfbd4d823e06b2 Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Sat, 17 Aug 2019 03:16:44 -0600 Subject: [PATCH 1/6] fixes #1415 WIP: Adds 2 tools for pen sizes. Todo: needs icons and a bit more code. --- src/gui/toolbarMenubar/ToolMenuHandler.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/toolbarMenubar/ToolMenuHandler.cpp b/src/gui/toolbarMenubar/ToolMenuHandler.cpp index 8997fc87..9a6ceb19 100644 --- a/src/gui/toolbarMenubar/ToolMenuHandler.cpp +++ b/src/gui/toolbarMenubar/ToolMenuHandler.cpp @@ -521,9 +521,11 @@ void ToolMenuHandler::initToolItems() addToolItem(new ToolDrawCombocontrol(this, listener, "DRAW")); // General tool configuration - working for every tool which support it + ADD_CUSTOM_ITEM_TGL("VERY_THIN", ACTION_SIZE_VERY_THIN, GROUP_SIZE, true, "thickness_very_thin", _("Very Thin")); ADD_CUSTOM_ITEM_TGL("FINE", ACTION_SIZE_FINE, GROUP_SIZE, true, "thickness_thin", _("Thin")); ADD_CUSTOM_ITEM_TGL("MEDIUM", ACTION_SIZE_MEDIUM, GROUP_SIZE, true, "thickness_medium", _("Medium")); ADD_CUSTOM_ITEM_TGL("THICK", ACTION_SIZE_THICK, GROUP_SIZE, true, "thickness_thick", _("Thick")); + ADD_CUSTOM_ITEM_TGL("VERY_THICK", ACTION_SIZE_VERY_THICK, GROUP_SIZE, true, "thickness_very_thick", _("Very Thick")); // now connect all Glade Signals From c0b45c0204ef4ca8ae16fa991dcb4f216e700ce5 Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Sat, 24 Aug 2019 01:44:28 -0600 Subject: [PATCH 2/6] add icons for thicknesses very thin and very thick --- ui/icons/hicolor/icon-theme.cache | Bin 2068 -> 2160 bytes .../scalable/actions/thickness_very_thick.svg | 62 ++++++++++++++++++ .../scalable/actions/thickness_very_thin.svg | 62 ++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 ui/icons/hicolor/scalable/actions/thickness_very_thick.svg create mode 100644 ui/icons/hicolor/scalable/actions/thickness_very_thin.svg diff --git a/ui/icons/hicolor/icon-theme.cache b/ui/icons/hicolor/icon-theme.cache index cb0cf55c90f5272bc6b069b597105fc8b709e64b..85ff0b6a5a6762c6a951dfcfa75f2466c0c59021 100644 GIT binary patch delta 685 zcmZXSp>G;d9LIl@d+*&PClCn2meB1;X%omQ5M6?(n5d}O7Q_SzT;O$(USYXAw$=3y zz%;*!$%;zMk_yDcL?r?-F@czvKujPI6HVIh9VuPIC7;~)^1Ju@{@(Y!FR6LTrUXTg zO=Rw$+b^DZL}CvNz=%lFEgrl#!Hh@^ztxVDFBe3~37CcLPV=~{gP{IV`=|BzGj2#| zoS==RHl7k0kVc9p$((fnwGAr#FIm{BLN&r(&#QmX-DU>^JYM@1_0M3y2ZrDFJ@Y8cowI7%NuL~Qszt|)3cVkP63}lgKhGR9LUV$p7g(EPHIOB>a z2#g_y+!oHxFQ{uUZs{Yp?}btG)n=D*i9e_>_)0wAl5mn~&kcg!+7uE=$ReoljmTN( zB$0+}b6z?Y4CNUZ@N4bZqV@|M4EeelmRi31Y0XCMqK+M^ zd>nJ<#C@;hpH@?&_6}6QA=@fv!C19G$Yte3mqA@{O*thPs}Z<9>U&<$^tE1#UPaSP q!HkD0vxked3E*d@AI|Llw#2JfV=Tink%(F5iONdz5VFQ|mA?airG#t% delta 592 zcmZXRp-%!)9LFDW@AtUv0>Qx4jp;GKO{c+NAQB7)bw)OJI}Tx<;5eMR84L!3LH!X7 z1Ovf9(9K{l@&{Zr5DWwZfnYGW>G#lp@l|=)(1j_eeiap#q}7(rx2RKX)U#wfLg6rt8V_#sn}&V z*gb@2DiElZzy`?iiDqtJLDj)Uy;QdMD~{*op(>-+@xLC>(*kYRI(2HJ^1oessJ#H6 z2U?P}cgQb}NmF0N?9(8@S!v1))E2ukB{7CP<6CJi-a|D(tKbx^BNx+*4g7cdC)B&# zmkUV=C)sx`&#O*MK}bS=At-~FD6VIrkOr;uE}1$EX$$1|oMv?x5}c^PZA!^Is1Exy zvqRXPy1=hFc73@}vyLZh6uuBnNFSq^%Lmq;Gin+OOr>#G!KKb|M#Xg)t2L12f--}< zRfl}3%w-s>251(KT-UQ}jx!Ox!ZfM_p1G%D#&00X$A?#5ip-E23K0>!8A<#Af?snz diff --git a/ui/icons/hicolor/scalable/actions/thickness_very_thick.svg b/ui/icons/hicolor/scalable/actions/thickness_very_thick.svg new file mode 100644 index 00000000..cfade19f --- /dev/null +++ b/ui/icons/hicolor/scalable/actions/thickness_very_thick.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/ui/icons/hicolor/scalable/actions/thickness_very_thin.svg b/ui/icons/hicolor/scalable/actions/thickness_very_thin.svg new file mode 100644 index 00000000..caff008e --- /dev/null +++ b/ui/icons/hicolor/scalable/actions/thickness_very_thin.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + From ef1e9f8b5598127aa687093048c1f9f3036779b2 Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Sun, 18 Aug 2019 16:35:05 -0600 Subject: [PATCH 3/6] found and fixed (unreported?) bug mixing up tool size selection. Support code to let new toolbuttons work. --- src/control/Control.cpp | 8 ++++++-- src/control/ToolHandler.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 21eb2e58..75b600a2 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -1996,12 +1996,14 @@ void Control::eraserSizeChanged() switch (toolHandler->getEraserSize()) { + case TOOL_SIZE_VERY_FINE: //fall through - we don't have a very fine menu item for the eraser (yet? - now has a toolbutton) case TOOL_SIZE_FINE: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_FINE); break; case TOOL_SIZE_MEDIUM: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_MEDIUM); break; + case TOOL_SIZE_VERY_THICK: //fall through case TOOL_SIZE_THICK: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_THICK); break; @@ -2042,12 +2044,14 @@ void Control::hilighterSizeChanged() switch (toolHandler->getHilighterSize()) { + case TOOL_SIZE_VERY_FINE: //fall through - we don't have a very fine for the hilighter (yet? - now has a toolbutton) case TOOL_SIZE_FINE: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_FINE); break; case TOOL_SIZE_MEDIUM: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_MEDIUM); break; + case TOOL_SIZE_VERY_THICK: //fall through case TOOL_SIZE_THICK: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_THICK); break; @@ -2079,7 +2083,7 @@ void Control::toolSizeChanged() fireActionSelected(GROUP_SIZE, ACTION_NONE); break; case TOOL_SIZE_VERY_FINE: - fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_THICK); + fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_THIN); break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_SIZE, ACTION_SIZE_FINE); @@ -2091,7 +2095,7 @@ void Control::toolSizeChanged() fireActionSelected(GROUP_SIZE, ACTION_SIZE_THICK); break; case TOOL_SIZE_VERY_THICK: - fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_THIN); + fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_THICK); break; } diff --git a/src/control/ToolHandler.cpp b/src/control/ToolHandler.cpp index 568e2be4..060fa2d0 100644 --- a/src/control/ToolHandler.cpp +++ b/src/control/ToolHandler.cpp @@ -47,21 +47,21 @@ void ToolHandler::initTools() tools[TOOL_PEN - TOOL_PEN] = t; thickness = new double[5]; - thickness[TOOL_SIZE_VERY_FINE] = 2.83; + thickness[TOOL_SIZE_VERY_FINE] = 1; thickness[TOOL_SIZE_FINE] = 2.83; thickness[TOOL_SIZE_MEDIUM] = 8.50; - thickness[TOOL_SIZE_THICK] = 19.84; - thickness[TOOL_SIZE_VERY_THICK] = 19.84; + thickness[TOOL_SIZE_THICK] = 12; + thickness[TOOL_SIZE_VERY_THICK] = 18; t = new Tool("eraser", TOOL_ERASER, 0x000000, TOOL_CAP_SIZE, thickness); tools[TOOL_ERASER - TOOL_PEN] = t; // highlighter thicknesses = 1, 3, 7 mm thickness = new double[5]; - thickness[TOOL_SIZE_VERY_FINE] = 2.83; + thickness[TOOL_SIZE_VERY_FINE] = 1; thickness[TOOL_SIZE_FINE] = 2.83; thickness[TOOL_SIZE_MEDIUM] = 8.50; thickness[TOOL_SIZE_THICK] = 19.84; - thickness[TOOL_SIZE_VERY_THICK] = 19.84; + thickness[TOOL_SIZE_VERY_THICK] = 30; t = new Tool("hilighter", TOOL_HILIGHTER, 0xFFFF00, TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_CIRCLE | TOOL_CAP_ARROW | TOOL_CAP_RECOGNIZER | TOOL_CAP_FILL, From ea038c361a0074a8afd4e61d1cc511cb9a447d79 Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Sun, 18 Aug 2019 20:58:56 -0600 Subject: [PATCH 4/6] add menu items for highlighter and eraser very fine and very thick and sync changes via Control.cpp --- src/control/Control.cpp | 46 +++++++++++++++++--- src/enums/ActionType.enum.h | 4 ++ src/enums/generated/ActionType.generated.cpp | 40 +++++++++++++++++ ui/main.glade | 44 +++++++++++++++++++ 4 files changed, 129 insertions(+), 5 deletions(-) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 75b600a2..5efd6a2e 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -735,6 +735,13 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even setLineStyle("dot"); break; + case ACTION_TOOL_ERASER_SIZE_VERY_FINE: + if (enabled) + { + this->toolHandler->setEraserSize(TOOL_SIZE_VERY_FINE); + eraserSizeChanged(); + } + break; case ACTION_TOOL_ERASER_SIZE_FINE: if (enabled) { @@ -756,6 +763,13 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even eraserSizeChanged(); } break; + case ACTION_TOOL_ERASER_SIZE_VERY_THICK: + if (enabled) + { + this->toolHandler->setEraserSize(TOOL_SIZE_VERY_THICK); + eraserSizeChanged(); + } + break; case ACTION_TOOL_PEN_SIZE_VERY_THIN: if (enabled) { @@ -799,7 +813,14 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even break; - case ACTION_TOOL_HILIGHTER_SIZE_FINE: + case ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE: + if (enabled) + { + this->toolHandler->setHilighterSize(TOOL_SIZE_VERY_FINE); + hilighterSizeChanged(); + } + break; + case ACTION_TOOL_HILIGHTER_SIZE_FINE: if (enabled) { this->toolHandler->setHilighterSize(TOOL_SIZE_FINE); @@ -820,6 +841,13 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even hilighterSizeChanged(); } break; + case ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK: + if (enabled) + { + this->toolHandler->setHilighterSize(TOOL_SIZE_VERY_THICK); + hilighterSizeChanged(); + } + break; case ACTION_TOOL_HILIGHTER_FILL: this->toolHandler->setHilighterFillEnabled(enabled); break; @@ -1996,17 +2024,21 @@ void Control::eraserSizeChanged() switch (toolHandler->getEraserSize()) { - case TOOL_SIZE_VERY_FINE: //fall through - we don't have a very fine menu item for the eraser (yet? - now has a toolbutton) + case TOOL_SIZE_VERY_FINE: + fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_VERY_FINE); + break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_FINE); break; case TOOL_SIZE_MEDIUM: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_MEDIUM); break; - case TOOL_SIZE_VERY_THICK: //fall through case TOOL_SIZE_THICK: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_THICK); break; + case TOOL_SIZE_VERY_THICK: + fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_VERY_THICK); + break; default: break; } @@ -2044,17 +2076,21 @@ void Control::hilighterSizeChanged() switch (toolHandler->getHilighterSize()) { - case TOOL_SIZE_VERY_FINE: //fall through - we don't have a very fine for the hilighter (yet? - now has a toolbutton) + case TOOL_SIZE_VERY_FINE: + fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE); + break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_FINE); break; case TOOL_SIZE_MEDIUM: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_MEDIUM); break; - case TOOL_SIZE_VERY_THICK: //fall through case TOOL_SIZE_THICK: fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_THICK); break; + case TOOL_SIZE_VERY_THICK: + fireActionSelected(GROUP_HILIGHTER_SIZE, ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK); + break; default: break; } diff --git a/src/enums/ActionType.enum.h b/src/enums/ActionType.enum.h index 8c7d4f1a..83687846 100644 --- a/src/enums/ActionType.enum.h +++ b/src/enums/ActionType.enum.h @@ -114,9 +114,11 @@ enum ActionType ACTION_TOOL_ERASER_WHITEOUT, ACTION_TOOL_ERASER_DELETE_STROKE, + ACTION_TOOL_ERASER_SIZE_VERY_FINE, ACTION_TOOL_ERASER_SIZE_FINE, ACTION_TOOL_ERASER_SIZE_MEDIUM, ACTION_TOOL_ERASER_SIZE_THICK, + ACTION_TOOL_ERASER_SIZE_VERY_THICK, ACTION_TOOL_PEN_SIZE_VERY_THIN, ACTION_TOOL_PEN_SIZE_FINE, @@ -127,9 +129,11 @@ enum ActionType ACTION_TOOL_PEN_FILL, ACTION_TOOL_PEN_FILL_TRANSPARENCY, + ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE, ACTION_TOOL_HILIGHTER_SIZE_FINE, ACTION_TOOL_HILIGHTER_SIZE_MEDIUM, ACTION_TOOL_HILIGHTER_SIZE_THICK, + ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK, ACTION_TOOL_HILIGHTER_FILL, ACTION_TOOL_HILIGHTER_FILL_TRANSPARENCY, diff --git a/src/enums/generated/ActionType.generated.cpp b/src/enums/generated/ActionType.generated.cpp index 66a684d1..060b8ff7 100644 --- a/src/enums/generated/ActionType.generated.cpp +++ b/src/enums/generated/ActionType.generated.cpp @@ -357,6 +357,11 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_ERASER_DELETE_STROKE; } + if (value == "ACTION_TOOL_ERASER_SIZE_VERY_FINE") + { + return ACTION_TOOL_ERASER_SIZE_VERY_FINE; + } + if (value == "ACTION_TOOL_ERASER_SIZE_FINE") { return ACTION_TOOL_ERASER_SIZE_FINE; @@ -372,6 +377,11 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_ERASER_SIZE_THICK; } + if (value == "ACTION_TOOL_ERASER_SIZE_VERY_THICK") + { + return ACTION_TOOL_ERASER_SIZE_VERY_THICK; + } + if (value == "ACTION_TOOL_PEN_SIZE_VERY_THIN") { return ACTION_TOOL_PEN_SIZE_VERY_THIN; @@ -407,6 +417,11 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_PEN_FILL_TRANSPARENCY; } + if (value == "ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE") + { + return ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE; + } + if (value == "ACTION_TOOL_HILIGHTER_SIZE_FINE") { return ACTION_TOOL_HILIGHTER_SIZE_FINE; @@ -422,6 +437,11 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_HILIGHTER_SIZE_THICK; } + if (value == "ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK") + { + return ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK; + } + if (value == "ACTION_TOOL_HILIGHTER_FILL") { return ACTION_TOOL_HILIGHTER_FILL; @@ -1040,6 +1060,11 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_ERASER_DELETE_STROKE"; } + if (value == ACTION_TOOL_ERASER_SIZE_VERY_FINE) + { + return "ACTION_TOOL_ERASER_SIZE_VERY_FINE"; + } + if (value == ACTION_TOOL_ERASER_SIZE_FINE) { return "ACTION_TOOL_ERASER_SIZE_FINE"; @@ -1055,6 +1080,11 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_ERASER_SIZE_THICK"; } + if (value == ACTION_TOOL_ERASER_SIZE_VERY_THICK) + { + return "ACTION_TOOL_ERASER_SIZE_VERY_THICK"; + } + if (value == ACTION_TOOL_PEN_SIZE_VERY_THIN) { return "ACTION_TOOL_PEN_SIZE_VERY_THIN"; @@ -1090,6 +1120,11 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_PEN_FILL_TRANSPARENCY"; } + if (value == ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE) + { + return "ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE"; + } + if (value == ACTION_TOOL_HILIGHTER_SIZE_FINE) { return "ACTION_TOOL_HILIGHTER_SIZE_FINE"; @@ -1105,6 +1140,11 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_HILIGHTER_SIZE_THICK"; } + if (value == ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK) + { + return "ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK"; + } + if (value == ACTION_TOOL_HILIGHTER_FILL) { return "ACTION_TOOL_HILIGHTER_FILL"; diff --git a/ui/main.glade b/ui/main.glade index 7f5e117d..afe3b698 100644 --- a/ui/main.glade +++ b/ui/main.glade @@ -1608,6 +1608,17 @@ True False + + + eraserFine + True + False + _very fine + True + True + + + eraserFine @@ -1641,6 +1652,17 @@ + + + eraserVeryThick + True + False + ver_y thick + True + True + + + True @@ -1695,6 +1717,17 @@ True False + + + highlighterVeryFine + True + False + _very fine + True + True + + + highlighterFine @@ -1728,6 +1761,17 @@ + + + highlighterThick + True + False + ver_y thick + True + True + + + True From b10eb926878f56c262893be9e40ee7e54097af16 Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Sun, 18 Aug 2019 21:14:53 -0600 Subject: [PATCH 5/6] Change 'THIN' to 'FINE' to match overall naming. Renaming icon svgs as well. --- src/control/Control.cpp | 10 +++++----- src/control/ToolHandler.cpp | 4 ++-- src/enums/ActionType.enum.h | 4 ++-- src/enums/generated/ActionType.generated.cpp | 16 ++++++++-------- src/gui/toolbarMenubar/ToolMenuHandler.cpp | 4 ++-- ui/icons/hicolor/icon-theme.cache | Bin 2160 -> 2160 bytes ...{thickness_thin.svg => thickness_fine.svg} | 0 ..._very_thin.svg => thickness_very_fine.svg} | 0 ui/main.glade | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) rename ui/icons/hicolor/scalable/actions/{thickness_thin.svg => thickness_fine.svg} (100%) rename ui/icons/hicolor/scalable/actions/{thickness_very_thin.svg => thickness_very_fine.svg} (100%) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 5efd6a2e..e9fbb756 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -691,7 +691,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even setFill(enabled); break; - case ACTION_SIZE_VERY_THIN: + case ACTION_SIZE_VERY_FINE: if (enabled) { setToolSize(TOOL_SIZE_VERY_FINE); @@ -770,7 +770,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even eraserSizeChanged(); } break; - case ACTION_TOOL_PEN_SIZE_VERY_THIN: + case ACTION_TOOL_PEN_SIZE_VERY_FINE: if (enabled) { this->toolHandler->setPenSize(TOOL_SIZE_VERY_FINE); @@ -1961,7 +1961,7 @@ void Control::toolChanged() fireEnableAction(ACTION_SIZE_THICK, enableSize); fireEnableAction(ACTION_SIZE_FINE, enableSize); fireEnableAction(ACTION_SIZE_VERY_THICK, enableSize); - fireEnableAction(ACTION_SIZE_VERY_THIN, enableSize); + fireEnableAction(ACTION_SIZE_VERY_FINE, enableSize); bool enableFill = toolHandler->hasCapability(TOOL_CAP_FILL); @@ -2051,7 +2051,7 @@ void Control::penSizeChanged() switch (toolHandler->getPenSize()) { case TOOL_SIZE_VERY_FINE: - fireActionSelected(GROUP_PEN_SIZE, ACTION_TOOL_PEN_SIZE_VERY_THIN); + fireActionSelected(GROUP_PEN_SIZE, ACTION_TOOL_PEN_SIZE_VERY_FINE); break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_PEN_SIZE, ACTION_TOOL_PEN_SIZE_FINE); @@ -2119,7 +2119,7 @@ void Control::toolSizeChanged() fireActionSelected(GROUP_SIZE, ACTION_NONE); break; case TOOL_SIZE_VERY_FINE: - fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_THIN); + fireActionSelected(GROUP_SIZE, ACTION_SIZE_VERY_FINE); break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_SIZE, ACTION_SIZE_FINE); diff --git a/src/control/ToolHandler.cpp b/src/control/ToolHandler.cpp index 060fa2d0..1bc5faad 100644 --- a/src/control/ToolHandler.cpp +++ b/src/control/ToolHandler.cpp @@ -490,7 +490,7 @@ void ToolHandler::saveSettings() switch (t->getSize()) { case TOOL_SIZE_VERY_FINE: - value = "VERY_THIN"; + value = "VERY_FINE"; break; case TOOL_SIZE_FINE: value = "THIN"; @@ -595,7 +595,7 @@ void ToolHandler::loadSettings() string value; if (t->hasCapability(TOOL_CAP_SIZE) && st.getString("size", value)) { - if (value == "VERY_THIN") t->setSize(TOOL_SIZE_VERY_FINE); + if (value == "VERY_FINE") t->setSize(TOOL_SIZE_VERY_FINE); else if (value == "THIN") t->setSize(TOOL_SIZE_FINE); else if (value == "MEDIUM") t->setSize(TOOL_SIZE_MEDIUM); else if (value == "BIG") t->setSize(TOOL_SIZE_THICK); diff --git a/src/enums/ActionType.enum.h b/src/enums/ActionType.enum.h index 83687846..0ce9e9ab 100644 --- a/src/enums/ActionType.enum.h +++ b/src/enums/ActionType.enum.h @@ -104,7 +104,7 @@ enum ActionType ACTION_TOOL_LINE_STYLE_DASH_DOT, ACTION_TOOL_LINE_STYLE_DOT, - ACTION_SIZE_VERY_THIN, + ACTION_SIZE_VERY_FINE, ACTION_SIZE_FINE, ACTION_SIZE_MEDIUM, ACTION_SIZE_THICK, @@ -120,7 +120,7 @@ enum ActionType ACTION_TOOL_ERASER_SIZE_THICK, ACTION_TOOL_ERASER_SIZE_VERY_THICK, - ACTION_TOOL_PEN_SIZE_VERY_THIN, + ACTION_TOOL_PEN_SIZE_VERY_FINE, ACTION_TOOL_PEN_SIZE_FINE, ACTION_TOOL_PEN_SIZE_MEDIUM, ACTION_TOOL_PEN_SIZE_THICK, diff --git a/src/enums/generated/ActionType.generated.cpp b/src/enums/generated/ActionType.generated.cpp index 060b8ff7..84437845 100644 --- a/src/enums/generated/ActionType.generated.cpp +++ b/src/enums/generated/ActionType.generated.cpp @@ -317,9 +317,9 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_LINE_STYLE_DOT; } - if (value == "ACTION_SIZE_VERY_THIN") + if (value == "ACTION_SIZE_VERY_FINE") { - return ACTION_SIZE_VERY_THIN; + return ACTION_SIZE_VERY_FINE; } if (value == "ACTION_SIZE_FINE") @@ -382,9 +382,9 @@ ActionType ActionType_fromString(string value) return ACTION_TOOL_ERASER_SIZE_VERY_THICK; } - if (value == "ACTION_TOOL_PEN_SIZE_VERY_THIN") + if (value == "ACTION_TOOL_PEN_SIZE_VERY_FINE") { - return ACTION_TOOL_PEN_SIZE_VERY_THIN; + return ACTION_TOOL_PEN_SIZE_VERY_FINE; } if (value == "ACTION_TOOL_PEN_SIZE_FINE") @@ -1020,9 +1020,9 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_LINE_STYLE_DOT"; } - if (value == ACTION_SIZE_VERY_THIN) + if (value == ACTION_SIZE_VERY_FINE) { - return "ACTION_SIZE_VERY_THIN"; + return "ACTION_SIZE_VERY_FINE"; } if (value == ACTION_SIZE_FINE) @@ -1085,9 +1085,9 @@ string ActionType_toString(ActionType value) return "ACTION_TOOL_ERASER_SIZE_VERY_THICK"; } - if (value == ACTION_TOOL_PEN_SIZE_VERY_THIN) + if (value == ACTION_TOOL_PEN_SIZE_VERY_FINE) { - return "ACTION_TOOL_PEN_SIZE_VERY_THIN"; + return "ACTION_TOOL_PEN_SIZE_VERY_FINE"; } if (value == ACTION_TOOL_PEN_SIZE_FINE) diff --git a/src/gui/toolbarMenubar/ToolMenuHandler.cpp b/src/gui/toolbarMenubar/ToolMenuHandler.cpp index 9a6ceb19..c42bce7c 100644 --- a/src/gui/toolbarMenubar/ToolMenuHandler.cpp +++ b/src/gui/toolbarMenubar/ToolMenuHandler.cpp @@ -521,8 +521,8 @@ void ToolMenuHandler::initToolItems() addToolItem(new ToolDrawCombocontrol(this, listener, "DRAW")); // General tool configuration - working for every tool which support it - ADD_CUSTOM_ITEM_TGL("VERY_THIN", ACTION_SIZE_VERY_THIN, GROUP_SIZE, true, "thickness_very_thin", _("Very Thin")); - ADD_CUSTOM_ITEM_TGL("FINE", ACTION_SIZE_FINE, GROUP_SIZE, true, "thickness_thin", _("Thin")); + ADD_CUSTOM_ITEM_TGL("VERY_FINE", ACTION_SIZE_VERY_FINE, GROUP_SIZE, true, "thickness_very_fine", _("Very Fine")); + ADD_CUSTOM_ITEM_TGL("FINE", ACTION_SIZE_FINE, GROUP_SIZE, true, "thickness_fine", _("Fine")); ADD_CUSTOM_ITEM_TGL("MEDIUM", ACTION_SIZE_MEDIUM, GROUP_SIZE, true, "thickness_medium", _("Medium")); ADD_CUSTOM_ITEM_TGL("THICK", ACTION_SIZE_THICK, GROUP_SIZE, true, "thickness_thick", _("Thick")); ADD_CUSTOM_ITEM_TGL("VERY_THICK", ACTION_SIZE_VERY_THICK, GROUP_SIZE, true, "thickness_very_thick", _("Very Thick")); diff --git a/ui/icons/hicolor/icon-theme.cache b/ui/icons/hicolor/icon-theme.cache index 85ff0b6a5a6762c6a951dfcfa75f2466c0c59021..44f535640e4072e972d8498d9fba5b28c0b0560b 100644 GIT binary patch delta 109 zcmew$@Ihe1Y!=NO3=AwwfOt(#Vr6O(0~jzeFfuSfm@H3#az}vp#^g6F3Oo!9tO7vJ w2O!NdS%OtzasxY?2&)W`t5cGZnVg-MT3j5TmYJ8jS&Q{46AOqnS(qah05LEblmGw# delta 121 zcmew$@Ihe1Y?i_very fine True True - + From e896055eefc0678778e0f692ae257c55097696bc Mon Sep 17 00:00:00 2001 From: JJones780 <2329541+JJones780@users.noreply.github.com> Date: Mon, 19 Aug 2019 00:39:34 -0600 Subject: [PATCH 6/6] apply clang-tidy to changed lines --- src/control/Control.cpp | 10 +++++----- src/control/ToolHandler.cpp | 3 ++- src/enums/ActionType.enum.h | 6 +++--- src/gui/toolbarMenubar/ToolMenuHandler.cpp | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index e9fbb756..83d3228f 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -735,7 +735,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even setLineStyle("dot"); break; - case ACTION_TOOL_ERASER_SIZE_VERY_FINE: + case ACTION_TOOL_ERASER_SIZE_VERY_FINE: if (enabled) { this->toolHandler->setEraserSize(TOOL_SIZE_VERY_FINE); @@ -763,7 +763,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even eraserSizeChanged(); } break; - case ACTION_TOOL_ERASER_SIZE_VERY_THICK: + case ACTION_TOOL_ERASER_SIZE_VERY_THICK: if (enabled) { this->toolHandler->setEraserSize(TOOL_SIZE_VERY_THICK); @@ -820,7 +820,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even hilighterSizeChanged(); } break; - case ACTION_TOOL_HILIGHTER_SIZE_FINE: + case ACTION_TOOL_HILIGHTER_SIZE_FINE: if (enabled) { this->toolHandler->setHilighterSize(TOOL_SIZE_FINE); @@ -841,7 +841,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even hilighterSizeChanged(); } break; - case ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK: + case ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK: if (enabled) { this->toolHandler->setHilighterSize(TOOL_SIZE_VERY_THICK); @@ -2026,7 +2026,7 @@ void Control::eraserSizeChanged() { case TOOL_SIZE_VERY_FINE: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_VERY_FINE); - break; + break; case TOOL_SIZE_FINE: fireActionSelected(GROUP_ERASER_SIZE, ACTION_TOOL_ERASER_SIZE_FINE); break; diff --git a/src/control/ToolHandler.cpp b/src/control/ToolHandler.cpp index 1bc5faad..251b6553 100644 --- a/src/control/ToolHandler.cpp +++ b/src/control/ToolHandler.cpp @@ -595,7 +595,8 @@ void ToolHandler::loadSettings() string value; if (t->hasCapability(TOOL_CAP_SIZE) && st.getString("size", value)) { - if (value == "VERY_FINE") t->setSize(TOOL_SIZE_VERY_FINE); + if (value == "VERY_FINE") + t->setSize(TOOL_SIZE_VERY_FINE); else if (value == "THIN") t->setSize(TOOL_SIZE_FINE); else if (value == "MEDIUM") t->setSize(TOOL_SIZE_MEDIUM); else if (value == "BIG") t->setSize(TOOL_SIZE_THICK); diff --git a/src/enums/ActionType.enum.h b/src/enums/ActionType.enum.h index 0ce9e9ab..27e3f96a 100644 --- a/src/enums/ActionType.enum.h +++ b/src/enums/ActionType.enum.h @@ -96,7 +96,7 @@ enum ActionType ACTION_TOOL_DRAW_ARROW, ACTION_TOOL_DRAW_COORDINATE_SYSTEM, ACTION_RULER, - + ACTION_TOOL_FLOATING_TOOLBOX, ACTION_TOOL_LINE_STYLE_PLAIN, @@ -189,10 +189,10 @@ enum ActionType ACTION_SET_LAYOUT_R2L, ACTION_SET_LAYOUT_T2B, ACTION_SET_LAYOUT_B2T, - + // Plugin Menu ACTION_PLUGIN_MANAGER = 700, - + // Menu Help ACTION_ABOUT = 800, ACTION_HELP, diff --git a/src/gui/toolbarMenubar/ToolMenuHandler.cpp b/src/gui/toolbarMenubar/ToolMenuHandler.cpp index c42bce7c..b51ac490 100644 --- a/src/gui/toolbarMenubar/ToolMenuHandler.cpp +++ b/src/gui/toolbarMenubar/ToolMenuHandler.cpp @@ -525,7 +525,8 @@ void ToolMenuHandler::initToolItems() ADD_CUSTOM_ITEM_TGL("FINE", ACTION_SIZE_FINE, GROUP_SIZE, true, "thickness_fine", _("Fine")); ADD_CUSTOM_ITEM_TGL("MEDIUM", ACTION_SIZE_MEDIUM, GROUP_SIZE, true, "thickness_medium", _("Medium")); ADD_CUSTOM_ITEM_TGL("THICK", ACTION_SIZE_THICK, GROUP_SIZE, true, "thickness_thick", _("Thick")); - ADD_CUSTOM_ITEM_TGL("VERY_THICK", ACTION_SIZE_VERY_THICK, GROUP_SIZE, true, "thickness_very_thick", _("Very Thick")); + ADD_CUSTOM_ITEM_TGL("VERY_THICK", ACTION_SIZE_VERY_THICK, GROUP_SIZE, true, "thickness_very_thick", + _("Very Thick")); // now connect all Glade Signals