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

Merge

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-11-25 15:45:54 +02:00
commit 1e5fd5e28d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1822,8 +1822,11 @@ void MainWindow::ActionDetails(bool checked)
disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor); disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor);
RestoreCurrentScene(); RestoreCurrentScene();
drawMode = false; if(drawMode)
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace {
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
drawMode = false;
}
comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1); comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);
comboBoxDraws->setEnabled(false); comboBoxDraws->setEnabled(false);
@ -1905,8 +1908,11 @@ void MainWindow::ActionLayout(bool checked)
ui->view->setScene(currentScene); ui->view->setScene(currentScene);
disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor); disconnect(ui->view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor);
drawMode = false; if(drawMode)
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace {
currentDrawIndex = comboBoxDraws->currentIndex();//save current pattern peace
drawMode = false;
}
comboBoxDraws->setCurrentIndex(-1); comboBoxDraws->setCurrentIndex(-1);
comboBoxDraws->setEnabled(false); comboBoxDraws->setEnabled(false);