Merge lp:~bkidwell/zim/pyzim-win-installer into lp:~jaap.karssenberg/zim/pyzim

[Brendan Kidwell]

* Created thumbdrive-ready Portable installer package using PortableApps.com tools.
* Desktop installer clears "$PROGRAMFILES/Zim Desktop Wiki" before writing to it.
* Desktop UNINSTALLER correctly removes user-level and "all users"-level Desktop icon and Start Menu shortcuts (2008, 7, Vista).
* Added 256x256 resolution image to zim.ico file for better appearance in Desktop folder (2008, 7, Vista).
* Fixed GTK default look and feel in Windows to "MS-Windows" theme https://bugs.launchpad.net/zim/+bug/830043 .
* Added EULA.rtf (converted from ./LICENSE.txt) to Desktop and Portable installers.

This supercedes a merge request from a couple of hours ago. I added one more revision to remove a comment in the Portable build's help file regarding the startup script creating a new notebooks.list each time.

* Created thumbdrive-ready Portable installer package using PortableApps.com tools.
* Desktop installer clears "$PROGRAMFILES/Zim Desktop Wiki" before writing to it.
* Desktop UNINSTALLER correctly removes user-level and "all users"-level Desktop icon and Start Menu shortcuts (2008, 7, Vista).
* Added 256x256 resolution image to zim.ico file for better appearance in Desktop folder (2008, 7, Vista).
* Fixed GTK default look and feel in Windows to "MS-Windows" theme https://bugs.launchpad.net/zim/+bug/830043 .
* Added EULA.rtf (converted from ./LICENSE.txt) to Desktop and Portable installers.

[lp:~bkidwell/zim/pyzim-win-installer]

440. By Jaap Karssenberg on 2011-09-14

Added tooltips for index pane

441. By Jaap Karssenberg on 2011-09-14

Merged windows installer branch

442. By Jaap Karssenberg on 2011-09-14

Fixed normal background color of text entries for theming with revesed color scheme

443. By Jaap Karssenberg on 2011-09-17

* Fix for regression in notebook list, showing default double
* Fixed style for assistent dialog heading to match theme
* Fixed count of all open tasks in task dialog
* Made pathname check more strict, now explicitly shows starting "_" as invalid

444. By Jaap Karssenberg on 2011-09-17

Imported new translations

445. By Jaap Karssenberg on 2011-09-17

Fixes to make test suite run on windows

446. By Jaap Karssenberg on 2011-09-17

Small change to build scripts for windows to make setup.py run without 'windows/' being present

447. By Jaap Karssenberg on 2011-09-19

Release updates

448. By Jaap Karssenberg on 2011-09-23

Very small update for the website

449. By Jaap Karssenberg on 2011-09-29

Added mono icons for ubuntu

450. By Jaap Karssenberg on 2011-11-06

* Bug fix for relative links to parents of current page
* Updated zim.desktop with ubuntu unity specific shortcuts

451. By Jaap Karssenberg on 2011-11-06

Fixed problem in test suite when loading gtk pixbufs

452. By Jaap Karssenberg on 2011-12-08

Fixed bug in "You found a bug" error reporting :S
and added a test case.

453. By Jaap Karssenberg on 2011-12-11

Tasklist plugin now supports nested tasks and shows an hierarchic list.

454. By Jaap Karssenberg on 2011-12-11

Added an "automount" plugin to automatically mount notebook folders.

455. By Jaap Karssenberg on 2011-12-11

Fixed bug which prevented following links in read-only mode (and thus the manual :( ) regression of earlier fix in rev432 - mea culpa

456. By Jaap Karssenberg on 2011-12-11

* Fixed a bug causing the index to jump with every page selection
* Fixed a bug causing the default icon for custom tools to be missing in the toolbar
* Fixed a bug causing the trayicon to be missing when run from source

457. By Jaap Karssenberg on 2011-12-11

Updated translation template

458. By Jaap Karssenberg on 2011-12-14

* Fix for drag and drop of files on windows
* Interwiki lookup now goes over all urls.list files in the config and data paths
* More strict parsing for .desktop files
* Fix for notebook= parameter quickstart plugin

459. By Jaap Karssenberg on 2011-12-15

* Tasklist now keeps selection when data is refreshed
* Calendar now updates the label with todays date every few minutes

460. By Jaap Karssenberg on 2011-12-15

Fixed autocomplete for page entry in quicknote

461. By Jaap Karssenberg on 2011-12-19

* Fix bug when tag selected in tag cloud is deleted
* Add option in context menu to sort tag cload alphabetically

462. By Jaap Karssenberg on 2011-12-19

Possible fix for encoding issues in strftime

463. By Jaap Karssenberg on 2011-12-21

* Updated manual page on templates
* Small bug fix in tasklist

464. By Jaap Karssenberg on 2011-12-22

Imported translations

465. By Jaap Karssenberg on 2011-12-22

Update package data for release

466. By Jaap Karssenberg on 2012-01-02

Updated tasklist to use markup - fixes bug with tooltips

467. By Jaap Karssenberg on 2012-01-02

Added cancel option to search dialog and made it report results iterative

468. By Jaap Karssenberg on 2012-01-02

Added spinner to search dialog

469. By Jaap Karssenberg on 2012-01-04

Further optimization for search

470. By Jaap Karssenberg on 2012-01-09

Added Table Of Contents plugin

471. By Jaap Karssenberg on 2012-01-09

Small fix for ToC

472. By Jaap Karssenberg on 2012-01-10

* ToC plugin now has context menu with "promote" and "demote" items
* Refactored code for context menu popup in BrowserTreeView

473. By Jaap Karssenberg on 2012-01-10

Fixed docs

474. By Jaap Karssenberg on 2012-01-17

Fixed regression in rev472

475. By Jaap Karssenberg on 2012-01-17

Additional fixes and feature for tasklist
* Fixed regression for tags in tasklist dialog
* Made sorting of tags case insensitive
* Fixed continuity for tasklist whith normal bullet in between
* Introduced "Next" keyword and allow hiding not-yet-actionable tasks

476. By Jaap Karssenberg on 2012-01-17

Made index sort naturally and locale aware :)

