Merge lp:~dangarner/xibo/client-141 into lp:~xibo-maintainers/xibo/d-arrest

[Dan Garner]

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2012-08-23 06:16:17 +0000
+++ client/dotNET/MainForm.cs	2012-12-02 17:36:23 +0000
@@ -159,12 +159,15 @@
                 Directory.CreateDirectory(Properties.Settings.Default.LibraryPath + @"\backgrounds");
             }
 
-            // Hide the cursor
-            Cursor.Position = new Point(_clientSize.Width, _clientSize.Height);
-            
+            // Is the mouse enabled?
             if (!Properties.Settings.Default.EnableMouse)
+                // Hide the cursor
                 Cursor.Hide();
 
+            // Move the cursor to the starting place
+            SetCursorStartPosition();
+
+            // Show the splash screen
             ShowSplashScreen();
 
             // Change the default Proxy class
@@ -504,6 +507,10 @@
                 options.top = (int)(double.Parse(nodeAttibutes["top"].Value) * _scaleFactor);
                 options.scaleFactor = _scaleFactor;
 
+                // Store the original width and original height for scaling
+                options.originalWidth = Convert.ToInt32(nodeAttibutes["width"].Value);
+                options.originalHeight = Convert.ToInt32(nodeAttibutes["height"].Value);
+
                 // Set the backgrounds (used for Web content offsets)
                 options.backgroundLeft = options.left * -1;
                 options.backgroundTop = options.top * -1;
@@ -666,6 +673,36 @@
         }
 
         /// <summary>
+        /// Set the Cursor start position
+        /// </summary>
+        private void SetCursorStartPosition()
+        {
+            Point position;
+
+            switch (Settings.Default.CursorStartPosition)
+            {
+                case "Top Left":
+                    position = new Point(0, 0);
+                    break;
+
+                case "Top Right":
+                    position = new Point(_clientSize.Width, 0);
+                    break;
+
+                case "Bottom Left":
+                    position = new Point(0, _clientSize.Height);
+                    break;
+
+                case "Bottom Right":
+                default:
+                    position = new Point(_clientSize.Width, _clientSize.Height);
+                    break;
+            }
+
+            Cursor.Position = position;
+        }
+
+        /// <summary>
         /// Force a flush of the stats log
         /// </summary>
         public void FlushStats()

=== modified file 'client/dotNET/OptionForm.Designer.cs'
--- client/dotNET/OptionForm.Designer.cs	2012-08-04 11:12:39 +0000
+++ client/dotNET/OptionForm.Designer.cs	2012-12-02 17:36:23 +0000
@@ -82,6 +82,8 @@
             this.clientHeight = new System.Windows.Forms.NumericUpDown();
             this.clientWidth = new System.Windows.Forms.NumericUpDown();
             this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.logToDiskLocation = new System.Windows.Forms.TextBox();
+            this.label21 = new System.Windows.Forms.Label();
             this.showInTaskbar = new System.Windows.Forms.CheckBox();
             this.label20 = new System.Windows.Forms.Label();
             this.logLevel = new System.Windows.Forms.ComboBox();
@@ -102,8 +104,8 @@
             this.folderBrowserLibrary = new System.Windows.Forms.FolderBrowserDialog();
             this.splashScreenOverride = new System.Windows.Forms.OpenFileDialog();
             this.xmds1 = new XiboClient.xmds.xmds();
-            this.label21 = new System.Windows.Forms.Label();
-            this.logToDiskLocation = new System.Windows.Forms.TextBox();
+            this.label22 = new System.Windows.Forms.Label();
+            this.cursorStartPosition = new System.Windows.Forms.ComboBox();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nupScrollStepAmount)).BeginInit();
@@ -682,6 +684,8 @@
             // 
             // tabPage5
             // 
+            this.tabPage5.Controls.Add(this.cursorStartPosition);
+            this.tabPage5.Controls.Add(this.label22);
             this.tabPage5.Controls.Add(this.logToDiskLocation);
             this.tabPage5.Controls.Add(this.label21);
             this.tabPage5.Controls.Add(this.showInTaskbar);
@@ -703,10 +707,26 @@
             this.tabPage5.Text = "Advanced";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
