Permalink
Browse files

Merge pull request #13 from magurin/xlinkkai_protocol

Xlinkkai protocol, private messages
  • Loading branch information...
seuffert committed Nov 7, 2012
2 parents 748d7a4 + 5deb486 commit b6cd28d56d7791db447122072868313831850d0e
View
@@ -1,2 +1,7 @@
/XBSlink.suo
/XBSlink.userprefs
+XBSlink/obj
+XBSlink/bin
+_ReSharper.XBSlink/
+/*.suo
+/*.userprefs

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C# Express 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XBSlink", "XBSlink\XBSlink.csproj", "{60AED2EE-9511-4FC0-BE50-DC440E4EF254}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpPcap", "SharpPcap\SharpPcap.csproj", "{24262E52-1304-4A25-8F73-A3B06E40592E}"
@@ -17,14 +17,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|x86.ActiveCfg = Debug|x86
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|x86.Build.0 = Debug|x86
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|Any CPU.Build.0 = Release|Any CPU
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|x86.ActiveCfg = Release|x86
- {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|x86.Build.0 = Release|x86
{24262E52-1304-4A25-8F73-A3B06E40592E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24262E52-1304-4A25-8F73-A3B06E40592E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24262E52-1304-4A25-8F73-A3B06E40592E}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -37,6 +29,14 @@ Global
{55ABBA4C-AAF9-4726-A592-0C92436CEC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55ABBA4C-AAF9-4726-A592-0C92436CEC92}.Release|Any CPU.Build.0 = Release|Any CPU
{55ABBA4C-AAF9-4726-A592-0C92436CEC92}.Release|x86.ActiveCfg = Release|Any CPU
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|x86.ActiveCfg = Debug|x86
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Debug|x86.Build.0 = Debug|x86
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|Any CPU.Build.0 = Release|Any CPU
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|x86.ActiveCfg = Release|x86
+ {60AED2EE-9511-4FC0-BE50-DC440E4EF254}.Release|x86.Build.0 = Release|x86
{F5D74163-145F-47BF-83DC-D0E07249C6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5D74163-145F-47BF-83DC-D0E07249C6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5D74163-145F-47BF-83DC-D0E07249C6CA}.Debug|x86.ActiveCfg = Debug|Any CPU
View
@@ -11,6 +11,7 @@
using SharpPcap.WinPcap;
using NDesk.Options;
using System.Runtime.InteropServices;
+using XBSlink.Common;
using XBSlink.Properties;
namespace XBSlink

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -55,8 +55,12 @@ private void add_text(String[] messages)
for (int i = 0; i < messages.Length; i++)
background_color_list.Add(getBackColor(messages[i]));
listBox_messages.Items.AddRange(messages);
- int top_index = listBox_messages.Items.Count - (int)(listBox_messages.Height / listBox_messages.ItemHeight) + 2;
- listBox_messages.TopIndex = (top_index>0 && top_index<listBox_messages.Items.Count) ? top_index : 0;
+
+ if (chk_tail.Checked)
+ {
+ int top_index = listBox_messages.Items.Count - (int)(listBox_messages.Height / listBox_messages.ItemHeight) + 2;
+ listBox_messages.TopIndex = (top_index > 0 && top_index < listBox_messages.Items.Count) ? top_index : 0;
+ }
}
private void button_clear_Click(object sender, EventArgs e)
Oops, something went wrong.

0 comments on commit b6cd28d

Please sign in to comment.