Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester:[396] ACMServer/trunk/ACMServer/Plugins/ MediatorPlugins
|
From: <br...@us...> - 2008-09-30 08:48:45
|
Revision: 396
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=396&view=rev
Author: brus07
Date: 2008-09-30 08:48:32 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
Added LogDataGridView to WebGatePlugin and SocketServerGatePlugin.
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.csproj
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.Designer.cs
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.csproj
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.Designer.cs
ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.csproj
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.csproj 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.csproj 2008-09-30 08:48:32 UTC (rev 396)
@@ -28,6 +28,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="LogDataGridView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\Resource\LogDataGridView.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.Designer.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.Designer.cs 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.Designer.cs 2008-09-30 08:48:32 UTC (rev 396)
@@ -34,19 +34,22 @@
this.clientsCountToolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.clientCountTimer = new System.Windows.Forms.Timer(this.components);
this.autoScrollCheckBox = new System.Windows.Forms.CheckBox();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
this.socketGateStatusStrip.SuspendLayout();
+ this.tabControl1.SuspendLayout();
+ this.tabPage2.SuspendLayout();
this.SuspendLayout();
//
// textBox1
//
- this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBox1.Location = new System.Drawing.Point(3, 26);
+ this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.textBox1.Location = new System.Drawing.Point(3, 3);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBox1.Size = new System.Drawing.Size(211, 130);
+ this.textBox1.Size = new System.Drawing.Size(197, 98);
this.textBox1.TabIndex = 1;
//
// socketGateStatusStrip
@@ -82,18 +85,55 @@
this.autoScrollCheckBox.Text = "AutoScroll";
this.autoScrollCheckBox.UseVisualStyleBackColor = true;
//
+ // tabControl1
+ //
+ this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Location = new System.Drawing.Point(3, 26);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(211, 130);
+ this.tabControl1.TabIndex = 5;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(203, 104);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "tabPage1";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.textBox1);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(203, 104);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "tabPage2";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
// SocketServerGatePluginUserControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.autoScrollCheckBox);
this.Controls.Add(this.socketGateStatusStrip);
- this.Controls.Add(this.textBox1);
this.Name = "SocketServerGatePluginUserControl";
this.Size = new System.Drawing.Size(217, 181);
this.Load += new System.EventHandler(this.SocketServerGatePluginUserControl_Load);
this.socketGateStatusStrip.ResumeLayout(false);
this.socketGateStatusStrip.PerformLayout();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ this.tabPage2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -106,5 +146,8 @@
private System.Windows.Forms.ToolStripStatusLabel clientsCountToolStripStatusLabel;
private System.Windows.Forms.Timer clientCountTimer;
private System.Windows.Forms.CheckBox autoScrollCheckBox;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs 2008-09-30 08:48:32 UTC (rev 396)
@@ -14,14 +14,23 @@
public SocketServerGatePluginUserControl()
{
InitializeComponent();
+
+ initGridSe();
}
+ LogDataGridView.LogDataGridView view = new LogDataGridView.LogDataGridView();
+ private void initGridSe()
+ {
+ view.Dock = DockStyle.Fill;
+ tabPage1.Controls.Add(view);
+ }
+
delegate void AddTextCallback(string text);
- public void AddText(string text)
+ private void AddTextToTextLog(string text)
{
if (this.textBox1.InvokeRequired)
{
- AddTextCallback d = new AddTextCallback(AddText);
+ AddTextCallback d = new AddTextCallback(AddTextToTextLog);
this.Invoke(d, new object[] { text });
}
else
@@ -34,6 +43,11 @@
}
}
}
+ public void AddText(string text)
+ {
+ AddTextToTextLog(text);
+ view.AddRow(new LogDataGridView.SystemMessage(text, LogDataGridView.SystemMessageMode.Other));
+ }
delegate void UpdateClientsCountStatusCallback(int clientsCount);
public void UpdateClientsCountStatus(int clientsCount)
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.csproj
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.csproj 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.csproj 2008-09-30 08:48:32 UTC (rev 396)
@@ -28,6 +28,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="LogDataGridView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\Resource\LogDataGridView.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.Designer.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.Designer.cs 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.Designer.cs 2008-09-30 08:48:32 UTC (rev 396)
@@ -36,20 +36,23 @@
this.label2 = new System.Windows.Forms.Label();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.MainToolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
((System.ComponentModel.ISupportInitialize)(this.CheckingIntervalNumericUpDown)).BeginInit();
this.statusStrip1.SuspendLayout();
+ this.tabControl1.SuspendLayout();
+ this.tabPage2.SuspendLayout();
this.SuspendLayout();
//
// textBox2
//
- this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBox2.Location = new System.Drawing.Point(3, 58);
+ this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.textBox2.Location = new System.Drawing.Point(3, 3);
this.textBox2.Multiline = true;
this.textBox2.Name = "textBox2";
this.textBox2.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBox2.Size = new System.Drawing.Size(263, 145);
+ this.textBox2.Size = new System.Drawing.Size(246, 113);
this.textBox2.TabIndex = 2;
//
// setAddressButton
@@ -133,23 +136,60 @@
this.MainToolStripStatusLabel.Name = "MainToolStripStatusLabel";
this.MainToolStripStatusLabel.Size = new System.Drawing.Size(0, 17);
//
+ // tabControl1
+ //
+ this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Location = new System.Drawing.Point(6, 58);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(260, 145);
+ this.tabControl1.TabIndex = 9;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(252, 119);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "tabPage1";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.textBox2);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(252, 119);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "tabPage2";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
// WebGatePluginUserControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.CheckingIntervalNumericUpDown);
this.Controls.Add(this.addressComboBox);
this.Controls.Add(this.setAddressButton);
- this.Controls.Add(this.textBox2);
this.Name = "WebGatePluginUserControl";
this.Size = new System.Drawing.Size(269, 228);
this.Load += new System.EventHandler(this.WebGatePluginUserControl_Load);
((System.ComponentModel.ISupportInitialize)(this.CheckingIntervalNumericUpDown)).EndInit();
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage2.ResumeLayout(false);
+ this.tabPage2.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -165,5 +205,8 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel MainToolStripStatusLabel;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs 2008-09-29 13:39:57 UTC (rev 395)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs 2008-09-30 08:48:32 UTC (rev 396)
@@ -14,8 +14,18 @@
public WebGatePluginUserControl()
{
InitializeComponent();
+
+ initGridSe();
+ }
+
+ LogDataGridView.LogDataGridView view = new LogDataGridView.LogDataGridView();
+ private void initGridSe()
+ {
+ view.Dock = DockStyle.Fill;
+ tabPage1.Controls.Add(view);
}
+
private void setAddressButton_Click(object sender, EventArgs e)
{
WebGate gate = WebGate.GetInstance();
@@ -36,11 +46,11 @@
}
delegate void AddTextCallback(string text);
- public void AddText(string text)
+ private void AddTextToTextLog(string text)
{
if (this.textBox2.InvokeRequired)
{
- AddTextCallback d = new AddTextCallback(AddText);
+ AddTextCallback d = new AddTextCallback(AddTextToTextLog);
this.Invoke(d, new object[] { text });
}
else
@@ -55,6 +65,12 @@
}
}
+ public void AddText(string text)
+ {
+ AddTextToTextLog(text);
+ view.AddRow(new LogDataGridView.SystemMessage(text, LogDataGridView.SystemMessageMode.Other));
+ }
+
public string MainStatusMessage
{
set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
