[e-cvs] cvs commit: e/src/jsrc/org/erights/e/ui/jed JedMain.java

[markm@eros.cs.jhu.edu]

markm       01/08/20 11:44:32

  Modified:    src/esrc/scripts eBrowser.e
               src/jsrc/org/erights/e/ui/jed JedMain.java
  Log:
  ui tweaks

Revision  Changes    Path
1.32      +33 -15    e/src/esrc/scripts/eBrowser.e

Index: eBrowser.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eBrowser.e,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- eBrowser.e	2001/08/18 05:19:38	1.31
+++ eBrowser.e	2001/08/20 15:44:31	1.32
@@ -184,6 +184,9 @@
 
 def openFiles := [] asMap() diverge()
 
+# the frame argument is sacrificial
+def fileDialog := <awt:FileDialog> new(<awt:Frame> new())
+
 # TextModel
 class textModelMaker(optBrowseFile) :any {
     def dummyFile {
@@ -268,15 +271,16 @@
     }
 }
 
+
 # elmer scratchpad
-def elmer() {
+def eui__uriGetter := <unsafe:org.erights.e.ui.*>
+def EditGroupMaker := <eui:jed.EditGroup>
+def ElmerMainMaker := <eui:elmer.ElmerMain>
+def EInterpAdapterMaker := <eui:elmer.EInterpAdapter>
 
-    def eui__uriGetter := <unsafe:org.erights.e.ui.*>
-    def EditGroupMaker := <eui:jed.EditGroup>
-    def ElmerMainMaker := <eui:elmer.ElmerMain>
-    def EInterpAdapterMaker := <eui:elmer.EInterpAdapter>
+def group := EditGroupMaker new(false)
 
-    def group := EditGroupMaker new(false)
+def elmer() {
     def first := ElmerMainMaker new(group, EInterpAdapterMaker)
     first setVisible(true)
 }
@@ -376,7 +380,7 @@
                     traceln("floating syntax exception")
                 }
             } else {
-                resultPane append("\n# problem: " + problem + "\n\n" +
+                resultPane append("\n# " + problem + "\n\n" +
                                   problem eStack() + "\n\n" +
                                   problem javaStack())
             }
@@ -459,7 +463,14 @@
     textModel addFuncsChangedAlertRecipient(eBrowser)
     var closingInProcess := false
     def mainFrame := standardWindow("",eBrowser)
-    def setTitle() {mainFrame setTitle("eBrowser-- " + textModel getFileName())}
+    def setTitle {
+        to (isDirty) {
+            # XXX true case is not yet used
+            def marker := if (isDirty) { "*" } else { "" }
+            mainFrame setTitle(textModel getFilePath() + marker + " - eBrowser")
+        }
+        to () {setTitle(false)}
+    }
     def mainPane := mainFrame getContentPane()
     mainFrame setDefaultCloseOperation(
         <swing:WindowConstants> DO_NOTHING_ON_CLOSE())
@@ -503,7 +514,8 @@
         <swing:ScrollPaneConstants> VERTICAL_SCROLLBAR_ALWAYS(),
         <swing:ScrollPaneConstants> HORIZONTAL_SCROLLBAR_ALWAYS())
     scrollingTextPane getViewport() add(textPane)
-    scrollingTextPane setMinimumSize(<awt:Dimension> new(300, 100))
+    scrollingTextPane setMinimumSize(<awt:Dimension> new(200, 100))
+    scrollingTextPane setPreferredSize(<awt:Dimension> new(700, 700))
 
     # build variable list pane
     def varListPopup := <swing:JPopupMenu> new("Var Ops")
@@ -577,7 +589,10 @@
         match _ {}
     }
     funcListPane addMouseListener(funcListPaneListener)
-    scrollingFuncPane setMinimumSize(<awt:Dimension> new(100, 100))
+    funcListPane setMinimumSize(<awt:Dimension> new(200, 100))
+    funcListPane setPreferredSize(<awt:Dimension> new(300, 100)) # why no effect?
+    scrollingFuncPane setMinimumSize(<awt:Dimension> new(200, 100))
+    scrollingFuncPane setPreferredSize(<awt:Dimension> new(300, 100)) # why no effect?
 
     # build output viewpane
     def outputPane := <swing:JTextArea> new()
@@ -629,7 +644,8 @@
         eBrowserMaker new(textModelMaker new(null))
     }
     def openFunc() {
-        def fileDialog := <awt:FileDialog> new(mainFrame, "Pick File To Open", 0)
+        fileDialog setMode(<awt:FileDialog> LOAD())
+        fileDialog setTitle("Pick File To Open")
         fileDialog show()
         def fileName := fileDialog getFile()
         if (fileName != null && fileName size() > 0) {
@@ -648,7 +664,8 @@
     }
     def saveFunc() {eBrowser save()}
     def saveAsFunc() {
-        def fileDialog := <awt:FileDialog> new(mainFrame, "Save File As", 1)
+        fileDialog setMode(<awt:FileDialog> SAVE())
+        fileDialog setTitle("Save File As")
         fileDialog show()
         def fileName := fileDialog getFile()
         if (fileName != null && fileName size() > 0) {
@@ -787,11 +804,12 @@
     textPane setText(textModel getText())
     textPane setCaretPosition(0)
     mainFrame pack()
-    mainFrame setSize(780,500)
+    mainFrame setSize(1100,900)
+    mainFrame setLocation(50 + entropy nextInt() % 30, 50 + entropy nextInt() % 30)
     mainFrame show()
-    E call(outputSplitter, "setDividerLocation(double)",[0.9])
+    # E call(outputSplitter, "setDividerLocation(double)",[0.9])
     def width := varLineSplitter getBounds() width()
-    E call(varLineSplitter, "setDividerLocation(int)",[350])
+    # E call(varLineSplitter, "setDividerLocation(int)",[350])
 
     def windowActiveListener {
         to windowActivated(e) {



1.35      +1 -0      e/src/jsrc/org/erights/e/ui/jed/JedMain.java

Index: JedMain.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/ui/jed/JedMain.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JedMain.java	2001/08/08 05:39:17	1.34
+++ JedMain.java	2001/08/20 15:44:31	1.35
@@ -280,6 +280,7 @@
         myTextArea.setText(text);
         myAmDirty = false;
         setMenuState(); //to remove the bad "*" indicator
+        setVisible(true);
         return true;
     }