Merge.

--HG--
branch : develop

scripts/generate_tool_cursor.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# usage:
+# $ ./generate_tool_cursor.sh
+
+PATTERN=*@2x.png
+TOOLICONPATH=../src/app/valentina/share/resources/toolicon/32x32/
+TOOLICONS=`ls $TOOLICONPATH$PATTERN`
+OUTPATH=../src/app/valentina/share/resources/cursor/svg
+
+
+for var in $TOOLICONS
+do
+	basename=${var##*/}
+	basename=${basename%.png}
+	basename=${basename%@2x} # remove optional @2x suffix
+	if [ ! -f $basename@2x.png ]; then # always prefere hidpi version
+		sed "s/<<basename>>/$basename@2x/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg
+	else
+		sed "s/<<basename>>/$basename/" $OUTPATH/template_cursor.svg > $OUTPATH/${basename}_cursor.svg
+	fi
+done

src/app/valentina/mainwindow.cpp

@@ -560,7 +560,17 @@ void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cur
         CancelTool();
         emit EnableItemMove(false);
         currentTool = lastUsedTool = t;
-        QPixmap pixmap(cursor);
+        auto cursorResource = cursor;
+        if (qApp->devicePixelRatio() >= 2)
+        {
+            // Try to load HiDPI versions of the cursors if availible
+            auto cursorHidpiResource = QString(cursor).replace(".png", "@2x.png");
+            if (QFileInfo(cursorResource).exists())
+            {
+                cursorResource = cursorHidpiResource;
+            }
+        }
+        QPixmap pixmap(cursorResource);
         QCursor cur(pixmap, 2, 3);
         ui->view->setCursor(cur);
         ui->view->setShowToolOptions(false);
@@ -951,6 +961,17 @@ void MainWindow::ToolCurveIntersectAxis(bool checked)
                                                      &MainWindow::ApplyDialog<VToolCurveIntersectAxis>);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void MainWindow::ToolArcIntersectAxis(bool checked)
+{
+    // Reuse ToolCurveIntersectAxis but with different cursor and tool tip
+    SetToolButtonWithApply<DialogCurveIntersectAxis>(checked, Tool::CurveIntersectAxis,
+                                                     ":/cursor/arc_intersect_axis_cursor.png",
+                                                     tr("Select arc"),
+                                                     &MainWindow::ClosedDialogWithApply<VToolCurveIntersectAxis>,
+                                                     &MainWindow::ApplyDialog<VToolCurveIntersectAxis>);
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::ToolPointOfIntersectionArcs(bool checked)
 {
@@ -1537,7 +1558,7 @@ void MainWindow::InitToolButtons()
     connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc);
     connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis);
     connect(ui->toolButtonCurveIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis);
-    connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis);
+    connect(ui->toolButtonArcIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolArcIntersectAxis);
     connect(ui->toolButtonLayoutSettings, &QToolButton::clicked, this, &MainWindow::ToolLayoutSettings);
     connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this,
             &MainWindow::ToolPointOfIntersectionArcs);

src/app/valentina/mainwindow.h

@@ -122,6 +122,7 @@ public slots:
     void               ToolCutArc(bool checked);
     void               ToolLineIntersectAxis(bool checked);
     void               ToolCurveIntersectAxis(bool checked);
+    void               ToolArcIntersectAxis(bool checked);
     void               ToolPointOfIntersectionArcs(bool checked);
     void               ToolPointOfIntersectionCircles(bool checked);
     void               ToolPointFromCircleAndTangent(bool checked);

src/app/valentina/share/resources/cursor.qrc

@@ -30,5 +30,33 @@
         <file>cursor/point_from_arc_and_tangent_cursor.png</file>
         <file>cursor/arc_with_length_cursor.png</file>
         <file>cursor/true_darts_cursor.png</file>
