Xibo

Merge lp:~dangarner/xibo/client-163 into lp:xibo/1.6

  1. client-163
  2. Merge into ponswinnecke
Proposed by Dan Garner
Status: Merged
Merged at revision: 347
Proposed branch: lp:~dangarner/xibo/client-163
Merge into: lp:xibo/1.6
Diff against target: 101 lines (+11/-8)
5 files modified
client/dotNET/DataSetView.cs (+3/-1)
client/dotNET/Properties/Settings.Designer.cs (+2/-2)
client/dotNET/Properties/Settings.settings (+2/-2)
client/dotNET/Rss.cs (+2/-1)
client/dotNET/app.config (+2/-2)
To merge this branch: bzr merge lp:~dangarner/xibo/client-163
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+231790@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/dotNET/DataSetView.cs'
2--- client/dotNET/DataSetView.cs 2013-11-09 12:14:38 +0000
3+++ client/dotNET/DataSetView.cs 2014-08-21 19:12:49 +0000
4@@ -40,6 +40,8 @@
5 private string _backgroundColor;
6 private string _backgroundTop;
7 private string _backgroundLeft;
8+
9+ private RegionOptions _options;
10
11 // File paths
12 private string _filePath;
13@@ -113,7 +115,7 @@
14 // It exists - therefore we want to get the last time it was updated
15 DateTime lastWriteDate = System.IO.File.GetLastWriteTime(filePath);
16
17- if (DateTime.Now.CompareTo(lastWriteDate.AddHours(_updateInterval * 1.0 / 60.0)) > 0)
18+ if (DateTime.Now.CompareTo(lastWriteDate.AddHours(_updateInterval * 1.0 / 60.0)) > 0 || _options.LayoutModifiedDate.CompareTo(lastWriteDate) > 0)
19 return false;
20 else
21 return true;
22
23=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
24--- client/dotNET/Properties/Settings.Designer.cs 2014-06-29 16:11:23 +0000
25+++ client/dotNET/Properties/Settings.Designer.cs 2014-08-21 19:12:49 +0000
26@@ -271,7 +271,7 @@
27
28 [global::System.Configuration.ApplicationScopedSettingAttribute()]
29 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
30- [global::System.Configuration.DefaultSettingValueAttribute("1.6.2")]
31+ [global::System.Configuration.DefaultSettingValueAttribute("1.6.3")]
32 public string ClientVersion {
33 get {
34 return ((string)(this["ClientVersion"]));
35@@ -535,7 +535,7 @@
36
37 [global::System.Configuration.ApplicationScopedSettingAttribute()]
38 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
39- [global::System.Configuration.DefaultSettingValueAttribute("84")]
40+ [global::System.Configuration.DefaultSettingValueAttribute("85")]
41 public int ClientCodeVersion {
42 get {
43 return ((int)(this["ClientCodeVersion"]));
44
45=== modified file 'client/dotNET/Properties/Settings.settings'
46--- client/dotNET/Properties/Settings.settings 2014-06-29 16:11:23 +0000
47+++ client/dotNET/Properties/Settings.settings 2014-08-21 19:12:49 +0000
48@@ -69,7 +69,7 @@
49 <Value Profile="(Default)">cacheManager.xml</Value>
50 </Setting>
51 <Setting Name="ClientVersion" Type="System.String" Scope="Application">
52- <Value Profile="(Default)">1.6.2</Value>
53+ <Value Profile="(Default)">1.6.3</Value>
54 </Setting>
55 <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
56 <Value Profile="(Default)">1</Value>
57@@ -138,7 +138,7 @@
58 <Value Profile="(Default)">Bottom Right</Value>
59 </Setting>
60 <Setting Name="ClientCodeVersion" Type="System.Int32" Scope="Application">
61- <Value Profile="(Default)">84</Value>
62+ <Value Profile="(Default)">85</Value>
63 </Setting>
64 <Setting Name="ClientInformationKeyCode" Type="System.String" Scope="User">
65 <Value Profile="(Default)">I</Value>
66
67=== modified file 'client/dotNET/Rss.cs'
68--- client/dotNET/Rss.cs 2014-02-09 14:58:41 +0000
69+++ client/dotNET/Rss.cs 2014-08-21 19:12:49 +0000
70@@ -614,7 +614,8 @@
71 // It exists - therefore we want to get the last time it was updated
72 DateTime lastWriteDate = System.IO.File.GetLastWriteTime(_filePath);
73
74- if (DateTime.Now.CompareTo(lastWriteDate.AddHours(_updateInterval * 1.0 / 60.0)) > 0)
75+ // Either the update interval has expired or the layout has been modified.
76+ if (DateTime.Now.CompareTo(lastWriteDate.AddHours(_updateInterval * 1.0 / 60.0)) > 0 || _options.LayoutModifiedDate.CompareTo(lastWriteDate) > 0)
77 return false;
78 else
79 return true;
80
81=== modified file 'client/dotNET/app.config'
82--- client/dotNET/app.config 2014-06-29 16:11:23 +0000
83+++ client/dotNET/app.config 2014-08-21 19:12:49 +0000
84@@ -144,7 +144,7 @@
85 <value>cacheManager.xml</value>
86 </setting>
87 <setting name="ClientVersion" serializeAs="String">
88- <value>1.6.2</value>
89+ <value>1.6.3</value>
90 </setting>
91 <setting name="xmdsResetTimeout" serializeAs="String">
92 <value>900</value>
93@@ -156,7 +156,7 @@
94 <value>True</value>
95 </setting>
96 <setting name="ClientCodeVersion" serializeAs="String">
97- <value>84</value>
98+ <value>85</value>
99 </setting>
100 </XiboClient.Properties.Settings>
101 </applicationSettings>

Subscribers

People subscribed via source and target branches

to all changes: