Add note tool

Closes #136.
mitchcurtis · Oct 20, 2019 · 923ec40 · 923ec40
1 parent 66fb52d
commit 923ec40
Show file tree

Hide file tree

Showing 48 changed files with 2,077 additions and 269 deletions.
diff --git a/app/images/images.qrc b/app/images/images.qrc
@@ -45,6 +45,10 @@
         <file>lock-splitter@2x.png</file>
         <file>lock-splitter@3x.png</file>
         <file>lock-splitter@4x.png</file>
+        <file>note.png</file>
+        <file>note@2x.png</file>
+        <file>note@3x.png</file>
+        <file>note@4x.png</file>
         <file>opacity.png</file>
         <file>opacity@2x.png</file>
         <file>opacity@3x.png</file>
@@ -65,6 +69,10 @@
         <file>show-guides@2x.png</file>
         <file>show-guides@3x.png</file>
         <file>show-guides@4x.png</file>
+        <file>show-notes.png</file>
+        <file>show-notes@2x.png</file>
+        <file>show-notes@3x.png</file>
+        <file>show-notes@4x.png</file>
         <file>show-rulers.png</file>
         <file>show-rulers@2x.png</file>
         <file>show-rulers@3x.png</file>

diff --git a/app/images/note.png b/app/images/note.png
diff --git a/app/images/note.svg b/app/images/note.svg
diff --git a/app/images/note@2x.png b/app/images/note@2x.png
diff --git a/app/images/note@3x.png b/app/images/note@3x.png
diff --git a/app/images/note@4x.png b/app/images/note@4x.png
diff --git a/app/images/show-guides.svg b/app/images/show-guides.svg
diff --git a/app/images/show-notes.png b/app/images/show-notes.png
diff --git a/app/images/show-notes.svg b/app/images/show-notes.svg
diff --git a/app/images/show-notes@2x.png b/app/images/show-notes@2x.png
diff --git a/app/images/show-notes@3x.png b/app/images/show-notes@3x.png
diff --git a/app/images/show-notes@4x.png b/app/images/show-notes@4x.png
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -149,6 +149,17 @@ ApplicationWindow {
     Connections {
         target: canvas
         onErrorOccurred: errorPopup.showError(errorMessage)
+        onNoteCreationRequested: {
+            noteDialog.currentAction = Ui.NoteDialog.NoteAction.Create
+            noteDialog.newNoteX = canvas.cursorSceneX
+            noteDialog.newNoteY = canvas.cursorSceneY
+            noteDialog.open()
+        }
+        onNoteModificationRequested: {
+            noteDialog.currentAction = Ui.NoteDialog.NoteAction.Modify
+            noteDialog.modifyingNoteIndex = noteIndex
+            noteDialog.open()
+        }
     }
 
     Ui.UiStateSerialisation {
@@ -485,6 +496,14 @@ ApplicationWindow {
         canvas: window.canvas
     }
 
+    Ui.NoteDialog {
+        id: noteDialog
+        parent: Overlay.overlay
+        anchors.centerIn: parent
+        project: projectManager.project
+        canvas: window.canvas
+    }
+
     Ui.AboutDialog {
         id: aboutDialog
         parent: Overlay.overlay

diff --git a/app/qml/qml.qbs b/app/qml/qml.qbs
@@ -52,6 +52,7 @@ Group {
             "ui/NewLayeredImageProjectPopup.qml",
             "ui/NewProjectPopup.qml",
             "ui/NewTilesetProjectPopup.qml",
+            "ui/NoteDialog.qml",
             "ui/OpacityDialog.qml",
             "ui/OptionsDialog.qml",
             "ui/Panel.qml",

diff --git a/app/qml/qml.qrc b/app/qml/qml.qrc
@@ -36,6 +36,7 @@
         <file>ui/NewLayeredImageProjectPopup.qml</file>
         <file>ui/NewProjectPopup.qml</file>
         <file>ui/NewTilesetProjectPopup.qml</file>
+        <file>ui/NoteDialog.qml</file>
         <file>ui/OpacityDialog.qml</file>
         <file>ui/OptionsDialog.qml</file>
         <file>ui/Panel.qml</file>

diff --git a/app/qml/ui/CanvasPaneRepeater.qml b/app/qml/ui/CanvasPaneRepeater.qml
@@ -14,7 +14,6 @@ Repeater {
     /*
         The stacking order for child items of ImageCanvas is as follows:
 
-
          +--------------------------+
          | ImageCanvas (parent)     |
          |   +--------------------------+
@@ -24,27 +23,29 @@ Repeater {
          |   |   |   +--------------------------+
          |   |   |   | Guides                   |
          |   |   |   |   +--------------------------+
-         +---|   |   |   | Selection Item
-             |   |   |   |   +--------------------------+
-             | 1 |   |   |   | Selection Cursor Guide   |
-             +---|   |   |   |   +--------------------------+
-                 | 2 |   |   |   | First Horizontal Ruler   |
-                 +---|   |   |   |   +--------------------------+
-                     | 3 |   |   |   | First Vertical Ruler     |
-                     +---|   |   |   |   +--------------------------+
-                         | 4 |   |   |   | Second Horizontal Ruler  |
-                         +---|   |   |   |   +--------------------------+
-                             | 5 |   |   |   | Second Vertical Ruler    |
-                             +---|   |   |   |                          |
-                                 | 6 |   |   |                          |
-                                 +---|   |   |                          |
-                                     | 7 |   |                          |
-                                     +---|   |                          |
-                                         | 8 |                          |
-                                         +---|                          |
-                                             | 9                        |
-                                             +--------------------------+
-
+         |   |   |   |   | Selection Item           |
+         |   |   |   |   |   +--------------------------+
+         +---|   |   |   |   | Selection Cursor Guide   |
+             |   |   |   |   |   +--------------------------+
+             | 1 |   |   |   |   | First Horizontal Ruler   |
+             +---|   |   |   |   |   +--------------------------+
+                 | 2 |   |   |   |   | First Vertical Ruler     |
+                 +---|   |   |   |   |   +--------------------------+
+                     | 3 |   |   |   |   | Second Horizontal Ruler  |
+                     +---|   |   |   |   |   +--------------------------+
+                         | 4 |   |   |   |   | Second Vertical Ruler    |
+                         +---|   |   |   |   |   +--------------------------+
+                             | 5 |   |   |   |   | Notes                    |
+                             +---|   |   |   |   |                          |
+                                 | 6 |   |   |   |                          |
+                                 +---|   |   |   |                          |
+                                     | 7 |   |   |                          |
+                                     +---|   |   |                          |
+                                         | 8 |   |                          |
+                                         +---|   |                          |
+                                             | 9 |                          |
+                                             +---| 10                       |
+                                                 |--------------------------+
 
         Each item is a direct child of ImageCanvas.
 

diff --git a/app/qml/ui/ImageTypeCanvas.qml b/app/qml/ui/ImageTypeCanvas.qml
@@ -29,9 +29,9 @@ ImageCanvas {
 
     readonly property int currentPaneZoomLevel: imageCanvas.currentPane ? imageCanvas.currentPane.integerZoomLevel : 1
     readonly property point currentPaneOffset: imageCanvas.currentPane ? imageCanvas.currentPane.integerOffset : Qt.point(0, 0)
-    readonly property bool useCrosshairCursor: imageCanvas.tool === TileCanvas.SelectionTool
+    readonly property bool useCrosshairCursor: imageCanvas.tool === ImageCanvas.SelectionTool || imageCanvas.tool === ImageCanvas.NoteTool
         || (imageCanvas.toolSize < 4 && imageCanvas.currentPaneZoomLevel <= 3)
-    readonly property bool useIconCursor: imageCanvas.tool === TileCanvas.EyeDropperTool
+    readonly property bool useIconCursor: imageCanvas.tool === ImageCanvas.EyeDropperTool
 
     onErrorOccurred: errorPopup.showError(errorMessage)
 

diff --git a/app/qml/ui/LayeredImageTypeCanvas.qml b/app/qml/ui/LayeredImageTypeCanvas.qml
@@ -29,7 +29,7 @@ LayeredImageCanvas {
 
     readonly property int currentPaneZoomLevel: layeredCanvas.currentPane ? layeredCanvas.currentPane.integerZoomLevel : 1
     readonly property point currentPaneOffset: layeredCanvas.currentPane ? layeredCanvas.currentPane.integerOffset : Qt.point(0, 0)
-    readonly property bool useCrosshairCursor: layeredCanvas.tool === ImageCanvas.SelectionTool
+    readonly property bool useCrosshairCursor: layeredCanvas.tool === ImageCanvas.SelectionTool || layeredCanvas.tool === ImageCanvas.NoteTool
         || (layeredCanvas.toolSize < 4 && layeredCanvas.currentPaneZoomLevel <= 3)
     readonly property bool useIconCursor: layeredCanvas.tool === ImageCanvas.EyeDropperTool