+        <file>cursor/alongline_cursor@2x.png</file>
+        <file>cursor/arc_cursor@2x.png</file>
+        <file>cursor/arc_cut_cursor@2x.png</file>
+        <file>cursor/arc_intersect_axis_cursor@2x.png</file>
+        <file>cursor/arc_with_length_cursor@2x.png</file>
+        <file>cursor/bisector_cursor@2x.png</file>
+        <file>cursor/curve_intersect_axis_cursor@2x.png</file>
+        <file>cursor/endline_cursor@2x.png</file>
+        <file>cursor/height_cursor@2x.png</file>
+        <file>cursor/intersect_cursor@2x.png</file>
+        <file>cursor/line_cursor@2x.png</file>
+        <file>cursor/line_intersect_axis_cursor@2x.png</file>
+        <file>cursor/new_detail_cursor@2x.png</file>
+        <file>cursor/normal_cursor@2x.png</file>
+        <file>cursor/point_from_arc_and_tangent_cursor@2x.png</file>
+        <file>cursor/point_from_circle_and_tangent_cursor@2x.png</file>
+        <file>cursor/point_of_intersection_circles@2x.png</file>
+        <file>cursor/pointcontact_cursor@2x.png</file>
+        <file>cursor/pointofintersect_cursor@2x.png</file>
+        <file>cursor/shoulder_cursor@2x.png</file>
+        <file>cursor/spline_cursor@2x.png</file>
+        <file>cursor/spline_cut_point_cursor@2x.png</file>
+        <file>cursor/splinepath_cursor@2x.png</file>
+        <file>cursor/splinepath_cut_point_cursor@2x.png</file>
+        <file>cursor/true_darts_cursor@2x.png</file>
+        <file>cursor/union_cursor@2x.png</file>
+        <file>cursor/triangle_cursor@2x.png</file>
+        <file>cursor/point_of_intersection_arcs@2x.png</file>
     </qresource>
 </RCC>

src/app/valentina/share/resources/cursor/svg/template_cursor.svg

@@ -0,0 +1,75 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 31.999999 32.000001"
+   id="svg4749"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-xdpi="180"
+   inkscape:export-ydpi="180">
+  <defs
+     id="defs4751" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.96875"
+     inkscape:cx="15.439298"
+     inkscape:cy="10.15269"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="1001"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4754">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <image
+       xlink:href="../../toolicon/32x32/<<basename>>.png"
+       width="15"
+       height="15"
+       preserveAspectRatio="none"
+       id="image4213"
+       x="16.5"
+       y="17" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 2.4999987,2.5 0.063,24 6.937,-6 11,0 z"
+       id="path4873"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

src/app/valentina/share/resources/toolicon.qrc

@@ -28,5 +28,35 @@
         <file>toolicon/32x32/new_detail.png</file>
         <file>toolicon/32x32/arc_with_length.png</file>
         <file>toolicon/32x32/true_darts.png</file>
+        <file>toolicon/32x32/along_line@2x.png</file>
+        <file>toolicon/32x32/arc_cut@2x.png</file>
+        <file>toolicon/32x32/arc_intersect_axis@2x.png</file>
+        <file>toolicon/32x32/arc_with_length@2x.png</file>
+        <file>toolicon/32x32/arc@2x.png</file>
+        <file>toolicon/32x32/bisector@2x.png</file>
+        <file>toolicon/32x32/curve_intersect_axis@2x.png</file>
+        <file>toolicon/32x32/height@2x.png</file>
+        <file>toolicon/32x32/intersect@2x.png</file>
+        <file>toolicon/32x32/line_intersect_axis@2x.png</file>
+        <file>toolicon/32x32/line@2x.png</file>
+        <file>toolicon/32x32/new_detail@2x.png</file>
+        <file>toolicon/32x32/normal@2x.png</file>
+        <file>toolicon/32x32/point_from_arc_and_tangent@2x.png</file>
+        <file>toolicon/32x32/point_from_circle_and_tangent@2x.png</file>
+        <file>toolicon/32x32/point_of_contact@2x.png</file>
+        <file>toolicon/32x32/point_of_intersection_arcs@2x.png</file>
+        <file>toolicon/32x32/point_of_intersection_circles@2x.png</file>
+        <file>toolicon/32x32/point_of_intersection@2x.png</file>
+        <file>toolicon/32x32/segment@2x.png</file>
+        <file>toolicon/32x32/shoulder@2x.png</file>
+        <file>toolicon/32x32/spline_cut_point@2x.png</file>
+        <file>toolicon/32x32/spline@2x.png</file>
+        <file>toolicon/32x32/splinePath_cut_point 2.png</file>
+        <file>toolicon/32x32/splinePath_cut_point copy.png</file>
+        <file>toolicon/32x32/splinePath_cut_point@2x.png</file>
+        <file>toolicon/32x32/splinePath@2x.png</file>
+        <file>toolicon/32x32/true_darts@2x.png</file>
+        <file>toolicon/32x32/union@2x.png</file>
+        <file>toolicon/32x32/triangle@2x.png</file>
     </qresource>
 </RCC>