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

Fixed GUI issue. After full parse some widgets was incorrectly reseted.

Browse Source 
(grafted from 49bad435c9e9a940fb91e6142cc0d9a951536f6a)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-04-03 20:01:37 +03:00
parent 297b32d5d9
commit b57354792c
2 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -19,6 +19,7 @@
- [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu. - [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu.
# Version 0.4.4 # Version 0.4.4
- Fixed GUI issue. After full parse some widgets was incorrectly reseted.
- [#464] Crash. Issue with modeling node objects. - [#464] Crash. Issue with modeling node objects.
- [#463] Wrong export to DXF format. - [#463] Wrong export to DXF format.
- Fixed issue with deleting detail nodes. - Fixed issue with deleting detail nodes.

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

@ -2012,29 +2012,13 @@ void MainWindow::ActionDraw(bool checked)
RestoreCurrentScene(); RestoreCurrentScene();
mode = Draw::Calculation; mode = Draw::Calculation;
comboBoxDraws->setEnabled(true);
comboBoxDraws->setCurrentIndex(currentDrawIndex);//restore current pattern peace comboBoxDraws->setCurrentIndex(currentDrawIndex);//restore current pattern peace
drawMode = true; drawMode = true;
SetEnableTool(true); SetEnableTool(true);
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(currentToolBoxIndex); ui->toolBox->setCurrentIndex(currentToolBoxIndex);
ui->actionHistory->setEnabled(true);
ui->actionOptionDraw->setEnabled(true);
ui->actionNewDraw->setEnabled(true);
ui->actionTable->setEnabled(true);
ui->actionArrowTool->setEnabled(true);
ui->actionShowCurveDetails->setEnabled(true);
actionDockWidgetToolOptions->setEnabled(true);
if (qApp->getUndoStack()->canUndo())
{
undoAction->setEnabled(true);
}
if (qApp->getUndoStack()->canRedo())
{
redoAction->setEnabled(true);
}
if (qApp->patternType() == MeasurementsType::Standard) if (qApp->patternType() == MeasurementsType::Standard)
{ {
ui->toolBarOption->setVisible(true); ui->toolBarOption->setVisible(true);
@ -2066,7 +2050,6 @@ void MainWindow::ActionDetails(bool checked)
drawMode = false; drawMode = false;
} }
comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);// Need to get data about all details comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);// Need to get data about all details
comboBoxDraws->setEnabled(false);
if(not qApp->getOpeningPattern()) if(not qApp->getOpeningPattern())
{ {
@ -2102,24 +2085,9 @@ void MainWindow::ActionDetails(bool checked)
} }
mode = Draw::Modeling; mode = Draw::Modeling;
SetEnableTool(true); SetEnableTool(true);
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(4); ui->toolBox->setCurrentIndex(4);
ui->actionHistory->setEnabled(false);
ui->actionOptionDraw->setEnabled(false);
ui->actionNewDraw->setEnabled(false);
ui->actionTable->setEnabled(false);
ui->actionArrowTool->setEnabled(true);
ui->actionShowCurveDetails->setEnabled(false);
actionDockWidgetToolOptions->setEnabled(true);
if (qApp->getUndoStack()->canUndo())
{
undoAction->setEnabled(true);
}
if (qApp->getUndoStack()->canRedo())
{
redoAction->setEnabled(true);
}
if (qApp->patternType() == MeasurementsType::Standard) if (qApp->patternType() == MeasurementsType::Standard)
{ {
ui->toolBarOption->setVisible(true); ui->toolBarOption->setVisible(true);
@ -2153,7 +2121,6 @@ void MainWindow::ActionLayout(bool checked)
drawMode = false; drawMode = false;
} }
comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);// Need to get data about all details comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);// Need to get data about all details
comboBoxDraws->setEnabled(false);
const QHash<quint32, VDetail> *details = pattern->DataDetails(); const QHash<quint32, VDetail> *details = pattern->DataDetails();
if(not qApp->getOpeningPattern()) if(not qApp->getOpeningPattern())
@ -2193,17 +2160,9 @@ void MainWindow::ActionLayout(bool checked)
} }
mode = Draw::Layout; mode = Draw::Layout;
SetEnableTool(true); SetEnableTool(true);
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(5); ui->toolBox->setCurrentIndex(5);
ui->actionHistory->setEnabled(false);
ui->actionOptionDraw->setEnabled(false);
ui->actionNewDraw->setEnabled(false);
ui->actionArrowTool->setEnabled(false);
ui->actionTable->setEnabled(false);
ui->actionShowCurveDetails->setEnabled(false);
actionDockWidgetToolOptions->setEnabled(false);
undoAction->setEnabled(false);
redoAction->setEnabled(false);
mouseCoordinate->setText(""); mouseCoordinate->setText("");
if (qApp->patternType() == MeasurementsType::Standard) if (qApp->patternType() == MeasurementsType::Standard)
@ -2585,7 +2544,7 @@ void MainWindow::FullParseFile()
return; return;
} }
QString patternPiece = QString(); QString patternPiece;
if (comboBoxDraws->currentIndex() != -1) if (comboBoxDraws->currentIndex() != -1)
{ {
patternPiece = comboBoxDraws->itemText(comboBoxDraws->currentIndex()); patternPiece = comboBoxDraws->itemText(comboBoxDraws->currentIndex());
@ -2593,6 +2552,18 @@ void MainWindow::FullParseFile()
comboBoxDraws->blockSignals(true); comboBoxDraws->blockSignals(true);
comboBoxDraws->clear(); comboBoxDraws->clear();
comboBoxDraws->addItems(doc->getPatternPieces()); comboBoxDraws->addItems(doc->getPatternPieces());
if (not drawMode)
{
comboBoxDraws->setCurrentIndex(comboBoxDraws->count()-1);
}
else
{
const qint32 index = comboBoxDraws->findText(patternPiece);
if ( index != -1 )
{
comboBoxDraws->setCurrentIndex(index);
}
}
comboBoxDraws->blockSignals(false); comboBoxDraws->blockSignals(false);
ui->actionPattern_properties->setEnabled(true); ui->actionPattern_properties->setEnabled(true);
@ -2671,34 +2642,35 @@ void MainWindow::SetEnabledGUI(bool enabled)
*/ */
void MainWindow::SetEnableWidgets(bool enable) void MainWindow::SetEnableWidgets(bool enable)
{ {
comboBoxDraws->setEnabled(enable); const bool drawStage = (mode == Draw::Calculation);
ui->actionOptionDraw->setEnabled(enable); const bool designStage = (drawStage || mode == Draw::Modeling);
if (enable && not patternReadOnly)
{ comboBoxDraws->setEnabled(enable && drawStage);
ui->actionSave->setEnabled(enable); ui->actionOptionDraw->setEnabled(enable && drawStage);
} ui->actionSave->setEnabled(enable && not patternReadOnly);
else
{
ui->actionSave->setEnabled(false);
}
ui->actionSaveAs->setEnabled(enable); ui->actionSaveAs->setEnabled(enable);
ui->actionPattern_properties->setEnabled(enable); ui->actionPattern_properties->setEnabled(enable && designStage);
ui->actionEdit_pattern_code->setEnabled(enable); ui->actionEdit_pattern_code->setEnabled(enable && designStage);
ui->actionZoomIn->setEnabled(enable); ui->actionZoomIn->setEnabled(enable);
ui->actionZoomOut->setEnabled(enable); ui->actionZoomOut->setEnabled(enable);
ui->actionArrowTool->setEnabled(enable); ui->actionArrowTool->setEnabled(enable && designStage);
ui->actionHistory->setEnabled(enable); ui->actionHistory->setEnabled(enable && drawStage);
ui->actionNewDraw->setEnabled(enable); ui->actionNewDraw->setEnabled(enable && drawStage);
ui->actionDraw->setEnabled(enable); ui->actionDraw->setEnabled(enable);
ui->actionDetails->setEnabled(enable); ui->actionDetails->setEnabled(enable);
ui->actionLayout->setEnabled(enable); ui->actionLayout->setEnabled(enable);
ui->actionTable->setEnabled(enable); ui->actionTable->setEnabled(enable && drawStage);
ui->actionZoomFitBest->setEnabled(enable); ui->actionZoomFitBest->setEnabled(enable);
ui->actionZoomOriginal->setEnabled(enable); ui->actionZoomOriginal->setEnabled(enable);
ui->actionShowCurveDetails->setEnabled(enable); ui->actionShowCurveDetails->setEnabled(enable && drawStage);
ui->actionLoadIndividual->setEnabled(enable); ui->actionLoadIndividual->setEnabled(enable && designStage);
ui->actionLoadStandard->setEnabled(enable); ui->actionLoadStandard->setEnabled(enable && designStage);
ui->actionUnloadMeasurements->setEnabled(enable); ui->actionUnloadMeasurements->setEnabled(enable && designStage);
actionDockWidgetToolOptions->setEnabled(enable && designStage);
undoAction->setEnabled(enable && designStage && qApp->getUndoStack()->canUndo());
redoAction->setEnabled(enable && designStage && qApp->getUndoStack()->canRedo());
//Now we don't want allow user call context menu //Now we don't want allow user call context menu
sceneDraw->SetDisableTools(!enable, doc->GetNameActivPP()); sceneDraw->SetDisableTools(!enable, doc->GetNameActivPP());