Merge lp:~dangarner/xibo/1.2.2-pre into lp:xibo/1.3

[Dan Garner]

[Dan Garner (dangarner)]

review: Approve

=== modified file 'client/dotNET/CacheManager.cs'
--- client/dotNET/CacheManager.cs	2010-04-19 21:45:10 +0000
+++ client/dotNET/CacheManager.cs	2011-02-28 15:09:00 +0000
@@ -25,6 +25,7 @@
 using System.Windows.Forms;
 using System.Xml.Serialization;
 using System.Diagnostics;
+using System.Xml;
 
 namespace XiboClient
 {
@@ -173,7 +174,7 @@
         /// </summary>
         /// <param name="path"></param>
         /// <returns>True is it is and false if it isnt</returns>
-        public bool IsValid(String path)
+        public bool IsValidPath(String path)
         {
             // TODO: what makes a path valid?
             // Currently a path is valid if it is in the cache
@@ -185,6 +186,10 @@
             {
                 if (file.path == path)
                 {
+                    // If we cached it over 2 minutes ago, then check the GetLastWriteTime
+                    if (file.cacheDate > DateTime.Now.AddMinutes(-2))
+                        return true;
+
                     try
                     {
                         // Check to see if this file has been modified since the MD5 cache
@@ -209,6 +214,75 @@
             // Reached the end of the cache and havent found the file.
             return false;
         }
+
+        /// <summary>
+        /// Is the provided layout file a valid layout (has all media)
+        /// </summary>
+        /// <param name="layoutFile"></param>
+        /// <returns></returns>
+        public bool IsValidLayout(string layoutFile)
+        {
+            Debug.WriteLine("Checking Layout " + layoutFile + " is valid");
+
+            if (!IsValidPath(layoutFile))
+                return false;
+
+            // Load the XLF, get all media ID's
+            XmlDocument layoutXml = new XmlDocument();
+            layoutXml.Load(Properties.Settings.Default.LibraryPath + @"\" + layoutFile);
+
+            XmlNodeList mediaNodes = layoutXml.SelectNodes("//media");
+
+            foreach (XmlNode media in mediaNodes)
+            {
+                // Is this a stored media type?
+                switch (media.Attributes["type"].Value)
+                {
+                    case "video":
+                    case "image":
+                    case "flash":
+                    case "ppt":
+
+                        // Get the path and see if its valid
+                        if (!IsValidPath(media.InnerText))
+                            return false;
+
+                        break;
+
+                    default:
+                        continue;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Regenerate from Required Files
+        /// </summary>
+        public void Regenerate()
+        {
+            if (!File.Exists(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile))
+                return;
+
+            // Open the XML file and check each required file that isnt already there
+            XmlDocument xml = new XmlDocument();
+            xml.Load(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile);
+
+            XmlNodeList fileNodes = xml.SelectNodes("//RequiredFile/Path");
+
+            foreach (XmlNode file in fileNodes)
+            {
+                string path = file.InnerText;
+
+                // Does the file exist?
+                if (!File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path))
+                    continue;
+
+                // Add this file to the cache manager
+                Add(path, GetMD5(path));
+            }
+        }
     }
 
     public struct Md5Resource
 
=== modified file 'client/dotNET/FileCollector.cs'
--- client/dotNET/FileCollector.cs	2010-04-19 21:45:10 +0000
+++ client/dotNET/FileCollector.cs	2011-02-28 15:09:00 +0000
@@ -31,28 +31,26 @@
     class FileCollector
     {
         private CacheManager _cacheManager;
+        private RequiredFiles _requiredFiles;
+        private XmlDocument _xml;
 
         public FileCollector(CacheManager cacheManager, string xmlString)
         {
             _cacheManager = cacheManager;
 
-            xml = new XmlDocument();
+            // Load the XML file RF call
+            _xml = new XmlDocument();
+            _xml.LoadXml(xmlString);
 
-            try
-            {
-                xml.LoadXml(xmlString);
-            }
-            catch (Exception e)
-            {
-                //Log this error
-                System.Diagnostics.Debug.WriteLine(e.Message);
-            }
+            // Create a required files object
+            _requiredFiles = new RequiredFiles();
+            _requiredFiles.RequiredFilesXml = _xml;
 
             // Get the key for later use
             hardwareKey = new HardwareKey();
 
             // Make a new filelist collection
-            files = new Collection<FileList>();
+            _files = new Collection<RequiredFile>();
 
             // Create a webservice call
             xmdsFile = new XiboClient.xmds.xmds();
@@ -73,13 +71,13 @@
         /// </summary>
         public void CompareAndCollect()
         {
-            XmlNodeList fileNodes = xml.SelectNodes("/files/file");
+            XmlNodeList fileNodes = _xml.SelectNodes("/files/file");
 
             //Inspect each file we have here
             foreach (XmlNode file in fileNodes)
             {
                 XmlAttributeCollection attributes = file.Attributes;
-                FileList fileList = new FileList();
+                RequiredFile fileList = new RequiredFile();
 
                 if (attributes["type"].Value == "layout")
                 {
@@ -120,13 +118,15 @@
                             fileList.md5 = attributes["md5"].Value;
                             fileList.retrys = 0;
 
-                            files.Add(fileList);
+                            _files.Add(fileList);
                         }
                         else
                         {
                             // The MD5 of the current file and the MD5 in RequiredFiles are the same.
                             // Therefore make sure this MD5 is in the CacheManager
                             _cacheManager.Add(path + ".xlf", md5);
+
+                            _requiredFiles.MarkComplete(int.Parse(path), md5); 
                         }
                     }
                     else
@@ -141,7 +141,7 @@
                         fileList.md5 = attributes["md5"].Value;
                         fileList.retrys = 0;
 
-                        files.Add(fileList);
+                        _files.Add(fileList);
                     }
                 }
                 else if (attributes["type"].Value == "media")
@@ -183,13 +183,16 @@
                             fileList.md5 = attributes["md5"].Value;
                             fileList.retrys = 0;
 
-                            files.Add(fileList);
+                            _files.Add(fileList);
                         }
                         else
                         {
                             // The MD5 of the current file and the MD5 in RequiredFiles are the same.
                             // Therefore make sure this MD5 is in the CacheManager
                             _cacheManager.Add(path, md5);
+
+                            string[] filePart = path.Split('.');
+                            _requiredFiles.MarkComplete(int.Parse(filePart[0]), md5); 
                         }
                     }
                     else
@@ -205,7 +208,7 @@
                         fileList.md5 = attributes["md5"].Value;
                         fileList.retrys = 0;
 
-                        files.Add(fileList);
+                        _files.Add(fileList);
                     }
                 }
                 else if (attributes["type"].Value == "blacklist")
@@ -234,10 +237,24 @@
                 }
             }
 
-            System.Diagnostics.Debug.WriteLine(String.Format("There are {0} files to get", files.Count.ToString()));
+            Debug.WriteLine(String.Format("There are {0} files to get", _files.Count.ToString()));
+
+            // Output a list of the files we need to get
+            string debugMessage = "";
+
+            foreach (RequiredFile fileToGet in _files)
+                debugMessage += string.Format("File: {0}, Type: {1}, MD5: {2}. ", fileToGet.path, fileToGet.type, fileToGet.md5);
+
+            Debug.WriteLine(debugMessage);
+
+            // Report the files files back to XMDS
+            _requiredFiles.ReportInventory();
+
+            // Write Required Files
+            _requiredFiles.WriteRequiredFiles();
 
             // Is there anything to get?
-            if (files.Count == 0)
+            if (_files.Count == 0)
             {
                 CollectionComplete();
                 return;
@@ -247,7 +264,7 @@
             _currentFile = 0;
 
             // Preload the first filelist
-            _currentFileList = files[_currentFile];
+            _currentFileList = _files[_currentFile];
 
             // Get the first file
             GetFile();
@@ -367,6 +384,10 @@
                         {
                             // Add to the CacheManager
                             _cacheManager.Add(_currentFileList.path + ".xlf", md5sum);
+
+                            // Report this completion back to XMDS
+                            _requiredFiles.MarkComplete(int.Parse(_currentFileList.path), md5sum);
+                            _requiredFiles.ReportInventory();
                         }
 
                         // Fire a layout complete event
@@ -437,6 +458,11 @@
 
                                 System.Diagnostics.Debug.WriteLine(string.Format("File downloaded: {0}", _currentFileList.path));
 
+                                // Report this completion back to XMDS
+                                string[] filePart = _currentFileList.path.Split('.');
+                                _requiredFiles.MarkComplete(int.Parse(filePart[0]), md5sum);
+                                _requiredFiles.ReportInventory();
+
                                 // All the file has been recieved. Move on to the next file.
                                 _currentFile++;
                             }
@@ -467,13 +493,16 @@
         /// </summary>
         public void GetFile()
         {
-            if (_currentFile > (files.Count - 1))
+            if (_currentFile > (_files.Count - 1))
             {
-                System.Diagnostics.Debug.WriteLine(String.Format("Finished Recieving {0} files", files.Count));
+                System.Diagnostics.Debug.WriteLine(String.Format("Finished Receiving {0} files", _files.Count));
 
                 // Clean up
-                files.Clear();
-                xmdsFile.Dispose();                
+                _files.Clear();
+                xmdsFile.Dispose();
+             
+                // Write Required Files
+                _requiredFiles.WriteRequiredFiles();
 
                 // Finished getting this file list
                 CollectionComplete();
@@ -483,7 +512,7 @@
                 // Get the current file into the currentfilelist if the current one is finished
                 if (_currentFileList.complete)
                 {
-                    _currentFileList = files[_currentFile];
+                    _currentFileList = _files[_currentFile];
                 }
 
                 System.Diagnostics.Debug.WriteLine(String.Format("Getting the file : {0} chunk : {1}", _currentFileList.path, _currentFileList.chunkOffset.ToString()));
@@ -496,7 +525,7 @@
         }
 
         [Serializable]
-        private struct FileList
+        private struct RequiredFile
         {
             public string path;
             public string type;
@@ -511,9 +540,9 @@
 
         private XmlDocument xml;
         private HardwareKey hardwareKey;
-        private Collection<FileList> files;
+        private Collection<RequiredFile> _files;
         private int _currentFile;
-        private FileList _currentFileList;
+        private RequiredFile _currentFileList;
         private xmds.xmds xmdsFile;
 
         public event LayoutFileChangedDelegate LayoutFileChanged;
 
=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2010-08-26 20:15:36 +0000
+++ client/dotNET/MainForm.cs	2011-02-28 15:09:00 +0000
@@ -72,14 +72,45 @@
 
             _statLog = new StatLog();
 
+            this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
+            this.Shown += new EventHandler(MainForm_Shown);
+        }
+
+        /// <summary>
+        /// Called after the form has been shown
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MainForm_Shown(object sender, EventArgs e)
+        {
+            // Process any stuff that has happened during the loading process
+            Application.DoEvents();
+
             // Create a cachemanager
             SetCacheManager();
 
-            this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
+            try
+            {
+                // Create the Schedule
+                _schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile, ref _cacheManager);
+
+                // Bind to the schedule change event - notifys of changes to the schedule
+                _schedule.ScheduleChangeEvent += new Schedule.ScheduleChangeDelegate(schedule_ScheduleChangeEvent);
+
+                // Initialize the other schedule components
+                _schedule.InitializeComponents();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex.Message, LogType.Error.ToString());
+                MessageBox.Show("Fatal Error initialising the application", "Fatal Error");
+                Close();
+                Dispose();
+            }
         }
 
         /// <summary>
-        /// Called when the form has finished loading
+        /// Called before the form has loaded for the first time
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -96,30 +127,13 @@
             Cursor.Position = new Point(_clientSize.Width, _clientSize.Height);
             Cursor.Hide();
 
+            ShowSplashScreen();
+
             // Change the default Proxy class
             OptionForm.SetGlobalProxy();
 
             // UserApp data
             Debug.WriteLine(new LogMessage("MainForm_Load", "User AppData Path: " + Application.UserAppDataPath), LogType.Info.ToString());
-
-            try
-            {
-                // Create the Schedule
-                _schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile, ref _cacheManager);
-
-                // Bind to the schedule change event - notifys of changes to the schedule
-                _schedule.ScheduleChangeEvent += new Schedule.ScheduleChangeDelegate(schedule_ScheduleChangeEvent);
-
-                // Initialize the other schedule components
-                _schedule.InitializeComponents();
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex.Message, LogType.Error.ToString());
-                MessageBox.Show("Fatal Error initialising the application", "Fatal Error");
-                Close();
-                Dispose();
-            }
         }
 
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -152,11 +166,20 @@
             }
             catch (Exception ex)
             {
-                Trace.WriteLine(new LogMessage("Schedule", "Unable to reuse the Cache Manager because: " + ex.Message));
+                Trace.WriteLine(new LogMessage("MainForm - SetCacheManager", "Unable to reuse the Cache Manager because: " + ex.Message));
 
                 // Create a new cache manager
                 _cacheManager = new CacheManager();
             }
+
+            try
+            {
+                _cacheManager.Regenerate();
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("MainForm - SetCacheManager", "Regenerate failed because: " + ex.Message));
+            }
         }
 
         /// <summary>
@@ -191,9 +214,29 @@
             {
                 Debug.WriteLine(ex.Message);
                 _isExpired = true;
+
+                ShowSplashScreen();
+
+                // In 10 seconds fire the next layout?
+                Timer timer = new Timer();
+                timer.Interval = 10000;
+                timer.Tick += new EventHandler(splashScreenTimer_Tick);
+
+                // Start the timer
+                timer.Start();
             }
         }
 
+        void splashScreenTimer_Tick(object sender, EventArgs e)
+        {
+            Debug.WriteLine(new LogMessage("timer_Tick", "Loading next layout after splashscreen"));
+
+            Timer timer = (Timer)sender;
+            timer.Stop();
+            timer.Dispose();
+
+            _schedule.NextLayout();
+        }
 
         /// <summary>
         /// Prepares the Layout.. rendering all the necessary controls
@@ -213,8 +256,7 @@
             // Default or not
             if (layoutPath == Properties.Settings.Default.LibraryPath + @"\Default.xml" || String.IsNullOrEmpty(layoutPath))
             {
-                ShowSplashScreen();
-                return;
+                throw new Exception("Default layout");
             }
             else
             {
@@ -232,33 +274,16 @@
                 }
                 catch (Exception ex)
                 {
-                    // couldnt open the layout file, so use the embedded one
-                    System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
-                    Stream resourceStream = assembly.GetManifestResourceStream("XiboClient.Resources.splash.jpg");
-
-                    // Load into a stream and then into an Image
-                    try
-                    {
-                        Image bgSplash = Image.FromStream(resourceStream);
-
-                        Bitmap bmpSplash = new Bitmap(bgSplash, _clientSize);
-                        this.BackgroundImage = bmpSplash;
-                    }
-                    catch
-                    {
-                        // Log
-                        System.Diagnostics.Debug.WriteLine(ex.Message);
-                        System.Diagnostics.Trace.WriteLine("Could not find the layout file {0}", layoutPath);
-                    }
-                    return;
+                    Trace.WriteLine(string.Format("Could not find the layout file {0}: {1}", layoutPath, ex.Message));
+                    throw;
                 }
             }
 
             // Attributes of the main layout node
             XmlNode layoutNode = layoutXml.SelectSingleNode("/layout");
-            
-            XmlAttributeCollection layoutAttributes =  layoutNode.Attributes;
-            
+
+            XmlAttributeCollection layoutAttributes = layoutNode.Attributes;
+
             // Set the background and size of the form
             _layoutWidth = int.Parse(layoutAttributes["width"].Value);
             _layoutHeight = int.Parse(layoutAttributes["height"].Value);
@@ -266,7 +291,7 @@
 
             // Scaling factor, will be applied to all regions
             _scaleFactor = Math.Min(_clientSize.Width / _layoutWidth, _clientSize.Height / _layoutHeight);
-       
+
             // Want to be able to center this shiv - therefore work out which one of these is going to have left overs
             int backgroundWidth = (int)(_layoutWidth * _scaleFactor);
             int backgroundHeight = (int)(_layoutHeight * _scaleFactor);
@@ -282,7 +307,7 @@
                 if (leftOverX != 0) leftOverX = leftOverX / 2;
                 if (leftOverY != 0) leftOverY = leftOverY / 2;
             }
