diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index cc5fc6ce4111d9d01407b9a96ae8835ec28cc32f..f530ba82f1750877bf70e87d09a95e8ad415d9c9 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.267 2004-09-03 19:00:51 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.268 2004-09-11 06:38:22 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -94,6 +94,8 @@ int file_chooser(int multi, int create, const char *message,
fc->type(Fl_File_Chooser::SINGLE);
fc->show();
+ //fc->newButton->parent()->parent()->position(200,200);
+ //fc->newButton->parent()->parent()->show();
while(fc->shown())
Fl::wait();
diff --git a/Fltk/MacIconsGeo.icns b/Fltk/MacIconsGeo.icns
new file mode 100644
index 0000000000000000000000000000000000000000..439c6e737b3f3a2fdf328825e59cf971a9f6d576
Binary files /dev/null and b/Fltk/MacIconsGeo.icns differ
diff --git a/Fltk/MacIconsMsh.icns b/Fltk/MacIconsMsh.icns
new file mode 100644
index 0000000000000000000000000000000000000000..8ab3d78407bb61777da159e05ea2837ea87b274a
Binary files /dev/null and b/Fltk/MacIconsMsh.icns differ
diff --git a/Fltk/MacIconsPos.icns b/Fltk/MacIconsPos.icns
new file mode 100644
index 0000000000000000000000000000000000000000..df67b94f47c6a78d1d847eaa701dc93380c724d7
Binary files /dev/null and b/Fltk/MacIconsPos.icns differ
diff --git a/Makefile b/Makefile
index f18ca53c54fbce7a937aee6a9f360467d0ec2ec0..baa8d86692dbf275c15c80cd902ac32dbc2bc890 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.366 2004-09-01 22:07:29 geuzaine Exp $
+# $Id: Makefile,v 1.367 2004-09-11 06:38:22 geuzaine Exp $
#
# Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
#
@@ -210,7 +210,7 @@ package-mac:
" <key>CFBundlePackageType</key><string>APPL</string>\n"\
" <key>CFBundleVersion</key><string>${GMSH_VERSION}</string>\n"\
" <key>CFBundleShortVersionString</key><string>${GMSH_VERSION}</string>\n"\
- " <key>CFBundleIconFile</key><string>gmsh.icns</string>\n"\
+ " <key>CFBundleIconFile</key><string>Gmsh.icns</string>\n"\
" <key>CFBundleSignature</key><string>GMSH</string>\n"\
" <key>CFBundleGetInfoString</key><string>Gmsh version ${GMSH_VERSION}, "\
"Copyright (C) 1997-2004 C. Geuzaine and J.-F. Remacle</string>\n"\
@@ -219,21 +219,21 @@ package-mac:
" <array>\n"\
" <dict>\n"\
" <key>CFBundleTypeExtensions</key><array><string>geo</string></array>\n"\
- " <key>CFBundleTypeIconFile</key><string>gmsh.icns</string>\n"\
+ " <key>CFBundleTypeIconFile</key><string>GmshGeo.icns</string>\n"\
" <key>CFBundleTypeName</key><string>Gmsh Geometry File</string>\n"\
" <key>CFBundleTypeOSTypes</key><array><string>GGEO</string></array>\n"\
" <key>CFBundleTypeRole</key><string>Editor</string>\n"\
" </dict>\n"\
" <dict>\n"\
" <key>CFBundleTypeExtensions</key><array><string>msh</string></array>\n"\
- " <key>CFBundleTypeIconFile</key><string>gmsh.icns</string>\n"\
+ " <key>CFBundleTypeIconFile</key><string>GmshMsh.icns</string>\n"\
" <key>CFBundleTypeName</key><string>Gmsh Mesh File</string>\n"\
" <key>CFBundleTypeOSTypes</key><array><string>GMSH</string></array>\n"\
" <key>CFBundleTypeRole</key><string>Viewer</string>\n"\
" </dict>\n"\
" <dict>\n"\
" <key>CFBundleTypeExtensions</key><array><string>pos</string></array>\n"\
- " <key>CFBundleTypeIconFile</key><string>gmsh.icns</string>\n"\
+ " <key>CFBundleTypeIconFile</key><string>GmshPos.icns</string>\n"\
" <key>CFBundleTypeName</key><string>Gmsh Post-Processing File</string>\n"\
" <key>CFBundleTypeOSTypes</key><array><string>GPOS</string></array>\n"\
" <key>CFBundleTypeRole</key><string>Viewer</string>\n"\
@@ -243,7 +243,10 @@ package-mac:
"</plist>" > gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Info.plist
cp bin/gmsh gmsh-${GMSH_VERSION}/Gmsh.app/Contents/MacOS/Gmsh
strip gmsh-${GMSH_VERSION}/Gmsh.app/Contents/MacOS/Gmsh
- cp Fltk/MacIcons.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/gmsh.icns
+ cp Fltk/MacIcons.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/Gmsh.icns
+ cp Fltk/MacIconsGeo.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshGeo.icns
+ cp Fltk/MacIconsMsh.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshMsh.icns
+ cp Fltk/MacIconsPos.icns gmsh-${GMSH_VERSION}/Gmsh.app/Contents/Resources/GmshPos.icns
cp -R doc/gmsh.1 tutorial demos gmsh-${GMSH_VERSION}
cp doc/VERSIONS gmsh-${GMSH_VERSION}/VERSIONS.txt
cp doc/FAQ gmsh-${GMSH_VERSION}/FAQ.txt
diff --git a/TODO b/TODO
index 8020a10509d0f4f206329c7fc7c4ce99142db3b9..c9651c23c439ef3f767c50e3819a0136cc16f893 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.61 2004-09-01 20:23:49 geuzaine Exp $
+$Id: TODO,v 1.62 2004-09-11 06:38:22 geuzaine Exp $
add an interactive way to choose the orientation of surfaces in
surface loops and lines in line loops
@@ -9,6 +9,13 @@ normals...)
********************************************************************
+template the view handling/drawing routines so that we can actually
+use post-pro files with float values (50% file savings can be nice
+for very large maps; would bring the format up to par with an
+index-based format)
+
+********************************************************************
+
Raise & offsets should modify the bouding boxes... (maybe?)
********************************************************************
diff --git a/utils/icons/gmsh-document.xcf b/utils/icons/gmsh-document.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..e37745a144511778289cf75eca300ba0d30780e6
Binary files /dev/null and b/utils/icons/gmsh-document.xcf differ