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

New Enhanced Document Properties

Browse Source 
Fixed Find and Replace logic to keep it from getting into an infinite loop
Used new CSLA code to hanndle deletion of procedures with external transitions
New Enhanced Document properties
This commit is contained in:
Rich
2015-10-27 13:34:33 +00:00
parent e22458bd1a
commit 58e58083c2
7 changed files with 242 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PROMS/Volian.Controls.Library/FindReplace.cs
View File

@@ -12,8 +12,13 @@ namespace Volian.Controls.Library
public partial class FindReplace : DevComponents.DotNetBar.Office2007Form
{
private bool doingfind = false;
private bool found = false;
private bool findingbookmarks = false;
private bool _FoundIt = false;
public bool FoundIt
{
get { return _FoundIt; }
set { _FoundIt = value; }
}
private bool IsFound
{
get
@@ -130,7 +135,6 @@ namespace Volian.Controls.Library
else
{
MyEditItem.ReplaceText(cmboReplaceText.Text, cmboFindText.Text, cbxCaseSensitive.Checked, cbxWholeWord.Checked, cbxReverse.Checked, false, null);
found = false;
}
}
@@ -149,7 +153,8 @@ namespace Volian.Controls.Library
{
findingbookmarks = true;
if (!IsFound) btnFindNext_Click(sender, e);
while (IsFound) // found is set in btnFindNext_Click()
FoundIt = true;
while (FoundIt) // found is set in btnFindNext_Click()
{
MyDisplayBookMarks.AddBookMark(MyEditItem.MyItemInfo);
btnFindNext_Click(sender, e);
@@ -158,17 +163,14 @@ namespace Volian.Controls.Library
MyEditItem.MyStepPanel.OnTabDisplay(sender, args);
findingbookmarks = false;
}
private void btnFndRplDone_Click(object sender, EventArgs e)
{
//this.Close();
doingfind = false;
this.Visible = false;
}
private void btnFindNext_Click(object sender, EventArgs e)
{
found = false;
AddToComboLists();
doingfind = true;
while (!MyEditItem.FindText(cmboFindText.Text, cbxCaseSensitive.Checked, cbxWholeWord.Checked, cbxReverse.Checked))
@@ -186,6 +188,7 @@ namespace Volian.Controls.Library
else
MessageBox.Show(this, "Not Found - From Here to End of Section", "Find/Replace");
}
FoundIt = false;
return;
}
@@ -199,7 +202,7 @@ namespace Volian.Controls.Library
MyEditItem.MyStepRTB.Visible = true;
MyEditItem.MyStepRTB.Focus();
}
found = true;
FoundIt = true;
}
private bool FindNextText(ItemInfo next)
{