Thread: [Sheets-cvs] sheets Sheets.sheets,1.13,1.14

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/sheets/sheets
In directory usw-pr-cvs1:/tmp/cvs-serv21444

Modified Files:
	Sheets.sheets 
Log Message:
Many minor changes:
 - changed +/- to arrows (basic, but slightly improved)
 - Fixed status line repaint delay -- it paints when it is updated instead of waiting for spare cycles
 - Font colors:  This is debatable.  I changed a few font colors to be slightly less obnoxious -- bright red comments are now dark gray, blending into the code better.  This needs to be made consistent with the rest of sheets -- comments in the left class listing panel are still red :(
 - Other minor things that I've forgotten

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Sheets.sheets	15 Jul 2002 20:44:16 -0000	1.13
--- Sheets.sheets	23 Jul 2002 02:05:21 -0000	1.14
***************
*** 256,259 ****
--- 256,269 ----
     // subclasses responsible for calling allocateArchivalReference
   }
+ object Administrator:3
+  pkg=org.browsecode.sheets
+  type=java
+ section text Administrator:3
+  public static final Color Profile.saveButtonColor = Color.lightGray;//new Color(10, 250, 90);
+ object Administrator:4
+  pkg=org.browsecode.sheets
+  type=java
+ section text Administrator:4
+  public static final Color Profile.cancelButtonColor = Color.lightGray;//new Color(250, 10, 90);
  object apowers:0
   pkg=org.browsecode.sheets
***************
*** 1026,1031 ****
   public GridConstrainer (Container container) {
     this.container = container;
!    container.setLayout(new GridBagLayout());
!    layout = (GridBagLayout)container.getLayout();
   }
  object nkramer:66
--- 1036,1044 ----
   public GridConstrainer (Container container) {
     this.container = container;
!    layout = new GridBagLayout();
!    if (container instanceof JFrame) {
!      ((JFrame)container).getContentPane().setLayout(layout);
!    } else
!      container.setLayout(layout);
   }
  object nkramer:66
***************
*** 4703,4708 ****
   // for IO errors. 
   private synchronized Fragment[] JavaFragmentParser.parseIntoFragments ()
