Merge pull request #333 from ales-erjavec/annotations-in-menu

schemeedit: Add Text and Arrow annotations to Edit menu

Author: janezd

i18n/si/msgs.jaml

@@ -1914,6 +1914,8 @@ document/schemeedit.py:
             Add a text annotation to the workflow.: V delotok dodaj besedilno oznako.
             Font Size: Velikost pisave
             %ipx: false
+            Text Annotation: Besedilna oznaka
+            new-quick-text-annotation-action: false
             Arrow: Puščica
             new-arrow-action: false
             Add a arrow annotation to the workflow.: V delotok dodaj oznako s puščico.
@@ -1923,6 +1925,8 @@ document/schemeedit.py:
             '#662D91': false
             '#1F9CDF': false
             '#39B54A': false
+            Arrow Annotation: Puščična oznaka
+            new-quick-arrow-annotation-action: false
             undo-action: false
             redo-action: false
             Select all: Izberi vse
@@ -2018,6 +2022,8 @@ document/schemeedit.py:
             Canceled new arrow annotation: false
         def `__toggleNewTextAnnotation`:
             Canceled new text annotation: false
+        def `__triggerNewTextAnnotation`:
+              text/markdown: false
         def `__onHelpAction`:
             help://search?: false
             id: false

orangecanvas/document/schemeedit.py

@@ -35,7 +35,7 @@
     QWhatsThisClickedEvent, QKeyEvent, QPalette
 )
 from AnyQt.QtCore import (
-    Qt, QObject, QEvent, QSignalMapper, QCoreApplication, QPointF,
+    Qt, QObject, QEvent, QSignalMapper, QCoreApplication, QPointF, QRectF,
     QMimeData, Slot)
 from AnyQt.QtCore import pyqtProperty as Property, pyqtSignal as Signal
 
@@ -51,7 +51,7 @@
 )
 from ..scheme import (
     scheme, signalmanager, Scheme, SchemeNode, SchemeLink,
-    BaseSchemeAnnotation, SchemeTextAnnotation, WorkflowEvent
+    BaseSchemeAnnotation, SchemeTextAnnotation, WorkflowEvent, SchemeArrowAnnotation
 )
 from ..scheme.widgetmanager import WidgetManager
 from ..canvas.scene import CanvasScene
@@ -224,6 +224,9 @@ def __init__(self, parent=None, ):
         self.__editMenu.addAction(self.__copySelectedAction)
         self.__editMenu.addAction(self.__pasteAction)
         self.__editMenu.addAction(self.__selectAllAction)
+        self.__editMenu.addSeparator()
+        self.__editMenu.addAction(self.__newQuickTextAnnotationAction)
+        self.__editMenu.addAction(self.__newQuickArrowAnnotationAction)
 
         # Widget context menu
         self.__widgetMenu = QMenu(self.tr("Widget"), self)
@@ -293,6 +296,13 @@ def font(size):
 
         self.__newTextAnnotationAction.setMenu(self.__fontMenu)
 
+        self.__newQuickTextAnnotationAction = QAction(
+            self.tr("Text Annotation"), self,
+            objectName="new-quick-text-annotation-action",
+            toolTip=self.tr("Add a text annotation to the workflow."),
+            triggered=self.__triggerNewTextAnnotation
+        )
+
         self.__newArrowAnnotationAction = QAction(
             self.tr("Arrow"), self,
             objectName="new-arrow-action",
@@ -332,6 +342,13 @@ def color_icon(color):
 
         self.__newArrowAnnotationAction.setMenu(self.__arrowColorMenu)
 
+        self.__newQuickArrowAnnotationAction = QAction(
+            self.tr("Arrow Annotation"), self,
+            objectName="new-quick-arrow-annotation-action",
+            toolTip=self.tr("Add a arrow annotation to the workflow."),
+            triggered=self.__triggerNewArrowAnnotation,
+        )
+
         self.__undoAction = self.__undoStack.createUndoAction(self)
         self.__undoAction.setShortcut(QKeySequence.Undo)
         self.__undoAction.setObjectName("undo-action")
@@ -1959,6 +1976,38 @@ def __onArrowColorTriggered(self, action):
             if isinstance(handler, interactions.NewArrowAnnotation):
                 handler.setColor(action.data())
 
+    def __triggerNewTextAnnotation(self):
+        """Place a text annotation at the center of the view"""
+        center = self.view().viewport().rect().center()
+        center = self.view().mapToScene(center)
+        rect = QRectF(0, 0, 300, 150)
+        rect.moveCenter(center)
+        annotation = SchemeTextAnnotation(
+            (rect.x(), rect.y(), rect.width(), rect.height()),
+            content_type="text/markdown",
+        )
+        self.addAnnotation(annotation)
+        # Give edit focus
+        item = self.scene().item_for_annotation(annotation)
+        item.setFocus(Qt.OtherFocusReason)
+        item.setSelected(True)
+        item.startEdit()
+
+    def __triggerNewArrowAnnotation(self):
+        """Place an arrow annotation at the center of the view"""
+        center = self.view().viewport().rect().center()
+        center = self.view().mapToScene(center)
+
+        annotation = SchemeArrowAnnotation(
+            (center.x() - 100, center.y()), (center.x() + 100, center.y()),
+            color=self.__arrowColorActionGroup.checkedAction().data()
+        )
+        self.addAnnotation(annotation)
+        # Give edit focus
+        item = self.scene().item_for_annotation(annotation)
+        item.setFocus(Qt.OtherFocusReason)
+        item.setSelected(True)
+
     def __onRenameAction(self):
         # type: () -> None
         """

orangecanvas/document/tests/test_schemeedit.py

@@ -310,6 +310,24 @@ def test_text_annotation_action_cancel(self):
         w.scene().setFocusItem(None)
         self.assertEqual(workflow.annotations, [])
 
+    def test_quick_text_annotation_action(self):
+        w = self.w
+        workflow = w.scheme()
+        edit_menu, *_ = w.menuBarActions()
+        actions = edit_menu.menu().actions()
+        action = action_by_name(actions, "new-quick-text-annotation-action")
+        action.trigger()
+        self.assertEqual(len(workflow.annotations), 1)
+
+    def test_quick_arrow_annotation_action(self):
+        w = self.w
+        workflow = w.scheme()
+        edit_menu, *_ = w.menuBarActions()
+        actions = edit_menu.menu().actions()
+        action = action_by_name(actions, "new-quick-arrow-annotation-action")
+        action.trigger()
+        self.assertEqual(len(workflow.annotations), 1)
+
     def test_path(self):
         w = self.w
         spy = QSignalSpy(w.pathChanged)