Merge.
--HG-- branch : develop
This commit is contained in:
commit
0c3fcfb14e
|
@ -1785,6 +1785,7 @@ void MainWindow::ActionDraw(bool checked)
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
qCDebug(vMainWindow, "Show draw scene");
|
qCDebug(vMainWindow, "Show draw scene");
|
||||||
|
ArrowTool();
|
||||||
|
|
||||||
leftGoToStage->setPixmap(QPixmap("://icon/24x24/fast_forward_left_to_right_arrow.png"));
|
leftGoToStage->setPixmap(QPixmap("://icon/24x24/fast_forward_left_to_right_arrow.png"));
|
||||||
rightGoToStage->setPixmap(QPixmap("://icon/24x24/left_to_right_arrow.png"));
|
rightGoToStage->setPixmap(QPixmap("://icon/24x24/left_to_right_arrow.png"));
|
||||||
|
@ -1847,6 +1848,7 @@ void MainWindow::ActionDetails(bool checked)
|
||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
|
ArrowTool();
|
||||||
const QHash<quint32, VDetail> *details = pattern->DataDetails();
|
const QHash<quint32, VDetail> *details = pattern->DataDetails();
|
||||||
if(not qApp->getOpeningPattern())
|
if(not qApp->getOpeningPattern())
|
||||||
{
|
{
|
||||||
|
@ -1932,6 +1934,7 @@ void MainWindow::ActionLayout(bool checked)
|
||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
|
ArrowTool();
|
||||||
const QHash<quint32, VDetail> *details = pattern->DataDetails();
|
const QHash<quint32, VDetail> *details = pattern->DataDetails();
|
||||||
if(not qApp->getOpeningPattern())
|
if(not qApp->getOpeningPattern())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user