477. By Jaap Karssenberg on 2012-01-18

Merged update of windows installer files

478. By Jaap Karssenberg on 2012-01-25

Update logic in table-of-contents plugin to find a heading

479. By Jaap Karssenberg on 2012-01-25

Refactored Clipboard code

480. By Jaap Karssenberg on 2012-02-12

Fixed critical bug that caused progress bar for export to hang ad infinitum

481. By Jaap Karssenberg on 2012-02-13

Fixed running zim daemon with proper python executable

482. By Jaap Karssenberg on 2012-02-13

Fixed small bug when attaching a file for selected text

483. By Jaap Karssenberg on 2012-02-13

Decoupled recent pages from history stack

484. By Jaap Karssenberg on 2012-02-14

Made history test not use private arguments

485. By Jaap Karssenberg on 2012-02-15

Fixed behavior when replacing a formatted word

486. By Jaap Karssenberg on 2012-02-15

Patch to improve behavior of automatic selections

487. By Jaap Karssenberg on 2012-02-15

* Fixed regression for pasting by middle button
* Small fix for recent paths pathbar

488. By Jaap Karssenberg on 2012-02-15

Very small fix for testcase

489. By Jaap Karssenberg on 2012-02-15

Fixed to make zim icons more customizable - Andrei

490. By Jaap Karssenberg on 2012-02-15

Fixed bug for latex templates

491. By Jaap Karssenberg on 2012-02-15

Small fix for making tasklist more robust

492. By Jaap Karssenberg on 2012-02-17

Fixed small regression in trayicon

493. By Jaap Karssenberg on 2012-02-17

* Fixed case-sensitive rename on windows (case-insensitive file system)
* Fixed small regression in Latex test case

494. By Jaap Karssenberg on 2012-02-17

Added Markdown with pandoc extensions as export format

495. By Jaap Karssenberg on 2012-02-17

Merge feature numbered lists

496. By Jaap Karssenberg on 2012-02-17

Added context menu item for mocing selected text to new page

497. By Jaap Karssenberg on 2012-02-17

Updated translations

498. By Jaap Karssenberg on 2012-02-20

* Fixed bug with uistate for export dialog
* Small update for website

499. By Jaap Karssenberg on 2012-02-22

Updated testing for formats and fixed regression in Markdown format

500. By Jaap Karssenberg on 2012-02-22

"Move text" now uses new page template

501. By Jaap Karssenberg on 2012-02-22

Small fix for zim.desktop

502. By Jaap Karssenberg on 2012-02-22

Fixed remembering folder for exporting single file

503. By Jaap Karssenberg on 2012-02-22

Fix for undoing numbered list changes

504. By Jaap Karssenberg on 2012-02-22

Added more formal alternative keybindings

505. By Jaap Karssenberg on 2012-02-26

Fixes in attachment browser to use proper file system calls (cross fingers - no testing...)

506. By Jaap Karssenberg on 2012-02-27

Further refactoring of attachmentbrowser thumbnailing, now with testcase

507. By Jaap Karssenberg on 2012-02-28

Added async queue again for thumbnailmanager - cross fingers

508. By Jaap Karssenberg on 2012-02-28

Small spelling fixes

509. By Jaap Karssenberg on 2012-02-28

Updated translations

510. By Jaap Karssenberg on 2012-02-28

Version 0.55

511. By Jaap Karssenberg on 2012-02-29

Oops - switched 'promote' and 'demote' in table of contents plugin

512. By Jaap Karssenberg on 2012-02-29

Added drag&drop for attachment browser

513. By Jaap Karssenberg on 2012-03-01

Updated bounty

514. By Jaap Karssenberg on 2012-03-17

Fixed bug for opening email adresses

515. By Jaap Karssenberg on 2012-03-17

Added test for fix in rev514

516. By Jaap Karssenberg on 2012-03-17

* Made sidepane remember state
* Made tag cloud remember state

517. By Jaap Karssenberg on 2012-03-17

Small fix to make daemon process more robust

518. By Jaap Karssenberg on 2012-03-17

Small fix in clipboard (lp:954091)

519. By Jaap Karssenberg on 2012-03-17

Merge Git & Hg support

520. By Jaap Karssenberg on 2012-03-18

Some refactoring on versioncontrol plugin

521. By Jaap Karssenberg on 2012-03-18

* Made version control backend an option for init dialog
* Fixed UTF-8 support for version control

522. By Jaap Karssenberg on 2012-03-18

Merged plugin for "ditaa" diagrams

523. By Jaap Karssenberg on 2012-03-18

Updated translation template

524. By Jaap Karssenberg on 2012-03-18

Merging patch for config profiles

525. By Jaap Karssenberg on 2012-03-20

Refactored profile loading

526. By Jaap Karssenberg on 2012-03-21

Small fix for style linked to profile

527. By Jaap Karssenberg on 2012-03-26

Fix for context menu page index

528. By Jaap Karssenberg on 2012-03-26

Small fix for GNU R plugin