+            // logToDiskLocation
+            // 
+            this.logToDiskLocation.Location = new System.Drawing.Point(176, 176);
+            this.logToDiskLocation.Name = "logToDiskLocation";
+            this.logToDiskLocation.Size = new System.Drawing.Size(121, 20);
+            this.logToDiskLocation.TabIndex = 19;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.Location = new System.Drawing.Point(20, 179);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(105, 13);
+            this.label21.TabIndex = 18;
+            this.label21.Text = "Log to Disk Location";
+            // 
             // showInTaskbar
             // 
             this.showInTaskbar.AutoSize = true;
-            this.showInTaskbar.Location = new System.Drawing.Point(176, 206);
+            this.showInTaskbar.Location = new System.Drawing.Point(176, 238);
             this.showInTaskbar.Name = "showInTaskbar";
             this.showInTaskbar.Size = new System.Drawing.Size(130, 17);
             this.showInTaskbar.TabIndex = 17;
@@ -876,21 +896,27 @@
             this.xmds1.Url = "http://localhost/Xibo/server/xmds.php";
             this.xmds1.UseDefaultCredentials = false;
             // 
-            // label21
-            // 
-            this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(20, 179);
-            this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(105, 13);
-            this.label21.TabIndex = 18;
-            this.label21.Text = "Log to Disk Location";
-            // 
-            // logToDiskLocation
-            // 
-            this.logToDiskLocation.Location = new System.Drawing.Point(176, 176);
-            this.logToDiskLocation.Name = "logToDiskLocation";
-            this.logToDiskLocation.Size = new System.Drawing.Size(121, 20);
-            this.logToDiskLocation.TabIndex = 19;
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            this.label22.Location = new System.Drawing.Point(23, 206);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(102, 13);
+            this.label22.TabIndex = 20;
+            this.label22.Text = "Cursor Start Position";
+            // 
+            // cursorStartPosition
+            // 
+            this.cursorStartPosition.FormattingEnabled = true;
+            this.cursorStartPosition.Items.AddRange(new object[] {
+            "Top Left",
+            "Top Right",
+            "Bottom Left",
+            "Bottom Right"});
+            this.cursorStartPosition.Location = new System.Drawing.Point(176, 203);
+            this.cursorStartPosition.Name = "cursorStartPosition";
+            this.cursorStartPosition.Size = new System.Drawing.Size(121, 21);
+            this.cursorStartPosition.TabIndex = 21;
             // 
             // OptionForm
             // 
@@ -1009,5 +1035,7 @@
         private System.Windows.Forms.CheckBox showInTaskbar;
         private System.Windows.Forms.Label label21;
         private System.Windows.Forms.TextBox logToDiskLocation;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.ComboBox cursorStartPosition;
     }
 }
\ No newline at end of file

=== modified file 'client/dotNET/OptionForm.cs'
--- client/dotNET/OptionForm.cs	2012-08-04 11:12:39 +0000
+++ client/dotNET/OptionForm.cs	2012-12-02 17:36:23 +0000
@@ -104,6 +104,7 @@
             maxConcurrentDownloads.Value = Settings.Default.MaxConcurrentDownloads;
             logToDiskLocation.Text = Settings.Default.LogToDiskLocation;
             showInTaskbar.Checked = Settings.Default.ShowInTaskbar;
+            cursorStartPosition.Text = Settings.Default.CursorStartPosition;
 
             Debug.WriteLine("Loaded Options Form", "OptionForm");
         }
@@ -200,6 +201,7 @@
                 Settings.Default.LogLevel = logLevel.Text;
                 Settings.Default.LogToDiskLocation = logToDiskLocation.Text;
                 Settings.Default.ShowInTaskbar = showInTaskbar.Checked;
