X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Viewer.cpp;h=ff33f60eb7b4c9a48e0539c9890f1d6b8b1a51b5;hb=2b4f4bf278c841500eb29bb5d204690427b0d56b;hp=3d5af347ade6fc484c4c3f65ec9856abe9ff698f;hpb=3965e179785e99fa48ce1cd0e49bf625401ace37;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp
index 3d5af347a..ff33f60eb 100644
--- a/src/XGUI/XGUI_Viewer.cpp
+++ b/src/XGUI/XGUI_Viewer.cpp
@@ -444,10 +444,10 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView)
     connect(aWindow, SIGNAL(keyReleased(XGUI_ViewWindow*, QKeyEvent*)),
             this,    SIGNAL(keyRelease(XGUI_ViewWindow*, QKeyEvent*)));
 
-    connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )),
-            this,    SLOT  (onContextMenuRequested( QContextMenuEvent* )));
-    //connect(aWindow, SIGNAL( contextMenuRequested(QContextMenuEvent*) ), 
-    //        this, SIGNAL( contextMenuRequested(QContextMenuEvent*) ) );
+    //connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )),
+    //        this,    SLOT  (onContextMenuRequested( QContextMenuEvent* )));
+    connect(aWindow, SIGNAL( contextMenuRequested(QContextMenuEvent*) ), 
+            this, SIGNAL( contextMenuRequested(QContextMenuEvent*) ) );
 
     connect(aWindow, SIGNAL(mouseMoving(XGUI_ViewWindow*, QMouseEvent*)),
             this, SLOT(onMouseMove(XGUI_ViewWindow*, QMouseEvent*)));
@@ -464,7 +464,6 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView)
 void XGUI_Viewer::onWindowActivated(QMdiSubWindow* view)
 {
   if (view && (view != myActiveView) && (!view->isMinimized())) {
-    qDebug("onWindowActivated");
     myActiveView = view;
     ((XGUI_ViewWindow*)myActiveView->widget())->windowActivated();
     QList<QMdiSubWindow*>::iterator aIt;
@@ -591,29 +590,29 @@ void XGUI_Viewer::updateViewsDrawMode() const
 }
 
 //******************************************************
-void XGUI_Viewer::onContextMenuRequested(QContextMenuEvent* theEvent)
-{
-  XGUI_ViewWindow* aWnd = dynamic_cast<XGUI_ViewWindow*>(sender());
-  if (!aWnd) return;
-
-  QMenu aMenu;
-
-  // Include Viewer actions
-  if (myActions.size() > 0) {
-    aMenu.addActions(myActions);
-    aMenu.addSeparator();
-  }
-  if (aWnd->actions().size() > 0) {
-    aMenu.addActions(aWnd->actions());
-    aMenu.addSeparator();
-  }
-
-  QMdiArea* aMDI = myMainWindow->mdiArea();
-  if (aMenu.actions().size() > 0) {
-    QMenu* aSubMenu = aMenu.addMenu(tr("Windows"));
-    aSubMenu->addActions(aMDI->actions());
-  } else {
-    aMenu.addActions(aMDI->actions());
-  }
-  aMenu.exec(theEvent->globalPos());
-}
\ No newline at end of file
+//void XGUI_Viewer::onContextMenuRequested(QContextMenuEvent* theEvent)
+//{
+//  XGUI_ViewWindow* aWnd = dynamic_cast<XGUI_ViewWindow*>(sender());
+//  if (!aWnd) return;
+//
+//  QMenu aMenu;
+//
+//  // Include Viewer actions
+//  if (myActions.size() > 0) {
+//    aMenu.addActions(myActions);
+//    aMenu.addSeparator();
+//  }
+//  if (aWnd->actions().size() > 0) {
+//    aMenu.addActions(aWnd->actions());
+//    aMenu.addSeparator();
+//  }
+//
+//  QMdiArea* aMDI = myMainWindow->mdiArea();
+//  if (aMenu.actions().size() > 0) {
+//    QMenu* aSubMenu = aMenu.addMenu(tr("Windows"));
+//    aSubMenu->addActions(aMDI->actions());
+//  } else {
+//    aMenu.addActions(aMDI->actions());
+//  }
+//  aMenu.exec(theEvent->globalPos());
+//}