1.1 --- a/Clients/Idle/SharpDisplayClientIdle.csproj Tue Aug 30 16:50:37 2016 +0200
1.2 +++ b/Clients/Idle/SharpDisplayClientIdle.csproj Tue Aug 30 21:14:18 2016 +0200
1.3 @@ -67,7 +67,7 @@
1.4 </PropertyGroup>
1.5 <ItemGroup>
1.6 <Reference Include="SharpLibDisplay, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
1.7 - <HintPath>..\..\packages\SharpLibDisplay.0.2.5\lib\net40\SharpLibDisplay.dll</HintPath>
1.8 + <HintPath>..\..\packages\SharpLibDisplay.0.2.6\lib\net40\SharpLibDisplay.dll</HintPath>
1.9 <Private>True</Private>
1.10 </Reference>
1.11 <Reference Include="System" />
1.12 @@ -114,7 +114,6 @@
1.13 <DependentUpon>Settings.settings</DependentUpon>
1.14 <DesignTimeSharedInput>True</DesignTimeSharedInput>
1.15 </Compile>
1.16 - <None Include="SharpDisplayManager_TemporaryKey.pfx" />
1.17 </ItemGroup>
1.18 <ItemGroup>
1.19 <None Include="App.config" />
2.1 --- a/Clients/Idle/packages.config Tue Aug 30 16:50:37 2016 +0200
2.2 +++ b/Clients/Idle/packages.config Tue Aug 30 21:14:18 2016 +0200
2.3 @@ -1,4 +1,4 @@
2.4 <?xml version="1.0" encoding="utf-8"?>
2.5 <packages>
2.6 - <package id="SharpLibDisplay" version="0.2.5" targetFramework="net452" />
2.7 + <package id="SharpLibDisplay" version="0.2.6" targetFramework="net46" />
2.8 </packages>
2.9 \ No newline at end of file
3.1 --- a/Clients/Message/SharpDisplayClientMessage.csproj Tue Aug 30 16:50:37 2016 +0200
3.2 +++ b/Clients/Message/SharpDisplayClientMessage.csproj Tue Aug 30 21:14:18 2016 +0200
3.3 @@ -66,7 +66,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.2.5\lib\net40\SharpLibDisplay.dll</HintPath>
3.8 + <HintPath>..\..\packages\SharpLibDisplay.0.2.6\lib\net40\SharpLibDisplay.dll</HintPath>
3.9 <Private>True</Private>
3.10 </Reference>
3.11 <Reference Include="System" />
4.1 --- a/Clients/Message/packages.config Tue Aug 30 16:50:37 2016 +0200
4.2 +++ b/Clients/Message/packages.config Tue Aug 30 21:14:18 2016 +0200
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.2.5" targetFramework="net452" />
4.7 + <package id="SharpLibDisplay" version="0.2.6" targetFramework="net452" />
4.8 </packages>
4.9 \ No newline at end of file
5.1 --- a/Clients/Test/FormClientTest.Designer.cs Tue Aug 30 16:50:37 2016 +0200
5.2 +++ b/Clients/Test/FormClientTest.Designer.cs Tue Aug 30 21:14:18 2016 +0200
5.3 @@ -43,12 +43,15 @@
5.4 this.buttonLayoutOneTextField = new System.Windows.Forms.Button();
5.5 this.numericUpDownPriority = new System.Windows.Forms.NumericUpDown();
5.6 this.labelPriority = new System.Windows.Forms.Label();
5.7 + this.buttonTriggerEvents = new System.Windows.Forms.Button();
5.8 + this.textBoxEventName = new System.Windows.Forms.TextBox();
5.9 + this.label1 = new System.Windows.Forms.Label();
5.10 ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPriority)).BeginInit();
5.11 this.SuspendLayout();
5.12 //
5.13 // buttonSetText
5.14 //
5.15 - this.buttonSetText.Location = new System.Drawing.Point(13, 132);
5.16 + this.buttonSetText.Location = new System.Drawing.Point(12, 109);
5.17 this.buttonSetText.Name = "buttonSetText";
5.18 this.buttonSetText.Size = new System.Drawing.Size(75, 23);
5.19 this.buttonSetText.TabIndex = 0;
5.20 @@ -72,7 +75,7 @@
5.21 //
5.22 // buttonAlignRight
5.23 //
5.24 - this.buttonAlignRight.Location = new System.Drawing.Point(176, 160);
5.25 + this.buttonAlignRight.Location = new System.Drawing.Point(175, 137);
5.26 this.buttonAlignRight.Name = "buttonAlignRight";
5.27 this.buttonAlignRight.Size = new System.Drawing.Size(75, 23);
5.28 this.buttonAlignRight.TabIndex = 23;
5.29 @@ -82,7 +85,7 @@
5.30 //
5.31 // buttonAlignCenter
5.32 //
5.33 - this.buttonAlignCenter.Location = new System.Drawing.Point(94, 161);
5.34 + this.buttonAlignCenter.Location = new System.Drawing.Point(93, 138);
5.35 this.buttonAlignCenter.Name = "buttonAlignCenter";
5.36 this.buttonAlignCenter.Size = new System.Drawing.Size(75, 23);
5.37 this.buttonAlignCenter.TabIndex = 22;
5.38 @@ -92,7 +95,7 @@
5.39 //
5.40 // buttonAlignLeft
5.41 //
5.42 - this.buttonAlignLeft.Location = new System.Drawing.Point(12, 161);
5.43 + this.buttonAlignLeft.Location = new System.Drawing.Point(11, 138);
5.44 this.buttonAlignLeft.Name = "buttonAlignLeft";
5.45 this.buttonAlignLeft.Size = new System.Drawing.Size(75, 23);
5.46 this.buttonAlignLeft.TabIndex = 21;
5.47 @@ -102,7 +105,7 @@
5.48 //
5.49 // buttonSetTopText
5.50 //
5.51 - this.buttonSetTopText.Location = new System.Drawing.Point(94, 132);
5.52 + this.buttonSetTopText.Location = new System.Drawing.Point(93, 109);
5.53 this.buttonSetTopText.Name = "buttonSetTopText";
5.54 this.buttonSetTopText.Size = new System.Drawing.Size(75, 23);
5.55 this.buttonSetTopText.TabIndex = 24;
5.56 @@ -112,7 +115,7 @@
5.57 //
5.58 // buttonLayoutUpdate
5.59 //
5.60 - this.buttonLayoutUpdate.Location = new System.Drawing.Point(176, 131);
5.61 + this.buttonLayoutUpdate.Location = new System.Drawing.Point(175, 108);
5.62 this.buttonLayoutUpdate.Name = "buttonLayoutUpdate";
5.63 this.buttonLayoutUpdate.Size = new System.Drawing.Size(156, 23);
5.64 this.buttonLayoutUpdate.TabIndex = 25;
5.65 @@ -122,7 +125,7 @@
5.66 //
5.67 // buttonSetBitmap
5.68 //
5.69 - this.buttonSetBitmap.Location = new System.Drawing.Point(12, 190);
5.70 + this.buttonSetBitmap.Location = new System.Drawing.Point(11, 167);
5.71 this.buttonSetBitmap.Name = "buttonSetBitmap";
5.72 this.buttonSetBitmap.Size = new System.Drawing.Size(75, 23);
5.73 this.buttonSetBitmap.TabIndex = 26;
5.74 @@ -132,7 +135,7 @@
5.75 //
5.76 // buttonBitmapLayout
5.77 //
5.78 - this.buttonBitmapLayout.Location = new System.Drawing.Point(176, 189);
5.79 + this.buttonBitmapLayout.Location = new System.Drawing.Point(175, 166);
5.80 this.buttonBitmapLayout.Name = "buttonBitmapLayout";
5.81 this.buttonBitmapLayout.Size = new System.Drawing.Size(75, 35);
5.82 this.buttonBitmapLayout.TabIndex = 27;
5.83 @@ -142,7 +145,7 @@
5.84 //
5.85 // buttonIndicatorsLayout
5.86 //
5.87 - this.buttonIndicatorsLayout.Location = new System.Drawing.Point(94, 189);
5.88 + this.buttonIndicatorsLayout.Location = new System.Drawing.Point(93, 166);
5.89 this.buttonIndicatorsLayout.Name = "buttonIndicatorsLayout";
5.90 this.buttonIndicatorsLayout.Size = new System.Drawing.Size(75, 35);
5.91 this.buttonIndicatorsLayout.TabIndex = 28;
5.92 @@ -152,7 +155,7 @@
5.93 //
5.94 // buttonUpdateTexts
5.95 //
5.96 - this.buttonUpdateTexts.Location = new System.Drawing.Point(257, 189);
5.97 + this.buttonUpdateTexts.Location = new System.Drawing.Point(256, 166);
5.98 this.buttonUpdateTexts.Name = "buttonUpdateTexts";
5.99 this.buttonUpdateTexts.Size = new System.Drawing.Size(75, 35);
5.100 this.buttonUpdateTexts.TabIndex = 29;
5.101 @@ -162,7 +165,7 @@
5.102 //
5.103 // buttonLayoutOneTextField
5.104 //
5.105 - this.buttonLayoutOneTextField.Location = new System.Drawing.Point(257, 160);
5.106 + this.buttonLayoutOneTextField.Location = new System.Drawing.Point(256, 137);
5.107 this.buttonLayoutOneTextField.Name = "buttonLayoutOneTextField";
5.108 this.buttonLayoutOneTextField.Size = new System.Drawing.Size(75, 23);
5.109 this.buttonLayoutOneTextField.TabIndex = 30;
5.110 @@ -202,11 +205,40 @@
5.111 this.labelPriority.TabIndex = 32;
5.112 this.labelPriority.Text = "Priority:";
5.113 //
5.114 - // MainForm
5.115 + // buttonTriggerEvents
5.116 + //
5.117 + this.buttonTriggerEvents.Location = new System.Drawing.Point(11, 257);
5.118 + this.buttonTriggerEvents.Name = "buttonTriggerEvents";
5.119 + this.buttonTriggerEvents.Size = new System.Drawing.Size(75, 23);
5.120 + this.buttonTriggerEvents.TabIndex = 33;
5.121 + this.buttonTriggerEvents.Text = "Trigger Events";
5.122 + this.buttonTriggerEvents.UseVisualStyleBackColor = true;
5.123 + this.buttonTriggerEvents.Click += new System.EventHandler(this.buttonTriggerEvents_Click);
5.124 + //
5.125 + // textBoxEventName
5.126 + //
5.127 + this.textBoxEventName.Location = new System.Drawing.Point(11, 231);
5.128 + this.textBoxEventName.Name = "textBoxEventName";
5.129 + this.textBoxEventName.Size = new System.Drawing.Size(202, 20);
5.130 + this.textBoxEventName.TabIndex = 34;
5.131 + //
5.132 + // label1
5.133 + //
5.134 + this.label1.AutoSize = true;
5.135 + this.label1.Location = new System.Drawing.Point(11, 212);
5.136 + this.label1.Name = "label1";
5.137 + this.label1.Size = new System.Drawing.Size(67, 13);
5.138 + this.label1.TabIndex = 35;
5.139 + this.label1.Text = "Event name:";
5.140 + //
5.141 + // FormClientTest
5.142 //
5.143 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
5.144 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
5.145 - this.ClientSize = new System.Drawing.Size(443, 252);
5.146 + this.ClientSize = new System.Drawing.Size(499, 292);
5.147 + this.Controls.Add(this.label1);
5.148 + this.Controls.Add(this.textBoxEventName);
5.149 + this.Controls.Add(this.buttonTriggerEvents);
5.150 this.Controls.Add(this.labelPriority);
5.151 this.Controls.Add(this.numericUpDownPriority);
5.152 this.Controls.Add(this.buttonLayoutOneTextField);
5.153 @@ -222,7 +254,7 @@
5.154 this.Controls.Add(this.textBoxBottom);
5.155 this.Controls.Add(this.textBoxTop);
5.156 this.Controls.Add(this.buttonSetText);
5.157 - this.Name = "MainForm";
5.158 + this.Name = "FormClientTest";
5.159 this.Text = "Client";
5.160 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
5.161 this.Load += new System.EventHandler(this.MainForm_Load);
5.162 @@ -249,6 +281,9 @@
5.163 private System.Windows.Forms.Button buttonLayoutOneTextField;
5.164 private System.Windows.Forms.NumericUpDown numericUpDownPriority;
5.165 private System.Windows.Forms.Label labelPriority;
5.166 + private System.Windows.Forms.Button buttonTriggerEvents;
5.167 + private System.Windows.Forms.TextBox textBoxEventName;
5.168 + private System.Windows.Forms.Label label1;
5.169 }
5.170 }
5.171
6.1 --- a/Clients/Test/FormClientTest.cs Tue Aug 30 16:50:37 2016 +0200
6.2 +++ b/Clients/Test/FormClientTest.cs Tue Aug 30 21:14:18 2016 +0200
6.3 @@ -400,5 +400,10 @@
6.4 {
6.5 iClient.SetPriority((uint)numericUpDownPriority.Value);
6.6 }
6.7 +
6.8 + private void buttonTriggerEvents_Click(object sender, EventArgs e)
6.9 + {
6.10 + iClient.TriggerEventsByName(textBoxEventName.Text);
6.11 + }
6.12 }
6.13 }
7.1 --- a/Clients/Test/SharpDisplayClientTest.csproj Tue Aug 30 16:50:37 2016 +0200
7.2 +++ b/Clients/Test/SharpDisplayClientTest.csproj Tue Aug 30 21:14:18 2016 +0200
7.3 @@ -85,7 +85,7 @@
7.4 </PropertyGroup>
7.5 <ItemGroup>
7.6 <Reference Include="SharpLibDisplay, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7.7 - <HintPath>..\..\packages\SharpLibDisplay.0.2.5\lib\net40\SharpLibDisplay.dll</HintPath>
7.8 + <HintPath>..\..\packages\SharpLibDisplay.0.2.6\lib\net40\SharpLibDisplay.dll</HintPath>
7.9 <Private>True</Private>
7.10 </Reference>
7.11 <Reference Include="System" />
8.1 --- a/Clients/Test/packages.config Tue Aug 30 16:50:37 2016 +0200
8.2 +++ b/Clients/Test/packages.config Tue Aug 30 21:14:18 2016 +0200
8.3 @@ -1,4 +1,4 @@
8.4 <?xml version="1.0" encoding="utf-8"?>
8.5 <packages>
8.6 - <package id="SharpLibDisplay" version="0.2.5" targetFramework="net46" />
8.7 + <package id="SharpLibDisplay" version="0.2.6" targetFramework="net46" />
8.8 </packages>
8.9 \ No newline at end of file
9.1 --- a/Server/Session.cs Tue Aug 30 16:50:37 2016 +0200
9.2 +++ b/Server/Session.cs Tue Aug 30 21:14:18 2016 +0200
9.3 @@ -107,6 +107,10 @@
9.4 return SharpDisplayManager.Program.iFormMain.iClients.Count;
9.5 }
9.6
9.7 + public void TriggerEventsByName(string aName)
9.8 + {
9.9 + SharpDisplayManager.Properties.Settings.Default.EarManager.TriggerEventsByName(aName);
9.10 + }
9.11
9.12
9.13 }
10.1 --- a/Server/SharpDisplayManager.csproj Tue Aug 30 16:50:37 2016 +0200
10.2 +++ b/Server/SharpDisplayManager.csproj Tue Aug 30 21:14:18 2016 +0200
10.3 @@ -34,7 +34,7 @@
10.4 <WebPage>index.htm</WebPage>
10.5 <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
10.6 <ApplicationRevision>0</ApplicationRevision>
10.7 - <ApplicationVersion>1.1.1.0</ApplicationVersion>
10.8 + <ApplicationVersion>1.2.1.0</ApplicationVersion>
10.9 <UseApplicationTrust>false</UseApplicationTrust>
10.10 <CreateDesktopShortcut>true</CreateDesktopShortcut>
10.11 <PublishWizardCompleted>true</PublishWizardCompleted>
10.12 @@ -129,7 +129,7 @@
10.13 <HintPath>..\packages\NAudio.1.7.3\lib\net35\NAudio.dll</HintPath>
10.14 </Reference>
10.15 <Reference Include="SharpLibDisplay, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
10.16 - <HintPath>..\packages\SharpLibDisplay.0.2.5\lib\net40\SharpLibDisplay.dll</HintPath>
10.17 + <HintPath>..\packages\SharpLibDisplay.0.2.6\lib\net40\SharpLibDisplay.dll</HintPath>
10.18 <Private>True</Private>
10.19 </Reference>
10.20 <Reference Include="SharpLibHid, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
11.1 --- a/Server/packages.config Tue Aug 30 16:50:37 2016 +0200
11.2 +++ b/Server/packages.config Tue Aug 30 21:14:18 2016 +0200
11.3 @@ -3,7 +3,7 @@
11.4 <package id="LibMiniDisplay" version="1.1.8" targetFramework="net46" />
11.5 <package id="Loamen.agsXMPP" version="1.3.1" targetFramework="net46" />
11.6 <package id="NAudio" version="1.7.3" targetFramework="net45" />
11.7 - <package id="SharpLibDisplay" version="0.2.5" targetFramework="net46" />
11.8 + <package id="SharpLibDisplay" version="0.2.6" targetFramework="net46" />
11.9 <package id="SharpLibHarmony" version="0.6.3" targetFramework="net46" />
11.10 <package id="SharpLibHid" version="1.4.2" targetFramework="net46" />
11.11 <package id="SharpLibNotification" version="0.0.1" targetFramework="net46" />