Merge pull request #1080 from FashionFreedom/improve-toolicon-and-cursor

feat:  improve intersect arc line icon and cursor

src/app/seamly2d/dialogs/groups_widget.cpp

@@ -863,7 +863,7 @@ void GroupsWidget::addGroupItem(const quint32 &toolId, const quint32 &objId, con
                 }
 
                 case Tool::PointOfContact:
-                    iconFileName = ":/toolicon/32x32/point_of_contact.png";
+                    iconFileName = ":/toolicon/32x32/point_intersect_arc_line.png";
                     objName = tr("%1 - Point Intersect Arc & Line").arg(getPointName(toolId));
                     break;
 

src/app/seamly2d/dialogs/history_dialog.cpp

@@ -422,7 +422,7 @@ RowData HistoryDialog::record(const VToolRecord &tool)
             }
 
             case Tool::PointOfContact:
-                rowData.icon = ":/toolicon/32x32/point_of_contact.png";
+                rowData.icon = ":/toolicon/32x32/point_intersect_arc_line.png";
                 rowData.name = tr("%1").arg(getPointName(toolId));
                 rowData.tool = tr("Point Intersect Arc with center %1 & Line %2_%3")
                                   .arg(getPointName(attrUInt(domElement, AttrCenter)))

src/app/seamly2d/mainwindow.cpp

@@ -980,7 +980,7 @@ void MainWindow::handlePointOfContactTool(bool checked)
     SetToolButtonWithApply<DialogPointOfContact>
     (
         checked, Tool::PointOfContact,
-        ":/cursor/pointcontact_cursor.png",
+        ":/cursor/point_intersect_arc_line_cursor.png",
         tr("<b>Tool::Point - Intersect Arc and Line:</b> Select first point of line"),
         &MainWindow::ClosedDrawDialogWithApply<VToolPointOfContact>,
         &MainWindow::ApplyDrawDialog<VToolPointOfContact>
@@ -2798,7 +2798,7 @@ void MainWindow::handlePointsMenu()
     QAction *action_AlongPerpendicular  = menu.addAction(QIcon(":/toolicon/32x32/normal.png"),                 tr("On Perpendicular") + "\tO, P");
     QAction *action_Bisector            = menu.addAction(QIcon(":/toolicon/32x32/bisector.png"),               tr("On Bisector") + "\tO, B");
     QAction *action_Shoulder            = menu.addAction(QIcon(":/toolicon/32x32/shoulder.png"),               tr("Length to Line") + "\tP, S");
-    QAction *action_PointOfContact      = menu.addAction(QIcon(":/toolicon/32x32/point_of_contact.png"),       tr("Intersect Arc and Line") + "\tA, L");
+    QAction *action_PointOfContact      = menu.addAction(QIcon(":/toolicon/32x32/point_intersect_arc_line.png"),       tr("Intersect Arc and Line") + "\tA, L");
     QAction *action_Triangle            = menu.addAction(QIcon(":/toolicon/32x32/triangle.png"),               tr("Intersect Axis and Triangle") + "\tX, T");
     QAction *action_PointIntersectXY    = menu.addAction(QIcon(":/toolicon/32x32/point_intersectxy_icon.png"), tr("Intersect XY") + "\tX, Y");
     QAction *action_PerpendicularPoint  = menu.addAction(QIcon(":/toolicon/32x32/height.png"),                 tr("Intersect Line and Perpendicular") + "\tL, P");

src/app/seamly2d/mainwindow.ui

@@ -1024,7 +1024,7 @@
                </property>
                <property name="icon">
                 <iconset resource="share/resources/toolicon.qrc">
-                 <normaloff>:/toolicon/32x32/point_of_contact.png</normaloff>:/toolicon/32x32/point_of_contact.png</iconset>
+                 <normaloff>:/toolicon/32x32/point_intersect_arc_line.png</normaloff>:/toolicon/32x32/point_intersect_arc_line.png</iconset>
                </property>
                <property name="iconSize">
                 <size>
@@ -3081,7 +3081,7 @@
    </property>
    <property name="icon">
     <iconset resource="share/resources/toolicon.qrc">
-     <normaloff>:/toolicon/32x32/point_of_contact.png</normaloff>:/toolicon/32x32/point_of_contact.png</iconset>
+     <normaloff>:/toolicon/32x32/point_intersect_arc_line.png</normaloff>:/toolicon/32x32/point_intersect_arc_line.png</iconset>
    </property>
    <property name="text">
     <string>Intersect  Arc and Line</string>

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

@@ -20,8 +20,6 @@
         <file>cursor/arc_cursor@2x.png</file>
         <file>cursor/splinepath_cursor.png</file>
         <file>cursor/splinepath_cursor@2x.png</file>
-        <file>cursor/pointcontact_cursor.png</file>
-        <file>cursor/pointcontact_cursor@2x.png</file>
         <file>cursor/new_piece_cursor.png</file>
         <file>cursor/new_piece_cursor@2x.png</file>
         <file>cursor/height_cursor.png</file>
@@ -86,5 +84,7 @@
         <file>cursor/group_cursor@2x.png</file>
         <file>cursor/insert_nodes_cursor.png</file>
         <file>cursor/insert_nodes_cursor@2x.png</file>
+        <file>cursor/point_intersect_arc_line_cursor.png</file>
+        <file>cursor/point_intersect_arc_line_cursor@2x.png</file>
     </qresource>
 </RCC>

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

@@ -27,8 +27,6 @@
         <file>toolicon/32x32/point_from_arc_and_tangent@2x.png</file>
         <file>toolicon/32x32/point_from_circle_and_tangent.png</file>
         <file>toolicon/32x32/point_from_circle_and_tangent@2x.png</file>
-        <file>toolicon/32x32/point_of_contact.png</file>
-        <file>toolicon/32x32/point_of_contact@2x.png</file>
         <file>toolicon/32x32/point_intersectxy_icon.png</file>
         <file>toolicon/32x32/point_intersectxy_icon@2x.png</file>
         <file>toolicon/32x32/point_of_intersection_arcs.png</file>
@@ -104,5 +102,7 @@
         <file>toolicon/32x32/insert_nodes_icon@2x.png</file>
         <file>toolicon/32x32/point_basepoint_icon.png</file>
         <file>toolicon/32x32/point_basepoint_icon@2x.png</file>
+        <file>toolicon/32x32/point_intersect_arc_line.png</file>
+        <file>toolicon/32x32/point_intersect_arc_line@2x.png</file>
     </qresource>
 </RCC>

src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp

@@ -86,7 +86,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    setWindowIcon(QIcon(":/toolicon/32x32/point_of_contact.png"));
+    setWindowIcon(QIcon(":/toolicon/32x32/point_intersect_arc_line.png"));
 
     ui->lineEditNamePoint->setClearButtonEnabled(true);