529. By Jaap Karssenberg on 2012-03-26

Small fix for git support

530. By Jaap Karssenberg on 2012-03-27

Small fix for trayicon

531. By Jaap Karssenberg on 2012-04-02

Small fix for windows paths

532. By Jaap Karssenberg on 2012-04-02

Fix for small bugje in Insert Date dialog

533. By Jaap Karssenberg on 2012-04-02

Version 0.56

534. By Brendan Kidwell on 2012-04-03

removing "[version]" section from PortableApps ini file; this is added by build script

535. By Brendan Kidwell on 2012-04-04

Fixing "Zim 0.54 doesn't work on Windows XP"

Unmerged revisions

=== modified file 'setup.py'
--- setup.py	2011-08-13 08:18:21 +0000
+++ setup.py	2011-09-11 23:12:23 +0000
@@ -301,17 +301,17 @@
 	py2exeoptions = {
 		'windows': [ {
 			"script": "zim.py",
-			"icon_resources": [(1, "windows/zim.ico")] # Windows 16x16, 32x32, and 48x48 icon based on PNG
+			"icon_resources": [(1, "windows/src/zim.ico")] # Windows 16x16, 32x32, and 48x48 icon based on PNG
 		} ],
 		'zipfile': None,
 		'options': {
 			"py2exe": {
-				"compressed": 0,
+				"compressed": 1,
 				"optimize": 2,
 				"ascii": 1,
 				"bundle_files": 3,
 				"packages": ["encodings", "cairo", "atk", "pangocairo", "zim", "bzrlib"],
-				"dist_dir" : "windows/build"
+				"dist_dir" : "windows/build/ZimDesktopWikiPortable/App/ZimDesktopWiki"
 			}
 		}
 	}

=== modified file 'windows/README-BUILD-win32.txt'
--- windows/README-BUILD-win32.txt	2011-06-20 20:02:00 +0000
+++ windows/README-BUILD-win32.txt	2011-09-11 23:12:23 +0000
@@ -1,35 +1,66 @@
 How to Build pyzim on Windows
+=============================
+
+
+Overview
+--------
+
+To build Zim for Windows, you must install all the requirements listed
+below. Then follow the steps in the "Building Zim" section.
+
+To make the regular desktop installer package, see "Packaging the
+Regular Installer".
+
+To make the portable package, see "Packaging the PortableApps.com
+Installer".
 
 
 Requirements
+------------
 
 1. Install Python 2.6 or greater for Windows from
+
    http://www.python.org/download/
 
    Note: Python version must be 2.6 or greater, but less than 3.0
 
 2. Install the py2exe library from
+
    http://sourceforge.net/projects/py2exe/files/
 
-3. Download the latest GTK+ bundle for Windows from
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+/[newest version]/gtk+-bundle*.zip
-   Extract that Zip file to
-   C:\Program Files\Common Files\GTK\2.22
+3. Download GTK+ Bundle from
+
+   http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/
+
+   Or a newer version if one exists. Extract this Zip file to a
+   convenient place such as
+
+   C:\Program Files (x86)\Common Files\GTK+ Bundle
 
 4. Install PyCairo, PyGObject, and PyGTK from
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/[newest version]/pycairo-*.win32*.exe
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/[newest version]/pygobject-*.win32*.exe
-   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/[newest version]/pygtk-*.win32*.exe
+
+   http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/[newest version]/pycairo-VERSION.win32-pyVER.msi
+   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/[newest version]/pygobject-VERSION.win32-pyVER.msi
+   http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/[newest version]/pygtk-VERSION.win32-pyVER.msi
+
+   Make sure that the Python version matches the one you're using, and
+   that you don't download a pygtk library with a version newer than
+   the bundle from the previous step.
 
 5. Jpeg for Windows
+
    http://gnuwin32.sourceforge.net/packages/jpeg.htm
+
    Get jpeg62.dll and put it in ./windows .
 
 6. Install Bazaar using the PYTHON-BASED installer from
+
    http://wiki.bazaar.canonical.com/WindowsDownloads
-   The build script depends on Bazaar.
+
+   The build script depends on Python Bazaar.
 
 7. Install NSIS from
+
    http://nsis.sourceforge.net/Download
 
 7a. You will also want to download Venis IX if you want to edit the 
@@ -37,31 +68,55 @@
     if you don't want to use an IDE.) 
     http://nsis.sourceforge.net/Venis_IX
 
+8. For the PortableApps.com build, additionally install these three
+   utilities:
+
+   http://portableapps.com/apps/development/nsis_portable (Unicode version)
+   http://portableapps.com/apps/development/portableapps.com_installer
+   http://portableapps.com/apps/development/portableapps.com_launcher
+
+   These tools default to installing in ~/Desktop, but I personally
+   put them in ~/Apps. Be sure to put them all in the same folder.
+
 
 Building Zim
