[Sheets-cvs] sheets .sheetsrc,1.12,1.13 Sheets.sheets,1.41,1.42 todo.txt,1.14,1.15

[<ox-...@us...>]

Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv14682

Modified Files:
	.sheetsrc Sheets.sheets todo.txt 
Log Message:
Minor fixes:
- Fixed tab order in compile dialog
- Fixed error on compiling via compile dialog
- Added a new status message on startup that lists the username
- Added default TAB keybinding for JavaExpert (about time!)
- Fixed tab-completion in search box


Index: .sheetsrc
===================================================================
RCS file: /cvsroot/sheets/sheets/.sheetsrc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** .sheetsrc	22 Apr 2003 22:33:47 -0000	1.12
--- .sheetsrc	24 Apr 2003 09:38:10 -0000	1.13
***************
*** 12,18 ****
  #set screen-insets 0 108 0 0
  
! #set web-browser "explorer.exe"
  # Use this instead for *nix systems:
! set web-browser "mozilla"
  set sheets-documentation-url "doc/reference.html"
  set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api"
--- 12,18 ----
  #set screen-insets 0 108 0 0
  
! set web-browser "explorer.exe"
  # Use this instead for *nix systems:
! #set web-browser "mozilla"
  set sheets-documentation-url "doc/reference.html"
  set java-documentation-url["java.*"] "http://java.sun.com/j2se/1.4/docs/api"
***************
*** 84,87 ****
--- 84,90 ----
  bind change-views-to-header F7
  bind change-views-to-summary F6
+ 
+ bind commit-fragment-edit F10
+ bind commit-container-edits shift-F10
  
  bind show-highlight-dialog ctl-H

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Sheets.sheets	22 Apr 2003 22:33:47 -0000	1.41
--- Sheets.sheets	24 Apr 2003 09:38:10 -0000	1.42
***************
*** 4869,4872 ****
--- 4869,4873 ----
   nkramer:27611
   nkramer:31389
+  schin:1244
   rgs:13433
  object nkramer:647
***************
*** 8805,8808 ****
--- 8806,8810 ----
  section exports nkramer:1209
   nkramer:1211
+  schin:1243
   rgs:13423
   rgs:13422
***************
*** 8829,8862 ****
   type=java
  section text nkramer:1211
!  public CompileDialog (Frame parent) {
!    super(parent, "Compile Program", true);
!    setBackground(Profile.dialogBackground);
!  
!    DesignGridLayout layout = new DesignGridLayout(getContentPane(), DesignGrid.large, 4);
!    layout.setRowSpacing(0);
!    layout.addLabel("Compile command:");
!    layout.add(compileCommand, 2, 2);
!    compileCommand.setText(Profile.compileCommand);
!    layout.nextRow();
!  
!    layout.addLabel("Recompile command:");
!    layout.makeColumnResizable();
!    layout.add(recompileCommand, 2, 2);
!    recompileCommand.setText(Profile.recompileCommand);
!    
!    layout.beginButtonBlock(true);
!    JButton compile = new JButton("Compile");
!    JButton recompile = new JButton("Recompile");
!    JButton cancel = new JButton("Cancel");
!    layout.add(compile);
!    layout.add(recompile);
!    layout.add(cancel);
!    compile.addActionListener(this);
!    recompile.addActionListener(this);
!    cancel.addActionListener(this);
!    layout.endBlock();
!  
!    pack();
!  }
  object nkramer:1213
   pkg=org.browsecode.sheets
--- 8831,8835 ----
   type=java
  section text nkramer:1211
!  private RootFrame CompileDialog.rootFrame;
  object nkramer:1213
   pkg=org.browsecode.sheets
***************
*** 10912,10920 ****
   type=java
  section text nkramer:1679
!  // This initialize method calls all of the above methods.  Were we writing
!  // in Java 1.1, this would probably be an instance initializer instead
!  // of a method...
!  final void LanguageExpert.initialize ()
!  {
     String[] extensions = filenameExtensions();
     for (int i=0; i<extensions.length; i++)
--- 10885,10889 ----
   type=java
  section text nkramer:1679
!  LanguageExpert.<init> {
     String[] extensions = filenameExtensions();
     for (int i=0; i<extensions.length; i++)
***************
*** 11444,11451 ****
     Profile.compileCommand = compileCommand.getText();
     Profile.recompileCommand = recompileCommand.getText();
     if (arg.equals("Compile"))
!      executeLastCommand(false);
     else if (arg.equals("Recompile"))
!      executeLastCommand(true);
   }
  object nkramer:2145
--- 11413,11422 ----
     Profile.compileCommand = compileCommand.getText();
     Profile.recompileCommand = recompileCommand.getText();
+    
+    ViewPanel panel = rootFrame.getVisibleContainer().getEditor();
     if (arg.equals("Compile"))
!      new CompileProgram().checkAndExecute(panel, panel.selectedFragment());
     else if (arg.equals("Recompile"))
!      new RecompileProgram().checkAndExecute(panel, panel.selectedFragment());
   }
  object nkramer:2145