-            catch 
+            catch
             {
                 leftOverX = 0;
                 leftOverY = 0;
@@ -361,25 +386,24 @@
             // Check to see if there are any regions on this layout.
             if (listRegions.Count == 0 || listMedia.Count == 0)
             {
-                Trace.WriteLine(new LogMessage("PrepareLayout", 
-                    string.Format("A layout with {0} regions and {1} media has been detected.", listRegions.Count.ToString(), listMedia.Count.ToString())), 
+                Trace.WriteLine(new LogMessage("PrepareLayout",
+                    string.Format("A layout with {0} regions and {1} media has been detected.", listRegions.Count.ToString(), listMedia.Count.ToString())),
                     LogType.Info.ToString());
 
                 if (_schedule.ActiveLayouts == 1)
                 {
                     Trace.WriteLine(new LogMessage("PrepareLayout", "Only 1 layout scheduled and it has nothing to show."), LogType.Info.ToString());
 
-                    // Fall back to the splash screen (will only shift from here once a new schedule is detected)
-                    ShowSplashScreen();
+                    throw new Exception("Only 1 layout schduled and it has nothing to show");
                 }
                 else
                 {
-                    Trace.WriteLine(new LogMessage("PrepareLayout", 
+                    Trace.WriteLine(new LogMessage("PrepareLayout",
                         string.Format(string.Format("An empty layout detected, will show for {0} seconds.", Properties.Settings.Default.emptyLayoutDuration.ToString()))), LogType.Info.ToString());
 
                     // Put a small dummy region in place, with a small dummy media node - which expires in 10 seconds.
                     XmlDocument dummyXml = new XmlDocument();
-                    dummyXml.LoadXml(string.Format("<region id='blah' width='1' height='1' top='1' left='1'><media id='blah' type='text' duration='{0}'><raw><text></text></raw></media></region>", 
+                    dummyXml.LoadXml(string.Format("<region id='blah' width='1' height='1' top='1' left='1'><media id='blah' type='text' duration='{0}'><raw><text></text></raw></media></region>",
                         Properties.Settings.Default.emptyLayoutDuration.ToString()));
 
                     // Replace the list of regions (they mean nothing as they are empty)
@@ -400,10 +424,10 @@
 
                 options.scheduleId = _scheduleId;
                 options.layoutId = _layoutId;
-                options.width = (int) (double.Parse(nodeAttibutes["width"].Value) * _scaleFactor);
-                options.height = (int) (double.Parse(nodeAttibutes["height"].Value) * _scaleFactor);
-                options.left = (int) (double.Parse(nodeAttibutes["left"].Value) * _scaleFactor);
-                options.top = (int) (double.Parse(nodeAttibutes["top"].Value) * _scaleFactor);
+                options.width = (int)(double.Parse(nodeAttibutes["width"].Value) * _scaleFactor);
+                options.height = (int)(double.Parse(nodeAttibutes["height"].Value) * _scaleFactor);
+                options.left = (int)(double.Parse(nodeAttibutes["left"].Value) * _scaleFactor);
+                options.top = (int)(double.Parse(nodeAttibutes["top"].Value) * _scaleFactor);
                 options.scaleFactor = _scaleFactor;
 
                 // Set the backgrounds (used for Web content offsets)
@@ -411,9 +435,9 @@
                 options.backgroundTop = options.top * -1;
 
                 //Account for scaling
-                options.left = options.left + (int) leftOverX;
-                options.top = options.top + (int) leftOverY;
-                
+                options.left = options.left + (int)leftOverX;
+                options.top = options.top + (int)leftOverY;
+
                 // All the media nodes for this region / layout combination
                 options.mediaNodes = region.ChildNodes;
 
@@ -421,7 +445,7 @@
                 temp.DurationElapsedEvent += new Region.DurationElapsedDelegate(temp_DurationElapsedEvent);
 
                 Debug.WriteLine("Created new region", "MainForm - Prepare Layout");
-                
+
                 // Dont be fooled, this innocent little statement kicks everything off
                 temp.regionOptions = options;
 
@@ -456,6 +480,8 @@
 
                 Bitmap bmpSplash = new Bitmap(bgSplash, _clientSize);
                 this.BackgroundImage = bmpSplash;
+
+                bgSplash.Dispose();
             }
             catch (Exception ex)
             {
 
=== modified file 'client/dotNET/Properties/Resources.Designer.cs'
--- client/dotNET/Properties/Resources.Designer.cs	2009-12-31 11:38:50 +0000
+++ client/dotNET/Properties/Resources.Designer.cs	2011-02-28 15:09:00 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.4952
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 
=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2010-09-26 14:33:38 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2011-02-28 15:09:00 +0000
@@ -47,7 +47,7 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/xibo/xmds.php")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php")]
         public string XiboClient_xmds_xmds {
             get {
                 return ((string)(this["XiboClient_xmds_xmds"]));
@@ -271,7 +271,7 @@
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.2.0")]
+        [global::System.Configuration.DefaultSettingValueAttribute("1.2.2")]
         public string ClientVersion {
             get {
                 return ((string)(this["ClientVersion"]));
@@ -370,5 +370,17 @@
                 this["emptyLayoutDuration"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("requiredFiles.xml")]
+        public string RequiredFilesFile {
+            get {
+                return ((string)(this["RequiredFilesFile"]));
+            }
+            set {
+                this["RequiredFilesFile"] = value;
+            }
+        }
     }
 }
 
=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2010-09-26 14:33:38 +0000
+++ client/dotNET/Properties/Settings.settings	2011-02-28 15:09:00 +0000
@@ -9,7 +9,7 @@
       <Value Profile="(Default)">schedule.xml</Value>
     </Setting>
     <Setting Name="XiboClient_xmds_xmds" Type="(Web Service URL)" Scope="User">
-      <Value Profile="(Default)">http://localhost/xibo/xmds.php</Value>
+      <Value Profile="(Default)">http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</Value>
     </Setting>
     <Setting Name="ServerKey" Type="System.String" Scope="User">
       <Value Profile="(Default)">yourserverkey</Value>
@@ -69,7 +69,7 @@
       <Value Profile="(Default)">cacheManager.xml</Value>
     </Setting>
     <Setting Name="ClientVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">1.2.0</Value>
+      <Value Profile="(Default)">1.2.2</Value>
     </Setting>
     <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">1</Value>
@@ -95,5 +95,8 @@
     <Setting Name="emptyLayoutDuration" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">10</Value>
     </Setting>
+    <Setting Name="RequiredFilesFile" Type="System.String" Scope="User">
+      <Value Profile="(Default)">requiredFiles.xml</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
 \ No newline at end of file
 
=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2010-08-26 19:23:14 +0000
+++ client/dotNET/Region.cs	2011-02-28 15:09:00 +0000
@@ -309,6 +309,13 @@
                         System.Diagnostics.Trace.WriteLine("Duration is Empty, using a default of 60.", "Region - SetNextMediaNode");
                     }
 
+                    // We cannot have a 0 duration here... not sure why we would... but
+                    if (options.duration == 0 && options.type != "video")
+                    {
+                        int emptyLayoutDuration = int.Parse(Properties.Settings.Default.emptyLayoutDuration.ToString());
+                        options.duration = (emptyLayoutDuration == 0) ? 10 : emptyLayoutDuration;
+                    }
+
                     // There will be some stuff on option nodes
                     XmlNode optionNode = mediaNode.FirstChild;                    
 
@@ -378,7 +385,7 @@
                     if (options.type == "video" || options.type == "flash" || options.type == "image" || options.type == "powerpoint")
                     {
                         // Use the cache manager to determine if the file is valid
-                        validNode = _cacheManager.IsValid(options.uri);
+                        validNode = _cacheManager.IsValidPath(options.uri);
                     }
                 }
 
 
=== added file 'client/dotNET/RequiredFiles.cs'
--- client/dotNET/RequiredFiles.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/RequiredFiles.cs	2011-02-28 15:09:00 +0000
@@ -0,0 +1,206 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2011 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+using System.IO;
+using System.Security.Cryptography;
+using System.Xml;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Xml.Serialization;
+
+namespace XiboClient
+{
+    public class RequiredFiles
+    {
+        private XmlDocument _requiredFilesXml;
+        public Collection<RequiredFile> _requiredFiles;
+        private xmds.xmds _report;
+
+        public RequiredFiles()
+        {
+            _requiredFiles = new Collection<RequiredFile>();
+
+            // Create a webservice call
+            _report = new XiboClient.xmds.xmds();
+
+            // Start up the Xmds Service Object
+            _report.Credentials = null;
+            _report.Url = Properties.Settings.Default.XiboClient_xmds_xmds;
+            _report.UseDefaultCredentials = false;
+        }
+
+        /// <summary>
+        /// Set required files from the XML document
+        /// </summary>
+        private void SetRequiredFiles()
+        {
+            // Itterate through the RF XML and populate the RF collection
+            XmlNodeList fileNodes = _requiredFilesXml.SelectNodes("/files/file");
+
+            foreach (XmlNode file in fileNodes)
+            {
+                RequiredFile rf = new RequiredFile(); 
+                
+                XmlAttributeCollection attributes = file.Attributes;
+
+                rf.FileType = attributes["type"].Value;
+                rf.Complete = 0;
+                rf.Md5 = "";
+                rf.LastChecked = DateTime.Now;
+
+                if (rf.FileType == "media")
+                {
+                    string[] filePart = attributes["path"].Value.Split('.');
+                    rf.Id = int.Parse(filePart[0]);
+                    rf.Path = attributes["path"].Value;
+                }
+                else if (rf.FileType == "layout")
+                {
+                    rf.Id = int.Parse(attributes["path"].Value);
+                    rf.Path = attributes["path"].Value + ".xlf";
+                }
+                else
+                {
+                    continue;
+                }
+
+                _requiredFiles.Add(rf);
+            }
+        }
+
+        /// <summary>
+        /// Required Files XML
+        /// </summary>
+        public XmlDocument RequiredFilesXml
+        {
+            set
+            {
+                _requiredFilesXml = value;
+                SetRequiredFiles();
+            }
+        }
+
+        /// <summary>
+        /// Mark a RequiredFile as complete
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="md5"></param>
+        public void MarkComplete(int id, string md5)
+        {
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                if (rf.Id == id)
+                {
+                    RequiredFile newRf = rf;
+
+                    newRf.Complete = 1;
+                    newRf.Md5 = md5;
+
+
+                    _requiredFiles.Add(newRf);
+                    _requiredFiles.Remove(rf);
+
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Mark a RequiredFile as incomplete
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="md5"></param>
+        public void MarkIncomplete(int id, string md5)
+        {
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                if (rf.Id == id)
+                {
+                    RequiredFile newRf = rf;
+
+                    newRf.Complete = 0;
+                    newRf.Md5 = md5;
+
+                    _requiredFiles.Add(newRf);
+                    _requiredFiles.Remove(rf);
+
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes Required Files to disk
+        /// </summary>
+        public void WriteRequiredFiles()
+        {
+            Debug.WriteLine(new LogMessage("RequiredFiles - WriteRequiredFiles", "About to Write RequiredFiles"), LogType.Info.ToString());
+
+            try
+            {
+                using (StreamWriter streamWriter = new StreamWriter(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile))
+                {
+                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(RequiredFiles));
+
+                    xmlSerializer.Serialize(streamWriter, this);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("RequiredFiles - WriteRequiredFiles", "Unable to write RequiredFiles to disk because: " + ex.Message));
+            }
+        }
+
+        /// <summary>
+        /// Report Required Files to XMDS
+        /// </summary>
+        public void ReportInventory()
+        {
+            HardwareKey hardwareKey = new HardwareKey();
+
+            // Build the XML required by media file
+            string xml = "";
+            
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                xml += string.Format("<file type=\"{0}\" id=\"{1}\" complete=\"{2}\" lastChecked=\"{3}\" md5=\"{4}\" />", 
+                    rf.FileType, rf.Id.ToString(), rf.Complete.ToString(), rf.LastChecked.ToString(), rf.Md5);
+            }
+
+            xml = string.Format("<files>{0}</files>", xml);
+
+            _report.MediaInventoryAsync(Properties.Settings.Default.Version, Properties.Settings.Default.ServerKey,
+                hardwareKey.Key, xml);
+        }
+    }
+
+    public struct RequiredFile
+    {
+        public string FileType;
+        public int Id;
+        public int Complete;
+        public DateTime LastChecked;
+        public string Md5;
+        public string Path;
+    }
+}
 
=== modified file 'client/dotNET/Resources/splash.jpg'
 Binary files client/dotNET/Resources/splash.jpg	2008-12-19 23:34:13 +0000 and client/dotNET/Resources/splash.jpg	2011-02-28 15:09:00 +0000 differ
=== modified file 'client/dotNET/RssReader.cs'
--- client/dotNET/RssReader.cs	2010-09-26 17:37:39 +0000
+++ client/dotNET/RssReader.cs	2011-02-28 15:09:00 +0000
@@ -120,7 +120,7 @@
                 item.DateString = date;
 
                 // Fudge the date...
-                if (date.Contains("+"))
+                if (date.Contains("+") || date.Contains("-"))
                     DateTime.TryParse(date, out item.Date);
                 else
                     DateTime.TryParse(date.Substring(0, date.Length - 4), out item.Date);
 
=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2010-08-22 16:49:09 +0000
+++ client/dotNET/Schedule.cs	2011-02-28 15:09:00 +0000
@@ -74,7 +74,7 @@
             _cacheManager = cacheManager;
 
             // Create a schedule manager
-            _scheduleManager = new ScheduleManager(scheduleLocation);
+            _scheduleManager = new ScheduleManager(_cacheManager, scheduleLocation);
 
             // Create a new Xmds service object
             _xmds2 = new XiboClient.xmds.xmds();
 
=== modified file 'client/dotNET/ScheduleManager.cs'
--- client/dotNET/ScheduleManager.cs	2010-08-25 21:39:53 +0000
+++ client/dotNET/ScheduleManager.cs	2011-02-28 15:09:00 +0000
@@ -42,13 +42,15 @@
         private Collection<LayoutSchedule> _layoutSchedule;
         private Collection<LayoutSchedule> _currentSchedule;
         private bool _refreshSchedule;
+        private CacheManager _cacheManager;
 
         /// <summary>
         /// Creates a new schedule Manager
         /// </summary>
         /// <param name="scheduleLocation"></param>
-        public ScheduleManager(string scheduleLocation)
+        public ScheduleManager(CacheManager cacheManager, string scheduleLocation)
         {
+            _cacheManager = cacheManager;
             _location = scheduleLocation;
 
             // Create an empty layout schedule
@@ -178,6 +180,19 @@
             // For each layout in the schedule determine if it is currently inside the _currentSchedule, and whether it should be
             foreach (LayoutSchedule layout in _layoutSchedule)
             {
+                // Is the layout valid in the cachemanager?
+                try
+                {
+                    if (!_cacheManager.IsValidLayout(layout.id + ".xlf"))
+                        continue;
+                }
+                catch
+                {
+                    // TODO: Ignore this layout.. raise an error?
+                    Trace.WriteLine("Unable to determine if layout is valid or not");
+                    continue;
+                }
+
                 // If this is the default, skip it
                 if (layout.NodeName == "default")
                 {
 
=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2009-12-31 11:38:50 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2011-02-28 15:09:00 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
+//     Runtime Version:2.0.50727.4952
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4927.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4952.
 // 
 #pragma warning disable 1591
 
@@ -23,7 +23,7 @@
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="xmdsBinding", Namespace="urn:xmds")]
@@ -45,6 +45,8 @@
         
         private System.Threading.SendOrPostCallback SubmitStatsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback MediaInventoryOperationCompleted;
+        
         private bool useDefaultCredentialsSetExplicitly;
         
         /// <remarks/>
@@ -108,6 +110,9 @@
         public event SubmitStatsCompletedEventHandler SubmitStatsCompleted;
         
         /// <remarks/>
+        public event MediaInventoryCompletedEventHandler MediaInventoryCompleted;
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
         public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string version) {
@@ -402,6 +407,42 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#MediaInventory", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
+        [return: System.Xml.Serialization.SoapElementAttribute("success")]
+        public bool MediaInventory(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
+            object[] results = this.Invoke("MediaInventory", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        mediaInventory1});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1) {
+            this.MediaInventoryAsync(version, serverKey, hardwareKey, mediaInventory1, null);
+        }
+        
+        /// <remarks/>
+        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1, object userState) {
+            if ((this.MediaInventoryOperationCompleted == null)) {
+                this.MediaInventoryOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMediaInventoryOperationCompleted);
+            }
+            this.InvokeAsync("MediaInventory", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        mediaInventory1}, this.MediaInventoryOperationCompleted, userState);
+        }
+        
+        private void OnMediaInventoryOperationCompleted(object arg) {
+            if ((this.MediaInventoryCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.MediaInventoryCompleted(this, new MediaInventoryCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
         }
@@ -421,11 +462,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void RegisterDisplayCompletedEventHandler(object sender, RegisterDisplayCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RegisterDisplayCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -447,11 +488,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void RequiredFilesCompletedEventHandler(object sender, RequiredFilesCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RequiredFilesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -473,11 +514,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void GetFileCompletedEventHandler(object sender, GetFileCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class GetFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -499,11 +540,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void ScheduleCompletedEventHandler(object sender, ScheduleCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class ScheduleCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -525,11 +566,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void RecieveXmlLogCompletedEventHandler(object sender, RecieveXmlLogCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class RecieveXmlLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -551,11 +592,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void BlackListCompletedEventHandler(object sender, BlackListCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class BlackListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -577,11 +618,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void SubmitLogCompletedEventHandler(object sender, SubmitLogCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SubmitLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -603,11 +644,11 @@
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     public delegate void SubmitStatsCompletedEventHandler(object sender, SubmitStatsCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SubmitStatsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -627,6 +668,32 @@
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
+    public delegate void MediaInventoryCompletedEventHandler(object sender, MediaInventoryCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class MediaInventoryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal MediaInventoryCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
 }
 
 #pragma warning restore 1591
 \ No newline at end of file
 
=== modified file 'client/dotNET/Web References/xmds/Reference.map'
--- client/dotNET/Web References/xmds/Reference.map	2009-12-31 11:38:50 +0000
+++ client/dotNET/Web References/xmds/Reference.map	2011-02-28 15:09:00 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/1.0.0/server/xmds.php?wsdl" filename="xmds.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/Series 1.2/server-121-soap-wsdl/server/xmds.php?wsdl" filename="xmds.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
 \ No newline at end of file
 
=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
--- client/dotNET/Web References/xmds/xmds.wsdl	2009-12-31 11:38:50 +0000
+++ client/dotNET/Web References/xmds/xmds.wsdl	2011-02-28 15:09:00 +0000
@@ -81,6 +81,15 @@
   <wsdl:message name="SubmitStatsResponse">
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
+  <wsdl:message name="MediaInventoryRequest">
+    <wsdl:part name="version" type="xsd:string" />
+    <wsdl:part name="serverKey" type="xsd:string" />
+    <wsdl:part name="hardwareKey" type="xsd:string" />
+    <wsdl:part name="mediaInventory" type="xsd:string" />
+  </wsdl:message>
+  <wsdl:message name="MediaInventoryResponse">
+    <wsdl:part name="success" type="xsd:boolean" />
+  </wsdl:message>
   <wsdl:portType name="xmdsPortType">
     <wsdl:operation name="RegisterDisplay">
       <documentation>Registered the Display on the Xibo Network</documentation>
@@ -122,6 +131,11 @@
       <wsdl:input message="tns:SubmitStatsRequest" />
       <wsdl:output message="tns:SubmitStatsResponse" />
     </wsdl:operation>
+    <wsdl:operation name="MediaInventory">
+      <documentation>Report back the clients MediaInventory</documentation>
+      <wsdl:input message="tns:MediaInventoryRequest" />
+      <wsdl:output message="tns:MediaInventoryResponse" />
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="xmdsBinding" type="tns:xmdsPortType">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
@@ -197,10 +211,19 @@
         <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="MediaInventory">
+      <soap:operation soapAction="urn:xmds#MediaInventory" style="rpc" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="xmds">
     <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
-      <soap:address location="http://localhost/1.0.0/server/xmds.php" />
+      <soap:address location="http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
 \ No newline at end of file
 
=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2010-08-22 12:42:36 +0000
+++ client/dotNET/XiboClient.csproj	2011-02-28 15:09:00 +0000
@@ -161,6 +161,7 @@
     <Compile Include="Region.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="RequiredFiles.cs" />
     <Compile Include="Rss.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -267,10 +268,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost/1.0.0/server/xmds.php%3fwsdl">
+    <WebReferenceUrl Include="http://localhost/Series%25201.2/server-121-soap-wsdl/server/xmds.php%3fwsdl">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\xmds\</RelPath>
-      <UpdateFromURL>http://localhost/1.0.0/server/xmds.php%3fwsdl</UpdateFromURL>
+      <UpdateFromURL>http://localhost/Series%25201.2/server-121-soap-wsdl/server/xmds.php%3fwsdl</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
@@ -294,11 +295,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\splash.jpg" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Resources\HtmlTemplate.htm" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\splash.jpg">
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
 
=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2010-09-26 14:33:38 +0000
+++ client/dotNET/app.config	2011-02-28 15:09:00 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/xibo/xmds.php</value>
+                <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>yourserverkey</value>
@@ -79,6 +79,9 @@
             <setting name="emptyLayoutDuration" serializeAs="String">
                 <value>10</value>
             </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -102,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.2.0</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>
 
=== modified file 'client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll'
 Binary files client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll	2011-02-28 15:09:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/AxInterop.WMPLib.dll'
 Binary files client/dotNET/bin/Release/AxInterop.WMPLib.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/AxInterop.WMPLib.dll	2011-02-28 15:09:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll'
 Binary files client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll	2011-02-28 15:09:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/Interop.WMPLib.dll'
 Binary files client/dotNET/bin/Release/Interop.WMPLib.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/Interop.WMPLib.dll	2011-02-28 15:09:00 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe.config'
--- client/dotNET/bin/Release/XiboClient.exe.config	2010-04-19 21:45:10 +0000
+++ client/dotNET/bin/Release/XiboClient.exe.config	2011-02-28 15:09:00 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/xibo/xmds.php</value>
+                <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>yourserverkey</value>
@@ -61,6 +61,27 @@
             <setting name="scrollStepAmount" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="sizeX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="sizeY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="expireModifiedLayouts" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="emptyLayoutDuration" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -75,7 +96,7 @@
                 <value>blacklist.xml</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>1</value>
+                <value>2</value>
             </setting>
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
@@ -84,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.0.7</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>
 
=== modified file 'client/dotNET/bin/Release/XiboClient.vshost.exe.config'
--- client/dotNET/bin/Release/XiboClient.vshost.exe.config	2010-04-19 21:45:10 +0000
+++ client/dotNET/bin/Release/XiboClient.vshost.exe.config	2011-02-28 15:09:00 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/xibo/xmds.php</value>
+                <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>yourserverkey</value>
@@ -61,6 +61,27 @@
             <setting name="scrollStepAmount" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="sizeX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="sizeY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="expireModifiedLayouts" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="emptyLayoutDuration" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -75,7 +96,7 @@
                 <value>blacklist.xml</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>1</value>
+                <value>2</value>
             </setting>
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
@@ -84,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.0.7</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>
 
=== modified file 'client/python/XiboClient.py'
--- client/python/XiboClient.py	2011-02-10 22:25:35 +0000
+++ client/python/XiboClient.py	2011-02-28 15:09:00 +0000
@@ -48,7 +48,11 @@
 import PIL.Image
 import math
 
+<<<<<<< TREE
 version = "1.3.0a1"
+=======
+version = "1.2.1a1"
+>>>>>>> MERGE-SOURCE
 
 # What layout schema version is supported
 schemaVersion = 1
@@ -1015,11 +1019,18 @@
                     if config.get('Main','manualUpdate') == 'true':
                         log.lights('offlineUpdate','start')
 
+                    if config.get('Main','manualUpdate') == 'true':
+                        log.lights('offlineUpdate','start')
+
                     # Check if the file is downloading already
                     if not tmpFileName in self.runningDownloads:
                         # Make a download thread and actually download the file.
                         # Add the running thread to the self.runningDownloads dictionary
+<<<<<<< TREE
                         self.runningDownloads[tmpFileName] = XiboDownloadThread(self,tmpType,tmpFileName,tmpSize,tmpHash,tmpId)
+=======
+                        self.runningDownloads[tmpFileName] = XiboDownloadThread(self,tmpType,tmpFileName,tmpSize,tmpHash)
+>>>>>>> MERGE-SOURCE
                         log.updateRunningDownloads(len(self.runningDownloads))
 
                         if self.offline:
@@ -2544,7 +2555,11 @@
 
 class XMDS:
     def __init__(self):
+<<<<<<< TREE
         self.__schemaVersion__ = "3"
+=======
+        self.__schemaVersion__ = "2"
+>>>>>>> MERGE-SOURCE
 
         # Semaphore to allow only one XMDS call to run check simultaneously
         self.checkLock = Semaphore()
@@ -2959,6 +2974,7 @@
                     log.log(0,"error",str(err))
                     self.hasInitialised = False
 
+<<<<<<< TREE
     def MediaInventory(self,inventoryXml):
         response = None
         log.lights('Log','amber')
@@ -3186,6 +3202,186 @@
         log.lights('RD','green')
 
 #### Finish Webservice
+=======
+class XMDSOffline(Thread):
+    def __init__(self,displayManager):
+        Thread.__init__(self)
+        self.__schemaVersion__ = "2"
+        self.displayManager = displayManager
+        self.updatePath = ""
+        self.__running__ = True
+        self.__scanPath__ = '/media'
+
+        # Semaphore to allow only one XMDS call to run check simultaneously
+        self.checkLock = Semaphore()
+
+        self.hasInitialised = False
+
+        salt = None
+        try:
+            salt = config.get('Main','xmdsClientID')
+        except:
+            log.log(0,"error",_("No XMDS Client ID specified in your configuration"))
+            log.log(0,"error",_("Please check your xmdsClientID configuration option"))
+            exit(1)
+
+        self.uuid = uuid.uuid5(uuid.NAMESPACE_DNS, salt)
+        # Convert the UUID in to a SHA1 hash
+        self.uuid = hashlib.sha1(str(self.uuid)).hexdigest()
+
+        licenseKey = ''
+        try:
+            licenseKey = config.get('Main','xmdsLicenseKey')
+        except:
+            pass
+
+        if licenseKey != '':
+            self.uuid = licenseKey
+
+        self.name = None
+        try:
+            self.name = config.get('Main','xmdsClientName')
+        except:
+            pass
+
+        if self.name == None or self.name == "":
+            import platform
+            self.name = platform.node()
+
+        self.start()
+
+    def run(self):
+        # Sleep for 10 seconds to allow the client time to start and settle.
+        time.sleep(10)
+
+        # Startup a loop listening scanning for new mounts
+        log.log(5,'info','Offline Update: Scanning.',True)
+        while self.__running__:
+            for folder in os.listdir(self.__scanPath__):
+                log.log(5,'info','Offline Update: Checking %s for new content.' % os.path.join(self.__scanPath__,folder),True)
+                log.log(5,'info','Offline Update: Client License Key: %s' % self.uuid,True)
+                if os.path.isdir(os.path.join(self.__scanPath__,folder,self.uuid)):
+                    log.log(5,'info','Offline Update: Starting update from %s.' % os.path.join(self.__scanPath__,folder,self.uuid),True)
+                    self.updatePath = os.path.join(self.__scanPath__,folder)
+                    self.displayManager.scheduler.collect()
+                    time.sleep(5)
+                    self.displayManager.downloader.collect()
+            log.log(5,'info','Offline Update: Sleeping 30 seconds.',True)
+            time.sleep(30)
+       
+    def getIP(self):
+        return 'Offline Mode'
+    
+    def getDisk(self):
+        s = os.statvfs(config.get('Main','libraryDir'))
+        return (s.f_bsize * s.f_blocks,s.f_bsize * s.f_bavail)
+
+    def getUUID(self):
+        return str(self.uuid)
+
+    def getName(self):
+        return str(self.name)
+
+    def getKey(self):
+        return 'Offline'
+
+    def check(self):
+        return True
+
+    def RequiredFiles(self):
+        """Connect to XMDS and get a list of required files"""
+        log.lights('RF','amber')
+        req = None
+        if self.check():
+            try:
+                # Update the IP Address shown on the infoScreen
+                log.updateIP(self.getIP())
+            except:
+                pass
+
+            log.updateFreeSpace(self.getDisk())
+            
+            try:
+                fh = open(os.path.join(self.updatePath,self.uuid,'rf.xml'), 'r')
+                req = fh.read()
+                fh.close()
+            except IOError:
+                log.lights('RF','red')
+                raise XMDSException("XMDS could not be initialised")
+
+        else:
+            log.log(0,"error","XMDS could not be initialised")
+            log.lights('RF','grey')
+            raise XMDSException("XMDS could not be initialised")
+
+        log.lights('RF','green')
+        return req
+    
+    def SubmitLog(self,logXml):
+        pass
+    
+    def SubmitStats(self,statXml):
+        pass
+
+    def Schedule(self):
+        """Connect to XMDS and get the current schedule"""
+        log.lights('S','amber')
+        req = None
+        if self.check():
+            try:
+                fh = open(os.path.join(self.updatePath,self.uuid,'schedule.xml'), 'r')
+                req = fh.read()
+                fh.close()
+            except IOError:
+                log.lights('S','red')
+                raise XMDSException("XMDS could not be initialised")
+        else:
+            log.log(0,"error","XMDS could not be initialised")
+            log.lights('S','grey')
+            raise XMDSException("XMDS could not be initialised")
+
+        log.lights('S','green')
+        return req
+
+    def GetFile(self,tmpPath,tmpType,tmpOffset,tmpChunk):
+        """Connect to XMDS and download a file"""
+        response = None
+        log.lights('GF','amber')
+        if self.check():
+            if tmpType == 'media':
+                try:
+                    fh = open(os.path.join(self.updatePath,self.uuid,tmpPath), 'r')
+                    fh.seek(tmpOffset)
+                    response = fh.read(tmpChunk)
+                    fh.close()
+                except:
+                    log.lights('GF','red')
+                    raise XMDSException("XMDS could not be initialised")
+            if tmpType == 'layout':
+                try:
+                    fh = open(os.path.join(self.updatePath,self.uuid,tmpPath), 'r')
+                    response = fh.read()
+                    fh.close()
+                except:
+                    log.lights('GF','red')
+                    raise XMDSException("XMDS could not be initialised")
+            if tmpType == 'blacklist':
+                response = ""
+        else:
+            log.log(0,"error","XMDS could not be initialised")
+            log.lights('GF','grey')
+            raise XMDSException("XMDS could not be initialised")
+
+        log.lights('GF','green')
+        return response
+
+    def RegisterDisplay(self):
+        log.lights('RD','amber')
+        time.sleep(5)
+        log.lights('RD','green')
+
+#### Finish Webservice
+>>>>>>> MERGE-SOURCE
 
 class XiboDisplayManager:
     def __init__(self):
 
=== added file 'client/python/client.conf'
--- client/python/client.conf	1970-01-01 00:00:00 +0000
+++ client/python/client.conf	2011-02-28 15:09:00 +0000
@@ -0,0 +1,25 @@
+[Main]
+;clientConfLoc=/home/matt/xibo
+;clientConfName=site.cfg
+
+;logWriter defines where the log file is written to
+;xiboLogScreen - Console
+;xiboLogFile - Log file stored in the same folder as the executable
+
+logWriter=xiboLogFile
+
+;logLevel defines the level of information written to the logger
+;INFO - information, warning and error messages
+;WARNING - warning and error messages
+;ERROR - error messages
+
+logLevel=INFO
+
+logFileName=error.log
+
+[Options]
+logType=XiboLogXmds,XiboLogFile,XiboLogScreen
+logTypeHuman=Xibo Server,Local File,Console
+scheduler=XmdsScheduler
+downloader=XiboDownloadManager
+colourDepth=8,16,24
 
=== renamed file 'client/python/client.conf' => 'client/python/client.conf.moved'
=== added file 'client/python/configure.py'
--- client/python/configure.py	1970-01-01 00:00:00 +0000
+++ client/python/configure.py	2011-02-28 15:09:00 +0000
@@ -0,0 +1,1753 @@
+#!/usr/bin/python
+
+# -*- coding: utf-8 -*-
+
+#
+# Xibo - Digitial Signage - http://www.xibo.org.uk
+# Copyright (C) 2011 Matt Holder
+#
+# This file is part of Xibo.
+#
+# Xibo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version. 
+#
+# Xibo 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+gettextAvailable = None
+
+try:
+	import gettext
+	gettextAvailable = True
+except:
+	print "Could not import gettext"
+	print "Creating dummy function for _()"
+	def _(string):
+		return string
+try:
+	import sys
+except:
+	print "Could not import sys module"
+	sys.exit()
+
+try:
+	import uuid
+except:
+	print "Could not import uuid module"
+	sys.exit()
+
+try:
+	import ConfigParser
+except:
+	print "Could not import ConfigParser module"
+	sys.exit()
+
+try:
+	import os
+except:
+	print "Could not import os module"
+	sys.exit()
+
+try:
+	import logging
+except:
+	print "Could not import logging module"
+	sys.exit()
+
+try:
+	import pygtk
+	pygtk.require("2.0")
+except:
+	print "Could not import pygtk"
+	sys.exit()
+
+try:
+	import gtk
+except:
+	print "Could not import gtk"
+	sys.exit(1)
+
+try:
+	import gtk.glade
+except:
+	print "Could not import gtk.glade"
+	sys.exit(1)
+	
+try:
+	import gobject
+except:
+	print "Could not import gobject"
+	sys.exit()
+
+#Only run this if gettext is available
+if gettextAvailable:
+	gettext.install('ivcm', './locale', unicode=False)
+
+
+class xiboConfWindow:
+	"""This is the PyWine application"""
+
+
+	def __init__(self,clientConfFile,lift = False):
+
+		#This is the location of the config. file for the client
+		#itself. This comes from when the instance of the class
+		#is created.
+		self.clientConfFile = clientConfFile
+
+		#Firstly, read in the values relating to log from the config. client config. file
+		config = None
+		try:
+			config = ConfigParser.ConfigParser()
+			config.read(self.clientConfFile)
+		except:
+			print "Could not open %s"%self.clientConfFile
+
+		#Xibo client configuration file name
+		logFileName="error.log"
+		try:
+			logFileName = config.get('Main','logFileName')
+		except:
+			pass
+
+		logWriter="xiboLogScreen"
+		try:
+			logWriter = config.get('Main','logWriter')
+		except:
+			pass
+
+
+		logLevel="INFO"
+		try:
+			logLevel = config.get('Main','logLevel')
+		except:
+			pass
+		a=logging
+
+		loggingLevel = None
+		if logLevel == "INFO":
+			loggingLevel = a.INFO
+		elif logLevel == "WARNING":
+			loggingLevel = a.WARNING
+		elif logLevel == "ERROR":
+			loggingLevel = a.ERROR
+		
+		if logWriter == "xiboLogScreen":
+			a.basicConfig(level=loggingLevel)
+		elif logWriter == "xiboLogFile":
+			
+			a.basicConfig(level=loggingLevel,filename=logFileName,filemode="w")
+
+#		#Set up the logger
+#		logging.basicConfig(level=logging.INFO,filename="error.log",filemode="w")
+#		#format='%(asctime)s %(levelname)s %(lineno)d %(message)s'
+
+		
+		self.logger = a.getLogger("PyClientConfig")
+		self.logger1 = a.getLogger("PyClientConfig.GUI")
+		self.logger2 = a.getLogger('PyClientConfig.readConfig')
+		self.logger3 = a.getLogger("PyClientConfig.saveConfigSignal")
+		self.logger4 = a.getLogger("PyClientConfig.genClientID")
+		self.logger5 = a.getLogger("PyClientConfig.getConfValues")
+		self.logger6 = a.getLogger("PyClientConfig.advancedOptionsCheck")
+		self.logger7 = a.getLogger("PyClientConfig.readConfigAppConf")
+		self.logger8 = a.getLogger("PyClientConfig.offlineOperationToggle")
+		self.logger9 = a.getLogger("PyClientConfig.clearFormSignal")
+		self.logger10 = a.getLogger("PyClientConfig.onDestroy")
+		self.logger11 = a.getLogger("PyClientConfig.saveSignal")
+		self.logger12 = a.getLogger("PyclientConfig.LoadDefaultValues")
+
+		self.logger1.info('Config. client config. file: %s'%self.clientConfFile)
+
+		self.logger1.info("logWriter: %s"%logWriter)
+		self.logger1.info("logLevel: %s"%logLevel)
+		self.logger.info("logFileName: %s"%logFileName)
+		
+		#Name of the default log file for the python client
+		self.pyClientLogName = "run.log"		
+
+
+		#Read out the values from the client configuration file
+		configValues = self.readConfigAppConf()
+
+		#Take the options for log type from the file, and set the
+		#class instance variable. The combo box is then populated from this.
+		self.logWriterTypes = configValues["logTypeOptions"]		
+
+		self.logger1.info("logWriter: %s"%self.logWriterTypes)
+
+		#Take the options for the human readable log type options
+		self.logWriterHumanTypes = configValues["logTypeHumanOptions"]
+
+		self.logger1.info("logWriteHumanOptions: %s"%self.logWriterHumanTypes)
+
+		#Take the location of the configuration file and set the class
+		#instance variable. This path is then used when the config.
+		#file is written		
+
+		self.pyClientConfName = configValues["xiboClientConf"]
+			
+			
+		self.logger1.info("Xibo client config. file: %s"%self.pyClientConfName)
+
+		self.pyClientConfDefaultsName = "defaults.cfg"
+
+		#Grab the directory location and check this directory exists.
+
+		self.pyclientConfPath = configValues["clientConfLoc"]
+		
+		self.logger1.info("Xibo client config. file path: %s"%self.pyclientConfPath)
+		
+		self.logger1.info("Config file combined path: %s"%os.path.join(self.pyclientConfPath,self.pyClientConfName))
+		
+		#Take the options for scheduler type and add them to a class
+		#instance variable
+
+		self.schedulerOptions = configValues["schedulerOptions"]
+		
+		#Add a blank entry to the combo box, so that a blank option
+		#can mean that the value is not written to the config. file
+		self.schedulerOptions.insert(0,"")
+
+		#Downloader options
+		self.downloaderOptions = configValues["downloaderOptions"]
+		self.downloaderOptions.insert(0,"")
+
+		#Colour Depth options
+		self.colourDepthOptions = configValues["colourDepthOptions"]
+		self.colourDepthOptions.insert(0,"")
+
+		#Lift enable options
+		self.liftEnableOptions = ["True","False"]
+
+		#Manual update options
+		self.manualUpdateOptions = ["True","False"]
+
+		#Set the Glade file
+		self.builder = gtk.Builder()
+		self.builder.add_from_file("gui.glade")
+		self.builder.connect_signals(self)
+
+		#Create instances of the text fields, window etc
+		self.window = self.builder.get_object("mainWindow")
+		self.clearButton = self.builder.get_object("clearFields")
+		self.saveButton = self.builder.get_object("saveConfig")
+		
+		self.serverURLText = self.builder.get_object("serverURLText")
+		self.clientIDText = self.builder.get_object("clientIDText")
+		self.serverKeyText = self.builder.get_object("serverKeyText")
+		self.refreshText = self.builder.get_object("refreshText")
+		self.serverConnBool = self.builder.get_object("serverConnection")
+		self.fullScreenBool = self.builder.get_object("fullScreen")
+		self.screenWidthText = self.builder.get_object("screenWidthText")
+		self.screenHeightText = self.builder.get_object("screenHeightText")
+		self.captureStatisticsBool = self.builder.get_object("captureStatistics")
+		self.queueSizeText = self.builder.get_object("queueSizeText")
+		self.logLevelSpin = self.builder.get_object("logLevelSpin")
+		self.logTypeCombo = self.builder.get_object("logTypeCombo")
+		self.clientNameText = self.builder.get_object("clientNameText")
+
+		self.offlineCheckButton = self.builder.get_object("offlineCheckButton")
+
+		#Advanced options widgets
+
+		self.liftDefaultTagText = self.builder.get_object('liftDefaultTagText')
+		self.lift7TagText = self.builder.get_object('lift7TagText')
+		self.lift6TagText = self.builder.get_object('lift6TagText')
+		self.lift5TagText = self.builder.get_object('lift5TagText')
+		self.lift4TagText = self.builder.get_object('lift4TagText')
+		self.lift3TagText = self.builder.get_object('lift3TagText')
+		self.lift2TagText = self.builder.get_object('lift2TagText')
+		self.lift1TagText = self.builder.get_object('lift1TagText')
+		self.lift0TagText = self.builder.get_object('lift0TagText')
+		self.firstSerialText = self.builder.get_object('firstSerialText')
+		self.secondSerialText = self.builder.get_object('secondSerialText')
+		self.liftTriggerValue = self.builder.get_object('liftTriggerValue')
+		self.liftEnableCombo = self.builder.get_object('liftEnableCombo')
+		self.dateFormatEntry = self.builder.get_object('dateFormatEntry')
+		self.libraryEntry = self.builder.get_object('libraryEntry')
+		self.socketTimeSpin = self.builder.get_object('socketTimeSpin')
+		self.checksumCheckButton = self.builder.get_object('checksumCheckButton')
+		self.lowTextureCheckButton = self.builder.get_object('lowTextureCheckButton')
+		self.framesSpin = self.builder.get_object('framesSpin')
+		self.vwidthSpin = self.builder.get_object('vwidthSpin')
+		self.vheightSpin = self.builder.get_object('vheightSpin')
+		self.vrotateSpin = self.builder.get_object('vrotateSpin')
+		self.schedulerCombo = self.builder.get_object("schedulerCombo")
+		self.downloaderCombo = self.builder.get_object("downloaderCombo")
+		self.colourDepthCombo = self.builder.get_object("colourDepthCombo")
+		self.notebook1 = self.builder.get_object("notebook1")
+
+		self.errorDialog = self.builder.get_object("errorDialog")
+		self.messageDialog = self.builder.get_object("infoDialog")
+
+		self.statsCaptureLabel = self.builder.get_object("statsCaptureLabel")
+		self.statsQueueSizeLabel = self.builder.get_object("statsQueueSizeLabel")
+
+		#Grab the log file link button and make it invisible by default
+		self.logFileLinkButton = self.builder.get_object("logFileLinkButton")
+		self.logFileLinkButton.hide()
+
+		self.statsFrame = self.builder.get_object("frame2")
+		
+		#We want to be able to hide the lift options if the command line flag
+		#has not been passed. We can do this by grabbing the 5th (4th when
+		#counting from zero) page, and using the hide method.
+
+		self.liftTabVisible = lift
+		print self.liftTabVisible
+
+		if lift == False:
+			liftPage = self.notebook1.get_nth_page(4)		
+			liftPage.hide()
+			self.logger1.info("Lift options hidden")
+			
+			#Hide the statistics options unless the lift
+			#tab is being shown
+			self.captureStatisticsBool.hide()
+			self.queueSizeText.hide()
+			self.statsCaptureLabel.hide()
+			self.statsQueueSizeLabel.hide()
+			self.statsFrame.hide()
+
+		else:
+			self.logger1.info("Lift options available")
+
+		#Set a class instance variable for whether the advanced tab is shown or not
+		self.advancedTabVisible = False
+
+		#Now hide the tab
+		advancedPage = self.notebook1.get_nth_page(3)		
+		advancedPage.hide()		
+
+		#Fill in the comboboxes
+
+		#log type combobox
+
+		liststore = gtk.ListStore(gobject.TYPE_STRING)
+		print "ABC: ",self.logWriterHumanTypes
+		for elem in self.logWriterHumanTypes:
+			liststore.append([elem])
+
+		self.logTypeCombo.set_model(liststore)
+		self.logTypeCombo.set_active(0)
+
+		cell = gtk.CellRendererText()
+		self.logTypeCombo.pack_start(cell, True)
+		self.logTypeCombo.add_attribute(cell, "text", 0)
+		
+		#scheduler combobox
+		
+		schedulerListStore = gtk.ListStore(gobject.TYPE_STRING)
+
+		for elem in self.schedulerOptions:
+			schedulerListStore.append([elem])
+
+		self.schedulerCombo.set_model(schedulerListStore)
+		self.schedulerCombo.set_active(0)
+
+		self.schedulerCombo.pack_start(cell, True)
+		self.schedulerCombo.add_attribute(cell, "text", 0)
+		
+
+		#downloader combobox
+		
+		downloaderListStore = gtk.ListStore(gobject.TYPE_STRING)
+
+		for elem in self.downloaderOptions:
+			downloaderListStore.append([elem])
+
+		self.downloaderCombo.set_model(downloaderListStore)
+		self.downloaderCombo.set_active(0)
+
+		self.downloaderCombo.pack_start(cell, True)
+		self.downloaderCombo.add_attribute(cell, "text", 0)
+
+		#colour depth combobox
+		
+		colourDepthListStore = gtk.ListStore(gobject.TYPE_STRING)
+
+		for elem in self.colourDepthOptions:
+			colourDepthListStore.append([elem])
+
+		self.colourDepthCombo.set_model(colourDepthListStore)
+		self.colourDepthCombo.set_active(0)
+
+		self.colourDepthCombo.pack_start(cell, True)
+		self.colourDepthCombo.add_attribute(cell, "text", 0)
+
+
+
+		#lift enable combobox
+		
+		liftEnableListStore = gtk.ListStore(gobject.TYPE_STRING)
+
+		liftEnableOptions = ["True","False"]
+
+		for elem in liftEnableOptions:
+			liftEnableListStore.append([elem])
+
+		self.liftEnableCombo.set_model(liftEnableListStore)
+		self.liftEnableCombo.set_active(0)
+
+		self.liftEnableCombo.pack_start(cell, True)
+		self.liftEnableCombo.add_attribute(cell, "text", 0)
+
+
+		#Set the range of values we accept for the spin controls
+
+		width_adj = gtk.Adjustment(1024, 1.0, 10000, 1.0, 5.0, 0.0)
+		height_adj = gtk.Adjustment(1024, 1.0, 10000, 1.0, 5.0, 0.0)
+		queue_adj = gtk.Adjustment(10, 1.0, 10000, 1.0, 5.0, 0.0)
+		refresh_adj = gtk.Adjustment(100, 1.0, 10000, 1.0, 5.0, 0.0)
+		logLevel_adj = gtk.Adjustment(0, 0, 10, 1.0, 2.0, 0.0)
+        	
+		socketTime_adj = gtk.Adjustment(0, 0, 100, 1.0, 2.0, 0.0)
+		frames_adj = gtk.Adjustment(0, 0, 100, 1.0, 2.0, 0.0)
+		vwidth_adj = gtk.Adjustment(0, 0, 10000, 1.0, 2.0, 0.0)
+		vheight_adj = gtk.Adjustment(0, 0, 10000, 1.0, 2.0, 0.0)
+		vrotate_adj = gtk.Adjustment(0, -359, 359, 1.0, 2.0, 0.0)
+		liftTrigger_adj = gtk.Adjustment(0, 0, 100, 1.0, 2.0, 0.0)
+
+		self.screenWidthText.configure(width_adj, 0, 0)
+		self.screenWidthText.set_wrap(True)
+
+		self.screenHeightText.configure(height_adj, 0, 0)
+		self.screenHeightText.set_wrap(True)
+		
+		self.queueSizeText.configure(queue_adj, 0, 0)
+		self.queueSizeText.set_wrap(True)
+
+		self.refreshText.configure(refresh_adj, 0, 0)
+		self.refreshText.set_wrap(True)
+
+		self.logLevelSpin.configure(logLevel_adj, 0, 0)
+		self.logLevelSpin.set_wrap(True)
+	
+		self.socketTimeSpin.configure(socketTime_adj,0,0)
+		self.socketTimeSpin.set_wrap(True)
+
+		self.framesSpin.configure(frames_adj,0,0)
+		self.framesSpin.set_wrap(True)
+
+		self.vwidthSpin.configure(vwidth_adj,0,0)
+		self.vwidthSpin.set_wrap(True)
+
+		self.vheightSpin.configure(vheight_adj,0,0)
+		self.vheightSpin.set_wrap(True)
+
+		self.vrotateSpin.configure(vrotate_adj,0,0)
+		self.vrotateSpin.set_wrap(True)
+
+		self.liftTriggerValue.configure(liftTrigger_adj,0,0)
+		self.liftTriggerValue.set_wrap(True)
+
+		#We want the labels to be translatable,
+		#Using the Glade stuff grab the labels
+		self.serverURLLabel = self.builder.get_object("serverURLLabel")
+		self.clientIDLabel = self.builder.get_object("clientIDLabel")
+		self.serverKeyLabel = self.builder.get_object("serverKeyLabel")
+		self.refreshLabel = self.builder.get_object("refreshLabel")
+		self.connectionLabel = self.builder.get_object("connectionLabel")
+		self.fullscreenLabel = self.builder.get_object("fullscreenLabel")
+		self.widthLabel = self.builder.get_object("widthLabel")
+		self.heightLabel = self.builder.get_object("heightLabel")
+		self.logLevelLabel = self.builder.get_object("logLevelLabel")
+		self.logTypeLabel = self.builder.get_object("logTypeLabel")
+		self.loggingFrameLabel = self.builder.get_object("loggingFrameLabel")
+		self.statsFrameLabel = self.builder.get_object("statsFrameLabel")
+		self.clientNameLabel = self.builder.get_object("clientNameLabel")
+
+		#Labels for advanced options and tabs
+		self.liftDefaultLabel = self.builder.get_object('liftDefaultLabel')
+		self.lift7Label = self.builder.get_object('lift7Label')
+		self.lift6Label = self.builder.get_object('lift6Label')
+		self.lift5Label = self.builder.get_object('lift5Label')
+		self.lift4Label = self.builder.get_object('lift4Label')
+		self.lift3Label = self.builder.get_object('lift3Label')
+		self.lift2Label = self.builder.get_object('lift2Label')
+		self.lift1Label = self.builder.get_object('lift1Label')
+		self.lift0Label = self.builder.get_object('lift0Label')
+		self.tagLiftLabel = self.builder.get_object('tagLiftLabel')
+		self.genLiftOptions = self.builder.get_object('genLiftOptions')
+		self.firstSerialLabel = self.builder.get_object('firstSerialLabel')
+		self.secondSerialLabel = self.builder.get_object('secondSerialLabel')
+		self.liftTriggerLabel = self.builder.get_object('liftTriggerLabel')
+		self.liftEnableLabel = self.builder.get_object('liftEnableLabel')
+		self.liftOptionsLabel = self.builder.get_object('liftOptionsLabel')
+		self.advancedOptionsLabel = self.builder.get_object('advancedOptionsLabel')
+		self.otherSettingsLabel = self.builder.get_object('otherSettingsLabel')
+		self.clientSettingsLabel = self.builder.get_object('clientSettingsLabel')
+		self.serverSettingsLabel = self.builder.get_object('serverSettingsLabel')
+		self.dateFormatLabel = self.builder.get_object('dateFormatLabel')
+		self.schedulerLabel = self.builder.get_object('schedulerLabel')
+		self.downloaderLabel = self.builder.get_object('downloaderLabel')
+		self.libraryLabel = self.builder.get_object('libraryLabel')
+		self.bppLabel = self.builder.get_object('bppLabel')
+		self.socketTimeLabel = self.builder.get_object('socketTimeLabel')
+		self.checksumLabel = self.builder.get_object('checksumLabel')
+		self.lowTextureLabel = self.builder.get_object('lowTextureLabel')
+		self.framesLabel = self.builder.get_object('framesLabel')
+		self.vwidthLabel = self.builder.get_object('vwidthLabel')
+		self.vheightLabel = self.builder.get_object('vheightLabel')
+		self.vrotationLabel = self.builder.get_object('vrotationLabel')
+		self.advancedOptionsCheck = self.builder.get_object("advancedOptionsCheck")
+
+#		self.manualUpdateLabel = self.builder.get_object("manualUpdateLabel")
+#		self.manualUpdateCombo = self.builder.get_object("manualUpdateCombo")
+		self.xmdsLicenseKeyLabel = self.builder.get_object("xmdsLicenseKeyLabel")
+		self.xmdsLicenseKeyEntry = self.builder.get_object("xmdsLicenseKeyEntry")
+
+		self.onlineOpLabel = self.builder.get_object("onlineOpLabel")
+		self.offlineOpLabel  = self.builder.get_object("offlineOpLabel")
+
+
+		#Now set the text in the labels. This is useful so that we can
+		#then use this as a basis for translations on launchpad
+
+#		self.manualUpdateLabel.set_text(_("Manual Update"))
+		self.xmdsLicenseKeyLabel.set_text(_("xmdsLicenseKey"))
+
+		self.serverURLLabel.set_text(_("Server URL"))
+		self.clientIDLabel.set_text(_("Client ID"))
+		self.serverKeyLabel.set_text(_("Server Key"))
+		self.refreshLabel.set_text(_("Set the number of seconds between the client contacting the server for updates"))
+		self.connectionLabel.set_text(_("Require connection to server"))
+		self.fullscreenLabel.set_text(_("Fullscreen"))
+		self.widthLabel.set_text(_("Width"))
+		self.heightLabel.set_text(_("Height"))
+		self.logLevelLabel.set_text(_("Log Level"))
+		self.logTypeLabel.set_text(_("Log Type"))
+		self.statsCaptureLabel.set_text(_("Statistics Capturing"))
+		self.statsQueueSizeLabel.set_text(_("Queue Size"))
+		self.loggingFrameLabel.set_text(_("Logging"))
+		self.statsFrameLabel.set_text(_("Statistics Generation"))
+
+		self.clientNameLabel.set_text(_("Client Name"))
+
+		self.liftDefaultLabel.set_label(_('Default'))
+		self.lift7Label.set_label(_('Lift 7'))
+		self.lift6Label.set_label(_('Lift 6'))
+		self.lift5Label.set_label(_('Lift 5'))
+		self.lift4Label.set_label(_('Lift 4'))
+		self.lift3Label.set_label(_('Lift 3'))
+		self.lift2Label.set_label(_('Lift 2'))
+		self.lift1Label.set_label(_('Lift 1'))
+		self.lift0Label.set_label(_('Lift 0'))
+		self.tagLiftLabel.set_label(_('Tagging Lift Options'))
+		self.genLiftOptions.set_label(_('General Lift Options'))
+		self.firstSerialLabel.set_label(_('1st Serial Port'))
+		self.secondSerialLabel.set_label(_('2nd Serial Port'))
+		self.liftTriggerLabel.set_label(_('Lift Trigger'))
+		self.liftEnableLabel.set_label(_('Lift Enable'))
+		self.liftOptionsLabel.set_label(_('Lift Options'))
+		self.advancedOptionsLabel.set_label(_('Advanced Options'))
+		self.otherSettingsLabel.set_label(_('Other Settings'))
+		self.clientSettingsLabel.set_label(_('Client Settings'))
+		self.serverSettingsLabel.set_label(_('Server Settings'))
+		self.dateFormatLabel.set_label(_('Date Format'))
+		self.schedulerLabel.set_label(_('Scheduler'))
+		self.downloaderLabel.set_label(_('Downloader'))
+		self.libraryLabel.set_label(_('Library Location'))
+		self.bppLabel.set_label(_('Colour Depth (BPP)'))
+		self.socketTimeLabel.set_label(_('Socket Timeout (s)'))
+		self.checksumLabel.set_label(_('Checksum Downloaded Media'))
+		self.lowTextureLabel.set_label(_('Low Texture Memory'))
+		self.framesLabel.set_label(_('Frames per Second'))
+		self.vwidthLabel.set_label(_('Virtual Width'))
+		self.vheightLabel.set_label(_('Virtual Height'))
+		self.vrotationLabel.set_label(_('Rotation'))
+
+		self.onlineOpLabel.set_label(_("Online operation (syncronise with Xibo server)"))
+#		self.offlineOpLabel.set_label(_("Offline operation (synchronise with USB memory stick)"))
+
+		#Set the icon for the Window
+		self.window.set_icon_from_file("xibo.ico")
+
+
+		#Now set the labels of the buttons and window
+		
+		self.clearButton.set_label(_("Clear Form"))
+		self.saveButton.set_label(_("Save Config"))
+		self.window.set_title(_("Xibo Client Configuration"))
+
+
+		#Set up the combo box
+
+#		manualUpdateListStore = gtk.ListStore(gobject.TYPE_STRING)
+
+#		for elem in self.manualUpdateOptions:
+#			manualUpdateListStore.append([elem])
+
+#		self.manualUpdateCombo.set_model(manualUpdateListStore)
+#		self.manualUpdateCombo.set_active(1)
+
+#		self.manualUpdateCombo.pack_start(cell, True)
+#		self.manualUpdateCombo.add_attribute(cell, "text", 0)
+
+		logFilePath = os.path.join(os.path.abspath(''),self.pyClientLogName)
+
+		self.logFileLinkButton.set_uri("file:%s%s%s"%(os.sep,os.sep,logFilePath))
+
+#		print "File path: ", logFilePath
+
+		#Set the tick box to online operation
+		self.offlineCheckButton.set_active(True)
+		self.offlineCheckButton.set_active(False)
+
+		#Set tooltips
+		self.set_tooltips()
+
+		self.window.show()
+
+		#Check that the directory exists where the configuration file
+		#is stored.
+
+		if os.path.exists(self.pyclientConfPath):
+			if os.path.isfile(self.pyclientConfPath):
+
+				self.logger1.error("Python client path chosen is a file")
+
+				print "Location is a file."
+				self.errorDialog.set_markup(_("File path is a file. Cannot write to it"))
+				self.errorDialog.show()
+				print "Exiting gracefully"
+#				sys.exit()
+			elif os.path.isdir(self.pyclientConfPath):
+				self.logger1.info("Python client path chosen is available")
+				print "Location exists."
+				print "Carrying on..."		
+
+				self.pyClientConfName = os.path.join(self.pyclientConfPath,self.pyClientConfName)				
+		else:
+			print "Configuration directory does not exist"
+			self.logger1.warning("Python client path chosen does not exist")
+			try:
+				os.makedirs(self.pyclientConfPath)
+				print "Directory created"
+				self.logger1.info("Python client path chosen has been created")
+				self.pyClientConfName = os.path.join(self.pyclientConfPath,self.pyClientConfName)
+			except OSError:
+				self.logger1.error("Python client path chosen could not be created")
+				self.errorDialog.set_markup(_("File path could not be created"))
+				self.errorDialog.show()
+
+
+		#Check that a file can be written to this directory
+		try:
+			file_written = open(os.path.join(self.pyclientConfPath,"tmp"),"w")
+			file_written.close()
+		except:
+			self.logger1.error("Could not write to testing file")			
+		
+		is_file = os.path.isfile(os.path.join(self.pyclientConfPath,"tmp"))
+		
+		self.logger1.info("Testing file has been created in the chosen location")
+		
+		#Check that the file can be written to
+
+		try:
+			file_edit = open(os.path.join(self.pyclientConfPath,"tmp"),"w")
+			file_edit.write("tmp")
+			file_edit.close()
+			print "boo"
+		except:
+			self.logger1.info("Testing file could not be written to")
+			
+		is_data = False
+		data = None
+
+		try:
+			data = open(os.path.join(self.pyclientConfPath,"tmp"),"r").read()
+		except:
+			self.logger1.error("Cannot open testing file to read data")
+		if data == "tmp":
+			is_data = True
+			self.logger1.info("Testing file could be written to")
+		else:
+			self.logger1.info("Testing file could not be written to")
+
+		#Check that the file can be deleted
+		is_deleted = False
+		try:
+			os.remove(os.path.join(self.pyclientConfPath,"tmp"))
+		except:
+			self.logger1.error("Cannot delete testing file")
+
+		if os.path.isfile(os.path.join(self.pyclientConfPath,"tmp")) == False:
+			is_deleted = True
+			self.logger1.info("Testing file has been deleted successfully")
+
+		if is_deleted and is_data and is_file:
+			print "Location is acceptable for file writing"
+			self.logger1.info("Location is acceptable for file writing")
+			self.messageDialog.set_markup(_("File location is acceptable"))
+			self.messageDialog.show()
+
+		else:
+			print "Cannot write to file"
+			self.logger1.error("Location selected is not acceptable for file writing")
+			print "Exiting gracefully"
+			self.errorDialog.show()
+			self.errorDialog.set_markup(_("Cannot write to file"))
+#			sys.exit()
+
+
+
+		print self.pyClientConfName
+
+
+		if is_deleted and is_data and is_file:
+
+			#Read the configuration information from the configuration file
+			self.readConfig()
+
+		#Check to see if the client ID field is blank. 
+		#If so, then generate one
+
+		if self.clientIDText.get_text() == "":
+			uuid = self.genClientID()
+			self.clientIDText.set_text(str(uuid))		
+
+	def messageDialogExit(self,widget):
+		sys.exit()
+
+	def infoDialogOKSignal(self,widget):
+		self.messageDialog.hide()
+
+	def offlineOperationToggle(self,widget):
+		
+		offlineOperation = widget.get_active()
+
+		self.logger8.info(_("Offline operation checkbox toggled"))
+
+		if offlineOperation:
+			print "Offline operation selected"
+#			self.manualUpdateCombo.set_sensitive(True)
+		#	self.xmdsLicenseKeyEntry.set_sensitive(True)
+
+			self.logger8.info(_("Offline operation selected"))
+
+			self.serverURLText.set_sensitive(False)
+			self.clientIDText.set_sensitive(False)
+			self.serverKeyText.set_sensitive(False)
+			self.clientNameText.set_sensitive(False)
+			
+		else:
+			print "Online operation selected"
+			self.logger8.info(_("Online operation selected"))
+#			self.manualUpdateCombo.set_sensitive(False)
+		#	self.xmdsLicenseKeyEntry.set_sensitive(False)
+			
+			self.serverURLText.set_sensitive(True)
+			self.clientIDText.set_sensitive(True)
+			self.serverKeyText.set_sensitive(True)
+			self.clientNameText.set_sensitive(True)			
+			
+	def on_advancedOptionsCheck(self,widget):
+		"""Function called when advanced options checkbox is toggled.
+		Used to hide / display the advanced notebook tab"""
+
+		advancedPage = self.notebook1.get_nth_page(3)		
+
+		if self.advancedOptionsCheck.get_active() and self.advancedTabVisible == False:
+			advancedPage.show()
+			self.advancedTabVisible = True
+			self.logger6.info(_("advancedTabEnabled"))
+		
+		elif self.advancedOptionsCheck.get_active() == False and self.advancedTabVisible:
+			advancedPage.hide()
+			self.advancedTabVisible = False
+			self.logger6.info(_("advancedTabDisabled"))
+
+	def readConfigAppConf(self):
+		"""This reads the configuration file that is used by the configuration application"""
+		self.logger7.info(_("Configuration application configuration file being read in"))
+		config_file = ""
+		try:
+			config_file = open(self.clientConfFile,"r")
+
+			#Implement all the stuff to read the config file in
+			data = config_file.read()
+			config_file.close()
+			self.logger7.info(_("Reading configuration file to make sure file is not empty"))
+			#If the file is not empty, then try and process it
+
+			if len(data) != 0:
+				config = ConfigParser.ConfigParser()
+				config.read(self.clientConfFile)
+
+				self.logger7.info(_("Reading configuration file"))
+
+				#Get the information from the configuration file
+				#and display into the GUI
+				
+				#Xibo client configuration file location
+				xiboClientConf = None
+
+				try:
+					xiboClientConf = config.get('Main','clientConfName')
+				except:
+					xiboClientConf = "site.cfg"
+					
+				self.logger7.info(_("Client configuration: %s"%xiboClientConf))				
+
+				#Options pertaining to log type
+				logTypeOptions = config.get("Options","logType").split(",")
+				for i in range(len(logTypeOptions)):
+					logTypeOptions[i] = _(logTypeOptions[i])
+
+				print logTypeOptions
+
+				#Options pertaining to log type (human readable form)
+				logTypeHumanOptions = config.get("Options","logTypeHuman").split(",")
+
+				for i in range(len(logTypeHumanOptions)):
+					logTypeHumanOptions[i] = _(logTypeHumanOptions[i])
+
+				self.logger7.info(_("logTypeOptions: %s"%logTypeOptions))
+
+				self.logger7.info(_("logTypeHumanOptions: %s"%logTypeHumanOptions))
+
+				#Options pertaining to scheduler
+				schedulerOptions = config.get("Options","scheduler").split(",")
+				for i in range(len(schedulerOptions)):
+					schedulerOptions[i] = _(schedulerOptions[i])
+
+				print schedulerOptions
+
+				self.logger7.info(_("schedulerOptions: %s"%schedulerOptions))
+				
+
+				#Options pertaining to downloader
+				downloaderOptions = config.get("Options","downloader").split(",")
+				for i in range(len(downloaderOptions)):
+					downloaderOptions[i] = _(downloaderOptions[i])
+
+				print downloaderOptions
+
+				self.logger7.info(_("downloaderOptions: %s"%downloaderOptions))
+
+				#Options pertaining to colour depth (BPP)
+				colourDepthOptions = config.get("Options","colourDepth").split(",")
+				for i in range(len(colourDepthOptions)):
+					colourDepthOptions[i] = _(colourDepthOptions[i])
+
+				print colourDepthOptions
+
+				self.logger7.info(_("colourDepthOptions: %s"%colourDepthOptions))
+
+				clientConfLoc = None
+				
+				try:
+					clientConfLoc = config.get("Main","clientConfLoc")
+				except:
+					clientConfLoc = os.path.expanduser('~/.xibo')
+					
+				clientConfName = None
+				try:
+					clientConfName = config.get("Main","clientConfName")
+				except:
+					clientConfName = "site.cfg"
+					
+					
+				self.logger7.info(_("clientConfLocation: %s"%clientConfLoc))
+				self.logger7.info(_("clientConfName: %s"%clientConfName))
+
+
+				return {"xiboClientConf":xiboClientConf,"logTypeOptions":logTypeOptions,"logTypeHumanOptions":logTypeHumanOptions,"clientConfLoc":clientConfLoc,"clientConfName":clientConfName,"schedulerOptions":schedulerOptions,"downloaderOptions":downloaderOptions,"colourDepthOptions":colourDepthOptions}
+
+			else:
+				self.logger7.error("Configuration file is empty. Cannot continue")
+				self.errorDialog.set_markup(_("The configuration application configuration file is empty. Cannot continue"))
+				self.errorDialog.show()
+
+		except:
+			print "Could not open the configuration application configuration file"
+
+			self.logger7.error(_("Could not open configuration file. Cannot continue"))
+
+			self.errorDialog.set_markup(_("File path is a file. Cannot write to itCould not open the configuration application configuration file"))
+			self.errorDialog.show()
+			return -1
+
+	def clearFormSignal(self,widget,data=None):
+		
+		self.serverURLText.set_text("")
+		self.clientIDText.set_text("")
+		self.serverKeyText.set_text("")
+		self.refreshText.set_text("")
+		self.serverConnBool.set_active(False)
+		self.fullScreenBool.set_active(False)
+		self.screenWidthText.set_text("")
+		self.screenHeightText.set_text("")
+		self.captureStatisticsBool.set_active(False)
+		self.queueSizeText.set_text("")
+
+		self.screenWidthText.set_value(0)
+		self.screenHeightText.set_value(0)
+		self.queueSizeText.set_value(0)
+
+
+		self.clearButton.set_tooltip_text(_("Clear input fields"))
+		self.saveButton.set_tooltip_text(_("Save data to file")) 
+
+		self.logLevelSpin.set_value(0)
+		
+		self.logTypeCombo.set_active(0) 
+		self.liftEnableCombo.set_active(0)
+		self.schedulerCombo.set_active(0)
+		self.downloaderCombo.set_active(0)
+		self.colourDepthCombo.set_active(0)
+		self.manualUpdateCombo.set_active(0)
+
+		
+		self.checksumCheckButton.set_active(False) 
+		self.lowTextureCheckButton.set_active(False)
+	
+		self.clientNameText.set_text("") 
+
+		#Advanced options widgets
+
+		self.liftDefaultTagText.set_text("") 
+		self.lift7TagText.set_text("")
+		self.lift6TagText.set_text("")
+		self.lift5TagText.set_text("")
+		self.lift4TagText.set_text("")
+		self.lift3TagText.set_text("")
+		self.lift2TagText.set_text("")
+		self.lift1TagText.set_text("")
+		self.lift0TagText.set_text("")
+		self.firstSerialText.set_text("")
+		self.secondSerialText.set_text("")
+		self.liftTriggerValue.set_value(0) 
+
+		self.dateFormatEntry.set_text("") 
+		self.libraryEntry.set_text("")
+		self.socketTimeSpin.set_value(0)
+
+		self.framesSpin.set_value(0) 
+		self.vwidthSpin.set_value(0)
+		self.vheightSpin.set_value(0)
+		self.vrotateSpin.set_value(0)
+
+		self.xmdsLicenseKeyEntry.set_text("")
+		
+		self.logger9.info("Clearing form elements")
+
+	def logTypeComboChanged(self,widget,data=None):
+
+		model = widget.get_model()
+		index = widget.get_active()
+		logTypeText = model[index][0].lower()
+
+		if logTypeText == "local file":
+			#Check to see if the file pointed to by the link exists
+			error_file = self.logFileLinkButton.get_uri().split(":%s%s"%(os.sep,os.sep))[1]
+			if os.path.isfile(error_file):
+				self.logFileLinkButton.show()
+		else:
+			self.logFileLinkButton.hide()
+
+		val = widget.get_active()
+
+
+	def onDestroy(self,widget,data=None):
+		"""
+		Close the program. Executes when the main
+		window is destroyed
+		"""
+		self.logger10.info("Exiting program")
+		gtk.main_quit()
+
+
+	def confValErr(self,err,logger):
+		#print "Error finding config. value in file: %s"%err
+		#self.logger2.warning("%s item not in config. file"%err)
+		logger.warning("%s item not in config. file"%err)
+		
+	def readConfig(self):
+		"""Function used to read in the configuration file and
+		fill in the GUI text elements"""
+
+		#Firstly check if the configuration file exists. If it does then
+		#open it and extract the values. These can then be filled into the
+		#fields on the GUI
+
+		#Try opening the configuration file, if it does not exists, then
+		#create it
+
+		config_file = ""
+		try:
+			config_file = open(self.pyClientConfName,"r")
+
+			self.logger2.info("Config. file opened successfully")
+
+			#Implement all the stuff to read the config file in
+			data = config_file.read()
+			config_file.close()
+			#If the file is not empty, then try and process it
+
+			if len(data) != 0:
+				self.logger2.info("Config. data read in successfully")
+
+
+				self.readDataFromConfigFile(self.pyClientConfName,self.logger2)
+
+				
+		except IOError:
+			print "Cannot open"
+			self.logger2.warning("Cannot open configuration file")
+			#Read in the values from the site.cfg.default
+
+			self.readDataFromConfigFile(self.pyClientConfDefaultsName,self.logger12,defaults=True)
+			self.messageDialog.set_markup(_("Could not open configuration file. A new one will be created"))
+			self.messageDialog.show()
+
+			
+			
+
+	def readDataFromConfigFile(self,confFileName,logger,defaults=False):
+
+
+		config = ConfigParser.ConfigParser()
+		config.read(confFileName)
+
+		#Get the information from the configuration file
+		#and display into the GUI
+
+		try:
+			self.serverURLText.set_text(config.get('Main','xmdsUrl'))
+			logger.info("serverURL: %s"%config.get('Main','xmdsUrl'))
+		except:
+			self.confValErr('xmdsUrl',logger)
+
+		if defaults == False:
+			try:
+				self.clientIDText.set_text(config.get("Main","xmdsClientID"))
+				logger.info("clientID: %s"%config.get('Main','xmdsClientID'))
+			except:
+				self.confValErr("xmdsClientID",logger)
+				logger.warning("xmdClientID item not in config. file")
+
+		try:
+			self.serverKeyText.set_text(config.get('Main','xmdsKey'))
+			logger.info("xmdsKey: %s"%config.get('Main','xmdsKey'))
+		except:
+			self.confValErr('xmdsKey',logger)
+
+		try: 
+			self.refreshText.set_text(config.get('Main','xmdsUpdateInterval'))
+			logger.info("xmdsUpdateInterval: %s"%config.get('Main','xmdsUpdateInterval'))
+		except:
+			self.confValErr('xmdsUpdateInterval',logger)
+
+		try:
+			self.clientNameText.set_text(config.get('Main','xmdsClientName'))
+			logger.info("xmdsClientName: %s"%config.get('Main','xmdsClientName'))
+		except:
+			self.confValErr('xmdsClientName',logger)			
+
+
+		try:
+			requireXmds = False
+			if config.get('Main','requireXmds') == "true":
+				requireXmds = True
+
+			self.serverConnBool.set_active(requireXmds)
+			logger.info("requireXMDS: %s"%requireXmds)
+
+		except:
+			self.confValErr("requireXmds",logger)
+
+		try:
+			fullScreen = False
+			if config.get('Main','fullscreen') == "true":
+				fullScreen = True
+			self.fullScreenBool.set_active(fullScreen)
+			logger.info("fullscreen: %s"%fullscreen)
+		
+
+		except:
+			self.confValErr("fullscreen",logger)					
+
+		try:
+			captureStats = False
+			if config.get('Stats','collect') == "true":
+				captureStats = True
+			logger.info("captureStats: %s"%captureStats)
+
+			self.captureStatisticsBool.set_active(captureStats)
+		except:
+			self.confValErr("Stats - Collect",logger)
+
+
+		try:
+			self.screenWidthText.set_value(int(config.get('Main','width')))
+			logger.info("screenWidth: %s"%config.get('Main','width'))
+
+		except:
+			self.confValErr("width",logger)
+
+		try:
+			self.screenHeightText.set_value(int(config.get('Main','height')))
+			logger.info("screenHeight: %s"%config.get('Main','height'))
+
+		except:
+			self.confValErr("height",logger)
+
+		try:
+			self.queueSizeText.set_value(int(config.get('Stats','queueSize')))
+			logger.info("queueSize: %s"%config.get('Stats','queueSize'))
+
+		except:
+			self.confValErr("queueSize",logger)
+
+		try:
+			self.logLevelSpin.set_value(int(config.get('Logging','logLevel')))
+			logger.info("Logging level: %s"%config.get('Logging','logLevel'))
+		
+		except:
+			self.confValErr("logLevel",logger)
+
+		try:				
+			logType = config.get('Logging','logWriter')
+
+			val = 0
+
+			for elem in self.logWriterTypes:
+				if elem.lower() == logType.lower():
+					print elem.lower(), logType.lower()
+					break
+				val += 1
+			print "*"*len(str(self.logWriterTypes))
+			print logType
+			print self.logWriterTypes
+			print " "*(len(str(self.logWriterTypes))/2),val
+			print self.logWriterHumanTypes
+			print "*"*len(str(self.logWriterTypes))
+
+			logger.info("logWriter: %s"%self.logWriterTypes[val])
+			logger.info("logWriterHuman: %s"%self.logWriterHumanTypes[val])
+			self.logTypeCombo.set_active(val)				
+		except:
+			self.confValErr("logWriter",logger)
+	
+
+		#Advanced options
+
+		try:
+			self.dateFormatEntry.set_text(config.get("TickerMedia","dateFormat"))
+			logger.info("tickerMedia: %s"%config.get('TickerMedia','dateFormat'))
+
+		except:
+			self.confValErr("dateFormat",logger)
+
+		try:
+			self.libraryEntry.set_text(config.get("Main","libraryDir"))
+			logger.info("libraryDir: %s"%config.get('Main','libraryDir'))
+
+		except:
+			self.confValErr("libraryDir",logger)
+
+		try:
+			self.socketTimeSpin.set_value(int(config.get("Main","socketTimeout")))
+			logger.info("socketTimeout: %s"%config.get('Main','socketTimeout'))
+
+		except:
+			self.confValErr("socketTimeout",logger)
+
+		try:
+			self.framesSpin.set_value(int(config.get("Main","fps")))
+			logger.info("FPS: %s"%config.get('Main','fps'))
+		
+		except:
+			self.confValErr("fps",logger)					
+
+		try:
+			self.vwidthSpin.set_value(int(config.get("Main","vwidth")))
+			logger.info("VirtualWidth: %s"%config.get('Main','vwidth'))
+
+		except:
+			self.confValErr("vwidth",logger)
+
+		try:
+			self.vheightSpin.set_value(int(config.get("Main","vheight")))
+			logger.info("VirtualHeight: %s"%config.get('Main','vheight'))
+
+		except:
+			self.confValErr("vheight",logger)
+
+		try:
+			self.vrotateSpin.set_value(int(config.get("Main","vrotation")))
+			logger.info("VirtualRotation: %s"%config.get('Main','vrotation'))
+
+		except:
+			self.confValErr("vrotation",logger)
+
+
+		try:
+			self.xmdsLicenseKeyEntry.set_text(config.get("Main","xmdsLicenseKey"))
+			logger.info("xmdsLicenseKey: %s"%config.get('Main','xmdsLicenseKey'))
+
+		except:
+			self.confValErr('xmdsLicenseKey',logger)
+
+
+		#Sort out the combo boxes
+
+		try:
+			schedType = config.get("Main","Scheduler")
+
+			val = 0
+			for elem in self.schedulerOptions:
+				if elem.lower() == schedType.lower():
+					break
+				val += 1
+			logger.info("scheduler: %s"%self.schedulerOptions[val])
+
+			self.schedulerCombo.set_active(val)
+		except:
+			self.confValErr("scheduler",logger)
+	
+		try:
+			dloadType = config.get("Main","Downloader")
+
+			val = 0
+			for elem in self.downloaderOptions:
+				if elem.lower() == dloadType.lower():
+					break
+				val += 1
+			logger.info("downloader: %s"%self.downloaderOptions[val])
+
+			self.downloaderCombo.set_active(val)
+		except:
+			self.confValErr("downloader",logger)
+	
+		try:
+			bppType = config.get("Main","bpp")
+
+			val = 0
+
+			for elem in self.colourDepthOptions:
+				if elem.lower() == bppType.lower():
+					break
+				val += 1
+			logger.info("BPP: %s"%self.colourDepthOptions[val])
+
+			self.colourDepthCombo.set_active(val)
+		except:
+			self.confValErr("bpp",logger)
+
+		#USB update section
+		try:
+			manualUpdateType = config.get("Main","manualUpdate")
+			logger.info("offlineUpdate: %s"%manualUpdateType)
+
+			if manualUpdateType == "true":
+				manualUpdateType = True
+			elif manualUpdateType == "false":
+				manualUpdateType = False
+
+			if manualUpdateType == True or manualUpdateType == False:
+				if manualUpdateType == True:
+					print "Stuff done"
+					self.offlineCheckButton.set_active(True)
+					self.offlineOperationToggle(self,self.offlineCheckButton)
+
+		except:
+			self.confValErr('offlineUpdate',logger)
+			print "Manual Update Failed"
+		
+		#Now the check boxes
+
+		checksum = False
+		try:
+			if config.get('Main','checksumPreviousDownloads') == "true":
+				checksum = True
+			
+			logger.info("checksumPreviousDownloads: %s"%checksum)
+
+		except:
+			self.confValErr("checksumPreviousDownloads",logger)
+
+
+		lowTexture = False
+
+		try:
+			if config.get('Main','lowTextureMemory') == "true":
+				lowTexture = True
+			logger.info("lowTextureMemory: %s"%lowTexture)
+
+		except:
+			self.confValErr("lowTextureMemory",logger)	
+
+
+		self.checksumCheckButton.set_active(checksum)
+
+		self.lowTextureCheckButton.set_active(lowTexture)
+
+
+		#Now the lift options
+		try:
+			self.liftDefaultTagText.set_text(config.get("LiftTags","default"))
+			logger.info("DefaultLiftTag: %s"%config.get('LiftTags','default'))
+
+		except:
+			self.confValErr("liftTags",logger)
+
+		try:
+			self.lift7TagText.set_text(config.get("LiftTags","lift7"))
+			logger.info("Lift7Tag: %s"%config.get('LiftTags','lift7'))
+
+		except:
+			self.confValErr("lift7",logger)
+
+		try:
+			self.lift6TagText.set_text(config.get("LiftTags","lift6"))
+			logger.info("Lift6Tag: %s"%config.get('LiftTags','lift6'))
+		except:
+			self.confValErr("lift6",logger)
+
+		try:
+			self.lift5TagText.set_text(config.get("LiftTags","lift5"))
+			logger.info("Lift5Tag: %s"%config.get('LiftTags','lift5'))
+		except:
+			self.confValErr("lift5",logger)
+
+		try:
+			self.lift4TagText.set_text(config.get("LiftTags","lift4"))
+			logger.info("Lift4Tag: %s"%config.get('LiftTags','lift4'))
+		except:
+			self.confValErr("lift4",logger)
+
+		try:
+			self.lift3TagText.set_text(config.get("LiftTags","lift3"))
+			logger.info("Lift3Tag: %s"%config.get('LiftTags','lift3'))
+		except:
+			self.confValErr("lift3",logger)
+
+		try:
+			self.lift2TagText.set_text(config.get("LiftTags","lift2"))
+			logger.info("Lift2Tag: %s"%config.get('LiftTags','lift2'))
+		except:
+			self.confValErr("lift2",logger)
+
+		try:
+			self.lift1TagText.set_text(config.get("LiftTags","lift1"))
+			logger.info("Lift1Tag: %s"%config.get('LiftTags','lift1'))
+		except:
+			self.confValErr("lift1",logger)
+
+		try:
+			self.lift0TagText.set_text(config.get("LiftTags","lift0"))
+			logger.info("Lift0Tag: %s"%config.get('LiftTags','lift0'))
+		except:
+			self.confValErr("lift0",logger)
+
+		try:
+			self.firstSerialText.set_text(config.get("Lift","serial0"))
+			logger.info("FirstSerial: %s"%config.get('Lift','serial0'))
+		except:
+			self.confValErr("serial0",logger)
+
+		try:
+			self.secondSerialText.set_text(config.get("Lift","serial1"))
+			logger.info("SecondSerial: %s"%config.get('Lift','serial1'))
+		except:
+			self.confValErr("serial1",logger)
+
+		try:
+			self.liftTriggerValue.set_value(int(config.get("Lift","trigger")))
+			logger.info("LiftTrigger: %s"%config.get('Lift','trigger'))
+		except:
+			self.confValErr("trigger",logger)				
+
+		try:
+
+			liftEnableType = config.get("Lift","enabled")
+			logger.info("LiftEnabled: %s"%config.get('Lift','enabled'))
+
+			val = 0
+
+			for elem in self.liftEnableOptions:
+				if elem.lower() == liftEnableType.lower():
+					break
+				val += 1
+
+			self.liftEnableCombo.set_active(val)
+		except:
+			self.confValErr("liftEnabled",logger)
+
+	def saveConfigSignal(self,widget,data=None):
+		a = self.getConfValues()
+		self.logger11.info("Config Values to process: %s"%a)
+		config = ConfigParser.RawConfigParser()
+
+		config.optionxform = str
+
+		configOptions = ["Main", "Logging", "Stats", "TickerMedia", "Lift", "LiftTags"]
+
+		for configOption in configOptions:
+			#print configOption
+			config.add_section(configOption)
+
+			for elem in a:
+				#print elem, a[elem][1], configOption
+				if a[elem][0] == configOption:
+					print elem, a[elem][1],configOption
+					try:
+
+						config.set(configOption, elem, str(a[elem][1]))
+						self.logger11.info("Value: %s %s %s"%(configOption,elem,str(a[elem][1])))		
+					except:
+						print "Error setting option:"
+						print "Element:", elem
+						print "Data:", a[elem]
+						print "Error setting: %s, %s"%(elem,a[elem][1])
+						print a[elem][1]
+						print str(a[elem][1])
+						self.logger11.error("Error setting value: %s %s %s"%(configOption,elem,str(a[elem][1])))
+					finally:
+						#Write everything, barring the error item
+
+					#	with open(self.pyClientConfName, 'wb') as configfile:
+					#		config.write(configfile)
+
+						try:
+							configfile = open(self.pyClientConfName,"wb")
+							config.write(configfile)
+							self.logger11.info("Data successfully written")
+							self.messageDialog.set_markup(_("Successfully written configuration file"))
+							self.messageDialog.show()
+
+						except:
+							self.logger11.error("Data could not be written")
+							self.errorDialog.set_markup(_("Could not open / write to configuration file. Cannot continue"))
+							self.errorDialog.show()
+
+#		#Read in the existing configuration file as a string
+#		#we can then replace every instance of %s with one of the
+#		#configuration items
+
+#		#I have chosen this way because then we can keep the comments
+#		#in place for manual usage
+	
+#		config_template_string = ""
+#		try:
+#			f = open("site.cfg.default","r")
+#			config_template_string = f.read()
+#			f.close()
+#		except:
+#			print "Error reading default config file"
+
+		#Now create the string to write to the new config. file
+
+#		config_string = config_template_string%(a["serverURL"],a["clientID"],a["serverKey"],a["refresh"],a["serverConn"],a["screenWidth"],a["screenHeight"],a["fullScreen"],a["logType"],a["logVal"],a["captureStats"],a["queueSize"])
+
+#		#Now write the configuration file
+
+#		try:
+#			f = open(self.pyClientConfLoc,"w")
+#		#	f.write(config_string)
+#			f.close()
+#		except:
+#			print "Could not write configuration file"
+
+	def genClientID(self):
+		"""Function used to generate a random client ID. Returns a generated UUID"""
+		uuidStr = uuid.uuid4()
+		self.logger4.info("UUID Generated: %s"%uuidStr)
+		return uuidStr
+
+
+	def set_tooltips(self):
+
+		self.clearButton.set_tooltip_text(_("Clear input fields"))
+		self.saveButton.set_tooltip_text(_("Save data to file")) 
+
+		self.serverURLText.set_tooltip_text(_("URL of your Xibo server")) 
+		self.clientIDText.set_tooltip_text(_("Client identifier (used to generate license key hash)")) 
+		self.serverKeyText.set_tooltip_text(_("Server key")) 
+		self.refreshText.set_tooltip_text(_("Collection interval")) 
+		self.serverConnBool.set_tooltip_text(_("Does the client have to connect to XMDS before playing cached content?")) 
+		self.fullScreenBool.set_tooltip_text(_("Should the client run fullscreen"))
+		self.screenWidthText.set_tooltip_text(_("Width of the rendered output screen")) 
+		self.screenHeightText.set_tooltip_text(_("Height of the rendered output screen")) 
+		self.captureStatisticsBool.set_tooltip_text(_("States whether statistics are generated or not")) 
+		self.queueSizeText.set_tooltip_text(_("Statistics queue size")) 
+		self.logLevelSpin.set_tooltip_text(_("Amount of log data to write. The higher the number, the more is written")) 
+		self.logTypeCombo.set_tooltip_text(_("Where log data should be written to")) 
+		self.clientNameText.set_tooltip_text(_("Name as it will be displayed in the server app")) 
+
+		#Advanced options widgets
+
+		self.liftDefaultTagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift7TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift6TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift5TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift4TagText.set_tooltip_text(_("Tag associated with lift input"))
+		self.lift3TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift2TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift1TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.lift0TagText.set_tooltip_text(_("Tag associated with lift input")) 
+		self.firstSerialText.set_tooltip_text(_("First serial port to use for lift purposes")) 
+		self.secondSerialText.set_tooltip_text(_("First serial port to use for lift purposes")) 
+		self.liftTriggerValue.set_tooltip_text(_("Number of times lift is triggered before layout is changed")) 
+		self.liftEnableCombo.set_tooltip_text(_("Sets whether lift functionality is enabled or not")) 
+		self.dateFormatEntry.set_tooltip_text(_("Date format the client should render dates in when displaying RSS tickers")) 
+		self.libraryEntry.set_tooltip_text(_("Which folder to store content in. Can be relative or absolute path")) 
+		self.socketTimeSpin.set_tooltip_text(_("How long should we wait (in seconds) before timing out a hung socket")) 
+		self.checksumCheckButton.set_tooltip_text(_("Should the client checksum all downloaded content to ensure it's unchanged at startup")) 
+		self.lowTextureCheckButton.set_tooltip_text(_("Should the client attempt to minimise the amount of graphics texture memory it uses")) 
+		self.framesSpin.set_tooltip_text(_("How many fps to force the client to run")) 
+		self.vwidthSpin.set_tooltip_text(_("Width of the rendered virtual output screen (this will be a section within the overall window")) 
+		self.vheightSpin.set_tooltip_text(_("Height of the rendered virtual output screen (this will be a section within the overall window")) 
+		self.vrotateSpin.set_tooltip_text(_("Angle to rotate virtual window within the rendered output window")) 
+		self.schedulerCombo.set_tooltip_text(_("Which scheduler module to use")) 
+		self.downloaderCombo.set_tooltip_text(_("Which download manager module to use")) 
+		self.colourDepthCombo.set_tooltip_text(_("Colour depth of the rendered output")) 
+
+		self.xmdsLicenseKeyEntry.set_tooltip_text(_("Sets license key value to use when syncronising from memory stick"))
+#		self.manualUpdateCombo.set_tooltip_text(_("Sets whether update from memory stick is enabled"))
+
+	def getConfValues(self):
+
+		model = self.logTypeCombo.get_model()
+		index = self.logTypeCombo.get_active()
+#		logTypeText = model[index][0]
+
+		logTypeText = self.logWriterTypes[index]
+		
+		configType = "Main"
+
+		serverUrl = [configType,self.serverURLText.get_text()]
+		clientId = [configType,self.clientIDText.get_text()]
+		serverKey = [configType,self.serverKeyText.get_text()]
+		refresh = [configType,int(self.refreshText.get_text())]		
+		serverConn = [configType,str(self.serverConnBool.get_active()).lower()]
+		fullScreen = [configType,str(self.fullScreenBool.get_active()).lower()]
+		screenWidth = [configType, self.screenWidthText.get_value_as_int()]
+		screenHeight = [configType, self.screenHeightText.get_value_as_int()]
+		captureStats = ["Stats",str(self.captureStatisticsBool.get_active()).lower()]
+		queueSize = ["Stats",self.queueSizeText.get_value_as_int()]
+		logType = ["Logging", logTypeText]
+		logVal = ["Logging",self.logLevelSpin.get_value_as_int()]
+		xmdsClientName = ["Main",self.clientNameText.get_text()]
+
+		self.logger5.info("ServerURL: %s"%serverUrl)
+		self.logger5.info("clientID: %s"%clientId)
+		self.logger5.info("serverKey: %s"%serverKey)
+		self.logger5.info("refresh: %s"%refresh)
+		self.logger5.info("serverConn: %s"%serverConn)
+		self.logger5.info("fullScreen: %s"%fullScreen)
+		self.logger5.info("screenWidth: %s"%screenWidth)
+		self.logger5.info("screenHeight: %s"%screenHeight)
+		self.logger5.info("captureStats: %s"%captureStats)
+		self.logger5.info("queueSize: %s"%queueSize)
+		self.logger5.info("logType: %s"%logType)
+		self.logger5.info("logVal: %s"%logVal)
+		self.logger5.info("xmdsClientName: %s"%xmdsClientName)
+		
+		#Take the boolean values and make them lower case.
+
+		configOptions = {"xmdsUrl": serverUrl, "xmdsClientID": clientId,"xmdsKey":serverKey,"xmdsUpdateInterval":refresh,"requireXMDS":serverConn,"fullScreen":fullScreen,"width":screenWidth,"height":screenHeight,"collect":captureStats,"queueSize":queueSize,"logWriter":logType,"logLevel":logVal,"xmdsClientName":xmdsClientName}
+
+		#GET THE LIFT OPTIONS
+		
+
+		#ONLY DO THIS IF THE LIFT TAB IS SHOWING
+		#THEN ADD THEM TO THE DICTIONARY
+
+#		if self.liftTabVisible == True:
+
+		#The above is deprecated. This is because we don't want the information to be
+		#"deleted" from the configuration file if we choose not to show these options
+		#on subsequent file loads
+		if 1:
+
+			configType = "Lift"
+			configType1 = "LiftTags"
+
+			model = self.liftEnableCombo.get_model()
+			index = self.liftEnableCombo.get_active()
+			liftEnableText = model[index][0].lower()
+
+			liftDefaultTag = [configType1,self.liftDefaultTagText.get_text()]
+			lift7Tag = [configType1, self.lift7TagText.get_text()]
+			lift6Tag = [configType1, self.lift6TagText.get_text()]
+			lift5Tag = [configType1, self.lift5TagText.get_text()]
+			lift4Tag = [configType1, self.lift4TagText.get_text()]
+			lift3Tag = [configType1, self.lift3TagText.get_text()]
+			lift2Tag = [configType1, self.lift2TagText.get_text()]
+			lift1Tag = [configType1, self.lift1TagText.get_text()]
+			lift0Tag = [configType1, self.lift0TagText.get_text()]
+			firstSerial = [configType, self.firstSerialText.get_text()]
+			secondSerial = [configType, self.secondSerialText.get_text()]
+			liftTrigger = [configType, self.liftTriggerValue.get_text()]
+			liftEnable = [configType, liftEnableText]
+		
+			if liftDefaultTag[1] != "":
+				configOptions["default"] = liftDefaultTag
+
+			if lift7Tag[1] != "":
+				configOptions["lift7"] =lift7Tag
+
+			if lift6Tag[1] != "":
+				configOptions["lift6"] =lift6Tag
+
+			if lift5Tag[1] != "":
+				configOptions["lift5"] =lift5Tag
+
+			if lift4Tag[1] != "":
+				configOptions["lift4"] =lift4Tag
+
+			if lift3Tag[1] != "":
+				configOptions["lift3"] =lift3Tag
+
+			if lift2Tag[1] != "":
+				configOptions["lift2"] =lift2Tag
+
+			if lift1Tag[1] != "":
+				configOptions["lift1"] =lift1Tag
+		
+			if lift0Tag[1] != "":
+				configOptions["lift0"] =lift0Tag
+
+			if firstSerial[1] != "":
+				configOptions["serial0"] =firstSerial
+
+			if secondSerial[1] != "":
+				configOptions["serial1"] =secondSerial
+
+			if liftEnable[1] != "false":
+				configOptions["enabled"] =liftEnable
+
+			if liftTrigger != "0":
+				configOptions["trigger"] =liftTrigger
+
+#		if self.advancedTabVisible == True:
+
+		#The above is deprecated. This is because we don't want the information to be
+		#"deleted" from the configuration file if we choose not to show these options
+		#on subsequent file loads
+		if 1:
+			configType = "Main"
+
+			model = self.schedulerCombo.get_model()
+			index = self.schedulerCombo.get_active()
+			schedulerComboText = model[index][0]
+
+			model = self.downloaderCombo.get_model()
+			index = self.downloaderCombo.get_active()
+			downloaderComboText = model[index][0]
+
+			model = self.colourDepthCombo.get_model()
+			index = self.colourDepthCombo.get_active()
+			colourDepthComboText = model[index][0]
+
+			xmdsLicenseKeyEntry = [configType,self.xmdsLicenseKeyEntry.get_text()]
+
+#			model = self.manualUpdateCombo.get_model()
+#			index = self.manualUpdateCombo.get_active()
+#			manualUpdateText = model[index][0]
+
+			manualUpdateText = str(self.offlineCheckButton.get_active()).lower()
+
+			manualUpdate = [configType,manualUpdateText.lower()]
+
+			dateFormatEntry = ["TickerMedia", self.dateFormatEntry.get_text()]
+		
+			libraryEntry = [configType, self.libraryEntry.get_text()]
+			socketTimeSpin = [configType, self.socketTimeSpin.get_text()]
+			checksum = [configType, str(self.checksumCheckButton.get_active()).lower()]
+			lowTexture = [configType, str(self.lowTextureCheckButton.get_active()).lower()]
+
+
+			frames = [configType, self.framesSpin.get_text()]
+			vwidth = [configType, self.vwidthSpin.get_text()]
+			vheight = [configType, self.vheightSpin.get_text()]
+			vrotate = [configType, self.vrotateSpin.get_text()]
+			scheduler = [configType, schedulerComboText]
+			downloader = [configType, downloaderComboText]
+			colourDepth = [configType, colourDepthComboText]
+			
+			if xmdsLicenseKeyEntry[1] != "":
+				configOptions["xmdsLicenseKey"] = xmdsLicenseKeyEntry
+
+			if manualUpdateText[1] != "":
+				configOptions["manualUpdate"] = manualUpdate
+
+
+			if dateFormatEntry[1] != "":	
+				configOptions["dateFormat"] = dateFormatEntry
+	
+			if libraryEntry[1] != "":
+				configOptions["libraryDir"] = libraryEntry
+	
+			if socketTimeSpin[1] != "0":
+				configOptions["socketTimeout"] = socketTimeSpin
+
+			if checksum[1] == "true":
+				configOptions["checksumPreviousDownloads"] = checksum
+
+			if lowTexture[1] == "true":
+				configOptions["lowTextureMemory"] = lowTexture
+
+			if frames[1] != "0":
+				configOptions["fps"] = frames
+	
+			if vwidth[1] != "0":
+				configOptions["vwidth"] = vwidth
+
+			if vheight[1] != "0":
+				configOptions["vheight"] = vheight
+
+			if vrotate[1] != "0":
+				configOptions["vrotation"] = vrotate
+
+			if scheduler[1] != "":
+				configOptions["scheduler"] = scheduler
+
+			if downloader[1] != "":
+				configOptions["downloader"] = downloader
+
+			if colourDepth[1] != "":
+				configOptions["bpp"] = colourDepth 
+
+		return configOptions
+def cmdOptions():
+	options = sys.argv[1:]
+	
+	#For each option in the array strip off any - characters and convert to lower case
+	
+	for i in range(len(options)):
+		options[i] = options[i].strip("-").lower()
+
+	return options
+
+if __name__ == "__main__":
+
+	#Grab the command line options
+	options = cmdOptions()
+	
+	#Find out of the lift option has been passed
+	lift = False
+	try:
+		options.index("lift")
+		lift = True
+	except ValueError:
+		print "Option not found"
+		lift = False
+
+
+	wine = xiboConfWindow("client.conf", lift = lift)
+	gtk.main()
 
=== renamed file 'client/python/configure.py' => 'client/python/configure.py.moved'
=== modified file 'client/python/defaults.cfg'
=== added file 'client/python/gui.glade'
--- client/python/gui.glade	1970-01-01 00:00:00 +0000
+++ client/python/gui.glade	2011-02-28 15:09:00 +0000
@@ -0,0 +1,1451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="mainWindow">
+    <property name="width_request">600</property>
+    <property name="height_request">445</property>
+    <property name="title" translatable="yes">Xibo Client Configuration</property>
+    <property name="resizable">False</property>
+    <signal name="destroy" handler="onDestroy"/>
+    <child>
+      <object class="GtkFixed" id="fixed1">
+        <property name="width_request">600</property>
+        <property name="height_request">445</property>
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkNotebook" id="notebook1">
+            <property name="width_request">600</property>
+            <property name="height_request">440</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkFixed" id="fixed2">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="refreshLabel">
+                    <property name="width_request">267</property>
+                    <property name="height_request">38</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Set the number of seconds between the client contacting the server for updates</property>
+                    <property name="justify">right</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">8</property>
+                    <property name="y">303</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="clearFields">
+                    <property name="label" translatable="yes">Clear Form</property>
+                    <property name="width_request">100</property>
+                    <property name="height_request">33</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <signal name="clicked" handler="clearFormSignal"/>
+                  </object>
+                  <packing>
+                    <property name="x">370</property>
+                    <property name="y">364</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="saveConfig">
+                    <property name="label" translatable="yes">Save Config</property>
+                    <property name="width_request">100</property>
+                    <property name="height_request">33</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <signal name="clicked" handler="saveConfigSignal"/>
+                  </object>
+                  <packing>
+                    <property name="x">475</property>
+                    <property name="y">363</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="connectionLabel">
+                    <property name="width_request">213</property>
+                    <property name="height_request">40</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Require connection to server</property>
+                    <property name="justify">right</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">12</property>
+                    <property name="y">357</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="serverConnection">
+                    <property name="width_request">40</property>
+                    <property name="height_request">32</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">This setting is used by the client to
+determine whether a connection to
+the server is needed before the client
+displays any content.
+
+This can be used to allow client that
+are not connected to a network to show
+pre-loaded content</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">220</property>
+                    <property name="y">362</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="refreshText">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">272</property>
+                    <property name="y">308</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="advancedOptionsCheck">
+                    <property name="label" translatable="yes">Display Advanced Options</property>
+                    <property name="width_request">200</property>
+                    <property name="height_request">33</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="on_advancedOptionsCheck"/>
+                  </object>
+                  <packing>
+                    <property name="x">386</property>
+                    <property name="y">316</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame7">
+                    <property name="width_request">561</property>
+                    <property name="height_request">186</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment7">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed13">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkEntry" id="serverURLText">
+                                <property name="width_request">375</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">108</property>
+                                <property name="y">7</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="serverURLLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Server URL</property>
+                                <property name="justify">right</property>
+                              </object>
+                              <packing>
+                                <property name="y">10</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="clientIDText">
+                                <property name="width_request">375</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">108</property>
+                                <property name="y">48</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="clientIDLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Client ID</property>
+                                <property name="justify">right</property>
+                              </object>
+                              <packing>
+                                <property name="x">7</property>
+                                <property name="y">49</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="serverKeyText">
+                                <property name="width_request">375</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">108</property>
+                                <property name="y">91</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="serverKeyLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Server Key</property>
+                                <property name="justify">right</property>
+                              </object>
+                              <packing>
+                                <property name="y">92</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="clientNameText">
+                                <property name="width_request">375</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">108</property>
+                                <property name="y">132</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="clientNameLabel">
+                                <property name="width_request">87</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Client Name</property>
+                              </object>
+                              <packing>
+                                <property name="y">135</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="onlineOpLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Online operation (synchronise with server)&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">17</property>
+                    <property name="y">46</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="offlineCheckButton">
+                    <property name="label" translatable="yes">Offline operation (syncronise from memory stick)</property>
+                    <property name="width_request">362</property>
+                    <property name="height_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="offlineOperationToggle"/>
+                  </object>
+                  <packing>
+                    <property name="x">16</property>
+                    <property name="y">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="xmdsLicenseKeyLabel">
+                    <property name="width_request">122</property>
+                    <property name="height_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">XMDS License Key</property>
+                  </object>
+                  <packing>
+                    <property name="x">16</property>
+                    <property name="y">247</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="xmdsLicenseKeyEntry">
+                    <property name="width_request">296</property>
+                    <property name="height_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">140</property>
+                    <property name="y">246</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="serverSettingsLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Server Settings</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFixed" id="fixed3">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="fullscreenLabel">
+                    <property name="width_request">100</property>
+                    <property name="height_request">32</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Fullscreen</property>
+                  </object>
+                  <packing>
+                    <property name="x">19</property>
+                    <property name="y">27</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="fullScreen">
+                    <property name="width_request">100</property>
+                    <property name="height_request">32</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Set this option if the client
+should run in full screen mode</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">125</property>
+                    <property name="y">24</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="widthLabel">
+                    <property name="width_request">57</property>
+                    <property name="height_request">32</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Width</property>
+                    <property name="justify">right</property>
+                  </object>
+                  <packing>
+                    <property name="x">54</property>
+                    <property name="y">60</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="screenWidthText">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">126</property>
+                    <property name="y">61</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="heightLabel">
+                    <property name="width_request">57</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Height</property>
+                  </object>
+                  <packing>
+                    <property name="x">49</property>
+                    <property name="y">100</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="screenHeightText">
+                    <property name="width_request">100</property>
+                    <property name="height_request">30</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">125</property>
+                    <property name="y">97</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="clientSettingsLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Client Settings</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFixed" id="fixed4">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="width_request">582</property>
+                    <property name="height_request">172</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed5">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="logTypeLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">28</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Log Type</property>
+                              </object>
+                              <packing>
+                                <property name="x">4</property>
+                                <property name="y">15</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="logLevelLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Log Level</property>
+                              </object>
+                              <packing>
+                                <property name="y">44</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="logTypeCombo">
+                                <property name="width_request">218</property>
+                                <property name="height_request">28</property>
+                                <property name="visible">True</property>
+                                <signal name="changed" handler="logTypeComboChanged"/>
+                              </object>
+                              <packing>
+                                <property name="x">103</property>
+                                <property name="y">14</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="logLevelSpin">
+                                <property name="width_request">97</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The higher the value, the 
+more verbose the logging</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">103</property>
+                                <property name="y">50</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLinkButton" id="logFileLinkButton">
+                                <property name="label" translatable="yes">Open Log File</property>
+                                <property name="width_request">114</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="relief">none</property>
+                              </object>
+                              <packing>
+                                <property name="x">207</property>
+                                <property name="y">50</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="loggingFrameLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Logging&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">8</property>
+                    <property name="y">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame2">
+                    <property name="width_request">582</property>
+                    <property name="height_request">208</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed6">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="statsCaptureLabel">
+                                <property name="width_request">63</property>
+                                <property name="height_request">43</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Statistics capturing</property>
+                                <property name="justify">right</property>
+                                <property name="wrap">True</property>
+                              </object>
+                              <packing>
+                                <property name="x">17</property>
+                                <property name="y">13</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="captureStatistics">
+                                <property name="width_request">100</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="x">99</property>
+                                <property name="y">18</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="statsQueueSizeLabel">
+                                <property name="width_request">73</property>
+                                <property name="height_request">25</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Queue Size</property>
+                              </object>
+                              <packing>
+                                <property name="x">5</property>
+                                <property name="y">62</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="queueSizeText">
+                                <property name="width_request">100</property>
+                                <property name="height_request">30</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">101</property>
+                                <property name="y">57</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="statsFrameLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Statistic Capturing&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">8</property>
+                    <property name="y">192</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="otherSettingsLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Other settings</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFixed" id="fixed10">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="schedulerLabel">
+                    <property name="width_request">73</property>
+                    <property name="height_request">25</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Scheduler</property>
+                  </object>
+                  <packing>
+                    <property name="x">14</property>
+                    <property name="y">16</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="downloaderLabel">
+                    <property name="width_request">82</property>
+                    <property name="height_request">22</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Downloader</property>
+                  </object>
+                  <packing>
+                    <property name="x">15</property>
+                    <property name="y">51</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="libraryLabel">
+                    <property name="width_request">68</property>
+                    <property name="height_request">38</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Library Location</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">17</property>
+                    <property name="y">82</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="bppLabel">
+                    <property name="width_request">82</property>
+                    <property name="height_request">40</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Colour depth (BPP)</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">17</property>
+                    <property name="y">129</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame5">
+                    <property name="width_request">278</property>
+                    <property name="height_request">125</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment5">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed11">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="vwidthLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">25</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Virtual Width</property>
+                              </object>
+                              <packing>
+                                <property name="y">9</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="vheightLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">25</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Virtual Height</property>
+                              </object>
+                              <packing>
+                                <property name="y">41</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="vrotationLabel">
+                                <property name="width_request">66</property>
+                                <property name="height_request">25</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Rotation</property>
+                              </object>
+                              <packing>
+                                <property name="y">72</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="vwidthSpin">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">135</property>
+                                <property name="y">7</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="vheightSpin">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">135</property>
+                                <property name="y">39</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="vrotateSpin">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">135</property>
+                                <property name="y">71</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="virtualWinLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Virtual Window&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">308</property>
+                    <property name="y">269</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="socketTimeLabel">
+                    <property name="width_request">107</property>
+                    <property name="height_request">40</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Socket Timeout (seconds)</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">16</property>
+                    <property name="y">183</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="checksumLabel">
+                    <property name="width_request">100</property>
+                    <property name="height_request">57</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Checksum Downloaded Media</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">15</property>
+                    <property name="y">232</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="lowTextureLabel">
+                    <property name="width_request">85</property>
+                    <property name="height_request">42</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Low Texture Memory</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">14</property>
+                    <property name="y">299</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="framesLabel">
+                    <property name="width_request">80</property>
+                    <property name="height_request">42</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Frames per Second</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">14</property>
+                    <property name="y">351</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dateFormatLabel">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Date Format</property>
+                  </object>
+                  <packing>
+                    <property name="x">307</property>
+                    <property name="y">14</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="schedulerCombo">
+                    <property name="width_request">170</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">15</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="downloaderCombo">
+                    <property name="width_request">170</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">48</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="libraryEntry">
+                    <property name="width_request">170</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">85</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="colourDepthCombo">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">133</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="socketTimeSpin">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">188</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checksumCheckButton">
+                    <property name="width_request">18</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">240</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="lowTextureCheckButton">
+                    <property name="width_request">20</property>
+                    <property name="height_request">20</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">308</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="framesSpin">
+                    <property name="width_request">100</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">127</property>
+                    <property name="y">356</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="dateFormatEntry">
+                    <property name="width_request">150</property>
+                    <property name="height_request">27</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                  </object>
+                  <packing>
+                    <property name="x">432</property>
+                    <property name="y">15</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="advancedOptionsLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Advanced Options</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFixed" id="fixed7">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkFrame" id="frame3">
+                    <property name="width_request">290</property>
+                    <property name="height_request">390</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed8">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="firstSerialLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">22</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">1st Serial Port</property>
+                              </object>
+                              <packing>
+                                <property name="y">11</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="secondSerialLabel">
+                                <property name="width_request">100</property>
+                                <property name="height_request">22</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">2nd Serial Port</property>
+                              </object>
+                              <packing>
+                                <property name="x">1</property>
+                                <property name="y">50</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="liftTriggerLabel">
+                                <property name="width_request">87</property>
+                                <property name="height_request">22</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Trigger Value</property>
+                              </object>
+                              <packing>
+                                <property name="x">2</property>
+                                <property name="y">97</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="liftEnableLabel">
+                                <property name="width_request">75</property>
+                                <property name="height_request">23</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Enable Lift</property>
+                              </object>
+                              <packing>
+                                <property name="y">136</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="firstSerialText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">118</property>
+                                <property name="y">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="secondSerialText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">118</property>
+                                <property name="y">45</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="liftTriggerValue">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">117</property>
+                                <property name="y">93</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBox" id="liftEnableCombo">
+                                <property name="width_request">100</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                              </object>
+                              <packing>
+                                <property name="x">117</property>
+                                <property name="y">138</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="genLiftOptions">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;General Lift Options&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">5</property>
+                    <property name="y">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame4">
+                    <property name="width_request">290</property>
+                    <property name="height_request">390</property>
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">out</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment4">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkFixed" id="fixed9">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="lift0Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift0</property>
+                              </object>
+                              <packing>
+                                <property name="y">10</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift1Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift1</property>
+                              </object>
+                              <packing>
+                                <property name="y">40</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift2Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift2</property>
+                              </object>
+                              <packing>
+                                <property name="y">72</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift3Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift3</property>
+                              </object>
+                              <packing>
+                                <property name="y">104</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift4Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift4</property>
+                              </object>
+                              <packing>
+                                <property name="y">136</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift5Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift5</property>
+                              </object>
+                              <packing>
+                                <property name="y">169</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift6Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift6</property>
+                              </object>
+                              <packing>
+                                <property name="y">200</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lift7Label">
+                                <property name="width_request">40</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">lift7</property>
+                              </object>
+                              <packing>
+                                <property name="y">233</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="liftDefaultLabel">
+                                <property name="width_request">50</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">default</property>
+                              </object>
+                              <packing>
+                                <property name="x">5</property>
+                                <property name="y">264</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift0TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">8</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift1TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">39</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift2TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">71</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift3TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">103</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift4TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">135</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift5TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">167</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift6TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">199</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="lift7TagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">231</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="liftDefaultTagText">
+                                <property name="width_request">140</property>
+                                <property name="height_request">27</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="x">77</property>
+                                <property name="y">265</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="tagLiftLabel">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Tagging Lift Options&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="x">299</property>
+                    <property name="y">5</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="liftOptionsLabel">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Lift Options</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="y">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMessageDialog" id="errorDialog">
+    <property name="border_width">5</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">error</property>
+    <property name="use_markup">True</property>
+    <property name="secondary_use_markup">True</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="errorExitButton">
+                <property name="label" translatable="yes">Exit</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="messageDialogExit"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">errorExitButton</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkMessageDialog" id="infoDialog">
+    <property name="border_width">5</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="infoDialogOK">
+                <property name="label" translatable="yes">OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="clicked" handler="infoDialogOKSignal"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">infoDialogOK</action-widget>
+    </action-widgets>
+  </object>
+</interface>
 
=== renamed file 'client/python/gui.glade' => 'client/python/gui.glade.moved'
=== added file 'client/python/xibo.ico'
 Binary files client/python/xibo.ico	1970-01-01 00:00:00 +0000 and client/python/xibo.ico	2011-02-28 15:09:00 +0000 differ
=== renamed file 'client/python/xibo.ico' => 'client/python/xibo.ico.moved'