Xibo

Merge lp:~dangarner/xibo/client-170-beta into lp:xibo/1.7

  1. client-170-beta
  2. Merge into tuttle
Proposed by Dan Garner
Status: Merged
Approved by: Dan Garner
Approved revision: 353
Merged at revision: 350
Proposed branch: lp:~dangarner/xibo/client-170-beta
Merge into: lp:xibo/1.7
Diff against target: 1197 lines (+227/-192)
19 files modified
client/dotNET/Control/Region.cs (+8/-4)
client/dotNET/Forms/OptionForm.Designer.cs (+120/-65)
client/dotNET/Forms/OptionForm.cs (+1/-1)
client/dotNET/Forms/OptionForm.resx (+7/-7)
client/dotNET/Log/StatLog.cs (+1/-1)
client/dotNET/Log/XiboTraceListener.cs (+1/-1)
client/dotNET/Logic/ApplicationSettings.cs (+2/-2)
client/dotNET/Logic/ScreenShot.cs (+1/-1)
client/dotNET/Media/PowerPoint.cs (+0/-11)
client/dotNET/Media/Video.cs (+7/-0)
client/dotNET/Media/VideoPlayer.cs (+13/-0)
client/dotNET/Web References/xmds/Reference.cs (+57/-79)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+1/-12)
client/dotNET/XiboClient.csproj (+2/-2)
client/dotNET/XmdsAgents/FileAgent.cs (+2/-2)
client/dotNET/XmdsAgents/RegisterAgent.cs (+1/-1)
client/dotNET/XmdsAgents/RequiredFilesAgent.cs (+1/-1)
client/dotNET/XmdsAgents/ScheduleAgent.cs (+1/-1)
To merge this branch: bzr merge lp:~dangarner/xibo/client-170-beta
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+242897@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/Control/Region.cs'
2--- client/dotNET/Control/Region.cs 2014-09-01 13:33:50 +0000
3+++ client/dotNET/Control/Region.cs 2014-11-26 10:33:06 +0000
4@@ -147,7 +147,7 @@
5 // If the sequence hasnt been changed, OR the layout has been expired
6 // there has been no change to the sequence, therefore the media we have already created is still valid
7 // or this media has actually been destroyed and we are working out way out the call stack
8- if (_currentSequence == temp || _layoutExpired)
9+ if (_layoutExpired || (_currentSequence == temp))
10 return;
11
12 // Store the Current Index
13@@ -377,7 +377,10 @@
14 }
15 catch
16 {
17- System.Diagnostics.Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
18+ // Update interval not defined, so assume a high value
19+ _options.updateInterval = 3600;
20+
21+ Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
22 }
23 }
24
25@@ -489,8 +492,9 @@
26 }
27 }
28
29- // Sets up the timer for this media
30- media.Duration = options.duration;
31+ // Sets up the timer for this media, if it hasn't already been set
32+ if (media.Duration == 0)
33+ media.Duration = options.duration;
34
35 // Add event handler for when this completes
36 media.DurationElapsedEvent += new Media.DurationElapsedDelegate(media_DurationElapsedEvent);
37
38=== modified file 'client/dotNET/Forms/OptionForm.Designer.cs'
39--- client/dotNET/Forms/OptionForm.Designer.cs 2014-08-29 19:31:56 +0000
40+++ client/dotNET/Forms/OptionForm.Designer.cs 2014-11-26 10:33:06 +0000
41@@ -40,7 +40,6 @@
42 this.textBoxServerKey = new System.Windows.Forms.TextBox();
43 this.textBoxLibraryPath = new System.Windows.Forms.TextBox();
44 this.buttonDisplayAdmin = new System.Windows.Forms.Button();
45- this.groupBox2 = new System.Windows.Forms.GroupBox();
46 this.textBoxProxyDomain = new System.Windows.Forms.TextBox();
47 this.maskedTextBoxProxyPass = new System.Windows.Forms.MaskedTextBox();
48 this.textBoxProxyUser = new System.Windows.Forms.TextBox();
49@@ -64,15 +63,22 @@
50 this.xmds1 = new XiboClient.xmds.xmds();
51 this.buttonExit = new System.Windows.Forms.Button();
52 this.button1 = new System.Windows.Forms.Button();
53- this.groupBox2.SuspendLayout();
54+ this.tabControl1 = new System.Windows.Forms.TabControl();
55+ this.tabPage1 = new System.Windows.Forms.TabPage();
56+ this.tabPage2 = new System.Windows.Forms.TabPage();
57+ this.label4 = new System.Windows.Forms.Label();
58+ this.label5 = new System.Windows.Forms.Label();
59 this.menuStrip1.SuspendLayout();
60+ this.tabControl1.SuspendLayout();
61+ this.tabPage1.SuspendLayout();
62+ this.tabPage2.SuspendLayout();
63 this.SuspendLayout();
64 //
65 // label1
66 //
67 this.label1.AutoSize = true;
68 this.label1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
69- this.label1.Location = new System.Drawing.Point(11, 46);
70+ this.label1.Location = new System.Drawing.Point(99, 37);
71 this.label1.Name = "label1";
72 this.label1.Size = new System.Drawing.Size(128, 22);
73 this.label1.TabIndex = 1;
74@@ -82,7 +88,7 @@
75 //
76 this.label2.AutoSize = true;
77 this.label2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
78- this.label2.Location = new System.Drawing.Point(522, 46);
79+ this.label2.Location = new System.Drawing.Point(184, 87);
80 this.label2.Name = "label2";
81 this.label2.Size = new System.Drawing.Size(43, 22);
82 this.label2.TabIndex = 3;
83@@ -92,7 +98,7 @@
84 //
85 this.label3.AutoSize = true;
86 this.label3.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
87- this.label3.Location = new System.Drawing.Point(21, 92);
88+ this.label3.Location = new System.Drawing.Point(109, 141);
89 this.label3.Name = "label3";
90 this.label3.Size = new System.Drawing.Size(118, 22);
91 this.label3.TabIndex = 5;
92@@ -113,7 +119,7 @@
93 //
94 this.label9.AutoSize = true;
95 this.label9.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
96- this.label9.Location = new System.Drawing.Point(468, 92);
97+ this.label9.Location = new System.Drawing.Point(46, 174);
98 this.label9.Name = "label9";
99 this.label9.Size = new System.Drawing.Size(97, 22);
100 this.label9.TabIndex = 13;
101@@ -122,7 +128,7 @@
102 // buttonLibrary
103 //
104 this.buttonLibrary.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
105- this.buttonLibrary.Location = new System.Drawing.Point(353, 87);
106+ this.buttonLibrary.Location = new System.Drawing.Point(441, 136);
107 this.buttonLibrary.Name = "buttonLibrary";
108 this.buttonLibrary.Size = new System.Drawing.Size(109, 31);
109 this.buttonLibrary.TabIndex = 10;
110@@ -133,32 +139,32 @@
111 // tbHardwareKey
112 //
113 this.tbHardwareKey.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
114- this.tbHardwareKey.Location = new System.Drawing.Point(571, 89);
115+ this.tbHardwareKey.Location = new System.Drawing.Point(148, 171);
116 this.tbHardwareKey.Name = "tbHardwareKey";
117- this.tbHardwareKey.Size = new System.Drawing.Size(116, 29);
118+ this.tbHardwareKey.Size = new System.Drawing.Size(497, 29);
119 this.tbHardwareKey.TabIndex = 14;
120 //
121 // textBoxXmdsUri
122 //
123 this.textBoxXmdsUri.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
124- this.textBoxXmdsUri.Location = new System.Drawing.Point(145, 43);
125+ this.textBoxXmdsUri.Location = new System.Drawing.Point(233, 34);
126 this.textBoxXmdsUri.Name = "textBoxXmdsUri";
127- this.textBoxXmdsUri.Size = new System.Drawing.Size(371, 29);
128+ this.textBoxXmdsUri.Size = new System.Drawing.Size(317, 29);
129 this.textBoxXmdsUri.TabIndex = 0;
130 this.textBoxXmdsUri.Text = "http://localhost/xibo";
131 //
132 // textBoxServerKey
133 //
134 this.textBoxServerKey.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
135- this.textBoxServerKey.Location = new System.Drawing.Point(571, 43);
136+ this.textBoxServerKey.Location = new System.Drawing.Point(233, 84);
137 this.textBoxServerKey.Name = "textBoxServerKey";
138- this.textBoxServerKey.Size = new System.Drawing.Size(116, 29);
139+ this.textBoxServerKey.Size = new System.Drawing.Size(317, 29);
140 this.textBoxServerKey.TabIndex = 2;
141 //
142 // textBoxLibraryPath
143 //
144 this.textBoxLibraryPath.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
145- this.textBoxLibraryPath.Location = new System.Drawing.Point(145, 89);
146+ this.textBoxLibraryPath.Location = new System.Drawing.Point(233, 138);
147 this.textBoxLibraryPath.Name = "textBoxLibraryPath";
148 this.textBoxLibraryPath.Size = new System.Drawing.Size(202, 29);
149 this.textBoxLibraryPath.TabIndex = 4;
150@@ -175,52 +181,36 @@
151 this.buttonDisplayAdmin.UseVisualStyleBackColor = true;
152 this.buttonDisplayAdmin.Click += new System.EventHandler(this.buttonDisplayAdmin_Click);
153 //
154- // groupBox2
155- //
156- this.groupBox2.Controls.Add(this.textBoxProxyDomain);
157- this.groupBox2.Controls.Add(this.maskedTextBoxProxyPass);
158- this.groupBox2.Controls.Add(this.textBoxProxyUser);
159- this.groupBox2.Controls.Add(this.labelProxyDomain);
160- this.groupBox2.Controls.Add(this.labelProxyPass);
161- this.groupBox2.Controls.Add(this.labelProxyUser);
162- this.groupBox2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
163- this.groupBox2.Location = new System.Drawing.Point(12, 263);
164- this.groupBox2.Name = "groupBox2";
165- this.groupBox2.Size = new System.Drawing.Size(674, 150);
166- this.groupBox2.TabIndex = 7;
167- this.groupBox2.TabStop = false;
168- this.groupBox2.Text = "Proxy Information";
169- //
170 // textBoxProxyDomain
171 //
172 this.textBoxProxyDomain.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
173- this.textBoxProxyDomain.Location = new System.Drawing.Point(110, 95);
174+ this.textBoxProxyDomain.Location = new System.Drawing.Point(148, 120);
175 this.textBoxProxyDomain.Name = "textBoxProxyDomain";
176- this.textBoxProxyDomain.Size = new System.Drawing.Size(558, 29);
177+ this.textBoxProxyDomain.Size = new System.Drawing.Size(497, 29);
178 this.textBoxProxyDomain.TabIndex = 7;
179 //
180 // maskedTextBoxProxyPass
181 //
182 this.maskedTextBoxProxyPass.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
183- this.maskedTextBoxProxyPass.Location = new System.Drawing.Point(441, 37);
184+ this.maskedTextBoxProxyPass.Location = new System.Drawing.Point(148, 83);
185 this.maskedTextBoxProxyPass.Name = "maskedTextBoxProxyPass";
186- this.maskedTextBoxProxyPass.Size = new System.Drawing.Size(227, 29);
187+ this.maskedTextBoxProxyPass.Size = new System.Drawing.Size(497, 29);
188 this.maskedTextBoxProxyPass.TabIndex = 5;
189 this.maskedTextBoxProxyPass.UseSystemPasswordChar = true;
190 //
191 // textBoxProxyUser
192 //
193 this.textBoxProxyUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
194- this.textBoxProxyUser.Location = new System.Drawing.Point(110, 37);
195+ this.textBoxProxyUser.Location = new System.Drawing.Point(148, 49);
196 this.textBoxProxyUser.Name = "textBoxProxyUser";
197- this.textBoxProxyUser.Size = new System.Drawing.Size(225, 29);
198+ this.textBoxProxyUser.Size = new System.Drawing.Size(497, 29);
199 this.textBoxProxyUser.TabIndex = 3;
200 //
201 // labelProxyDomain
202 //
203 this.labelProxyDomain.AutoSize = true;
204 this.labelProxyDomain.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
205- this.labelProxyDomain.Location = new System.Drawing.Point(29, 95);
206+ this.labelProxyDomain.Location = new System.Drawing.Point(65, 123);
207 this.labelProxyDomain.Name = "labelProxyDomain";
208 this.labelProxyDomain.Size = new System.Drawing.Size(75, 22);
209 this.labelProxyDomain.TabIndex = 2;
210@@ -230,7 +220,7 @@
211 //
212 this.labelProxyPass.AutoSize = true;
213 this.labelProxyPass.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
214- this.labelProxyPass.Location = new System.Drawing.Point(341, 40);
215+ this.labelProxyPass.Location = new System.Drawing.Point(46, 86);
216 this.labelProxyPass.Name = "labelProxyPass";
217 this.labelProxyPass.Size = new System.Drawing.Size(94, 22);
218 this.labelProxyPass.TabIndex = 1;
219@@ -240,7 +230,7 @@
220 //
221 this.labelProxyUser.AutoSize = true;
222 this.labelProxyUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
223- this.labelProxyUser.Location = new System.Drawing.Point(7, 40);
224+ this.labelProxyUser.Location = new System.Drawing.Point(43, 52);
225 this.labelProxyUser.Name = "labelProxyUser";
226 this.labelProxyUser.Size = new System.Drawing.Size(97, 22);
227 this.labelProxyUser.TabIndex = 0;
228@@ -249,7 +239,7 @@
229 // splashButtonBrowse
230 //
231 this.splashButtonBrowse.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
232- this.splashButtonBrowse.Location = new System.Drawing.Point(353, 136);
233+ this.splashButtonBrowse.Location = new System.Drawing.Point(536, 211);
234 this.splashButtonBrowse.Name = "splashButtonBrowse";
235 this.splashButtonBrowse.Size = new System.Drawing.Size(109, 29);
236 this.splashButtonBrowse.TabIndex = 14;
237@@ -261,7 +251,7 @@
238 //
239 this.linkLabel1.AutoSize = true;
240 this.linkLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
241- this.linkLabel1.Location = new System.Drawing.Point(246, 226);
242+ this.linkLabel1.Location = new System.Drawing.Point(249, 283);
243 this.linkLabel1.Name = "linkLabel1";
244 this.linkLabel1.Size = new System.Drawing.Size(177, 18);
245 this.linkLabel1.TabIndex = 13;
246@@ -272,7 +262,7 @@
247 //
248 this.label17.AutoSize = true;
249 this.label17.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
250- this.label17.Location = new System.Drawing.Point(95, 195);
251+ this.label17.Location = new System.Drawing.Point(98, 252);
252 this.label17.Name = "label17";
253 this.label17.Size = new System.Drawing.Size(509, 18);
254 this.label17.TabIndex = 12;
255@@ -282,7 +272,7 @@
256 //
257 this.label16.AutoSize = true;
258 this.label16.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
259- this.label16.Location = new System.Drawing.Point(3, 139);
260+ this.label16.Location = new System.Drawing.Point(6, 214);
261 this.label16.Name = "label16";
262 this.label16.Size = new System.Drawing.Size(134, 22);
263 this.label16.TabIndex = 11;
264@@ -291,9 +281,9 @@
265 // splashOverride
266 //
267 this.splashOverride.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
268- this.splashOverride.Location = new System.Drawing.Point(145, 136);
269+ this.splashOverride.Location = new System.Drawing.Point(148, 211);
270 this.splashOverride.Name = "splashOverride";
271- this.splashOverride.Size = new System.Drawing.Size(202, 29);
272+ this.splashOverride.Size = new System.Drawing.Size(382, 29);
273 this.splashOverride.TabIndex = 10;
274 //
275 // menuStrip1
276@@ -355,10 +345,10 @@
277 this.tbStatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
278 this.tbStatus.Cursor = System.Windows.Forms.Cursors.Default;
279 this.tbStatus.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
280- this.tbStatus.Location = new System.Drawing.Point(12, 431);
281+ this.tbStatus.Location = new System.Drawing.Point(12, 391);
282 this.tbStatus.Multiline = true;
283 this.tbStatus.Name = "tbStatus";
284- this.tbStatus.Size = new System.Drawing.Size(674, 60);
285+ this.tbStatus.Size = new System.Drawing.Size(674, 100);
286 this.tbStatus.TabIndex = 15;
287 //
288 // xmds1
289@@ -389,40 +379,101 @@
290 this.button1.UseVisualStyleBackColor = true;
291 this.button1.Click += new System.EventHandler(this.button1_Click);
292 //
293+ // tabControl1
294+ //
295+ this.tabControl1.Controls.Add(this.tabPage1);
296+ this.tabControl1.Controls.Add(this.tabPage2);
297+ this.tabControl1.Location = new System.Drawing.Point(12, 40);
298+ this.tabControl1.Name = "tabControl1";
299+ this.tabControl1.SelectedIndex = 0;
300+ this.tabControl1.Size = new System.Drawing.Size(675, 345);
301+ this.tabControl1.TabIndex = 18;
302+ //
303+ // tabPage1
304+ //
305+ this.tabPage1.Controls.Add(this.label5);
306+ this.tabPage1.Controls.Add(this.label1);
307+ this.tabPage1.Controls.Add(this.textBoxLibraryPath);
308+ this.tabPage1.Controls.Add(this.textBoxServerKey);
309+ this.tabPage1.Controls.Add(this.label3);
310+ this.tabPage1.Controls.Add(this.label2);
311+ this.tabPage1.Controls.Add(this.textBoxXmdsUri);
312+ this.tabPage1.Controls.Add(this.buttonLibrary);
313+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
314+ this.tabPage1.Name = "tabPage1";
315+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
316+ this.tabPage1.Size = new System.Drawing.Size(667, 319);
317+ this.tabPage1.TabIndex = 0;
318+ this.tabPage1.Text = "Connect";
319+ this.tabPage1.UseVisualStyleBackColor = true;
320+ //
321+ // tabPage2
322+ //
323+ this.tabPage2.Controls.Add(this.label4);
324+ this.tabPage2.Controls.Add(this.textBoxProxyDomain);
325+ this.tabPage2.Controls.Add(this.labelProxyUser);
326+ this.tabPage2.Controls.Add(this.labelProxyDomain);
327+ this.tabPage2.Controls.Add(this.maskedTextBoxProxyPass);
328+ this.tabPage2.Controls.Add(this.splashButtonBrowse);
329+ this.tabPage2.Controls.Add(this.textBoxProxyUser);
330+ this.tabPage2.Controls.Add(this.label9);
331+ this.tabPage2.Controls.Add(this.tbHardwareKey);
332+ this.tabPage2.Controls.Add(this.labelProxyPass);
333+ this.tabPage2.Controls.Add(this.linkLabel1);
334+ this.tabPage2.Controls.Add(this.label16);
335+ this.tabPage2.Controls.Add(this.label17);
336+ this.tabPage2.Controls.Add(this.splashOverride);
337+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
338+ this.tabPage2.Name = "tabPage2";
339+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
340+ this.tabPage2.Size = new System.Drawing.Size(667, 319);
341+ this.tabPage2.TabIndex = 1;
342+ this.tabPage2.Text = "Advanced";
343+ this.tabPage2.UseVisualStyleBackColor = true;
344+ //
345+ // label4
346+ //
347+ this.label4.AutoSize = true;
348+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
349+ this.label4.Location = new System.Drawing.Point(144, 13);
350+ this.label4.Name = "label4";
351+ this.label4.Size = new System.Drawing.Size(215, 24);
352+ this.label4.TabIndex = 15;
353+ this.label4.Text = "Proxy Server Information";
354+ //
355+ // label5
356+ //
357+ this.label5.AutoSize = true;
358+ this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
359+ this.label5.Location = new System.Drawing.Point(33, 231);
360+ this.label5.Name = "label5";
361+ this.label5.Size = new System.Drawing.Size(604, 24);
362+ this.label5.TabIndex = 15;
363+ this.label5.Text = "Enter the CMS Address, Key and Local Library Location and click Save.";
364+ //
365 // OptionForm
366 //
367 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
368 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
369 this.ClientSize = new System.Drawing.Size(698, 561);
370+ this.Controls.Add(this.tabControl1);
371 this.Controls.Add(this.button1);
372 this.Controls.Add(this.buttonExit);
373 this.Controls.Add(this.tbStatus);
374- this.Controls.Add(this.splashButtonBrowse);
375 this.Controls.Add(this.buttonDisplayAdmin);
376- this.Controls.Add(this.linkLabel1);
377- this.Controls.Add(this.groupBox2);
378- this.Controls.Add(this.label17);
379 this.Controls.Add(this.menuStrip1);
380- this.Controls.Add(this.label16);
381- this.Controls.Add(this.splashOverride);
382- this.Controls.Add(this.label9);
383 this.Controls.Add(this.buttonSaveSettings);
384- this.Controls.Add(this.tbHardwareKey);
385- this.Controls.Add(this.buttonLibrary);
386- this.Controls.Add(this.label1);
387- this.Controls.Add(this.textBoxXmdsUri);
388- this.Controls.Add(this.label2);
389- this.Controls.Add(this.label3);
390- this.Controls.Add(this.textBoxServerKey);
391- this.Controls.Add(this.textBoxLibraryPath);
392 this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
393 this.MainMenuStrip = this.menuStrip1;
394 this.Name = "OptionForm";
395 this.Text = "Xibo Client Options";
396- this.groupBox2.ResumeLayout(false);
397- this.groupBox2.PerformLayout();
398 this.menuStrip1.ResumeLayout(false);
399 this.menuStrip1.PerformLayout();
400+ this.tabControl1.ResumeLayout(false);
401+ this.tabPage1.ResumeLayout(false);
402+ this.tabPage1.PerformLayout();
403+ this.tabPage2.ResumeLayout(false);
404+ this.tabPage2.PerformLayout();
405 this.ResumeLayout(false);
406 this.PerformLayout();
407
408@@ -447,7 +498,6 @@
409 private System.Windows.Forms.Button buttonLibrary;
410 private System.Windows.Forms.ToolStripMenuItem onlineHelpToolStripMenuItem;
411 private System.Windows.Forms.Button buttonDisplayAdmin;
412- private System.Windows.Forms.GroupBox groupBox2;
413 private System.Windows.Forms.MaskedTextBox maskedTextBoxProxyPass;
414 private System.Windows.Forms.TextBox textBoxProxyUser;
415 private System.Windows.Forms.Label labelProxyDomain;
416@@ -465,5 +515,10 @@
417 private System.Windows.Forms.TextBox tbStatus;
418 private System.Windows.Forms.Button buttonExit;
419 private System.Windows.Forms.Button button1;
420+ private System.Windows.Forms.TabControl tabControl1;
421+ private System.Windows.Forms.TabPage tabPage1;
422+ private System.Windows.Forms.Label label5;
423+ private System.Windows.Forms.TabPage tabPage2;
424+ private System.Windows.Forms.Label label4;
425 }
426 }
427\ No newline at end of file
428
429=== modified file 'client/dotNET/Forms/OptionForm.cs'
430--- client/dotNET/Forms/OptionForm.cs 2014-10-21 12:35:07 +0000
431+++ client/dotNET/Forms/OptionForm.cs 2014-11-26 10:33:06 +0000
432@@ -123,7 +123,7 @@
433 tbStatus.AppendText("Saving with CMS... Please wait...");
434
435 // Make sure our XMDS location is correct
436- ApplicationSettings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php";
437+ ApplicationSettings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php?v=" + ApplicationSettings.Default.Version;
438
439 // Simple settings
440 ApplicationSettings.Default.ServerKey = textBoxServerKey.Text;
441
442=== modified file 'client/dotNET/Forms/OptionForm.resx'
443--- client/dotNET/Forms/OptionForm.resx 2014-08-29 19:31:56 +0000
444+++ client/dotNET/Forms/OptionForm.resx 2014-11-26 10:33:06 +0000
445@@ -112,24 +112,24 @@
446 <value>2.0</value>
447 </resheader>
448 <resheader name="reader">
449- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
450+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
451 </resheader>
452 <resheader name="writer">
453- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
454+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
455 </resheader>
456- <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
457+ <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
458 <value>101, 17</value>
459 </metadata>
460- <metadata name="folderBrowserLibrary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
461+ <metadata name="folderBrowserLibrary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
462 <value>210, 17</value>
463 </metadata>
464- <metadata name="splashScreenOverride.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
465+ <metadata name="splashScreenOverride.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
466 <value>374, 17</value>
467 </metadata>
468- <metadata name="xmds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
469+ <metadata name="xmds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
470 <value>17, 17</value>
471 </metadata>
472- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
473+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
474 <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
475 <value>
476 AAABAAkAICAQAAEABADoAgAAlgAAABAQEAABAAQAKAEAAH4DAAAwMAAAAQAIAKgOAACmBAAAICAAAAEA
477
478=== modified file 'client/dotNET/Log/StatLog.cs'
479--- client/dotNET/Log/StatLog.cs 2014-10-10 13:15:40 +0000
480+++ client/dotNET/Log/StatLog.cs 2014-11-26 10:33:06 +0000
481@@ -228,7 +228,7 @@
482
483 try
484 {
485- logtoXmds.SubmitStats(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
486+ logtoXmds.SubmitStats(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
487
488 // Delete the file we are on
489 File.Delete(fileName);
490
491=== modified file 'client/dotNET/Log/XiboTraceListener.cs'
492--- client/dotNET/Log/XiboTraceListener.cs 2014-09-16 16:40:30 +0000
493+++ client/dotNET/Log/XiboTraceListener.cs 2014-11-26 10:33:06 +0000
494@@ -166,7 +166,7 @@
495
496 try
497 {
498- logtoXmds.SubmitLog(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
499+ logtoXmds.SubmitLog(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
500
501 // Delete the file we are on
502 File.Delete(fileName);
503
504=== modified file 'client/dotNET/Logic/ApplicationSettings.cs'
505--- client/dotNET/Logic/ApplicationSettings.cs 2014-10-21 12:14:16 +0000
506+++ client/dotNET/Logic/ApplicationSettings.cs 2014-11-26 10:33:06 +0000
507@@ -36,9 +36,9 @@
508 private static string _default = "default";
509
510 // Application Specific Settings we want to protect
511- private string _clientVersion = "1.7.0-alpha2";
512+ private string _clientVersion = "1.7.0-beta";
513 private string _version = "4";
514- private int _clientCodeVersion = 101;
515+ private int _clientCodeVersion = 102;
516
517 public string ClientVersion { get { return _clientVersion; } }
518 public string Version { get { return _version; } }
519
520=== modified file 'client/dotNET/Logic/ScreenShot.cs'
521--- client/dotNET/Logic/ScreenShot.cs 2014-10-10 12:20:47 +0000
522+++ client/dotNET/Logic/ScreenShot.cs 2014-11-26 10:33:06 +0000
523@@ -32,7 +32,7 @@
524 {
525 screenShotXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
526 screenShotXmds.SubmitScreenShotCompleted += screenShotXmds_SubmitScreenShotCompleted;
527- screenShotXmds.SubmitScreenShotAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, bytes);
528+ screenShotXmds.SubmitScreenShotAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, bytes);
529 }
530 }
531 }
532
533=== modified file 'client/dotNET/Media/PowerPoint.cs'
534--- client/dotNET/Media/PowerPoint.cs 2014-09-01 13:33:50 +0000
535+++ client/dotNET/Media/PowerPoint.cs 2014-11-26 10:33:06 +0000
536@@ -53,11 +53,6 @@
537 webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
538 webBrowser.Visible = false;
539
540- // Offset?
541- double offsetTop = Convert.ToDouble(options.Dictionary.Get("offsetTop", "0"));
542- double offsetLeft = Convert.ToDouble(options.Dictionary.Get("offsetLeft", "0"));
543- double scaling = Convert.ToDouble(options.Dictionary.Get("scaling", "100"));
544-
545 if (!ApplicationSettings.Default.PowerpointEnabled)
546 {
547 webBrowser.DocumentText = "<html><body><h1>Powerpoint not enabled on this display</h1></body></html>";
548@@ -92,12 +87,6 @@
549 Show();
550 }
551
552- public override void RenderMedia()
553- {
554- // do nothing
555- return;
556- }
557-
558 void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
559 {
560 // Get ready to show the control
561
562=== modified file 'client/dotNET/Media/Video.cs'
563--- client/dotNET/Media/Video.cs 2014-08-29 19:31:56 +0000
564+++ client/dotNET/Media/Video.cs 2014-11-26 10:33:06 +0000
565@@ -53,6 +53,13 @@
566 _videoPlayer.Height = options.height;
567 _videoPlayer.Location = new System.Drawing.Point(0, 0);
568
569+ // Should we loop?
570+ if (options.Dictionary.Get("loop", "0") == "1" && _duration == 0)
571+ _videoPlayer.SetLooping(true);
572+
573+ // Should we mute?
574+ _videoPlayer.SetMute((options.Dictionary.Get("mute", "0") == "1"));
575+
576 // Capture any video errors
577 _videoPlayer.VideoError += new VideoPlayer.VideoErrored(_videoPlayer_VideoError);
578
579
580=== modified file 'client/dotNET/Media/VideoPlayer.cs'
581--- client/dotNET/Media/VideoPlayer.cs 2014-08-29 19:31:56 +0000
582+++ client/dotNET/Media/VideoPlayer.cs 2014-11-26 10:33:06 +0000
583@@ -65,6 +65,19 @@
584 axWindowsMediaPlayer1.ErrorEvent += new EventHandler(axWindowsMediaPlayer1_ErrorEvent);
585 }
586
587+ public void SetLooping(bool looping)
588+ {
589+ axWindowsMediaPlayer1.settings.setMode("loop", looping);
590+ }
591+
592+ public void SetMute(bool mute)
593+ {
594+ if (mute)
595+ axWindowsMediaPlayer1.settings.mute = true;
596+ else
597+ axWindowsMediaPlayer1.settings.volume = 100;
598+ }
599+
600 void axWindowsMediaPlayer1_ErrorEvent(object sender, EventArgs e)
601 {
602 // Get the error for logging
603
604=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
605--- client/dotNET/Web References/xmds/Reference.cs 2014-10-21 12:35:07 +0000
606+++ client/dotNET/Web References/xmds/Reference.cs 2014-11-26 10:33:06 +0000
607@@ -55,7 +55,7 @@
608
609 /// <remarks/>
610 public xmds() {
611- this.Url = "http://172.28.128.3/xmds.php";
612+ this.Url = "http://172.28.128.3/xmds.php?v=4";
613 if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
614 this.UseDefaultCredentials = true;
615 this.useDefaultCredentialsSetExplicitly = false;
616@@ -125,7 +125,7 @@
617 /// <remarks/>
618 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
619 [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
620- public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
621+ public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress) {
622 object[] results = this.Invoke("RegisterDisplay", new object[] {
623 serverKey,
624 hardwareKey,
625@@ -134,18 +134,17 @@
626 clientVersion,
627 clientCode,
628 operatingSystem,
629- macAddress,
630- version});
631+ macAddress});
632 return ((string)(results[0]));
633 }
634
635 /// <remarks/>
636- public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
637- this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, operatingSystem, macAddress, version, null);
638+ public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress) {
639+ this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, operatingSystem, macAddress, null);
640 }
641
642 /// <remarks/>
643- public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version, object userState) {
644+ public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, object userState) {
645 if ((this.RegisterDisplayOperationCompleted == null)) {
646 this.RegisterDisplayOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRegisterDisplayOperationCompleted);
647 }
648@@ -157,8 +156,7 @@
649 clientVersion,
650 clientCode,
651 operatingSystem,
652- macAddress,
653- version}, this.RegisterDisplayOperationCompleted, userState);
654+ macAddress}, this.RegisterDisplayOperationCompleted, userState);
655 }
656
657 private void OnRegisterDisplayOperationCompleted(object arg) {
658@@ -171,28 +169,26 @@
659 /// <remarks/>
660 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RequiredFiles", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
661 [return: System.Xml.Serialization.SoapElementAttribute("RequiredFilesXml")]
662- public string RequiredFiles(string serverKey, string hardwareKey, string version) {
663+ public string RequiredFiles(string serverKey, string hardwareKey) {
664 object[] results = this.Invoke("RequiredFiles", new object[] {
665 serverKey,
666- hardwareKey,
667- version});
668+ hardwareKey});
669 return ((string)(results[0]));
670 }
671
672 /// <remarks/>
673- public void RequiredFilesAsync(string serverKey, string hardwareKey, string version) {
674- this.RequiredFilesAsync(serverKey, hardwareKey, version, null);
675+ public void RequiredFilesAsync(string serverKey, string hardwareKey) {
676+ this.RequiredFilesAsync(serverKey, hardwareKey, null);
677 }
678
679 /// <remarks/>
680- public void RequiredFilesAsync(string serverKey, string hardwareKey, string version, object userState) {
681+ public void RequiredFilesAsync(string serverKey, string hardwareKey, object userState) {
682 if ((this.RequiredFilesOperationCompleted == null)) {
683 this.RequiredFilesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRequiredFilesOperationCompleted);
684 }
685 this.InvokeAsync("RequiredFiles", new object[] {
686 serverKey,
687- hardwareKey,
688- version}, this.RequiredFilesOperationCompleted, userState);
689+ hardwareKey}, this.RequiredFilesOperationCompleted, userState);
690 }
691
692 private void OnRequiredFilesOperationCompleted(object arg) {
693@@ -205,25 +201,24 @@
694 /// <remarks/>
695 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#GetFile", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
696 [return: System.Xml.Serialization.SoapElementAttribute("file", DataType="base64Binary")]
697- public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
698+ public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize) {
699 object[] results = this.Invoke("GetFile", new object[] {
700 serverKey,
701 hardwareKey,
702 fileId,
703 fileType,
704 chunkOffset,
705- chuckSize,
706- version});
707+ chuckSize});
708 return ((byte[])(results[0]));
709 }
710
711 /// <remarks/>
712- public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
713- this.GetFileAsync(serverKey, hardwareKey, fileId, fileType, chunkOffset, chuckSize, version, null);
714+ public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize) {
715+ this.GetFileAsync(serverKey, hardwareKey, fileId, fileType, chunkOffset, chuckSize, null);
716 }
717
718 /// <remarks/>
719- public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version, object userState) {
720+ public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, object userState) {
721 if ((this.GetFileOperationCompleted == null)) {
722 this.GetFileOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFileOperationCompleted);
723 }
724@@ -233,8 +228,7 @@
725 fileId,
726 fileType,
727 chunkOffset,
728- chuckSize,
729- version}, this.GetFileOperationCompleted, userState);
730+ chuckSize}, this.GetFileOperationCompleted, userState);
731 }
732
733 private void OnGetFileOperationCompleted(object arg) {
734@@ -247,28 +241,26 @@
735 /// <remarks/>
736 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#Schedule", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
737 [return: System.Xml.Serialization.SoapElementAttribute("ScheduleXml")]
738- public string Schedule(string serverKey, string hardwareKey, string version) {
739+ public string Schedule(string serverKey, string hardwareKey) {
740 object[] results = this.Invoke("Schedule", new object[] {
741 serverKey,
742- hardwareKey,
743- version});
744+ hardwareKey});
745 return ((string)(results[0]));
746 }
747
748 /// <remarks/>
749- public void ScheduleAsync(string serverKey, string hardwareKey, string version) {
750- this.ScheduleAsync(serverKey, hardwareKey, version, null);
751+ public void ScheduleAsync(string serverKey, string hardwareKey) {
752+ this.ScheduleAsync(serverKey, hardwareKey, null);
753 }
754
755 /// <remarks/>
756- public void ScheduleAsync(string serverKey, string hardwareKey, string version, object userState) {
757+ public void ScheduleAsync(string serverKey, string hardwareKey, object userState) {
758 if ((this.ScheduleOperationCompleted == null)) {
759 this.ScheduleOperationCompleted = new System.Threading.SendOrPostCallback(this.OnScheduleOperationCompleted);
760 }
761 this.InvokeAsync("Schedule", new object[] {
762 serverKey,
763- hardwareKey,
764- version}, this.ScheduleOperationCompleted, userState);
765+ hardwareKey}, this.ScheduleOperationCompleted, userState);
766 }
767
768 private void OnScheduleOperationCompleted(object arg) {
769@@ -281,24 +273,23 @@
770 /// <remarks/>
771 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#BlackList", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
772 [return: System.Xml.Serialization.SoapElementAttribute("success")]
773- public bool BlackList(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version) {
774+ public bool BlackList(string serverKey, string hardwareKey, int mediaId, string type, string reason) {
775 object[] results = this.Invoke("BlackList", new object[] {
776 serverKey,
777 hardwareKey,
778 mediaId,
779 type,
780- reason,
781- version});
782+ reason});
783 return ((bool)(results[0]));
784 }
785
786 /// <remarks/>
787- public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version) {
788- this.BlackListAsync(serverKey, hardwareKey, mediaId, type, reason, version, null);
789+ public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason) {
790+ this.BlackListAsync(serverKey, hardwareKey, mediaId, type, reason, null);
791 }
792
793 /// <remarks/>
794- public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version, object userState) {
795+ public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, object userState) {
796 if ((this.BlackListOperationCompleted == null)) {
797 this.BlackListOperationCompleted = new System.Threading.SendOrPostCallback(this.OnBlackListOperationCompleted);
798 }
799@@ -307,8 +298,7 @@
800 hardwareKey,
801 mediaId,
802 type,
803- reason,
804- version}, this.BlackListOperationCompleted, userState);
805+ reason}, this.BlackListOperationCompleted, userState);
806 }
807
808 private void OnBlackListOperationCompleted(object arg) {
809@@ -321,9 +311,8 @@
810 /// <remarks/>
811 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
812 [return: System.Xml.Serialization.SoapElementAttribute("success")]
813- public bool SubmitLog(string version, string serverKey, string hardwareKey, string logXml) {
814+ public bool SubmitLog(string serverKey, string hardwareKey, string logXml) {
815 object[] results = this.Invoke("SubmitLog", new object[] {
816- version,
817 serverKey,
818 hardwareKey,
819 logXml});
820@@ -331,17 +320,16 @@
821 }
822
823 /// <remarks/>
824- public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml) {
825- this.SubmitLogAsync(version, serverKey, hardwareKey, logXml, null);
826+ public void SubmitLogAsync(string serverKey, string hardwareKey, string logXml) {
827+ this.SubmitLogAsync(serverKey, hardwareKey, logXml, null);
828 }
829
830 /// <remarks/>
831- public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml, object userState) {
832+ public void SubmitLogAsync(string serverKey, string hardwareKey, string logXml, object userState) {
833 if ((this.SubmitLogOperationCompleted == null)) {
834 this.SubmitLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitLogOperationCompleted);
835 }
836 this.InvokeAsync("SubmitLog", new object[] {
837- version,
838 serverKey,
839 hardwareKey,
840 logXml}, this.SubmitLogOperationCompleted, userState);
841@@ -357,9 +345,8 @@
842 /// <remarks/>
843 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
844 [return: System.Xml.Serialization.SoapElementAttribute("success")]
845- public bool SubmitStats(string version, string serverKey, string hardwareKey, string statXml) {
846+ public bool SubmitStats(string serverKey, string hardwareKey, string statXml) {
847 object[] results = this.Invoke("SubmitStats", new object[] {
848- version,
849 serverKey,
850 hardwareKey,
851 statXml});
852@@ -367,17 +354,16 @@
853 }
854
855 /// <remarks/>
856- public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml) {
857- this.SubmitStatsAsync(version, serverKey, hardwareKey, statXml, null);
858+ public void SubmitStatsAsync(string serverKey, string hardwareKey, string statXml) {
859+ this.SubmitStatsAsync(serverKey, hardwareKey, statXml, null);
860 }
861
862 /// <remarks/>
863- public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml, object userState) {
864+ public void SubmitStatsAsync(string serverKey, string hardwareKey, string statXml, object userState) {
865 if ((this.SubmitStatsOperationCompleted == null)) {
866 this.SubmitStatsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitStatsOperationCompleted);
867 }
868 this.InvokeAsync("SubmitStats", new object[] {
869- version,
870 serverKey,
871 hardwareKey,
872 statXml}, this.SubmitStatsOperationCompleted, userState);
873@@ -393,9 +379,8 @@
874 /// <remarks/>
875 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#MediaInventory", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
876 [return: System.Xml.Serialization.SoapElementAttribute("success")]
877- public bool MediaInventory(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
878+ public bool MediaInventory(string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
879 object[] results = this.Invoke("MediaInventory", new object[] {
880- version,
881 serverKey,
882 hardwareKey,
883 mediaInventory1});
884@@ -403,17 +388,16 @@
885 }
886
887 /// <remarks/>
888- public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1) {
889- this.MediaInventoryAsync(version, serverKey, hardwareKey, mediaInventory1, null);
890+ public void MediaInventoryAsync(string serverKey, string hardwareKey, string mediaInventory1) {
891+ this.MediaInventoryAsync(serverKey, hardwareKey, mediaInventory1, null);
892 }
893
894 /// <remarks/>
895- public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1, object userState) {
896+ public void MediaInventoryAsync(string serverKey, string hardwareKey, string mediaInventory1, object userState) {
897 if ((this.MediaInventoryOperationCompleted == null)) {
898 this.MediaInventoryOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMediaInventoryOperationCompleted);
899 }
900 this.InvokeAsync("MediaInventory", new object[] {
901- version,
902 serverKey,
903 hardwareKey,
904 mediaInventory1}, this.MediaInventoryOperationCompleted, userState);
905@@ -429,24 +413,23 @@
906 /// <remarks/>
907 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#GetResource", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
908 [return: System.Xml.Serialization.SoapElementAttribute("resource")]
909- public string GetResource(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version) {
910+ public string GetResource(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId) {
911 object[] results = this.Invoke("GetResource", new object[] {
912 serverKey,
913 hardwareKey,
914 layoutId,
915 regionId,
916- mediaId,
917- version});
918+ mediaId});
919 return ((string)(results[0]));
920 }
921
922 /// <remarks/>
923- public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version) {
924- this.GetResourceAsync(serverKey, hardwareKey, layoutId, regionId, mediaId, version, null);
925+ public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId) {
926+ this.GetResourceAsync(serverKey, hardwareKey, layoutId, regionId, mediaId, null);
927 }
928
929 /// <remarks/>
930- public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version, object userState) {
931+ public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, object userState) {
932 if ((this.GetResourceOperationCompleted == null)) {
933 this.GetResourceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetResourceOperationCompleted);
934 }
935@@ -455,8 +438,7 @@
936 hardwareKey,
937 layoutId,
938 regionId,
939- mediaId,
940- version}, this.GetResourceOperationCompleted, userState);
941+ mediaId}, this.GetResourceOperationCompleted, userState);
942 }
943
944 private void OnGetResourceOperationCompleted(object arg) {
945@@ -469,9 +451,8 @@
946 /// <remarks/>
947 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#NotifyStatus", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
948 [return: System.Xml.Serialization.SoapElementAttribute("success")]
949- public bool NotifyStatus(string version, string serverKey, string hardwareKey, string status) {
950+ public bool NotifyStatus(string serverKey, string hardwareKey, string status) {
951 object[] results = this.Invoke("NotifyStatus", new object[] {
952- version,
953 serverKey,
954 hardwareKey,
955 status});
956@@ -479,17 +460,16 @@
957 }
958
959 /// <remarks/>
960- public void NotifyStatusAsync(string version, string serverKey, string hardwareKey, string status) {
961- this.NotifyStatusAsync(version, serverKey, hardwareKey, status, null);
962+ public void NotifyStatusAsync(string serverKey, string hardwareKey, string status) {
963+ this.NotifyStatusAsync(serverKey, hardwareKey, status, null);
964 }
965
966 /// <remarks/>
967- public void NotifyStatusAsync(string version, string serverKey, string hardwareKey, string status, object userState) {
968+ public void NotifyStatusAsync(string serverKey, string hardwareKey, string status, object userState) {
969 if ((this.NotifyStatusOperationCompleted == null)) {
970 this.NotifyStatusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNotifyStatusOperationCompleted);
971 }
972 this.InvokeAsync("NotifyStatus", new object[] {
973- version,
974 serverKey,
975 hardwareKey,
976 status}, this.NotifyStatusOperationCompleted, userState);
977@@ -505,9 +485,8 @@
978 /// <remarks/>
979 [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitScreenShot", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
980 [return: System.Xml.Serialization.SoapElementAttribute("success")]
981- public bool SubmitScreenShot(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute(DataType="base64Binary")] byte[] screenShot) {
982+ public bool SubmitScreenShot(string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute(DataType="base64Binary")] byte[] screenShot) {
983 object[] results = this.Invoke("SubmitScreenShot", new object[] {
984- version,
985 serverKey,
986 hardwareKey,
987 screenShot});
988@@ -515,17 +494,16 @@
989 }
990
991 /// <remarks/>
992- public void SubmitScreenShotAsync(string version, string serverKey, string hardwareKey, byte[] screenShot) {
993- this.SubmitScreenShotAsync(version, serverKey, hardwareKey, screenShot, null);
994+ public void SubmitScreenShotAsync(string serverKey, string hardwareKey, byte[] screenShot) {
995+ this.SubmitScreenShotAsync(serverKey, hardwareKey, screenShot, null);
996 }
997
998 /// <remarks/>
999- public void SubmitScreenShotAsync(string version, string serverKey, string hardwareKey, byte[] screenShot, object userState) {
1000+ public void SubmitScreenShotAsync(string serverKey, string hardwareKey, byte[] screenShot, object userState) {
1001 if ((this.SubmitScreenShotOperationCompleted == null)) {
1002 this.SubmitScreenShotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitScreenShotOperationCompleted);
1003 }
1004 this.InvokeAsync("SubmitScreenShot", new object[] {
1005- version,
1006 serverKey,
1007 hardwareKey,
1008 screenShot}, this.SubmitScreenShotOperationCompleted, userState);
1009
1010=== modified file 'client/dotNET/Web References/xmds/Reference.map'
1011--- client/dotNET/Web References/xmds/Reference.map 2014-10-14 16:39:35 +0000
1012+++ client/dotNET/Web References/xmds/Reference.map 2014-11-26 10:33:06 +0000
1013@@ -1,6 +1,6 @@
1014 <?xml version="1.0" encoding="utf-8"?>
1015 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
1016 <Results>
1017- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.3/xmds.php?WSDL" filename="xmds.wsdl" />
1018+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.3/xmds.php?v=4&amp;WSDL" filename="xmds.wsdl" />
1019 </Results>
1020 </DiscoveryClientResultsFile>
1021\ No newline at end of file
1022
1023=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
1024--- client/dotNET/Web References/xmds/xmds.wsdl 2014-10-21 12:35:07 +0000
1025+++ client/dotNET/Web References/xmds/xmds.wsdl 2014-11-26 10:33:06 +0000
1026@@ -15,7 +15,6 @@
1027 <wsdl:part name="clientCode" type="xsd:int" />
1028 <wsdl:part name="operatingSystem" type="xsd:string" />
1029 <wsdl:part name="macAddress" type="xsd:string" />
1030- <wsdl:part name="version" type="xsd:string" />
1031 </wsdl:message>
1032 <wsdl:message name="RegisterDisplayResponse">
1033 <wsdl:part name="ActivationMessage" type="xsd:string" />
1034@@ -23,7 +22,6 @@
1035 <wsdl:message name="RequiredFilesRequest">
1036 <wsdl:part name="serverKey" type="xsd:string" />
1037 <wsdl:part name="hardwareKey" type="xsd:string" />
1038- <wsdl:part name="version" type="xsd:string" />
1039 </wsdl:message>
1040 <wsdl:message name="RequiredFilesResponse">
1041 <wsdl:part name="RequiredFilesXml" type="xsd:string" />
1042@@ -35,7 +33,6 @@
1043 <wsdl:part name="fileType" type="xsd:string" />
1044 <wsdl:part name="chunkOffset" type="xsd:double" />
1045 <wsdl:part name="chuckSize" type="xsd:double" />
1046- <wsdl:part name="version" type="xsd:string" />
1047 </wsdl:message>
1048 <wsdl:message name="GetFileResponse">
1049 <wsdl:part name="file" type="xsd:base64Binary" />
1050@@ -43,7 +40,6 @@
1051 <wsdl:message name="ScheduleRequest">
1052 <wsdl:part name="serverKey" type="xsd:string" />
1053 <wsdl:part name="hardwareKey" type="xsd:string" />
1054- <wsdl:part name="version" type="xsd:string" />
1055 </wsdl:message>
1056 <wsdl:message name="ScheduleResponse">
1057 <wsdl:part name="ScheduleXml" type="xsd:string" />
1058@@ -54,13 +50,11 @@
1059 <wsdl:part name="mediaId" type="xsd:int" />
1060 <wsdl:part name="type" type="xsd:string" />
1061 <wsdl:part name="reason" type="xsd:string" />
1062- <wsdl:part name="version" type="xsd:string" />
1063 </wsdl:message>
1064 <wsdl:message name="BlackListResponse">
1065 <wsdl:part name="success" type="xsd:boolean" />
1066 </wsdl:message>
1067 <wsdl:message name="SubmitLogRequest">
1068- <wsdl:part name="version" type="xsd:string" />
1069 <wsdl:part name="serverKey" type="xsd:string" />
1070 <wsdl:part name="hardwareKey" type="xsd:string" />
1071 <wsdl:part name="logXml" type="xsd:string" />
1072@@ -69,7 +63,6 @@
1073 <wsdl:part name="success" type="xsd:boolean" />
1074 </wsdl:message>
1075 <wsdl:message name="SubmitStatsRequest">
1076- <wsdl:part name="version" type="xsd:string" />
1077 <wsdl:part name="serverKey" type="xsd:string" />
1078 <wsdl:part name="hardwareKey" type="xsd:string" />
1079 <wsdl:part name="statXml" type="xsd:string" />
1080@@ -78,7 +71,6 @@
1081 <wsdl:part name="success" type="xsd:boolean" />
1082 </wsdl:message>
1083 <wsdl:message name="MediaInventoryRequest">
1084- <wsdl:part name="version" type="xsd:string" />
1085 <wsdl:part name="serverKey" type="xsd:string" />
1086 <wsdl:part name="hardwareKey" type="xsd:string" />
1087 <wsdl:part name="mediaInventory" type="xsd:string" />
1088@@ -92,13 +84,11 @@
1089 <wsdl:part name="layoutId" type="xsd:int" />
1090 <wsdl:part name="regionId" type="xsd:string" />
1091 <wsdl:part name="mediaId" type="xsd:string" />
1092- <wsdl:part name="version" type="xsd:string" />
1093 </wsdl:message>
1094 <wsdl:message name="GetResourceResponse">
1095 <wsdl:part name="resource" type="xsd:string" />
1096 </wsdl:message>
1097 <wsdl:message name="NotifyStatusRequest">
1098- <wsdl:part name="version" type="xsd:string" />
1099 <wsdl:part name="serverKey" type="xsd:string" />
1100 <wsdl:part name="hardwareKey" type="xsd:string" />
1101 <wsdl:part name="status" type="xsd:string" />
1102@@ -107,7 +97,6 @@
1103 <wsdl:part name="success" type="xsd:boolean" />
1104 </wsdl:message>
1105 <wsdl:message name="SubmitScreenShotRequest">
1106- <wsdl:part name="version" type="xsd:string" />
1107 <wsdl:part name="serverKey" type="xsd:string" />
1108 <wsdl:part name="hardwareKey" type="xsd:string" />
1109 <wsdl:part name="screenShot" type="xsd:base64Binary" />
1110@@ -276,7 +265,7 @@
1111 </wsdl:binding>
1112 <wsdl:service name="xmds">
1113 <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
1114- <soap:address location="http://172.28.128.3/xmds.php" />
1115+ <soap:address location="http://172.28.128.3/xmds.php?v=4" />
1116 </wsdl:port>
1117 </wsdl:service>
1118 </wsdl:definitions>
1119\ No newline at end of file
1120
1121=== modified file 'client/dotNET/XiboClient.csproj'
1122--- client/dotNET/XiboClient.csproj 2014-10-14 16:39:35 +0000
1123+++ client/dotNET/XiboClient.csproj 2014-11-26 10:33:06 +0000
1124@@ -262,10 +262,10 @@
1125 <WebReferences Include="Web References\" />
1126 </ItemGroup>
1127 <ItemGroup>
1128- <WebReferenceUrl Include="http://172.28.128.3/xmds.php%3fWSDL">
1129+ <WebReferenceUrl Include="http://172.28.128.3/xmds.php%3fv=4&amp;WSDL">
1130 <UrlBehavior>Static</UrlBehavior>
1131 <RelPath>Web References\xmds\</RelPath>
1132- <UpdateFromURL>http://172.28.128.3/xmds.php%3fWSDL</UpdateFromURL>
1133+ <UpdateFromURL>http://172.28.128.3/xmds.php%3fv=4&amp;WSDL</UpdateFromURL>
1134 <ServiceLocationURL>
1135 </ServiceLocationURL>
1136 <CachedDynamicPropName>
1137
1138=== modified file 'client/dotNET/XmdsAgents/FileAgent.cs'
1139--- client/dotNET/XmdsAgents/FileAgent.cs 2014-10-14 16:39:35 +0000
1140+++ client/dotNET/XmdsAgents/FileAgent.cs 2014-11-26 10:33:06 +0000
1141@@ -147,7 +147,7 @@
1142 xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
1143 xmds.UseDefaultCredentials = true;
1144
1145- string result = xmds.GetResource(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, file.LayoutId, file.RegionId, file.MediaId, ApplicationSettings.Default.Version);
1146+ string result = xmds.GetResource(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, file.LayoutId, file.RegionId, file.MediaId);
1147
1148 // Write the result to disk
1149 using (StreamWriter sw = new StreamWriter(File.Open(ApplicationSettings.Default.LibraryPath + @"\" + file.SaveAs, FileMode.Create, FileAccess.Write, FileShare.Read)))
1150@@ -204,7 +204,7 @@
1151 xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
1152 xmds.UseDefaultCredentials = false;
1153
1154- getFileReturn = xmds.GetFile(ApplicationSettings.Default.ServerKey, _hardwareKey, file.Id, file.FileType, file.ChunkOffset, file.ChunkSize, ApplicationSettings.Default.Version);
1155+ getFileReturn = xmds.GetFile(ApplicationSettings.Default.ServerKey, _hardwareKey, file.Id, file.FileType, file.ChunkOffset, file.ChunkSize);
1156 }
1157
1158 // Set the flag to indicate we have a connection to XMDS
1159
1160=== modified file 'client/dotNET/XmdsAgents/RegisterAgent.cs'
1161--- client/dotNET/XmdsAgents/RegisterAgent.cs 2014-10-21 12:35:07 +0000
1162+++ client/dotNET/XmdsAgents/RegisterAgent.cs 2014-11-26 10:33:06 +0000
1163@@ -71,7 +71,7 @@
1164 xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
1165 xmds.UseDefaultCredentials = false;
1166
1167- RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), key.MacAddress, ApplicationSettings.Default.Version));
1168+ RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), key.MacAddress));
1169
1170 // Set the flag to indicate we have a connection to XMDS
1171 ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;
1172
1173=== modified file 'client/dotNET/XmdsAgents/RequiredFilesAgent.cs'
1174--- client/dotNET/XmdsAgents/RequiredFilesAgent.cs 2014-08-28 12:59:20 +0000
1175+++ client/dotNET/XmdsAgents/RequiredFilesAgent.cs 2014-11-26 10:33:06 +0000
1176@@ -138,7 +138,7 @@
1177 xmds.UseDefaultCredentials = false;
1178
1179 // Get required files from XMDS
1180- string requiredFilesXml = xmds.RequiredFiles(ApplicationSettings.Default.ServerKey, _hardwareKey, ApplicationSettings.Default.Version);
1181+ string requiredFilesXml = xmds.RequiredFiles(ApplicationSettings.Default.ServerKey, _hardwareKey);
1182
1183 // Set the flag to indicate we have a connection to XMDS
1184 ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;
1185
1186=== modified file 'client/dotNET/XmdsAgents/ScheduleAgent.cs'
1187--- client/dotNET/XmdsAgents/ScheduleAgent.cs 2014-08-27 14:37:13 +0000
1188+++ client/dotNET/XmdsAgents/ScheduleAgent.cs 2014-11-26 10:33:06 +0000
1189@@ -121,7 +121,7 @@
1190 xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
1191 xmds.UseDefaultCredentials = false;
1192
1193- string scheduleXml = xmds.Schedule(ApplicationSettings.Default.ServerKey, _hardwareKey, ApplicationSettings.Default.Version);
1194+ string scheduleXml = xmds.Schedule(ApplicationSettings.Default.ServerKey, _hardwareKey);
1195
1196 // Set the flag to indicate we have a connection to XMDS
1197 ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;

Subscribers

People subscribed via source and target branches