From 58894e2afa05229a8fa9cd44d5705e913876900e Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 5 Feb 2010 19:08:47 +0000
Subject: [PATCH] Update default config file and add version checking option

---
 openlp/core/utils/__init__.py        |  4 +-
 resources/.config/openlp/openlp.conf | 80 +++++++++++++---------------
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 962aa69bd..9504c771e 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -37,12 +37,14 @@ log = logging.getLogger(__name__)
 
 def check_latest_version(config, current_version):
     version_string = current_version
+    #set to prod in the distribution confif file.
+    environment = config.get_config(u'run environment', u'dev')
     last_test = config.get_config(u'last version test', datetime.now().date())
     this_test = unicode(datetime.now().date())
     config.set_config(u'last version test', this_test)
     if last_test != this_test:
         version_string = u''
-        req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
+        req = urllib2.Request(u'http://www.openlp.org/files/%s_version.txt' % environment)
         req.add_header(u'User-Agent', u'OpenLP/%s' % current_version)
         try:
             handle = urllib2.urlopen(req, None)
diff --git a/resources/.config/openlp/openlp.conf b/resources/.config/openlp/openlp.conf
index 876bea5cf..a1501ff73 100644
--- a/resources/.config/openlp/openlp.conf
+++ b/resources/.config/openlp/openlp.conf
@@ -1,77 +1,73 @@
-[audit]
-first service = 2
-db type = sqlite
-audit active = False
-second service = 2
-audit_status = 0
-data path = audit
-
 [bibles]
 display new chapter = False
 display brackets = 0
-verse layout style = 0
-bible theme = 0
-search as type = True
-bibles_status = 0
+dual bibles = False
+db type = sqlite
+bible theme = 
+verse layout style = 1
+status = 1
 data path = bibles
 
 [media]
-use mode layout = False
-media_status = 1
-
-[image]
-loop delay = 5
+status = 1
 
 [alerts]
 font color = #ffffff
+background color = #660000
 font face = Sans Serif
 timeout = 5
-background color = #660000
 
-[user interface]
-display previewpanel = True
-display thememanager = True
-display servicemanager = True
-display mediamanager = True
+[remotes]
+remote port = 4316
 
 [presentations]
-data path = presentations
+status = 1
 impress = 0
+data path = presentations
+powerpoint = 0
+powerpoint viewer = 0
 
 [custom]
+status = 1
+display footer = True
 data path = custom
 db type = sqlite
-custom_status = 0
 
 [themes]
+global theme = 
 data path = themes
-theme global theme = 
-theme global style = Global
+theme level = 1
+
+[images]
+status = 1
+data path = images
+loop delay = 5
+
+[user interface]
+theme manager = True
+media manager = True
+preview panel = True
+service manager = True
 
 [servicemanager]
 data path = servicemanager
-theme service theme = 
-
-[remotes]
-remotes_status = 1
-remote port = 4316
-
-[images]
-images_status = 1
 
 [general]
 monitor = 0
+run environment = dev
+ccli number = 
+blank warning = False
 show splash = True
-application version test = 2009-10-14
-user name = 
-application version = 1.9.0-600
-warning = False
+last version test = 2010-02-05
+songselect username = 
+save prompt = False
+songselect password = 
 auto open = False
-password = 
-ccl number = XXX
 
 [songs]
-songs_status = 0
+status = 1
+search as type = False
+display songbar = True
 data path = songs
 db type = sqlite