Add select all feature

mitchcurtis · Jul 1, 2017 · 0273ef8 · 0273ef8
1 parent 11cd8ab
commit 0273ef8
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 1 deletion.
diff --git a/app/imagecanvas.cpp b/app/imagecanvas.cpp
@@ -1001,6 +1001,17 @@ void ImageCanvas::paste()
     update();
 }
 
+void ImageCanvas::selectAll()
+{
+    if (mTool == SelectionTool) {
+        clearOrConfirmSelection();
+    } else {
+        setTool(SelectionTool);
+    }
+
+    setSelectionArea(QRect(0, 0, mProject->widthInPixels(), mProject->heightInPixels()));
+}
+
 void ImageCanvas::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     QQuickItem::geometryChanged(newGeometry, oldGeometry);

diff --git a/app/imagecanvas.h b/app/imagecanvas.h
@@ -199,6 +199,7 @@ public slots:
     void flipSelection(Qt::Orientation orientation);
     void copySelection();
     void paste();
+    void selectAll();
 
 protected slots:
     virtual void reset();

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -30,7 +30,6 @@ import "ui" as Ui
 
 /*
     TODO:
-    - Ctrl+A selection when selection tool active
     - rulers, guides
     - Fill-all-of-this-colour tool
     - fix performance when drawing pixels

diff --git a/app/qml/ui/+windows/MenuBar.qml b/app/qml/ui/+windows/MenuBar.qml
@@ -116,6 +116,15 @@ RowLayout {
 
             MenuSeparator {}
 
+            MenuItem {
+                objectName: "selectAllMenuButton"
+                text: qsTr("Select All")
+                onTriggered: canvas.selectAll()
+                enabled: isImageProjectType && canvas
+            }
+
+            MenuSeparator {}
+
             MenuItem {
                 objectName: "copyMenuButton"
                 text: qsTr("Copy")

diff --git a/app/qml/ui/MenuBar.qml b/app/qml/ui/MenuBar.qml
@@ -99,6 +99,15 @@ Platform.MenuBar {
 
         Platform.MenuSeparator {}
 
+        Platform.MenuItem {
+            objectName: "selectAllMenuButton"
+            text: qsTr("Select All")
+            onTriggered: canvas.selectAll()
+            enabled: isImageProjectType && canvas
+        }
+
+        Platform.MenuSeparator {}
+
         Platform.MenuItem {
             objectName: "flipHorizontallyMenuButton"
             text: qsTr("Flip Horizontally")

diff --git a/app/qml/ui/Shortcuts.qml b/app/qml/ui/Shortcuts.qml
@@ -96,6 +96,13 @@ Item {
         enabled: isImageProjectType && canvasHasActiveFocus
     }
 
+    Shortcut {
+        objectName: "selectAllShortcut"
+        sequence: StandardKey.SelectAll
+        onActivated: canvas.selectAll()
+        enabled: isImageProjectType && canvasHasActiveFocus
+    }
+
     Shortcut {
         objectName: "gridVisibleShortcut"
         sequence: settings.gridVisibleShortcut