We don't need anymore button Stop Tool. Arrow Tool does this function.
--HG-- branch : develop
This commit is contained in:
parent
15e840f49a
commit
c97fa6a1e8
|
@ -1849,7 +1849,6 @@ void MainWindow::CancelTool()
|
||||||
pointer->setChecked(false);
|
pointer->setChecked(false);
|
||||||
}
|
}
|
||||||
helpLabel->setText("");
|
helpLabel->setText("");
|
||||||
ui->actionStopTool->setEnabled(true);
|
|
||||||
|
|
||||||
// Crash: using CRTL+Z while using line tool.
|
// Crash: using CRTL+Z while using line tool.
|
||||||
// related bug report:
|
// related bug report:
|
||||||
|
@ -1998,7 +1997,6 @@ void MainWindow::ArrowTool()
|
||||||
{
|
{
|
||||||
pointer->setChecked(true);
|
pointer->setChecked(true);
|
||||||
}
|
}
|
||||||
ui->actionStopTool->setEnabled(false);
|
|
||||||
currentTool = Tool::Arrow;
|
currentTool = Tool::Arrow;
|
||||||
emit EnableItemMove(true);
|
emit EnableItemMove(true);
|
||||||
emit ItemsSelection(SelectionType::ByMouseRelease);
|
emit ItemsSelection(SelectionType::ByMouseRelease);
|
||||||
|
@ -3691,7 +3689,6 @@ void MainWindow::CreateActions()
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
connect(ui->actionStopTool, &QAction::triggered, this, &MainWindow::ArrowTool);
|
|
||||||
connect(ui->actionArrowTool, &QAction::triggered, this, &MainWindow::ArrowTool);
|
connect(ui->actionArrowTool, &QAction::triggered, this, &MainWindow::ArrowTool);
|
||||||
connect(ui->actionDraw, &QAction::triggered, this, &MainWindow::ActionDraw);
|
connect(ui->actionDraw, &QAction::triggered, this, &MainWindow::ActionDraw);
|
||||||
connect(ui->actionDetails, &QAction::triggered, this, &MainWindow::ActionDetails);
|
connect(ui->actionDetails, &QAction::triggered, this, &MainWindow::ActionDetails);
|
||||||
|
|
|
@ -1560,7 +1560,6 @@
|
||||||
<addaction name="actionZoomOut"/>
|
<addaction name="actionZoomOut"/>
|
||||||
<addaction name="actionZoomOriginal"/>
|
<addaction name="actionZoomOriginal"/>
|
||||||
<addaction name="actionZoomFitBest"/>
|
<addaction name="actionZoomFitBest"/>
|
||||||
<addaction name="actionStopTool"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QDockWidget" name="dockWidgetToolOptions">
|
<widget class="QDockWidget" name="dockWidgetToolOptions">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
|
@ -2091,28 +2090,6 @@
|
||||||
<enum>QAction::NoRole</enum>
|
<enum>QAction::NoRole</enum>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionStopTool">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="process-stop">
|
|
||||||
<normaloff/>
|
|
||||||
</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Stop</string>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Stop using tool</string>
|
|
||||||
</property>
|
|
||||||
<property name="shortcut">
|
|
||||||
<string notr="true"/>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="actionReportBug">
|
<action name="actionReportBug">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Report Bug...</string>
|
<string>Report Bug...</string>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user