wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1416 from JJones780/add2SizeTools

Browse Source 
fixes #1415  WIP: Adds 2 tools for pen sizes.
presentation
JJones780 7 years ago committed by GitHub
parent 30e555e20e e896055eef
commit 7974b3b748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 284 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      src/control/Control.cpp
  2. 15
      src/control/ToolHandler.cpp
  3. 14
      src/enums/ActionType.enum.h
  4. 56
      src/enums/generated/ActionType.generated.cpp
  5. 5
      src/gui/toolbarMenubar/ToolMenuHandler.cpp
  6. BIN
      ui/icons/hicolor/icon-theme.cache
  7. 0
      ui/icons/hicolor/scalable/actions/thickness_fine.svg
  8. 62
      ui/icons/hicolor/scalable/actions/thickness_very_fine.svg
  9. 62
      ui/icons/hicolor/scalable/actions/thickness_very_thick.svg
  10. 46
      ui/main.glade

52
src/control/Control.cpp
Unescape View File

@ -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);
@ -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,7 +763,14 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even
eraserSizeChanged();
}
break;
case ACTION_TOOL_PEN_SIZE_VERY_THIN:
case ACTION_TOOL_ERASER_SIZE_VERY_THICK:
if (enabled)
{
this->toolHandler->setEraserSize(TOOL_SIZE_VERY_THICK);
eraserSizeChanged();
}
break;
case ACTION_TOOL_PEN_SIZE_VERY_FINE:
if (enabled)
{
this->toolHandler->setPenSize(TOOL_SIZE_VERY_FINE);
@ -799,6 +813,13 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even
break;
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)
{
@ -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;
@ -1933,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);
@ -1996,6 +2024,9 @@ void Control::eraserSizeChanged()
switch (toolHandler->getEraserSize())
{
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;
@ -2005,6 +2036,9 @@ void Control::eraserSizeChanged()
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;
}
@ -2017,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);
@ -2042,6 +2076,9 @@ void Control::hilighterSizeChanged()
switch (toolHandler->getHilighterSize())
{
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;
@ -2051,6 +2088,9 @@ void Control::hilighterSizeChanged()
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;
}
@ -2079,7 +2119,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_FINE);
break;
case TOOL_SIZE_FINE:
fireActionSelected(GROUP_SIZE, ACTION_SIZE_FINE);
@ -2091,7 +2131,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;
}

15
src/control/ToolHandler.cpp
Unescape View File

@ -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,
@ -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,8 @@ 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);

14
src/enums/ActionType.enum.h
Unescape View File

@ -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,
@ -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,
@ -114,11 +114,13 @@ 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_VERY_FINE,
ACTION_TOOL_PEN_SIZE_FINE,
ACTION_TOOL_PEN_SIZE_MEDIUM,
ACTION_TOOL_PEN_SIZE_THICK,
@ -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,
@ -185,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,

56
src/enums/generated/ActionType.generated.cpp
Unescape View File

@ -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")
@ -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,9 +377,14 @@ ActionType ActionType_fromString(string value)
return ACTION_TOOL_ERASER_SIZE_THICK;
}
if (value == "ACTION_TOOL_PEN_SIZE_VERY_THIN")
if (value == "ACTION_TOOL_ERASER_SIZE_VERY_THICK")
{
return ACTION_TOOL_ERASER_SIZE_VERY_THICK;
}
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")
@ -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;
@ -1000,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)
@ -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,9 +1080,14 @@ string ActionType_toString(ActionType value)
return "ACTION_TOOL_ERASER_SIZE_THICK";
}
if (value == ACTION_TOOL_PEN_SIZE_VERY_THIN)
if (value == ACTION_TOOL_ERASER_SIZE_VERY_THICK)
{
return "ACTION_TOOL_ERASER_SIZE_VERY_THICK";
}
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)
@ -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";

5
src/gui/toolbarMenubar/ToolMenuHandler.cpp
Unescape View File

@ -521,9 +521,12 @@ void ToolMenuHandler::initToolItems()
addToolItem(new ToolDrawCombocontrol(this, listener, "DRAW"));
// General tool configuration - working for every tool which support it
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"));
// now connect all Glade Signals

BIN
ui/icons/hicolor/icon-theme.cache
View File

Binary file not shown.

0
ui/icons/hicolor/scalable/actions/thickness_thin.svg → ui/icons/hicolor/scalable/actions/thickness_fine.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

62
ui/icons/hicolor/scalable/actions/thickness_very_fine.svg
Unescape View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="thickness_very_thin.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="10.060456"
inkscape:cy="6.5627302"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1082"
inkscape:window-height="604"
inkscape:window-x="2202"
inkscape:window-y="162"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3622)">
<circle
style="opacity:0.98000004;fill:#000000;fill-opacity:1;stroke:none"
id="path2985"
cx="10.982142"
cy="1041.3801"
r="0.66964316" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

62
ui/icons/hicolor/scalable/actions/thickness_very_thick.svg
Unescape View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="22"
height="22"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="thickness_very_thick.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="9.7308271"
inkscape:cy="10.04982"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1275"
inkscape:window-height="774"
inkscape:window-x="1806"
inkscape:window-y="925"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1030.3622)">
<circle
style="fill:#000000;fill-opacity:1;stroke:none"
id="path2985"
cx="10.982142"
cy="1041.38"
r="9.8214283" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

46
ui/main.glade
Unescape View File

@ -1470,7 +1470,7 @@
<property name="label" translatable="yes">_very fine</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_TOOL_PEN_SIZE_VERY_THIN:GROUP_PEN_SIZE" swapped="no"/>
<signal name="toggled" handler="ACTION_TOOL_PEN_SIZE_VERY_FINE:GROUP_PEN_SIZE" swapped="no"/>
</object>
</child>
<child>
@ -1608,6 +1608,17 @@
<object class="GtkMenu" id="menu12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="eraserVeryFine">
<property name="name">eraserFine</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_very fine</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_TOOL_ERASER_SIZE_VERY_FINE:GROUP_ERASER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="eraserFine">
<property name="name">eraserFine</property>
@ -1641,6 +1652,17 @@
<signal name="toggled" handler="ACTION_TOOL_ERASER_SIZE_THICK:GROUP_ERASER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="eraserVeryThick">
<property name="name">eraserVeryThick</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">ver_y thick</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_TOOL_ERASER_SIZE_VERY_THICK:GROUP_ERASER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem15">
<property name="visible">True</property>
@ -1695,6 +1717,17 @@
<object class="GtkMenu" id="menu13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="highlighterVeryFine">
<property name="name">highlighterVeryFine</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_very fine</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_TOOL_HILIGHTER_SIZE_VERY_FINE:GROUP_HILIGHTER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="highlighterFine">
<property name="name">highlighterFine</property>
@ -1728,6 +1761,17 @@
<signal name="toggled" handler="ACTION_TOOL_HILIGHTER_SIZE_THICK:GROUP_HILIGHTER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem" id="highlighterVeryThick">
<property name="name">highlighterThick</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">ver_y thick</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
<signal name="toggled" handler="ACTION_TOOL_HILIGHTER_SIZE_VERY_THICK:GROUP_HILIGHTER_SIZE" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem2">
<property name="visible">True</property>

Write Preview
Loading…
Cancel
Save