Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / XGUI / XGUI_Workshop.h

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index f9a5ee50dc7c19e7031dcd8746764a0959dbff9d..b969861682dec1ec56492aa3dbdf5e594737f444 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -175,6 +175,14 @@ Q_OBJECT
   */
   void saveDocument(const QString& theName, std::list<std::string>& theFileNames);
 
+  /*
+   * If there is an active (uncommited) operation shows a prompt to abort it
+   * and performs abortion if user agreed. Returns true if
+   * - operation aborted successfully
+   * - there is no active operation
+   */
+  bool isActiveOperationAborted();
+
 signals:
   void salomeViewerSelection();
   void errorOccurred(const QString&);
@@ -202,9 +210,6 @@ signals:
 
   void activateLastPart();
 
-  /// Display all results of the current document
-  void displayAllResults();
-
  protected:
   //Event-loop processing methods:
   void addFeature(const Config_FeatureMessage*);
@@ -219,6 +224,7 @@ signals:
 
   QList<QAction*> getModuleCommands() const;
 
+  void displayAllResults();
   void displayDocumentResults(DocumentPtr theDoc);
   void displayGroupResults(DocumentPtr theDoc, std::string theGroup);