added an icon to the windows installer

disabled console windows for standalone executable
minor rewording of the interface
improved Changelog
updates installation details for Windows


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@793 bbaffbd6-741e-11dd-a85d-61de82d9cad9

Changelog

 Version 0.4 - UNRELEASED
- * use multiple processes for some toolpath strategies
+ * use all available CPU cores for parallel processing
   * this requires at least Python 2.6 or the "python-multiprocessing" package
+ * a standalone windows executable is available (experimental)
  * added an improved contour toolpath strategy (ContourFollow)
   * see http://fab.senselab.org/node/43
  * added options for conventional/climb milling

INSTALL.TXT

@@ -4,17 +4,21 @@ Dependencies of the graphical interface:
 Windows:
 --------
 
-    Python 2.5:
-                http://www.python.org/download/releases/2.5.4/
+Please note that there are two ways of using PyCAM on Windows:
+1) use the standalone executable (experimental - but it does not require further dependencies)
+2) the installer package - it requires the following dependencies:
+
+    Python 2.6:
+                http://www.python.org/download/releases/2.6.6/
                 Please note that some of the GTK packages below require
-                specifically v2.5 (thus v2.6 will not help).
+                specifically v2.6 (thus v2.7 will not help).
 
-    GTK v2.12 and GtkGlExt and PyGTK:
+    GTK v2.16 and GtkGlExt and PyGTK:
                 http://www.bonifazi.eu/appunti/ (Blog)
                 http://www.bonifazi.eu/appunti/pygtk_windows_installer.exe
 
     PyODE (optional):
-                http://downloads.sourceforge.net/pyode/PyODE-1.2.0.win32-py2.5.exe?use_mirror=osdn
+                http://sourceforge.net/projects/pyode/files/pyode/snapshot-2010-03-22/PyODE-snapshot-2010-03-22.win32-py2.6.exe/download
 
 
 Notes:

pycam_win32_postinstall.py

@@ -49,6 +49,8 @@ START_SCRIPT = '"%s"' % os.path.join(distutils.sysconfig.EXEC_PREFIX, "Scripts",
 
 PYTHON_DOC_DIR = os.path.join(distutils.sysconfig.PREFIX, "share", "pycam", "doc")
 
+ICON_FILE = os.path.join(distutils.sysconfig.PREFIX, "share", "pycam", "pycam.ico")
+
 # add some more doc files
 DOC_FILES = [
         ("LICENSE.TXT", "License"),
@@ -74,7 +76,7 @@ if action == "-install":
         create_shortcut(target, description, filename)
         file_created(filename)
     filename = os.path.join(START_MENU_SUBDIR, "Run PyCAM") + LINK_EXTENSION
-    create_shortcut(PYTHON_EXE, "Run PyCAM", filename, START_SCRIPT)
+    create_shortcut(PYTHON_EXE, "Run PyCAM", filename, START_SCRIPT, iconpath=ICON_FILE)
     file_created(filename)
 elif action == "-remove":
     pass

pyinstaller/pycam.spec

@@ -78,6 +78,6 @@ exe = EXE(pyz, data, samples, gtk_pixbuf_loaders,
           debug=False,
           strip=False,
           upx=True,
-          console=True,
+          console=False,
       )
 

setup.py

@@ -90,8 +90,8 @@ Basically you will need Python, GTK and OpenGL.
             os.path.join("share", "gtk-interface", "menubar.xml"),
             os.path.join("share", "gtk-interface", "logo_gui.png"),
             ]),
-        ("share/pycam/samples", 
-            glob.glob(os.path.join("samples", "*"))),
+        ("share/pycam", [os.path.join("share", "pycam.ico")]),
+        ("share/pycam/samples", glob.glob(os.path.join("samples", "*"))),
     ],
 )
 

share/gtk-interface/pycam-project.ui

@@ -6794,7 +6794,8 @@ Any selected group of dimensions will be scaled accordingly.</property>
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Multiprocessing is currently not enabled on your system.
-Please run PyCAM with the parameter "--enable-server" to allow remote workers to connect to your host.</property>
+You need to start PyCAM with the parameter "--enable-server" to allow remote workers to connect to your host.
+Please read the description of the Server Mode (linked below) to understand the related security implications.</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
                     <property name="width_chars">60</property>