--- capa/capa51/GUITools/grader.tcl	1999/09/28 21:25:36	1.1.1.1
+++ capa/capa51/GUITools/grader.tcl	2000/08/07 20:47:29	1.6
@@ -1,6 +1,29 @@
+#  GUI to changing student's grades
+#  Copyright (C) 1992-2000 Michigan State University
+#
+#  The CAPA system is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  The CAPA system is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public
+#  License along with the CAPA system; see the file COPYING.  If not,
+#  write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
+#
+#  As a special exception, you have permission to link this program
+#  with the TtH/TtM library and distribute executables, as long as you
+#  follow the requirements of the GNU GPL in regard to all of the
+#  software in the executable aside from TtH/TtM.
+
 ###########################################################
 # grader.tcl - 
-# Copyright Guy Albertelli II 1996
+# Created Guy Albertelli II 1996
 ###########################################################
 set gTclVer 2.0
 
@@ -38,7 +61,12 @@ proc createControlWindow {} {
     $menuFrame add command -label "Grader" -foreground grey85 -background \
 	    black -state disabled 
     $menuFrame add command -label "Info..." -command { createInfoWindow }
-    $menuFrame add cascade -label "File" -menu $menuFrame.file
+    $menuFrame add command -label "Specify Class" -command { specifyClass }
+    $menuFrame add command -label "Create Class Report" -command { \
+	    createSummaryWindow }
+    $menuFrame add command -label "Grade Subjective" -command { gradeSubjective }
+
+#    $menuFrame add cascade -label "File" -menu $menuFrame.file
     $menuFrame add command -label "Excuse Problem" -command { \
 	    createExcuseWindow }
     $menuFrame add cascade -label "Windows" -menu $menuFrame.windows
@@ -46,16 +74,11 @@ proc createControlWindow {} {
     $menuFrame add command -label "Remap..." -command { createRemapWindow }
     $menuFrame add command -label "Quit" -command { quit }
 
-    set file  [menu $menuFrame.file -tearoff 1 -font 8x13bold ]
+#    set file  [menu $menuFrame.file -tearoff 1 -font 8x13bold ]
     set windows [menu $menuFrame.windows -tearoff 1 -font 8x13bold]
     set print    [menu $menuFrame.print -tearoff 1  -font 8x13bold]
     set gWindowMenu $windows
     
-    $file add command -label "Specify Class" -command { specifyClass }
-    $file add command -label "Create Class Report" -command { \
-	    createSummaryWindow }
-    $file add command -label "Grade Subjective" -command { gradeSubjective }
-
     $print add command -label "Set Summary" -command { printSetSummary }
     $print add command -label "Term Summary" -command { printTermSummary }
 
@@ -93,7 +116,7 @@ proc createInfoWindow {} {
     label $about.l1 -font 12x24 -text "Grader $gVer" -pady 20
     label $about.l4 -font 8x13 -text "Grader.tcl Version $gTclVer" -pady 20
     label $about.l6  -font 8x13 -text "$gCompileDate" 
-    message $about.l2 -font 8x13 -text "Code by: Y. Tsai, G. Albertelli II Copyright Michigan State University Board of Trustees, 1992-1999, No Unauthorized Commercial Use" \
+    message $about.l2 -font 8x13 -text "Code by: Y. Tsai, G. Albertelli II Copyright Michigan State University Board of Trustees, 1992-2000, CAPA is released under to GNU GPL v2, and comes WITHOUT ANY WARRENTY, see COPYING for details." \
        -pady 20 -aspect 300
     label $about.l3 -font 8x13 -textvariable gDate 
     label $about.l5  -font 8x13 -textvariable gCmd
@@ -446,7 +469,7 @@ proc createSummaryReport {} {
 	}
 	default
 	{
-	    displayError "An error has occured while creating a summary \
+	    displayError "An error has occurred while creating a summary \
 		    report $gSummary(section)"
 	    return
 	}
@@ -974,7 +997,7 @@ proc printBody { lprCommand } {
     exec /bin/rm -f /tmp/g[pid]
 
     if { $error == 1 } {
-        displayError "When attempting to print an error occured : $errorMsg"
+        displayError "When attempting to print an error occurred : $errorMsg"
 	return 1
     } else {
 	displayMessage "Print job sent to the printer.\n $returnMessage"