-
-1. Look at "windows\env.cmd" -- make sure that your paths to GTK and 
-   Python binaries are correct.
-
-2. Run "windows\env.cmd" to initialize your $PATH environment variable..
-
-3. Run "python.exe windows\build_win32.py".
-
-   Note: If you installed GTK to another path than suggested, you must change it also in the
-         file build_win32.py.
-
-4. Make sure it built okay by running ".\windows\build\zim.exe".
-
-
-Packaging the Installer
-
-1. Build zim.exe (see steps above)
-
-2. Create or modify ./windows/version-and-date.nsi . (Fill in the appropriate values.)
-
-   !define VER "version_number_goes_here"
-   !define BUILDDATE "yyyy-mm-dd"
-
-3. Run ./windows/create-zim-setup.nsi .
-
-4. Find its output in ./dist/Zim-setup-*.exe and test it.
+------------
+
+1. Add your Python root folder and your "GTK+ Bundle\bin" folder to
+   your $PATH environment variable.
+
+2. At the command prompt, CD into the Zim project's root folder.
+
+3. Run "python.exe windows\build_win32.py" in the command prompt.
+   NOTE: Sometimes I get "Access denied" errors in this step. Closing
+   all windows except the command prompt usually helps.
+
+4. Make sure it built okay by running
+   ".\windows\build\ZimDesktopWikiPortable\App\ZimDesktopWiki\zim.exe"
+
+
+Packaging the Regular Installer
+-------------------------------
+
+1. Build zim.exe (see steps above).
+
+2. Run "./windows/create-zim-setup.nsi".
+
+3. Find its output in "./dist/Zim-setup-*.exe" and test it.
+
+
+Packaging the PortableApps.com Installer
+----------------------------------------
+
+1. Build zim.exe (see steps above).
+
+2. Run the PortableApps.comLauncher app on the folder
+   "./windows/build/ZimDesktopWikiPortable".
+
+2a. Test the launcher built in "./windows/build/ZimDesktopWikiPortable".
+
+3. Run the PortableApps.comInstaller app on the folder
+   "./windows/build/ZimDesktopWikiPortable".
+
+4. You will find the installer named as
+   "./windows/build/ZimDesktopWikiPortable_VERSION.paf.exe"/

=== modified file 'windows/build_win32.py'
--- windows/build_win32.py	2010-11-30 07:56:14 +0000
+++ windows/build_win32.py	2011-09-11 23:12:23 +0000
@@ -1,67 +1,127 @@
+# --------------------------------------------------------------------
+# For the complete Windows build procedure, please read
+# README-BUILD-win32.txt .
+#
+# Some general advice for building PyGTK-based Windows .EXEs can be
+# found here:
+# http://www.no-ack.org/2010/09/complete-guide-to-py2exe-for-pygtk.html
+# --------------------------------------------------------------------
+
 import os
+from os import path
 import sys
 import shutil
 import glob
 import datetime
 import subprocess
 import distutils.dir_util
+from distutils.sysconfig import get_python_lib
 
+# load version number constant from zim package
 sys.path.append(".")
 from zim import __version__
 
-# For the complete Windows build procedure, please read
-# README-BUILD-win32.txt
-
-#  Clean up the build directory
-shutil.rmtree("windows/build", True)
-
-# create main.exe and any files generated by setup.py
+# contants for this script
+#
+# windows
+#   /build                      BUILD_ROOT
+#     /ZimDesktopWikiPortable   APP_ROOT
+#       /App
+#         /ZimDesktopWiki       EXE_ROOT
+#
+BUILD_ROOT = r"windows\build"
+APP_ROOT = path.join(BUILD_ROOT, "ZimDesktopWikiPortable")
+EXE_ROOT = path.join(APP_ROOT, r"App\ZimDesktopWiki")
+
+#GTK_ROOT = path.join(get_python_lib(), r"gtk-2.0\runtime")
+for libdir in os.environ["PATH"].split(path.pathsep):
+	if path.exists(path.join(libdir, "libgtk-win32-2.0-0.dll")):
+		GTK_ROOT = path.dirname(libdir)
+
+# --------------------------------------
+# BUILD
+# --------------------------------------
+
+# Clean up and initialize the build directory
+shutil.rmtree(BUILD_ROOT, True)
+os.makedirs(EXE_ROOT)
+
+# Create main zim.exe and any files generated by setup.py
 subprocess.check_call(['python.exe', 'setup.py', 'build'])
 subprocess.check_call(['python.exe', 'setup.py', 'py2exe'])
 
-# update "data" folder
-shutil.copytree("data", "windows/build/data")
-
-# Use function from distutils because shutil.copytree 
-# fails when destination folder exists
-
-# If you installed GTK to a different folder, change these lines:
-distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.22/etc", "windows/build/etc", update=1)
-distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.22/lib", "windows/build/lib", update=1)
-distutils.dir_util.copy_tree("c:/Program Files/Common Files/GTK/2.22/share", "windows/build/share", update=1)
-shutil.rmtree("windows/build/share/doc", True)
-shutil.rmtree("windows/build/share/gtk-doc", True)
-files = glob.iglob(os.path.join("c:/Program Files/Common Files/GTK/2.22/bin", "*.exe"))
-for file in files:
-    if os.path.isfile(file):
-        shutil.copy2(file, "windows/build")
+# Copy GTK runtime
+for d in ["etc", "lib", "share"]:
+	distutils.dir_util.copy_tree(path.join(GTK_ROOT, d), path.join(EXE_ROOT, d), update=1)
+for ext in ["*.exe", "*.dll"]:
+	files = glob.iglob(os.path.join(GTK_ROOT, "bin", ext))
+	for file in files:
+	    if os.path.isfile(file):
+        	shutil.copy(file, EXE_ROOT)
+os.remove(os.path.join(EXE_ROOT, "gtk-demo.exe"))
+
+# Remove docs from copied GTK runtime
+shutil.rmtree(path.join(EXE_ROOT, r"share\doc"), True)
+shutil.rmtree(path.join(EXE_ROOT, r"share\gtk-doc"), True)
+
+# Load Zim's data folder
+shutil.copytree("data", path.join(EXE_ROOT, "data"))
 
 # Copy icon files
-distutils.dir_util.copy_tree("icons", "windows/build/icons", update=1)
+distutils.dir_util.copy_tree("icons", path.join(EXE_ROOT, "icons"), update=1)
 
 # Copy translation files
