diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx
index c950d8f5..3c84ece0 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx
@@ -121,83 +121,85 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAACK0lE
- QVQ4T6VSTWsTURTtT8hPmJ9QFFy4ytLloA1kGcFFFyrBhQRBHApCMKgRKRosnbEqNpLa2dSO0doRbbWI
- dLBWYxsm0xI1babp06nSD83x3nnW2KYb8cHh3XfvPed+zHQA+C/s6ZyYCXCruIz07Qp6+ufQWyhj5PlH
- CrXn7ni8cdeRH29ALy7Bq2/iy9oWRLBJ9gYu5ktI6w6KLxYpdQ8BJt+zV+F/a8J2AG0QUNMSbNuOgLva
- xLneSYw8LRNllwBXXvnehGED0RRgWIBY5zzAE0DyOvsEKiRyKvOY3S2BibdreDDdCCszmZP5mC+BRFbe
- LBZNCbIFdOsdcvlXnCIF7jyq45P4EbYaTcq2sybQSbbSLZDMUgt0VE0gkXYw5wY4emaIXVIgc3cxXJiq
- SVJnt4RCSBCZq9slAUW1ocRt1PwAB2JXWwLnb7q07a2wfUmk5ISgTmRl06Y3ESOqSbeJWv0r9qmXOSQF
- cvcrWPA3aHZJVOJeiOygFIioDkEKqCkbpXIVXScMDkmB0cnPsBw/XBATI3EmODSSR3uhN5MPmSEMy8OQ
- NYsLN8ZaAozMwAzm/Z9U9TeBwDafbbJmOPiw7OPIcZ3dIe+PwNhUFT25KbgN+heoiqo54dwMttk3X11B
- jFrvL9B33S3AGH1WwelL4zAevsf07AKWaNu1ehDOzG13UWX9LzJjh8A2+gqvcezsMA7Gr2H/4SuInRxA
- pu8Jhdpz2xz/BnT8ArdxBbaHHpuKAAAAAElFTkSuQmCC
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAACG0lE
+ QVQ4T6WQX0sUURiH/Qj7EeYjSEEXXe1ll4dS2MsNutgLjaWLkCAahGBJqo2QXBJ3siKNNefG2ixzojQl
+ wiGzNpXdUazUHfXUWPin9olzJt22hSAa+DGHl/d53vecBqDhf1JXUBmbDrg5vErqVon2nlk6c/MMPf/A
+ n311gtfFLfpH18kOr+CVd/i8uYsMdvDK21zsL5DKugy/WKwR1cB3nQ38rxUcF8w+EKkw6uy4kuJGhXOd
+ 4ww9nd+X7AvU5LVvFSwHom1g5UFuqT7wJCS7VE1S2qhwquNxrWDszSb3p9b1ZAWrZvXZExBPh38li7ZJ
+ 7AlJNv+WTP9LLdGC24/KfJTf9arRZLh22obGJBgJSTIttVCYknjKZbYYcPzMQFXQcWdRP5gwQ6gxEcZI
+ qA2knu4UJIZwMGIOy37AoearVcH5G0VksKvXD0GJEZeIVDjZdqQGI8LGiNksl79wQFyuCjL3Siz42yS7
+ QtCIeTrpvlAQES4REQpEm0NhfommVqsqeDD+ibzr6wdSYCSmABdheph9XggfsXWsvMdAfoYL10eqAv0O
+ vdPM+T9I7wHC0We9wS/YtFzer/oca8lquEYwMrlEe2aS4npFTxGmq++tos6qNre0RnOrRU9uol6gr/Ks
+ xOlLo1gP3zE1s8CKH7BcDvSd1dpNLVmyv8F1gr10515x4uwgh2PXOHj0Cs0ne+noflID/lXwL/kJt3EF
+ thF+kyUAAAAASUVORK5CYII=
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
- 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
+ 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
- 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
- rkJggg==
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr7AAAK+wHLnx2QAAADAklE
+ QVQ4T32R3U9ScRjH+wNaW62rml7UevGtVasMa71pqSVNKaLMMsVAFOpYqVNBUqRieTA8iGhBcawMp4Wo
+ neoiJ6P1ptOmsZqKK5g6zbWmvTjTbzsUN1JdfJ+b7+/5PM/z/S0AsIAVRTNBFM0QFM0wFeaWMU3N/TEV
+ ZWXkZB2Rq74R5H83X/5mDkUztvLWJlBdVlS6aqEbKMGZ9kSkVZCQFlfZMvJIzvxmH+DPZFtRmxaX3xfg
+ 4ad2dH5zI9Mqh+ZdLtKaohGj0uG4TG07JCoO2IQFEAW0CenPN8MwlA/mkxOvJnvx9vs47nptOKUvxS79
+ W2xTX8SB1HzibwAmRXsHokc8lLiScf0DCbOnFFSPGaK6e8iomsARzRBCag9iryCHCQCwgWVSbvCMQqQ+
+ 24WslzGQmc5DcvMhhFVvcKrciy1UHVbe2ocdvOyxAACb9lnTDJKLldhticKeFh6O6khk6b1I1w5DoO7H
+ KnMqgqujwOGKAwEqvZWRGicgqR7FESIFMYYUbG1MBucWhWNqNxIVvYiWJCA8fyc2xwsDT5CTNHGW7MBp
+ wzTSyAEcuCDGBksiQur2Y02lHLF5nYiSZGE7/ygLCAzxgvpGkIz956suZJOPUWCoR26FGScKtVhxJRKR
+ mRJwRSRkJdc/qqqbhxW6Rs+5S7RFVGjg+gBsKSTri2qs7T963nsx9W0Oo5+n0fz0DaRKExLESlTXt2O+
+ l6Myj8SdVPB9gDKj3e5yjyFbrh9ctpE3uT5OPHOppnXWbOtElfXZz4YnvTA0OCeXbzrsitgn6issv+sw
+ NTrBSSLsfsDULIBFa+OHQvakh9Y2ve6aA/D5K+AenUZX/xd09IxjSTiX5Es1oUp981BH9wjCooVTPoBC
+ 12h3drshU9Y4+FJNn6LyQd/isISZhatj4de6GOGw37tGP3WUGVsRHCn4vcG5yzRfqWsYuW1/AUe3B23O
+ QSh0TYhKyhlJEF7U/stbGs79nQErgUzDjUtVWDhJhCcsOt0THCmwLI3g+pL+n/cLizaROFBwAHwAAAAA
+ SUVORK5CYII=
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+ oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
+
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII=
-
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAACxMAAAsTAQCanBgAAAA0SURBVDhPY2CgFHxqEvyPDX9sFOhAV4sVoGsk2RB0TeiY
+ oCH/l+n9pwSPGjBqAHUMGHAAAO9c/kJD+HpiAAAAAElFTkSuQmCC
+
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACm0lE
- QVQ4T6WS/UtTURjHz3/RfxAEhRBBhEHkD2UqOYzIlAx0Tc03WOvFLAtiElNz5ltatmWKWWaITF0NLR1K
- DUPBl2kyTVebe1G3u93turu+3XOnbuaPfeE5nOfzfO9zz3nuJQD+K/aB4mYLyl6v4EGnA7e0DkjVC7he
- OYbSGr1Q3uulsbspaJiHXLOE6j4bjIssFmwclh08LDYWnydWoNIYcaFEi+x7bwT7Pw1k6hnIX1jQNe4C
- T8vb2vTz2PCHxL3HF0Rn/wQkhS3IUGgpijbIr5vG074VCndlc7M4UTSOY7JPcK4z2xRo7R5FkqwB6fJW
- mhIiVX3D7ZZJ4agbomFHW6EwlG0zUGqnEOQip4goCGnZKyTnNdCEkJyKEVS2mcRSrH47WEz+cMLq9G4T
- oSnHCWsA+mGTcIp6ighJL+1Ffdf+Bh++LCHuih6pCgPW3JEr8CEefJCBeXYeaQWNFBFyqVSHpnffRUOs
- TGY7jmeM4FT2AFad6yILh3kE/B5Yly24WPKMIkIy7w+iut0kFP+Iph1NLjpwMtOAxFwd7BsekYV4HozH
- BbN5DmmFTRQRUqwaxMPGIXFosZr96UZ8mh4pUh0YjhWZl2HAetcwaDDirLSOIkJUmlEoqnTQG+dF047G
- ph04cPQtDiZ0YNUdGaTbuQbWY0V+uSbagC7ySh3uqvvh8QcoFNUxYMah1A4clrThvWFOmKBwjYAdnT0f
- kXC1RpjBc2qL/spFyh48bh6A1W4X0i2EOQY+bh0+nwuM2w7Oa0WvbgiJ0lqcuxb5hDR2G9C4fOMlsu5o
- UK7uxteJKQSYX9h0LWN4ZAw3K9qRmFOL5NzowzT2NKCRkteEJOEN8RlVOHL+EeIkSpzOeoJkWR3OZNcK
- llg/yF+gIjK+CZq8XgAAAABJRU5ErkJggg==
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAAChUlE
+ QVQ4T6WR+0uTURzG3/+i/yAICiGCCIPIH8pUUgzJlAx0Ts0bmF3MsiAm4SU1b2nZzBSzzBCZuhItFaXE
+ UPAyTabpanNz6nx1c+5dn3i30E1/7AvPl3Oec54P5yIAwv/ogJFRoyf39SIPms3cqjejKJ3leuEQOSVa
+ 9u/1A6RWzpClnqe4w8jgnJ1Zo5MFs4TeaOfz6CIF6kEuZdYTf++NH8jTlKWTZL3Q0zK8giQv/6v1LYm1
+ LZdnbNvcprlzlIi0WmKy63chnpZSPsHTjkWfKBitdk6lD3NC+QnLqrjr17UOEKKsJDqrTp4KgqLgG7dr
+ x9Ab13zz7LjcqBomUdWPs+30nsJb2yhyXxGaXClPBCEhv5/ChhGfDd76bbYz9sOCwbKx6+04nYADbd8I
+ IcoK2RKE6Jx2KloOAj58mSfgqpbw7B6Wrd4rSC4JaVtENzVDZGqVbAnC5RwN1e++788zojNxMqafM/Fd
+ LFlWPZ7bLeHYsmFY0BOV+Uy2BCH2fjfFjSO43X/8AGNzZk7H9hCcpMG0ZvN4LklCtK2g000TmVbtBWQU
+ dPOwqtfzaL419dNKYKSWMIUG0Wn3eBuiiH1jme6eQc4ryr2AAvUA2UUatIMzfoChCTOHjr/lcFATS1bv
+ Q1oty9htBlLy1HsAuWUVarhb2olty7ELaOrScSS8iaMRDbzvmQbJBg4TzW0fCbpWQlTm8z2ArHRVG49r
+ ujCYTPKH4XaKbDpX2dxcQbSacG4YaNf0Eqwo40Ki9wv9ALKu3HhJ3B01eaWtfB0dxyH+Yn1lgb7+IW7m
+ NxKcUEZo0l74AEBWWHI1IYkVBMYUceziIwIiVJyNe0Kospxz8WV+YVl/AaAiMr7CG6U7AAAAAElFTkSu
+ QmCC
@@ -229,208 +231,162 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAAEAElE
- QVRYR82W226TRxSF9x1XVH2CvkKfggeoeuTQ0nImJvSWi0pIVdVn6DsUoqoXCFHRSqhqaTkEAklDSICm
- wSRgYifkfPhX1xrPNuPf9jgIIbGl78b+tdfaa2b+f+ztqg8v1+2j32AfXyG/wz75A/bpVdhnf8P2Xoft
- u0luwfaPwA7chX0+RsZhX0zADt4nU7AvH8K+ekSm63Zo5mDsvMOi+I1ZvDbnx4AzF9axu1KFHa6+gglO
- PvoMr83QCLDnB+CbixvYfWoOdmRuhyYY+2QdgX9qwJ2nwF2ipmNEv4lxcu95k4nI/fmXDA0XeP9sEUyc
- vUQTgzXY0doOTHDN/1tEQEI3qsDwE+A2Y70z1zQTjJB7/D8Ik0kyRWHxgObPXSvwXuWliW9/2cQ7p+dh
- x+b7mOCGm11CQI2HKTwSxUejeJieBOFE9CF51AD+JT/+VeDd/e0mvrtME183YMcbGRPc7bUVBNR0JE6t
- JUin7iU8vcD0yLmrBXZ90Gni+1+3aGABUa1L8ag11hBQQ488nbosPE0kKma4dI+1fLMFhpjCT1yKn28W
- uDRa4Mok8Oc0YCcWMwZ4zl+sI6BmLj5REveJgyiRqKi+AJ6QWcFlnIvMrzZ7CjuxlDNwCysbCKhZEE8i
- 19Rp1DJZJWXRp2IZeBZRot7XTi5nDPANt7aJgBq6+IOSuE/tE5dFa4L76HlkkZN737wBvl7XtxBQQz9e
- Lt4xNZ+ReDdRxS7qZIkGvK+dXMkY4Lt9cxsBNc2Jh6n5TBB3USJB0RBxQyt672sDqzkD49jiQ0JN+4lr
- 6lTYRRcii4LTrzJ672sDaxkD/KptFwioaThmXcQ9co86iCeivuOF4tfae18bWM8Y4CfVH1RTP+PacF0n
- j1OXhSW6xNiXI1r7loFK1sAUCj4kZCAV14brJy5hFw3HjpOLDRrwvlbZyBjgZYLPBBSpjpui15HUqVD0
- HeI+dUlY6y4Uvzaf97XKZsYAbzL+oJqn0ftu9w3XVTwV5tRC8Wvz7dAAX9axJJBO79H7hmvFXhLXxH7m
- Fb3YknIsO8UPUs86NBMfawqk05ejT9e8JR6FgzinFopfm8+rj4HH8bFmvDJQnt6jb4mTdPIwdRQWir/d
- wHbGwGFegWJpwtbOj2vfNn0SfU9xCgvtfq+8gSO8/sSSSEf8mj4a6BZ9WdzPfruBImeAV6BYZQNd4+8x
- fSreYWAwZ+Aor0CxZMDXPz16afzdpg/v/EQ4EHuq+hjgDSSWmvbaaD5xK+5EtE1YxH5eNkh61jFeAN5w
- 9THAC8AbrryB4/U67+3Nq7Nur7pA6goV4E1Glwl9z/VJ1VdNHxa9WoVeMAEeswDXWusdiMJN6lHtbSiz
- /wHzStEFcdgTgAAAAABJRU5ErkJggg==
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAAD+UlE
+ QVRYR82W224TVxiF/7teBfUJ+gp9ij5ABeGQEEI4BWLS3nJRCamq+gx9h9Ko6kVVUVGkCNFwSqhJQsiB
+ BBOMndge23Gc+DSrWvsw3h7b20YgtVtaN9bo/9Zae2/PiPyv1sl7gZy6Dxmdh4w+gJx+CDmzADn7GHLu
+ KWRsETL2HDKehJxfhkysQibWIBfWIZMbkMktyMVtyNQOZCoVyKXdyTjCv07dx7MMPlq/rAK3fq9hJJGG
+ XE5/gInReazs46M1lwS++gn47o86Rm5mIVeyQ5oYfYDNAEovc8CLPWB5Tw9d3de/UWs54FVea91oo9DW
+ 3FKIL2+HysTtu3WMzOYgV3NDmDj9EG/LUCLoWRpYeg/8kwFeZLUZZWQfeJUz4DywmQe2ClqvA+DOkxBf
+ JNomvv+zgRPfFCDXCgNMnFlApgIlDl7KAEkDXzFwlT5nwA50OwB2isCbIvDzoxCfj3ea+OFeAye+LUKm
+ ix4TZx8jV4UShyZNam6Bm7ofOFUC3paAOwshPvu628SPfzUh0yXEse117imKx1DiQFu5mzoOThU1lNot
+ A++4fZkQc49C/PokxG+LIe6uhJjfBP5OAXK97DEwtoiDGpQ4zMLXY3CbWEFLGkqlD4D3B0CGqgBZo8KR
+ nknJ9YrPwHNU61DiMAV3Kmdqt2qaTJe7oXvUIbBvxEbtXLlx6DEwnsRxA0ocaOGvY3Cb2iaOQ3NUFcgb
+ lWt6JuU3cH4ZtSaUONBeLwvvSm0S94Kydio4Aio1PZOSG1WPgYlVNFpQ4lAfXKW2iS20qoFUkTIHmtXb
+ uTJz5DOwhmYLShw6CM7ULthCS0ZlqgYcNfRMSmaOPQYurKMVQolD1TXrAbeV26oV3IHaE0+xfu69nSsz
+ NY+ByY3oQQ61d5wHrmdykzoOJrRSBw6NuPeRgYTXwBbCEEo04MJ54AbBCbZQde0aWvWmnklJou4xcHEb
+ IaDESnndWD2vJG8Fq++C29QxMPedYv08fHauJBoeA1M70YMc7lZvT7s9cD3hLripxfp5+IY0kIJdBLjp
+ bfX2wEW1x+BMbO88q6eaJJslN5seA5d2owcJcNPHq3f3PIIbsIK3tFg/D9+QBt61DdS0gXh6W30Er3cm
+ V6kNmGL9nQZaHgOX09GDTBidfLP3Hemd6vvCQy2e/uEMXMl0GOiq39n7XtXH4fbudxoIfQayfQ30rL9P
+ ehfeZWDWZ+DqXocBu//u1XPr75Ve/ec7YKU2f5CBXPQgh/Y7aDaxe9DilfeCc8ksPAau5WOPf/o1wEAh
+ /vwnX34D00Eg0/x2L+mvV35A8hNKqao/Jvg+5yuVbzW+WPjXSvEPRqllFOr9VjJgrSCO/U/Xv/NK0QUD
+ Xvf2AAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
- JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJrAAASawHhvKGoAAADR0lE
- QVRYR+2XWUiUURzFhwgrtI2KyGSstCkr8KEwaFO01NRKbBGSElNGSGoUXNIsR4kKk4oYQU2Z3FBECrUp
- UulLFDVyKUV70GGKJItKQUVtPf2v35VxqwSv1EMHfm9zvnPmP99dRvFf/4Qi96ociYQoxj4z0Qx3mZix
- eKgSzskc4o+YmShcKkxWozw7fjI5MhVTQAV6+SNmJlagszkPP4YN+N6XOW2oAPgjZiYaNxXQ42uXGsMN
- FtMm1lPFcGbEMfbLnB/FS4bH/FojBZrS8eVNCAafzp82aWFbkBF1BLcZ0WYyGTEyujBPxHupJB41teQC
- qfj8OggDtQumzWCrAzCU/EeowO9/Knrbpc7Gmxg2BaKv2lI4fy7gzgpcw5DxBIylVqjTWyE7XImsMFsh
- aA+okHhQJU1Aw+NHC1zGYMdx1GRaoUi7HHfi/GFqeTQr1JXoRgrxeLmAsSERH1v9UZm6EBlnVtOHrgN4
- BQxHCEfK9WZTucHjFQra3ahAPEz1h1F+axGuHLVDt7EM+KIHPimEo4+yQcKBMctTLhCDlgpvlF5dhiv+
- jvTt64GBEOA9mQQyZJqDBJ8JLyXt7ZLxWQSqilyQE7UKd2+cpAKVwAcq0kVGgbTft8RFnwn7Am2p0vPH
- alQV7sGtYCWaKuKBb/mAiUyCeZCyAhe8x6wAJlagujQATwp2QXvQHj3vdEA/vTAdZBJMqlrJCjjyaFms
- gCHPF4aM3UgJ2krjTwO63YA2Mgmkp2Yu25Qmn6DR7uulkhxvFCQ7w5DuRwVSgJfWQDMZBdKYtQh0ON3j
- sWZpXNdJJdke0Gm2oa02mPbvcFoEZBJMcexK0CkZyGPNCt29hgq4gY5SDPafpfF7AlVkEkySrx3LsOWx
- ZgXtUEqZSU50lDrR+EOB1g1AOZkE8jZ/Hrs7mHjkeJ2iAkkBDqjMdaECAcBDC6CMjAKpubSEFdDzyPFi
- BSL32sP4Yh/QSyWKySSYnFBrdoWb+hIbvFMpaf1o7KCl164CcskkGHZ/JBbzyPE67bxWytZupgLbAcNS
- QEcmgRi1C0DnTTOPmyyNq52UFrmRrt+bUB66TDhpx2zA/lvwuMmiK5njyJ+Q2cT9F+P/r78rheIntwDg
- SPIX+0MAAAAASUVORK5CYII=
-
-
-
-
- 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
+ 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
- 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
- rkJggg==
+ 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
- QVQ4T32S209UVxSH9x9gjCbVF1JNGk1MNIGkvGitPPhgYzSxXkpUKjXYgg44Fi+ooAeDLcVbjEKaQFtI
- yygqihduUQgmilfGmSnCMDAOhhMJ12OhOBBmOJ9rmNNiX7qSL3s/7N+31t7Zaro2NSaozfc19VWzphKf
- amqrU1PbPZpKatPUjg5NJfs19U23pnb22KOBaAHWTsLufvg/KlshsXySed8PlFqpDwTSufsvaB0Ajxx+
- KWv7IPiGoHMYugwRtJjE5Zpsc4SYv9+YlswIZOz+dyJ42oTzUi6uihO4K3LxPm8i8BZei/zaE5O5X0cl
- SZfDqNQR+4xA7jwyAd7rebj3zeLPA3PwZM7Ge+Mk+gi8GYWOPpOqZyZ1HpPmbkmm/a3NCOTBgiEI1J2i
- K+9jun/6BP8PC6ku1liR7ZzmMyG12IcxDpGzave7qOBxirK3XFhDa0M5XTX59BYuY/CXePp+jqW99hxV
- LQa3nAa3hTsvDJp9o0yGI4KgJdilNIIn6K1ez81D8XQ6tjPalIlRn46zsYIsR4DDwpEIlwIUN/QSnpLk
- nglL8K0IzACMFzHc9Cn3Ctbyx902bkrnSNdq6VrrMqhzG7S/CTIu40+ZkrRNWoLvRIAXzEcw6WDMtYLK
- 7DiWJpWw/MgzPs9xRjnmpES6R8aXvAhCliA1KhjrKWPYnQXhekL+DbjOLOLs+UKOOrrIvhwgx8LfF5Sc
- JNPD/xWM+AqpObmOnrtbZcZS6E+ntSiGtF3J7CvxcKwiwHHh1b+CKUuQNiOwZWSyMulHHpR9QWh0L7w9
- zMCV+VzM3siqg/dIkGvYf/NZAtMS7LYEnYWUH1hJUc4OKk+n4Cn4iImhRJHYGLu/hDL7MqofdvAiIL8q
- ksz4R7BHBPrvsn8gVAklQr6wX0iWF/sSjC2EvAn4L8YyMSzfUEplYAlsStNrbOg1O9FrE4X16HWrheXo
- 9bHCYiEG/epC9BsL+DVnlSsSFhIA9R7YS8m5vNQLXQAAAABJRU5ErkJggg==
+ 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
- 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
- j+nfDUm/ANUSPxfO1ir7AAAAAElFTkSuQmCC
+ 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
- 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
+ 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
- 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
- gg==
+ JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJuAAASbgHMBsReAAACfUlE
+ QVQ4T2P4//8/AwxXVFSwFxUVJUyaNGn3tm3b/q1cufL/hAkTPoSGhh5UUVFJ09fX50RWD8IoHBBes2bN
+ zJcvX/78/////y9fvvw/c+bM/7a2tv8GBgY7NTU1DR0dHZlxGjB9+nTWpUuXZr58+fLNhw8f/l+5cuX/
+ 6tWr/5eXV/x3dnberKurq6+lqYnbgPz8fN64uLjQqVOnnly7du2flpaW/7m5ef99ff1empqaVRubGPOh
+ uxiFA8JpaWm8KSkp1StWrnyzdOnS//n5Bf9NTc1u6ekbVDs4OSmiq0fhlJaWKldXV1fMnDVrx6vXrz98
+ /Pjx/7Rp0/6npqb+9g8MfGTr4NhoZWsnitOA2tpau23btl28cvUq2P/37t37P2fOnP/t7R3/W9va/7t5
+ eDzXNzSMxGpAaWkpU0VFhfOBAwf2f/r06f/FS5f+P3z48P/1a9f+L1+27H9HV9f/iKioHzZ29n0OTi4i
+ GAaAcE1NjdesWbPuv3z5EhSL/79///7/3bt3/w8fPvy/uKT4v72T02MTc8t0Y1NzNqwGNDU1ybS0tMxd
+ sWLFz+vXr/8/ePDQ/xkzZv7Pyc397+bu8cvYxGyRsam5JFYvwHBjQ4N0eXl5aUt72/YpU6c+6Onp/e/q
+ 4f1GW99kupGppTy6ejijo6uXEc7u7GaprW90rKtrPNXX1/c/O79sW1BMmhq6ZhQD0HFP3yTJObPnnY+L
+ jfuvY2CyJzGrTBZdDU4DGpvbmBqbOxT37Duw7sKFi/9V1TUO8wmKWKOrw2kAxJB2hYmTp9SuW7fuf2ho
+ 2AlZGRmMVIjXgI7OLub6xkaVtLS0ovT09IjCwkIWdDUgDAAMn43RSw4q2AAAAABJRU5ErkJggg==
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 4b680ed0..407aa6d1 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -6942,11 +6942,11 @@ namespace VEPROMS.CSLA.Library
#endregion // EnhancedGetMissingEnh
#endregion // EnhancedSupport
#region Text Search
- public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, string unitPrefix, string byWordPrefix, string byWordSuffix)
+ public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, int caseSensitive, int ProcSectSrch, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters, string unitPrefix, string byWordPrefix, string byWordSuffix)
{
try
{
- using (ItemInfoList tmp = DataPortal.Fetch(new ItemListSearchCriteria(docVersionList, stepTypeList, searchString, caseSensitive, includeLinks, includeRtfFormatting, includeSpecialCharacters, unitPrefix, byWordPrefix, byWordSuffix)))
+ using (ItemInfoList tmp = DataPortal.Fetch(new ItemListSearchCriteria(docVersionList, stepTypeList, searchString, caseSensitive, ProcSectSrch, includeLinks, includeRtfFormatting, includeSpecialCharacters, unitPrefix, byWordPrefix, byWordSuffix)))
{
tmp.SourceOfList = "Search";
ItemInfo.AddList(tmp);
@@ -6986,6 +6986,12 @@ namespace VEPROMS.CSLA.Library
get { return _CaseSensitive; }
set { _CaseSensitive = value; }
}
+ private int _ProcSectSrch;
+ public int ProcSectSrch
+ {
+ get { return _ProcSectSrch; }
+ set { _ProcSectSrch = value; }
+ }
private ItemSearchIncludeLinks _IncludeLinks;
public ItemSearchIncludeLinks IncludeLinks
{
@@ -7028,13 +7034,14 @@ namespace VEPROMS.CSLA.Library
set { _ByWordSuffix = value; }
}
public ItemListSearchCriteria(string docVersionList, string stepTypeList, string searchString,
- int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters,
+ int caseSensitive, int ProcSectSrch, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters,
string unitPrefix, string byWordPrefix, string byWordSuffix)
{
_DocVersionList = docVersionList;
_StepTypeList = stepTypeList;
_SearchString = searchString;
_CaseSensitive = caseSensitive;
+ _ProcSectSrch = ProcSectSrch;
_IncludeLinks = includeLinks;
_IncludeRtfFormatting = includeRtfFormatting;
_IncludeSpecialCharacters = includeSpecialCharacters;
@@ -7058,6 +7065,7 @@ namespace VEPROMS.CSLA.Library
cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList);
cm.Parameters.AddWithValue("@SearchString", criteria.SearchString);
cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive);
+ cm.Parameters.AddWithValue("@ProcSectSrch", criteria.ProcSectSrch);
cm.Parameters.AddWithValue("@IncludeLinks", (int)criteria.IncludeLinks);
cm.Parameters.AddWithValue("@IncludeRtfFormatting", criteria.IncludeRtfFormatting ? 1 : 0);
cm.Parameters.AddWithValue("@IncludeSpecialCharacters", criteria.IncludeSpecialCharacters ? 1 : 0);
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
index 1c28d5f9..46c24706 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs
@@ -50,6 +50,21 @@ namespace Volian.Controls.Library
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplaySearch));
this.tabSearchTypes = new DevComponents.DotNetBar.TabControl();
+ this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel();
+ this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+ this.label1 = new System.Windows.Forms.Label();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.cbxByWord = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxProcSectSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxRnoOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX();
+ this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel();
this.cbxRnoOnlyTrans = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.pnlTranCategory = new System.Windows.Forms.Panel();
@@ -79,20 +94,6 @@ namespace Volian.Controls.Library
this.label2 = new System.Windows.Forms.Label();
this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx();
this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components);
- this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel();
- this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel();
- this.panel1 = new System.Windows.Forms.Panel();
- this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx();
- this.label1 = new System.Windows.Forms.Label();
- this.panel3 = new System.Windows.Forms.Panel();
- this.cbxByWord = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.cbxRnoOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX();
- this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components);
this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
this.lblIncTran = new System.Windows.Forms.Label();
@@ -154,6 +155,10 @@ namespace Volian.Controls.Library
this.checkedListBox1 = new System.Windows.Forms.CheckedListBox();
((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit();
this.tabSearchTypes.SuspendLayout();
+ this.tabControlPanel4.SuspendLayout();
+ this.gpSrchText.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.panel3.SuspendLayout();
this.tabControlPanel5.SuspendLayout();
this.pnlTranCategory.SuspendLayout();
this.pnlTranFormat.SuspendLayout();
@@ -163,10 +168,6 @@ namespace Volian.Controls.Library
this.tabControlPanel3.SuspendLayout();
this.gpSrchAnnoText.SuspendLayout();
this.panel4.SuspendLayout();
- this.tabControlPanel4.SuspendLayout();
- this.gpSrchText.SuspendLayout();
- this.panel1.SuspendLayout();
- this.panel3.SuspendLayout();
this.tabControlPanel1.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
@@ -197,7 +198,7 @@ namespace Volian.Controls.Library
this.tabSearchTypes.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold);
this.tabSearchTypes.SelectedTabIndex = 0;
this.tabSearchTypes.ShowFocusRectangle = false;
- this.tabSearchTypes.Size = new System.Drawing.Size(277, 124);
+ this.tabSearchTypes.Size = new System.Drawing.Size(277, 147);
this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document;
this.tabSearchTypes.TabIndex = 0;
this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
@@ -209,6 +210,280 @@ namespace Volian.Controls.Library
this.tabSearchTypes.Text = "tabControl1";
this.tabSearchTypes.ThemeAware = true;
//
+ // tabControlPanel4
+ //
+ this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+ this.tabControlPanel4.Controls.Add(this.gpSrchText);
+ this.tabControlPanel4.Controls.Add(this.rbtnSrchTxt);
+ this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage);
+ this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty;
+ this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControlPanel4.Location = new System.Drawing.Point(0, 34);
+ this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2);
+ this.tabControlPanel4.Name = "tabControlPanel4";
+ this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1);
+ this.tabControlPanel4.Size = new System.Drawing.Size(277, 113);
+ this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+ this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+ this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+ this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+ | DevComponents.DotNetBar.eBorderSide.Bottom)));
+ this.tabControlPanel4.Style.GradientAngle = 90;
+ this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" +
+ "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
+ this.tabControlPanel4.TabIndex = 4;
+ this.tabControlPanel4.TabItem = this.tabStepTypeSearch;
+ //
+ // gpSrchText
+ //
+ this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control;
+ this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+ this.gpSrchText.Controls.Add(this.panel1);
+ this.gpSrchText.Controls.Add(this.panel3);
+ this.gpSrchText.DisabledBackColor = System.Drawing.Color.Empty;
+ this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gpSrchText.Location = new System.Drawing.Point(23, 1);
+ this.gpSrchText.Margin = new System.Windows.Forms.Padding(2);
+ this.gpSrchText.Name = "gpSrchText";
+ this.gpSrchText.Size = new System.Drawing.Size(253, 91);
+ //
+ //
+ //
+ this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+ this.gpSrchText.Style.BackColorGradientAngle = 90;
+ this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+ this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpSrchText.Style.BorderBottomWidth = 1;
+ this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpSrchText.Style.BorderLeftWidth = 1;
+ this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpSrchText.Style.BorderRightWidth = 1;
+ this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+ this.gpSrchText.Style.BorderTopWidth = 1;
+ this.gpSrchText.Style.CornerDiameter = 4;
+ this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+ this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+ this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+ //
+ //
+ //
+ this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.gpSrchText.TabIndex = 5;
+ this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged);
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.Transparent;
+ this.panel1.Controls.Add(this.cbxTextSearchText);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, -3);
+ this.panel1.Margin = new System.Windows.Forms.Padding(2);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(247, 23);
+ this.panel1.TabIndex = 5;
+ //
+ // cbxTextSearchText
+ //
+ this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText);
+ this.cbxTextSearchText.DisplayMember = "Text";
+ this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+ this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxTextSearchText.FormattingEnabled = true;
+ this.cbxTextSearchText.ItemHeight = 16;
+ this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0);
+ this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2);
+ this.cbxTextSearchText.Name = "cbxTextSearchText";
+ this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22);
+ this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.cbxTextSearchText.TabIndex = 2;
+ this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxTextSearchText.WatermarkText = "Enter Search Text Here";
+ this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey);
+ this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(0, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label1.Name = "label1";
+ this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
+ this.label1.Size = new System.Drawing.Size(30, 18);
+ this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.label1.TabIndex = 4;
+ this.label1.Text = "Find:";
+ //
+ // panel3
+ //
+ this.panel3.BackColor = System.Drawing.Color.Transparent;
+ this.panel3.Controls.Add(this.cbxByWord);
+ this.panel3.Controls.Add(this.cbxBooleanTxtSrch);
+ this.panel3.Controls.Add(this.cbxIncROTextSrch);
+ this.panel3.Controls.Add(this.cbxProcSectSrch);
+ this.panel3.Controls.Add(this.cbxCaseSensitive);
+ this.panel3.Controls.Add(this.cbxRnoOnly);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel3.Location = new System.Drawing.Point(0, 20);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(247, 65);
+ this.panel3.TabIndex = 6;
+ //
+ // cbxByWord
+ //
+ this.cbxByWord.BackColor = System.Drawing.Color.Transparent;
+ //
+ //
+ //
+ this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxByWord.Location = new System.Drawing.Point(106, 6);
+ this.cbxByWord.Margin = new System.Windows.Forms.Padding(2);
+ this.cbxByWord.Name = "cbxByWord";
+ this.cbxByWord.Size = new System.Drawing.Size(56, 15);
+ this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" +
+ "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+ this.cbxByWord.TabIndex = 7;
+ this.cbxByWord.Text = "By Word";
+ //
+ // cbxBooleanTxtSrch
+ //
+ //
+ //
+ //
+ this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(160, 23);
+ this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch";
+ this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(86, 15);
+ this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.cbxBooleanTxtSrch.TabIndex = 6;
+ this.cbxBooleanTxtSrch.Text = "Boolean Search";
+ this.cbxBooleanTxtSrch.Visible = false;
+ this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged);
+ //
+ // cbxIncROTextSrch
+ //
+ //
+ //
+ //
+ this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 23);
+ this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
+ this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12);
+ this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
+ "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.cbxIncROTextSrch.TabIndex = 5;
+ this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
+ //
+ // cbxProcSectSrch
+ //
+ //
+ //
+ //
+ this.cbxProcSectSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxProcSectSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxProcSectSrch.Location = new System.Drawing.Point(9, 40);
+ this.cbxProcSectSrch.Name = "cbxProcSectSrch";
+ this.cbxProcSectSrch.Size = new System.Drawing.Size(169, 12);
+ this.superTooltip1.SetSuperTooltip(this.cbxProcSectSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
+ "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.cbxProcSectSrch.TabIndex = 5;
+ this.cbxProcSectSrch.Text = "Ignore Procedure & Section titles";
+ //
+ // cbxCaseSensitive
+ //
+ this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent;
+ //
+ //
+ //
+ this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxCaseSensitive.Location = new System.Drawing.Point(9, 6);
+ this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(2);
+ this.cbxCaseSensitive.Name = "cbxCaseSensitive";
+ this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15);
+ this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " +
+ "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+ this.cbxCaseSensitive.TabIndex = 3;
+ this.cbxCaseSensitive.Text = "Case Sensitive";
+ //
+ // cbxRnoOnly
+ //
+ this.cbxRnoOnly.BackColor = System.Drawing.Color.Transparent;
+ //
+ //
+ //
+ this.cbxRnoOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxRnoOnly.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxRnoOnly.Location = new System.Drawing.Point(172, 6);
+ this.cbxRnoOnly.Margin = new System.Windows.Forms.Padding(2);
+ this.cbxRnoOnly.Name = "cbxRnoOnly";
+ this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15);
+ this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
+ ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
+ this.cbxRnoOnly.TabIndex = 7;
+ this.cbxRnoOnly.Text = "RNO Only";
+ //
+ // rbtnSrchTxt
+ //
+ this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent;
+ //
+ //
+ //
+ this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+ this.rbtnSrchTxt.Checked = true;
+ this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.rbtnSrchTxt.CheckValue = "Y";
+ this.rbtnSrchTxt.Dock = System.Windows.Forms.DockStyle.Left;
+ this.rbtnSrchTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1);
+ this.rbtnSrchTxt.Margin = new System.Windows.Forms.Padding(2);
+ this.rbtnSrchTxt.Name = "rbtnSrchTxt";
+ this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 91);
+ this.rbtnSrchTxt.TabIndex = 6;
+ this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged);
+ //
+ // cbxSrchTypeUsage
+ //
+ this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
+ //
+ //
+ //
+ this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+ this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 92);
+ this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(2);
+ this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage";
+ this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 20);
+ this.superTooltip1.SetSuperTooltip(this.cbxSrchTypeUsage, new DevComponents.DotNetBar.SuperTooltipInfo("Find Selected Step Elements", "", "This option will have Search show you where the selected Step Elements are used.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+ this.cbxSrchTypeUsage.TabIndex = 4;
+ this.cbxSrchTypeUsage.Text = " Find Selected Step Elements";
+ this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged);
+ //
+ // tabStepTypeSearch
+ //
+ this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4;
+ this.tabStepTypeSearch.Name = "tabStepTypeSearch";
+ this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" +
+ "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
+ this.tabStepTypeSearch.Text = "Text";
+ this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click);
+ //
// tabControlPanel5
//
this.tabControlPanel5.Controls.Add(this.cbxRnoOnlyTrans);
@@ -221,7 +496,7 @@ namespace Volian.Controls.Library
this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(2);
this.tabControlPanel5.Name = "tabControlPanel5";
this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel5.Size = new System.Drawing.Size(277, 90);
+ this.tabControlPanel5.Size = new System.Drawing.Size(277, 113);
this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -369,168 +644,7 @@ namespace Volian.Controls.Library
this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2);
this.tabControlPanel2.Name = "tabControlPanel2";
this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel2.Size = new System.Drawing.Size(277, 90);
- this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
- this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
- this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
- this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
- | DevComponents.DotNetBar.eBorderSide.Bottom)));
- this.tabControlPanel2.Style.GradientAngle = 90;
- this.tabControlPanel2.TabIndex = 2;
- this.tabControlPanel2.TabItem = this.tabROSearch;
- //
- // pnlTranCategory
- //
- this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control;
- this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.gpFindROs.Controls.Add(this.cbxRnoOnlyRO);
- this.gpFindROs.Controls.Add(this.lblSrchRoMsg);
- this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals);
- this.gpFindROs.DisabledBackColor = System.Drawing.Color.Empty;
- this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gpFindROs.Location = new System.Drawing.Point(1, 21);
- this.gpFindROs.Margin = new System.Windows.Forms.Padding(2);
- this.gpFindROs.Name = "gpFindROs";
- this.gpFindROs.Size = new System.Drawing.Size(275, 68);
- //
- // cbxTranCategory
- //
- this.cbxTranCategory.Dock = System.Windows.Forms.DockStyle.Fill;
- this.cbxTranCategory.Location = new System.Drawing.Point(57, 1);
- this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.cbxTranCategory.Name = "cbxTranCategory";
- this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
- this.cbxTranCategory.TabIndex = 1;
- this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
- //
- // lblTranCategory
- //
- this.lblTranCategory.Dock = System.Windows.Forms.DockStyle.Left;
- this.lblTranCategory.Location = new System.Drawing.Point(1, 1);
- this.lblTranCategory.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.lblTranCategory.Name = "lblTranCategory";
- this.lblTranCategory.Size = new System.Drawing.Size(56, 17);
- this.lblTranCategory.TabIndex = 0;
- this.lblTranCategory.Text = "Category";
- this.lblTranCategory.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // pnlTranFormat
- //
- this.pnlTranFormat.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pnlTranFormat.Controls.Add(this.cbxTranFormat);
- this.pnlTranFormat.Controls.Add(this.lblTranFormat);
- this.pnlTranFormat.Dock = System.Windows.Forms.DockStyle.Top;
- this.pnlTranFormat.Location = new System.Drawing.Point(1, 22);
- this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.pnlTranFormat.Name = "pnlTranFormat";
- this.pnlTranFormat.Padding = new System.Windows.Forms.Padding(1);
- this.pnlTranFormat.Size = new System.Drawing.Size(275, 21);
- this.pnlTranFormat.TabIndex = 1;
- //
- // cbxTranFormat
- //
- this.cbxTranFormat.Dock = System.Windows.Forms.DockStyle.Fill;
- this.cbxTranFormat.Location = new System.Drawing.Point(57, 1);
- this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.cbxTranFormat.Name = "cbxTranFormat";
- this.cbxTranFormat.Size = new System.Drawing.Size(215, 21);
- this.cbxTranFormat.TabIndex = 1;
- this.cbxTranFormat.WatermarkText = "Select Style of Transitions";
- //
- // lblTranFormat
- //
- // cbxRnoOnlyRO
- //
- this.cbxRnoOnlyRO.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.cbxRnoOnlyRO.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxRnoOnlyRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxRnoOnlyRO.Location = new System.Drawing.Point(186, 4);
- this.cbxRnoOnlyRO.Margin = new System.Windows.Forms.Padding(2);
- this.cbxRnoOnlyRO.Name = "cbxRnoOnlyRO";
- this.cbxRnoOnlyRO.Size = new System.Drawing.Size(71, 15);
- this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyRO, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
- ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
- this.cbxRnoOnlyRO.TabIndex = 8;
- this.cbxRnoOnlyRO.Text = "RNO Only";
- //
- // lblSrchRoMsg
- //
- this.lblSrchRoMsg.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.lblSrchRoMsg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.lblSrchRoMsg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblSrchRoMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.lblSrchRoMsg.Location = new System.Drawing.Point(7, 23);
- this.lblSrchRoMsg.Margin = new System.Windows.Forms.Padding(2);
- this.lblSrchRoMsg.Name = "lblSrchRoMsg";
- this.lblSrchRoMsg.Size = new System.Drawing.Size(262, 40);
- this.lblSrchRoMsg.TabIndex = 3;
- this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s). This " +
- "may be due to the RO values needing to be updated.";
- this.lblSrchRoMsg.Visible = false;
- this.lblSrchRoMsg.WordWrap = true;
- //
- // cbxFndUnLnkROVals
- //
- // pnlTranVersion
- //
- this.pnlTranVersion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pnlTranVersion.Controls.Add(this.cbxTranVersion);
- this.pnlTranVersion.Controls.Add(this.lblTranVersion);
- this.pnlTranVersion.Dock = System.Windows.Forms.DockStyle.Top;
- this.pnlTranVersion.Location = new System.Drawing.Point(1, 1);
- this.pnlTranVersion.Margin = new System.Windows.Forms.Padding(2);
- this.pnlTranVersion.Name = "pnlTranVersion";
- this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1);
- this.pnlTranVersion.Size = new System.Drawing.Size(275, 21);
- this.pnlTranVersion.TabIndex = 0;
- //
- // cbxTranVersion
- //
- this.cbxTranVersion.Dock = System.Windows.Forms.DockStyle.Fill;
- this.cbxTranVersion.Location = new System.Drawing.Point(52, 1);
- this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(2);
- this.cbxTranVersion.Name = "cbxTranVersion";
- this.cbxTranVersion.Size = new System.Drawing.Size(220, 21);
- this.cbxTranVersion.TabIndex = 1;
- this.cbxTranVersion.WatermarkText = "Select Format for Transitions";
- //
- // lblTranVersion
- //
- this.lblTranVersion.Dock = System.Windows.Forms.DockStyle.Left;
- this.lblTranVersion.Location = new System.Drawing.Point(1, 1);
- this.lblTranVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.lblTranVersion.Name = "lblTranVersion";
- this.lblTranVersion.Size = new System.Drawing.Size(51, 17);
- this.lblTranVersion.TabIndex = 0;
- this.lblTranVersion.Text = "Formats";
- this.lblTranVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // tabTranSearch
- //
- this.tabTranSearch.AttachedControl = this.tabControlPanel5;
- this.tabTranSearch.Name = "tabTranSearch";
- this.superTooltip1.SetSuperTooltip(this.tabTranSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Transition From", "", "Allows you to search for transitions of the selected type that point from selecte" +
- "d procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
- this.tabTranSearch.Text = "Transitions";
- //
- // tabControlPanel2
- //
- this.tabControlPanel2.Controls.Add(this.gpFindROs);
- this.tabControlPanel2.Controls.Add(this.cmboTreeROs);
- this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty;
- this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControlPanel2.Location = new System.Drawing.Point(0, 34);
- this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2);
- this.tabControlPanel2.Name = "tabControlPanel2";
- this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel2.Size = new System.Drawing.Size(277, 90);
+ this.tabControlPanel2.Size = new System.Drawing.Size(277, 113);
this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -553,7 +667,7 @@ namespace Volian.Controls.Library
this.gpFindROs.Location = new System.Drawing.Point(1, 21);
this.gpFindROs.Margin = new System.Windows.Forms.Padding(2);
this.gpFindROs.Name = "gpFindROs";
- this.gpFindROs.Size = new System.Drawing.Size(275, 68);
+ this.gpFindROs.Size = new System.Drawing.Size(275, 91);
//
//
//
@@ -678,7 +792,7 @@ namespace Volian.Controls.Library
this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2);
this.tabControlPanel3.Name = "tabControlPanel3";
this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel3.Size = new System.Drawing.Size(277, 90);
+ this.tabControlPanel3.Size = new System.Drawing.Size(277, 113);
this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -701,7 +815,7 @@ namespace Volian.Controls.Library
this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23);
this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2);
this.gpSrchAnnoText.Name = "gpSrchAnnoText";
- this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 66);
+ this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 89);
//
//
//
@@ -861,261 +975,6 @@ namespace Volian.Controls.Library
this.tabAnnotationSearch.Text = "Annotations";
this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
//
- // tabControlPanel4
- //
- this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.tabControlPanel4.Controls.Add(this.gpSrchText);
- this.tabControlPanel4.Controls.Add(this.rbtnSrchTxt);
- this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage);
- this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty;
- this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControlPanel4.Location = new System.Drawing.Point(0, 34);
- this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2);
- this.tabControlPanel4.Name = "tabControlPanel4";
- this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel4.Size = new System.Drawing.Size(277, 90);
- this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
- this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
- this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
- this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
- | DevComponents.DotNetBar.eBorderSide.Bottom)));
- this.tabControlPanel4.Style.GradientAngle = 90;
- this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" +
- "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140)));
- this.tabControlPanel4.TabIndex = 4;
- this.tabControlPanel4.TabItem = this.tabStepTypeSearch;
- //
- // gpSrchText
- //
- this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control;
- this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
- this.gpSrchText.Controls.Add(this.panel1);
- this.gpSrchText.Controls.Add(this.panel3);
- this.gpSrchText.DisabledBackColor = System.Drawing.Color.Empty;
- this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gpSrchText.Location = new System.Drawing.Point(23, 1);
- this.gpSrchText.Margin = new System.Windows.Forms.Padding(2);
- this.gpSrchText.Name = "gpSrchText";
- this.gpSrchText.Size = new System.Drawing.Size(253, 70);
- //
- //
- //
- this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
- this.gpSrchText.Style.BackColorGradientAngle = 90;
- this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
- this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpSrchText.Style.BorderBottomWidth = 1;
- this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpSrchText.Style.BorderLeftWidth = 1;
- this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpSrchText.Style.BorderRightWidth = 1;
- this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
- this.gpSrchText.Style.BorderTopWidth = 1;
- this.gpSrchText.Style.CornerDiameter = 4;
- this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
- this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
- this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
- //
- //
- //
- this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.gpSrchText.TabIndex = 5;
- this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged);
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.Transparent;
- this.panel1.Controls.Add(this.cbxTextSearchText);
- this.panel1.Controls.Add(this.label1);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, -3);
- this.panel1.Margin = new System.Windows.Forms.Padding(2);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(247, 23);
- this.panel1.TabIndex = 5;
- //
- // cbxTextSearchText
- //
- this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText);
- this.cbxTextSearchText.DisplayMember = "Text";
- this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill;
- this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
- this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxTextSearchText.FormattingEnabled = true;
- this.cbxTextSearchText.ItemHeight = 16;
- this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0);
- this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2);
- this.cbxTextSearchText.Name = "cbxTextSearchText";
- this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22);
- this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
- this.cbxTextSearchText.TabIndex = 2;
- this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxTextSearchText.WatermarkText = "Enter Search Text Here";
- this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey);
- this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave);
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Dock = System.Windows.Forms.DockStyle.Left;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(0, 0);
- this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.label1.Name = "label1";
- this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0);
- this.label1.Size = new System.Drawing.Size(30, 18);
- this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
- this.label1.TabIndex = 4;
- this.label1.Text = "Find:";
- //
- // panel3
- //
- this.panel3.BackColor = System.Drawing.Color.Transparent;
- this.panel3.Controls.Add(this.cbxByWord);
- this.panel3.Controls.Add(this.cbxBooleanTxtSrch);
- this.panel3.Controls.Add(this.cbxIncROTextSrch);
- this.panel3.Controls.Add(this.cbxCaseSensitive);
- this.panel3.Controls.Add(this.cbxRnoOnly);
- this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel3.Location = new System.Drawing.Point(0, 20);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(247, 44);
- this.panel3.TabIndex = 6;
- //
- // cbxByWord
- //
- this.cbxByWord.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxByWord.Location = new System.Drawing.Point(106, 6);
- this.cbxByWord.Margin = new System.Windows.Forms.Padding(2);
- this.cbxByWord.Name = "cbxByWord";
- this.cbxByWord.Size = new System.Drawing.Size(56, 15);
- this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" +
- "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
- this.cbxByWord.TabIndex = 7;
- this.cbxByWord.Text = "By Word";
- //
- // cbxBooleanTxtSrch
- //
- //
- //
- //
- this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(160, 23);
- this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch";
- this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(86, 15);
- this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
- this.cbxBooleanTxtSrch.TabIndex = 6;
- this.cbxBooleanTxtSrch.Text = "Boolean Search";
- this.cbxBooleanTxtSrch.Visible = false;
- this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged);
- //
- // cbxIncROTextSrch
- //
- //
- //
- //
- this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 23);
- this.cbxIncROTextSrch.Name = "cbxIncROTextSrch";
- this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12);
- this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " +
- "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
- this.cbxIncROTextSrch.TabIndex = 5;
- this.cbxIncROTextSrch.Text = "Search RO and Transition Text";
- //
- // cbxCaseSensitive
- //
- this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxCaseSensitive.Location = new System.Drawing.Point(9, 6);
- this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(2);
- this.cbxCaseSensitive.Name = "cbxCaseSensitive";
- this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15);
- this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " +
- "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
- this.cbxCaseSensitive.TabIndex = 3;
- this.cbxCaseSensitive.Text = "Case Sensitive";
- //
- // cbxRnoOnly
- //
- this.cbxRnoOnly.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.cbxRnoOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxRnoOnly.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxRnoOnly.Location = new System.Drawing.Point(172, 6);
- this.cbxRnoOnly.Margin = new System.Windows.Forms.Padding(2);
- this.cbxRnoOnly.Name = "cbxRnoOnly";
- this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15);
- this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" +
- ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100)));
- this.cbxRnoOnly.TabIndex = 7;
- this.cbxRnoOnly.Text = "RNO Only";
- //
- // rbtnSrchTxt
- //
- this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent;
- //
- //
- //
- this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
- this.rbtnSrchTxt.Checked = true;
- this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked;
- this.rbtnSrchTxt.CheckValue = "Y";
- this.rbtnSrchTxt.Dock = System.Windows.Forms.DockStyle.Left;
- this.rbtnSrchTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1);
- this.rbtnSrchTxt.Margin = new System.Windows.Forms.Padding(2);
- this.rbtnSrchTxt.Name = "rbtnSrchTxt";
- this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 70);
- this.rbtnSrchTxt.TabIndex = 6;
- this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged);
- //
- // cbxSrchTypeUsage
- //
- this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent;
- this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
- this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 71);
- this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(2);
- this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage";
- this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 18);
- this.superTooltip1.SetSuperTooltip(this.cbxSrchTypeUsage, new DevComponents.DotNetBar.SuperTooltipInfo("Find Selected Step Elements", "", "This option will have Search show you where the selected Step Elements are used.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
- this.cbxSrchTypeUsage.TabIndex = 4;
- this.cbxSrchTypeUsage.Text = " Find Selected Step Elements";
- this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged);
- //
- // tabStepTypeSearch
- //
- this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4;
- this.tabStepTypeSearch.Name = "tabStepTypeSearch";
- this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" +
- "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110)));
- this.tabStepTypeSearch.Text = "Text";
- this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click);
- //
// tabControlPanel1
//
this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
@@ -1128,7 +987,7 @@ namespace Volian.Controls.Library
this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
this.tabControlPanel1.Name = "tabControlPanel1";
this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
- this.tabControlPanel1.Size = new System.Drawing.Size(277, 90);
+ this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
@@ -1414,7 +1273,7 @@ namespace Volian.Controls.Library
this.advTreeProcSets.NodeStyleSelected = this.elementStyle1;
this.advTreeProcSets.PathSeparator = ";";
this.advTreeProcSets.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.advTreeProcSets.Size = new System.Drawing.Size(277, 107);
+ this.advTreeProcSets.Size = new System.Drawing.Size(277, 103);
this.advTreeProcSets.Styles.Add(this.elementStyle1);
this.advTreeProcSets.TabIndex = 0;
this.advTreeProcSets.Text = "advTree1";
@@ -1463,7 +1322,7 @@ namespace Volian.Controls.Library
this.advTreeStepTypes.PathSeparator = ";";
this.advTreeStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.advTreeStepTypes.SelectionPerCell = true;
- this.advTreeStepTypes.Size = new System.Drawing.Size(277, 125);
+ this.advTreeStepTypes.Size = new System.Drawing.Size(277, 110);
this.advTreeStepTypes.Styles.Add(this.elementStyle2);
this.advTreeStepTypes.TabIndex = 0;
this.advTreeStepTypes.Text = "advTree1";
@@ -1493,10 +1352,10 @@ namespace Volian.Controls.Library
this.grpPanSearchResults.Controls.Add(this.lbSrchResultsIncTrans);
this.grpPanSearchResults.DisabledBackColor = System.Drawing.Color.Empty;
this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grpPanSearchResults.Location = new System.Drawing.Point(0, 457);
+ this.grpPanSearchResults.Location = new System.Drawing.Point(0, 461);
this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(2);
this.grpPanSearchResults.Name = "grpPanSearchResults";
- this.grpPanSearchResults.Size = new System.Drawing.Size(277, 219);
+ this.grpPanSearchResults.Size = new System.Drawing.Size(277, 215);
//
//
//
@@ -1535,7 +1394,7 @@ namespace Volian.Controls.Library
this.lbSrchResults.Margin = new System.Windows.Forms.Padding(2);
this.lbSrchResults.Name = "lbSrchResults";
this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.lbSrchResults.Size = new System.Drawing.Size(271, 198);
+ this.lbSrchResults.Size = new System.Drawing.Size(271, 194);
this.lbSrchResults.TabIndex = 0;
this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove);
@@ -1547,7 +1406,6 @@ namespace Volian.Controls.Library
//
this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.lbSrchResultsIncTrans.CheckBoxesVisible = true;
- this.lbSrchResultsIncTrans.CheckStateMember = null;
this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true;
this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbSrchResultsIncTrans.DragDropSupport = true;
@@ -1556,7 +1414,7 @@ namespace Volian.Controls.Library
this.lbSrchResultsIncTrans.Margin = new System.Windows.Forms.Padding(2);
this.lbSrchResultsIncTrans.Name = "lbSrchResultsIncTrans";
this.lbSrchResultsIncTrans.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(271, 198);
+ this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(271, 194);
this.lbSrchResultsIncTrans.TabIndex = 0;
this.lbSrchResultsIncTrans.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged);
this.lbSrchResultsIncTrans.ItemClick += new System.EventHandler(this.lbSrchResultsIncTrans_ItemClicked);
@@ -1576,7 +1434,7 @@ namespace Volian.Controls.Library
this.panSearchButtons.Controls.Add(this.btnPrnSrchRslts);
this.panSearchButtons.DisabledBackColor = System.Drawing.Color.Empty;
this.panSearchButtons.Dock = System.Windows.Forms.DockStyle.Top;
- this.panSearchButtons.Location = new System.Drawing.Point(0, 398);
+ this.panSearchButtons.Location = new System.Drawing.Point(0, 402);
this.panSearchButtons.Margin = new System.Windows.Forms.Padding(2);
this.panSearchButtons.Name = "panSearchButtons";
this.panSearchButtons.Size = new System.Drawing.Size(277, 59);
@@ -1788,11 +1646,11 @@ namespace Volian.Controls.Library
this.xpSetToSearch.DisabledBackColor = System.Drawing.Color.Empty;
this.xpSetToSearch.Dock = System.Windows.Forms.DockStyle.Top;
this.xpSetToSearch.ExpandOnTitleClick = true;
- this.xpSetToSearch.Location = new System.Drawing.Point(0, 124);
+ this.xpSetToSearch.Location = new System.Drawing.Point(0, 147);
this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(2);
this.xpSetToSearch.Name = "xpSetToSearch";
this.xpSetToSearch.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.xpSetToSearch.Size = new System.Drawing.Size(277, 128);
+ this.xpSetToSearch.Size = new System.Drawing.Size(277, 124);
this.xpSetToSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
this.xpSetToSearch.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.xpSetToSearch.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1823,11 +1681,11 @@ namespace Volian.Controls.Library
this.xpStepTypes.DisabledBackColor = System.Drawing.Color.Empty;
this.xpStepTypes.Dock = System.Windows.Forms.DockStyle.Top;
this.xpStepTypes.ExpandOnTitleClick = true;
- this.xpStepTypes.Location = new System.Drawing.Point(0, 252);
+ this.xpStepTypes.Location = new System.Drawing.Point(0, 271);
this.xpStepTypes.Margin = new System.Windows.Forms.Padding(2);
this.xpStepTypes.Name = "xpStepTypes";
this.xpStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.xpStepTypes.Size = new System.Drawing.Size(277, 146);
+ this.xpStepTypes.Size = new System.Drawing.Size(277, 131);
this.xpStepTypes.Style.Alignment = System.Drawing.StringAlignment.Center;
this.xpStepTypes.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.xpStepTypes.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1879,6 +1737,11 @@ namespace Volian.Controls.Library
this.Size = new System.Drawing.Size(277, 676);
((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit();
this.tabSearchTypes.ResumeLayout(false);
+ this.tabControlPanel4.ResumeLayout(false);
+ this.gpSrchText.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.panel3.ResumeLayout(false);
this.tabControlPanel5.ResumeLayout(false);
this.pnlTranCategory.ResumeLayout(false);
this.pnlTranFormat.ResumeLayout(false);
@@ -1890,11 +1753,6 @@ namespace Volian.Controls.Library
this.gpSrchAnnoText.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.panel4.PerformLayout();
- this.tabControlPanel4.ResumeLayout(false);
- this.gpSrchText.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- this.panel3.ResumeLayout(false);
this.tabControlPanel1.ResumeLayout(false);
this.tabControlPanel1.PerformLayout();
this.groupBox1.ResumeLayout(false);
@@ -1963,6 +1821,7 @@ namespace Volian.Controls.Library
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.Controls.CheckBoxX cbxIncROTextSrch;
+ private DevComponents.DotNetBar.Controls.CheckBoxX cbxProcSectSrch;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.Panel panel4;
private DevComponents.DotNetBar.Controls.CheckBoxX cbxFndUnLnkROVals;
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs
index 1fa9dd89..9d962791 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -2057,7 +2057,7 @@ namespace Volian.Controls.Library
ReportTitle = "Step Element Report"; //"Proms - Search by Type: " + typstr;
TypesSelected = "Filtered By: " + typstr;
SearchString = null;
- SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
+ SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, string.Empty, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
cmbResultsStyleIndex = 1; //display step locations in results
}
}
@@ -2103,7 +2103,7 @@ namespace Volian.Controls.Library
SearchString = TextSearchString;
//TypesSelected = (typstr != null) ? "Searched Step Types: " + typstr : "Searched All Step Types";
//TypesSelected = "Searched Step Types: " + ((typstr != null) ? typstr : "All Step Types");
- SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
+ SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
cmbResultsStyleIndex = 3; // display step text in results
//}
@@ -2145,7 +2145,7 @@ namespace Volian.Controls.Library
if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
{
- SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
+ SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
cmbResultsStyleIndex = 3; // display step text in results
}
else
diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.resx b/PROMS/Volian.Controls.Library/DisplaySearch.resx
index 71264547..8ea3e35b 100644
--- a/PROMS/Volian.Controls.Library/DisplaySearch.resx
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.resx
@@ -145,4 +145,7 @@ Boolean searches are case insensitive and the search finds RO data as text or wi
305, 17
+
+ 25
+
\ No newline at end of file