From 000bbd454ef5888c82a5e21013a3a52ce91f7f2b Mon Sep 17 00:00:00 2001 From: Benjamin Nauck Date: Sat, 2 Jan 2016 23:57:26 +0100 Subject: [PATCH] Use same icon on cursor as it is on the tool button for the arc intersect axis tool --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 13 ++++++++++++- src/app/valentina/mainwindow.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 007b84b7c..6df063274 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -951,6 +951,17 @@ void MainWindow::ToolCurveIntersectAxis(bool checked) &MainWindow::ApplyDialog); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ToolArcIntersectAxis(bool checked) +{ + // Reuse ToolCurveIntersectAxis but with different cursor and tool tip + SetToolButtonWithApply(checked, Tool::CurveIntersectAxis, + ":/cursor/arc_intersect_axis_cursor.png", + tr("Select arc"), + &MainWindow::ClosedDialogWithApply, + &MainWindow::ApplyDialog); +} + //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolPointOfIntersectionArcs(bool checked) { @@ -1537,7 +1548,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); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 3411c3bc1..0aa106f60 100644 --- a/src/app/valentina/mainwindow.h +++ b/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);