Avans/ErgometerDoctorApplication
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
Conflicts:
	ErgometerDoctorApplication/MainWindow.cs
This commit is contained in:
Aareschluchtje
2015-10-20 13:45:23 +02:00
parent 91a659b6fb dfc4ab9b42
commit a0e71b562b
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerDoctorApplication/Client/ClientThread.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace ErgometerDoctorApplication
window.Invoke(window.updateMetingen, new Object[] { command.Meting });
break;
case NetCommand.CommandType.CHAT:
ChatMessage chat = new ChatMessage(command.DisplayName, command.ChatMessage, false);
ChatMessage chat = new ChatMessage(command.DisplayName, command.ChatMessage, command.IsDoctor);
Chat.Add(chat);
window.panelClientChat.Invoke(window.panelClientChat.passChatMessage, new Object[] { chat });
break;
ErgometerDoctorApplication/Client/PanelClientChat.cs
+3 -3
View File
@@ -17,8 +17,8 @@ namespace ErgometerDoctorApplication
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.RichTextBox richTextBox1;
public System.Windows.Forms.Button button1;
public System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.Label connectionLabel;
@@ -153,7 +153,7 @@ namespace ErgometerDoctorApplication
if (richTextBox1.TextLength > 1)
{
AddChatItem(new ChatMessage("Doctor", richTextBox1.Text, true));
MainClient.SendNetCommand(new NetCommand(richTextBox1.Text, Session));
MainClient.SendNetCommand(new NetCommand(richTextBox1.Text, true, Session));
richTextBox1.ResetText();
}
}
ErgometerDoctorApplication/Client/SessionWindow.cs
+4 -1
View File
@@ -43,7 +43,10 @@ namespace ErgometerDoctorApplication
InitializeComponent();
if(! ActiveSession)
panelClientChat.Visible = false;
{
panelClientChat.richTextBox1.Enabled = false;
panelClientChat.button1.Enabled = false;
}
}
public void ClientApplicatie_Resize(object sender, EventArgs e)
ErgometerDoctorApplication/MainClient.cs
+2 -1
View File
@@ -96,7 +96,7 @@ namespace ErgometerDoctorApplication
loggedin = true;
}
SendNetCommand(new NetCommand(NetCommand.RequestType.USERS, Session));
//SendNetCommand(new NetCommand(NetCommand.RequestType.USERS, Session));
SendNetCommand(new NetCommand(NetCommand.RequestType.SESSIONDATA, Session));
return true;
@@ -254,6 +254,7 @@ namespace ErgometerDoctorApplication
return;
SendNetCommand(new NetCommand(NetCommand.RequestType.OLDDATA, session));
SendNetCommand(new NetCommand(NetCommand.RequestType.CHAT, session));
//Start new client
ClientThread cl = new ClientThread(name, session, true);