***************
*** 11593,11597 ****
     try {
       LanguageExpert expert = (LanguageExpert)Class.forName(name).newInstance();
-      expert.initialize();
       allExperts.add(expert);
       VectorUtils.append(Profile.defaultViewModifiers, expert.defaultViewModifiers());
--- 11564,11567 ----
***************
*** 71101,71107 ****
     queryField = new JTextField(20);
     queryField.addActionListener(queryAction);
!    Keymap keymap = queryField.addKeymap(null, queryField.getKeymap());
     keymap.addActionForKeyStroke(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_TAB, 0), queryCompleteAction);
-    queryField.setKeymap(keymap);
     queryField.getDocument().addDocumentListener(queryDocumentListener);
     query = new JButton("Go");
--- 71071,71076 ----
     queryField = new JTextField(20);
     queryField.addActionListener(queryAction);
!    Keymap keymap = queryField.getKeymap();
     keymap.addActionForKeyStroke(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_TAB, 0), queryCompleteAction);
     queryField.getDocument().addDocumentListener(queryDocumentListener);
     query = new JButton("Go");
***************
*** 82683,82686 ****
--- 82652,82704 ----
     }
   }
+ object schin:1243
+  pkg=org.browsecode.sheets
+  type=java
+ section text schin:1243
+  public CompileDialog (RootFrame parent) {
+    super(parent, "Compile Program", true);
+    rootFrame = parent;
+    setBackground(Profile.dialogBackground);
+    
+    JPanel fields = new JPanel();
+    JPanel buttons = new JPanel();
+    
+    DesignGridLayout layout = new DesignGridLayout(fields, DesignGrid.small, 3);
+    layout.setRowSpacing(0);
+    layout.addLabel("Compile command:");
+    layout.add(compileCommand, 2, 2);
+    compileCommand.setText(Profile.compileCommand);
+    layout.nextRow();
+  
+    layout.addLabel("Recompile command:");
+    layout.makeColumnResizable();
+    layout.add(recompileCommand, 2, 2);
+    recompileCommand.setText(Profile.recompileCommand);
+    
+    DesignGridLayout buttonLayout = new DesignGridLayout(buttons, DesignGrid.tiny, 1);
+    buttonLayout.beginButtonBlock(true);
+    JButton compile = new JButton("Compile");
+    JButton recompile = new JButton("Recompile");
+    JButton cancel = new JButton("Cancel");
+    buttonLayout.add(compile);
+    buttonLayout.add(recompile);
+    buttonLayout.add(cancel);
+    compile.addActionListener(this);
+    recompile.addActionListener(this);
+    cancel.addActionListener(this);
+    buttonLayout.endBlock();
+  
+    getContentPane().setLayout(new FlowLayout());
+    getContentPane().add(fields);
+    getContentPane().add(buttons);
+    pack();
+  }
+ object schin:1244
+  pkg=org.browsecode.javaStuff
+  type=java
+ section text schin:1244
+  JavaExpert.<init> {
+    Profile.sheetCommands.add("TAB", 0, new CompleteJavaWord());
+  }
  object sjc:1
   pkg=org.browsecode.sheets.dicer
***************
*** 87957,87960 ****
--- 87975,87979 ----
       public void run() {
         createRootFrame();
+        Console.status("Welcome to Sheets, " + Profile.username + "!");
       }
     });
***************
*** 96857,96860 ****
--- 96876,96880 ----
   rgs:13433
   nkramer:31389
+  schin:1244
   lightWeight:separator
   rgs:6426
***************
*** 97711,97714 ****
--- 97731,97735 ----
   rgs:13423
   nkramer:1211
+  schin:1243
   rgs:297
   nkramer:1218

Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** todo.txt	21 Apr 2003 20:27:29 -0000	1.14
--- todo.txt	24 Apr 2003 09:38:13 -0000	1.15
***************
*** 30,33 ****
--- 30,34 ----
  
  Stuff I Want to do:
+ Add a Profile keybinding for search-box completion
  Fix the language expert so that it can lookup the right xml expert by public identifier.
  Create a package/class-lookup routine for the bytecode support (modeled after the ClassPath.java bcel class)