From aeef6f233323014fee80c0928321aa97733f7a74 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 16 Dec 2006 18:38:52 +0000
Subject: [PATCH] better integration with mac finder
---
Makefile | 15 ++++++++++++---
Parser/OpenFile.cpp | 11 ++++-------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index a9498310d6..f9f35a455f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.423 2006-11-28 20:17:44 geuzaine Exp $
+# $Id: Makefile,v 1.424 2006-12-16 18:38:52 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -227,14 +227,23 @@ package-mac:
" <key>CFBundleDocumentTypes</key>\n"\
" <array>\n"\
" <dict>\n"\
- " <key>CFBundleTypeExtensions</key><array><string>geo</string></array>\n"\
+ " <key>CFBundleTypeExtensions</key><array>\n"\
+ " <string>geo</string>\n"\
+ " <string>brep</string><string>brp</string><string>rle</string>\n"\
+ " <string>igs</string><string>iges</string>\n"\
+ " <string>stp</string><string>step</string></array>\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>CFBundleTypeExtensions</key><array>\n"\
+ " <string>msh</string>\n"\
+ " <string>unv</string>\n"\
+ " <string>vrml</string><string>wrl</string><string>iv</string>\n"\
+ " <string>bdf</string><string>nas</string>\n"\
+ " <string>mesh</string></array>\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"\
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index b0724a4c9c..5f6ba17acb 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.134 2006-12-16 15:44:30 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.135 2006-12-16 18:38:52 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -403,16 +403,13 @@ void OpenProject(char *name)
void OpenProjectMacFinder(const char *filename)
{
static int first = 1;
- if(first){
- // just copy the filename: it will be opened when Gmsh is ready in
- // main() (calling OpenProject right now would be a bad idea: Gmsh
- // is probably not completely initialized)
+ if(first || CTX.batch){
+ // just copy the filename: it will be opened when the GUI is ready
+ // in main()
strncpy(CTX.filename, filename, 255);
first = 0;
}
else{
- // should we do MergeFile instead? not sure what's the most
- // intuitive
OpenProject((char*)filename);
#if defined(HAVE_FLTK)
Draw();
--
GitLab