Skip to content
Snippets Groups Projects
Commit aeef6f23 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

better integration with mac finder
parent d9c5194c
No related branches found
No related tags found
No related merge requests found
# $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 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
# #
...@@ -227,14 +227,23 @@ package-mac: ...@@ -227,14 +227,23 @@ package-mac:
" <key>CFBundleDocumentTypes</key>\n"\ " <key>CFBundleDocumentTypes</key>\n"\
" <array>\n"\ " <array>\n"\
" <dict>\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>CFBundleTypeIconFile</key><string>GmshGeo.icns</string>\n"\
" <key>CFBundleTypeName</key><string>Gmsh Geometry File</string>\n"\ " <key>CFBundleTypeName</key><string>Gmsh Geometry File</string>\n"\
" <key>CFBundleTypeOSTypes</key><array><string>GGEO</string></array>\n"\ " <key>CFBundleTypeOSTypes</key><array><string>GGEO</string></array>\n"\
" <key>CFBundleTypeRole</key><string>Editor</string>\n"\ " <key>CFBundleTypeRole</key><string>Editor</string>\n"\
" </dict>\n"\ " </dict>\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>CFBundleTypeIconFile</key><string>GmshMsh.icns</string>\n"\
" <key>CFBundleTypeName</key><string>Gmsh Mesh File</string>\n"\ " <key>CFBundleTypeName</key><string>Gmsh Mesh File</string>\n"\
" <key>CFBundleTypeOSTypes</key><array><string>GMSH</string></array>\n"\ " <key>CFBundleTypeOSTypes</key><array><string>GMSH</string></array>\n"\
......
// $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 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -403,16 +403,13 @@ void OpenProject(char *name) ...@@ -403,16 +403,13 @@ void OpenProject(char *name)
void OpenProjectMacFinder(const char *filename) void OpenProjectMacFinder(const char *filename)
{ {
static int first = 1; static int first = 1;
if(first){ if(first || CTX.batch){
// just copy the filename: it will be opened when Gmsh is ready in // just copy the filename: it will be opened when the GUI is ready
// main() (calling OpenProject right now would be a bad idea: Gmsh // in main()
// is probably not completely initialized)
strncpy(CTX.filename, filename, 255); strncpy(CTX.filename, filename, 255);
first = 0; first = 0;
} }
else{ else{
// should we do MergeFile instead? not sure what's the most
// intuitive
OpenProject((char*)filename); OpenProject((char*)filename);
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
Draw(); Draw();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment