-

Ram Rachum · Ram Rachum · commit 578d87f02dd6 · 2010-05-10T16:27:35.000+02:00
diff --git a/garlicsim_wx/garlicsim_wx/__init__.py b/garlicsim_wx/garlicsim_wx/__init__.py
@@ -16,6 +16,7 @@
 import bootstrap
 
 import sys
+import os.path
 
 import wx
 
@@ -31,15 +32,21 @@
 def start():
     '''Start the GUI.'''
     
-    new_gui_project_simpack_name = None
-    for arg in sys.argv:
+    args = sys.argv[:]
+    # If we're not frozen, the first argument is the path of the script, and
+    # that should be ignored:
+    if not hasattr(sys, 'frozen'):
+        del args[:1]
+    
+    if args:
+        arg = args[0]
+        new_gui_project_simpack_name = None
+        load_gui_project_file_path = None
+        
         if arg.startswith('__garlicsim_wx_new='):
             new_gui_project_simpack_name = arg[19:]
-            
-    load_gui_project_file_path = None
-    for arg in sys.argv:
-        if arg.startswith('__garlicsim_wx_load='):
-            load_gui_project_file_path = arg[20:]
+        elif os.path.isfile(arg):
+            load_gui_project_file_path = arg
     
     app = App(new_gui_project_simpack_name=new_gui_project_simpack_name,
               load_gui_project_file_path=load_gui_project_file_path)
diff --git a/garlicsim_wx/garlicsim_wx/frame/frame.py b/garlicsim_wx/garlicsim_wx/frame/frame.py
@@ -15,6 +15,7 @@
 import cPickle as pickle_module
 import subprocess
 import webbrowser
+import traceback
 
 import wx
 from garlicsim_wx.general_misc.third_party import aui
@@ -344,7 +345,7 @@ def on_open(self, event=None):
 
         open_dialog = wx.FileDialog(self, message='Choose a file',
                                     defaultDir=folder, defaultFile='',
-                                    wcd=wildcard, style=wx.OPEN)
+                                    wildcard=wildcard, style=wx.OPEN)
         if open_dialog.ShowModal() == wx.ID_OK:
             path = open_dialog.GetPath()
             
@@ -357,7 +358,7 @@ def on_open(self, event=None):
                     program = [sys.executable, os.path.abspath(sys.argv[0])]
                     # Todo: what if some other program is launching my code?
                     
-                program.append('__garlicsim_wx_load=%s' % path)
+                program.append(path)
              
                 subprocess.Popen(program)
                         
@@ -372,7 +373,7 @@ def _open_gui_project_from_path(self, path):
         except Exception, exception:
             dialog = wx.MessageDialog(
                 self,
-                'Error opening file:\n' + str(exception),
+                'Error opening file:\n' + traceback.format_exc(),
                 style=(wx.OK | wx.ICON_ERROR)
             )
             dialog.ShowModal()
@@ -384,7 +385,7 @@ def _open_gui_project_from_path(self, path):
             except Exception, exception:
                 dialog = wx.MessageDialog(
                     self,
-                    'Error opening file:\n' + str(exception),
+                    'Error opening file:\n' + traceback.format_exc(),
                     style=(wx.OK | wx.ICON_ERROR)
                 )
                 dialog.ShowModal()
@@ -402,7 +403,7 @@ def on_save(self, event=None):
         try:
             save_dialog = wx.FileDialog(self, message='Save file as...',
                                      defaultDir=folder, defaultFile='',
-                                     wcd=wildcard,
+                                     wildcard=wildcard,
                                      style=wx.SAVE | wx.OVERWRITE_PROMPT)
             if save_dialog.ShowModal() == wx.ID_OK:
                 path = save_dialog.GetPath()
diff --git a/garlicsim_wx/installer_script.iss b/garlicsim_wx/installer_script.iss
@@ -0,0 +1,41 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{0D13DAF6-02E1-4DC4-B919-8B6A9FAE64A6}
+AppName=GarlicSim
+AppVerName=GarlicSim 0.4
+AppPublisher=Ram Rachum
+AppPublisherURL=http://garlicsim.org
+AppSupportURL=http://garlicsim.org
+AppUpdatesURL=http://garlicsim.org
+DefaultDirName={pf}\GarlicSim
+DefaultGroupName=GarlicSim
+AllowNoIcons=yes
+OutputDir=.
+OutputBaseFilename=setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "py2exe_dist/GarlicSim.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "py2exe_dist/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\GarlicSim"; Filename: "{app}\GarlicSim.exe"
+Name: "{group}\{cm:UninstallProgram,GarlicSim}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\GarlicSim"; Filename: "{app}\GarlicSim.exe"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\GarlicSim.exe"; Description: "{cm:LaunchProgram,GarlicSim}"; Flags: nowait postinstall skipifsilent
+
