Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester:[403] ACMServer/trunk
|
From: <br...@us...> - 2008-10-03 14:16:14
|
Revision: 403
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=403&view=rev
Author: brus07
Date: 2008-10-03 14:16:07 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
Modify LogDataGridView.
Time column split to 2 columns: Time, Date.
And fix some small bugs.
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Resource/LogDataGridView.dll
ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/Properties/AssemblyInfo.cs
ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/SystemMessage.cs
Modified: ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/Properties/AssemblyInfo.cs
===================================================================
--- ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/Properties/AssemblyInfo.cs 2008-10-02 21:00:45 UTC (rev 402)
+++ ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/Properties/AssemblyInfo.cs 2008-10-03 14:16:07 UTC (rev 403)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
Modified: ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/SystemMessage.cs
===================================================================
--- ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/SystemMessage.cs 2008-10-02 21:00:45 UTC (rev 402)
+++ ACMServer/trunk/tasks/LogDataGridView/LogDataGridView/SystemMessage.cs 2008-10-03 14:16:07 UTC (rev 403)
@@ -13,15 +13,17 @@
private ContextMenuStrip contextMenuStrip = new ContextMenuStrip();
private ToolStripMenuItem toolStripMenuItemTime = new ToolStripMenuItem();
+ private ToolStripMenuItem toolStripMenuItemDate = new ToolStripMenuItem();
private ToolStripMenuItem toolStripMenuItemText = new ToolStripMenuItem();
private ToolStripMenuItem toolStripMenuItemMode = new ToolStripMenuItem();
private void InitContexMenu()
{
contextMenuStrip.Items.AddRange(new ToolStripItem[]{
toolStripMenuItemTime,
+ toolStripMenuItemDate,
toolStripMenuItemText,
toolStripMenuItemMode});
- contextMenuStrip.Name = "ContexMenoStrip";
+ contextMenuStrip.Name = "ContexMenuStrip";
contextMenuStrip.ShowCheckMargin = true;
contextMenuStrip.ShowImageMargin = false;
contextMenuStrip.Size = new Size(180, 92);
@@ -31,6 +33,11 @@
toolStripMenuItemTime.Checked = true;
toolStripMenuItemTime.Click += new EventHandler(toolStripMenuItem_Click);
+ toolStripMenuItemDate.Size = new Size(179, 22);
+ toolStripMenuItemDate.Text = "Visible Date Column";
+ toolStripMenuItemDate.Checked = true;
+ toolStripMenuItemDate.Click += new EventHandler(toolStripMenuItem_Click);
+
toolStripMenuItemText.Size = new Size(179, 22);
toolStripMenuItemText.Text = "Visible Text Column";
toolStripMenuItemText.Checked = true;
@@ -44,6 +51,8 @@
void toolStripMenuItem_Click(object sender, EventArgs e)
{
+ //Bug: jaksho shovaty vsi kolonky, todi ne mozna vidkryty ContextMenu
+
ToolStripMenuItem toolStrip = (ToolStripMenuItem)sender;
if (toolStrip == toolStripMenuItemTime)
{
@@ -58,29 +67,48 @@
toolStripMenuItemTime.Checked = true;
}
}
+ if (toolStrip == toolStripMenuItemDate)
+ {
+ if (toolStripMenuItemDate.Checked)
+ {
+ columns[1].Visible = false;
+ toolStripMenuItemDate.Checked = false;
+ }
+ else
+ {
+ columns[1].Visible = true;
+ toolStripMenuItemDate.Checked = true;
+ }
+ }
if (toolStrip == toolStripMenuItemText)
{
if (toolStripMenuItemText.Checked)
{
- columns[1].Visible = false;
+ columns[2].Visible = false;
toolStripMenuItemText.Checked = false;
}
else
{
- columns[1].Visible = true;
+ columns[2].Visible = true;
toolStripMenuItemText.Checked = true;
+
+ //Hack: jaksho shovaty, a potim vidobrazyty Text'ovu kolonky
+ // todi vysota rjadkiv stane defoltnoju, a ne roztjagnetsja avtomatom, po tekstu.
+ // Tomu roblju she taki dvi zminy, shob updejtnyty GridView
+ columns[1].Visible = !columns[1].Visible;
+ columns[1].Visible = !columns[1].Visible;
}
}
if (toolStrip == toolStripMenuItemMode)
{
if (toolStripMenuItemMode.Checked)
{
- columns[2].Visible = false;
+ columns[3].Visible = false;
toolStripMenuItemMode.Checked = false;
}
else
{
- columns[2].Visible = true;
+ columns[3].Visible = true;
toolStripMenuItemMode.Checked = true;
}
}
@@ -100,6 +128,12 @@
result.Add(column);
column = new DataGridViewTextBoxColumn();
+ column.Name = "Date";
+ column.AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
+ column.ContextMenuStrip = this.contextMenuStrip;
+ result.Add(column);
+
+ column = new DataGridViewTextBoxColumn();
column.Name = "Log text";
column.MinimumWidth = 150;
column.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
@@ -137,10 +171,11 @@
public override object[] GetValues()
{
- object[] result = new object[3];
+ object[] result = new object[4];
result[0] = this.Time;
- result[1] = this.Text;
- result[2] = this.Mode;
+ result[1] = this.Date;
+ result[2] = this.Text;
+ result[3] = this.Mode;
return result;
}
@@ -150,14 +185,22 @@
{
DateTime dt = DateTime.Now;
string result = "";
- result += dt.ToShortDateString();
- result += Environment.NewLine;
result += dt.ToLongTimeString();
result += ".";
result += dt.Millisecond.ToString();
return result;
}
}
+ private string Date
+ {
+ get
+ {
+ DateTime dt = DateTime.Now;
+ string result = "";
+ result += dt.ToShortDateString();
+ return result;
+ }
+ }
private string Text
{
get
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
