refactor circle to ellipse

5 years ago · c9f6e037fc
parent c440e3069a
commit c9f6e037fc
18 changed files with 65 additions and 57 deletions
--- a/src/control/Control.cpp
+++ b/src/control/Control.cpp
@ -561,7 +561,7 @@ void Control::actionPerformed(ActionType type, ActionGroup group, GdkEvent* even
            }
            break;
        case ACTION_TOOL_DRAW_RECT:
-        case ACTION_TOOL_DRAW_CIRCLE:
+        case ACTION_TOOL_DRAW_ELLIPSE:
        case ACTION_TOOL_DRAW_ARROW:
        case ACTION_TOOL_DRAW_COORDINATE_SYSTEM:
        case ACTION_RULER:
@ -1097,7 +1097,7 @@ void Control::setShapeTool(ActionType type, bool enabled) {
        (this->toolHandler->getDrawingType() == DRAWING_TYPE_ARROW && type == ACTION_TOOL_DRAW_ARROW) ||
        (this->toolHandler->getDrawingType() == DRAWING_TYPE_COORDINATE_SYSTEM &&
         type == ACTION_TOOL_DRAW_COORDINATE_SYSTEM) ||
-        (this->toolHandler->getDrawingType() == DRAWING_TYPE_CIRCLE && type == ACTION_TOOL_DRAW_CIRCLE) ||
+        (this->toolHandler->getDrawingType() == DRAWING_TYPE_ELLIPSE && type == ACTION_TOOL_DRAW_ELLIPSE) ||
        (this->toolHandler->getDrawingType() == DRAWING_TYPE_SPLINE && type == ACTION_TOOL_DRAW_SPLINE) ||
        (this->toolHandler->getDrawingType() == DRAWING_TYPE_STROKE_RECOGNIZER && type == ACTION_SHAPE_RECOGNIZER)) {
        return;
@ -1108,8 +1108,8 @@ void Control::setShapeTool(ActionType type, bool enabled) {
            this->toolHandler->setDrawingType(DRAWING_TYPE_RECTANGLE);
            break;

-        case ACTION_TOOL_DRAW_CIRCLE:
-            this->toolHandler->setDrawingType(DRAWING_TYPE_CIRCLE);
+        case ACTION_TOOL_DRAW_ELLIPSE:
+            this->toolHandler->setDrawingType(DRAWING_TYPE_ELLIPSE);
            break;

        case ACTION_TOOL_DRAW_ARROW:
@ -1654,7 +1654,7 @@ void Control::toolChanged() {

    fireEnableAction(ACTION_RULER, toolHandler->hasCapability(TOOL_CAP_RULER));
    fireEnableAction(ACTION_TOOL_DRAW_RECT, toolHandler->hasCapability(TOOL_CAP_RECTANGLE));
-    fireEnableAction(ACTION_TOOL_DRAW_CIRCLE, toolHandler->hasCapability(TOOL_CAP_CIRCLE));
+    fireEnableAction(ACTION_TOOL_DRAW_ELLIPSE, toolHandler->hasCapability(TOOL_CAP_ELLIPSE));
    fireEnableAction(ACTION_TOOL_DRAW_ARROW, toolHandler->hasCapability(TOOL_CAP_ARROW));
    fireEnableAction(ACTION_TOOL_DRAW_COORDINATE_SYSTEM, toolHandler->hasCapability(TOOL_CAP_ARROW));
    fireEnableAction(ACTION_TOOL_DRAW_SPLINE, toolHandler->hasCapability(TOOL_CAP_SPLINE));
@ -1688,8 +1688,8 @@ void Control::toolChanged() {
        rulerAction = ACTION_RULER;
    } else if (toolHandler->getDrawingType() == DRAWING_TYPE_RECTANGLE) {
        rulerAction = ACTION_TOOL_DRAW_RECT;
-    } else if (toolHandler->getDrawingType() == DRAWING_TYPE_CIRCLE) {
-        rulerAction = ACTION_TOOL_DRAW_CIRCLE;
+    } else if (toolHandler->getDrawingType() == DRAWING_TYPE_ELLIPSE) {
+        rulerAction = ACTION_TOOL_DRAW_ELLIPSE;
    } else if (toolHandler->getDrawingType() == DRAWING_TYPE_ARROW) {
        rulerAction = ACTION_TOOL_DRAW_ARROW;
    } else if (toolHandler->getDrawingType() == DRAWING_TYPE_COORDINATE_SYSTEM) {
--- a/src/control/ToolEnums.cpp
+++ b/src/control/ToolEnums.cpp
@ -48,8 +48,8 @@ auto drawingTypeToString(DrawingType type) -> string {
            return "line";
        case DRAWING_TYPE_RECTANGLE:
            return "rectangle";
-        case DRAWING_TYPE_CIRCLE:
-            return "circle";
+        case DRAWING_TYPE_ELLIPSE:
+            return "ellipse";
        case DRAWING_TYPE_ARROW:
            return "arrow";
        case DRAWING_TYPE_STROKE_RECOGNIZER:
@ -73,8 +73,8 @@ auto drawingTypeFromString(const string& type) -> DrawingType {
    if (type == "rectangle") {
        return DRAWING_TYPE_RECTANGLE;
    }
-    if (type == "circle") {
-        return DRAWING_TYPE_CIRCLE;
+    if (type == "ellipse") {
+        return DRAWING_TYPE_ELLIPSE;
    }
    if (type == "arrow") {
        return DRAWING_TYPE_ARROW;
@ -119,8 +119,8 @@ auto toolTypeToString(ToolType type) -> string {
            return "hand";
        case TOOL_DRAW_RECT:
            return "drawRect";
-        case TOOL_DRAW_CIRCLE:
-            return "drawCircle";
+        case TOOL_DRAW_ELLIPSE:
+            return "drawEllipse";
        case TOOL_DRAW_ARROW:
            return "drawArrow";
        case TOOL_DRAW_COORDINATE_SYSTEM:
@ -172,8 +172,9 @@ auto toolTypeFromString(const string& type) -> ToolType {
    if (type == "drawRect") {
        return TOOL_DRAW_RECT;
    }
-    if (type == "drawCircle") {
-        return TOOL_DRAW_CIRCLE;
+    // recognize previous spelling of Ellipse, V1.1.0+dev (Jan 2021) and earlier
+    if (type == "drawEllipse" || type == "drawCircle") {
+        return TOOL_DRAW_ELLIPSE;
    }
    if (type == "drawArrow") {
        return TOOL_DRAW_ARROW;
--- a/src/control/ToolEnums.h
+++ b/src/control/ToolEnums.h
@ -42,7 +42,7 @@ enum DrawingType {
    DRAWING_TYPE_DEFAULT,
    DRAWING_TYPE_LINE,
    DRAWING_TYPE_RECTANGLE,
-    DRAWING_TYPE_CIRCLE,
+    DRAWING_TYPE_ELLIPSE,
    DRAWING_TYPE_ARROW,
    DRAWING_TYPE_COORDINATE_SYSTEM,
    DRAWING_TYPE_STROKE_RECOGNIZER,
@ -69,7 +69,7 @@ enum ToolType {
    TOOL_VERTICAL_SPACE = 10,
    TOOL_HAND = 11,
    TOOL_DRAW_RECT = 12,
-    TOOL_DRAW_CIRCLE = 13,
+    TOOL_DRAW_ELLIPSE = 13,
    TOOL_DRAW_ARROW = 14,
    TOOL_DRAW_COORDINATE_SYSTEM = 15,
    TOOL_FLOATING_TOOLBOX = 16,
@ -96,7 +96,7 @@ enum ToolCapabilities {
    TOOL_CAP_SIZE = 1 << 1,
    TOOL_CAP_RULER = 1 << 2,
    TOOL_CAP_RECTANGLE = 1 << 3,
-    TOOL_CAP_CIRCLE = 1 << 4,
+    TOOL_CAP_ELLIPSE = 1 << 4,
    TOOL_CAP_ARROW = 1 << 5,
    TOOL_CAP_RECOGNIZER = 1 << 6,
    TOOL_CAP_FILL = 1 << 7,
--- a/src/control/ToolHandler.cpp
+++ b/src/control/ToolHandler.cpp
@ -32,7 +32,7 @@ void ToolHandler::initTools() {
    thickness[TOOL_SIZE_VERY_THICK] = 5.67;
    tools[TOOL_PEN - TOOL_PEN] = std::make_unique<Tool>(
            "pen", TOOL_PEN, Color{0x3333CCU},
-            TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_CIRCLE | TOOL_CAP_ARROW |
+            TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_ELLIPSE | TOOL_CAP_ARROW |
                    TOOL_CAP_SPLINE | TOOL_CAP_RECOGNIZER | TOOL_CAP_FILL | TOOL_CAP_DASH_LINE,
            thickness);

@ -54,7 +54,7 @@ void ToolHandler::initTools() {
    thickness[TOOL_SIZE_VERY_THICK] = 30;
    tools[TOOL_HIGHLIGHTER - TOOL_PEN] = std::make_unique<Tool>(
            "highlighter", TOOL_HIGHLIGHTER, Color{0xFFFF00U},
-            TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_CIRCLE | TOOL_CAP_ARROW |
+            TOOL_CAP_COLOR | TOOL_CAP_SIZE | TOOL_CAP_RULER | TOOL_CAP_RECTANGLE | TOOL_CAP_ELLIPSE | TOOL_CAP_ARROW |
                    TOOL_CAP_SPLINE | TOOL_CAP_RECOGNIZER | TOOL_CAP_FILL,
            thickness);

@ -83,8 +83,8 @@ void ToolHandler::initTools() {
    tools[TOOL_DRAW_RECT - TOOL_PEN] =
            std::make_unique<Tool>("drawRect", TOOL_DRAW_RECT, Color{0x000000U}, TOOL_CAP_NONE, nullptr);

-    tools[TOOL_DRAW_CIRCLE - TOOL_PEN] =
-            std::make_unique<Tool>("drawCircle", TOOL_DRAW_CIRCLE, Color{0x000000U}, TOOL_CAP_NONE, nullptr);
+    tools[TOOL_DRAW_ELLIPSE - TOOL_PEN] =
+            std::make_unique<Tool>("drawEllipse", TOOL_DRAW_ELLIPSE, Color{0x000000U}, TOOL_CAP_NONE, nullptr);

    tools[TOOL_DRAW_ARROW - TOOL_PEN] =
            std::make_unique<Tool>("drawArrow", TOOL_DRAW_ARROW, Color{0x000000U}, TOOL_CAP_NONE, nullptr);
@ -530,11 +530,11 @@ auto ToolHandler::isSinglePageTool() -> bool {
    ToolType toolType = this->getToolType();
    DrawingType drawingType = this->getDrawingType();

-    return toolType == (TOOL_PEN && (drawingType == DRAWING_TYPE_ARROW || drawingType == DRAWING_TYPE_CIRCLE ||
+    return toolType == (TOOL_PEN && (drawingType == DRAWING_TYPE_ARROW || drawingType == DRAWING_TYPE_ELLIPSE ||
                                     drawingType == DRAWING_TYPE_COORDINATE_SYSTEM ||
                                     drawingType == DRAWING_TYPE_LINE || drawingType == DRAWING_TYPE_RECTANGLE)) ||
           drawingType == DRAWING_TYPE_SPLINE || toolType == TOOL_SELECT_REGION || toolType == TOOL_SELECT_RECT ||
-           toolType == TOOL_SELECT_OBJECT || toolType == TOOL_DRAW_RECT || toolType == TOOL_DRAW_CIRCLE ||
+           toolType == TOOL_SELECT_OBJECT || toolType == TOOL_DRAW_RECT || toolType == TOOL_DRAW_ELLIPSE ||
           toolType == TOOL_DRAW_COORDINATE_SYSTEM || toolType == TOOL_DRAW_ARROW ||
           toolType == TOOL_FLOATING_TOOLBOX || toolType == TOOL_DRAW_SPLINE;
 }
--- a/src/control/tools/EllipseHandler.cpp
+++ b/src/control/tools/EllipseHandler.cpp
@ -1,4 +1,4 @@
-#include "CircleHandler.h"
+#include "EllipseHandler.h"

 #include <cmath>

@ -7,14 +7,14 @@
 #include "undo/InsertUndoAction.h"


-CircleHandler::CircleHandler(XournalView* xournal, XojPageView* redrawable, const PageRef& page, bool flipShift,
-                             bool flipControl):
+EllipseHandler::EllipseHandler(XournalView* xournal, XojPageView* redrawable, const PageRef& page, bool flipShift,
+                               bool flipControl):
        BaseStrokeHandler(xournal, redrawable, page, flipShift, flipControl) {}

-CircleHandler::~CircleHandler() = default;
+EllipseHandler::~EllipseHandler() = default;


-void CircleHandler::drawShape(Point& c, const PositionInputData& pos) {
+void EllipseHandler::drawShape(Point& c, const PositionInputData& pos) {
    this->currPoint = c;

    /**
--- a/src/control/tools/EllipseHandler.h
+++ b/src/control/tools/EllipseHandler.h
@ -1,7 +1,7 @@
 /*
 * Xournal++
 *
- * Handles input to draw circle
+ * Handles input to draw ellipses
 *
 * @author Xournal++ Team
 * https://github.com/xournalpp/xournalpp
@ -13,11 +13,11 @@

 #include "BaseStrokeHandler.h"

-class CircleHandler: public BaseStrokeHandler {
+class EllipseHandler: public BaseStrokeHandler {
 public:
-    CircleHandler(XournalView* xournal, XojPageView* redrawable, const PageRef& page, bool flipShift = false,
-                  bool flipControl = false);
-    virtual ~CircleHandler();
+    EllipseHandler(XournalView* xournal, XojPageView* redrawable, const PageRef& page, bool flipShift = false,
+                   bool flipControl = false);
+    virtual ~EllipseHandler();

 private:
    virtual void drawShape(Point& currentPoint, const PositionInputData& pos);
--- a/src/control/tools/SplineHandler.h
+++ b/src/control/tools/SplineHandler.h
@ -75,5 +75,5 @@ protected:
    DocumentView view;
    Point currPoint;
    Point buttonDownPoint;  // used for tapSelect and filtering - never snapped to grid. See startPoint defined in
-                            // derived classes such as CircleHandler.
+                            // derived classes such as EllipseHandler.
 };
--- a/src/enums/ActionType.enum.h
+++ b/src/enums/ActionType.enum.h
@ -93,7 +93,7 @@ enum ActionType {

    ACTION_SHAPE_RECOGNIZER,
    ACTION_TOOL_DRAW_RECT,
-    ACTION_TOOL_DRAW_CIRCLE,
+    ACTION_TOOL_DRAW_ELLIPSE,
    ACTION_TOOL_DRAW_ARROW,
    ACTION_TOOL_DRAW_COORDINATE_SYSTEM,
    ACTION_RULER,
--- a/src/enums/generated/ActionType.generated.cpp
+++ b/src/enums/generated/ActionType.generated.cpp
@ -228,8 +228,8 @@ auto ActionType_fromString(const string& value) -> ActionType {
        return ACTION_TOOL_DRAW_RECT;
    }

-    if (value == "ACTION_TOOL_DRAW_CIRCLE") {
-        return ACTION_TOOL_DRAW_CIRCLE;
+    if (value == "ACTION_TOOL_DRAW_ELLIPSE") {
+        return ACTION_TOOL_DRAW_ELLIPSE;
    }

    if (value == "ACTION_TOOL_DRAW_ARROW") {
@ -810,8 +810,8 @@ auto ActionType_toString(ActionType value) -> string {
        return "ACTION_TOOL_DRAW_RECT";
    }

-    if (value == ACTION_TOOL_DRAW_CIRCLE) {
-        return "ACTION_TOOL_DRAW_CIRCLE";
+    if (value == ACTION_TOOL_DRAW_ELLIPSE) {
+        return "ACTION_TOOL_DRAW_ELLIPSE";
    }

    if (value == ACTION_TOOL_DRAW_ARROW) {
--- a/src/gui/PageView.cpp
+++ b/src/gui/PageView.cpp
@ -13,8 +13,8 @@
 #include "control/settings/ButtonConfig.h"
 #include "control/settings/Settings.h"
 #include "control/tools/ArrowHandler.h"
-#include "control/tools/CircleHandler.h"
 #include "control/tools/CoordinateSystemHandler.h"
+#include "control/tools/EllipseHandler.h"
 #include "control/tools/EraseHandler.h"
 #include "control/tools/ImageHandler.h"
 #include "control/tools/InputHandler.h"
@ -298,8 +298,8 @@ auto XojPageView::onButtonPressEvent(const PositionInputData& pos) -> bool {
            this->inputHandler = new RulerHandler(this->xournal, this, getPage());
        } else if (h->getDrawingType() == DRAWING_TYPE_RECTANGLE) {
            this->inputHandler = new RectangleHandler(this->xournal, this, getPage());
-        } else if (h->getDrawingType() == DRAWING_TYPE_CIRCLE) {
-            this->inputHandler = new CircleHandler(this->xournal, this, getPage());
+        } else if (h->getDrawingType() == DRAWING_TYPE_ELLIPSE) {
+            this->inputHandler = new EllipseHandler(this->xournal, this, getPage());
        } else if (h->getDrawingType() == DRAWING_TYPE_ARROW) {
            this->inputHandler = new ArrowHandler(this->xournal, this, getPage());
        } else if (h->getDrawingType() == DRAWING_TYPE_COORDINATE_SYSTEM) {
--- a/src/gui/dialog/ButtonConfigGui.cpp
+++ b/src/gui/dialog/ButtonConfigGui.cpp
@ -118,8 +118,8 @@ ButtonConfigGui::ButtonConfigGui(GladeSearchpath* gladeSearchPath, GtkWidget* w,
    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Line"));
    // DRAWING_TYPE_RECTANGLE
    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Rectangle"));
-    // DRAWING_TYPE_CIRCLE
-    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Circle"));
+    // DRAWING_TYPE_ELLIPSE
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Ellipse"));
    // DRAWING_TYPE_ARROW
    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(this->cbDrawingType), _("Draw Arrow"));
    // DRAWING_TYPE_COORDINATE_SYSTEM
@ -294,7 +294,7 @@ void ButtonConfigGui::enableDisableTools() {
        case TOOL_NONE:
        case TOOL_IMAGE:
            // case TOOL_DRAW_RECT:
-            // case TOOL_DRAW_CIRCLE:
+            // case TOOL_DRAW_ELLIPSE:
        case TOOL_SELECT_RECT:
        case TOOL_SELECT_REGION:
        case TOOL_VERTICAL_SPACE:
--- a/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp
+++ b/src/gui/toolbarMenubar/ToolDrawCombocontrol.cpp
@ -26,7 +26,7 @@ ToolDrawCombocontrol::ToolDrawCombocontrol(ToolMenuHandler* toolMenuHandler, Act
    setPopupMenu(gtk_menu_new());

    drawTypes.push_back(new ToolDrawType(_("Draw Rectangle"), "rect-draw", ACTION_TOOL_DRAW_RECT));
-    drawTypes.push_back(new ToolDrawType(_("Draw Circle"), "circle-draw", ACTION_TOOL_DRAW_CIRCLE));
+    drawTypes.push_back(new ToolDrawType(_("Draw Ellipse"), "ellipse-draw", ACTION_TOOL_DRAW_ELLIPSE));
    drawTypes.push_back(new ToolDrawType(_("Draw Arrow"), "arrow-draw", ACTION_TOOL_DRAW_ARROW));
    drawTypes.push_back(new ToolDrawType(_("Draw Line"), "ruler", ACTION_RULER));
    drawTypes.push_back(new ToolDrawType(_("Draw coordinate system"), "coordinate-system-draw",
--- a/src/gui/toolbarMenubar/ToolMenuHandler.cpp
+++ b/src/gui/toolbarMenubar/ToolMenuHandler.cpp
@ -104,8 +104,14 @@ void ToolMenuHandler::load(ToolbarData* d, GtkWidget* toolbar, const char* toolb
                }

                // recognize previous name, V1.0.19 (Dec 2020) and earlier
-                if (name == "HILIGHTER")
+                if (name == "HILIGHTER") {
                    name = "HIGHLIGHTER";
+                }
+
+                // recognize previous name, V1.1.0+dev (Jan 2021) and earlier
+                if (name == "DRAW_CIRCLE") {
+                    name = "DRAW_ELLIPSE";
+                }

                if (name == "SEPARATOR") {
                    GtkToolItem* it = gtk_separator_tool_item_new();
@ -407,7 +413,8 @@ void ToolMenuHandler::initToolItems() {
    ADD_CUSTOM_ITEM_TGL("SHAPE_RECOGNIZER", ACTION_SHAPE_RECOGNIZER, GROUP_RULER, false, "shape_recognizer",
                        _("Shape Recognizer"));
    ADD_CUSTOM_ITEM_TGL("DRAW_RECTANGLE", ACTION_TOOL_DRAW_RECT, GROUP_RULER, false, "rect-draw", _("Draw Rectangle"));
-    ADD_CUSTOM_ITEM_TGL("DRAW_CIRCLE", ACTION_TOOL_DRAW_CIRCLE, GROUP_RULER, false, "circle-draw", _("Draw Circle"));
+    ADD_CUSTOM_ITEM_TGL("DRAW_ELLIPSE", ACTION_TOOL_DRAW_ELLIPSE, GROUP_RULER, false, "ellipse-draw",
+                        _("Draw Ellipse"));
    ADD_CUSTOM_ITEM_TGL("DRAW_ARROW", ACTION_TOOL_DRAW_ARROW, GROUP_RULER, false, "arrow-draw", _("Draw Arrow"));
    ADD_CUSTOM_ITEM_TGL("DRAW_COORDINATE_SYSTEM", ACTION_TOOL_DRAW_COORDINATE_SYSTEM, GROUP_RULER, false,
                        "coordinate-system-draw", _("Draw coordinate system"));
--- a/src/plugin/luapi_application.h
+++ b/src/plugin/luapi_application.h
@ -164,8 +164,8 @@ static int applib_registerUi(lua_State* L) {
 * Example 1: app.uiAction({["action"] = "ACTION_PASTE"})
 * pastes the clipboard content into the document
 *
- * Example 2: app.uiAction({["action"] = "ACTION_TOOL_DRAW_CIRCLE", ["enabled"] = false})
- * turns off the Circle drawing type
+ * Example 2: app.uiAction({["action"] = "ACTION_TOOL_DRAW_ELLIPSE", ["enabled"] = false})
+ * turns off the Ellipse drawing type
 */
 static int applib_uiAction(lua_State* L) {
    Plugin* plugin = Plugin::getPluginFromLua(L);
--- a/ui/icons/hicolor/scalable/actions/ellipse-draw.svg
+++ b/ui/icons/hicolor/scalable/actions/ellipse-draw.svg
--- a/ui/iconsDark/hicolor/scalable/actions/ellipse-draw.svg
+++ b/ui/iconsDark/hicolor/scalable/actions/ellipse-draw.svg
--- a/ui/main.glade
+++ b/ui/main.glade
@ -1358,13 +1358,13 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkCheckMenuItem" id="menuToolsDrawCircle">
-                            <property name="name">menuToolsDrawCircle</property>
+                          <object class="GtkCheckMenuItem" id="menuToolsDrawEllipse">
+                            <property name="name">menuToolsDrawEllipse</property>
                            <property name="visible">True</property>
                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes">Draw Circle</property>
+                            <property name="label" translatable="yes">Draw Ellipse</property>
                            <property name="use-underline">True</property>
-                            <signal name="toggled" handler="ACTION_TOOL_DRAW_CIRCLE" swapped="no"/>
+                            <signal name="toggled" handler="ACTION_TOOL_DRAW_ELLIPSE" swapped="no"/>
                            <accelerator key="3" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                          </object>
                        </child>
--- a/ui/toolbar.ini
+++ b/ui/toolbar.ini
@ -51,7 +51,7 @@ toolbarBottom1 = PAGE_SPIN,SEPARATOR,LAYER,GOTO_FIRST,GOTO_NEXT_ANNOTATED_PAGE,G
 [Right hand Note Taking]
 toolbarTop1=SAVE,NEW,OPEN,SEPARATOR,CUT,COPY,PASTE,SEPARATOR,UNDO,REDO,SEPARATOR,PEN,ERASER,HIGHLIGHTER,IMAGE,TEXT,MATH_TEX,SEPARATOR,DEFAULT_TOOL,SEPARATOR,INSERT_NEW_PAGE,DELETE_CURRENT_PAGE,SEPARATOR,GOTO_BACK,GOTO_NEXT,SEPARATOR,FULLSCREEN,SEPARATOR,AUDIO_RECORDING,AUDIO_SEEK_BACKWARDS,AUDIO_PAUSE_PLAYBACK,AUDIO_STOP_PLAYBACK,AUDIO_SEEK_FORWARDS
 toolbarLeft1=COLOR(0xffffff),COLOR(0xffff00),COLOR(0xff8000),COLOR(0xff00ff),COLOR(0x00ff00),COLOR(0x00c0ff),COLOR(0x808080),COLOR(0x008000),COLOR(0xff0000),COLOR(0x3333cc),COLOR(0x000000),COLOR_SELECT,SEPARATOR,PRESENTATION_MODE,ZOOM_100,ZOOM_FIT,ZOOM_IN,ZOOM_OUT
-toolbarLeft2=FINE,MEDIUM,THICK,SEPARATOR,TOOL_FILL,SEPARATOR,DRAW_CIRCLE,DRAW_RECTANGLE,DRAW_ARROW,RULER,SEPARATOR,ROTATION_SNAPPING,GRID_SNAPPING,SEPARATOR,VERTICAL_SPACE,SELECT_REGION,SELECT_RECTANGLE,SELECT_OBJECT,PLAY_OBJECT
+toolbarLeft2=FINE,MEDIUM,THICK,SEPARATOR,TOOL_FILL,SEPARATOR,DRAW_ELLIPSE,DRAW_RECTANGLE,DRAW_ARROW,RULER,SEPARATOR,ROTATION_SNAPPING,GRID_SNAPPING,SEPARATOR,VERTICAL_SPACE,SELECT_REGION,SELECT_RECTANGLE,SELECT_OBJECT,PLAY_OBJECT
 name=Right hand Note Taking
 name[it] = Appunti per Destrorsi
 name[ru] = Заметки правой рукой
@ -78,7 +78,7 @@ name[ru] = Плавающая панель инструментов (экспе
 toolbarTop1 = SAVE,NEW,OPEN,SEPARATOR, CUT,COPY,PASTE,SEPARATOR,ERASER,IMAGE,TEXT,MATH_TEX,DRAW,SEPARATOR, SELECT,VERTICAL_SPACE,HAND,SEPARATOR, DEFAULT_TOOL,SEPARATOR, PAGE_SPIN,SEPARATOR, GOTO_FIRST,GOTO_NEXT_ANNOTATED_PAGE,GOTO_LAST,INSERT_NEW_PAGE,DELETE_CURRENT_PAGE,SEPARATOR, LAYER,FULLSCREEN
 toolbarLeft1 = COLOR(0xffffff),COLOR(0xffff00),COLOR(0xff8000),COLOR(0xff00ff),COLOR(0x00ff00),COLOR(0x00c0ff),COLOR(0x808080),COLOR(0x008000),COLOR(0xff0000),COLOR(0x3333cc),COLOR(0x000000),COLOR_SELECT,SEPARATOR, SEPARATOR,PAIRED_PAGES,PRESENTATION_MODE,ZOOM_100,ZOOM_FIT,ZOOM_OUT,ZOOM_IN
 toolbarFloat1=PEN,HIGHLIGHTER,UNDO
-toolbarFloat2=ZOOM_SLIDER,DRAW_CIRCLE
+toolbarFloat2=ZOOM_SLIDER,DRAW_ELLIPSE
 toolbarFloat3=TOOL_FILL,FINE,THICK,DRAW_RECTANGLE
 toolbarFloat4=COLOR(0x000000),COLOR(0xffff00),COLOR(0xff0000),COLOR(0x00ff00),DRAW_ARROW