Changeset 2109 for trunk/MagicSoft/Mars/mmain

Timestamp:

05/10/03 18:27:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MStatusDisplay.cc (modified) (6 diffs)
• MStatusDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -72 +72 @@
 #include <TDatime.h>              // TDatime
 #include <TRandom.h>              // TRandom
+#include <TBrowser.h>             // TBrowser
 #include <TObjArray.h>            // TObjArray
 #include <TPostScript.h>          // TPostScript
@@ -169 +170 @@
     //
     MGPopupMenu *filemenu = new MGPopupMenu(gClient->GetRoot());
-    // filemenu->AddEntry("S&ave [F2]", kFileSave);
-    // filemenu->AddEntry("Save &As... [Shift-F2]", kFileSaveAs);
+    // filemenu->AddEntry("Save &As...", kFileSaveAs);
+    filemenu->AddEntry("New Can&vas",   kFileCanvas);
+    filemenu->AddEntry("New &Browser",  kFileBrowser);
+    filemenu->AddSeparator();
     filemenu->AddEntry("Save As status.&ps",   kFileSaveAsPS);
     filemenu->AddEntry("Save As status.&gif",  kFileSaveAsGIF);
@@ -177 +180 @@
     filemenu->AddSeparator();
     filemenu->AddEntry("Print with &lpr",      kFilePrint);
-    filemenu->AddEntry("Set printer &name",    kFilePrinterName);
+    //filemenu->AddEntry("Set printer &name",    kFilePrinterName);
     filemenu->AddSeparator();
     filemenu->AddEntry("E&xit", kFileExit);
@@ -186 +189 @@
     //
     MGPopupMenu *tabmenu = new MGPopupMenu(gClient->GetRoot());
-    // tabmenu->AddEntry("S&ave [F2]", kFileSave);
-    // tabmenu->AddEntry("Save &As... [Shift-F2]", kFileSaveAs);
+    // tabmenu->AddEntry("Save &As...", kFileSaveAs);
     tabmenu->AddEntry("Save As tab-i.&ps",   kTabSaveAsPS);
     tabmenu->AddEntry("Save As tab-i.&gif",  kTabSaveAsGIF);
@@ -760 +762 @@
         fStatus = (Status_t)id;
         return kTRUE;
-/*
+
+    case kFileCanvas:
+        new TCanvas;
+        return kTRUE;
+
+    case kFileBrowser:
+        new TBrowser;
+        return kTRUE;
+
+        /*
     case kFileSave:
         cout << "Save..." << endl;
@@ -1356 +1367 @@
     TPostScript ps(name, 112);
     ps.SetBit(TPad::kPrintingPS);
+
+    //%%DocumentPaperSizes: a4
+    //%%Orientation: Portrait
+
     ps.PrintFast(13, "/nan {1} def ");
 

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -33 +33 @@
     typedef enum {
         // KFile
-        kFileSave, kFileSaveAs, kFileSaveAsPS, kFileSaveAsRoot,
-        kFileSaveAsGIF, kFileSaveAsC, kFilePrint, kFilePrinterName,
-        kFileExit,
+        kFileBrowser, kFileCanvas, kFileSave, kFileSaveAs, kFileSaveAsPS,
+        kFileSaveAsRoot, kFileSaveAsGIF, kFileSaveAsC, kFilePrint,
+        kFilePrinterName, kFileExit,
         // kLoop
         kLoopNone, kLoopStop,