-distutils.dir_util.copy_tree("locale", "windows/build/locale", update=1)
+distutils.dir_util.copy_tree("locale", path.join(EXE_ROOT, "locale"), update=1)
 
 # Copy plugins folder so Preferences dialog can iterate through them
-distutils.dir_util.copy_tree("zim/plugins", "windows/build/zim/plugins", update=1)
+distutils.dir_util.copy_tree(r"zim\plugins", path.join(EXE_ROOT, r"zim\plugins"), update=1)
 
 # Copy the hicolor icon theme from windows folder because it's missing from Gtk/win32 distro
-if not os.path.exists("windows/build/share/icons/hicolor"):
-	os.makedirs("windows/build/share/icons/hicolor")
-shutil.copyfile(
-	"windows/hicolor-icon-theme__index.theme",
-	"windows/build/share/icons/hicolor/index.theme"
+p = path.join(EXE_ROOT, r"share\icons\hicolor")
+if not path.exists(p): os.makedirs(p)
+shutil.copy(
+	r"windows\src\hicolor-icon-theme__index.theme",
+	path.join(EXE_ROOT, r"share\icons\hicolor\index.theme")
 )
 
 # Copy jpeg62.dll
-shutil.copyfile("windows/jpeg62.dll", "windows/build/jpeg62.dll")
-
-# print out version number
-f = open("windows/version-and-date.nsi", "w")
-f.write('!define VER "%s"\n' % __version__)
-f.write('!define BUILDDATE "%s"\n' % datetime.datetime.now().strftime("%Y-%m-%d"))
+shutil.copy(r"windows\jpeg62.dll", EXE_ROOT)
+
+# Set theme to MS-Windows
+f = open(os.path.join(EXE_ROOT, r"etc\gtk-2.0\gtkrc"), "w")
+print >>f, 'gtk-theme-name = "MS-Windows"'
+f.close()
+
+# --------------------------------------
+# NSIS STUFF
+# --------------------------------------
+
+# print out version number to NSIS include file
+f = open(r"windows\build\version-and-date.nsi", "w")
+print >>f, '!define VER "%s"' % __version__
+print >>f, '!define BUILDDATE "%s"' % datetime.datetime.now().strftime("%Y-%m-%d")
 f.close()
 
 # NSIS script compiles to "dist" folder but compiler won't create it if it's needed
-if not os.path.exists("dist"):
-    os.mkdir("dist")
+if not path.exists("dist"): os.mkdir("dist")
+
+# --------------------------------------
+# PORTABLEAPPS.COM STUFF
+# --------------------------------------
+
+# Fill out PortableApps.com installer skeleton
+distutils.dir_util.copy_tree(r"windows\src\AppInfo", path.join(APP_ROOT, r"App\AppInfo"), update=1)
+os.makedirs(path.join(APP_ROOT, r"App\DefaultData\Config\zim"))
+os.makedirs(path.join(APP_ROOT, r"App\DefaultData\Notebooks"))
+distutils.dir_util.copy_tree(r"windows\src\Other", path.join(APP_ROOT, "Other"), update=1)
+shutil.copy(r"windows\src\zim.ico",   path.join(APP_ROOT, r"App\AppInfo\appicon.ico"))
+shutil.copy(r"icons\zim16.png",       path.join(APP_ROOT, r"App\AppInfo\appicon_16.png"))
+shutil.copy(r"icons\zim32.png",       path.join(APP_ROOT, r"App\AppInfo\appicon_32.png"))
+shutil.copy(r"windows\src\help.html", APP_ROOT)
+
+# Add version number to appinfo.ini
+f = open(path.join(APP_ROOT, r"App\AppInfo\appinfo.ini"), "a")
+print >>f ,"[Version]"
+print >>f, "PackageVersion=%s.0.0" % __version__
+print >>f, "DisplayVersion=%s\n" % __version__
+f.close()

=== modified file 'windows/create-zim-setup.nsi'
--- windows/create-zim-setup.nsi	2010-05-24 02:53:11 +0000
+++ windows/create-zim-setup.nsi	2011-09-11 23:12:23 +0000
@@ -1,41 +1,39 @@
 ; Script generated with the Venis Install Wizard
 
 ; Define your application name
-!define APPNAME "Zim Desktop Wiki"
-
-; Define VER and BUILDDATE
-!include "version-and-date.nsi"
-
+!define APPNAME "Zim Desktop Wiki"
+
+; Define VER and BUILDDATE
+!include "build\version-and-date.nsi"
+
 !define APPNAMEANDVERSION "Zim Desktop Wiki ${VER} for Windows"
 
 ; Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Zim Desktop Wiki"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\dist\Zim-setup-${VER}_${BUILDDATE}.exe"
+OutFile "..\dist\Zim-setup-${VER}_${BUILDDATE}.exe"
 
 ; Modern interface settings
 !include "MUI.nsh"
-
-; Register Extension function
-!include "registerExtension.nsh"
+
+; Register Extension function
+!include "src\registerExtension.nsh"
 
 !define MUI_ABORTWARNING
 !define MUI_FINISHPAGE_RUN "$INSTDIR\zim.exe"
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "zim-logo-big.bmp" ; optional
-!define MUI_ICON "zim.ico"
-
-!define MUI_DIRECTORYPAGE_TEXT_TOP \
-	"Setup will install ${APPNAME} in the following folder. \
-	$\r$\r \
-	BE SURE TO CHOOSE ANOTHER FOLDER NOW if you want to install Zim \
-	to a portable storage device."
-
-!define MUI_COMPONENTSPAGE_SMALLDESC
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "src\zim-logo-big.bmp" ; optional
+!define MUI_ICON "src\zim.ico"
+
+!define MUI_DIRECTORYPAGE_TEXT_TOP \
+	"Setup will install ${APPNAME} in the following folder."
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
 
 !insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "src\Other\Source\EULA.rtf"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -47,92 +45,75 @@
 ; Set languages (first is default language)
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro MUI_RESERVEFILE_LANGDLL
-
-Section "-Main program" SecMain
-
-	SectionIn 1 2
-
-	; Set Section properties
-	SetOverwrite on
-
-	; Set Section Files and Shortcuts
-	SetOutPath "$INSTDIR\"
-	File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "build\*.*"
-	File "zim.ico"
-
-SectionEnd
-
-SectionGroup "Desktop" GroupDesktop
-
-	Section "Start Menu shortcut" SecStartShortcut
-	
-		SectionIn 1
-	
-		CreateDirectory "$SMPROGRAMS\Zim Desktop Wiki"
-		CreateShortCut "$SMPROGRAMS\Zim Desktop Wiki\Zim.lnk" "$INSTDIR\zim.exe"
-		CreateShortCut "$SMPROGRAMS\Zim Desktop Wiki\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-	
-	SectionEnd
-	
-	Section "Desktop shortcut" SecDesktopShortcut
-
-		SectionIn 1
-	
-		; Set Section properties
-		SetOverwrite on
-	
-		; Set Section Files and Shortcuts
-		CreateShortCut "$DESKTOP\Zim Desktop Wiki.lnk" "$INSTDIR\zim.exe"
-	
-	SectionEnd
-	
-	Section ".zim file association" SecAssociate
-		
-		SectionIn 1
-		${registerExtension} "$INSTDIR\zim.exe" ".zim" "Zim Desktop Wiki" "$INSTDIR\zim.ico"
-		
-	SectionEnd
-	
-	Section "Create Registry Keys and Uninstaller" SecUninstall
-	
-		SectionIn 1
-		WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
-		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
-		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe"
-		WriteUninstaller "$INSTDIR\uninstall.exe"
-	
-	SectionEnd
-
-SectionGroupEnd
-
-SectionGroup "Portable" GroupPortable
-
-	Section "Set portable mode" SecPortable
-
-		SectionIn 2
-		SetOutPath "$INSTDIR\"
-
-	SectionEnd
-
-SectionGroupEnd
-
+
+
+Section "-Main program" SecProgramFiles
+
+	; Clear installation folder, to be sure to get rid of orphaned files
+	RMDir /r "$INSTDIR"
+
+	; Set Section properties
+	SetOverwrite on
+
+	; Set Section Files and Shortcuts
+	SetOutPath "$INSTDIR\"
+	File /r /x .svn /x Zim-setup*.exe /x "zim.exe.log" "build\ZimDesktopWikiPortable\App\ZimDesktopWiki\*.*"
+	File "src\zim.ico"
+
+SectionEnd
+
+
+Section "Start Menu shortcut" SecStartShortcut
+
+	CreateDirectory "$SMPROGRAMS\Zim Desktop Wiki"
+	CreateShortCut "$SMPROGRAMS\Zim Desktop Wiki\Zim.lnk" "$INSTDIR\zim.exe"
+	CreateShortCut "$SMPROGRAMS\Zim Desktop Wiki\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+SectionEnd
+
+Section "Desktop shortcut" SecDesktopShortcut
+
+	; Set Section properties
+	SetOverwrite on
+
+	; Set Section Files and Shortcuts
+	CreateShortCut "$DESKTOP\Zim Desktop Wiki.lnk" "$INSTDIR\zim.exe"
+
+SectionEnd
+
+Section ".zim file association" SecAssociate
+	
+	${registerExtension} "$INSTDIR\zim.exe" ".zim" "Zim Desktop Wiki" "$INSTDIR\zim.ico"
+	
+SectionEnd
+
+Section "Create Registry Keys and Uninstaller" SecUninstall
+
+	WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe"
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+
+SectionEnd
+
 
 ; Modern install component descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	!insertmacro MUI_DESCRIPTION_TEXT ${GroupDesktop} "Install to this computer."
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecStartShortcut} "Install a shortcut to Zim in your Start Menu."
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} "Install a shortcut to Zim on your Desktop."
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecAssociate} "Associate .zim files with Zim."
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecUninstall} "Create uninstaller and registry keys necessary for uninstallation."
-	!insertmacro MUI_DESCRIPTION_TEXT ${GroupPortable} "Install to portable storage device. (Work in progress! Uses %USERPROFILE% folder when running.)"
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Set the installed application to portable mode (does not use Registry nor My Documents or Program Files folders)."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecStartShortcut} \
+	"Install a shortcut to Zim in your Start Menu."
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
+	"Install a shortcut to Zim on your Desktop."
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecAssociate} \
+	"Associate .zim files with Zim."
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecUninstall} \
+	"Create uninstaller and registry keys necessary for uninstallation."
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;Uninstall section
 Section Uninstall
