1.1 --- a/Client/Client.cs Thu Aug 14 00:23:18 2014 +0200
1.2 +++ b/Client/Client.cs Thu Aug 14 09:11:27 2014 +0200
1.3 @@ -4,14 +4,14 @@
1.4 using System.Text;
1.5 using System.Threading.Tasks;
1.6 using System.Windows.Forms;
1.7 -using SharpDisplayManager;
1.8 +using SharpDisplayInterface;
1.9 using System.ServiceModel;
1.10 using System.ServiceModel.Channels;
1.11
1.12
1.13 namespace SharpDisplayClient
1.14 {
1.15 - public partial class ClientInput : SharpDisplayManager.IDisplayServiceCallback
1.16 + public partial class ClientInput : IDisplayServiceCallback
1.17 {
1.18 public void OnConnected()
1.19 {
2.1 --- a/Client/SharpDisplayClient.csproj Thu Aug 14 00:23:18 2014 +0200
2.2 +++ b/Client/SharpDisplayClient.csproj Thu Aug 14 09:11:27 2014 +0200
2.3 @@ -80,9 +80,9 @@
2.4 <None Include="App.config" />
2.5 </ItemGroup>
2.6 <ItemGroup>
2.7 - <ProjectReference Include="..\Server\SharpDisplayManager.csproj">
2.8 - <Project>{1da8c1b3-18c5-4e74-be4e-0b0e15fbaf49}</Project>
2.9 - <Name>SharpDisplayManager</Name>
2.10 + <ProjectReference Include="..\Interface\SharpDisplayInterface.csproj">
2.11 + <Project>{88eee0dc-abbc-4738-bad6-7e08cf7f50f9}</Project>
2.12 + <Name>SharpDisplayInterface</Name>
2.13 </ProjectReference>
2.14 </ItemGroup>
2.15 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
3.1 --- a/Server/MainForm.cs Thu Aug 14 00:23:18 2014 +0200
3.2 +++ b/Server/MainForm.cs Thu Aug 14 09:11:27 2014 +0200
3.3 @@ -11,6 +11,7 @@
3.4 using CodeProject.Dialog;
3.5 using System.Drawing.Imaging;
3.6 using System.ServiceModel;
3.7 +using SharpDisplayInterface;
3.8
3.9
3.10 namespace SharpDisplayManager
3.11 @@ -190,7 +191,7 @@
3.12 {
3.13 CheckForRequestResults();
3.14
3.15 - //Draw to bitmap
3.16 + //Draw to bitmap
3.17 if (iCreateBitmap)
3.18 {
3.19 iBmp = new System.Drawing.Bitmap(tableLayoutPanel.Width, tableLayoutPanel.Height, PixelFormat.Format32bppArgb);
3.20 @@ -213,7 +214,7 @@
3.21 screenX = ScreenX;
3.22 screenY = ScreenY;
3.23 }
3.24 -
3.25 +
3.26 //Send it to our display
3.27 for (int i = 0; i < iBmp.Width; i++)
3.28 {
4.1 --- a/Server/Servers.cs Thu Aug 14 00:23:18 2014 +0200
4.2 +++ b/Server/Servers.cs Thu Aug 14 09:11:27 2014 +0200
4.3 @@ -4,6 +4,7 @@
4.4 using System.ServiceModel;
4.5 using System.Collections.Generic;
4.6 using System.Linq;
4.7 +using SharpDisplayInterface;
4.8
4.9 namespace SharpDisplayManager
4.10 {
4.11 @@ -30,7 +31,7 @@
4.12 }
4.13 }
4.14 }
4.15 -
4.16 +
4.17 //
4.18 public void SetText(int aLineIndex, string aText)
4.19 {
4.20 @@ -56,7 +57,7 @@
4.21 }
4.22 //Register our client
4.23 Program.iMainForm.iClients.Add(aClientName, callback);
4.24 -
4.25 +
4.26 //For some reason MP still hangs on that one
4.27 //callback.OnConnected();
4.28 }
5.1 --- a/Server/Services.cs Thu Aug 14 00:23:18 2014 +0200
5.2 +++ b/Server/Services.cs Thu Aug 14 09:11:27 2014 +0200
5.3 @@ -5,6 +5,7 @@
5.4
5.5 namespace SharpDisplayManager
5.6 {
5.7 + /*
5.8 [ServiceContract(CallbackContract = typeof(IDisplayServiceCallback))]
5.9 public interface IDisplayService
5.10 {
5.11 @@ -27,4 +28,5 @@
5.12 [OperationContract(IsOneWay = true)]
5.13 void OnServerClosing();
5.14 }
5.15 + */
5.16 }
6.1 --- a/Server/SharpDisplayManager.csproj Thu Aug 14 00:23:18 2014 +0200
6.2 +++ b/Server/SharpDisplayManager.csproj Thu Aug 14 09:11:27 2014 +0200
6.3 @@ -89,6 +89,12 @@
6.4 <ItemGroup>
6.5 <None Include="App.config" />
6.6 </ItemGroup>
6.7 + <ItemGroup>
6.8 + <ProjectReference Include="..\Interface\SharpDisplayInterface.csproj">
6.9 + <Project>{88eee0dc-abbc-4738-bad6-7e08cf7f50f9}</Project>
6.10 + <Name>SharpDisplayInterface</Name>
6.11 + </ProjectReference>
6.12 + </ItemGroup>
6.13 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6.14 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6.15 Other similar extension points exist, see Microsoft.Common.targets.
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/SharpDisplayManager.sln Thu Aug 14 09:11:27 2014 +0200
7.3 @@ -0,0 +1,32 @@
7.4 +
7.5 +Microsoft Visual Studio Solution File, Format Version 12.00
7.6 +# Visual Studio 2012
7.7 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDisplayManager", "Server\SharpDisplayManager.csproj", "{1DA8C1B3-18C5-4E74-BE4E-0B0E15FBAF49}"
7.8 +EndProject
7.9 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDisplayClient", "Client\SharpDisplayClient.csproj", "{7EE64074-8CDB-4448-B40C-81B75D6B31CD}"
7.10 +EndProject
7.11 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDisplayInterface", "Interface\SharpDisplayInterface.csproj", "{88EEE0DC-ABBC-4738-BAD6-7E08CF7F50F9}"
7.12 +EndProject
7.13 +Global
7.14 + GlobalSection(SolutionConfigurationPlatforms) = preSolution
7.15 + Debug|Any CPU = Debug|Any CPU
7.16 + Release|Any CPU = Release|Any CPU
7.17 + EndGlobalSection
7.18 + GlobalSection(ProjectConfigurationPlatforms) = postSolution
7.19 + {1DA8C1B3-18C5-4E74-BE4E-0B0E15FBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7.20 + {1DA8C1B3-18C5-4E74-BE4E-0B0E15FBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
7.21 + {1DA8C1B3-18C5-4E74-BE4E-0B0E15FBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
7.22 + {1DA8C1B3-18C5-4E74-BE4E-0B0E15FBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
7.23 + {7EE64074-8CDB-4448-B40C-81B75D6B31CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7.24 + {7EE64074-8CDB-4448-B40C-81B75D6B31CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
7.25 + {7EE64074-8CDB-4448-B40C-81B75D6B31CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
7.26 + {7EE64074-8CDB-4448-B40C-81B75D6B31CD}.Release|Any CPU.Build.0 = Release|Any CPU
7.27 + {88EEE0DC-ABBC-4738-BAD6-7E08CF7F50F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7.28 + {88EEE0DC-ABBC-4738-BAD6-7E08CF7F50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
7.29 + {88EEE0DC-ABBC-4738-BAD6-7E08CF7F50F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
7.30 + {88EEE0DC-ABBC-4738-BAD6-7E08CF7F50F9}.Release|Any CPU.Build.0 = Release|Any CPU
7.31 + EndGlobalSection
7.32 + GlobalSection(SolutionProperties) = preSolution
7.33 + HideSolutionNode = FALSE
7.34 + EndGlobalSection
7.35 +EndGlobal