diff --git a/sources/projectview.cpp b/sources/projectview.cpp index c1944a376..23d3a93ea 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -113,13 +113,6 @@ QList ProjectView::getDiagrams(ProjectSaveOptions options) { } } - if (options & ModifiedDiagramsOnly) { - foreach (Diagram *diagram, selection) { - if (!diagram -> undoStack().isClean() || !diagram -> wasWritten()) continue; - selection.removeOne(diagram); - } - } - return(selection); } @@ -371,21 +364,17 @@ void ProjectView::removeDiagram(DiagramView *diagram_view) { // verifie que le schema est bien present dans le projet if (!diagram_ids_.values().contains(diagram_view)) return; - // demande confirmation a l'utilisateur - if ( - diagram_view -> diagram() -> wasWritten() ||\ - !diagram_view -> diagram() -> undoStack().isClean() - ) { - int answer = QET::MessageBox::question( - this, - tr("Supprimer le sch\351ma ?", "message box title"), - tr("\312tes-vous s\373r de vouloir supprimer ce sch\351ma du projet ? Ce changement est irr\351versible.", "message box content"), - QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, - QMessageBox::No - ); - if (answer != QMessageBox::Yes) { - return; - } + + //Ask confirmation to user. + int answer = QET::MessageBox::question( + this, + tr("Supprimer le sch\351ma ?", "message box title"), + tr("\312tes-vous s\373r de vouloir supprimer ce sch\351ma du projet ? Ce changement est irr\351versible.", "message box content"), + QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, + QMessageBox::No + ); + if (answer != QMessageBox::Yes) { + return; } // enleve le DiagramView des onglets diff --git a/sources/projectview.h b/sources/projectview.h index ed52357ee..76d9646bc 100644 --- a/sources/projectview.h +++ b/sources/projectview.h @@ -34,7 +34,6 @@ class ProjectView : public QWidget { public: enum ProjectSaveOption { - ModifiedDiagramsOnly = 1, CurrentDiagram = 2, AllDiagramsButCurrent = 4, AllDiagrams = 6 @@ -77,7 +76,7 @@ class ProjectView : public QWidget { void printProject(); void exportProject(); QETResult save(); - QETResult saveAs(ProjectSaveOptions = ProjectSaveOptions(AllDiagrams | ModifiedDiagramsOnly)); + QETResult saveAs(ProjectSaveOptions = ProjectSaveOptions(AllDiagrams)); QETResult doSave(ProjectSaveOptions); void saveDiagrams(const QList &); int cleanProject();