Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Jsj 2008-03-05 21:31:57 +00:00
parent e3842e54b2
commit f30af1b77c
5 changed files with 1375 additions and 1268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/VEPROMS User Interface/frmSectionProperties.cs
View File

@ -135,7 +135,7 @@ namespace VEPROMS
/// <param name="e">EventArgs</param> /// <param name="e">EventArgs</param>
private void ppCmbxFormat_SelectedValueChanged(object sender, EventArgs e) private void ppCmbxFormat_SelectedValueChanged(object sender, EventArgs e)
{ {
if ((ppCmbxFormat.SelectedIndex != -1) && _DefaultFormatName.Equals(ppCmbxFormat.SelectedValue)) if ((ppCmbxFormat.SelectedIndex != -1) && _DefaultFormatName != null && _DefaultFormatName.Equals(ppCmbxFormat.SelectedValue))
{ {
ppBtnDefaultFmt.Focus(); ppBtnDefaultFmt.Focus();
ppBtnDefaultFmt.PerformClick(); ppBtnDefaultFmt.PerformClick();

1331
PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

166
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -58,12 +58,6 @@ namespace VEPROMS
tv.NodeProperties += new Volian.Controls.Library.vlnTreeViewEvent(tv_NodeProperties); tv.NodeProperties += new Volian.Controls.Library.vlnTreeViewEvent(tv_NodeProperties);
_CommentTitleBckColor = epComments.TitleStyle.BackColor1.Color; _CommentTitleBckColor = epComments.TitleStyle.BackColor1.Color;
epComments.Expanded = false; epComments.Expanded = false;
// TODO: load previously set bookmarks
btnPrevPos.Enabled = false;
btnClrBookMrks.Enabled = false;
btnRmvCurBookMrk.Enabled = false;
lbxBookMarks.Enabled = false;
_PrevBookMark = null;
infoPanel.Expanded = false; infoPanel.Expanded = false;
} }
@ -90,10 +84,37 @@ namespace VEPROMS
if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size; if (Settings.Default["Size"] != null) this.Size = Settings.Default.Size;
ShutDownRibbons(); ShutDownRibbons();
_MyMRIList = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["MRIList"])); _MyMRIList = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["MRIList"]));
_MyBookMarks = MostRecentItemList.GetMRILst((System.Collections.Specialized.StringCollection)(Properties.Settings.Default["BookMarks"]));
SetupMRU(); SetupMRU();
SetupBookMarks();
SetupAnnotations();
} }
private void SetupAnnotations()
{
cbAnnoType.DataSource = AnnotationTypeInfoList.Get();
cbAnnoType.DisplayMember = "Name";
lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove);
}
#region MRU #region MRU
private MostRecentItemList _MyMRIList; private MostRecentItemList _MyMRIList;
private MostRecentItemList _MyBookMarks;
private void SetupBookMarks()
{
// TODO: load previously set bookmarks
lbxBookMarks.SelectedValueChanged += new EventHandler(lbxBookMarks_SelectedValueChanged);
RefreshBookMarkData();
btnPrevPos.Enabled = false;
//lbxBookMarks.Enabled = false;
_PrevBookMark = null;
}
void lbxBookMarks_SelectedValueChanged(object sender, EventArgs e)
{
btnRmvCurBookMrk.Enabled = (lbxBookMarks.SelectedIndex >= 0);
}
private void SetupMRU() private void SetupMRU()
{ {
icRecentDocs.SubItems.Clear(); icRecentDocs.SubItems.Clear();
@ -139,6 +160,7 @@ namespace VEPROMS
private void SaveMRU() private void SaveMRU()
{ {
Properties.Settings.Default.MRIList = _MyMRIList.ToSettings(); Properties.Settings.Default.MRIList = _MyMRIList.ToSettings();
Properties.Settings.Default.BookMarks = _MyBookMarks.ToSettings();
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
} }
#endregion #endregion
@ -738,12 +760,12 @@ namespace VEPROMS
/// <param name="e"></param> /// <param name="e"></param>
private void btnPrevPos_Click(object sender, EventArgs e) private void btnPrevPos_Click(object sender, EventArgs e)
{ {
if (_PrevBookMark != null) //if (_PrevBookMark != null)
{ //{
VETreeNode jumpToHere = _PrevBookMark; // save current previous // VETreeNode jumpToHere = _PrevBookMark; // save current previous
btnSetBookMrk_Click(sender, e); // save current as the new previous // btnSetBookMrk_Click(sender, e); // save current as the new previous
tv.SelectedNode = jumpToHere; // jump to the saved previous // tv.SelectedNode = jumpToHere; // jump to the saved previous
} //}
} }
/// <summary> /// <summary>
@ -753,12 +775,22 @@ namespace VEPROMS
/// <param name="e"></param> /// <param name="e"></param>
private void btnClrBookMrks_Click(object sender, EventArgs e) private void btnClrBookMrks_Click(object sender, EventArgs e)
{ {
lbxBookMarks.Items.Clear(); _MyBookMarks.Clear();
lbxBookMarks.Enabled = false; RefreshBookMarkData();
btnPrevPos.Enabled = false; //lbxBookMarks.Items.Clear();
btnClrBookMrks.Enabled = false; //lbxBookMarks.Enabled = false;
btnRmvCurBookMrk.Enabled = false; //btnPrevPos.Enabled = false;
_PrevBookMark = null; //btnClrBookMrks.Enabled = false;
//btnRmvCurBookMrk.Enabled = false;
//_PrevBookMark = null;
}
private void RefreshBookMarkData()
{
lbxBookMarks.DataSource = null;
lbxBookMarks.DataSource = _MyBookMarks;
lbxBookMarks.DisplayMember = "MenuTitle";
btnClrBookMrks.Enabled = (lbxBookMarks.Items.Count > 0);
} }
/// <summary> /// <summary>
@ -768,26 +800,28 @@ namespace VEPROMS
/// <param name="e"></param> /// <param name="e"></param>
private void btnRmvCurBookMrk_Click(object sender, EventArgs e) private void btnRmvCurBookMrk_Click(object sender, EventArgs e)
{ {
lbxBookMarks.Items.RemoveAt(lbxBookMarks.SelectedIndex); _MyBookMarks.RemoveAt(lbxBookMarks.SelectedIndex);
if (lbxBookMarks.Items.Count == 0) RefreshBookMarkData();
{ // lbxBookMarks.Items.RemoveAt(lbxBookMarks.SelectedIndex);
lbxBookMarks.Enabled = false; // if (lbxBookMarks.Items.Count == 0)
btnPrevPos.Enabled = false; // {
btnClrBookMrks.Enabled = false; // //lbxBookMarks.Enabled = false;
btnRmvCurBookMrk.Enabled = false; // btnPrevPos.Enabled = false;
_PrevBookMark = null; // btnClrBookMrks.Enabled = (lbxBookMarks.Items.Count > 0);
} // //btnRmvCurBookMrk.Enabled = (lbxBookMarks.SelectedIndex >= 0);
// _PrevBookMark = null;
// }
} }
/// <summary> /// <summary>
/// Adds the given tree node to the list of bookmarks /// Adds the given tree node to the list of bookmarks
/// </summary> /// </summary>
/// <param name="bkmrk"></param> /// <param name="bkmrk"></param>
private void AddToBookMarkList(VETreeNode bkmrk) //private void AddToBookMarkList(VETreeNode bkmrk)
{ //{
if (!(lbxBookMarks.Items.Contains(bkmrk))) // if (!(lbxBookMarks.Items.Contains(bkmrk)))
lbxBookMarks.Items.Add(bkmrk); // lbxBookMarks.Items.Add(bkmrk);
} //}
/// <summary> /// <summary>
/// Set Bookmark button on the Information pannel /// Set Bookmark button on the Information pannel
@ -796,26 +830,18 @@ namespace VEPROMS
/// <param name="e"></param> /// <param name="e"></param>
private void btnSetBookMrk_Click(object sender, EventArgs e) private void btnSetBookMrk_Click(object sender, EventArgs e)
{ {
VETreeNode tn = (VETreeNode)(tv.SelectedNode); DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel;
AddToBookMarkList(tn); _MyBookMarks.Add(dtp.SelectedItem.MyItem);
_PrevBookMark = tn; RefreshBookMarkData();
lbxBookMarks.Enabled = true; //VETreeNode tn = (VETreeNode)(tv.SelectedNode);
btnPrevPos.Enabled = true; //AddToBookMarkList(tn);
btnClrBookMrks.Enabled = true; //_PrevBookMark = tn;
btnRmvCurBookMrk.Enabled = true; //lbxBookMarks.Enabled = true;
//btnPrevPos.Enabled = true;
//btnClrBookMrks.Enabled = true;
//btnRmvCurBookMrk.Enabled = true;
} }
/// <summary>
/// Bookmarks List item double click event
/// Jump to slected bookmark
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void lbxBookMarks_DoubleClick(object sender, EventArgs e)
{
if (lbxBookMarks.SelectedItem != null)
tv.SelectedNode = (VETreeNode)lbxBookMarks.SelectedItem;
}
#endregion #endregion
#region DisplayPanel #region DisplayPanel
@ -1161,5 +1187,45 @@ namespace VEPROMS
displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB;
displayRO.CurROLink = args.RoUsageid; // this is wrong - use for now. displayRO.CurROLink = args.RoUsageid; // this is wrong - use for now.
} }
private bool _LoadingList = false;
private void cbAnnoType_SelectedValueChanged(object sender, EventArgs e)
{
AnnotationTypeInfo ati = cbAnnoType.SelectedValue as AnnotationTypeInfo;
_LoadingList = true;
lbResults.DataSource = ati.AnnotationTypeAnnotations;
lbResults.DisplayMember = "SearchText";
lbResults.SelectedIndex = -1;
LastResultsMouseOverIndex = -1;
_LoadingList = false;
}
private int LastResultsMouseOverIndex=-1;
void lbResults_MouseMove(object sender, MouseEventArgs e)
{
int ResultsMouseOverIndex = lbResults.IndexFromPoint(e.Location);
if (ResultsMouseOverIndex != -1 && ResultsMouseOverIndex != LastResultsMouseOverIndex)
{
AnnotationInfo ai = lbResults.Items[ResultsMouseOverIndex] as AnnotationInfo;
toolTip1.SetToolTip(lbResults, ai.MyItem.Path);
LastResultsMouseOverIndex = ResultsMouseOverIndex;
}
}
private void lbResults_SelectedValueChanged(object sender, EventArgs e)
{
if (!_LoadingList)
{
AnnotationInfo ai = lbResults.SelectedValue as AnnotationInfo;
tc.OpenItem(ai.MyItem);
}
}
private void lbxBookMarks_Click(object sender, EventArgs e)
{
MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem;
tc.OpenItem(itm.MyItem);
}
} }
} }

