846,8 → 846,15 |
|
private void recentMenuItem_Click(object sender, EventArgs e) |
{ |
MenuItem menuItem = (MenuItem)sender; |
RecentItem recentItem = (RecentItem)recentItems[recentItems.Count - menuItem.Index - 1]; |
int n = recentItems.Count-1; |
foreach(MenuItem menuItem in recentListeningMenu.MenuItems) { |
if(sender == menuItem) break; |
n--; |
} |
if(n < 0) |
throw new Exception("Unknown sender"); |
|
RecentItem recentItem = (RecentItem)recentItems[n]; |
IPAddress resendIp; |
|
this.listenPort = recentItem.ListenPort; |
1023,7 → 1030,7 |
int existingIdx = recentItems.IndexOf(recentItem); |
if(existingIdx >= 0) { |
recentItems.RemoveAt(existingIdx); |
this.recentListeningMenu.MenuItems.RemoveAt(recentItems.Count - existingIdx - 1); |
this.recentListeningMenu.MenuItems.RemoveAt(recentItems.Count - existingIdx); |
} |
|
if(recentItems.Count == 0 && this.recentListeningMenu.MenuItems.Count == 1) |
1046,16 → 1053,14 |
// update hot keys of old items |
int count = 0; |
foreach(MenuItem item in this.recentListeningMenu.MenuItems) { |
RecentItem ri = (RecentItem)recentItems[recentItems.Count - count - 1]; |
|
if(count == 0) { |
} |
else if(count < 10) |
item.Text = string.Format("&{3} {0} to {1}:{2}", ri.ListenPort, |
ri.ResendHost, ri.ResendPort, count + 1); |
item.Text = string.Format("&{3} {0} to {1}:{2}", recentItem.ListenPort, |
recentItem.ResendHost, recentItem.ResendPort, count + 1); |
else |
item.Text = string.Format("{0} to {1}:{2}", ri.ListenPort, |
ri.ResendHost, ri.ResendPort); |
item.Text = string.Format("{0} to {1}:{2}", recentItem.ListenPort, |
recentItem.ResendHost, recentItem.ResendPort); |
count++; |
} |
} |
1365,22 → 1370,17 |
} |
} |
|
private string TcpNodeTitle(TcpConnection tcp) |
{ |
return tcp.Id + " " + tcp.StartTimestamp.ToString("HH:mm:ss.ffff"); |
} |
|
private void AddTcpNodeInternal(TcpConnection tcp) |
private void AddTcpNodeInternal(TcpConnection tcp) |
{ |
TreeNode treeNode = new TreeNode(TcpNodeTitle(tcp)); |
TreeNode treeNode = new TreeNode(tcp.ToString()); |
TcpNodeData data = new TcpNodeData(this, treeNode); |
|
data.Tcp = tcp; |
data.Tcp = tcp; |
treeNode.Tag = data; |
treeNode.ImageIndex = (tcp.LocalState == SocketState.Closed |
&& tcp.RemoteState == SocketState.Closed) ? 2 : 1; |
treeNode.SelectedImageIndex = treeNode.ImageIndex; |
treeNodes[tcp] = data; |
treeNodes[tcp] = data; |
|
messageView.Nodes.Add(treeNode); |
treeNode.EnsureVisible(); |
1391,7 → 1391,7 |
TcpNodeData data = treeNodes[tcp] as TcpNodeData; |
if(data == null) return; // might be call by Cancel |
|
string title = TcpNodeTitle(tcp); |
string title = tcp.ToString(); |
if(title != data.Node.Text) data.Node.Text = title; |
if(tcp.LocalState == SocketState.Closed && tcp.RemoteState == SocketState.Closed) |
{ |
1405,19 → 1405,13 |
data.Show(); |
} |
|
private string HttpNodeTitle(HttpMessage http) |
{ |
return (http.Request.SoapAction != null ? ("SOAP " + http.Request.SoapAction) |
: (http.Request.Method == null ? "" : http.Request.Method) + " " + (http.Request.Uri == null ? "" : http.Request.Uri)); |
} |
|
private void AddHttpNodeInternal(TcpConnection tcp, HttpMessage http) |
private void AddHttpNodeInternal(TcpConnection tcp, HttpMessage http) |
{ |
TreeNode treeNode = new TreeNode(HttpNodeTitle(http)); |
TreeNode treeNode = new TreeNode(http.ToString()); |
HttpNodeData data = new HttpNodeData(this, treeNode); |
|
data.Http = http; |
treeNode.Tag = data; |
data.Http = http; |
treeNode.Tag = data; |
treeNodes[http] = data; |
|
TcpNodeData tcpData = treeNodes[tcp] as TcpNodeData; |
1433,7 → 1427,7 |
HttpNodeData httpData = treeNodes[http] as HttpNodeData; |
if(httpData == null) return; // might be call by Cancel |
|
string title = HttpNodeTitle(http); |
string title = http.ToString(); |
if(httpData.Node.Text != title) httpData.Node.Text = title; |
|
if(!httpData.RequestXmlShown && http.Request.Xml != null) |