Changeset 2082 for trunk

Timestamp:

05/06/03 17:06:04 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -92 +92 @@
 #include "MParContainer.h"        // MParContainer::GetDescriptor
 
+#undef DEBUG
+//#define DEBUG
+
 ClassImp(MStatusDisplay);
 
@@ -157 +160 @@
     MGPopupMenu *logmenu = new MGPopupMenu(gClient->GetRoot());
     logmenu->AddEntry("&Copy Selected", kLogCopy);
-    logmenu->AddEntry("Clear all",      kLogClear);
+    logmenu->AddEntry("Cl&ear all",     kLogClear);
     logmenu->AddSeparator();
-    logmenu->AddEntry("Select All",     kLogSelect);
+    logmenu->AddEntry("Select &All",    kLogSelect);
     /*
      logmenu->AddSeparator();
@@ -165 +168 @@
      */
     logmenu->AddSeparator();
-    logmenu->AddEntry("Save",           kLogSave);
-    logmenu->AddEntry("Save append",    kLogAppend);
+    logmenu->AddEntry("&Save",          kLogSave);
+    logmenu->AddEntry("Save &append",   kLogAppend);
     logmenu->Associate(this);
 
@@ -172 +175 @@
     // Menu Bar
     //
+    TGLayoutHints *layitem = new TGLayoutHints(kLHintsNormal, 0, 4, 0, 0);
+    fList->Add(layitem);
+
     MGMenuBar *menubar = new MGMenuBar(this, 1, 1, kHorizontalFrame);
-    menubar->AddPopup("&File", filemenu, NULL);
-    menubar->AddPopup("Lo&g",  logmenu,  NULL);
-    menubar->AddPopup("&Size", sizemenu, NULL);
-    menubar->AddPopup("&Tab",  tabmenu,  NULL);
-    menubar->AddPopup("&Loop", loopmenu, NULL);
+    menubar->AddPopup("&File", filemenu, layitem);
+    menubar->AddPopup("Lo&g",  logmenu,  layitem);
+    menubar->AddPopup("&Size", sizemenu, layitem);
+    menubar->AddPopup("&Tab",  tabmenu,  layitem);
+    menubar->AddPopup("&Loop", loopmenu, layitem);
     menubar->BindKeys(this);
     AddFrame(menubar);
@@ -273 +279 @@
         TGCompositeFrame *f = fTab->AddTab("-Logbook-");
 
-
-        fLogBox = new TGTextView(f, 1, 1/*, -1, 0, TGTextView::GetBlackPixel()*/);
+        // Create Text View
+        fLogBox = new TGTextView(f, 1, 1); // , -1, 0, TGFrame::GetDefaultFrameBackground());
         if (fFont)
             fLogBox->SetFont(fFont);
-        fLogBox->Associate(this);
+        //fLogBox->Associate(this);
 
         // Add List box to the tab
@@ -810 +816 @@
         }
         return kTRUE;
-
+#ifdef DEBUG
     default:
         cout << "Command-Menu #" << id << endl;
+#endif
     }
     return kTRUE;
@@ -828 +835 @@
     case kCM_MENU:
         return ProcessMessageCommandMenu(mp1); // mp2=userdata
-
-    case kCM_MENUSELECT:
-        cout << "Command-Menuselect #" << mp1 << " (UserData=" << (void*)mp2 << ")" << endl;
-        return kTRUE;
-
-    case kCM_BUTTON:
-        cout << "Command-Button." << endl;
-        return kTRUE;
-
-    case kCM_CHECKBUTTON:
-        cout << "Command-CheckButton." << endl;
-        return kTRUE;
-
-    case kCM_RADIOBUTTON:
-        cout << "Command-RadioButton." << endl;
-        return kTRUE;
-
-    case kCM_LISTBOX:
-        cout << "Command-Listbox #" << mp1 << " (LineId #" << mp2 << ")" << endl;
-        return kTRUE;
-
-    case kCM_COMBOBOX:
-        cout << "Command-ComboBox." << endl;
-        return kTRUE;
-
     case kCM_TAB:
         for (int i=1; i<fTab->GetNumberOfTabs(); i++)
@@ -868 +850 @@
         */
         return kTRUE;
-    }
-
-    cout << "Command: " << "Submsg:" << submsg << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
+#ifdef DEBUG
+    case kCM_MENUSELECT:
+        cout << "Command-Menuselect #" << mp1 << " (UserData=" << (void*)mp2 << ")" << endl;
+        return kTRUE;
+
+    case kCM_BUTTON:
+        cout << "Command-Button." << endl;
+        return kTRUE;
+
+    case kCM_CHECKBUTTON:
+        cout << "Command-CheckButton." << endl;
+        return kTRUE;
+
+    case kCM_RADIOBUTTON:
+        cout << "Command-RadioButton." << endl;
+        return kTRUE;
+
+    case kCM_LISTBOX:
+        cout << "Command-Listbox #" << mp1 << " (LineId #" << mp2 << ")" << endl;
+        return kTRUE;
+
+    case kCM_COMBOBOX:
+        cout << "Command-ComboBox." << endl;
+        return kTRUE;
+    default:
+        cout << "Command: " << "Submsg:" << submsg << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
+#endif
+    }
     return kTRUE;
 }
@@ -888 +895 @@
     // kC_TEXTVIEW, kTXT_CLOSE, widget id, 0                                //
     // kC_TEXTVIEW, kTXT_SAVE, widget id, 0                                 //
+#ifdef DEBUG
     switch (submsg)
     {
@@ -921 +929 @@
         cout << "Textview-Save #" << mp1 << endl;
         return kTRUE;
-    }
-
-    cout << "Textview: " << "Submsg:" << submsg << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
+
+    default:
+        cout << "Textview: " << "Submsg:" << submsg << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
+    }
+#endif
     return kTRUE;
 }
@@ -942 +952 @@
         return ProcessMessageTextview(GET_SUBMSG(msg), mp1, mp2);
     }
-
+#ifdef DEBUG
     cout << "Msg: " << GET_MSG(msg) << " Submsg:" << GET_SUBMSG(msg);
     cout << " Mp1=" << mp1 << " Mp2=" << mp2 << endl;
-
+#endif
     return kTRUE;
 }