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

Fixed issue #218. Pattern disappears when Detail icon on icon bar is selected.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2015-01-27 16:14:54 +02:00
parent e8329a1294
commit 12c1b59c79
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/mainwindow.cpp
View File

@ -1468,7 +1468,6 @@ void MainWindow::Clear()
qCDebug(vMainWindow)<<"Unlocked pattern file."; qCDebug(vMainWindow)<<"Unlocked pattern file.";
ui->actionDetails->setChecked(false); ui->actionDetails->setChecked(false);
ui->actionDetails->setEnabled(false);
ui->actionDraw->setChecked(true); ui->actionDraw->setChecked(true);
ui->actionDraw->setEnabled(false); ui->actionDraw->setEnabled(false);
qCDebug(vMainWindow)<<"Returned to Draw mode."; qCDebug(vMainWindow)<<"Returned to Draw mode.";
@ -1678,11 +1677,20 @@ void MainWindow::SetEnabledGUI(bool enabled)
ui->actionHistory->setEnabled(enabled); ui->actionHistory->setEnabled(enabled);
ui->actionNewDraw->setEnabled(enabled); ui->actionNewDraw->setEnabled(enabled);
ui->actionDraw->setEnabled(enabled); ui->actionDraw->setEnabled(enabled);
ui->actionDetails->setEnabled(enabled);
ui->actionTable->setEnabled(enabled); ui->actionTable->setEnabled(enabled);
ui->actionLayout->setEnabled(enabled);
ui->actionZoomFitBest->setEnabled(enabled); ui->actionZoomFitBest->setEnabled(enabled);
ui->actionZoomOriginal->setEnabled(enabled); ui->actionZoomOriginal->setEnabled(enabled);
if (enabled)
{
Layout();
}
else
{
ui->actionDetails->setEnabled(enabled);
ui->actionLayout->setEnabled(enabled);
}
guiEnabled = enabled; guiEnabled = enabled;
sceneDraw->SetDisable(!enabled); sceneDraw->SetDisable(!enabled);
@ -1708,10 +1716,12 @@ void MainWindow::Layout()
const QHash<quint32, VDetail> *details = pattern->DataDetails(); const QHash<quint32, VDetail> *details = pattern->DataDetails();
if (details->size() > 0) if (details->size() > 0)
{ {
ui->actionDetails->setEnabled(true);
ui->actionLayout->setEnabled(true); ui->actionLayout->setEnabled(true);
} }
else else
{ {
ui->actionDetails->setEnabled(false);
ui->actionLayout->setEnabled(false); ui->actionLayout->setEnabled(false);
} }
} }
@ -1826,12 +1836,12 @@ void MainWindow::SetEnableWidgets(bool enable)
{ {
ui->actionSaveAs->setEnabled(enable); ui->actionSaveAs->setEnabled(enable);
ui->actionDraw->setEnabled(enable); ui->actionDraw->setEnabled(enable);
ui->actionDetails->setEnabled(enable);
ui->actionOptionDraw->setEnabled(enable); ui->actionOptionDraw->setEnabled(enable);
if (enable == true && curFile.isEmpty() == false) if (enable == true && curFile.isEmpty() == false)
{ {
ui->actionSave->setEnabled(enable); ui->actionSave->setEnabled(enable);
} }
Layout();
ui->actionTable->setEnabled(enable); ui->actionTable->setEnabled(enable);
ui->actionHistory->setEnabled(enable); ui->actionHistory->setEnabled(enable);
ui->actionPattern_properties->setEnabled(enable); ui->actionPattern_properties->setEnabled(enable);