+                Settings.Default.CursorStartPosition = cursorStartPosition.Text;
 
                 // Commit these changes back to the user settings
                 Settings.Default.Save();

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2012-10-18 13:58:07 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2012-12-02 17:36:23 +0000
@@ -271,7 +271,7 @@
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.4.0")]
+        [global::System.Configuration.DefaultSettingValueAttribute("1.4.1")]
         public string ClientVersion {
             get {
                 return ((string)(this["ClientVersion"]));
@@ -520,5 +520,17 @@
                 this["VideoRenderingEngine"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Bottom Right")]
+        public string CursorStartPosition {
+            get {
+                return ((string)(this["CursorStartPosition"]));
+            }
+            set {
+                this["CursorStartPosition"] = value;
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2012-10-18 13:58:07 +0000
+++ client/dotNET/Properties/Settings.settings	2012-12-02 17:36:23 +0000
@@ -69,7 +69,7 @@
       <Value Profile="(Default)">cacheManager.xml</Value>
     </Setting>
     <Setting Name="ClientVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">1.4.0</Value>
+      <Value Profile="(Default)">1.4.1</Value>
     </Setting>
     <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">1</Value>
@@ -134,5 +134,8 @@
     <Setting Name="VideoRenderingEngine" Type="System.String" Scope="User">
       <Value Profile="(Default)">WindowsMediaPlayer</Value>
     </Setting>
+    <Setting Name="CursorStartPosition" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Bottom Right</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2012-09-05 20:34:12 +0000
+++ client/dotNET/Region.cs	2012-12-02 17:36:23 +0000
@@ -649,6 +649,8 @@
         public int height;
         public int top;
         public int left;
+        public int originalWidth;
+        public int originalHeight;
 
         public int backgroundLeft;
         public int backgroundTop;

=== modified file 'client/dotNET/Resources/HtmlTemplate.htm'
--- client/dotNET/Resources/HtmlTemplate.htm	2012-07-07 10:42:08 +0000
+++ client/dotNET/Resources/HtmlTemplate.htm	2012-12-02 17:36:23 +0000
@@ -120,7 +120,7 @@
                 width = $marquee.attr('width') || $marquee.width(),
                 height = $marquee.attr('height') || $marquee.height(),
                 direction = ($marquee.attr('direction') || 'left').toLowerCase(),
-                $marqueeRedux = $marquee.after('<div id="' + $marquee.attr("id") + '" ' + (klass ? 'class="' + klass + '" ' : '') + 'style="display: block-inline; width: ' + width + 'px; height: ' + height + 'px; overflow: hidden;"><div style="float: left; ' + ((/left|right/.test(direction)) ? "white-space: nowrap;" : "") + '">' + $marquee.html() + '</div></div>').next(),
+                $marqueeRedux = $marquee.after('<div ' + (klass ? 'class="' + klass + '" ' : '') + 'style="display: block-inline; width: ' + width + 'px; height: ' + height + 'px; overflow: hidden;"><div style="float: left; ' + ((/left|right/.test(direction)) ? "white-space: nowrap;" : "") + '">' + $marquee.html() + '</div></div>').next(),
                 marqueeRedux = $marqueeRedux.get(0),
                 hitedge = 0,
                 marqueeState = {
@@ -252,6 +252,8 @@
                 direction: "none",
                 width: 100,
                 height: 100,
+                originalWidth: 100,
+                originalHeight: 100,
                 scrollSpeed: 2,
                 scaleText: false,
                 fitText: false,
@@ -262,12 +264,11 @@
         this.each(function() {
             // Scale text to fit the box
             if (options.scaleText) {
-                // Go through every <span> element, and scale it accordingly.
-                $("span, p", this).each(function(){
-                    // Already has a font?
-                    var fontSize = $(this).css("font-size");
-
-                    $(this).css("font-size", Math.round(fontSize.replace("px", "") * options.scaleFactor));
+                // Apply the ZOOM attribute to the body
+                $(this).css({
+                    zoom: options.scaleFactor,
+                    width: options.originalWidth,
+                    height: options.originalHeight
                 });
             }
 
@@ -297,7 +298,7 @@
 
                 $(".XiboRssItem", this).css({
                     display: "block",
-                    width: options.width
+                    width: options.originalWidth
                 });
             }
 
@@ -331,15 +332,22 @@
 
                 // Set some options on the node, before calling marquee (behaviour, direction, scrollAmount, width, height)
                 $(this).attr({
-                    direction: options.direction,
-                    width: options.width,
-                    height: options.height,
-                    scrollamount: options.scrollSpeed,
-                    behaviour: "scroll"
+                    width: options.originalWidth,
+                    height: options.originalHeight                    
                 });
-
-                // Create a marquee out of it
-                $(this).marquee();
+				
+				// Wrap in an extra DIV - this will be what is scrolled.
+				$(this).wrap("<div class='scroll'>");
+				
+				// Set some options on the extra DIV and make it a marquee
+				$(this).parent().attr({
+					scrollamount: options.scrollSpeed,
+                    scaleFactor: options.scaleFactor,
+                    behaviour: "scroll",
+					direction: options.direction,
+					height: options.height,
+					width: options.width
+				}).marquee();
             }
         });
     }

=== modified file 'client/dotNET/Rss.cs'
--- client/dotNET/Rss.cs	2012-08-21 19:04:26 +0000
+++ client/dotNET/Rss.cs	2012-12-02 17:36:23 +0000
@@ -25,9 +25,10 @@
 using System.Xml;
 using System.Net;
 using System.Diagnostics;
-using System.ServiceModel.Syndication;
 using System.Globalization;
 using System.Linq;
+using FeedDotNet;
+using FeedDotNet.Common;
 
 namespace XiboClient
 {
@@ -49,6 +50,8 @@
         private int _duration;
         private bool _fitText;
 
+        private RegionOptions _options;
+
         private int _numItems;
         private string _takeItemsFrom;
         private int _durationIsPerItem;
@@ -76,6 +79,10 @@
         public Rss(RegionOptions options)
             : base(options.width, options.height, options.top, options.left)
         {
+            // Store the options
+            _options = options;
+
+            // Get the URI
             if (String.IsNullOrEmpty(options.uri))
             {
                 throw new ArgumentNullException("Uri", "The Uri for the RSS feed can not be empty");
@@ -106,9 +113,8 @@
             _duration = options.duration;
             _fitText = (options.Dictionary.Get("fitText", "0") == "0" ? false : true);
 
-            // Adjust the scale factor
-            // Scale factor is always slightly over stated, we need to reduce it.
-            _scaleFactor = options.scaleFactor * 0.85;
+            // Scale factor
+            _scaleFactor = options.scaleFactor;
 
             // Update interval and scrolling speed
             _updateInterval = options.updateInterval;
@@ -210,10 +216,12 @@
             headContent += "           type: 'ticker',";
             headContent += "           direction: '" + _direction + "',";
             headContent += "           duration: " + _duration + ",";
-            headContent += "           durationIsPerItem: false,";
+            headContent += "           durationIsPerItem: " + ((_durationIsPerItem == 0) ? "true" : "false") + ",";
             headContent += "           numItems: 0,";
             headContent += "           width: " + _width + ",";
             headContent += "           height: " + _height + ",";
+            headContent += "           originalWidth: " + _options.originalWidth + ",";
+            headContent += "           originalHeight: " + _options.originalHeight + ",";
             headContent += "           scrollSpeed: " + _scrollSpeed + ",";
             headContent += "           fitText: " + ((!_fitText) ? "false" : "true") + ",";
             headContent += "           scaleText: " + ((_fitText) ? "false" : "true") + ",";
@@ -258,26 +266,28 @@
             {
                 string localFeedUrl = Properties.Settings.Default.LibraryPath + @"\" + _mediaid + ".xml";
 
-                using (XmlReader reader = XmlReader.Create(localFeedUrl))
+                using (StreamReader sr = new StreamReader(localFeedUrl))
                 {
-                    SyndicationFeed feed = SyndicationFeed.Load(reader);
-
-                    int countItems = 0;
-                    int currentItem = 0;
-
-                    foreach (SyndicationItem item in feed.Items)
-                        countItems++;
+                    Feed feed = FeedReader.Read(sr.BaseStream, _filePath, new FeedReaderSettings());
+
+                    if (FeedReader.HasErrors || feed == null)
+                    {
+                        throw new Exception("Error reading feed. " + FeedReader.GetErrors()[0]);
+                    }
 
                     // What if the _numItems we want is 0? Take them all.
                     if (_numItems == 0)
-                        _numItems = countItems;
+                        _numItems = feed.Items.Count;
 
                     // Make sure we dont have a count higher than the actual number of items returned
-                    if (_numItems > countItems)
-                        _numItems = countItems;
+                    if (_numItems > feed.Items.Count)
+                        _numItems = feed.Items.Count;
+
+                    // Read items
+                    int currentItem = 0;
 
                     // Go through each item and construct the HTML for the feed
-                    foreach(SyndicationItem item in feed.Items)
+                    foreach (FeedItem item in feed.Items)
                     {
                         currentItem++;
 
@@ -296,20 +306,24 @@
                         // Load the template into a temporary variable
                         string temp = _documentTemplate;
 
-                        temp = temp.Replace("[Title]", item.Title.Text.ToString());
-                        
-                        string description;
-
-                        if (item.Summary == null)
-                            description = item.ElementExtensions.ReadElementExtensions<string>("encoded", "http://purl.org/rss/1.0/modules/content/")[0].ToString();
-                        else
-                            description = item.Summary.Text;
-
-                        temp = temp.Replace("[Description]", description);
-                        temp = temp.Replace("[Date]", item.PublishDate.ToString("F"));
-
-                        if (item.Links.Count > 0)
-                            temp = temp.Replace("[Link]", item.Links[0].Uri.ToString());                       
+                        // Get some generic items
+                        temp = temp.Replace("[Title]", item.Title);
+                        temp = temp.Replace("[Summary]", item.Summary);
+
+                        string date = "";
+                        if (item.Published.HasValue)
+                            date = item.Published.Value.ToString("F");
+                        else if (item.Updated.HasValue)
+                            date = item.Updated.Value.ToString("F");
+
+                        temp = temp.Replace("[Date]", (item.Published.HasValue) ? item.Published.Value.ToString("F") : "");
+                        temp = temp.Replace("[Description]", item.ContentOrSummary);
+
+                        string links = "";
+                        foreach (FeedUri uri in item.WebUris)
+                            links += " " + uri.Uri;
+
+                        temp = temp.Replace("[Link]", links);
 
                         // Assemble the RSS items based on the direction we are displaying
                         if (_direction == "left" || _direction == "right")

=== modified file 'client/dotNET/Text.cs'
--- client/dotNET/Text.cs	2012-08-21 19:04:26 +0000
+++ client/dotNET/Text.cs	2012-12-02 17:36:23 +0000
@@ -43,6 +43,7 @@
         private double _scaleFactor;
         private int _scrollSpeed;
         private bool _fitText;
+        private RegionOptions _options;
 
         private TemporaryHtml _tempHtml;
 
@@ -55,6 +56,7 @@
         {
             // Collect some options from the Region Options passed in
             // and store them in member variables.
+            _options = options;
             _filePath = options.uri;
             _direction = options.direction;
             _backgroundImage = options.backgroundImage;
@@ -66,9 +68,8 @@
             _headJavaScript = options.javaScript;
             _fitText = (options.Dictionary.Get("fitText", "0") == "0" ? false : true);
             
-            // Adjust the scale factor
-            // Scale factor is always slightly over stated, we need to reduce it.
-            _scaleFactor = options.scaleFactor * 0.85;
+            // Scale Factor
+            _scaleFactor = options.scaleFactor;
 
             // Generate a temporary file to store the rendered object in.
             _tempHtml = new TemporaryHtml();
@@ -101,7 +102,7 @@
 
             // Generate the body content
             bodyContent += "<div id=\"contentPane\" style=\"overflow: none; width:" + _width + "px; height:" + _height + "px;\">";
-            bodyContent += "   <div id=\"text\">";
+            bodyContent += "   <div id=\"" + _options.type + "\">";
             bodyContent += "       " + _documentText;
             bodyContent += "   </div>";
             bodyContent += "</div>";
@@ -132,6 +133,8 @@
             headContent += "           numItems: 0,";
             headContent += "           width: " + _width + ",";
             headContent += "           height: " + _height + ",";
+            headContent += "           originalWidth: " + _options.originalWidth + ",";
+            headContent += "           originalHeight: " + _options.originalHeight + ",";
             headContent += "           scrollSpeed: " + _scrollSpeed + ",";
             headContent += "           fitText: " + ((!_fitText) ? "false" : "true") + ",";
             headContent += "           scaleText: " + ((_fitText) ? "false" : "true") + ",";

=== modified file 'client/dotNET/Video.cs'
--- client/dotNET/Video.cs	2012-09-05 20:34:12 +0000
+++ client/dotNET/Video.cs	2012-12-02 17:36:23 +0000
@@ -26,6 +26,7 @@
 using System.IO;
 
 /// 09/06/12 Dan Changed to raise an event when the video is finished
+/// 03/11/12 Dan Fix for non zero duration timers.
 
 namespace XiboClient
 {
@@ -35,6 +36,7 @@
         private VideoPlayer _videoPlayer;
         private int _duration;
         private bool _expired = false;
+        private bool _detectEnd = false;
 
         /// <summary>
         /// Constructor
@@ -71,6 +73,7 @@
 
                 // Set the duration to 1 second
                 Duration = 1;
+                _detectEnd = true;
             }
                 
             // Render media as normal (starts the timer, shows the form, etc)
@@ -119,7 +122,7 @@
         /// <param name="e"></param>
         protected override void timer_Tick(object sender, EventArgs e)
         {
-            if (_expired)
+            if (!_detectEnd || _expired)
                 base.timer_Tick(sender, e);
         }
 

=== modified file 'client/dotNET/WebContent.cs'
--- client/dotNET/WebContent.cs	2012-09-05 20:34:12 +0000
+++ client/dotNET/WebContent.cs	2012-12-02 17:36:23 +0000
@@ -1,6 +1,6 @@
 /*
  * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006-2012 Daniel Garner and James Packer
+ * Copyright (C) 2006-2012 Daniel Garner
  *
  * This file is part of Xibo.
  *
@@ -54,6 +54,7 @@
             // Offset?
             double offsetTop = Convert.ToDouble(options.Dictionary.Get("offsetTop", "0"));
             double offsetLeft = Convert.ToDouble(options.Dictionary.Get("offsetLeft", "0"));
+            double scaling = Convert.ToDouble(options.Dictionary.Get("scaling", "100"));
 
             // Attach event
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
@@ -78,14 +79,30 @@
                         Trace.WriteLine(new LogMessage("WebContent", "Unable to get a URI with exception: " + ex.Message), LogType.Audit.ToString());
                     }
 
-                    if (offsetLeft == 0 && offsetTop == 0)
+                    if (offsetLeft == 0 && offsetTop == 0 && scaling == 100)
                     {
                         webBrowser.Navigate(_filePath);
                     }
                     else
                     {
+                        double w = Convert.ToDouble(options.width);
+                        double h = Convert.ToDouble(options.height);
+                        string zoom = "";
+
+                        // Scale?
+                        if (scaling != 100)
+                        {
+                            // Convert from percentage
+                            scaling = scaling / 100;
+
+                            // Alter the width and height
+                            w = w * (1 / scaling);
+                            h = h * (1 / scaling);
+                            zoom = "zoom: " + scaling.ToString() + ";";
+                        }
+
                         // Load an IFRAME into the DocumentText
-                        string iframe = "<html><body style='margin:0; border:0;'><iframe style='margin-left:-" + offsetLeft.ToString() + "px; margin-top:-" + offsetTop.ToString() + "px;' scrolling=\"no\" width=\"" + (options.width + offsetLeft).ToString() + "px\" height=\"" + (options.height + offsetTop).ToString() + "px\" src=\"" + _filePath + "\"></body></html>";
+                        string iframe = "<html><body style='margin:0; border:0;'><iframe style='border:0;margin-left:-" + offsetLeft.ToString() + "px; margin-top:-" + offsetTop.ToString() + "px;" + zoom + "' scrolling=\"no\" width=\"" + (w + offsetLeft).ToString() + "px\" height=\"" + (h + offsetTop).ToString() + "px\" src=\"" + _filePath + "\"></body></html>";
                         webBrowser.DocumentText = iframe;
                     }
                 }

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2012-09-05 20:34:12 +0000
+++ client/dotNET/XiboClient.csproj	2012-12-02 17:36:23 +0000
@@ -74,6 +74,18 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FeedDotNet, Version=1.2.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\FeedDotNet-master\FeedDotNet\bin\x86\Release\FeedDotNet.dll</HintPath>
+    </Reference>
+    <Reference Include="FeedDotNet.Common, Version=1.2.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\FeedDotNet-master\FeedDotNet\bin\x86\Release\FeedDotNet.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="FeedDotNet.Modules, Version=1.2.1.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\FeedDotNet-master\FeedDotNet\bin\x86\Release\FeedDotNet.Modules.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
     <Reference Include="System.Data" />

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2012-10-27 12:45:04 +0000
+++ client/dotNET/app.config	2012-12-02 17:36:23 +0000
@@ -112,6 +112,9 @@
             <setting name="VideoRenderingEngine" serializeAs="String">
                 <value>WindowsMediaPlayer</value>
             </setting>
+            <setting name="CursorStartPosition" serializeAs="String">
+                <value>Bottom Right</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -135,7 +138,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.4.0</value>
+                <value>1.4.1</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>