diff --git a/Forms/About.resx b/Forms/About.resx index af387578..7df322c6 100644 --- a/Forms/About.resx +++ b/Forms/About.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAAKAAAABSCAYAAADTld8/AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH @@ -165,7 +165,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAABp0RVh0U29mdHdhcmUA + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAABp0RVh0U29mdHdhcmUA UGFpbnQuTkVUIHYzLjUuMTAw9HKhAAA+J0lEQVR4Xu2dd3hURffHg6B0COmh9xZKqNIJ6aQ3AgRCF0RU 9EVRAZFeEtIhEFBREAVEUCkCAUIKHVSqWPAFFBR9/VlRrPd3Pjc7y93NBkgI6B/O83yf3bs7d+bMnO+c c6bcXbt/0z8ylTPhHkF5QQUT7jW85zuV7+9Kqn4lI/Ip/JPk/DfdYjIqFCVWElQT1BTYC2qZXqsLqggq @@ -435,8 +435,8 @@ - Xibo - Digitial Signage - http://www.xibo.org.uk -Copyright (C) 2006-2014 Daniel Garner and the Xibo Developers + Xibo - Digital Signage - http://www.xibo.org.uk +Copyright (C) 2006-2015 Daniel Garner and the Xibo Developers 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 diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs index c68f18d5..bd1cd789 100644 --- a/Logic/ApplicationSettings.cs +++ b/Logic/ApplicationSettings.cs @@ -37,9 +37,9 @@ public class ApplicationSettings private static string _default = "default"; // Application Specific Settings we want to protect - private string _clientVersion = "1.7.3"; + private string _clientVersion = "1.7.4"; private string _version = "4"; - private int _clientCodeVersion = 107; + private int _clientCodeVersion = 108; public string ClientVersion { get { return _clientVersion; } } public string Version { get { return _version; } } diff --git a/MainForm.cs b/MainForm.cs index af7a416a..5327dbb6 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -459,7 +459,7 @@ private void ChangeToNextLayout(string layoutPath) using (xmds.xmds statusXmds = new xmds.xmds()) { statusXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds; - statusXmds.NotifyStatusAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, "{\"currentLayoutId\":" + _layoutId + "}"); + statusXmds.NotifyStatusAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, "{\"currentLayoutId\":" + _layoutId + "}"); } } } diff --git a/Media/IeWebMedia.cs b/Media/IeWebMedia.cs index 6e7c0abf..763b73bf 100644 --- a/Media/IeWebMedia.cs +++ b/Media/IeWebMedia.cs @@ -62,6 +62,9 @@ public IeWebMedia(RegionOptions options) // Write to temporary file ReadControlMeta(); + // Start the timer (will be reset in DocumentComplete) + base.StartTimer(); + // Navigate to temp file _webBrowser.Navigate(_filePath); } @@ -79,7 +82,7 @@ public IeWebMedia(RegionOptions options) void _webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e) { // Start the timer - base.StartTimer(); + base.RestartTimer(); if (_disposed) return; @@ -174,6 +177,10 @@ private void xmds_GetResourceCompleted(object sender, XiboClient.xmds.GetResourc { // Cached file to revert to UpdateCacheIfNecessary(); + + // Start the timer + StartTimer(); + _webBrowser.Navigate(_filePath); } else @@ -213,6 +220,9 @@ private void xmds_GetResourceCompleted(object sender, XiboClient.xmds.GetResourc // Read the control meta back out ReadControlMeta(); + // Start the timer + StartTimer(); + // Handle Navigate in here because we will not have done it during first load _webBrowser.Navigate(_filePath); } diff --git a/Media/Media.cs b/Media/Media.cs index 0728e692..7788b53c 100644 --- a/Media/Media.cs +++ b/Media/Media.cs @@ -187,6 +187,10 @@ protected void RestartTimer() _timer.Stop(); _timer.Start(); } + else + { + StartTimer(); + } } /// diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index e896b524..2daecaea 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Xibo Digital Signage")] [assembly: AssemblyProduct("Xibo")] -[assembly: AssemblyCopyright("Copyright Dan Garner © 2008-2014")] +[assembly: AssemblyCopyright("Copyright Dan Garner © 2008-2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/XiboClient.v11.suo b/XiboClient.v11.suo index c45f75fe..bf215a83 100644 Binary files a/XiboClient.v11.suo and b/XiboClient.v11.suo differ diff --git a/bin/x86/Release/XiboClient.XmlSerializers.dll b/bin/x86/Release/XiboClient.XmlSerializers.dll index 16843d97..79f2b0cc 100644 Binary files a/bin/x86/Release/XiboClient.XmlSerializers.dll and b/bin/x86/Release/XiboClient.XmlSerializers.dll differ diff --git a/bin/x86/Release/XiboClient.exe b/bin/x86/Release/XiboClient.exe index 18b3b0ba..cbe2cbeb 100644 Binary files a/bin/x86/Release/XiboClient.exe and b/bin/x86/Release/XiboClient.exe differ diff --git a/bin/x86/Release/XiboClient.pdb b/bin/x86/Release/XiboClient.pdb index 495d32b4..a1ff7af8 100644 Binary files a/bin/x86/Release/XiboClient.pdb and b/bin/x86/Release/XiboClient.pdb differ