-
-	;Remove file association
-	${unregisterExtension} ".zim" "Zim Desktop Wiki"
+
+	;Remove file association
+	${unregisterExtension} ".zim" "Zim Desktop Wiki"
 
 	;Remove from registry...
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
@@ -141,21 +122,21 @@
 	; Delete self
 	Delete "$INSTDIR\uninstall.exe"
 
-	; Delete Shortcuts
-	Delete "$SMPROGRAMS\Zim Desktop Wiki\Zim.lnk"
-	Delete "$SMPROGRAMS\Zim Desktop Wiki\Uninstall.lnk"
-	Delete "$DESKTOP\Zim Desktop Wiki.lnk"
-
-	; Delete configuration
-	RMDir /r "$APPDATA\zim"
+	; Delete configuration
+	RMDir /r "$APPDATA\zim"
 
 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\Zim Desktop Wiki"
 	RMDir /r "$INSTDIR"
 
+	; Detel desktop icon and Start Menu shortcuts
+	SetShellVarContext all
+	Delete "$DESKTOP\Zim Desktop Wiki.lnk"
+	RMDir /r "$SMPROGRAMS\Zim Desktop Wiki"
+	SetShellVarContext current
+	Delete "$DESKTOP\Zim Desktop Wiki.lnk"
+	RMDir /r "$SMPROGRAMS\Zim Desktop Wiki"
+
 SectionEnd
