1.1 --- a/Client/MainForm.Designer.cs Thu Jan 21 23:01:53 2016 +0100
1.2 +++ b/Client/MainForm.Designer.cs Fri Jan 22 16:08:22 2016 +0100
1.3 @@ -28,169 +28,169 @@
1.4 /// </summary>
1.5 private void InitializeComponent()
1.6 {
1.7 - this.buttonSetText = new System.Windows.Forms.Button();
1.8 - this.textBoxTop = new System.Windows.Forms.TextBox();
1.9 - this.textBoxBottom = new System.Windows.Forms.TextBox();
1.10 - this.buttonAlignRight = new System.Windows.Forms.Button();
1.11 - this.buttonAlignCenter = new System.Windows.Forms.Button();
1.12 - this.buttonAlignLeft = new System.Windows.Forms.Button();
1.13 - this.buttonSetTopText = new System.Windows.Forms.Button();
1.14 - this.buttonLayoutUpdate = new System.Windows.Forms.Button();
1.15 - this.buttonSetBitmap = new System.Windows.Forms.Button();
1.16 - this.buttonBitmapLayout = new System.Windows.Forms.Button();
1.17 - this.buttonIndicatorsLayout = new System.Windows.Forms.Button();
1.18 - this.buttonUpdateTexts = new System.Windows.Forms.Button();
1.19 - this.buttonLayoutOneTextField = new System.Windows.Forms.Button();
1.20 - this.SuspendLayout();
1.21 - //
1.22 - // buttonSetText
1.23 - //
1.24 - this.buttonSetText.Location = new System.Drawing.Point(13, 132);
1.25 - this.buttonSetText.Name = "buttonSetText";
1.26 - this.buttonSetText.Size = new System.Drawing.Size(75, 23);
1.27 - this.buttonSetText.TabIndex = 0;
1.28 - this.buttonSetText.Text = "Set Text";
1.29 - this.buttonSetText.UseVisualStyleBackColor = true;
1.30 - this.buttonSetText.Click += new System.EventHandler(this.buttonSetText_Click);
1.31 - //
1.32 - // textBoxTop
1.33 - //
1.34 - this.textBoxTop.Location = new System.Drawing.Point(12, 31);
1.35 - this.textBoxTop.Name = "textBoxTop";
1.36 - this.textBoxTop.Size = new System.Drawing.Size(419, 20);
1.37 - this.textBoxTop.TabIndex = 1;
1.38 - //
1.39 - // textBoxBottom
1.40 - //
1.41 - this.textBoxBottom.Location = new System.Drawing.Point(12, 57);
1.42 - this.textBoxBottom.Name = "textBoxBottom";
1.43 - this.textBoxBottom.Size = new System.Drawing.Size(419, 20);
1.44 - this.textBoxBottom.TabIndex = 2;
1.45 - //
1.46 - // buttonAlignRight
1.47 - //
1.48 - this.buttonAlignRight.Location = new System.Drawing.Point(176, 160);
1.49 - this.buttonAlignRight.Name = "buttonAlignRight";
1.50 - this.buttonAlignRight.Size = new System.Drawing.Size(75, 23);
1.51 - this.buttonAlignRight.TabIndex = 23;
1.52 - this.buttonAlignRight.Text = "Align Right";
1.53 - this.buttonAlignRight.UseVisualStyleBackColor = true;
1.54 - this.buttonAlignRight.Click += new System.EventHandler(this.buttonAlignRight_Click);
1.55 - //
1.56 - // buttonAlignCenter
1.57 - //
1.58 - this.buttonAlignCenter.Location = new System.Drawing.Point(94, 161);
1.59 - this.buttonAlignCenter.Name = "buttonAlignCenter";
1.60 - this.buttonAlignCenter.Size = new System.Drawing.Size(75, 23);
1.61 - this.buttonAlignCenter.TabIndex = 22;
1.62 - this.buttonAlignCenter.Text = "Align Center";
1.63 - this.buttonAlignCenter.UseVisualStyleBackColor = true;
1.64 - this.buttonAlignCenter.Click += new System.EventHandler(this.buttonAlignCenter_Click);
1.65 - //
1.66 - // buttonAlignLeft
1.67 - //
1.68 - this.buttonAlignLeft.Location = new System.Drawing.Point(12, 161);
1.69 - this.buttonAlignLeft.Name = "buttonAlignLeft";
1.70 - this.buttonAlignLeft.Size = new System.Drawing.Size(75, 23);
1.71 - this.buttonAlignLeft.TabIndex = 21;
1.72 - this.buttonAlignLeft.Text = "Align Left";
1.73 - this.buttonAlignLeft.UseVisualStyleBackColor = true;
1.74 - this.buttonAlignLeft.Click += new System.EventHandler(this.buttonAlignLeft_Click);
1.75 - //
1.76 - // buttonSetTopText
1.77 - //
1.78 - this.buttonSetTopText.Location = new System.Drawing.Point(94, 132);
1.79 - this.buttonSetTopText.Name = "buttonSetTopText";
1.80 - this.buttonSetTopText.Size = new System.Drawing.Size(75, 23);
1.81 - this.buttonSetTopText.TabIndex = 24;
1.82 - this.buttonSetTopText.Text = "Set Top Text";
1.83 - this.buttonSetTopText.UseVisualStyleBackColor = true;
1.84 - this.buttonSetTopText.Click += new System.EventHandler(this.buttonSetTopText_Click);
1.85 - //
1.86 - // buttonLayoutUpdate
1.87 - //
1.88 - this.buttonLayoutUpdate.Location = new System.Drawing.Point(176, 131);
1.89 - this.buttonLayoutUpdate.Name = "buttonLayoutUpdate";
1.90 - this.buttonLayoutUpdate.Size = new System.Drawing.Size(75, 23);
1.91 - this.buttonLayoutUpdate.TabIndex = 25;
1.92 - this.buttonLayoutUpdate.Text = "Layout 2x2";
1.93 - this.buttonLayoutUpdate.UseVisualStyleBackColor = true;
1.94 - this.buttonLayoutUpdate.Click += new System.EventHandler(this.buttonLayoutUpdate_Click);
1.95 - //
1.96 - // buttonSetBitmap
1.97 - //
1.98 - this.buttonSetBitmap.Location = new System.Drawing.Point(12, 190);
1.99 - this.buttonSetBitmap.Name = "buttonSetBitmap";
1.100 - this.buttonSetBitmap.Size = new System.Drawing.Size(75, 23);
1.101 - this.buttonSetBitmap.TabIndex = 26;
1.102 - this.buttonSetBitmap.Text = "Set Bitmap";
1.103 - this.buttonSetBitmap.UseVisualStyleBackColor = true;
1.104 - this.buttonSetBitmap.Click += new System.EventHandler(this.buttonSetBitmap_Click);
1.105 - //
1.106 - // buttonBitmapLayout
1.107 - //
1.108 - this.buttonBitmapLayout.Location = new System.Drawing.Point(176, 189);
1.109 - this.buttonBitmapLayout.Name = "buttonBitmapLayout";
1.110 - this.buttonBitmapLayout.Size = new System.Drawing.Size(75, 35);
1.111 - this.buttonBitmapLayout.TabIndex = 27;
1.112 - this.buttonBitmapLayout.Text = "Bitmap Layout";
1.113 - this.buttonBitmapLayout.UseVisualStyleBackColor = true;
1.114 - this.buttonBitmapLayout.Click += new System.EventHandler(this.buttonBitmapLayout_Click);
1.115 - //
1.116 - // buttonIndicatorsLayout
1.117 - //
1.118 - this.buttonIndicatorsLayout.Location = new System.Drawing.Point(94, 189);
1.119 - this.buttonIndicatorsLayout.Name = "buttonIndicatorsLayout";
1.120 - this.buttonIndicatorsLayout.Size = new System.Drawing.Size(75, 35);
1.121 - this.buttonIndicatorsLayout.TabIndex = 28;
1.122 - this.buttonIndicatorsLayout.Text = "Indicators Layout ";
1.123 - this.buttonIndicatorsLayout.UseVisualStyleBackColor = true;
1.124 - this.buttonIndicatorsLayout.Click += new System.EventHandler(this.buttonIndicatorsLayout_Click);
1.125 - //
1.126 - // buttonUpdateTexts
1.127 - //
1.128 - this.buttonUpdateTexts.Location = new System.Drawing.Point(257, 189);
1.129 - this.buttonUpdateTexts.Name = "buttonUpdateTexts";
1.130 - this.buttonUpdateTexts.Size = new System.Drawing.Size(75, 35);
1.131 - this.buttonUpdateTexts.TabIndex = 29;
1.132 - this.buttonUpdateTexts.Text = "Update Texts";
1.133 - this.buttonUpdateTexts.UseVisualStyleBackColor = true;
1.134 - this.buttonUpdateTexts.Click += new System.EventHandler(this.buttonUpdateTexts_Click);
1.135 - //
1.136 - // buttonLayoutOneTextField
1.137 - //
1.138 - this.buttonLayoutOneTextField.Location = new System.Drawing.Point(257, 131);
1.139 - this.buttonLayoutOneTextField.Name = "buttonLayoutOneTextField";
1.140 - this.buttonLayoutOneTextField.Size = new System.Drawing.Size(75, 23);
1.141 - this.buttonLayoutOneTextField.TabIndex = 30;
1.142 - this.buttonLayoutOneTextField.Text = "Layout 1x1";
1.143 - this.buttonLayoutOneTextField.UseVisualStyleBackColor = true;
1.144 - this.buttonLayoutOneTextField.Click += new System.EventHandler(this.buttonLayoutOneTextField_Click);
1.145 - //
1.146 - // MainForm
1.147 - //
1.148 - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
1.149 - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
1.150 - this.ClientSize = new System.Drawing.Size(443, 252);
1.151 - this.Controls.Add(this.buttonLayoutOneTextField);
1.152 - this.Controls.Add(this.buttonUpdateTexts);
1.153 - this.Controls.Add(this.buttonIndicatorsLayout);
1.154 - this.Controls.Add(this.buttonBitmapLayout);
1.155 - this.Controls.Add(this.buttonSetBitmap);
1.156 - this.Controls.Add(this.buttonLayoutUpdate);
1.157 - this.Controls.Add(this.buttonSetTopText);
1.158 - this.Controls.Add(this.buttonAlignRight);
1.159 - this.Controls.Add(this.buttonAlignCenter);
1.160 - this.Controls.Add(this.buttonAlignLeft);
1.161 - this.Controls.Add(this.textBoxBottom);
1.162 - this.Controls.Add(this.textBoxTop);
1.163 - this.Controls.Add(this.buttonSetText);
1.164 - this.Name = "MainForm";
1.165 - this.Text = "Client";
1.166 - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
1.167 - this.Load += new System.EventHandler(this.MainForm_Load);
1.168 - this.ResumeLayout(false);
1.169 - this.PerformLayout();
1.170 + this.buttonSetText = new System.Windows.Forms.Button();
1.171 + this.textBoxTop = new System.Windows.Forms.TextBox();
1.172 + this.textBoxBottom = new System.Windows.Forms.TextBox();
1.173 + this.buttonAlignRight = new System.Windows.Forms.Button();
1.174 + this.buttonAlignCenter = new System.Windows.Forms.Button();
1.175 + this.buttonAlignLeft = new System.Windows.Forms.Button();
1.176 + this.buttonSetTopText = new System.Windows.Forms.Button();
1.177 + this.buttonLayoutUpdate = new System.Windows.Forms.Button();
1.178 + this.buttonSetBitmap = new System.Windows.Forms.Button();
1.179 + this.buttonBitmapLayout = new System.Windows.Forms.Button();
1.180 + this.buttonIndicatorsLayout = new System.Windows.Forms.Button();
1.181 + this.buttonUpdateTexts = new System.Windows.Forms.Button();
1.182 + this.buttonLayoutOneTextField = new System.Windows.Forms.Button();
1.183 + this.SuspendLayout();
1.184 + //
1.185 + // buttonSetText
1.186 + //
1.187 + this.buttonSetText.Location = new System.Drawing.Point(13, 132);
1.188 + this.buttonSetText.Name = "buttonSetText";
1.189 + this.buttonSetText.Size = new System.Drawing.Size(75, 23);
1.190 + this.buttonSetText.TabIndex = 0;
1.191 + this.buttonSetText.Text = "Set Text";
1.192 + this.buttonSetText.UseVisualStyleBackColor = true;
1.193 + this.buttonSetText.Click += new System.EventHandler(this.buttonSetText_Click);
1.194 + //
1.195 + // textBoxTop
1.196 + //
1.197 + this.textBoxTop.Location = new System.Drawing.Point(12, 31);
1.198 + this.textBoxTop.Name = "textBoxTop";
1.199 + this.textBoxTop.Size = new System.Drawing.Size(419, 20);
1.200 + this.textBoxTop.TabIndex = 1;
1.201 + //
1.202 + // textBoxBottom
1.203 + //
1.204 + this.textBoxBottom.Location = new System.Drawing.Point(12, 57);
1.205 + this.textBoxBottom.Name = "textBoxBottom";
1.206 + this.textBoxBottom.Size = new System.Drawing.Size(419, 20);
1.207 + this.textBoxBottom.TabIndex = 2;
1.208 + //
1.209 + // buttonAlignRight
1.210 + //
1.211 + this.buttonAlignRight.Location = new System.Drawing.Point(176, 160);
1.212 + this.buttonAlignRight.Name = "buttonAlignRight";
1.213 + this.buttonAlignRight.Size = new System.Drawing.Size(75, 23);
1.214 + this.buttonAlignRight.TabIndex = 23;
1.215 + this.buttonAlignRight.Text = "Align Right";
1.216 + this.buttonAlignRight.UseVisualStyleBackColor = true;
1.217 + this.buttonAlignRight.Click += new System.EventHandler(this.buttonAlignRight_Click);
1.218 + //
1.219 + // buttonAlignCenter
1.220 + //
1.221 + this.buttonAlignCenter.Location = new System.Drawing.Point(94, 161);
1.222 + this.buttonAlignCenter.Name = "buttonAlignCenter";
1.223 + this.buttonAlignCenter.Size = new System.Drawing.Size(75, 23);
1.224 + this.buttonAlignCenter.TabIndex = 22;
1.225 + this.buttonAlignCenter.Text = "Align Center";
1.226 + this.buttonAlignCenter.UseVisualStyleBackColor = true;
1.227 + this.buttonAlignCenter.Click += new System.EventHandler(this.buttonAlignCenter_Click);
1.228 + //
1.229 + // buttonAlignLeft
1.230 + //
1.231 + this.buttonAlignLeft.Location = new System.Drawing.Point(12, 161);
1.232 + this.buttonAlignLeft.Name = "buttonAlignLeft";
1.233 + this.buttonAlignLeft.Size = new System.Drawing.Size(75, 23);
1.234 + this.buttonAlignLeft.TabIndex = 21;
1.235 + this.buttonAlignLeft.Text = "Align Left";
1.236 + this.buttonAlignLeft.UseVisualStyleBackColor = true;
1.237 + this.buttonAlignLeft.Click += new System.EventHandler(this.buttonAlignLeft_Click);
1.238 + //
1.239 + // buttonSetTopText
1.240 + //
1.241 + this.buttonSetTopText.Location = new System.Drawing.Point(94, 132);
1.242 + this.buttonSetTopText.Name = "buttonSetTopText";
1.243 + this.buttonSetTopText.Size = new System.Drawing.Size(75, 23);
1.244 + this.buttonSetTopText.TabIndex = 24;
1.245 + this.buttonSetTopText.Text = "Set Top Text";
1.246 + this.buttonSetTopText.UseVisualStyleBackColor = true;
1.247 + this.buttonSetTopText.Click += new System.EventHandler(this.buttonSetTopText_Click);
1.248 + //
1.249 + // buttonLayoutUpdate
1.250 + //
1.251 + this.buttonLayoutUpdate.Location = new System.Drawing.Point(176, 131);
1.252 + this.buttonLayoutUpdate.Name = "buttonLayoutUpdate";
1.253 + this.buttonLayoutUpdate.Size = new System.Drawing.Size(156, 23);
1.254 + this.buttonLayoutUpdate.TabIndex = 25;
1.255 + this.buttonLayoutUpdate.Text = "Layout 2x2 and Recording";
1.256 + this.buttonLayoutUpdate.UseVisualStyleBackColor = true;
1.257 + this.buttonLayoutUpdate.Click += new System.EventHandler(this.buttonLayoutUpdate_Click);
1.258 + //
1.259 + // buttonSetBitmap
1.260 + //
1.261 + this.buttonSetBitmap.Location = new System.Drawing.Point(12, 190);
1.262 + this.buttonSetBitmap.Name = "buttonSetBitmap";
1.263 + this.buttonSetBitmap.Size = new System.Drawing.Size(75, 23);
1.264 + this.buttonSetBitmap.TabIndex = 26;
1.265 + this.buttonSetBitmap.Text = "Set Bitmap";
1.266 + this.buttonSetBitmap.UseVisualStyleBackColor = true;
1.267 + this.buttonSetBitmap.Click += new System.EventHandler(this.buttonSetBitmap_Click);
1.268 + //
1.269 + // buttonBitmapLayout
1.270 + //
1.271 + this.buttonBitmapLayout.Location = new System.Drawing.Point(176, 189);
1.272 + this.buttonBitmapLayout.Name = "buttonBitmapLayout";
1.273 + this.buttonBitmapLayout.Size = new System.Drawing.Size(75, 35);
1.274 + this.buttonBitmapLayout.TabIndex = 27;
1.275 + this.buttonBitmapLayout.Text = "Bitmap Layout";
1.276 + this.buttonBitmapLayout.UseVisualStyleBackColor = true;
1.277 + this.buttonBitmapLayout.Click += new System.EventHandler(this.buttonBitmapLayout_Click);
1.278 + //
1.279 + // buttonIndicatorsLayout
1.280 + //
1.281 + this.buttonIndicatorsLayout.Location = new System.Drawing.Point(94, 189);
1.282 + this.buttonIndicatorsLayout.Name = "buttonIndicatorsLayout";
1.283 + this.buttonIndicatorsLayout.Size = new System.Drawing.Size(75, 35);
1.284 + this.buttonIndicatorsLayout.TabIndex = 28;
1.285 + this.buttonIndicatorsLayout.Text = "Indicators Layout ";
1.286 + this.buttonIndicatorsLayout.UseVisualStyleBackColor = true;
1.287 + this.buttonIndicatorsLayout.Click += new System.EventHandler(this.buttonIndicatorsLayout_Click);
1.288 + //
1.289 + // buttonUpdateTexts
1.290 + //
1.291 + this.buttonUpdateTexts.Location = new System.Drawing.Point(257, 189);
1.292 + this.buttonUpdateTexts.Name = "buttonUpdateTexts";
1.293 + this.buttonUpdateTexts.Size = new System.Drawing.Size(75, 35);
1.294 + this.buttonUpdateTexts.TabIndex = 29;
1.295 + this.buttonUpdateTexts.Text = "Update Texts";
1.296 + this.buttonUpdateTexts.UseVisualStyleBackColor = true;
1.297 + this.buttonUpdateTexts.Click += new System.EventHandler(this.buttonUpdateTexts_Click);
1.298 + //
1.299 + // buttonLayoutOneTextField
1.300 + //
1.301 + this.buttonLayoutOneTextField.Location = new System.Drawing.Point(257, 160);
1.302 + this.buttonLayoutOneTextField.Name = "buttonLayoutOneTextField";
1.303 + this.buttonLayoutOneTextField.Size = new System.Drawing.Size(75, 23);
1.304 + this.buttonLayoutOneTextField.TabIndex = 30;
1.305 + this.buttonLayoutOneTextField.Text = "Layout 1x1";
1.306 + this.buttonLayoutOneTextField.UseVisualStyleBackColor = true;
1.307 + this.buttonLayoutOneTextField.Click += new System.EventHandler(this.buttonLayoutOneTextField_Click);
1.308 + //
1.309 + // MainForm
1.310 + //
1.311 + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
1.312 + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
1.313 + this.ClientSize = new System.Drawing.Size(443, 252);
1.314 + this.Controls.Add(this.buttonLayoutOneTextField);
1.315 + this.Controls.Add(this.buttonUpdateTexts);
1.316 + this.Controls.Add(this.buttonIndicatorsLayout);
1.317 + this.Controls.Add(this.buttonBitmapLayout);
1.318 + this.Controls.Add(this.buttonSetBitmap);
1.319 + this.Controls.Add(this.buttonLayoutUpdate);
1.320 + this.Controls.Add(this.buttonSetTopText);
1.321 + this.Controls.Add(this.buttonAlignRight);
1.322 + this.Controls.Add(this.buttonAlignCenter);
1.323 + this.Controls.Add(this.buttonAlignLeft);
1.324 + this.Controls.Add(this.textBoxBottom);
1.325 + this.Controls.Add(this.textBoxTop);
1.326 + this.Controls.Add(this.buttonSetText);
1.327 + this.Name = "MainForm";
1.328 + this.Text = "Client";
1.329 + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
1.330 + this.Load += new System.EventHandler(this.MainForm_Load);
1.331 + this.ResumeLayout(false);
1.332 + this.PerformLayout();
1.333
1.334 }
1.335
2.1 --- a/Client/MainForm.cs Thu Jan 21 23:01:53 2016 +0100
2.2 +++ b/Client/MainForm.cs Fri Jan 22 16:08:22 2016 +0100
2.3 @@ -230,7 +230,7 @@
2.4 //
2.5 RecordingField recording = new RecordingField();
2.6 recording.IsActive = true;
2.7 -
2.8 + recording.Text = "Recording Tame of Gone until 22:05";
2.9 //Set texts
2.10 iClient.CreateFields(new DataField[]
2.11 {
3.1 --- a/Client/SharpDisplayClient.csproj Thu Jan 21 23:01:53 2016 +0100
3.2 +++ b/Client/SharpDisplayClient.csproj Fri Jan 22 16:08:22 2016 +0100
3.3 @@ -85,7 +85,7 @@
3.4 </PropertyGroup>
3.5 <ItemGroup>
3.6 <Reference Include="SharpLibDisplay, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
3.7 - <HintPath>..\packages\SharpLibDisplay.0.1.3\lib\net40\SharpLibDisplay.dll</HintPath>
3.8 + <HintPath>..\packages\SharpLibDisplay.0.2.4\lib\net40\SharpLibDisplay.dll</HintPath>
3.9 <Private>True</Private>
3.10 </Reference>
3.11 <Reference Include="System" />
4.1 --- a/Client/packages.config Thu Jan 21 23:01:53 2016 +0100
4.2 +++ b/Client/packages.config Fri Jan 22 16:08:22 2016 +0100
4.3 @@ -1,4 +1,4 @@
4.4 <?xml version="1.0" encoding="utf-8"?>
4.5 <packages>
4.6 - <package id="SharpLibDisplay" version="0.1.3" targetFramework="net46" />
4.7 + <package id="SharpLibDisplay" version="0.2.4" targetFramework="net46" />
4.8 </packages>
4.9 \ No newline at end of file
5.1 --- a/Server/MainForm.cs Thu Jan 21 23:01:53 2016 +0100
5.2 +++ b/Server/MainForm.cs Fri Jan 22 16:08:22 2016 +0100
5.3 @@ -1759,6 +1759,17 @@
5.4 }
5.5
5.6 /// <summary>
5.7 + ///
5.8 + /// </summary>
5.9 + /// <param name="value"></param>
5.10 + /// <param name="maxChars"></param>
5.11 + /// <returns></returns>
5.12 + public static string Truncate(string value, int maxChars)
5.13 + {
5.14 + return value.Length <= maxChars ? value : value.Substring(0, maxChars-3) + "...";
5.15 + }
5.16 +
5.17 + /// <summary>
5.18 /// Update our recording notification.
5.19 /// </summary>
5.20 private void UpdateRecordingNotification()
5.21 @@ -1773,19 +1784,33 @@
5.22 if (rec!=null && rec.IsActive)
5.23 {
5.24 activeRecording = true;
5.25 - //Don't break cause we are collecting the names.
5.26 - text += client.Value.Name + " recording\n";
5.27 + //Don't break cause we are collecting the names/texts.
5.28 + if (!String.IsNullOrEmpty(rec.Text))
5.29 + {
5.30 + text += (rec.Text + "\n");
5.31 + }
5.32 + else
5.33 + {
5.34 + //Not text for that recording, use client name instead
5.35 + text += client.Value.Name + " recording\n";
5.36 + }
5.37 +
5.38 }
5.39 }
5.40
5.41 + //Update our text no matter what, can't have more than 63 characters otherwise it throws an exception.
5.42 + iRecordingNotification.Text = Truncate(text,63);
5.43 +
5.44 //Change visibility of notification if needed
5.45 if (iRecordingNotification.Visible != activeRecording)
5.46 - {
5.47 - iRecordingNotification.Text = text;
5.48 + {
5.49 iRecordingNotification.Visible = activeRecording;
5.50 //Assuming the notification icon is in sync with our display icon
5.51 //Take care of our REC icon
5.52 - iDisplay.SetIconOnOff(MiniDisplay.IconType.Recording, activeRecording);
5.53 + if (iDisplay.IsOpen())
5.54 + {
5.55 + iDisplay.SetIconOnOff(MiniDisplay.IconType.Recording, activeRecording);
5.56 + }
5.57 }
5.58 }
5.59
6.1 --- a/Server/SharpDisplayManager.csproj Thu Jan 21 23:01:53 2016 +0100
6.2 +++ b/Server/SharpDisplayManager.csproj Fri Jan 22 16:08:22 2016 +0100
6.3 @@ -121,11 +121,11 @@
6.4 <HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
6.5 </Reference>
6.6 <Reference Include="SharpLibDisplay, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6.7 - <HintPath>..\packages\SharpLibDisplay.0.1.3\lib\net40\SharpLibDisplay.dll</HintPath>
6.8 + <HintPath>..\packages\SharpLibDisplay.0.2.4\lib\net40\SharpLibDisplay.dll</HintPath>
6.9 <Private>True</Private>
6.10 </Reference>
6.11 - <Reference Include="SharpLibHid">
6.12 - <HintPath>..\packages\SharpLibHid.1.2.1\lib\net20\SharpLibHid.dll</HintPath>
6.13 + <Reference Include="SharpLibHid, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
6.14 + <HintPath>..\packages\SharpLibHid.1.3.1\lib\net20\SharpLibHid.dll</HintPath>
6.15 <Private>True</Private>
6.16 </Reference>
6.17 <Reference Include="SharpLibNotification, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7.1 --- a/Server/packages.config Thu Jan 21 23:01:53 2016 +0100
7.2 +++ b/Server/packages.config Fri Jan 22 16:08:22 2016 +0100
7.3 @@ -2,8 +2,8 @@
7.4 <packages>
7.5 <package id="LibMiniDisplay" version="1.1.8" targetFramework="net46" />
7.6 <package id="NAudio" version="1.7.3" targetFramework="net45" />
7.7 - <package id="SharpLibDisplay" version="0.1.3" targetFramework="net46" />
7.8 - <package id="SharpLibHid" version="1.2.1" targetFramework="net45" />
7.9 + <package id="SharpLibDisplay" version="0.2.4" targetFramework="net46" />
7.10 + <package id="SharpLibHid" version="1.3.1" targetFramework="net46" />
7.11 <package id="SharpLibNotification" version="0.0.1" targetFramework="net46" />
7.12 <package id="SharpLibWin32" version="0.0.7" targetFramework="net45" />
7.13 </packages>
7.14 \ No newline at end of file