14
PROMS/VEPROMS User Interface/frmVEPROMS.resx
View File

@ -128,6 +128,9 @@
cHBwcHd3d3ezPnd3B3AHdwB3d3ezPnd3d3d3d3d3d3ezPnd3d3d3d3d3d3ezPnd3d3d3d3d3d3ezPg== cHBwcHd3d3ezPnd3B3AHdwB3d3ezPnd3d3d3d3d3d3ezPnd3d3d3d3d3d3ezPnd3d3d3d3d3d3ezPg==
</value> </value>
</data> </data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnChgTyp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnChgTyp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -759,9 +762,6 @@
bFkILv1JUUyMWgDrxVLnzhXMLQAAAABJRU5ErkJggg== bFkILv1JUUyMWgDrxVLnzhXMLQAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnInsPgBrk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnInsPgBrk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -1056,9 +1056,6 @@
Bj7Ytu3MNM0z2vf7fTpku91iyG+I+Vlp8+f1t3/G/0p4HPgGBbHOq7wkrakAAAAASUVORK5CYII= Bj7Ytu3MNM0z2vf7fTpku91iyG+I+Vlp8+f1t3/G/0p4HPgGBbHOq7wkrakAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="btnExit2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnExit2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -3640,7 +3637,7 @@
<value>156, 17</value> <value>156, 17</value>
</metadata> </metadata>
<data name="c1CommentGrid.ColumnInfo" xml:space="preserve"> <data name="c1CommentGrid.ColumnInfo" xml:space="preserve">
<value>5,0,0,0,0,85,Columns:0{Width:127;Name:"MyAnnotationType";Caption:"Type";Style:"TextAlign:GeneralCenter;";} 1{Width:39;Name:"DTS";Caption:"Date";Style:"Format:"d";DataType:System.DateTime;TextAlign:LeftCenter;";} 2{Width:55;Name:"UserID";Caption:"User";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 4{Width:82;Name:"SearchText";Caption:"Description";Style:"DataType:System.String;TextAlign:LeftCenter;";} </value> <value>5,0,0,0,0,100,Columns:0{Width:127;Name:"MyAnnotationType";Caption:"Type";Style:"TextAlign:GeneralCenter;";} 1{Width:39;Name:"DTS";Caption:"Date";Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 2{Width:55;Name:"UserID";Caption:"User";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 4{Width:82;Name:"SearchText";Caption:"Description";Style:"DataType:System.String;TextAlign:LeftCenter;";} </value>
</data> </data>
<data name="c1CommentGrid.StyleInfo" xml:space="preserve"> <data name="c1CommentGrid.StyleInfo" xml:space="preserve">
<value>Normal{Font:Microsoft Sans Serif, 8pt;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:AppWorkspace;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} </value> <value>Normal{Font:Microsoft Sans Serif, 8pt;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:AppWorkspace;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} </value>
@ -3675,6 +3672,9 @@
F5viAAAAAElFTkSuQmCC F5viAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>402, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>41</value> <value>41</value>
</metadata> </metadata>

2
PROMS/VEPROMS User Interface/frmVersionsProperties.cs
View File

@ -603,7 +603,7 @@ namespace VEPROMS
/// <param name="deflabel">label containing the default</param> /// <param name="deflabel">label containing the default</param>
private void ProcessCmbxSelectedValueChange(ComboBoxEx cmbx, string defstr, ButtonX button, Label deflabel) private void ProcessCmbxSelectedValueChange(ComboBoxEx cmbx, string defstr, ButtonX button, Label deflabel)
{ {
if ((cmbx.SelectedIndex != -1) && defstr.Equals(cmbx.SelectedValue)) if ((cmbx.SelectedIndex != -1) && defstr != null && defstr.Equals(cmbx.SelectedValue))
{ {
button.Focus(); button.Focus();
button.PerformClick(); button.PerformClick();