Skip to content

Commit

Permalink
Merge branch 'С#-Client-GUI'
Browse files Browse the repository at this point in the history
  • Loading branch information
MyLibh committed Oct 17, 2018
2 parents fe816da + 04cfff8 commit 839f1bf
Show file tree
Hide file tree
Showing 20 changed files with 792 additions and 522 deletions.
12 changes: 6 additions & 6 deletions VS17/Client GUI/Client GUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="InitProgramForm.cs">
<Compile Include="InputForms\InitProgramForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="InitProgramForm.Designer.cs">
<Compile Include="InputForms\InitProgramForm.Designer.cs">
<DependentUpon>InitProgramForm.cs</DependentUpon>
</Compile>
<Compile Include="MainWindowForm.cs">
Expand All @@ -78,22 +78,22 @@
<Compile Include="MainWindowForm.Designer.cs">
<DependentUpon>MainWindowForm.cs</DependentUpon>
</Compile>
<Compile Include="MainWindowInputForms\GetMessageForm.cs">
<Compile Include="InputForms\GetMessageForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MainWindowInputForms\GetMessageForm.Designer.cs">
<Compile Include="InputForms\GetMessageForm.Designer.cs">
<DependentUpon>GetMessageForm.cs</DependentUpon>
</Compile>
<Compile Include="NativeClient\NativeClient.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="InitProgramForm.resx">
<EmbeddedResource Include="InputForms\InitProgramForm.resx">
<DependentUpon>InitProgramForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainWindowForm.resx">
<DependentUpon>MainWindowForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainWindowInputForms\GetMessageForm.resx">
<EmbeddedResource Include="InputForms\GetMessageForm.resx">
<DependentUpon>GetMessageForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
115 changes: 0 additions & 115 deletions VS17/Client GUI/InitProgramForm.Designer.cs

This file was deleted.

76 changes: 0 additions & 76 deletions VS17/Client GUI/InitProgramForm.cs

This file was deleted.

101 changes: 101 additions & 0 deletions VS17/Client GUI/InputForms/GetMessageForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions VS17/Client GUI/InputForms/GetMessageForm.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Client_GUI.MainWindowInputForms
{
public partial class GetMessageForm : Form
{
#region Properties

public string Message { get; set; }

#endregion

#region Events

private void GetMessageForm_Load(object sender, EventArgs e)
{

}

private void sendButton_Click(object sender, EventArgs e)
{
this.Message = messageTextBox.Text;

this.Close();
}

private void cancelButton_Click(object sender, EventArgs e)
{
this.Message = string.Empty;

this.Close();
}

#endregion

#region Constructors

public GetMessageForm()
{
this.Message = string.Empty;

InitializeComponent();
}

#endregion
}
}
Loading

0 comments on commit 839f1bf

Please sign in to comment.