aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in nauck/valentina/feature (pull request #90)

Browse Source 
Fix issue #431

--HG--
branch : develop
This commit is contained in:
Roman Telezhinskyi 2016-01-03 10:28:57 +02:00
commit e90db08842
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/valentina/mainwindow.cpp
View File

@ -961,6 +961,17 @@ void MainWindow::ToolCurveIntersectAxis(bool checked)
&MainWindow::ApplyDialog<VToolCurveIntersectAxis>); &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) void MainWindow::ToolPointOfIntersectionArcs(bool checked)
{ {
@ -1547,7 +1558,7 @@ void MainWindow::InitToolButtons()
connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc); connect(ui->toolButtonArcCutPoint, &QToolButton::clicked, this, &MainWindow::ToolCutArc);
connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis); connect(ui->toolButtonLineIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolLineIntersectAxis);
connect(ui->toolButtonCurveIntersectAxis, &QToolButton::clicked, this, &MainWindow::ToolCurveIntersectAxis); 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->toolButtonLayoutSettings, &QToolButton::clicked, this, &MainWindow::ToolLayoutSettings);
connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this, connect(ui->toolButtonPointOfIntersectionArcs, &QToolButton::clicked, this,
&MainWindow::ToolPointOfIntersectionArcs); &MainWindow::ToolPointOfIntersectionArcs);

1
src/app/valentina/mainwindow.h
View File

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