Changeset 501

Timestamp:

Jun 12, 2007, 10:34:32 AM (17 years ago)

Author:

garnier

Message:

r605@mac-90108: laurentgarnier | 2007-06-12 10:37:44 +0200
pb sur les menus, voici une version bien bancale

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (12 diffs)

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -110 +110 @@
   QTextEdit *fTextArea;
   QTextEdit *fCommandHistoryArea;
+  std::vector <QString*> menuName;
+  std::vector <QString*> menuLabel;
 
 private slots :

trunk/geant4/interfaces/basic/src/G4UIQt.cc

@@ -61 +61 @@
 
 static G4bool ConvertStringToInt(const char*,int&);
-//static void ExecuteChangeSizeFunction(Widget);
 
 static G4bool exitSession = true;
@@ -145 +144 @@
 
 
-  //  QMenu *menuFile = new QMenu("File");
-  //  fMainWindow->menuBar()->addMenu(menuFile); 
-
+  QMenu *fileMenu = fMainWindow->menuBar()->addMenu(tr("&File"));
+  fileMenu->addAction("Quitter", this, SLOT(fMainWindow->close()));
+  fileMenu->addAction("Quitter2", this, SLOT(fMainWindow->close()));
+  fileMenu->addSeparator();
 
 
@@ -301 +301 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf("G4UIQt::PauseSessionStart\n");
   if(a_state=="G4_pause> ") {  // TO KEEP
     SecondaryLoop ("Pause, type continue to exit this state"); // TO KEEP
@@ -317 +318 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf("G4UIQt::SecondaryLoop\n");
   G4Qt* interactorManager = G4Qt::getInstance (); // TO KEEP ?
   Prompt(a_prompt); // TO KEEP
@@ -355 +357 @@
   fTextArea->append(QString((char*)a_string.data()).trimmed());
   fTextArea->setTextColor(previousColor);
+  fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
   return 0;
 }
@@ -364 +367 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-//   fHelp = true; // TO KEEP
+  printf("G4UIQt::GetHelpChoice\n");
+  
+  fHelp = true; // TO KEEP
 //   // SecondaryLoop : // TO KEEP
-//   G4Qt* interactorManager = G4Qt::getInstance (); // TO KEEP ?
-//   Prompt("Help"); // TO KEEP
-//   exitHelp = false; // TO KEEP
-//   void* event; // TO KEEP
-//   while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
-//     interactorManager->DispatchEvent(event); // TO KEEP
-//     if(exitHelp==true) break; // TO KEEP
-//   } // TO KEEP
-//   Prompt("session"); // TO KEEP
-//   // // TO KEEP
-//   if(fHelp==false) return false; // TO KEEP
-//   aInt = fHelpChoice; // TO KEEP
-//   fHelp = false; // TO KEEP
-//   return true; // TO KEEP
+  G4Qt* interactorManager = G4Qt::getInstance (); // TO KEEP ?
+  Prompt("Help"); // TO KEEP
+  exitHelp = false; // TO KEEP
+  void* event; // TO KEEP
+  while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
+    interactorManager->DispatchEvent(event); // TO KEEP
+    if(exitHelp==true) break; // TO KEEP
+  } // TO KEEP
+  Prompt("session"); // TO KEEP
+  // // TO KEEP
+  if(fHelp==false) return false; // TO KEEP
+  aInt = fHelpChoice; // TO KEEP
+  fHelp = false; // TO KEEP
+  return true; // TO KEEP
 }
 /***************************************************************************/
@@ -387 +392 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-}
+  printf("G4UIQt::ExitHelp\n");
+}
+
 /***************************************************************************/
 void G4UIQt::AddMenu (
@@ -396 +403 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf("G4UIQt::AddMenu %s %s\n",a_name,a_label);
+  QString *name = new QString(a_name);
+  QString *label = new QString(a_label);
+  menuName.push_back(name);
+  menuLabel.push_back(label);
+
+  //  QMenu *menu = new QMenu("test");//a_label);
+  //  fMainWindow->menuBar()->addMenu(menu); 
+
 //   if(menuBar==NULL) return;
 //   if(a_name==NULL) return;
@@ -423 +439 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  printf("G4UIQt::AddButton %s %s %s\n",a_menu,a_label,a_command);
 //   if(a_menu==NULL) return; // TO KEEP
 //   if(a_label==NULL) return; // TO KEEP
@@ -468 +485 @@
   fCommandArea->setText("");
 }
-// /***************************************************************************/
-// void G4UIXm::keyHandler (
-//  Widget a_widget
-// ,XtPointer a_tag
-// ,XEvent* a_event
-// ,Boolean*
-// )
-// /***************************************************************************/
-// /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-// {
-//   KeySym keySym;
-//   XLookupString(&(a_event->xkey),NULL,0,&keySym,NULL);
-//   if(keySym!=XK_Tab) return;
-//   G4UIXm* This = (G4UIXm*)a_tag;
-//   char* s = XmTextGetString(a_widget);
-//   G4String ss = This->Complete(s);
-//   XmTextSetString(a_widget,(char*)ss.data());
-//   XtFree(s);
-//   XmTextSetInsertionPosition(a_widget,XmTextGetLastPosition(a_widget));
-//}
 
  /***************************************************************************/
@@ -498 +495 @@
 }
 
-/***************************************************************************/
-// TODO !
-//void G4UIQt::ButtonCallback (
-// Widget a_widget
-//,XtPointer a_tag
-//,XtPointer
-//)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-//{
-//   G4UIXm* This = (G4UIXm*)a_tag;
-//   if(This->fHelp==true) return; // Disabled when in help.
-//   G4String ss = This->GetCommand (a_widget);
-//   //printf ("debug : execute:\n%s\n",ss.data());
-//   This->ApplyShellCommand(ss,exitSession,exitPause);
-//}
-/***************************************************************************/
-/***************************************************************************/
-/***************************************************************************/
-// char* XmConvertCompoundStringToString (
-//  XmString a_cps 
-// ,int a_number 
-// )
-// /***************************************************************************/
-// /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-// {
-//   if(a_cps==NULL) return NULL;
-//   char* ss = NULL;
-//   XmStringContext context;
-//   XmStringInitContext(&context,a_cps);
-//   int icount = 0;
-//   Boolean Done = False;
-//   while(Done==False) {  
-//     char* text = NULL;
-//     XmStringCharSet charset = NULL;
-//     XmStringDirection direct;
-//     Boolean sep;
-//     if(XmStringGetNextSegment(context,&text,&charset,&direct,&sep)==True) {
-//       XtFree(charset);
-//       if(sep==True) Done = True;
-//       if(icount==a_number) { 
-//      ss = text;
-//      break;
-//       }
-//       icount++;
-//       XtFree(text);
-//     }
-//     else
-//       Done = True;
-//   }
-//   XmStringFreeContext(context);
-//   return ss;
-//}
 //////////////////////////////////////////////////////////////////////////////
 G4bool ConvertStringToInt(
@@ -567 +511 @@
   return true; // TO KEEP
 }
-#include <X11/IntrinsicP.h>
-//////////////////////////////////////////////////////////////////////////////
-// void ExecuteChangeSizeFunction (
-//  Widget aWidget
-// )
-// //////////////////////////////////////////////////////////////////////////////
-// //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
-// {
-//   if(aWidget==NULL) return;
-//   if(aWidget->core.widget_class->core_class.resize==NULL) return;
-//   (aWidget->core.widget_class->core_class.resize)(aWidget);
-// }
-
 
 #endif