From b42d85d6ff18751973c616a2b6ba2c6dffb2113c Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Mon, 25 Aug 2008 19:45:20 -0700
Subject: [PATCH] Luminotes version now defined in a config file and shows up
 in the Desktop UI.

---
 NEWS              | 6 ++----
 config/Version.py | 1 +
 setup.py          | 6 ++----
 view/Header.py    | 3 +++
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 config/Version.py

diff --git a/NEWS b/NEWS
index e809445..5a8e03f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,7 @@
-1.?
- * Created a Windows application icon and embedded it into the generated
-   Luminotes executable.
+1.5.0:
+ * Completed the Luminotes Desktop Windows installer.
  * Improved logging, so tracebacks in production and desktop mode actually go
    to a file. Also removing logs on startup to prevent endless log growth.
- * 
 
 1.4.27: August 22, 2008
  * Fixed a bug in tools/initdb.py and tools/updatedb.py that caused them to
diff --git a/config/Version.py b/config/Version.py
new file mode 100644
index 0000000..1bc99e4
--- /dev/null
+++ b/config/Version.py
@@ -0,0 +1 @@
+VERSION = u"1.5.0"
diff --git a/setup.py b/setup.py
index eeed2c1..2f60955 100755
--- a/setup.py
+++ b/setup.py
@@ -4,9 +4,7 @@ import os
 import sys
 from glob import glob
 from distutils.core import setup, Distribution
-
-
-VERSION = "1.5.0"
+from config.Version import VERSION
 
 
 def files( path ):
@@ -195,7 +193,7 @@ try:
                 dist_dir,
                 self.windows_exe_files,
                 self.lib_files,
-                            version = VERSION)
+                version = VERSION)
       print "*** creating the inno setup script***"
       script.create()
       print "*** compiling the inno setup script***"
diff --git a/view/Header.py b/view/Header.py
index f6b3a3f..e2e31c9 100644
--- a/view/Header.py
+++ b/view/Header.py
@@ -1,4 +1,5 @@
 from Tags import Div, A, Img, Span
+from config.Version import VERSION
 
 class Header( Div ):
   def __init__( self, user, first_notebook, login_url, logout_url, note_title, rate_plan = None ):
@@ -15,6 +16,8 @@ class Header( Div ):
           ( note_title == u"home" ) and title_image or
             A( title_image, href = u"http://luminotes.com/", target = "_new" ),
           Div(
+            u"version", VERSION, u" | ",
+            A( u"upgrade", href = u"http://luminotes.com/pricing", target = "_new" ), u" | ",
             A( u"support", href = u"http://luminotes.com/support", target = "_new" ), u" | ",
             A( u"blog", href = u"http://luminotes.com/blog", target = "_new" ),
             class_ = u"header_links",