[PD-cvs] SF.net SVN: pure-data: [10066] branches/pd-extended/v0-40/pd/src/u_main.tk

[eighthave at users.sourceforge.net]

Revision: 10066
          http://pure-data.svn.sourceforge.net/pure-data/?rev=10066&view=rev
Author:   eighthave
Date:     2008-06-22 11:50:42 -0700 (Sun, 22 Jun 2008)

Log Message:
-----------
reordered items on the File menu so that they match native apps

Modified Paths:
--------------
    branches/pd-extended/v0-40/pd/src/u_main.tk

Modified: branches/pd-extended/v0-40/pd/src/u_main.tk
===================================================================
--- branches/pd-extended/v0-40/pd/src/u_main.tk	2008-06-21 22:24:17 UTC (rev 10065)
+++ branches/pd-extended/v0-40/pd/src/u_main.tk	2008-06-22 18:50:42 UTC (rev 10066)
@@ -798,36 +798,40 @@
 .mbar.file add command -label Open -command {menu_open} \
     -accelerator [accel_munge "Ctrl+o"]
 .mbar.file add  separator
+.mbar.file add command -label Close -accelerator [accel_munge "Ctrl+w"] \
+	-state disabled
+.mbar.file add command -label Save -accelerator [accel_munge "Ctrl+s"] \
+	-state disabled
+.mbar.file add command -label "Save as..." -accelerator [accel_munge "Ctrl+S"] \
+	-state disabled
+.mbar.file add  separator
 if {$pd_nt != 2} {
-	.mbar.file add command -label Message -command {menu_send} \
+	.mbar.file add command -label "Message..." -command {menu_send} \
 		-accelerator [accel_munge "Ctrl+m"]
 	# On MacOS X, follow the standard Human Interface Guidelines
 	# i.e. the Preferences menu under "Pd"
+	.mbar.file add  separator
     .mbar.file add command -label Path... \
         -command {pd pd start-path-dialog \;}
     .mbar.file add command -label Startup... \
         -command {pd pd start-startup-dialog \;}
 } else { # Mac OS X
 	# Cmd-m is minimize window on Mac OS X, so remove binding
-	.mbar.file add command -label Message -command {menu_send}
+	.mbar.file add command -label "Message..." -command {menu_send}
 	.mbar.file add  separator
 	.mbar.file add command -label "Make app from patch..." -state disabled
 	.mbar.file add command -label "Make app from folder..." -state disabled
 }
 .mbar.file add  separator
-.mbar.file add command -label Close -accelerator [accel_munge "Ctrl+w"] \
+.mbar.file add command -label "Print..." -accelerator [accel_munge "Ctrl+p"] \
 	-state disabled
-.mbar.file add command -label Save -accelerator [accel_munge "Ctrl+s"] \
-	-state disabled
-.mbar.file add command -label "Save as..." -accelerator [accel_munge "Ctrl+S"] \
-	-state disabled
-.mbar.file add command -label Print -accelerator [accel_munge "Ctrl+p"] \
-	-state disabled
+if {$pd_nt != 2} {
+# Mac OS X doesn't put Quit on the File menu
 .mbar.file add  separator
 .mbar.file add command -label Quit -command {menu_quit} \
     -accelerator [accel_munge "Ctrl+q"]
+}
 
-
 #################### the "Edit" menu for the Pd window ##############
 # this is mostly a placeholder
 .mbar.edit add command -label Undo -accelerator [accel_munge "Ctrl+z"] \
@@ -1330,10 +1334,21 @@
         -accelerator [accel_munge "Ctrl+o"]
 
     $name.m.file add  separator
+    $name.m.file add command -label Close \
+        -command [concat menu_close $name] \
+        -accelerator [accel_munge "Ctrl+w"]
 
+    $name.m.file add command -label Save -command [concat menu_save $name] \
+        -accelerator [accel_munge "Ctrl+s"]
+
+    $name.m.file add command -label "Save as..." \
+        -command [concat menu_saveas $name] \
+        -accelerator [accel_munge "Ctrl+S"]
+    $name.m.file add  separator
+
     # arrange menus according to Apple HIG
     if {$pd_nt != 2 } {
-		$name.m.file add command -label Message -command {menu_send} \
+		$name.m.file add command -label "Message..." -command {menu_send} \
 			-accelerator [accel_munge "Ctrl+m"]
 		# these are now part of Preferences... on Mac OS X
         $name.m.file add command -label Path... \
@@ -1342,34 +1357,23 @@
             -command {pd pd start-startup-dialog \;} 
     } else { 
 		# Cmd-m is minimize window on Mac OS X		
-		$name.m.file add command -label Message -command {menu_send}
+		$name.m.file add command -label "Message..." -command {menu_send}
 		$name.m.file add  separator
 		$name.m.file add command -label "Make app from patch..." \
 			-command {menu_makeapp 0}
 		$name.m.file add command -label "Make app from folder..." \
 			-command {menu_makeapp 1}
 	}
-
-    $name.m.file add  separator
-    $name.m.file add command -label Close \
-        -command [concat menu_close $name] \
-        -accelerator [accel_munge "Ctrl+w"]
-
-    $name.m.file add command -label Save -command [concat menu_save $name] \
-        -accelerator [accel_munge "Ctrl+s"]
-
-    $name.m.file add command -label "Save as..." \
-        -command [concat menu_saveas $name] \
-        -accelerator [accel_munge "Ctrl+S"]
-
-    $name.m.file add command -label Print -command [concat menu_print $name] \
+    $name.m.file add separator
+    $name.m.file add command -label "Print..." -command [concat menu_print $name] \
         -accelerator [accel_munge "Ctrl+p"]
+	if {$pd_nt != 2} {
+		# Mac OS X doesn't put Quit on the File menu
+		$name.m.file add separator
+		$name.m.file add command -label Quit -command {menu_quit} \
+			-accelerator [accel_munge "Ctrl+q"]
+	}
 
-    $name.m.file add separator
-
-    $name.m.file add command -label Quit -command {menu_quit} \
-        -accelerator [accel_munge "Ctrl+q"]
-
     # the edit menu
     menu $name.m.edit -postcommand [concat menu_fixeditmenu $name] -tearoff $pd_tearoff
     $name.m add cascade -label Edit -menu $name.m.edit


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.