!      throws IOException
!  {
     // I think the synchronized keyword is at this point purely historical,
     // but I don't really want to find out the hard way.
--- 4716,4720 ----
   // for IO errors. 
   private synchronized Fragment[] JavaFragmentParser.parseIntoFragments ()
!      throws IOException {
     // I think the synchronized keyword is at this point purely historical,
     // but I don't really want to find out the hard way.
***************
*** 7827,7833 ****
   
     if (exportCleanSheets)
!      Console.status("Exporting everything.");
     else
!      Console.status("Exporting dirty stuff.");
     if (!interactive) {
       // just do it immediately
--- 7839,7845 ----
   
     if (exportCleanSheets)
!      Console.status("Exporting everything...");
     else
!      Console.status("Exporting dirty stuff...");
     if (!interactive) {
       // just do it immediately
***************
*** 8600,8603 ****
--- 8612,8617 ----
   sjc:562
   sjc:563
+  Administrator:3
+  Administrator:4
   nkramer:6587
   nkramer:6562
***************
*** 9143,9147 ****
   
     Console.log("Executing " + cmd + " -- output follows:");
!    Console.status("Executing " + cmd);
   
   // this hack causes a problem with ChangeCommands (since the return occurs before the command is complete)...  need to find a better way to accomplish this (have the execute launch a separate thread, probably)
--- 9157,9161 ----
   
     Console.log("Executing " + cmd + " -- output follows:");
!    Console.status("Executing '" + cmd+"'...");
   
   // this hack causes a problem with ChangeCommands (since the return occurs before the command is complete)...  need to find a better way to accomplish this (have the execute launch a separate thread, probably)
***************
*** 17167,17171 ****
   type=java
  section text nkramer:6553
!  public static final Color Profile.commentColor = Color.red;
  object nkramer:6554
   pkg=org.browsecode.sheets
--- 17181,17185 ----
   type=java
  section text nkramer:6553
!  public static final Color Profile.commentColor = new Color(90, 70, 90); //used to be Color.red, but it was a bit obnoxious, low-contrast, and caught too much attention.  This could be a dark gray, which sorta fades into the background (which is good, comments aren't supposed to more important than code).  A slight purple tinge seems to be okay, but this is debatable.
  object nkramer:6554
   pkg=org.browsecode.sheets
***************
*** 26869,26873 ****
       JFileChooser dialog = new JFileChooser();
       dialog.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
!      dialog.setDialogTitle("Select File or Direcotry to Import");
       int returnVal = dialog.showOpenDialog(getParent()); // does not return until the dialog is closed
       if (returnVal == JFileChooser.APPROVE_OPTION) {
--- 26883,26887 ----
       JFileChooser dialog = new JFileChooser();
       dialog.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
!      dialog.setDialogTitle("Select File or Directory to Import");
       int returnVal = dialog.showOpenDialog(getParent()); // does not return until the dialog is closed
       if (returnVal == JFileChooser.APPROVE_OPTION) {
***************
*** 64405,64408 ****
--- 64419,64426 ----
       pane.text.setForeground(Profile.black);
       pane.text.setText(line);
+      //pane.text.doLayout();
+      //pane.text.repaint();
+      pane.text.paint(pane.text.getGraphics());
+      //System.out.println("new: "+line);
     }
   }
***************
*** 71260,71264 ****
   
       try {
!        Console.status("Importing " + file.toString());
         return expert.importFile(file, project, makeExported ? ImportTask.EXPORT_RELATIVE : ImportTask.NO_EXPORT, sharedCreations);
       }
--- 71278,71282 ----
   
       try {
!        Console.status("Importing \\"" + file.toString()+"\\"...");
         return expert.importFile(file, project, makeExported ? ImportTask.EXPORT_RELATIVE : ImportTask.NO_EXPORT, sharedCreations);
       }
***************
*** 80759,80768 ****
  section text schin:522
   public void TextualViewer.paintTreeWidget (Graphics g, int line, int tabWidth, boolean collapse) {
!    int height = lineHeight();
     int startX = tabWidth - 5;
     int startY = lineBase(line, 0) + descent();
!    g.drawLine(startX, startY - height / 2, startX + 4, startY - height / 2);
     if (collapse) g.drawLine(startX + 2, startY - ((height / 2) + 2), 
!                                startX + 2, startY - ((height / 2) - 2));
   }
  object schin:523
--- 80777,80814 ----
  section text schin:522
   public void TextualViewer.paintTreeWidget (Graphics g, int line, int tabWidth, boolean collapse) {
!    int lineHeight = lineHeight();
     int startX = tabWidth - 5;
     int startY = lineBase(line, 0) + descent();
!    g.setColor(Color.darkGray);
!    
!    /*int minY = startY-height+height/3;
!    int middleY = startY-height/2;
!    int maxY = startY-height/3;*/
!    int height = lineHeight-2*lineHeight/3;
!    int minY = startY-lineHeight+lineHeight/3;
!    int middleY = minY+height/2;
!    int maxY = minY+height;
!  
!    int minX=tabWidth-height;
!    int middleX = tabWidth-height/2;
!    int maxX = tabWidth;
!    /*int minX=tabWidth-6;
!    int middleX = tabWidth-3;
!    int maxX = tabWidth;*/
!    
!    if (collapse) {
!      // Arrow to the right
!      g.drawLine(minX, minY, maxX, middleY);
!      g.drawLine(minX, maxY, maxX, middleY);
!      g.drawLine(minX, maxY, minX, minY);
!    } else {
!      // Down arrow
!      g.drawLine(minX, minY, middleX, maxY);
!      g.drawLine(maxX, minY, middleX, maxY);
!      g.drawLine(minX, minY, maxX, minY);
!    }
!    /*g.drawLine(startX, startY - height / 2, startX + 4, startY - height / 2);
     if (collapse) g.drawLine(startX + 2, startY - ((height / 2) + 2), 
!                                startX + 2, startY - ((height / 2) - 2));*/
   }
  object schin:523
***************
*** 91721,91726 ****
     if (isBeingEdited()) {
       // Draw the commit and abort buttons.
!      paintButton(g, "Save", 0, Color.green);
!      paintButton(g, "Cancel", BUTTON_WIDTH + BUTTON_GAP, Color.red);
     }
   }
--- 91767,91772 ----
     if (isBeingEdited()) {
       // Draw the commit and abort buttons.
!      paintButton(g, "Save", 0, Profile.saveButtonColor);
!      paintButton(g, "Cancel", BUTTON_WIDTH + BUTTON_GAP, Profile.cancelButtonColor);
     }
   }
***************
*** 94201,94204 ****
--- 94247,94252 ----
   sjc:562
   sjc:563
+  Administrator:3
+  Administrator:4
   nkramer:6559
   nkramer:6587

Thread: [Sheets-cvs] sheets Sheets.sheets,1.13,1.14

sheets-cvs