* Rename OSX GUI from "mac" to "macnew" (in preparation for restoring old

  GUI and calling it "mac")

61 files changed, 27 insertions, 7 deletions

diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml
index d573807..410c5fe 100644
--- a/src/Makefile.OCaml
+++ b/src/Makefile.OCaml
@@ -56,12 +56,13 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\/\/
 #     UISTYLE=gtk
 #     UISTYLE=gtk2
 #     UISTYLE=mac
+#     UISTYLE=macnew  (not yet working!)
 #
 # This should be set to an appropriate value automatically, depending
 # on whether the lablgtk library is available
 LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
 LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
-##BCP [3/2007]: Removed temporarily, since OSX UI is not working well 
+##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
 ## at the moment and we don't want to confuse people by building it by default
 ##ifeq ($(OSARCH),osx)
 ##  UISTYLE=mac
@@ -133,20 +134,26 @@ clean::
 
 ifeq ($(UISTYLE),mac)
   buildexecutable:: macexecutable
+  UIMACDIR=uimac
+else
+ifeq ($(UISTYLE),macnew)
+  buildexecutable:: macexecutable
+  UIMACDIR=uimacnew
 else
   buildexecutable:: $(NAME)$(EXEC_EXT)
 endif
+endif
 
 # NOTE: the OCAMLLIBDIR is not getting passed correctly?
 # The two cases for cltool are needed because Xcode 2.1+
 # builds in build/Default/, and earlier versions use build/
 macexecutable: $(NAME)-blob.o
-	sed -e's/@@VERSION@@/$(VERSION)/' uimac/Info.plist.template > uimac/Info.plist
-	(cd uimac; xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)")
-	if [ -e uimac/build/Default ]; then \
-	  gcc uimac/cltool.c -o uimac/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
+	sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
+	(cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)")
+	if [ -e $(UIMACDIR)/build/Default ]; then \
+	  gcc $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
 	else \
-	  gcc uimac/cltool.c -o uimac/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
+	  gcc $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Unison.app/Contents/MacOS/cltool -framework Carbon; \
 	fi
 
 # OCaml objects for the bytecode version
@@ -185,11 +192,16 @@ ifeq ($(UISTYLE), text)
   OCAMLOBJS+=linktext.cmo
 endif
 
-## Mac UI
+## Old Mac UI
 ifeq ($(UISTYLE),mac)
   OCAMLOBJS+=uimacbridge.cmo
 endif
 
+## New Mac UI
+ifeq ($(UISTYLE),macnew)
+  OCAMLOBJS+=uimacbridgenew.cmo
+endif
+
 ## Graphic UI
 
 # Setup the lib directories
diff --git a/src/RECENTNEWS b/src/RECENTNEWS
index 95a8add..045fd1d 100644
--- a/src/RECENTNEWS
+++ b/src/RECENTNEWS
@@ -1,3 +1,10 @@
+CHANGES FROM VERSION 2.27.16
+
+* Rename OSX GUI from "mac" to "macnew" (in preparation for restoring old
+  GUI and calling it "mac")
+
+
+-------------------------------
 CHANGES FROM VERSION 2.27.15
 
 * Make Unison compile out of the box on FreeBSD.  (Thanks to Kurt Bond.)
diff --git a/src/mkProjectInfo.ml b/src/mkProjectInfo.ml
index c4f4af3..39823a5 100644
--- a/src/mkProjectInfo.ml
+++ b/src/mkProjectInfo.ml
@@ -113,3 +113,4 @@ Printf.printf "NAME=%s\n" projectName;;
 
 
 