-
-InstType "Desktop Install"
-InstType "Portable Install"
 
 ; eof
\ No newline at end of file

=== removed file 'windows/env.cmd'
--- windows/env.cmd	2010-11-30 07:47:14 +0000
+++ windows/env.cmd	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-SET PATH=%PATH%;C:\Program Files\Common Files\GTK\2.22\bin;c:\Programs\Python26

=== added directory 'windows/src'
=== added directory 'windows/src/AppInfo'
=== added directory 'windows/src/AppInfo/Launcher'
=== added file 'windows/src/AppInfo/Launcher/ZimDesktopWikiPortable.ini'
--- windows/src/AppInfo/Launcher/ZimDesktopWikiPortable.ini	1970-01-01 00:00:00 +0000
+++ windows/src/AppInfo/Launcher/ZimDesktopWikiPortable.ini	2011-09-11 23:12:23 +0000
@@ -0,0 +1,6 @@
+[Launch]
+ProgramExecutable=ZimDesktopWiki\zim.exe
+
+[Environment]
+XDG_CONFIG_HOME=%PAL:DataDir%\Config
+HOME=%PAL:DataDir%

=== added file 'windows/src/AppInfo/appicon_128.png'
Binary files windows/src/AppInfo/appicon_128.png	1970-01-01 00:00:00 +0000 and windows/src/AppInfo/appicon_128.png	2011-09-11 23:12:23 +0000 differ
=== added file 'windows/src/AppInfo/appinfo.ini'
--- windows/src/AppInfo/appinfo.ini	1970-01-01 00:00:00 +0000
+++ windows/src/AppInfo/appinfo.ini	2011-09-11 23:12:23 +0000
@@ -0,0 +1,37 @@
+[Format]
+Type=PortableApps.comFormat
+Version=2.0
+
+[Details]
+Name=Zim Desktop Wiki Portable
+AppId=ZimDesktopWikiPortable
+Publisher=Brendan Kidwell
+Homepage=glump.net/software/zim
+Category=Office
+Description=Zim is a graphical text editor used to maintain a collection of wiki pages.
+Language=Multilingual
+Trademarks=
+InstallType=
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=true
+CommercialUse=true
+EULAVersion=1
+
+[SpecialPaths]
+Plugins=NONE
+
+[Dependencies]
+UsesJava=false
+UsesDotNetVersion=
+
+[Control]
+Icons=1
+Start=ZimDesktopWikiPortable.exe
+
+; -- The following will be filled out by build_win32.py
+;[Version]
+;PackageVersion=0.0.0.0
+;DisplayVersion=0.0

