From 896e2a217ea9073d0ffb70bbae46e35b0f83bb8d Mon Sep 17 00:00:00 2001
From: mkr <mkr@opencascade.com>
Date: Thu, 24 Nov 2005 14:35:53 +0000
Subject: [PATCH] Fix for IPAL10387 ( Supervisor viewer has no "View
 Operations" toolbar ) : add "Show toolbar" item into Supervisor background
 popup menus in Full, Control and Table views.

---
 src/SUPERVGUI/SUPERVGUI_ArrayView.cxx  | 9 ++++++++-
 src/SUPERVGUI/SUPERVGUI_ArrayView.h    | 1 +
 src/SUPERVGUI/SUPERVGUI_CanvasView.cxx | 8 ++++++++
 src/SUPERVGUI/SUPERVGUI_CanvasView.h   | 1 +
 src/SUPERVGUI/SUPERVGUI_Main.cxx       | 7 +++++++
 src/SUPERVGUI/SUPERVGUI_Main.h         | 2 ++
 src/SUPERVGUI/SUPERV_msg_en.po         | 3 +++
 7 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
index de53d8c..b8c2be4 100644
--- a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
@@ -69,7 +69,13 @@ SUPERVGUI_ArrayView::SUPERVGUI_ArrayView(SUPERVGUI_CanvasArray* theArray, SUPERV
 
   myPopup->insertSeparator();
   myPopup->insertItem(tr("MSG_CHANGE_BACKGROUND"), this, SLOT(changeBackground()));
- 
+
+  SUPERVGraph_ViewFrame* anActiveVF = (SUPERVGraph_ViewFrame*)myMain->parent();
+  if ( anActiveVF ) {
+    myPopup->insertSeparator();
+    myShowToolBarItem = myPopup->insertItem( tr( "MEN_SHOW_TOOLBAR" ), myMain, SLOT( onShowToolbar() ) );
+  }
+
   hide();
 }
  
@@ -143,6 +149,7 @@ void SUPERVGUI_ArrayView::contentsMousePressEvent(QMouseEvent* theEvent) {
     }
 
     myPopup->setItemEnabled(myAddStudyItem, !myMain->isDataflowInStudy());
+    myPopup->setItemEnabled(myShowToolBarItem, !((SUPERVGraph_ViewFrame*)myMain->parent())->getToolBar()->isVisible());
     myMain->showPopup(myPopup, theEvent);
     return;
   }
diff --git a/src/SUPERVGUI/SUPERVGUI_ArrayView.h b/src/SUPERVGUI/SUPERVGUI_ArrayView.h
index 358c27d..a02aa39 100644
--- a/src/SUPERVGUI/SUPERVGUI_ArrayView.h
+++ b/src/SUPERVGUI/SUPERVGUI_ArrayView.h
@@ -48,6 +48,7 @@ class SUPERVGUI_ArrayView: public QCanvasView {
     SUPERVGUI_Main* myMain;
     QPopupMenu*     myPopup;
     int             myAddStudyItem;
+    int             myShowToolBarItem;
 
     QCursor         myCursor;
 
diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
index 0d2b30f..3e52a41 100644
--- a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
@@ -153,6 +153,12 @@ SUPERVGUI_CanvasView::SUPERVGUI_CanvasView(SUPERVGUI_Canvas* theCanvas, SUPERVGU
   // add "change dataflow parameters" popup item
   myPopup->insertSeparator();
   myDSParamsItem = myPopup->insertItem( tr( "MSG_SET_GRAPHPARAMS" ), myMain, SLOT( changeDSGraphParameters() ) );
+
+  SUPERVGraph_ViewFrame* anActiveVF = (SUPERVGraph_ViewFrame*)myMain->parent();
+  if ( anActiveVF ) {
+    myPopup->insertSeparator();
+    myShowToolBarItem = myPopup->insertItem( tr( "MEN_SHOW_TOOLBAR" ), myMain, SLOT( onShowToolbar() ) );
+  }
 }
  
 
@@ -233,6 +239,8 @@ void SUPERVGUI_CanvasView::contentsMousePressEvent(QMouseEvent* theEvent)
        
     myPopup->setItemEnabled( myDSParamsItem, isHavingStreamPort()/*myMain->getDataflow()->IsStreamGraph()*/ );
 
+    myPopup->setItemEnabled( myShowToolBarItem, !((SUPERVGraph_ViewFrame*)myMain->parent())->getToolBar()->isVisible() );
+
     myMain->showPopup(myPopup, theEvent);
     return;
   }
diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.h b/src/SUPERVGUI/SUPERVGUI_CanvasView.h
index e44fb2a..feda501 100644
--- a/src/SUPERVGUI/SUPERVGUI_CanvasView.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.h
@@ -74,6 +74,7 @@ class SUPERVGUI_CanvasView: public QCanvasView {
     QPopupMenu*     mySketchPopup;
     int             myDelPntItem;
     int             myOrtoItem;
+    int             myShowToolBarItem;
 
     bool         myIsPanBtnClicked;
     bool         myIsPanActivated;
diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index 7ecc679..3ffa305 100644
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -549,6 +549,13 @@ void SUPERVGUI_Main::onSubGraphClosed(SUIT_ViewWindow* theStudyFrame)
   }
 }
 
+void SUPERVGUI_Main::onShowToolbar()
+{
+  SUPERVGraph_ViewFrame* aVF = (SUPERVGraph_ViewFrame*)this->parent();
+  if ( aVF )
+    aVF->getToolBar()->show();
+}
+
 void SUPERVGUI_Main::run( const bool andSuspend ) {
   Trace("SUPERVGUI_Main::run");
   if ( SUPERV_isNull(dataflow) ) 
diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h
index 1559b74..5fde3ae 100644
--- a/src/SUPERVGUI/SUPERVGUI_Main.h
+++ b/src/SUPERVGUI/SUPERVGUI_Main.h
@@ -156,6 +156,8 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
     void changeDSGraphParameters();
     void onSubGraphClosed( SUIT_ViewWindow* );
     void onSubGraphActivated( SUIT_ViewWindow* );
+
+    void onShowToolbar();
  
   private slots:
     void chooseData(QListViewItem* item);
diff --git a/src/SUPERVGUI/SUPERV_msg_en.po b/src/SUPERVGUI/SUPERV_msg_en.po
index 8d65080..706508f 100644
--- a/src/SUPERVGUI/SUPERV_msg_en.po
+++ b/src/SUPERVGUI/SUPERV_msg_en.po
@@ -972,3 +972,6 @@ msgstr "Execution"
 
 msgid "MSG_INCORRECT_INDENT"
 msgstr "Incorrect indent of the python function name (must be 0)!"
+
+msgid "MEN_SHOW_TOOLBAR"
+msgstr "Show toolbar"
-- 
2.30.2