+
diff --git a/src/uimacbridge.ml b/src/uimacbridgenew.ml
index 849ff24..849ff24 100644
--- a/src/uimacbridge.ml
+++ b/src/uimacbridgenew.ml
diff --git a/src/uimac/English.lproj/InfoPlist.strings b/src/uimacnew/English.lproj/InfoPlist.strings
index f1eb09d..f1eb09d 100644
--- a/src/uimac/English.lproj/InfoPlist.strings
+++ b/src/uimacnew/English.lproj/InfoPlist.strings
diff --git a/src/uimac/English.lproj/MainMenu.nib/classes.nib b/src/uimacnew/English.lproj/MainMenu.nib/classes.nib
index 13554ec..13554ec 100644
--- a/src/uimac/English.lproj/MainMenu.nib/classes.nib
+++ b/src/uimacnew/English.lproj/MainMenu.nib/classes.nib
diff --git a/src/uimac/English.lproj/MainMenu.nib/info.nib b/src/uimacnew/English.lproj/MainMenu.nib/info.nib
index d748bc1..d748bc1 100644
--- a/src/uimac/English.lproj/MainMenu.nib/info.nib
+++ b/src/uimacnew/English.lproj/MainMenu.nib/info.nib
diff --git a/src/uimac/English.lproj/MainMenu.nib/keyedobjects.nib b/src/uimacnew/English.lproj/MainMenu.nib/keyedobjects.nib
index 310eb8e..310eb8e 100644
--- a/src/uimac/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/src/uimacnew/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/src/uimac/English.lproj/MainMenu.nib/objects.nib b/src/uimacnew/English.lproj/MainMenu.nib/objects.nib
index bedbdda..bedbdda 100644
--- a/src/uimac/English.lproj/MainMenu.nib/objects.nib
+++ b/src/uimacnew/English.lproj/MainMenu.nib/objects.nib
diff --git a/src/uimac/Growl.framework/Growl b/src/uimacnew/Growl.framework/Growl
index 85956e2..85956e2 120000
--- a/src/uimac/Growl.framework/Growl
+++ b/src/uimacnew/Growl.framework/Growl
diff --git a/src/uimac/Growl.framework/Headers b/src/uimacnew/Growl.framework/Headers
index a177d2a..a177d2a 120000
--- a/src/uimac/Growl.framework/Headers
+++ b/src/uimacnew/Growl.framework/Headers
diff --git a/src/uimac/Growl.framework/Resources b/src/uimacnew/Growl.framework/Resources
index 953ee36..953ee36 120000
--- a/src/uimac/Growl.framework/Resources
+++ b/src/uimacnew/Growl.framework/Resources
diff --git a/src/uimac/Growl.framework/Versions/A/Growl b/src/uimacnew/Growl.framework/Versions/A/Growl
index 62cb342..62cb342 100755
--- a/src/uimac/Growl.framework/Versions/A/Growl
+++ b/src/uimacnew/Growl.framework/Versions/A/Growl
diff --git a/src/uimac/Growl.framework/Versions/A/Headers/Growl.h b/src/uimacnew/Growl.framework/Versions/A/Headers/Growl.h
index e2a4425..e2a4425 100644
--- a/src/uimac/Growl.framework/Versions/A/Headers/Growl.h
+++ b/src/uimacnew/Growl.framework/Versions/A/Headers/Growl.h
diff --git a/src/uimac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h
index fb70509..fb70509 100644
--- a/src/uimac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h
+++ b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h
diff --git a/src/uimac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
index 7ac315a..7ac315a 100644
--- a/src/uimac/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
+++ b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h
diff --git a/src/uimac/Growl.framework/Versions/A/Headers/GrowlDefines.h b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlDefines.h
index 6ff6ee3..6ff6ee3 100644
--- a/src/uimac/Growl.framework/Versions/A/Headers/GrowlDefines.h
+++ b/src/uimacnew/Growl.framework/Versions/A/Headers/GrowlDefines.h
diff --git a/src/uimac/Growl.framework/Versions/A/Resources/Info.plist b/src/uimacnew/Growl.framework/Versions/A/Resources/Info.plist
index 0444144..0444144 100644
--- a/src/uimac/Growl.framework/Versions/A/Resources/Info.plist
+++ b/src/uimacnew/Growl.framework/Versions/A/Resources/Info.plist
diff --git a/src/uimac/Growl.framework/Versions/Current b/src/uimacnew/Growl.framework/Versions/Current
index 8c7e5a6..8c7e5a6 120000
--- a/src/uimac/Growl.framework/Versions/Current
+++ b/src/uimacnew/Growl.framework/Versions/Current
diff --git a/src/uimac/Info.plist.template b/src/uimacnew/Info.plist.template
index 22a46af..22a46af 100644
--- a/src/uimac/Info.plist.template
+++ b/src/uimacnew/Info.plist.template
diff --git a/src/uimac/MyController.h b/src/uimacnew/MyController.h
index bccb607..bccb607 100644
--- a/src/uimac/MyController.h
+++ b/src/uimacnew/MyController.h
diff --git a/src/uimac/MyController.m b/src/uimacnew/MyController.m
index a2f6c50..a2f6c50 100644
--- a/src/uimac/MyController.m
+++ b/src/uimacnew/MyController.m
diff --git a/src/uimac/NotificationController.h b/src/uimacnew/NotificationController.h
index 899bf83..899bf83 100644
--- a/src/uimac/NotificationController.h
+++ b/src/uimacnew/NotificationController.h
diff --git a/src/uimac/NotificationController.m b/src/uimacnew/NotificationController.m
index 7749534..7749534 100644
--- a/src/uimac/NotificationController.m
+++ b/src/uimacnew/NotificationController.m
diff --git a/src/uimac/PreferencesController.h b/src/uimacnew/PreferencesController.h
index 4a4a330..4a4a330 100644
--- a/src/uimac/PreferencesController.h
+++ b/src/uimacnew/PreferencesController.h
diff --git a/src/uimac/PreferencesController.m b/src/uimacnew/PreferencesController.m
index e5479ac..e5479ac 100644
--- a/src/uimac/PreferencesController.m
+++ b/src/uimacnew/PreferencesController.m
diff --git a/src/uimac/ProfileController.h b/src/uimacnew/ProfileController.h
index 20bbc97..20bbc97 100644
--- a/src/uimac/ProfileController.h
+++ b/src/uimacnew/ProfileController.h
diff --git a/src/uimac/ProfileController.m b/src/uimacnew/ProfileController.m
index 0515399..0515399 100644
--- a/src/uimac/ProfileController.m
+++ b/src/uimacnew/ProfileController.m
diff --git a/src/uimac/ProfileTableView.h b/src/uimacnew/ProfileTableView.h
index 2ff6a86..2ff6a86 100644
--- a/src/uimac/ProfileTableView.h
+++ b/src/uimacnew/ProfileTableView.h
diff --git a/src/uimac/ProfileTableView.m b/src/uimacnew/ProfileTableView.m
index 7a3c1e1..7a3c1e1 100644
--- a/src/uimac/ProfileTableView.m
+++ b/src/uimacnew/ProfileTableView.m
diff --git a/src/uimac/ReconItem.h b/src/uimacnew/ReconItem.h
index 2e4f074..2e4f074 100644
--- a/src/uimac/ReconItem.h
+++ b/src/uimacnew/ReconItem.h
diff --git a/src/uimac/ReconItem.m b/src/uimacnew/ReconItem.m
index 544d070..544d070 100644
--- a/src/uimac/ReconItem.m
+++ b/src/uimacnew/ReconItem.m
diff --git a/src/uimac/ReconTableView.h b/src/uimacnew/ReconTableView.h
index a976bc6..a976bc6 100644
--- a/src/uimac/ReconTableView.h
+++ b/src/uimacnew/ReconTableView.h
diff --git a/src/uimac/ReconTableView.m b/src/uimacnew/ReconTableView.m
index 4021f43..4021f43 100644
--- a/src/uimac/ReconTableView.m
+++ b/src/uimacnew/ReconTableView.m
diff --git a/src/uimac/TrevorsUnison.icns b/src/uimacnew/TrevorsUnison.icns
index e1fa6f8..e1fa6f8 100644
--- a/src/uimac/TrevorsUnison.icns
+++ b/src/uimacnew/TrevorsUnison.icns
diff --git a/src/uimac/Unison.icns b/src/uimacnew/Unison.icns
index b7a4e60..b7a4e60 100644
--- a/src/uimac/Unison.icns
+++ b/src/uimacnew/Unison.icns
diff --git a/src/uimac/UnisonToolbar.h b/src/uimacnew/UnisonToolbar.h
index 2020808..2020808 100644
--- a/src/uimac/UnisonToolbar.h
+++ b/src/uimacnew/UnisonToolbar.h
diff --git a/src/uimac/UnisonToolbar.m b/src/uimacnew/UnisonToolbar.m
index fef964f..fef964f 100644
--- a/src/uimac/UnisonToolbar.m
+++ b/src/uimacnew/UnisonToolbar.m
diff --git a/src/uimac/cltool.c b/src/uimacnew/cltool.c
index 9a1049d..9a1049d 100644
--- a/src/uimac/cltool.c
+++ b/src/uimacnew/cltool.c
diff --git a/src/uimac/main.m b/src/uimacnew/main.m
index 1d8cb8d..1d8cb8d 100644
--- a/src/uimac/main.m
+++ b/src/uimacnew/main.m
diff --git a/src/uimac/tableicons/table-conflict.tif b/src/uimacnew/tableicons/table-conflict.tif
index b84cd1b..b84cd1b 100644
--- a/src/uimac/tableicons/table-conflict.tif
+++ b/src/uimacnew/tableicons/table-conflict.tif
diff --git a/src/uimac/tableicons/table-error.tif b/src/uimacnew/tableicons/table-error.tif
index 72ebafb..72ebafb 100644
--- a/src/uimac/tableicons/table-error.tif
+++ b/src/uimacnew/tableicons/table-error.tif
diff --git a/src/uimac/tableicons/table-left-blue.tif b/src/uimacnew/tableicons/table-left-blue.tif
index 9a2ad1b..9a2ad1b 100644
--- a/src/uimac/tableicons/table-left-blue.tif
+++ b/src/uimacnew/tableicons/table-left-blue.tif
diff --git a/src/uimac/tableicons/table-left-green.tif b/src/uimacnew/tableicons/table-left-green.tif
index e5f2909..e5f2909 100644
--- a/src/uimac/tableicons/table-left-green.tif
+++ b/src/uimacnew/tableicons/table-left-green.tif
diff --git a/src/uimac/tableicons/table-merge.tif b/src/uimacnew/tableicons/table-merge.tif
index beb33ff..beb33ff 100644
--- a/src/uimac/tableicons/table-merge.tif
+++ b/src/uimacnew/tableicons/table-merge.tif
diff --git a/src/uimac/tableicons/table-right-blue.tif b/src/uimacnew/tableicons/table-right-blue.tif
index 6cc7f30..6cc7f30 100644
--- a/src/uimac/tableicons/table-right-blue.tif
+++ b/src/uimacnew/tableicons/table-right-blue.tif
diff --git a/src/uimac/tableicons/table-right-green.tif b/src/uimacnew/tableicons/table-right-green.tif
index 6a8a420..6a8a420 100644
--- a/src/uimac/tableicons/table-right-green.tif
+++ b/src/uimacnew/tableicons/table-right-green.tif
diff --git a/src/uimac/tableicons/table-skip.tif b/src/uimacnew/tableicons/table-skip.tif
index 4cc8b8c..4cc8b8c 100644
--- a/src/uimac/tableicons/table-skip.tif
+++ b/src/uimacnew/tableicons/table-skip.tif
diff --git a/src/uimac/toolbar/add.tif b/src/uimacnew/toolbar/add.tif
index 7d1e413..7d1e413 100644
--- a/src/uimac/toolbar/add.tif
+++ b/src/uimacnew/toolbar/add.tif
diff --git a/src/uimac/toolbar/diff.tif b/src/uimacnew/toolbar/diff.tif
index c424403..c424403 100644
--- a/src/uimac/toolbar/diff.tif
+++ b/src/uimacnew/toolbar/diff.tif
diff --git a/src/uimac/toolbar/go.tif b/src/uimacnew/toolbar/go.tif
index ed368e3..ed368e3 100644
--- a/src/uimac/toolbar/go.tif
+++ b/src/uimacnew/toolbar/go.tif
diff --git a/src/uimac/toolbar/left.tif b/src/uimacnew/toolbar/left.tif
index 0633aff..0633aff 100644
--- a/src/uimac/toolbar/left.tif
+++ b/src/uimacnew/toolbar/left.tif
diff --git a/src/uimac/toolbar/merge.tif b/src/uimacnew/toolbar/merge.tif
index d41dc06..d41dc06 100644
--- a/src/uimac/toolbar/merge.tif
+++ b/src/uimacnew/toolbar/merge.tif
diff --git a/src/uimac/toolbar/quit.tif b/src/uimacnew/toolbar/quit.tif
index f2911c2..f2911c2 100644
--- a/src/uimac/toolbar/quit.tif
+++ b/src/uimacnew/toolbar/quit.tif
diff --git a/src/uimac/toolbar/rescan.tif b/src/uimacnew/toolbar/rescan.tif
index 5e9ac45..5e9ac45 100644
--- a/src/uimac/toolbar/rescan.tif
+++ b/src/uimacnew/toolbar/rescan.tif
diff --git a/src/uimac/toolbar/restart.tif b/src/uimacnew/toolbar/restart.tif
index fe58a07..fe58a07 100644
--- a/src/uimac/toolbar/restart.tif
+++ b/src/uimacnew/toolbar/restart.tif
diff --git a/src/uimac/toolbar/right.tif b/src/uimacnew/toolbar/right.tif
index 1391f49..1391f49 100644
--- a/src/uimac/toolbar/right.tif
+++ b/src/uimacnew/toolbar/right.tif
diff --git a/src/uimac/toolbar/save.tif b/src/uimacnew/toolbar/save.tif
index bc1a468..bc1a468 100644
--- a/src/uimac/toolbar/save.tif
+++ b/src/uimacnew/toolbar/save.tif
diff --git a/src/uimac/toolbar/skip.tif b/src/uimacnew/toolbar/skip.tif
index 7ca1bb9..7ca1bb9 100644
--- a/src/uimac/toolbar/skip.tif
+++ b/src/uimacnew/toolbar/skip.tif
diff --git a/src/uimac/uimac.pbproj/project.pbxproj b/src/uimacnew/uimac.pbproj/project.pbxproj
index 5fd3d1d..5fd3d1d 100644
--- a/src/uimac/uimac.pbproj/project.pbxproj
+++ b/src/uimacnew/uimac.pbproj/project.pbxproj
diff --git a/src/uimac/uimac.xcodeproj/project.pbxproj b/src/uimacnew/uimac.xcodeproj/project.pbxproj
index 66719df..66719df 100644
--- a/src/uimac/uimac.xcodeproj/project.pbxproj
+++ b/src/uimacnew/uimac.xcodeproj/project.pbxproj