=== added directory 'windows/src/Other'
=== added directory 'windows/src/Other/Help'
=== added directory 'windows/src/Other/Help/images'
=== added file 'windows/src/Other/Help/images/globe_64.png'
Binary files windows/src/Other/Help/images/globe_64.png	1970-01-01 00:00:00 +0000 and windows/src/Other/Help/images/globe_64.png	2011-09-11 23:12:23 +0000 differ
=== added directory 'windows/src/Other/Source'
=== added file 'windows/src/Other/Source/EULA.rtf'
--- windows/src/Other/Source/EULA.rtf	1970-01-01 00:00:00 +0000
+++ windows/src/Other/Source/EULA.rtf	2011-09-11 23:12:23 +0000
@@ -0,0 +1,128 @@
+{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Microsoft Sans Serif;}}
+{\colortbl ;\red0\green0\blue0;}
+{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\qc\cf1\lang1033\f0\fs16 GNU GENERAL PUBLIC LICENSE\par
+Version 2, June 1991\par
+\pard\par
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\par
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par
+\par
+\pard\qc Preamble\par
+\pard\par
+  The licenses for most software are designed to take away your freedom to share and change it.  By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.  This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it.  (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.\par
+\par
+  When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par
+\par
+  To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights.  These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par
+\par
+  For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have.  You must make sure that they, too, receive or can get the source code.  And you must show them these terms so they know their rights.\par
+\par
+  We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par
+\par
+  Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software.  If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.\par
+\par
+  Finally, any free program is threatened constantly by software patents.  We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary.  To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.\par
+\par
+  The precise terms and conditions for copying, distribution and modification follow.\par
+\par
+\pard\qc GNU GENERAL PUBLIC LICENSE\par
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\pard\par
+  0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License.  The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language.  (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".\par
+\par
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope.  The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program).  Whether that is true depends on what the Program does.\par
+\par
+  1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\par
+\par
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par
+\par
+  2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par
+\par
+\pard\li360 a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par
+\par
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par
+\par
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License.  (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\par
+\pard\par
+These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par
+\par
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par
+\par
+  3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par
+\par
+\pard\li360 a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par
+\par
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par
+\par
+c) Accompany it with the information you received as to the offer to distribute corresponding source code.  (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\par
+\pard\par
+The source code for a work means the preferred form of the work for making modifications to it.  For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable.  However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par
+\par
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par
+\par
+  4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License.  Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License.  However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par
+\par
+  5. You are not required to accept this License, since you have not signed it.  However, nothing else grants you permission to modify or distribute the Program or its derivative works.  These actions are prohibited by law if you do not accept this License.  Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par
+\par
+  6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions.  You may not impose any further restrictions on the recipients' exercise of the rights granted herein.  You are not responsible for enforcing compliance by third parties to this License.\par
+\par
+  7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all.  For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\par
+\par
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices.  Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par
+\par
+  8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.  In such case, this License incorporates the limitation as if written in the body of this License.\par
+\par
+  9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number.  If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par
+\par
+  10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\par
+\par
+\pard\qc NO WARRANTY\par
+\pard\par
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par
+\par
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par
+\par
+\pard\qc END OF TERMS AND CONDITIONS\par
+\par
+How to Apply These Terms to Your New Programs\par
+\pard\par
+  If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par
+\par
+  To do so, attach the following notices to the program.  It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\par
+\par
+\pard\li360 <one line to give the program's name and a brief idea of what it does.>\par
+Copyright (C) <year> <name of author>\par
+\par
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\par
+\par
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\par
+\par
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par
+\pard\par
+Also add information on how to contact you by electronic and paper mail.\par
+\par
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par
+\par
+\pard\li360 Gnomovision version 69, Copyright (C) year name of author\par
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.  This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.\par
+\pard\par
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License.  Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.\par
+\par
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary.  Here is a sample; alter the names:\par
+\par
+\pard\li360 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.\par
+\par
+<signature of Ty Coon>, 1 April 1989\par
+Ty Coon, President of Vice\par
+\pard\par
+This General Public License does not permit incorporating your program into proprietary programs.  If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library.  If this is what you want to do, use the GNU Lesser General Public License instead of this License.\par
+}
+
\ No newline at end of file

=== added file 'windows/src/help.html'
--- windows/src/help.html	1970-01-01 00:00:00 +0000
+++ windows/src/help.html	2011-09-11 23:12:23 +0000
@@ -0,0 +1,37 @@
+<html>
+<head>
+<title>Zim Desktop Wiki Portable</title>
+<style type="text/css">
+	body { margin: 1em; }
+	h1, h2, h3 { font-family: sans-serif; }
+	h1 { font-size: 1.5em; font-weight: bold; }
+	h2 { font-size: 1.25em; font-weight: bold; }
+	h3 { font-size: 1.15em; }
+</style>
+</head>
+<body>
+
+<h1>
+<img src="Other/Help/images/globe_64.png" style="vertical-align:middle;" />
+Zim Desktop Wiki Portable
+</h1>
+
+<p><a href="http://www.zim-wiki.org">www.zim-wiki.org</a></p>
+
+<p><b>Zim</b> is a graphical text editor used to maintain a collection of wiki pages. Each page can contain links to other pages, simple formatting and images. Pages are stored in a folder structure, like in an outliner, and can have attachments. Creating a new page is as easy as linking to a nonexistent page. All data is stored in plain text files with wiki formatting. Various plugins provide additional functionality, like a task list manager, an equation editor, a tray icon, and support for version control.</p>
+
+<p><b>Zim</b> can be used to:</p>
+
+<ul>
+<li>Keep an archive of notes</li>
+<li>Take notes during meetings or lectures</li>
+<li>Organize task lists</li>
+<li>Draft blog entries and emails</li>
+<li>Do brainstorming</li>
+</ul>
+
+<h2>How to Use Zim Desktop Wiki Portable</h2>
+
+<p>If you have any exiting notebooks, put them in <code>./Data/Notebooks</code>. When <b>Zim Desktop Wiki Portable</b> starts, your notebook list will automatically be populated with the contents of that folder. If there is a notebook called <code>Default</code>, this notebook will be opened automatically and the <b>Open Notebook</b> dialog box will be bypassed.</p>
+
+<p>To launch <b>Zim Desktop Wiki Portable</b>, run <code>ZimDesktopWikiPortable.exe</code>

=== renamed file 'windows/hicolor-icon-theme__index.theme' => 'windows/src/hicolor-icon-theme__index.theme'
=== renamed file 'windows/registerExtension.nsh' => 'windows/src/registerExtension.nsh'
=== renamed file 'windows/zim-logo-big.bmp' => 'windows/src/zim-logo-big.bmp'
=== renamed file 'windows/zim.ico' => 'windows/src/zim.ico'
Binary files windows/zim.ico	2010-06-28 18:27:14 +0000 and windows/src/zim.ico	2011-09-11 23:12:23 +0000 differ
=== added file 'windows/src/zim.ico.txt'
--- windows/src/zim.ico.txt	1970-01-01 00:00:00 +0000
+++ windows/src/zim.ico.txt	2011-09-11 23:12:23 +0000
@@ -0,0 +1,10 @@
+If the Zim application icon has changed, you must manually rebuild it
+here before running the Windows build scripts.
+
+1. Using IcoFX (free software), import Zim's zim16.png, zim32.png, and
+zim48.png to a fresh ICO file.
+
+2. Using InkScape, convert zim48.svg to a temporary 256x256 PNG file
+and import that into the same ICO file as step 1.
+
+3. Save as ./windows/src/zim.ico .