Changeset 715 for trunk/geant4

Timestamp:

Feb 6, 2008, 6:52:42 PM (16 years ago)

Author:

garnier

Message:

correction du ticket #116. Correction du menu contextuel full screen qui n etait pas remis a jour lors du clic sur escape

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (11 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -422 +422 @@
 
 #if QT_VERSION < 0x030200
-  QAction *polyhedron = new QAction("&Polyhedron","&Polyhedron",CTRL+Key_P,mRepresentation);
-  QAction *nurbs = new QAction("&NURBS","&NURBS",CTRL+Key_N,mRepresentation);
-
-  QAction *ortho = new QAction("&Orthographic","&Orthographic",CTRL+Key_O,mProjection);
-  QAction *perspective = new QAction("&Perspective","&Perspective",CTRL+Key_P,mProjection);
+  QAction *polyhedron = new QAction("&Polyhedron","&Polyhedron",CTRL+Key_P,mRepresentation,0,true);
+  QAction *nurbs = new QAction("&NURBS","&NURBS",CTRL+Key_N,mRepresentation,0,true);
+
+  QAction *ortho = new QAction("&Orthographic","&Orthographic",CTRL+Key_O,mProjection,0,true);
+  QAction *perspective = new QAction("&Perspective","&Perspective",CTRL+Key_P,mProjection,0,true);
 #else
   QAction *polyhedron = new QAction("&Polyhedron",CTRL+Key_P,mRepresentation);
@@ -433 +433 @@
   QAction *ortho = new QAction("&Orthographic",CTRL+Key_O,mProjection);
   QAction *perspective = new QAction("&Perspective",CTRL+Key_P,mProjection);
+  polyhedron->setToggleAction(true);
+  nurbs->setToggleAction(true);
+  ortho->setToggleAction(true);
+  perspective->setToggleAction(true);
 #endif
   polyhedron->addTo(mRepresentation);
@@ -590 +594 @@
 
 #if QT_VERSION < 0x030200
-  QAction *white = new QAction("&White","&White",CTRL+Key_W,mBackground);
-  QAction *black =  new QAction("&Black","&Black",CTRL+Key_B,mBackground);
+  QAction *white = new QAction("&White","&White",CTRL+Key_W,mBackground,0,true);
+  QAction *black =  new QAction("&Black","&Black",CTRL+Key_B,mBackground,0,true);
 #else
   QAction *white = new QAction("&White",CTRL+Key_W,mBackground);
   QAction *black =  new QAction("&Black",CTRL+Key_B,mBackground);
+  white->setToggleAction(true);
+  black->setToggleAction(true);
 #endif
   white->addTo(mBackground);
@@ -620 +626 @@
 
 #if QT_VERSION < 0x030200
-  QAction *createEPS =  new QAction("&Save as ...","&Save as ...",CTRL+Key_S,mActions);
+  QAction *createEPS =  new QAction("&Save as ...","&Save as ...",CTRL+Key_S,mActions,0,true);
 #else
   QAction *createEPS =  new QAction("&Save as ...",CTRL+Key_S,mActions);
+  createEPS->setToggleAction(true);
 #endif
   createEPS->addTo(mActions);
@@ -651 +658 @@
 
 #if QT_VERSION < 0x030200
-  QAction *transparencyOn = new QAction("&On","&On",CTRL+Key_O,mTransparency);
-  QAction *transparencyOff = new QAction("&Off","&Off",CTRL+Key_F,mTransparency);
+  QAction *transparencyOn = new QAction("&On","&On",CTRL+Key_O,mTransparency,0,true);
+  QAction *transparencyOff = new QAction("&Off","&Off",CTRL+Key_F,mTransparency,0,true);
 #else
   QAction *transparencyOn = new QAction("&On",CTRL+Key_O,mTransparency);
   QAction *transparencyOff = new QAction("&Off",CTRL+Key_F,mTransparency);
+  transparencyOn->setToggleAction(true);
+  transparencyOff->setToggleAction(true);
 #endif
   transparencyOn->addTo(mTransparency);
@@ -682 +691 @@
 
 #if QT_VERSION < 0x030200
-  QAction *antialiasingOn = new QAction("&On","&On",CTRL+Key_O,mAntialiasing);
-  QAction *antialiasingOff = new QAction("&Off","&Off",CTRL+Key_F,mAntialiasing);
+  QAction *antialiasingOn = new QAction("&On","&On",CTRL+Key_O,mAntialiasing,0,true);
+  QAction *antialiasingOff = new QAction("&Off","&Off",CTRL+Key_F,mAntialiasing,0,true);
 #else
   QAction *antialiasingOn = new QAction("&On",CTRL+Key_O,mAntialiasing);
   QAction *antialiasingOff = new QAction("&Off",CTRL+Key_F,mAntialiasing);
+  antialiasingOn->setToggleAction(true);
+  antialiasingOff->setToggleAction(true);
 #endif
   antialiasingOn->addTo(mAntialiasing);
@@ -710 +721 @@
 
 #if QT_VERSION < 0x030200
-  QAction *haloingOn = new QAction("&On","&On",CTRL+Key_O,mHaloing);
-  QAction *haloingOff = new QAction("&Off","&Off",CTRL+Key_F,mHaloing);
+  QAction *haloingOn = new QAction("&On","&On",CTRL+Key_O,mHaloing,0,true);
+  QAction *haloingOff = new QAction("&Off","&Off",CTRL+Key_F,mHaloing,0,true);
 #else
   QAction *haloingOn = new QAction("&On",CTRL+Key_O,mHaloing);
   QAction *haloingOff = new QAction("&Off",CTRL+Key_F,mHaloing);
+  haloingOn->setToggleAction(true);
+  haloingOff->setToggleAction(true);
 #endif
   haloingOn->addTo(mHaloing);
@@ -736 +749 @@
 
 #if QT_VERSION < 0x030200
-  QAction *auxOn = new QAction("&On","&On",CTRL+Key_O,mAux);
-  QAction *auxOff = new QAction("&Off","&Off",CTRL+Key_F,mAux);
+  QAction *auxOn = new QAction("&On","&On",CTRL+Key_O,mAux,0,true);
+  QAction *auxOff = new QAction("&Off","&Off",CTRL+Key_F,mAux,0,true);
 #else
   QAction *auxOn = new QAction("&On",CTRL+Key_O,mAux);
   QAction *auxOff = new QAction("&Off",CTRL+Key_F,mAux);
+  auxOn->setToggleAction(true);
+  auxOff->setToggleAction(true);
 #endif
   auxOn->addTo(mAux);
@@ -757 +772 @@
 
 
-#if QT_VERSION >= 0x030200
+
 #if QT_VERSION < 0x040000
   QPopupMenu *mFullScreen = new QPopupMenu(mSpecial);
   mSpecial->insertItem("Full screen",mFullScreen);
 
+#if QT_VERSION < 0x030200
+  QAction *fullOn = new QAction("&On","&On",CTRL+Key_O,mFullScreen,0,true);
+  QAction *fullOff = new QAction("&Off","&Off",CTRL+Key_F,mFullScreen,0,true);
+#else
   QAction *fullOn = new QAction("&On",CTRL+Key_O,mFullScreen);
   QAction *fullOff = new QAction("&Off",CTRL+Key_F,mFullScreen);
+  fullOn->setToggleAction(true);
+  fullOff->setToggleAction(true);
+#endif
   fullOn->addTo(mFullScreen);
   fullOff->addTo(mFullScreen);
 #else
-  QMenu *mFullScreen = mSpecial->addMenu("Full screen");
+  QMenu *mFullScreen = mSpecial->addMenu("&Full screen");
   QAction *fullOn = mFullScreen->addAction("On");
   QAction *fullOff = mFullScreen->addAction("Off");
 #endif
   createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen()),2);
-#endif
 
 }
@@ -808 +829 @@
   if (action1->parent()->inherits("QPopupMenu")){
     ((QPopupMenu*)action1->parent())->setCheckable(true);
-  }
-  ((QPopupMenu*)action1->parent())->setItemChecked(0,true);
-  ((QPopupMenu*)action1->parent())->setItemChecked(1,true);
+    ((QPopupMenu*)action2->parent())->setCheckable(true);
+  }
+  action1->setOn(false);
+   action2->setOn(false);
 
   if (nCheck ==1)
-    ((QPopupMenu*)action1->parent())->setItemChecked(0,true);
+    action1->setOn(true);
   else
-    ((QPopupMenu*)action1->parent())->setItemChecked(1,true);
+    action2->setOn(true);
    
   //FIXME : Should not work on Qt3
@@ -1857 +1879 @@
   if (event->key() == Qt::Key_Escape) { // escaped from full screen
     toggleFullScreen();
+    emit toggleMouseAction();
   }
   if (event->key() == Qt::Key_Plus) { // zoom in