diff --git a/PROMS/VEPROMS User Interface/SORTCUTS_INSERT.RTF b/PROMS/VEPROMS User Interface/SORTCUTS_INSERT.RTF index 359f4410..a56dd222 100644 --- a/PROMS/VEPROMS User Interface/SORTCUTS_INSERT.RTF +++ b/PROMS/VEPROMS User Interface/SORTCUTS_INSERT.RTF @@ -1,20 +1,286 @@ -{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fprq2\fcharset0 Cambria;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fmodern\fprq1\fcharset0 Courier New;}} -{\colortbl ;\red23\green54\blue93;\red0\green0\blue0;} -{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\brdrb\brdrs\brdrw20\brsp80 \nowidctlpar\sa300\qc\cf1\expndtw5\kerning28\f0\fs52 Shortcuts for Inserting\f1\par -\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2\brsp80 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\qc\cf0\expndtw0\kerning0\f2\fs22 KEY STROKE\cell COMMAND\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2\brsp80 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3\fs20 [SHIFT] [CTRL] [SPACE]\cell\f2 Insert Hard Space\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [B]\cell\f2 Insert Current Type Before (at same level)\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [C]\cell\f2 Insert a Caution\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [F]\cell\f2 Insert a Figure\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [H]\cell\f2 Insert a High Level Step\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [I]\cell\f2 Insert Current Type After (at same level)\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [CTRL] [J]\f2\cell Insert Referenced Object\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [N]\cell\f2 Insert Note\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [R]\cell\f2 Insert RNO\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [S]\cell\f2 Insert Sub Step\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [CTRL] [T]\cell\f2 Insert Transition\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [D]\cell\f2 Insert Indent\cell\row\trowd\trgaph108\trleft-108\trbrdrl\brdrs\brdrw10\brdrcf2 \trbrdrt\brdrs\brdrw10\brdrcf2 \trbrdrr\brdrs\brdrw10\brdrcf2 \trbrdrb\brdrs\brdrw10\brdrcf2 \trpaddl108\trpaddr108\trpaddfl3\trpaddfr3 -\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx2790\clvertalc\clbrdrl\brdrw10\brdrs\brdrcf2\clbrdrt\brdrw10\brdrs\brdrcf2\clbrdrr\brdrw10\brdrs\brdrcf2\clbrdrb\brdrw10\brdrs\brdrcf2 \cellx7290\pard\intbl\nowidctlpar\f3 [SHIFT] [CTRL] [T]\cell\f2 Insert Table\cell\row\pard\nowidctlpar\sa200\sl276\slmult1\fs22\par -} - \ No newline at end of file +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} +{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f39\fbidi \froman\fcharset0\fprq2{\*\panose 00000000000000000000}Cambria;} +{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f60\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} +{\f61\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f63\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f64\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f65\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} +{\f66\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f67\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f68\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f60\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} +{\f61\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f63\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f64\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f65\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} +{\f66\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f67\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f68\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f410\fbidi \fswiss\fcharset238\fprq2 Calibri CE;} +{\f411\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f413\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f414\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f417\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\f418\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f430\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\f431\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f433\fbidi \froman\fcharset161\fprq2 Cambria Greek;} +{\f434\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\f437\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\f438\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;} +{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);} +{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0; +\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red23\green54\blue93;}{\*\defchp +\fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;} +{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused +Normal Table;}}{\*\rsidtbl \rsid4014281\rsid13717389}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Diane Palafoutas}{\creatim\yr2016\mo11\dy2\hr8\min51} +{\revtim\yr2016\mo11\dy2\hr8\min52}{\version2}{\edmins1}{\nofpages1}{\nofwords89}{\nofchars513}{\nofcharsws601}{\vern57441}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} +\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 +\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot4014281 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2 +\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6 +\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\qc \li0\ri0\sa300\nowidctlpar\brdrb\brdrs\brdrw20\brsp80 \wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs52 \ltrch\fcs0 \f39\fs52\expnd1\expndtw5\cf17\kerning28\insrsid13717389 \hich\af39\dbch\af31505\loch\f39 Shortcuts for Inserting}{ +\rtlch\fcs1 \af0\afs52 \ltrch\fcs0 \f0\fs52\expnd1\expndtw5\cf17\kerning28\insrsid13717389 +\par \ltrrow}\trowd \irow0\irowband0\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brsp80\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290 +\pard \ltrpar\qc \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 KEY STROKE\cell \hich\af37\dbch\af31505\loch\f37 COMMAND\cell }\pard \ltrpar +\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\insrsid13717389 \trowd \irow0\irowband0\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl +\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brsp80\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 \trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb +\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row \ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 +[SHIFT] [CTRL] [SPACE]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Hard Space\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \trowd \irow1\irowband1\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 +\trbrdrb\brdrs\brdrw10\brsp80\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 \trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr +\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row \ltrrow}\trowd \irow2\irowband2\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290 +\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [B]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 +\hich\af37\dbch\af31505\loch\f37 Insert Current Type Before (at same level)\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow2\irowband2\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [C]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert a Caution\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow3\irowband3\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [F]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert a Figure\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow4\irowband4\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0\pararsid4014281 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid4014281 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [}{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 +\f2\fs20\insrsid4014281 \hich\af2\dbch\af31505\loch\f2 E}{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid4014281 \hich\af2\dbch\af31505\loch\f2 ]}{\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid4014281 \cell }\pard \ltrpar +\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid4014281 \hich\af37\dbch\af31505\loch\f37 I\hich\af37\dbch\af31505\loch\f37 nsert an Equation\cell }\pard \ltrpar +\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid4014281 \trowd \irow5\irowband5\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 +\trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 \trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb +\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row \ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [H] +\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert a High Level Step\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 { +\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \trowd \irow6\irowband6\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [I]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Current Type After (at same level)\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 +\ltrch\fcs0 \f37\fs20\insrsid13717389 \trowd \irow7\irowband7\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [CTRL] [J]}{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \cell +\hich\af37\dbch\af31505\loch\f37 Insert Referenced Object\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 +\trowd \irow8\irowband8\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 \trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 +\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl +\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row \ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 +\ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [N]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Note\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \trowd \irow9\irowband9\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 +\trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 \trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr +\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row \ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [R] +\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert RNO\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 +\af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 \trowd \irow10\irowband10\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [S]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Sub Step\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow11\irowband11\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [CTRL] [T]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 +\hich\af37\dbch\af31505\loch\f37 Insert Transition\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 \f37\fs20\insrsid13717389 +\trowd \irow12\irowband12\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [D]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Indent\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow13\irowband13\ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +\ltrrow}\pard \ltrpar\ql \li0\ri0\nowidctlpar\intbl\wrapdefault\faauto\rin0\lin0 {\rtlch\fcs1 \af2\afs20 \ltrch\fcs0 \f2\fs20\insrsid13717389 \hich\af2\dbch\af31505\loch\f2 [SHIFT] [CTRL] [T]\cell }{\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \hich\af37\dbch\af31505\loch\f37 Insert Table\cell }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\rtlch\fcs1 \af37\afs20 \ltrch\fcs0 +\f37\fs20\insrsid13717389 \trowd \irow14\irowband14\lastrow \ltrrow\ts11\trgaph108\trleft-108\trbrdrt\brdrs\brdrw10\brdrcf1 \trbrdrl\brdrs\brdrw10\brdrcf1 \trbrdrb\brdrs\brdrw10\brdrcf1 \trbrdrr\brdrs\brdrw10\brdrcf1 +\trftsWidth1\trpaddl108\trpaddr108\trpaddfl3\trpaddfr3\tblind0\tblindtype3 \clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 +\cltxlrtb\clftsWidth3\clwWidth2898\clshdrawnil \cellx2790\clvertalc\clbrdrt\brdrs\brdrw10\brdrcf1 \clbrdrl\brdrs\brdrw10\brdrcf1 \clbrdrb\brdrs\brdrw10\brdrcf1 \clbrdrr\brdrs\brdrw10\brdrcf1 \cltxlrtb\clftsWidth3\clwWidth4500\clshdrawnil \cellx7290\row +}\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\insrsid13717389 +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100aa5225dfc60600008b1a0000160000007468656d652f7468656d652f +7468656d65312e786d6cec595d8bdb46147d2ff43f08bd3bfe92fcb1c41b6cd9ceb6d94d42eca4e4716c8fadc98e344633de8d0981923c160aa569e943037deb +43691b48a02fe9afd936a54d217fa17746b63c638fbb9b2585a5640d8b343af7ce997bafce1d4997afdc8fa87384134e58dc708b970aae83e3211b9178d2706f +f7bbb99aeb7081e211a22cc60d778eb97b65f7c30f2ea31d11e2083b601ff31dd4704321a63bf93c1fc230e297d814c7706dcc920809384d26f951828ec16f44 +f3a542a1928f10895d274611b8bd311e932176fad2a5bbbb74dea1701a0b2e078634e949d7d8b050d8d1615122f89c0734718e106db830cf881df7f17de13a14 +7101171a6e41fdb9f9ddcb79b4b330a2628bad66d7557f0bbb85c1e8b0a4e64c26836c52cff3bd4a33f3af00546ce23ad54ea553c9fc29001a0e61a52917dda7 +dfaab7dafe02ab81d2438bef76b55d2e1a78cd7f798373d3973f03af40a97f6f03dfed06104503af4029dedfc07b5eb51478065e81527c65035f2d34db5ed5c0 +2b5048497cb8812ef89572b05c6d061933ba6785d77daf5b2d2d9caf50500d5975c929c62c16db6a2d42f758d2058004522448ec88f9148fd110aa3840940c12 +e2ec93490885374531e3305c2815ba8532fc973f4f1da988a01d8c346bc90b98f08d21c9c7e1c3844c45c3fd18bcba1ae4cdcb1fdfbc7cee9c3c7a71f2e89793 +c78f4f1efd9c3a32acf6503cd1ad5e7fffc5df4f3f75fe7afeddeb275fd9f15cc7fffed367bffdfaa51d082b5d85e0d5d7cffe78f1ecd5379ffff9c3130bbc99 +a0810eef930873e73a3e766eb10816a6426032c783e4ed2cfa2122ba45339e701423398bc57f478406fafa1c5164c1b5b019c13b09488c0d787576cf20dc0b93 +9920168fd7c2c8001e30465b2cb146e19a9c4b0b737f164fec9327331d770ba123dbdc018a8dfc766653d05662731984d8a07993a258a0098eb170e4357688b1 +6575770931e27a408609e36c2c9cbbc46921620d499f0c8c6a5a19ed9108f232b711847c1bb139b8e3b418b5adba8d8f4c24dc15885ac8f73135c27815cd048a +6c2efb28a27ac0f791086d247bf364a8e33a5c40a6279832a733c29cdb6c6e24b05e2de9d7405eec693fa0f3c84426821cda7cee23c674649b1d06218aa6366c +8fc4a18efd881f428922e7261336f80133ef10790e7940f1d674df21d848f7e96a701b9455a7b42a107965965872791533a37e7b733a4658490d08bfa1e71189 +4f15f73559f7ff5b5907217df5ed53cbaa2eaaa0371362bda3f6d6647c1b6e5dbc03968cc8c5d7ee369ac53731dc2e9b0decbd74bf976ef77f2fdddbeee7772f +d82b8d06f9965bc574abae36eed1d67dfb9850da13738af7b9daba73e84ca32e0c4a3bf5cc8ab3e7b8690887f24e86090cdc2441cac64998f88488b017a229ec +ef8bae7432e10bd713ee4c19876dbf1ab6fa96783a8b0ed8287d5c2d16e5a3692a1e1c89d578c1cfc6e15143a4e84a75f50896b9576c27ea51794940dabe0d09 +6d329344d942a2ba1c9441520fe610340b09b5b277c2a26e615193ee97a9da6001d4b2acc0d6c9810d57c3f53d30012378a242148f649ed2542fb3ab92f92e33 +bd2d984605c03e625901ab4cd725d7adcb93ab4b4bed0c99364868e566925091513d8c87688417d52947cf42e36d735d5fa5d4a02743a1e683d25ad1a8d6fe8d +c579730d76ebda40635d2968ec1c37dc4ad9879219a269c31dc3633f1c4653a81d2eb7bc884ee0ddd95024e90d7f1e6599265cb4110fd3802bd149d520220227 +0e2551c395cbcfd24063a5218a5bb104827061c9d541562e1a3948ba99643c1ee3a1d0d3ae8dc848a7a7a0f0a95658af2af3f383a5259b41ba7be1e8d819d059 +720b4189f9d5a20ce0887078fb534ca33922f03a3313b255fdad35a685eceaef13550da5e3884e43b4e828ba98a77025e5191d7596c5403b5bac1902aa8564d1 +080713d960f5a01add34eb1a2987ad5df7742319394d34573dd35015d935ed2a66ccb06c036bb13c5f93d7582d430c9aa677f854bad725b7bed4bab57d42d625 +20e059fc2c5df70c0d41a3b69acca026196fcab0d4ecc5a8d93b960b3c85da599a84a6fa95a5dbb5b8653dc23a1d0c9eabf383dd7ad5c2d078b9af549156df3d +f44f136c700fc4a30d2f81675470954af8f09020d810f5d49e24950db845ee8bc5ad0147ce2c210df741c16f7a41c90f72859adfc97965af90abf9cd72aee9fb +e562c72f16daadd243682c228c8a7efacda50bafa2e87cf1e5458d6f7c7d89966fdb2e0d599467eaeb4a5e11575f5f8aa5ed5f5f1c02a2f3a052ead6cbf55625 +572f37bb39afddaae5ea41a5956b57826abbdb0efc5abdfbd0758e14d86b9603afd2a9e52ac520c8799582a45fabe7aa5ea9d4f4aacd5ac76b3e5c6c6360e5a9 +7c2c6201e155bc76ff010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f +7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be +9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980 +ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5b +babac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f6e74656e +745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72656c732f +2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f7468656d652f74 +68656d654d616e616765722e786d6c504b01022d0014000600080000002100aa5225dfc60600008b1a00001600000000000000000000000000d6020000746865 +6d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b0100002700000000000000000000000000d00900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000cb0a00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text; +\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2; +\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List; +\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1; +\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision; +\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1; +\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1; +\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; +\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2; +\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; +\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3; +\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4; +\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; +\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4; +\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5; +\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000 +4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000009099 +abf60735d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 955e4e0d..fcf930b9 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -3106,10 +3106,10 @@ namespace VEPROMS if (_LastStepRTB != null) { infotabRO.Visible = _LastStepRTB.MyItemInfo.MyDocVersion.DocVersionAssociationCount > 0; - infotabTransition.Visible = !_CurrentItem.IsFigure; + infotabTransition.Visible = !_CurrentItem.IsFigure && !_CurrentItem.IsRtfRaw; // don't allow ro insert for a non-ro figure. First check that it is visible (from above line of code), // and allow for non-figures or ro figures (for replace of existing ro figures) - infotabRO.Visible = infotabRO.Visible && (!_CurrentItem.IsFigure || (_CurrentItem.IsFigure && _CurrentItem.MyContent.MyImage == null)); + infotabRO.Visible = infotabRO.Visible && (!_CurrentItem.IsRtfRaw && (!_CurrentItem.IsFigure || (_CurrentItem.IsFigure && _CurrentItem.MyContent.MyImage == null))); displayRO.Enabled = _LastStepRTB.EditMode || _LastStepRTB.IsRoTable; displayTransition.Enabled = _LastStepRTB.EditMode; } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index cb812821..620d4af8 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1792,6 +1792,13 @@ namespace VEPROMS.CSLA.Library return parent.IsInRNO; } } + public bool IsRtfRaw + { + get + { + return (MyContent.Type > 20999); + } + } public bool IsInCalvertConditionResponse { get @@ -2224,6 +2231,7 @@ namespace VEPROMS.CSLA.Library if (MyContent.ContentRoUsages == null || MyContent.ContentRoUsages.Count == 0) return "Embedded Image"; } + if (IsRtfRaw) return "Equation"; if (cont.Type >= 20000) number = MyTab == null ? "" : MyTab.CleanText; return string.Format("{0} {1}", number, DisplayText).Trim(); // Need TrimEnd(); for IP3 //return string.Format("{0} {1}", number, cont.Text).Trim(); @@ -2300,7 +2308,13 @@ namespace VEPROMS.CSLA.Library } public string ShortSearchPath { - get { return ConvertToDisplayText(Regex.Replace(_SearchPath ?? "", "\x11.*?\x07", "\x07")); } + get + { + string dtext = ConvertToDisplayText(Regex.Replace(_SearchPath ?? "", "\x11.*?\x07", "\x07")); + if (IsFigure && dtext.EndsWith("Table.")) dtext = dtext.Substring(0, dtext.Length - "Table.".Length) + "Figure."; + else if (IsRtfRaw && dtext.EndsWith("Table.") && FormatStepData.Type.Contains("Equation")) dtext = dtext.Substring(0, dtext.Length - "Table.".Length) + "Equation."; + return dtext; + } } internal int _SearchAnnotationID; public int SearchAnnotationID diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/PartExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/PartExt.cs index 6cd0f294..3db3027e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/PartExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/PartExt.cs @@ -96,7 +96,12 @@ namespace VEPROMS.CSLA.Library case E_FromType.Step: break; case E_FromType.Table: - partText = ".Table"; + if (MyItem.IsRtfRaw) + partText = ".Equation"; + else if (MyItem.IsFigure) + partText = ".Figure"; + else + partText = ".Table"; break; default: break; @@ -151,6 +156,7 @@ namespace VEPROMS.CSLA.Library { if (MyItems != null && MyItems[0].IsTable) return ("Table"); if (MyItems != null && MyItems[0].IsFigure) return ("Figure"); + if (MyItems != null && MyItems[0].IsRtfRaw) return ("Equation"); } return string.Format("{0}", PartTypes); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 215f9bf7..93ac4981 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -492,7 +492,7 @@ namespace VEPROMS.CSLA.Library { if (!topType.Inactive) { - if ((_CurItemInfo.IsInRNO||_CurItemInfo.IsCaution||_CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "") + if ((_CurItemInfo.IsInRNO || _CurItemInfo.IsCaution || _CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "") sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.RnoMenuItem, Convert.ToInt32(topType.Index))); else sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.MenuItem, Convert.ToInt32(topType.Index))); @@ -525,13 +525,18 @@ namespace VEPROMS.CSLA.Library { if (!topType.Inactive) { - if ((_CurItemInfo.IsInRNO||_CurItemInfo.IsCaution||_CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "") + // if equation type && in single column mode, put out the rnomenu list, and skip the AER items + bool singleColEq = (topType.Type.ToUpper().Contains("EQUATION") && _CurItemInfo.ColumnMode == 0); + if ((singleColEq ||_CurItemInfo.IsInRNO || _CurItemInfo.IsCaution || _CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "") sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.RnoMenuItem, Convert.ToInt32(topType.Index))); - else + else if (!singleColEq) sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.MenuItem, Convert.ToInt32(topType.Index))); - if (topType.Type == curType) retval = cntitm; - cntitm++; + if (!singleColEq || (singleColEq && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "")) + { + if (topType.Type == curType) retval = cntitm; + cntitm++; + } } foreach (StepData sd in StepDataList) { @@ -4827,6 +4832,8 @@ namespace VEPROMS.CSLA.Library { foreach (StepData stepData in this) if (stepData.Type == type) return stepData; + //foreach (StepData stepData1 in InheritedList) + // if (stepData1.Type == type) return stepData1; return null; } } @@ -4836,6 +4843,8 @@ namespace VEPROMS.CSLA.Library { foreach (StepData stepData in this) if (stepData.Index == index) return stepData; + //foreach (StepData stepData1 in InheritedList) + // if (stepData1.Index == index) return stepData1; return null; } } @@ -4959,6 +4968,57 @@ namespace VEPROMS.CSLA.Library return null; } } + // EmbeddedObject has been commented out, 'Equations' are separate top level items. + // This code was left here in case Equations , and other OLE objects, end up + // under the EmbeddedObject: + + // EmbeddedObject has inheritted types that represent OLE objects. + // The first of these is 'Equation'. Another that may be implemented later is Image. + // This is a special case, since only 'Equation' exists on initial development of + // embedded objects, 'skip' the embedded object layer when creating the list and + // go right to the equations. + //private StepData _EmbeddedObject; + //public StepData EmbeddedObject + //{ + // get + // { + // if (_EmbeddedObject != null) return _EmbeddedObject; + // foreach (StepData sd in this) + // { + // if (sd.Type == "EmbeddedObject") + // { + // _Equation = sd; + // return sd; + // } + // } + // return null; + // } + //} + private StepData _Equation; + public StepData Equation // equation has a parent of embedded object. + { + get + { + if (_Equation != null) return _Equation; + foreach (StepData sd in this) + { + if (sd.Type == "Equation") + { + _Equation = sd; + return sd; + } + } + //foreach (StepData sdi in InheritedList) + //{ + // if (sdi.Type == "Equation") + // { + // _Equation = sdi; + // return sdi; + // } + //} + return null; + } + } } #endregion #region StepLayoutData diff --git a/PROMS/Volian.Controls.Library/DisplayHistory.cs b/PROMS/Volian.Controls.Library/DisplayHistory.cs index 81d19e96..f506713b 100644 --- a/PROMS/Volian.Controls.Library/DisplayHistory.cs +++ b/PROMS/Volian.Controls.Library/DisplayHistory.cs @@ -618,6 +618,12 @@ namespace Volian.Controls.Library if (tn.Tag is ContentAuditInfo) { ContentAuditInfo cai = tn.Tag as ContentAuditInfo; + // if original equation is restored, don't allow it because it is empty: + if ((cai.Type > 20999 && cai.Type < 21010) && cai.ActionWhat.ToUpper() == "ORIGINAL") + { + MessageBox.Show(this, "Cannot restore original empty or new equation.", "Warning on restore", MessageBoxButtons.OK); + return; + } if (MessageBox.Show(this, "Do you want to restore this content change?", "Confirm Content Change Restore", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes) { ROFstInfo myRoFst = MyItemInfo.MyDocVersion.DocVersionAssociations[0].MyROFst; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 8183bd3b..f142296b 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -50,17 +50,6 @@ 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.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel(); - this.pnlTranCategory = new System.Windows.Forms.Panel(); - this.cbxTranCategory = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.lblTranCategory = new System.Windows.Forms.Label(); - this.pnlTranFormat = new System.Windows.Forms.Panel(); - this.cbxTranFormat = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.lblTranFormat = new System.Windows.Forms.Label(); - this.pnlTranVersion = new System.Windows.Forms.Panel(); - this.cbxTranVersion = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.lblTranVersion = new System.Windows.Forms.Label(); - this.tabTranSearch = 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(); @@ -73,6 +62,17 @@ namespace Volian.Controls.Library 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.pnlTranCategory = new System.Windows.Forms.Panel(); + this.cbxTranCategory = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.lblTranCategory = new System.Windows.Forms.Label(); + this.pnlTranFormat = new System.Windows.Forms.Panel(); + this.cbxTranFormat = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.lblTranFormat = new System.Windows.Forms.Label(); + this.pnlTranVersion = new System.Windows.Forms.Panel(); + this.cbxTranVersion = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.lblTranVersion = new System.Windows.Forms.Label(); + this.tabTranSearch = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.gpFindROs = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbxFndUnLnkROVals = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -137,14 +137,14 @@ namespace Volian.Controls.Library this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit(); this.tabSearchTypes.SuspendLayout(); - this.tabControlPanel5.SuspendLayout(); - this.pnlTranCategory.SuspendLayout(); - this.pnlTranFormat.SuspendLayout(); - this.pnlTranVersion.SuspendLayout(); this.tabControlPanel4.SuspendLayout(); this.gpSrchText.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); + this.tabControlPanel5.SuspendLayout(); + this.pnlTranCategory.SuspendLayout(); + this.pnlTranFormat.SuspendLayout(); + this.pnlTranVersion.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.gpFindROs.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); @@ -171,13 +171,13 @@ namespace Volian.Controls.Library this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); - this.tabSearchTypes.Margin = new System.Windows.Forms.Padding(2); + this.tabSearchTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabSearchTypes.Name = "tabSearchTypes"; this.tabSearchTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; 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, 112); + this.tabSearchTypes.Size = new System.Drawing.Size(369, 138); this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabSearchTypes.TabIndex = 0; this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -188,156 +188,28 @@ namespace Volian.Controls.Library this.tabSearchTypes.Text = "tabControl1"; this.tabSearchTypes.ThemeAware = true; // - // tabControlPanel5 - // - this.tabControlPanel5.Controls.Add(this.pnlTranCategory); - this.tabControlPanel5.Controls.Add(this.pnlTranFormat); - this.tabControlPanel5.Controls.Add(this.pnlTranVersion); - this.tabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel5.Location = new System.Drawing.Point(0, 22); - 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.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; - this.tabControlPanel5.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel5.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel5.Style.GradientAngle = 90; - this.tabControlPanel5.TabIndex = 5; - this.tabControlPanel5.TabItem = this.tabTranSearch; - // - // pnlTranCategory - // - this.pnlTranCategory.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pnlTranCategory.Controls.Add(this.cbxTranCategory); - this.pnlTranCategory.Controls.Add(this.lblTranCategory); - this.pnlTranCategory.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTranCategory.Location = new System.Drawing.Point(1, 51); - this.pnlTranCategory.Margin = new System.Windows.Forms.Padding(2); - this.pnlTranCategory.Name = "pnlTranCategory"; - this.pnlTranCategory.Padding = new System.Windows.Forms.Padding(1); - this.pnlTranCategory.Size = new System.Drawing.Size(275, 25); - this.pnlTranCategory.TabIndex = 2; - // - // cbxTranCategory - // - this.cbxTranCategory.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions"; - this.cbxTranCategory.Location = new System.Drawing.Point(83, 1); - this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(2); - this.cbxTranCategory.Name = "cbxTranCategory"; - this.cbxTranCategory.Size = new System.Drawing.Size(189, 21); - this.cbxTranCategory.TabIndex = 1; - // - // 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(82, 21); - this.lblTranCategory.TabIndex = 0; - this.lblTranCategory.Text = "Select 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, 26); - this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(2); - this.pnlTranFormat.Name = "pnlTranFormat"; - this.pnlTranFormat.Padding = new System.Windows.Forms.Padding(1); - this.pnlTranFormat.Size = new System.Drawing.Size(275, 25); - this.pnlTranFormat.TabIndex = 1; - // - // cbxTranFormat - // - this.cbxTranFormat.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranFormat.WatermarkText = "Select Style of Transitions"; - this.cbxTranFormat.Location = new System.Drawing.Point(76, 1); - this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(2); - this.cbxTranFormat.Name = "cbxTranFormat"; - this.cbxTranFormat.Size = new System.Drawing.Size(196, 21); - this.cbxTranFormat.TabIndex = 1; - // - // lblTranFormat - // - this.lblTranFormat.Dock = System.Windows.Forms.DockStyle.Left; - this.lblTranFormat.Location = new System.Drawing.Point(1, 1); - this.lblTranFormat.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lblTranFormat.Name = "lblTranFormat"; - this.lblTranFormat.Size = new System.Drawing.Size(75, 21); - this.lblTranFormat.TabIndex = 0; - this.lblTranFormat.Text = "Select Type"; - this.lblTranFormat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // 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, 25); - this.pnlTranVersion.TabIndex = 0; - // - // cbxTranVersion - // - this.cbxTranVersion.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranVersion.WatermarkText = "Select Format for Transitions"; - this.cbxTranVersion.Location = new System.Drawing.Point(76, 1); - this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(2); - this.cbxTranVersion.Name = "cbxTranVersion"; - this.cbxTranVersion.Size = new System.Drawing.Size(196, 21); - this.cbxTranVersion.TabIndex = 1; - // - // 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(75, 21); - 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.tabTranSearch.Text = "Transitions"; - // // 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, 22); - this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel4.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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.Size = new System.Drawing.Size(369, 114); 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.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))); + "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; // @@ -347,11 +219,12 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(30, 1); + this.gpSrchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpSrchText.Name = "gpSrchText"; - this.gpSrchText.Size = new System.Drawing.Size(253, 70); + this.gpSrchText.Size = new System.Drawing.Size(338, 90); // // // @@ -389,10 +262,10 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(0, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(247, 23); + this.panel1.Size = new System.Drawing.Size(332, 28); this.panel1.TabIndex = 5; // // cbxTextSearchText @@ -404,16 +277,16 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(39, 0); + this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxTextSearchText.Name = "cbxTextSearchText"; - this.cbxTextSearchText.Size = new System.Drawing.Size(217, 22); + this.cbxTextSearchText.Size = new System.Drawing.Size(293, 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.Leave += new System.EventHandler(this.cbxTextSearchText_Leave); this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); + this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave); // // label1 // @@ -422,10 +295,9 @@ namespace Volian.Controls.Library 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.label1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.label1.Size = new System.Drawing.Size(39, 23); 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:"; @@ -437,9 +309,10 @@ namespace Volian.Controls.Library this.panel3.Controls.Add(this.cbxIncROTextSrch); this.panel3.Controls.Add(this.cbxCaseSensitive); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 20); + this.panel3.Location = new System.Drawing.Point(0, 30); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(247, 44); + this.panel3.Size = new System.Drawing.Size(332, 54); this.panel3.TabIndex = 6; // // cbxBooleanTxtSrch @@ -448,9 +321,10 @@ namespace Volian.Controls.Library // // this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(127, 20); + this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(169, 25); + this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; - this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(111, 15); + this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(148, 18); 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"; @@ -464,10 +338,12 @@ namespace Volian.Controls.Library // 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, 26); + this.cbxIncROTextSrch.Location = new System.Drawing.Point(12, 32); + this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; - this.cbxIncROTextSrch.Size = new System.Drawing.Size(172, 15); - 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.Size = new System.Drawing.Size(229, 18); + 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"; // @@ -479,12 +355,12 @@ namespace Volian.Controls.Library // 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.Location = new System.Drawing.Point(12, 7); + this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxCaseSensitive.Name = "cbxCaseSensitive"; - this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15); + this.cbxCaseSensitive.Size = new System.Drawing.Size(139, 18); 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))); + "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"; // @@ -502,9 +378,9 @@ namespace Volian.Controls.Library 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbtnSrchTxt.Name = "rbtnSrchTxt"; - this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 70); + this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 90); this.rbtnSrchTxt.TabIndex = 6; this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); // @@ -518,10 +394,10 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(1, 91); + this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; - this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 18); + this.cbxSrchTypeUsage.Size = new System.Drawing.Size(367, 22); 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"; @@ -532,26 +408,154 @@ namespace Volian.Controls.Library 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))); + "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.pnlTranCategory); + this.tabControlPanel5.Controls.Add(this.pnlTranFormat); + this.tabControlPanel5.Controls.Add(this.pnlTranVersion); + this.tabControlPanel5.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel5.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel5.Name = "tabControlPanel5"; + this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel5.Size = new System.Drawing.Size(369, 114); + 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; + this.tabControlPanel5.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel5.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel5.Style.GradientAngle = 90; + this.tabControlPanel5.TabIndex = 5; + this.tabControlPanel5.TabItem = this.tabTranSearch; + // + // pnlTranCategory + // + this.pnlTranCategory.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlTranCategory.Controls.Add(this.cbxTranCategory); + this.pnlTranCategory.Controls.Add(this.lblTranCategory); + this.pnlTranCategory.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTranCategory.Location = new System.Drawing.Point(1, 61); + this.pnlTranCategory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pnlTranCategory.Name = "pnlTranCategory"; + this.pnlTranCategory.Padding = new System.Windows.Forms.Padding(1); + this.pnlTranCategory.Size = new System.Drawing.Size(367, 30); + this.pnlTranCategory.TabIndex = 2; + // + // cbxTranCategory + // + this.cbxTranCategory.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbxTranCategory.Location = new System.Drawing.Point(110, 1); + this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranCategory.Name = "cbxTranCategory"; + this.cbxTranCategory.Size = new System.Drawing.Size(254, 24); + this.cbxTranCategory.TabIndex = 1; + this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions"; + // + // lblTranCategory + // + this.lblTranCategory.Dock = System.Windows.Forms.DockStyle.Left; + this.lblTranCategory.Location = new System.Drawing.Point(1, 1); + this.lblTranCategory.Name = "lblTranCategory"; + this.lblTranCategory.Size = new System.Drawing.Size(109, 26); + this.lblTranCategory.TabIndex = 0; + this.lblTranCategory.Text = "Select 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, 31); + this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pnlTranFormat.Name = "pnlTranFormat"; + this.pnlTranFormat.Padding = new System.Windows.Forms.Padding(1); + this.pnlTranFormat.Size = new System.Drawing.Size(367, 30); + this.pnlTranFormat.TabIndex = 1; + // + // cbxTranFormat + // + this.cbxTranFormat.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbxTranFormat.Location = new System.Drawing.Point(101, 1); + this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranFormat.Name = "cbxTranFormat"; + this.cbxTranFormat.Size = new System.Drawing.Size(263, 24); + this.cbxTranFormat.TabIndex = 1; + this.cbxTranFormat.WatermarkText = "Select Style of Transitions"; + // + // lblTranFormat + // + this.lblTranFormat.Dock = System.Windows.Forms.DockStyle.Left; + this.lblTranFormat.Location = new System.Drawing.Point(1, 1); + this.lblTranFormat.Name = "lblTranFormat"; + this.lblTranFormat.Size = new System.Drawing.Size(100, 26); + this.lblTranFormat.TabIndex = 0; + this.lblTranFormat.Text = "Select Type"; + this.lblTranFormat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // 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(3, 2, 3, 2); + this.pnlTranVersion.Name = "pnlTranVersion"; + this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1); + this.pnlTranVersion.Size = new System.Drawing.Size(367, 30); + this.pnlTranVersion.TabIndex = 0; + // + // cbxTranVersion + // + this.cbxTranVersion.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbxTranVersion.Location = new System.Drawing.Point(101, 1); + this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranVersion.Name = "cbxTranVersion"; + this.cbxTranVersion.Size = new System.Drawing.Size(263, 24); + 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.Name = "lblTranVersion"; + this.lblTranVersion.Size = new System.Drawing.Size(100, 26); + 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.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, 22); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel2.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(369, 114); 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.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; @@ -561,11 +565,12 @@ namespace Volian.Controls.Library this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control; this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; 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.Location = new System.Drawing.Point(1, 26); + this.gpFindROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpFindROs.Name = "gpFindROs"; - this.gpFindROs.Size = new System.Drawing.Size(275, 68); + this.gpFindROs.Size = new System.Drawing.Size(367, 87); // // // @@ -606,10 +611,10 @@ namespace Volian.Controls.Library this.cbxFndUnLnkROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxFndUnLnkROVals.Enabled = false; this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 3); - this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(2); + this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4); + this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxFndUnLnkROVals.Name = "cbxFndUnLnkROVals"; - this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(176, 19); + this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(235, 23); this.superTooltip1.SetSuperTooltip(this.cbxFndUnLnkROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Find Linked Values", "", "Finding unlinked values does the search for a specific RO.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxFndUnLnkROVals.TabIndex = 2; this.cbxFndUnLnkROVals.Text = "Find Unlinked Values of Selected RO"; @@ -627,10 +632,10 @@ namespace Volian.Controls.Library this.cmboTreeROs.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmboTreeROs.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.cmboTreeROs.Location = new System.Drawing.Point(1, 1); - this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(2); + this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cmboTreeROs.Name = "cmboTreeROs"; this.cmboTreeROs.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cmboTreeROs.Size = new System.Drawing.Size(275, 20); + this.cmboTreeROs.Size = new System.Drawing.Size(367, 25); this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cmboTreeROs.TabIndex = 1; this.cmboTreeROs.ThemeAware = true; @@ -647,18 +652,19 @@ namespace Volian.Controls.Library // this.tabControlPanel3.Controls.Add(this.gpSrchAnnoText); this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); + this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel3.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(369, 114); 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; this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel3.Style.GradientAngle = 90; this.tabControlPanel3.TabIndex = 5; this.tabControlPanel3.TabItem = this.tabAnnotationSearch; @@ -669,12 +675,13 @@ namespace Volian.Controls.Library this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.gpSrchAnnoText.Controls.Add(this.panel4); + this.gpSrchAnnoText.DisabledBackColor = System.Drawing.Color.Empty; this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; this.gpSrchAnnoText.Enabled = false; this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23); - this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2); + this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 66); + this.gpSrchAnnoText.Size = new System.Drawing.Size(367, 90); // // // @@ -715,9 +722,9 @@ namespace Volian.Controls.Library this.panel4.Controls.Add(this.label2); this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(2); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(269, 62); + this.panel4.Size = new System.Drawing.Size(361, 76); this.panel4.TabIndex = 9; // // cbxBooleanAnoTxtSrch @@ -726,9 +733,10 @@ namespace Volian.Controls.Library // // this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(12, 41); + this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); + this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; - this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(111, 17); + this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); this.cbxBooleanAnoTxtSrch.TabIndex = 8; this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; this.cbxBooleanAnoTxtSrch.Visible = false; @@ -743,13 +751,13 @@ namespace Volian.Controls.Library // this.cbxCaseSensitiveAnnoText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(12, 25); - this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(2); + this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(16, 31); + this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(92, 15); + this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(109, 17); this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" + - " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); + " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); this.cbxCaseSensitiveAnnoText.TabIndex = 5; this.cbxCaseSensitiveAnnoText.Text = "Case Sensitive"; // @@ -762,18 +770,18 @@ namespace Volian.Controls.Library this.cbxTextSearchAnnotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchAnnotation.FormattingEnabled = true; this.cbxTextSearchAnnotation.ItemHeight = 16; - this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(30, 0); - this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(2); + this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(39, 0); + this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(239, 22); + this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(322, 22); this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" + - "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140))); + "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140))); this.cbxTextSearchAnnotation.TabIndex = 6; this.cbxTextSearchAnnotation.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchAnnotation.WatermarkText = "Enter Search Text Here"; - this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); this.cbxTextSearchAnnotation.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); + this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); // // label2 // @@ -782,10 +790,9 @@ namespace Volian.Controls.Library this.label2.Dock = System.Windows.Forms.DockStyle.Left; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.label2.Size = new System.Drawing.Size(30, 18); + this.label2.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.label2.Size = new System.Drawing.Size(39, 23); this.label2.TabIndex = 7; this.label2.Text = "Find:"; // @@ -799,10 +806,10 @@ namespace Volian.Controls.Library this.cbxAnnoTypes.FormattingEnabled = true; this.cbxAnnoTypes.ItemHeight = 16; this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); - this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(2); + this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxAnnoTypes.Name = "cbxAnnoTypes"; this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(275, 22); + this.cbxAnnoTypes.Size = new System.Drawing.Size(367, 22); this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61))); this.cbxAnnoTypes.TabIndex = 0; this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search"; @@ -818,12 +825,13 @@ namespace Volian.Controls.Library // this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top; this.contextMenuBar1.Font = new System.Drawing.Font("Segoe UI", 9F); + this.contextMenuBar1.IsMaximized = false; this.contextMenuBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnCMIFindText}); - this.contextMenuBar1.Location = new System.Drawing.Point(225, -3); - this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(2); + this.contextMenuBar1.Location = new System.Drawing.Point(300, -4); + this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.contextMenuBar1.Name = "contextMenuBar1"; - this.contextMenuBar1.Size = new System.Drawing.Size(56, 25); + this.contextMenuBar1.Size = new System.Drawing.Size(75, 29); this.contextMenuBar1.Stretch = true; this.contextMenuBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; this.contextMenuBar1.TabIndex = 6; @@ -985,8 +993,8 @@ namespace Volian.Controls.Library this.advTreeProcSets.Dock = System.Windows.Forms.DockStyle.Fill; this.advTreeProcSets.DragDropEnabled = false; this.advTreeProcSets.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeProcSets.Location = new System.Drawing.Point(0, 21); - this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(2); + this.advTreeProcSets.Location = new System.Drawing.Point(0, 26); + this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.advTreeProcSets.MultiSelect = true; this.advTreeProcSets.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeProcSets.Name = "advTreeProcSets"; @@ -997,12 +1005,12 @@ 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, 137); + this.advTreeProcSets.Size = new System.Drawing.Size(369, 168); this.advTreeProcSets.Styles.Add(this.elementStyle1); this.advTreeProcSets.TabIndex = 0; this.advTreeProcSets.Text = "advTree1"; - this.advTreeProcSets.AfterNodeSelect += new DevComponents.AdvTree.AdvTreeNodeEventHandler(this.advTreeProcSets_AfterNodeSelect); this.advTreeProcSets.AfterCheck += new DevComponents.AdvTree.AdvTreeCellEventHandler(this.advTreeProcSets_AfterCheck); + this.advTreeProcSets.AfterNodeSelect += new DevComponents.AdvTree.AdvTreeNodeEventHandler(this.advTreeProcSets_AfterNodeSelect); // // elementStyle1 // @@ -1033,8 +1041,8 @@ namespace Volian.Controls.Library this.advTreeStepTypes.Dock = System.Windows.Forms.DockStyle.Fill; this.advTreeStepTypes.DragDropEnabled = false; this.advTreeStepTypes.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeStepTypes.Location = new System.Drawing.Point(0, 21); - this.advTreeStepTypes.Margin = new System.Windows.Forms.Padding(2); + this.advTreeStepTypes.Location = new System.Drawing.Point(0, 26); + this.advTreeStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.advTreeStepTypes.MultiSelect = true; this.advTreeStepTypes.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeStepTypes.Name = "advTreeStepTypes"; @@ -1046,7 +1054,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(369, 154); this.advTreeStepTypes.Styles.Add(this.elementStyle2); this.advTreeStepTypes.TabIndex = 0; this.advTreeStepTypes.Text = "advTree1"; @@ -1073,11 +1081,12 @@ namespace Volian.Controls.Library this.grpPanSearchResults.CanvasColor = System.Drawing.SystemColors.Control; this.grpPanSearchResults.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpPanSearchResults.Controls.Add(this.lbSrchResults); + this.grpPanSearchResults.DisabledBackColor = System.Drawing.Color.Empty; this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpPanSearchResults.Location = new System.Drawing.Point(0, 475); - this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(2); + this.grpPanSearchResults.Location = new System.Drawing.Point(0, 585); + this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.grpPanSearchResults.Name = "grpPanSearchResults"; - this.grpPanSearchResults.Size = new System.Drawing.Size(277, 201); + this.grpPanSearchResults.Size = new System.Drawing.Size(369, 247); // // // @@ -1114,11 +1123,12 @@ namespace Volian.Controls.Library this.lbSrchResults.Dock = System.Windows.Forms.DockStyle.Fill; this.lbSrchResults.FormattingEnabled = true; this.lbSrchResults.HorizontalScrollbar = true; + this.lbSrchResults.ItemHeight = 16; this.lbSrchResults.Location = new System.Drawing.Point(0, 0); - this.lbSrchResults.Margin = new System.Windows.Forms.Padding(2); + this.lbSrchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lbSrchResults.Name = "lbSrchResults"; this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lbSrchResults.Size = new System.Drawing.Size(271, 173); + this.lbSrchResults.Size = new System.Drawing.Size(363, 224); this.lbSrchResults.TabIndex = 0; this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove); @@ -1135,11 +1145,12 @@ namespace Volian.Controls.Library this.panSearchButtons.Controls.Add(this.cbSorted); this.panSearchButtons.Controls.Add(this.btnSearch); 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, 416); - this.panSearchButtons.Margin = new System.Windows.Forms.Padding(2); + this.panSearchButtons.Location = new System.Drawing.Point(0, 512); + this.panSearchButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panSearchButtons.Name = "panSearchButtons"; - this.panSearchButtons.Size = new System.Drawing.Size(277, 59); + this.panSearchButtons.Size = new System.Drawing.Size(369, 73); this.panSearchButtons.Style.Alignment = System.Drawing.StringAlignment.Center; this.panSearchButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panSearchButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1159,11 +1170,11 @@ namespace Volian.Controls.Library this.btnClearSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnClearSearchResults.Enabled = false; this.btnClearSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnClearSearchResults.Location = new System.Drawing.Point(237, 3); - this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(2); + this.btnClearSearchResults.Location = new System.Drawing.Point(316, 4); + this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnClearSearchResults.Name = "btnClearSearchResults"; this.btnClearSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnClearSearchResults.Size = new System.Drawing.Size(37, 23); + this.btnClearSearchResults.Size = new System.Drawing.Size(49, 28); this.superTooltip1.SetSuperTooltip(this.btnClearSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Clear Search Results", "", "Clear Search Results just clears out the Search Results list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnClearSearchResults.TabIndex = 11; this.btnClearSearchResults.Text = "Clear"; @@ -1176,13 +1187,13 @@ namespace Volian.Controls.Library this.btnCopySearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnCopySearchResults.Enabled = false; this.btnCopySearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCopySearchResults.Location = new System.Drawing.Point(105, 29); - this.btnCopySearchResults.Margin = new System.Windows.Forms.Padding(2); + this.btnCopySearchResults.Location = new System.Drawing.Point(140, 36); + this.btnCopySearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCopySearchResults.Name = "btnCopySearchResults"; this.btnCopySearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnCopySearchResults.Size = new System.Drawing.Size(43, 23); + this.btnCopySearchResults.Size = new System.Drawing.Size(57, 28); this.superTooltip1.SetSuperTooltip(this.btnCopySearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Copy Search Results", "", "This button copies the Search Results listed below into the copy/paste buffer. Th" + - "e copied data can then be pasted into another tool, such as a spreadsheet.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "e copied data can then be pasted into another tool, such as a spreadsheet.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCopySearchResults.TabIndex = 10; this.btnCopySearchResults.Text = "Copy"; this.btnCopySearchResults.ThemeAware = true; @@ -1194,13 +1205,13 @@ namespace Volian.Controls.Library this.btnSaveSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnSaveSearchResults.Enabled = false; this.btnSaveSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSaveSearchResults.Location = new System.Drawing.Point(218, 29); - this.btnSaveSearchResults.Margin = new System.Windows.Forms.Padding(2); + this.btnSaveSearchResults.Location = new System.Drawing.Point(291, 36); + this.btnSaveSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSaveSearchResults.Name = "btnSaveSearchResults"; this.btnSaveSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnSaveSearchResults.Size = new System.Drawing.Size(43, 23); + this.btnSaveSearchResults.Size = new System.Drawing.Size(57, 28); this.superTooltip1.SetSuperTooltip(this.btnSaveSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Save Search Results", "", "This button saves the Search Results listed below into a named file in xml, csv, " + - "tab or basic format.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "tab or basic format.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnSaveSearchResults.TabIndex = 10; this.btnSaveSearchResults.Text = "Save"; this.btnSaveSearchResults.ThemeAware = true; @@ -1211,13 +1222,13 @@ namespace Volian.Controls.Library this.btnLoadSearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnLoadSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnLoadSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnLoadSearchResults.Location = new System.Drawing.Point(266, 29); - this.btnLoadSearchResults.Margin = new System.Windows.Forms.Padding(2); + this.btnLoadSearchResults.Location = new System.Drawing.Point(355, 36); + this.btnLoadSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLoadSearchResults.Name = "btnLoadSearchResults"; this.btnLoadSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnLoadSearchResults.Size = new System.Drawing.Size(43, 23); + this.btnLoadSearchResults.Size = new System.Drawing.Size(57, 28); this.superTooltip1.SetSuperTooltip(this.btnLoadSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Save Search Results", "", "This button loads saved Search Results from a named file in xml, csv, tab or basi" + - "c format.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "c format.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnLoadSearchResults.TabIndex = 10; this.btnLoadSearchResults.Text = "Load"; this.btnLoadSearchResults.ThemeAware = true; @@ -1231,13 +1242,13 @@ namespace Volian.Controls.Library // this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(3, 5); - this.labelX1.Margin = new System.Windows.Forms.Padding(2); + this.labelX1.Location = new System.Drawing.Point(4, 6); + this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.labelX1.Name = "labelX1"; this.labelX1.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.labelX1.Size = new System.Drawing.Size(66, 14); + this.labelX1.Size = new System.Drawing.Size(82, 17); this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" + - "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.labelX1.TabIndex = 9; this.labelX1.Text = "Results Style:"; // @@ -1253,13 +1264,13 @@ namespace Volian.Controls.Library this.comboItem2, this.comboItem3, this.comboItem4}); - this.cmbResultsStyle.Location = new System.Drawing.Point(70, 5); - this.cmbResultsStyle.Margin = new System.Windows.Forms.Padding(2); + this.cmbResultsStyle.Location = new System.Drawing.Point(93, 6); + this.cmbResultsStyle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cmbResultsStyle.Name = "cmbResultsStyle"; this.cmbResultsStyle.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cmbResultsStyle.Size = new System.Drawing.Size(110, 22); + this.cmbResultsStyle.Size = new System.Drawing.Size(145, 22); this.superTooltip1.SetSuperTooltip(this.cmbResultsStyle, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" + - "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cmbResultsStyle.TabIndex = 8; this.cmbResultsStyle.SelectedValueChanged += new System.EventHandler(this.cmbResultsStyle_SelectedValueChanged); // @@ -1287,11 +1298,11 @@ namespace Volian.Controls.Library // this.cbSorted.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbSorted.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbSorted.Location = new System.Drawing.Point(152, 33); - this.cbSorted.Margin = new System.Windows.Forms.Padding(2); + this.cbSorted.Location = new System.Drawing.Point(203, 41); + this.cbSorted.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbSorted.Name = "cbSorted"; this.cbSorted.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbSorted.Size = new System.Drawing.Size(42, 15); + this.cbSorted.Size = new System.Drawing.Size(46, 17); this.superTooltip1.SetSuperTooltip(this.cbSorted, new DevComponents.DotNetBar.SuperTooltipInfo("Sort Results", "", "Sorts results that are output into the Search Results list shown below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbSorted.TabIndex = 7; this.cbSorted.Text = "Sort"; @@ -1303,11 +1314,11 @@ namespace Volian.Controls.Library this.btnSearch.BackColor = System.Drawing.SystemColors.Control; this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; this.btnSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSearch.Location = new System.Drawing.Point(4, 29); - this.btnSearch.Margin = new System.Windows.Forms.Padding(2); + this.btnSearch.Location = new System.Drawing.Point(5, 36); + this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSearch.Name = "btnSearch"; this.btnSearch.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnSearch.Size = new System.Drawing.Size(50, 23); + this.btnSearch.Size = new System.Drawing.Size(67, 28); this.superTooltip1.SetSuperTooltip(this.btnSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search Button", "", "This will perform the search and place the results below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnSearch.TabIndex = 4; this.btnSearch.Text = "Search"; @@ -1320,13 +1331,13 @@ namespace Volian.Controls.Library this.btnPrnSrchRslts.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnPrnSrchRslts.Enabled = false; this.btnPrnSrchRslts.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnPrnSrchRslts.Location = new System.Drawing.Point(58, 29); - this.btnPrnSrchRslts.Margin = new System.Windows.Forms.Padding(2); + this.btnPrnSrchRslts.Location = new System.Drawing.Point(77, 36); + this.btnPrnSrchRslts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnPrnSrchRslts.Name = "btnPrnSrchRslts"; this.btnPrnSrchRslts.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnPrnSrchRslts.Size = new System.Drawing.Size(43, 23); + this.btnPrnSrchRslts.Size = new System.Drawing.Size(57, 28); this.superTooltip1.SetSuperTooltip(this.btnPrnSrchRslts, new DevComponents.DotNetBar.SuperTooltipInfo("Print Search Results", "", "This button generates a PDF of a standard formatted report regardless of what Res" + - "ults Style is selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + "ults Style is selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnPrnSrchRslts.TabIndex = 5; this.btnPrnSrchRslts.Text = "Print"; this.btnPrnSrchRslts.ThemeAware = true; @@ -1335,13 +1346,13 @@ namespace Volian.Controls.Library // sfdSearchResults // this.sfdSearchResults.Filter = "XML File (*.xml)|*.xml|Comma Separated Values (*.csv)|*.csv|Tab Separated Values " + - "(*.tsv)|*.tsv|Basic Style Format (*.bsf)|*.bsf"; + "(*.tsv)|*.tsv|Basic Style Format (*.bsf)|*.bsf"; this.sfdSearchResults.InitialDirectory = "Personal"; // // ofdSearchResults // this.ofdSearchResults.Filter = "XML File (*.xml)|*.xml|Comma Separated Values (*.csv)|*.csv|Tab Separated Values " + - "(*.tsv)|*.tsv|Basic Style Format (*.bsf)|*.bsf"; + "(*.tsv)|*.tsv|Basic Style Format (*.bsf)|*.bsf"; this.ofdSearchResults.InitialDirectory = "Personal"; // // xpSetToSearch @@ -1349,12 +1360,13 @@ namespace Volian.Controls.Library this.xpSetToSearch.CanvasColor = System.Drawing.SystemColors.Control; this.xpSetToSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.xpSetToSearch.Controls.Add(this.advTreeProcSets); + 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, 112); - this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(2); + this.xpSetToSearch.Location = new System.Drawing.Point(0, 138); + this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xpSetToSearch.Name = "xpSetToSearch"; - this.xpSetToSearch.Size = new System.Drawing.Size(277, 158); + this.xpSetToSearch.Size = new System.Drawing.Size(369, 194); 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; @@ -1363,9 +1375,8 @@ namespace Volian.Controls.Library this.xpSetToSearch.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.xpSetToSearch.Style.GradientAngle = 90; this.superTooltip1.SetSuperTooltip(this.xpSetToSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Select Procedure Sets to Search", "", "This allows you to select specific procedure sets in which to search.\r\n\r\nThe defa" + - "ult is the current procedure set only.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(228, 105))); + "ult is the current procedure set only.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(228, 105))); this.xpSetToSearch.TabIndex = 7; - this.xpSetToSearch.TitleHeight = 21; this.xpSetToSearch.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpSetToSearch.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSetToSearch.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1381,13 +1392,14 @@ namespace Volian.Controls.Library this.xpStepTypes.CanvasColor = System.Drawing.SystemColors.Control; this.xpStepTypes.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.xpStepTypes.Controls.Add(this.advTreeStepTypes); + 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, 270); - this.xpStepTypes.Margin = new System.Windows.Forms.Padding(2); + this.xpStepTypes.Location = new System.Drawing.Point(0, 332); + this.xpStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(369, 180); 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; @@ -1396,11 +1408,10 @@ namespace Volian.Controls.Library this.xpStepTypes.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.xpStepTypes.Style.GradientAngle = 90; this.superTooltip1.SetSuperTooltip(this.xpStepTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Filter Search by Selected Step Elements", "", "This allows you to search in only the selected step elements.\r\n\r\nIf the Find Sele" + - "cted Step Elements option is selected, search will show you where the selected " + - "Step Elements are use.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(240, 155))); + "cted Step Elements option is selected, search will show you where the selected " + + "Step Elements are use.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(240, 155))); this.xpStepTypes.TabIndex = 8; this.xpStepTypes.ThemeAware = true; - this.xpStepTypes.TitleHeight = 21; this.xpStepTypes.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpStepTypes.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpStepTypes.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1413,32 +1424,33 @@ namespace Volian.Controls.Library // // superTooltip1 // + this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray); this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // // DisplaySearch // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.grpPanSearchResults); this.Controls.Add(this.panSearchButtons); this.Controls.Add(this.xpStepTypes); this.Controls.Add(this.xpSetToSearch); this.Controls.Add(this.tabSearchTypes); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "DisplaySearch"; this.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.Size = new System.Drawing.Size(277, 676); + this.Size = new System.Drawing.Size(369, 832); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit(); this.tabSearchTypes.ResumeLayout(false); - this.tabControlPanel5.ResumeLayout(false); - this.pnlTranCategory.ResumeLayout(false); - this.pnlTranFormat.ResumeLayout(false); - this.pnlTranVersion.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); + this.pnlTranVersion.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); this.gpFindROs.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 34ad35e2..b1f3976b 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -419,11 +419,11 @@ namespace Volian.Controls.Library // else, it is a parent node, so add it as a new parent DevComponents.AdvTree.Node parnode = advTreeStepTypes.FindNodeByName(parentName); - // Group by High Level Steps, Substeps, Cautions, Notes, Figures, Tables + // Group by High Level Steps, Substeps, Cautions, Notes, Figures, Tables and Equations while (!parentName.Equals("Base") && !parentName.Equals("Substep") && !parentName.Equals("High") && !parentName.Equals("Caution") && !parentName.Equals("Note") && !parentName.Equals("Table") && !parentName.Equals("Figure") && !parentName.Equals("Title") && - !parentName.Equals("And") && !parentName.Equals("Or") && !parentName.Equals("Paragraph")) + !parentName.Equals("And") && !parentName.Equals("Or") && !parentName.Equals("Paragraph") && !parentName.Equals("Equation")) { StepData tmpsd = (StepData)parnode.Tag; parentName = tmpsd.ParentType; @@ -978,7 +978,7 @@ namespace Volian.Controls.Library if (ResultsMouseOverIndex != -1 && ResultsMouseOverIndex != LastResultsMouseOverIndex) { ItemInfo ii = lbSrchResults.Items[ResultsMouseOverIndex] as ItemInfo; - if (cmbResultsStyle.Text == "Step Path") + if (cmbResultsStyle.Text == "Step Path" && !ii.IsRtfRaw) toolTip1.SetToolTip(lbSrchResults, ii.DisplayText); // display the text in a tooltip else toolTip1.SetToolTip(lbSrchResults, ii.Path); // display location of corresponding procedure text in a tooltip diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 7bef1611..a33d9fe3 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -702,6 +702,7 @@ namespace Volian.Controls.Library { if (_MyEditItem.RTBLastFocus) { + if (_MyStepRTB.MyItemInfo != null && _MyStepRTB.MyItemInfo.IsRtfRaw) return; trackerSC++; /*if (trackerSC>20) *///Console.WriteLine("ShowCaret: {0}", trackerSC); //Volian.Base.Library.vlnStackTrace.ShowStack("ShowCaret: EI: {0} StepRTB: {1}", _MyEditItem.MyItemInfo.ItemID, _MyStepRTB.MyItemInfo.ItemID); diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index 3ab4c7e5..25dc920a 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -195,7 +195,7 @@ namespace Volian.Controls.Library cbPlaceKeeper.Checked = false; // will be set below if HLS & config has this set cbPlaceKeeperCont.Checked = false; // will be set below if substep & config has this set cbPageBreak.Enabled = CurItemInfo.IsHigh; - if (!CurItemInfo.IsFigure) + if (!CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw) { cbPlaceKeeper.Enabled = (((SectionConfig)CurItemInfo.ActiveSection.MyConfig).Section_Placekeeper == "Y"); cbPlaceKeeperCont.Enabled = (cbPlaceKeeper.Enabled && !CurItemInfo.IsInRNO && !CurItemInfo.IsHigh); @@ -225,7 +225,7 @@ namespace Volian.Controls.Library //if ((fmtdata.ProcData.CheckOffData.CheckOffList == null || fmtdata.ProcData.CheckOffData.CheckOffList.Count == 0) || // fmtdata.ProcData.CheckOffData.Menu=="Signoff") // cmbCheckoff.Enabled = false; - cbCAS.Enabled = !CurItemInfo.IsFigure; + cbCAS.Enabled = !CurItemInfo.IsFigure && !CurItemInfo.IsRtfRaw; if (((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds) || ((CurItemInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedDeviations) == E_PurchaseOptions.EnhancedDeviations)) { diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 92abf348..f390bdec 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -997,6 +997,8 @@ namespace Volian.Controls.Library EditItem child = null; if (MyItemInfo.IsFigure) child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, expand); + else if (MyItemInfo.IsRtfRaw) + child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, expand); else if (MyItemInfo.MyContent.MyGrid != null) child = new GridItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, expand); else @@ -1007,9 +1009,9 @@ namespace Volian.Controls.Library { EditItem child = null; if (MyItemInfo.IsFigure) - { child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem, FigInsType); - } + else if (MyItemInfo.IsRtfRaw) + child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem); else if (MyItemInfo.MyContent.MyGrid != null) child = new GridItem(MyItemInfo, MyStepPanel, this, ChildRelation.After, true, nextEditItem); else @@ -1021,6 +1023,8 @@ namespace Volian.Controls.Library EditItem child = null; if (MyItemInfo.IsFigure) child = new ImageItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem, FigInsType); + else if (MyItemInfo.IsRtfRaw) + child = new RtfRawItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem); if(MyItemInfo.MyContent.MyGrid != null) child = new GridItem(MyItemInfo, MyStepPanel, this, ChildRelation.Before, true, nextEditItem); else @@ -2536,13 +2540,17 @@ namespace Volian.Controls.Library { AdjustTableWidthAndLocation(); } + else if (MyItemInfo.IsRtfRaw) + { + AdjustTableWidthAndLocation(); + } else { if (MyItemInfo.FormatStepData.StepLayoutData.AlignWithParentTab) // Paul Linn made the request on 6/4/12 to align the Component Description & // Required Position under the Component Number. ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom); - else if (MyItemInfo.FormatStepData.Type == "TitleWithTextRight" && (MyItemInfo.Steps == null || MyItemInfo.Steps.Count==0)) // this code is run for siblings within a HLS (but not last sibling). + else if (MyItemInfo.FormatStepData.Type == "TitleWithTextRight" && (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)) // this code is run for siblings within a HLS (but not last sibling). ItemLocation = new Point(_MyParentEditItem.ItemLocation.X, _MyParentEditItem.Bottom); else if (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight") ItemLocation = new Point(_MyParentEditItem.ItemLocation.X + _MyParentEditItem.ItemWidth, _MyParentEditItem.ItemLocation.Y); @@ -2557,7 +2565,7 @@ namespace Volian.Controls.Library else ItemLocation = new Point(_MyParentEditItem.ContentLeft, _MyParentEditItem.Bottom); } - bool specialTplSupport =((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) || + bool specialTplSupport = ((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd) || (MyItemInfo.MyDocStyle.LandscapePageList && MyItemInfo.MyDocStyle.ComponentList); bool wecTplSupport = ((MyItemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_ChklstEditSize) == E_DocStructStyle.DSS_ChklstEditSize); if (MyItemInfo.FormatStepData.ReadOnly) @@ -2723,7 +2731,8 @@ namespace Volian.Controls.Library _IgnoreResize = true; // the table code goes through the following, rather than 'istablepart' if (MyStepData != null && ((MyStepData.Type.ToLower().Contains("table") || MyStepData.ParentType.ToLower().Contains("table"))|| - (MyStepData.Type.ToLower().Contains("figure") || MyStepData.ParentType.ToLower().Contains("figure")))) + (MyStepData.Type.ToLower().Contains("figure") || MyStepData.ParentType.ToLower().Contains("figure"))|| + (MyStepData.Type.ToLower().Contains("equation") || MyStepData.ParentType.ToLower().Contains("equation")))) { ItemWidth = TableWidth; Location = new Point(_MyPreviousEditItem.Left, FindTop(_MyPreviousEditItem.BottomMostEditItem.Bottom)); @@ -3045,6 +3054,12 @@ namespace Volian.Controls.Library X = gi.MyFlexGrid.Right+2; H = gi.MyFlexGrid.Height; } + else if (this is RtfRawItem) + { + RtfRawItem ri = this as RtfRawItem; + X = ri.MyStepRTB.Right + 4; + H = ri.MyStepRTB.Height; + } else if (this is ImageItem) { ImageItem ii = this as ImageItem; @@ -3054,7 +3069,7 @@ namespace Volian.Controls.Library else { RTBItem ri = this as RTBItem; - X = ri.MyStepRTB.Right+2; + X = ri.MyStepRTB.Right + 2; H = ri.MyStepRTB.Height; } g.DrawLine(penCB, X, ContentTop, X, ContentTop+H); //Height); @@ -3068,7 +3083,17 @@ namespace Volian.Controls.Library GridItem gi = this as GridItem; location = new PointF(gi.MyFlexGrid.Left + gi.MyFlexGrid.Width + 2, gi.MyFlexGrid.Top); } - else + else if (this is RtfRawItem) + { + RtfRawItem rr = this as RtfRawItem; + // SkipSpaces puts the checkoff macro (if specified in the format) next to the step tab + // this is used for Bryon and Braidwood + if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.SkipSpaces) + location = new PointF(rr.MyStepRTB.Left - 50, rr.MyStepRTB.Top); + else + location = new PointF(rr.MyStepRTB.Left + rr.MyStepRTB.Width + 2, rr.MyStepRTB.Top); + } + else { RTBItem ri = this as RTBItem; // SkipSpaces puts the checkoff macro (if specified in the format) next to the step tab diff --git a/PROMS/Volian.Controls.Library/ImageItem.designer.cs b/PROMS/Volian.Controls.Library/ImageItem.designer.cs index 42a8fd00..19ef92d5 100644 --- a/PROMS/Volian.Controls.Library/ImageItem.designer.cs +++ b/PROMS/Volian.Controls.Library/ImageItem.designer.cs @@ -13,12 +13,26 @@ /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { + _BeingDisposed = true; + DisposeOfChildren(MyAfterEditItems); + DisposeOfChildren(MyBeforeEditItems); + DisposeOfChildren(MyRNOEditItems); if (disposing && (components != null)) { components.Dispose(); } base.Dispose(disposing); + MyItemInfo.MyContent.Changed -= new VEPROMS.CSLA.Library.ContentInfoEvent(MyContent_Changed); + MyItemInfo.MyProcedure.MyContent.Changed -= new VEPROMS.CSLA.Library.ContentInfoEvent(MyContent_Changed); } + private void DisposeOfChildren(System.Collections.Generic.List children) + { + if (children == null) return; + foreach (EditItem child in children) + child.Dispose(); + children = null; + } + #region Component Designer generated code diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs index b3f5273b..869fde52 100644 --- a/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs +++ b/PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs @@ -430,6 +430,16 @@ namespace Volian.Controls.Library.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap FormulaEvaluatorHS { + get { + object obj = ResourceManager.GetObject("FormulaEvaluatorHS", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PROMS/Volian.Controls.Library/Properties/Resources.resx b/PROMS/Volian.Controls.Library/Properties/Resources.resx index 1a0a8388..4c5e1bab 100644 --- a/PROMS/Volian.Controls.Library/Properties/Resources.resx +++ b/PROMS/Volian.Controls.Library/Properties/Resources.resx @@ -192,28 +192,26 @@ wxRG9X6OdC651mgas04UW54haAC+zAbOyYQUEJIHAEKin9SFT4mZAAAAAElFTkSuQmCC - + + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEgAA - CxIB0t1+/AAAAilJREFUOE+lk99rUmEcxtXb2B8Q+wdEwRvxMq+6GXRhuLNFF0a0iyKhYF3sIF7URSyH - MKjFwjlCJ/1YazaXM0VkC23GgrWKsjybZznnTueUTTKHep7Oe85cbmVQfeHhvPA93w/P+77Pq/bPLEKj - 0ajUarUKwK5ElShCUkMSWe9X8z8VKQKoiTWUqw1ZG6U6MsU67idYXB4N7+sd7Ju6zkAVmE3LgwtLH2Q9 - TjHyMFH/UHCvl3ieRWyRQTi1ikdP1zA1n4MMIA4GhsN76h8K4cLVIM5dmUKf8x5O0QGcvORDz8VxHD8/ - hmNnb6Gr7yaOnr6hAG5PJ6Ut/bmk80C9IaK6U0e5UsOX7R1sff6uAMYm53+ZFgQBbrcbNpsNFEXBPxHA - J2EbfKmKj1vf8H79K6LJjAIYvRMHy7JwuVwol8syLJvNguM48DyPzsOd6O09AYbdxAanDDudTjyMvVQA - IxNPQNM0LBYLDAYDdDodKpUKotEoBgevoeNQB7q7KbzNFuBwOGC322E0GqHX6xXAdd8c8vm8PMgwjOzA - 6/XCarWiyAkKgOrBuzUeb1ZLSL8uQqvVIjC7/BNw8BA8Hg/MZjMGaAdMJhOOSOvhkXG8yAhIrnCIL23C - N7O7BeKAVKFQkMXzAnK5dUw+mEYwFEEskUIosoC5eBrPllncjbyCP7QCb7DFwX/lgDhoF2WSxNbeb6NM - AO2iTJLY7LWNMgGQ6/hXtTzh5lP+u+8PbUr3KB0oMhcAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAADpJREFUOE9j/P// - PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WSlJCQA3IYpUQA76epNf0QgmEAAAAA - SUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRFBAIEBIIE + BIKEBAKEBP78BP4EhAKEhAIExMLE/AL8/P4EBAL8/P78hIIEhIKE/AIE//////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////Tc5YRQAAAAlwSFlzAAASdAAA + EnQB3mYfeAAAADNJREFUKFNjYMAAPCgAKA3kIxSBmJgqkA3BrgKkB6YKtwq4yVhtweIwJCGitKD7lgMN + AADBXQehB7bhZAAAAABJRU5ErkJggg== @@ -280,46 +278,18 @@ AgAb/SY4VCjkVwAAAABJRU5ErkJggg== - + - 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 - Ktosv/8Ac0Q/0UrVA0MAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA + EnQB3mYfeAAAAYdJREFUOE9j/P//PwNVAchAamKqGgb2LTVdRxsD79446NrRmPp/WmfW/zm9uf/PHd70 + //HDx0Eg2+49fez9+tVrnw8fPggT6xOGf9/fMW5cOaNuz9qO//fP9vyf3Ozyd9vixnxiDUBXBw/D1pLQ + ulfn+/9vnmr7vypa6v/22Y3/f719pUKqwSiRMrvKu+7WmpD/+yYa/O+J5f8/r7vi/YE9e4j2LtZIWdPu + vv7u9sT/x2aZ/+/MkP0/tzVl97a10xiJdSlGsskOVmfrLXdtPbQ45v+1te7/tzRo/O8s911X3eAvSoyh + ONNhX2Vs9fZ58f/vrwv6v77F4H9Vicnn9GhnR0KG4k3YBYk6EusmeL27tjLj/7mlef8XxDj/jzJSiMNn + KMGckhevr3l8w5L/37Ys+n8/2On/BAPJFxQZCNJcX9Nfd3H+kv//u5r/Hwi0+USxgSAD5k3urT5VW/54 + eqjHPKoYSCgyYPIEwxCXQcBCGSgFKUtBbBifKAORNaAbQJaBxHoXpA4AG4E67su8bvIAAAAASUVORK5C + YII= @@ -474,22 +444,19 @@ AAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE - WavUaCnpsqzhnNPlKvNlrFm+pem0Njdtup3nnPOc7dtznmGQbB34cODh+b78fs8WAMLmr981TtjZVjWm - CgpNIMtUoCrlf1mhgqrGpZyM9G2CZrCZgY/jMjuD+6sPQ545vB+eht31DW/7v+BVzyi6bG7UmboID09m - 4Bj0UgZsTje6e4dhsX6C2eJES7sdTc/eof7xa9QYLVpIcgNzpw2qGuNQqkJRKIdIMkQi4Xc4ghJ9lVZS - EF7apggDL6wTaO7yorFtFLWtn3H7kQvlDwZQcteOS9W9iEQJFwZDYSz5QygoupEw6LTP8HkdY0FYh/yw - OBdhts3jSfd3NHZMockyjav3HQgEV+FbWsbcwi9Mzy4iK/vC3wb03wZjvEGV6QNuGZ243tCP0uoe6HKL - cFpXyIUb8Ab1LX2g2qwM9lyQFRWSTCFKCqstYyVMcFFv5GnJEAwNFiZkYibU0MRrEQl32gKoeB5A+dOf - KDb6kHtvDhmGGRzVT+BQ0TjS8tzYlz1KhPIaM08WicKWRBAKi1heiaCqPailwuSIo86qoqJDQWmrhPMP - ozhTv86IYn+ehwiZ+TdxPKsYR04UIDOnDJf1taiua4HB7E80aN5o8CPR4BprUOxFWr4be8+OyEnn0mY9 - ZxhkewFHoXGIMkOKYU1UsbpOsRCQsCu9MvliNINTV94wIdhS42wvcURIDMGwgqWghJlFEZ7Zdew4WJba - 4FhhG2SWvBZV4V+RMe8nmPRFMTIZhsu7ir6xELbvPpnaYM/hUuw8oOOX/kfKHaR6983nfwDA/wvA3MbO - iwAAAABJRU5ErkJggg== + CxMBAJqcGAAAAf1JREFUOE9j/P//PwNFAGQAJRiu2ansDqdr9V1F1/ZXWc69b2utp3/dYj7r10WzqV/3 + mXS+7zaueJplmH/DSivurBiyhWADfGofcLk2PC+ya3+7yTvpwkW/8ANrfMIP53tFHk13iT492aLwzknN + nk/PFauf3VEOPlapZrWHB2YI2ACXqrv2ti2vHwUF7LsdE7rFH5uXzLMuT1RNvX5F2mnfPS3z5ZEoBtg0 + vdhpmn//u5/zug584aGacmGbjNvezzrmC9eiGGBa/XS5bszVb86Wq7PxGaCcfn69nNfur4aW85egGGBR + fMtfw+/MDTXDbZfxGaBUcvWNisPG11Y2c2JQDDCLu6ys6n7igLz1ga/q9ls8sBmim302Ubn8yh8T60XX + rKwXaKIYAOJo+h2xEI+49Fra4+AubAbo5F+6rBay77O17QI3jGiECcgmX5ktmXD2qYbdZntkRUaZp5w0 + iy990Pbdth7dcHA0ivd//qiWfM5ZJeSgqrTLzvdalis3Iis0yDl9RCf79Hd9/23Gmp7rk+R8Vv9E8YJ4 + /fP34tmXv8harn+iYzbvjYH1vHuoBpx6oRe+97O2y+r36k5Lf6o6zf+GYoB80JETisarb+uaz/+kaT3n + h4bTwr/IBhgmHfht7L3hh5H3ih86rove6zjMe4gRiORmKIpyIshSAKemayZYZb7LAAAAAElFTkSuQmCC @@ -559,7 +526,6 @@ kGYgJs8FpDobIwwoMQAAEuaJ1nndlB8AAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -600,25 +566,29 @@ D0SdDUdQRwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAz9JREFUWEftl2tI - k2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1KZJhkyIRpk+UNRaRQW9GU3kRRIy+l - aB90rEiyqBRU1Ozy77yOvM3pPjxCHxz84GEMzm/nfc7ltbBY/fwPGUj0EboSMimP7yxJdE4SGUiei59Q - ds3AKSb+FJyryIqBtijNmGL6jqhbBBIYZibQ31mKP5Ma/B5RmQ0JgIkApZ3r71Tj50AMJtsszSbFXwjC - gyeV56SB6/8IoDOxrOS0QEc+pj5GY/zVerNRxh1EgfQMHvAkzaKisyrZgCLOH2kBQm5JCYNAHn58iMRY - s5XZjHe7ABNZy0ICSz8quu1cf/t9TOojMNJozZzlBUS8wF1M6C5AV2ODFrUNiuIFKIxzZII8SIj0YCG3 - AMnMY6E6J4HbGO87jyaVDSrlW/AwNQz6rucrQku1YlponoCuLR3fusNQn7cBBVd2oKX6HoD3wGQCc7gS - MSgrOTMC1OU4XVsa9K2noc21ReZZJwzqaoEpNfDdgjlqqQNkQXPK0yCQjK46MWru2CEzzJX+fSswFg18 - IQGGTOjXQBa4oCqS/UjgdQIaKj1RLN2ORzkXSaAe+EoiAyTAkN4n1rgZuKAvUEvl3ryIQUPFCeRGCdBR - lwb8KgP0FJwxT7O34oZYOFsB/EXgBRprwvGy/Djkwc4Y+qwARuny9ZEAY/JiBLyA67zOyAtoSkOgKXBH - duQhSr8SGPQGekiAIUNNa/m2bDxBk0R7uOpiMcqzPKDJDyWBbOCdPdBJAgxpL7QFDafHRnNB4rWbqy7y - g0JyGD3NUdTb46kIKDhjqlK2gSZlhJFArPtOEvAGjVKMj16l9PsDDSTAmIwQJz6Go5FA5FEBp8pwo5Hq - RumPBbr3AloSYMinsnX87qBfdCxfIoGMcBfUl3iSQDjwzBKoJQGGNN3axAuoTQok+jhD99YXGCaJKgrO - mOJYe5hcYqOOCTh5KKUdVHq9QqCEBBjD74/ExkUzcNljF1ckP0ACRwDNZkBBAgzRya1A86bT5Fom8XLi - lIn7aP3eD22sHXOU5xzAv1uYFKCVzHX6JWQlEZlI/7Ir8+oPVjgDfwG3AOBIhe+ncQAAAABJRU5ErkJg - gg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABEVJREFUWEfNV9tO + lFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNobBPTtLYesCgUOXigOAKOMwNyHOBf + XWvP/obNwGwghqQ7WSGBP986fN8+YPa/Wgdv1+zTX2GH7hC/wQ7/DvvsLuzIX7DP78OOPiQewY71w44/ + gX0xSAzBTgzDTo4QY7Avn8NOvSDGa3Z64uTu/JH8wSTeGz8OApd/Wsa+Uhl2prwLEXQ+8Abvjd5+4MD3 + wDc/N7Dv0hSsa2qHIhj7aA0B/1SAx9PAE0KiBgn9Thginr5tYjhipAo4evsK7L9SBBFXblJETwV2trID + Eez5v7MIENGDMtD3GvibbXk81RQThBBP+XeRjxCjxBgFCM8o/tq9Ah+X1kV8e2sFH35VhZ2rbiOCAzc5 + hwAV7iNxfyQfiOTBPRGIE9LnJH5RB14SP/xZ4KNjG0V8d5sivq7DztczIjjtlQUEyEl/dK0WpK47EY/P + MD3i2t0CH3yyWcTVX1YpYAaddwa3Wn0JAXLikaeuPWZ3PM7vRCpMsHWv1L7JAr1M4TpbceNhgZsDBe6M + An+MA3ZhNiOA+/zdMgJUTP0W+XCM3Mk96kBKiFQovwNeE5MC2zgVUV1s1hTswlxOwCMsNBCgYoE86bVc + KxmPWiLLRDvpNImn54E3EUrU69rF+YwAnnBLKwiQCyd/xmFLyd21O5bTlLRCYs3R24hZOve6eQE8XpdX + EaCCvr2c3Pvcch0jltN2UsUu1Ig5CvC6dnEhkwDP9pU1BKioet6JPLiOEbvbKh2LUKgLcaAVv9e17sWc + gCGsklxQ0e3I5VoxO7GTzpBYmBXofpEt9brWvZQRwFttrUCAimraNXDpsMm5Rx7I3XFC6hOvn4pf/fe6 + 1r2cEcAr1T9UjL7HtcU06R57y3mM2t06sUjnGPt8hPrfElDKChhDQfeCBGjonFz7Wj3PkYvYScO2o3Oh + QQFe10qNTAJ8TJA7QAOk7aaJ15bUrlD0Hrv6HZzHA8YdO7H6Lih+DaDXtdJKRgBfMv6hiqfRh74nA7cl + eSQNxHQtKH4N4A4F8LCOSwSpe48+bLE44WHIYp8VtTv2Pa/ohVWxx2WXeCF1XKcnWh9qC/ngbRW9T7h6 + 3iKPjiWgQdeC4tcA7lDAq3UBdCcB6n3q3qP3gVPPU+fBdSQWueLfKGAtk8AZPoHiksPW5Mfe++C1R69B + C67byelc8WsHrCeQE9DF508iwA+d1uQnvd8q+g3O44Em9xsFFJkEuvgE6iBAw7cp/rjN2t3LtR88mwT0 + 5ASc5cMvEeD997NeAtL4fbv50HnPXYAfPkkHYHkBfIHEpaKdBs0d+w0XLpq2yLciV2nrITquc3z+7PHa + RgAfAHu88gLO12p8tzefznq96gGpN1wAXzJ6TOg+15WqW00Xi852QSdcALdZAIdN/Q6I0Td/1nb3D+se + f/0f80rRBR6zBfsAAAAASUVORK5CYII= @@ -664,21 +634,6 @@ SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T 13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq NIINQOcTNAAU/2y6TXAD0PkEDSA1ZVI/KZPqAgBmE8VVB/UQsAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAf1JREFUOE9j/P//PwNFAGQAJRiu2ansDqdr9V1F1/ZXWc69b2utp3/dYj7r10WzqV/3 - mXS+7zaueJplmH/DSivurBiyhWADfGofcLk2PC+ya3+7yTvpwkW/8ANrfMIP53tFHk13iT492aLwzknN - nk/PFauf3VEOPlapZrWHB2YI2ACXqrv2ti2vHwUF7LsdE7rFH5uXzLMuT1RNvX5F2mnfPS3z5ZEoBtg0 - vdhpmn//u5/zug584aGacmGbjNvezzrmC9eiGGBa/XS5bszVb86Wq7PxGaCcfn69nNfur4aW85egGGBR - fMtfw+/MDTXDbZfxGaBUcvWNisPG11Y2c2JQDDCLu6ys6n7igLz1ga/q9ls8sBmim302Ubn8yh8T60XX - rKwXaKIYAOJo+h2xEI+49Fra4+AubAbo5F+6rBay77O17QI3jGiECcgmX5ktmXD2qYbdZntkRUaZp5w0 - iy990Pbdth7dcHA0ivd//qiWfM5ZJeSgqrTLzvdalis3Iis0yDl9RCf79Hd9/23Gmp7rk+R8Vv9E8YJ4 - /fP34tmXv8harn+iYzbvjYH1vHuoBpx6oRe+97O2y+r36k5Lf6o6zf+GYoB80JETisarb+uaz/+kaT3n - h4bTwr/IBhgmHfht7L3hh5H3ih86rove6zjMe4gRiORmKIpyIshSAKemayZYZb7LAAAAAElFTkSuQmCC @@ -735,27 +690,6 @@ 4ksdWjoYBRamBiC1wDQQwG88JrMXyouNK8cyBRTFDJMMJB1Apql/RPtHN7+WJV93aRHhWOYnn54vzeqH sqZ1jMaJbka4CCuPApazKiwf+uWV35QH6WdEpweRWuRGcuEAHtvdByXWNWT8f5NjsE0llkWCAAAAAElF TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRFBAIEBIIE - BIKEBAKEBP78BP4EhAKEhAIExMLE/AL8/P4EBAL8/P78hIIEhIKE/AIE//////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////Tc5YRQAAAAlwSFlzAAASdAAA - EnQB3mYfeAAAACNJREFUKFNj4EEDDFA+jOahkQADCqCVLRDPYPgF7mcGDjQAAK7XComEDKxGAAAAAElF - TkSuQmCC @@ -779,6 +713,19 @@ FZTLZZRKJdjZCAqFAlYOoljaf8Pi7isYNgTG/QyP71oJ6B9h0De8AOuQHdbBefQOzFFd0lUQBCSTSSQS CfA8T6MA6H1pM1uPVJlhX+DYeVKkLcD05gM+f9Lg/De0ozryDvQMbBv3dNPmMT+dVyv0LRj9LEbPOwb8 Af/j3yagcYeqAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEgAA + CxIB0t1+/AAAAW9JREFUOE9jfPkp9z8DGrAwWMRw4kIciqgY7yRGdHVgPsgAdKyoxI8h9v//f4a22fst + gfh/Rf+2//ntG/4nVq0IZZi/1Os/SAMIg9ggw2B8ZDGY5uz6+Z/mrT//v2vB6f/ucY3/GR69yoLbBrMZ + RsMMv/Uk93/foh1AR/z/f+TMrf+2gTm/Y4um/Tf1TP7PsGZzAIqNMBfAvAUy7PTVZqDWP/9fvP32//il + V/+retf/BWkGYhsGZP9ic4GHj/7/Lz8P/H/1/jtYc8+8w3DNoHABh4GWjsh/Y1NxsEt2HQqHuwik+cTp + WUDNb7FqBhuALRbuPSr5f3BPyf9tR9b8P33pKlDzSwybQZqxGnD/SfH/5TOL///8tPr/oWML/7tGZP6v + 6V8PDjCQn2Ea4QagCyyZXgjWDMLv7jb/nzu34r+YEB9WzWAXoBvQU5f4v68u5X9ZRvD/IA/L/3oa8jg1 + YzUA3UBCfAwXENJAMAyGngEAmeKbGy12NvwAAAAASUVORK5CYII= @@ -869,27 +816,6 @@ C1hnAVWpZG+ZRFrycnKPrcJ9pD/tX6MEsdH6aCRZCaMpePKe1z75V5lHiP8NrBdAuySvHkt5UoZ0SNos rZAvNhf0hQQ8kdScjaC9qdYCsCawKapWaEMrXIlWFCXNRiueJo1HK4mQRkiD0K4PRbs1hAvJU5xKPKoU aQ7yC4PTu8CgAQ1TAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRFBAIEBIIE - BIKEBAKEBP78BP4EhAKEhAIExMLE/AL8/P4EBAL8/P78hIIEhIKE/AIE//////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - ////////////////////////////////////////////////////////Tc5YRQAAAAlwSFlzAAASdAAA - EnQB3mYfeAAAADNJREFUKFNjYMAAPCgAKA3kIxSBmJgqkA3BrgKkB6YKtwq4yVhtweIwJCGitKD7lgMN - AADBXQehB7bhZAAAAABJRU5ErkJggg== @@ -922,19 +848,12 @@ ruEOZ3PBIcFwG+zQO0Q9U+B+8F99/xdUy0Z4N2VsNgAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAeFJREFUOE+l019IU1EcwPFJz9JbD/Vgj5Kr9CGikDCitIxIqJeiMHQ5kdU2wyXan7mc - FmqQQURQFiG0RmgjGSbZcC6wMZz/bmqaTRcGpijOhNn9dibl3RLiUhc+3N85B7735Z4kQPNfTywg+Rr5 - 04D3DsGuBnrfNhB4U0/P6zo8LjvtDhvuZ9ZVqx//HSA6Ika/4FWl0pCnBIa6G4lG3okNh2oVhuNKwPeq - huW5l2LjvmrlJceUQFfrDb6HH0HktmqW4qNKwNNiY368jpU5+xpma/kbiz5XCXS+sDITLIPpKtUsRUeU - QPtzK5878liaLIepa4qwmL/ErePOynSHlYBbBD66Mgl79jHu3sOoaweBpk0s9uuQJ69C6Mo6l3Q5cQGH - la/dJxlq2sCCX8uMN5XAPQ2hjmzkiQoYu7yOuSA7MRAJ6Bl1bkNq3ogc3MWyL5Xgwy1Eh0tBMgnmBMb8 - g3EB8VvKAwZ5yZ/PRGs67+8mE3qgYUz45ExDlozQfxEGxfuXC2cOJAZW+op/xA6jvXrCbXv58GQrg083 - 01OfhPQ4hSlnJt/aclnoPMG8UHJqf2KgypSDzXSIGnMWt4y7uWnIwF6kpfp8GrZCLdcLtFSe247l7E5K - T6djEtYuU2z4Vz8BC8XpB/oFsiMAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAADpJREFUOE9j/P// + PwNFAGQAJRismZmZ+T86RjaUhYnlPzoGqQe7nhLbR5oBo4GIO7WSlJCQA3IYpUQA76epNf0QgmEAAAAA + SUVORK5CYII= @@ -1050,29 +969,22 @@ beQnfYs0y5pXzv4rbP2mAr1LUeRdJczT4kMvSI4DK4pQ1om/K9TfAX0G9Mz5CAq7AAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABEVJREFUWEfNV9tO - lFcY/e56ZdMn6Cv4FD5AY7VWrVbFEyPtrRdNTJrGZ+g71BLjRdNobBPTtLYesCgUOXigOAKOMwNyHOBf - XWvP/obNwGwghqQ7WSGBP986fN8+YPa/Wgdv1+zTX2GH7hC/wQ7/DvvsLuzIX7DP78OOPiQewY71w44/ - gX0xSAzBTgzDTo4QY7Avn8NOvSDGa3Z64uTu/JH8wSTeGz8OApd/Wsa+Uhl2prwLEXQ+8Abvjd5+4MD3 - wDc/N7Dv0hSsa2qHIhj7aA0B/1SAx9PAE0KiBgn9Thginr5tYjhipAo4evsK7L9SBBFXblJETwV2trID - Eez5v7MIENGDMtD3GvibbXk81RQThBBP+XeRjxCjxBgFCM8o/tq9Ah+X1kV8e2sFH35VhZ2rbiOCAzc5 - hwAV7iNxfyQfiOTBPRGIE9LnJH5RB14SP/xZ4KNjG0V8d5sivq7DztczIjjtlQUEyEl/dK0WpK47EY/P - MD3i2t0CH3yyWcTVX1YpYAaddwa3Wn0JAXLikaeuPWZ3PM7vRCpMsHWv1L7JAr1M4TpbceNhgZsDBe6M - An+MA3ZhNiOA+/zdMgJUTP0W+XCM3Mk96kBKiFQovwNeE5MC2zgVUV1s1hTswlxOwCMsNBCgYoE86bVc - KxmPWiLLRDvpNImn54E3EUrU69rF+YwAnnBLKwiQCyd/xmFLyd21O5bTlLRCYs3R24hZOve6eQE8XpdX - EaCCvr2c3Pvcch0jltN2UsUu1Ig5CvC6dnEhkwDP9pU1BKioet6JPLiOEbvbKh2LUKgLcaAVv9e17sWc - gCGsklxQ0e3I5VoxO7GTzpBYmBXofpEt9brWvZQRwFttrUCAimraNXDpsMm5Rx7I3XFC6hOvn4pf/fe6 - 1r2cEcAr1T9UjL7HtcU06R57y3mM2t06sUjnGPt8hPrfElDKChhDQfeCBGjonFz7Wj3PkYvYScO2o3Oh - QQFe10qNTAJ8TJA7QAOk7aaJ15bUrlD0Hrv6HZzHA8YdO7H6Lih+DaDXtdJKRgBfMv6hiqfRh74nA7cl - eSQNxHQtKH4N4A4F8LCOSwSpe48+bLE44WHIYp8VtTv2Pa/ohVWxx2WXeCF1XKcnWh9qC/ngbRW9T7h6 - 3iKPjiWgQdeC4tcA7lDAq3UBdCcB6n3q3qP3gVPPU+fBdSQWueLfKGAtk8AZPoHiksPW5Mfe++C1R69B - C67byelc8WsHrCeQE9DF508iwA+d1uQnvd8q+g3O44Em9xsFFJkEuvgE6iBAw7cp/rjN2t3LtR88mwT0 - 5ASc5cMvEeD997NeAtL4fbv50HnPXYAfPkkHYHkBfIHEpaKdBs0d+w0XLpq2yLciV2nrITquc3z+7PHa - RgAfAHu88gLO12p8tzefznq96gGpN1wAXzJ6TOg+15WqW00Xi852QSdcALdZAIdN/Q6I0Td/1nb3D+se - f/0f80rRBR6zBfsAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAApdJREFUOE+Nkt9PUnEYxukv6K6L5uZF3nTTbOuiuumiKy8Sy7W5tdZF6DDMtMylSWUz + ZoVmuJjMBMTI9My0peVmDX+loagF/QJU8HcCogI7Bzic8/Q9HLZu3PC7vfvuvXg/z/M+ew8AkKR77r6j + tkMZh0MHM09mzI93ZWWdPrdIB1yONfdiTCIA0lXcKTV7B48Du2qsjBaQvwmeD8cQsef0pR1Own3VLoS1 + ADuJ8FoP+ccg9FvOmvTqAsDZnckvWfIR+dsLDjug/f0Q+tWhE/sDEAd3sdtMIWqhCIQiTijSg/Or9gdg + XXl5no/ZFLeppIL6M8CQTMxg4QYkhjc/0PbagdZX36Brn8UL/TQ0OiueaSfw9Pko6hssMLfUYqRXCf67 + CtvduQj0FCA8X4J16yVI9J0O8DwPluMRYznQUQ4hmkMwkoBvh8VakIXXFwcMOuBeNXBFClw4AvX5UyQe + cgJtZjs4MlzesgqFZgWyhmVcrvfCH2KxsZ3AcmDv4bJbXSLgJbHOJnhcrPNAen8BOdVunK10YVNQ32JF + ZWUVUc4F8kVlq4vB9bJOEaAzzSHO8mDiHCIMh21i3R9KYJ1Y38v29DyDCScDRalZBLQYZxAlw486ZlDX + Po2HRise6CeBgC21M1FO7XyzcQBl6vcY/8OgWNEhArR6G+gYCY5JJNV9uyl1ASAUWUGwPeuJYsrN4AsZ + Hv1FQ15sEgHNrVOIkOSTDkzEgUF0YMsmV54armweQkXTIEQH/Rj+SaNQ3i4CNLqvSfVgOJEMbj0Yh9cf + h3sjht+rMdiXYphd/K8+QtQ/O2jIigwiQDgYtWYMjxuHUffkE2pVg1DWDqCq5h1u33mL8goKpSRxRYkZ + 8msmFBYZcVWmT5YA+Aehl/jy7tE8WgAAAABJRU5ErkJggg== @@ -1368,17 +1280,40 @@ bJUGBXHaCcJzm3yCqh2k4Envwj+VezN9C/hM/wAAAABJRU5ErkJggg== - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRFBAIEBIIE + BIKEBAKEBP78BP4EhAKEhAIExMLE/AL8/P4EBAL8/P78hIIEhIKE/AIE//////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////Tc5YRQAAAAlwSFlzAAASdAAA + EnQB3mYfeAAAACNJREFUKFNj4EEDDFA+jOahkQADCqCVLRDPYPgF7mcGDjQAAK7XComEDKxGAAAAAElF + TkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAYxJREFUOE9j/P// - PwNFAGQAJZgizWDXg4iA1Kts4Tm30+JKHqVl1T5JK2x5llbS9hyIn4HZeY1P0zJrn6YllT9Oiy58lBaY - /iAB5mqwAR4xBzl9Ew7+DE47+j8s8+T/iJxz/8OzL/0Pzrj83z/lyn/3uCv/7cJv/DcLvP3fwPvWfx2P - mz9QDKB6GHgl3U/zSLif5hR9L8069E6aoe/tNA2Xm2my1tfTpM1PpEka70b1AroLHCLv/gdq/G8acPu/ - ruet/8oON/7LWF3+L2V25L+k0bb/4vqrqewFI9/bbECcZuBzK03P61aapuvNNCWHG2myVleATj6ZJmmy - N03CcGOamO6SNFGtWWkiGpNRvaDufJNTxfHGT0X7G/9lra/9l7E8/1/a7Oh/SeNd/yUM1v8X0136X1R7 - 9n8RjYn/hdU6/wuptlLZC9iiUVRnfpqI5tQ0YbXuNCGV5jRBpZo0AcXyNAGFEhDGHwsgA0U0pwCd2vlf - ULnuP1Djf375ov/8cnlAnAtkF9DBC8SmTgD93XAH4mFsLgAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAAeFJREFUOE+l019IU1EcwPFJz9JbD/Vgj5Kr9CGikDCitIxIqJeiMHQ5kdU2wyXan7mc + FmqQQURQFiG0RmgjGSbZcC6wMZz/bmqaTRcGpijOhNn9dibl3RLiUhc+3N85B7735Z4kQPNfTywg+Rr5 + 04D3DsGuBnrfNhB4U0/P6zo8LjvtDhvuZ9ZVqx//HSA6Ika/4FWl0pCnBIa6G4lG3okNh2oVhuNKwPeq + huW5l2LjvmrlJceUQFfrDb6HH0HktmqW4qNKwNNiY368jpU5+xpma/kbiz5XCXS+sDITLIPpKtUsRUeU + QPtzK5878liaLIepa4qwmL/ErePOynSHlYBbBD66Mgl79jHu3sOoaweBpk0s9uuQJ69C6Mo6l3Q5cQGH + la/dJxlq2sCCX8uMN5XAPQ2hjmzkiQoYu7yOuSA7MRAJ6Bl1bkNq3ogc3MWyL5Xgwy1Eh0tBMgnmBMb8 + g3EB8VvKAwZ5yZ/PRGs67+8mE3qgYUz45ExDlozQfxEGxfuXC2cOJAZW+op/xA6jvXrCbXv58GQrg083 + 01OfhPQ4hSlnJt/aclnoPMG8UHJqf2KgypSDzXSIGnMWt4y7uWnIwF6kpfp8GrZCLdcLtFSe247l7E5K + T6djEtYuU2z4Vz8BC8XpB/oFsiMAAAAASUVORK5CYII= @@ -1484,30 +1419,41 @@ IEYjSlImRQO6WgCDbJeeDo3KmQAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKBJREFUOE9j/P// - PwNFAGQAJRisGQ+wxyaHbCEhA+pJNUAfqGE/FMcjsWFiYBqnC7gCF/oDMT+SrSAvYGB8BuwHGnAfZBDU - EFAAYWAMA4AaQBr/o2GQF9BtB7uOEheAY4WSMMDvAqDh6LFAXBgghTrIBpi/5aFskKEoAF9CAmkCJR4Q - BhkEokGBSbQB6GpBhiCnC7A8qUkZ5Cr8LqAkNwIABOc40fsHWwUAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAz9JREFUWEftl2tI + k2EUxyXCEs0Ki8hkVtrKCvxQGFSmeJnm1MQuQlJiikJSU3CaZm1KZJhkyIRpk+UNRaRQW9GU3kRRIy+l + aB90rEiyqBRU1Ozy77yOvM3pPjxCHxz84GEMzm/nfc7ltbBY/fwPGUj0EboSMimP7yxJdE4SGUiei59Q + ds3AKSb+FJyryIqBtijNmGL6jqhbBBIYZibQ31mKP5Ma/B5RmQ0JgIkApZ3r71Tj50AMJtsszSbFXwjC + gyeV56SB6/8IoDOxrOS0QEc+pj5GY/zVerNRxh1EgfQMHvAkzaKisyrZgCLOH2kBQm5JCYNAHn58iMRY + s5XZjHe7ABNZy0ICSz8quu1cf/t9TOojMNJozZzlBUS8wF1M6C5AV2ODFrUNiuIFKIxzZII8SIj0YCG3 + AMnMY6E6J4HbGO87jyaVDSrlW/AwNQz6rucrQku1YlponoCuLR3fusNQn7cBBVd2oKX6HoD3wGQCc7gS + MSgrOTMC1OU4XVsa9K2noc21ReZZJwzqaoEpNfDdgjlqqQNkQXPK0yCQjK46MWru2CEzzJX+fSswFg18 + IQGGTOjXQBa4oCqS/UjgdQIaKj1RLN2ORzkXSaAe+EoiAyTAkN4n1rgZuKAvUEvl3ryIQUPFCeRGCdBR + lwb8KgP0FJwxT7O34oZYOFsB/EXgBRprwvGy/Djkwc4Y+qwARuny9ZEAY/JiBLyA67zOyAtoSkOgKXBH + duQhSr8SGPQGekiAIUNNa/m2bDxBk0R7uOpiMcqzPKDJDyWBbOCdPdBJAgxpL7QFDafHRnNB4rWbqy7y + g0JyGD3NUdTb46kIKDhjqlK2gSZlhJFArPtOEvAGjVKMj16l9PsDDSTAmIwQJz6Go5FA5FEBp8pwo5Hq + RumPBbr3AloSYMinsnX87qBfdCxfIoGMcBfUl3iSQDjwzBKoJQGGNN3axAuoTQok+jhD99YXGCaJKgrO + mOJYe5hcYqOOCTh5KKUdVHq9QqCEBBjD74/ExkUzcNljF1ckP0ACRwDNZkBBAgzRya1A86bT5Fom8XLi + lIn7aP3eD22sHXOU5xzAv1uYFKCVzHX6JWQlEZlI/7Ir8+oPVjgDfwG3AOBIhe+ncQAAAABJRU5ErkJg + gg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL - srQwQYeOVmp+VGamlo1lMUVJ+9DmdCbNBVqkzvyiD9vmr51/rP8IoqgXzuXzO88553nnAnP+6wmg8FY7 - wZVf0UbO9WbOFTehy39ISk4difpq4tMriUstJSbZxK4ko1/qbx4AeLzwu/r0FcamZxkam6X/vY9Ol49V - 2zP/DuC2O3AcCMW+X4Ot1a6IyxoHWLnt7J8B0lnEDJmZeXycZ7uX0eLwca3+NSsiggAy86/2A7bt+zQ/ - xLkRtEWHYO7yUnzHxvKtGaoDWVgwIHhmsS2dRXz33itqO7wUVHYQsuWMCpBtBwB9A8McyzIq1d77UZlZ - bEtnEVe1esgraWZpmE4FyKkE4BwcU4TOoXFs/aNsjkrAWPOS8J0HlSqq7aPU6iHXaGHJpnQVIHcOiN+N - TDL44TNPu91UmXuIjE2k7lEnjdZuSRxFD9ycL2xg8YbTKkBCIp2H3VNMTs9gc05gqnvDTYsLg39ebdwR - Sm4/Ie9qvQLRX6lh0fpTKkAS9s3jY3Ryhl7XFGX3nVwu7yHb9IIcUxvJ+ko04TEk6/JJTLukQBauS1MB - Es+R8S8873VT3fT2pzizwErqxXqSMsqJjtcrkMg9RwnXJrAg9KQKkGw7XBNUNHSRZWhBl2chNbvWL7xB - fIqB2MMX0O7VEbbjEKs3Rik1f20QQD6GZFviKQmTkMid5VSybVmYzCy2pbOI5605oTqQD/Wv9R1FPMYf - N743kwAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEgAA + CxIB0t1+/AAAAilJREFUOE+lk99rUmEcxtXb2B8Q+wdEwRvxMq+6GXRhuLNFF0a0iyKhYF3sIF7URSyH + MKjFwjlCJ/1YazaXM0VkC23GgrWKsjybZznnTueUTTKHep7Oe85cbmVQfeHhvPA93w/P+77Pq/bPLEKj + 0ajUarUKwK5ElShCUkMSWe9X8z8VKQKoiTWUqw1ZG6U6MsU67idYXB4N7+sd7Ju6zkAVmE3LgwtLH2Q9 + TjHyMFH/UHCvl3ieRWyRQTi1ikdP1zA1n4MMIA4GhsN76h8K4cLVIM5dmUKf8x5O0QGcvORDz8VxHD8/ + hmNnb6Gr7yaOnr6hAG5PJ6Ut/bmk80C9IaK6U0e5UsOX7R1sff6uAMYm53+ZFgQBbrcbNpsNFEXBPxHA + J2EbfKmKj1vf8H79K6LJjAIYvRMHy7JwuVwol8syLJvNguM48DyPzsOd6O09AYbdxAanDDudTjyMvVQA + IxNPQNM0LBYLDAYDdDodKpUKotEoBgevoeNQB7q7KbzNFuBwOGC322E0GqHX6xXAdd8c8vm8PMgwjOzA + 6/XCarWiyAkKgOrBuzUeb1ZLSL8uQqvVIjC7/BNw8BA8Hg/MZjMGaAdMJhOOSOvhkXG8yAhIrnCIL23C + N7O7BeKAVKFQkMXzAnK5dUw+mEYwFEEskUIosoC5eBrPllncjbyCP7QCb7DFwX/lgDhoF2WSxNbeb6NM + AO2iTJLY7LWNMgGQ6/hXtTzh5lP+u+8PbUr3KB0oMhcAAAAASUVORK5CYII= @@ -1532,6 +1478,15 @@ iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAB5JREFUKFNj/P// PwNBUFBQ8B8fBhsCIghhhmFtEgAZm8Rn5/bAFAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKlJREFUOE/V0lEN + AkEMBFBQgAQkIAEJSEDCSUACEpCABCQg4SQgYW/f0pKF3yUhNJl0tu20k8utSymrobBgBEPi5n7k+ncW + dB9wU/mhe+PHiqlCT8j7qMtvoXDvKt6nWCoTX7u+WottbFUw4CKxfAlwou+tBxzSNpsu3yI/Oj4HLx89 + s0Db4kUqJ2LXlXPFLsTmiNIhBy1ymJ3kRJB2c1bO3rP2+//g/x0sWmDQ9clxUeYAAAAASUVORK5CYII= @@ -1557,26 +1512,57 @@ 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 + Ktosv/8Ac0Q/0UrVA0MAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEgAA - CxIB0t1+/AAAAW9JREFUOE9jfPkp9z8DGrAwWMRw4kIciqgY7yRGdHVgPsgAdKyoxI8h9v//f4a22fst - gfh/Rf+2//ntG/4nVq0IZZi/1Os/SAMIg9ggw2B8ZDGY5uz6+Z/mrT//v2vB6f/ucY3/GR69yoLbBrMZ - RsMMv/Uk93/foh1AR/z/f+TMrf+2gTm/Y4um/Tf1TP7PsGZzAIqNMBfAvAUy7PTVZqDWP/9fvP32//il - V/+retf/BWkGYhsGZP9ic4GHj/7/Lz8P/H/1/jtYc8+8w3DNoHABh4GWjsh/Y1NxsEt2HQqHuwik+cTp - WUDNb7FqBhuALRbuPSr5f3BPyf9tR9b8P33pKlDzSwybQZqxGnD/SfH/5TOL///8tPr/oWML/7tGZP6v - 6V8PDjCQn2Ea4QagCyyZXgjWDMLv7jb/nzu34r+YEB9WzWAXoBvQU5f4v68u5X9ZRvD/IA/L/3oa8jg1 - YzUA3UBCfAwXENJAMAyGngEAmeKbGy12NvwAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhtJREFUOE+dk29I + U1EYh98sLJjtsu2um+vSrputhc4RUqArDpSBFEFmBYFRUIQoZhpW6OAyKGyVTcUU/RCSMGokfShlIGOQ + hQQWBRUWbq7dIMoPI0b/TPl1LZEVfpg7cL695znv+5zfIUpn+exOurGZS6d0yZqS4HpY/WI4Y0D5KI+6 + qAbaTlHOCOJ4KOH8tBa7QjzIk8v+hfQWc9RbzKhnK6OuIkadBYx8dkZtNkZXrYxaJeZ4YMaRiIRTk3qY + bwkJchtSfKiHK18IOPlOh8MvjSgfy4UrJGL+VnMgH/p+O6T7dhyatKBiIg9lj03I8fIpPtSb65W1aE1m + 4+InDapjOhx9sw57xzeg9FEeCoI2FI78BeyfsKHsmQXWgISsFm7Bh9p2g5KD9plV8H5fA09Sg+YEh8Zp + A2o/qp19MKEqtnERsOf1FmwP21E5ovqoz3bS/MwNcc2yAN1JF6rCelDdShWgCgvEb+LtnB/P5zowOtuC + 4K/TGJw5gNs/Xej5sQmeL8bFDi5/3ocuZQeM8uqFEVTbbeN9GHo/iHuxbgxMyeibqkZHtAJXIiWQIxY0 + KYY/gLPx3Qh9bURRu5Ai8Vo+R16L+lxmRpdERh4TI1lg5OYZNesYXdAyR8CIY9FCvJrtx0H/tgTVZi0v + 1o47PJ5+u4vrY2dANSv+C1Ia2WwaOocnyjBEt5BZlI8PnMBOX2nmn4lqyKnuJef+DQ5AF2rdu5MuAAAA + AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAYxJREFUOE9j/P// + PwNFAGQAJZgizWDXg4iA1Kts4Tm30+JKHqVl1T5JK2x5llbS9hyIn4HZeY1P0zJrn6YllT9Oiy58lBaY + /iAB5mqwAR4xBzl9Ew7+DE47+j8s8+T/iJxz/8OzL/0Pzrj83z/lyn/3uCv/7cJv/DcLvP3fwPvWfx2P + mz9QDKB6GHgl3U/zSLif5hR9L8069E6aoe/tNA2Xm2my1tfTpM1PpEka70b1AroLHCLv/gdq/G8acPu/ + ruet/8oON/7LWF3+L2V25L+k0bb/4vqrqewFI9/bbECcZuBzK03P61aapuvNNCWHG2myVleATj6ZJmmy + N03CcGOamO6SNFGtWWkiGpNRvaDufJNTxfHGT0X7G/9lra/9l7E8/1/a7Oh/SeNd/yUM1v8X0136X1R7 + 9n8RjYn/hdU6/wuptlLZC9iiUVRnfpqI5tQ0YbXuNCGV5jRBpZo0AcXyNAGFEhDGHwsgA0U0pwCd2vlf + ULnuP1Djf375ov/8cnlAnAtkF9DBC8SmTgD93XAH4mFsLgAAAABJRU5ErkJggg== @@ -1627,49 +1613,30 @@ AAAAAElFTkSuQmCC - + - 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 - f82/z9vxfwGXPqZxsYacjAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKBJREFUOE9j/P// + PwNFAGQAJRisGQ+wxyaHbCEhA+pJNUAfqGE/FMcjsWFiYBqnC7gCF/oDMT+SrSAvYGB8BuwHGnAfZBDU + EFAAYWAMA4AaQBr/o2GQF9BtB7uOEheAY4WSMMDvAqDh6LFAXBgghTrIBpi/5aFskKEoAF9CAmkCJR4Q + BhkEokGBSbQB6GpBhiCnC7A8qUkZ5Cr8LqAkNwIABOc40fsHWwUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL + srQwQYeOVmp+VGamlo1lMUVJ+9DmdCbNBVqkzvyiD9vmr51/rP8IoqgXzuXzO88553nnAnP+6wmg8FY7 + wZVf0UbO9WbOFTehy39ISk4difpq4tMriUstJSbZxK4ko1/qbx4AeLzwu/r0FcamZxkam6X/vY9Ol49V + 2zP/DuC2O3AcCMW+X4Ot1a6IyxoHWLnt7J8B0lnEDJmZeXycZ7uX0eLwca3+NSsiggAy86/2A7bt+zQ/ + xLkRtEWHYO7yUnzHxvKtGaoDWVgwIHhmsS2dRXz33itqO7wUVHYQsuWMCpBtBwB9A8McyzIq1d77UZlZ + bEtnEVe1esgraWZpmE4FyKkE4BwcU4TOoXFs/aNsjkrAWPOS8J0HlSqq7aPU6iHXaGHJpnQVIHcOiN+N + TDL44TNPu91UmXuIjE2k7lEnjdZuSRxFD9ycL2xg8YbTKkBCIp2H3VNMTs9gc05gqnvDTYsLg39ebdwR + Sm4/Ie9qvQLRX6lh0fpTKkAS9s3jY3Ryhl7XFGX3nVwu7yHb9IIcUxvJ+ko04TEk6/JJTLukQBauS1MB + Es+R8S8873VT3fT2pzizwErqxXqSMsqJjtcrkMg9RwnXJrAg9KQKkGw7XBNUNHSRZWhBl2chNbvWL7xB + fIqB2MMX0O7VEbbjEKs3Rik1f20QQD6GZFviKQmTkMid5VSybVmYzCy2pbOI5605oTqQD/Wv9R1FPMYf + N743kwAAAABJRU5ErkJggg== @@ -1700,6 +1667,24 @@ ////////////////////////////////////////////////////////Tc5YRQAAAAlwSFlzAAASdAAA EnQB3mYfeAAAAC5JREFUKFNjYMAAPCgAKM3Dg1ADZmOqQDYEuwqEIUDdWM3AtBZZhEpa0H3LgQYAwCUH ofZjoJYAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAAoJJREFUOE99kd1LU2Ecx0939Rd022UXQdBFXZVdh10FERRBipXD1CRDS8tmRbhM09LE + WavUaCnpsqzhnNPlKvNlrFm+pem0Njdtup3nnPOc7dtznmGQbB34cODh+b78fs8WAMLmr981TtjZVjWm + CgpNIMtUoCrlf1mhgqrGpZyM9G2CZrCZgY/jMjuD+6sPQ545vB+eht31DW/7v+BVzyi6bG7UmboID09m + 4Bj0UgZsTje6e4dhsX6C2eJES7sdTc/eof7xa9QYLVpIcgNzpw2qGuNQqkJRKIdIMkQi4Xc4ghJ9lVZS + EF7apggDL6wTaO7yorFtFLWtn3H7kQvlDwZQcteOS9W9iEQJFwZDYSz5QygoupEw6LTP8HkdY0FYh/yw + OBdhts3jSfd3NHZMockyjav3HQgEV+FbWsbcwi9Mzy4iK/vC3wb03wZjvEGV6QNuGZ243tCP0uoe6HKL + cFpXyIUb8Ab1LX2g2qwM9lyQFRWSTCFKCqstYyVMcFFv5GnJEAwNFiZkYibU0MRrEQl32gKoeB5A+dOf + KDb6kHtvDhmGGRzVT+BQ0TjS8tzYlz1KhPIaM08WicKWRBAKi1heiaCqPailwuSIo86qoqJDQWmrhPMP + ozhTv86IYn+ehwiZ+TdxPKsYR04UIDOnDJf1taiua4HB7E80aN5o8CPR4BprUOxFWr4be8+OyEnn0mY9 + ZxhkewFHoXGIMkOKYU1UsbpOsRCQsCu9MvliNINTV94wIdhS42wvcURIDMGwgqWghJlFEZ7Zdew4WJba + 4FhhG2SWvBZV4V+RMe8nmPRFMTIZhsu7ir6xELbvPpnaYM/hUuw8oOOX/kfKHaR6983nfwDA/wvA3MbO + iwAAAABJRU5ErkJggg== @@ -2000,35 +1985,53 @@ jWXUWs1mdKvqIG5c2M+o6VwM5GUxaBNxnoX9TOE+z+71X97TkIKytaQHAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA - EnQB3mYfeAAAAYdJREFUOE9j/P//PwNVAchAamKqGgb2LTVdRxsD79446NrRmPp/WmfW/zm9uf/PHd70 - //HDx0Eg2+49fez9+tVrnw8fPggT6xOGf9/fMW5cOaNuz9qO//fP9vyf3Ozyd9vixnxiDUBXBw/D1pLQ - ulfn+/9vnmr7vypa6v/22Y3/f719pUKqwSiRMrvKu+7WmpD/+yYa/O+J5f8/r7vi/YE9e4j2LtZIWdPu - vv7u9sT/x2aZ/+/MkP0/tzVl97a10xiJdSlGsskOVmfrLXdtPbQ45v+1te7/tzRo/O8s911X3eAvSoyh - ONNhX2Vs9fZ58f/vrwv6v77F4H9Vicnn9GhnR0KG4k3YBYk6EusmeL27tjLj/7mlef8XxDj/jzJSiMNn - KMGckhevr3l8w5L/37Ys+n8/2On/BAPJFxQZCNJcX9Nfd3H+kv//u5r/Hwi0+USxgSAD5k3urT5VW/54 - eqjHPKoYSCgyYPIEwxCXQcBCGSgFKUtBbBifKAORNaAbQJaBxHoXpA4AG4E67su8bvIAAAAASUVORK5C - YII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAhtJREFUOE+dk29I - U1EYh98sLJjtsu2um+vSrputhc4RUqArDpSBFEFmBYFRUIQoZhpW6OAyKGyVTcUU/RCSMGokfShlIGOQ - hQQWBRUWbq7dIMoPI0b/TPl1LZEVfpg7cL695znv+5zfIUpn+exOurGZS6d0yZqS4HpY/WI4Y0D5KI+6 - qAbaTlHOCOJ4KOH8tBa7QjzIk8v+hfQWc9RbzKhnK6OuIkadBYx8dkZtNkZXrYxaJeZ4YMaRiIRTk3qY - bwkJchtSfKiHK18IOPlOh8MvjSgfy4UrJGL+VnMgH/p+O6T7dhyatKBiIg9lj03I8fIpPtSb65W1aE1m - 4+InDapjOhx9sw57xzeg9FEeCoI2FI78BeyfsKHsmQXWgISsFm7Bh9p2g5KD9plV8H5fA09Sg+YEh8Zp - A2o/qp19MKEqtnERsOf1FmwP21E5ovqoz3bS/MwNcc2yAN1JF6rCelDdShWgCgvEb+LtnB/P5zowOtuC - 4K/TGJw5gNs/Xej5sQmeL8bFDi5/3ocuZQeM8uqFEVTbbeN9GHo/iHuxbgxMyeibqkZHtAJXIiWQIxY0 - KYY/gLPx3Qh9bURRu5Ai8Vo+R16L+lxmRpdERh4TI1lg5OYZNesYXdAyR8CIY9FCvJrtx0H/tgTVZi0v - 1o47PJ5+u4vrY2dANSv+C1Ia2WwaOocnyjBEt5BZlI8PnMBOX2nmn4lqyKnuJef+DQ5AF2rdu5MuAAAA - AElFTkSuQmCC + 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 + f82/z9vxfwGXPqZxsYacjAAAAABJRU5ErkJggg== + + ..\Resources\FormulaEvaluatorHS.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/RTBAPI.cs b/PROMS/Volian.Controls.Library/RTBAPI.cs index 39ec22f9..9d7ed96b 100644 --- a/PROMS/Volian.Controls.Library/RTBAPI.cs +++ b/PROMS/Volian.Controls.Library/RTBAPI.cs @@ -874,6 +874,25 @@ namespace Volian.Controls.Library pft.dySpaceBefore = spaceBefore * 1440 / dpi; SetParaFormat(richTextBox, pft); } + //developed for equation editor interface work, but ended up not needing it. Kept it in + // case it is needed in the future. + //public static void SetSpaceAfter(RichTextBox richTextBox, int spaceAfter) + //{ + // ParaFormatTwo pft = GetParaFormat(richTextBox); + // pft.dwMask = 0; + // pft.dwMask |= ParaFormatMasks.PFM_SPACEAFTER; + // // get the monitor's resolution in DPI and use it to set the linespacing value for + // // the richtextbox. Note that without this, the Arial Unicode font made the appearance of + // // almost double linespacing. Using PFS_Exact makes it appear as regular single spacing. + // Graphics g = richTextBox.CreateGraphics(); + // int dpi = Convert.ToInt32((g.DpiX + g.DpiY) / 2); + // g.Dispose(); + // // dyLineSpacing is Spacing between lines. the PFS_EXACT sets line spacing as the spacing from one + // //line to the next, in twips - thus the 1440. + + // pft.dySpaceAfter = spaceAfter * 1440 / dpi; + // SetParaFormat(richTextBox, pft); + //} public static void SetLineSpacing(RichTextBox richTextBox, ParaSpacing type) { ParaFormatTwo pft = GetParaFormat(richTextBox); diff --git a/PROMS/Volian.Controls.Library/RtfRawItem.cs b/PROMS/Volian.Controls.Library/RtfRawItem.cs new file mode 100644 index 00000000..87def310 --- /dev/null +++ b/PROMS/Volian.Controls.Library/RtfRawItem.cs @@ -0,0 +1,482 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Text; +using System.Windows.Forms; +using VEPROMS.CSLA.Library; + +namespace Volian.Controls.Library +{ + public partial class RtfRawItem : EditItem + { + #region IEditItem + public override StepRTB MyStepRTB + { + get { return _MyStepRTB; } + } + public override int TableWidth + { + get + { + return (int)_MyStepRTB.Width + RtfRawMargin; + } + } + /// + /// The left edge of the Tab (no visible tab, but use this for EditItem interfacing + /// + public override int ItemLeft + { + get { return Left + lblTab.Left; } + set { Left = value - lblTab.Left; } + } + /// + /// The Location of the Tab + /// + public override Point ItemLocation + { + get { return new Point(Location.X + lblTab.Left, Location.Y); } + set { Location = new Point(value.X - lblTab.Left, value.Y); } + } + /// + /// Width of the Tab and RichTextBox + /// + public override int ItemWidth + { + get { return Width - lblTab.Left; } + set + { + Width = RtfRawMargin + value + lblTab.Left; + } + } + /// + /// Width of the RichTextBox + /// + public override int ContentWidth + { + get { return _MyStepRTB.Width; } + set + { + Width = value + lblTab.Left + lblTab.Width; + } + } + public override int BorderWidth { get { return (_MyStepRTB.Width - _MyStepRTB.ClientRectangle.Width); } } + /// + /// Location of the RichTextBox + /// + public override Point ContentLocation + { + get { return new Point(Location.X + _MyStepRTB.Left, Location.Y); } + set { Location = new Point(value.X - _MyStepRTB.Left, value.Y); } + } + /// + /// Left edge of the RichTextBox + /// + public override int ContentLeft + { + get { return Left + _MyStepRTB.Left; } + } + override public void AdjustTableWidthAndLocation() + { + Size sz = GetRtfRawSize(MyItemInfo.MyContent.Text); + string tmp = MyItemInfo.MyContent.Text; + if (MyItemInfo.MyContent.Text == "New Step") tmp = ""; // if coming from the tree view/insert before or after - rtf is 'New Step' + MyStepRTB.Rtf = tmp; + MyStepRTB.Width = sz.Width; + MyStepRTB.Height = sz.Height; + ItemLocation = TableLocation(MyStepSectionLayoutData, ItemWidth); + Width = sz.Width; + Height = _MyStepRTB.Height + _MyStepRTB.Top + 7; + ItemWidth = Width; + } + override public void SetToolTip(string tip) + { + DevComponents.DotNetBar.SuperTooltipInfo tpi = new DevComponents.DotNetBar.SuperTooltipInfo("", "", tip, null, null, DevComponents.DotNetBar.eTooltipColor.Lemon); + _MyToolTip.MinimumTooltipSize = new Size(0, 24); + _MyToolTip.TooltipDuration = 3; + _MyToolTip.SetSuperTooltip(MyStepRTB, tpi); + } + public override void RefreshContent() + { + IdentifyMe(false); + MyStepRTB.Rtf = MyItemInfo.MyContent.Text; + RefreshDisplay(false); + } + public override void RefreshOrdinal() + { + TabFormat = null; + } + public override void HandleResize() {} + public override void MatchExpanded() {} + public override void ItemSelect() + { + // Was getting an Error that _MyStepRTB was Disposed RHM 20101217 + if (!_MyStepRTB.Disposing && !_MyStepRTB.Closed) + { + _MyStepRTB.Focus(); + } + else + { + _MyLog.WarnFormat("Attempt to give Focus to Disposed Object {0}", MyID); + } + ScrollToCenter(); + } + /// + /// Sets the focus to this RTBItem + /// + public override void ItemShow() + { + _MyStepRTB.Focus(); + ScrollToCenter(); + } + public override void SetActive() + { + this.BackColor = MyStepPanel.ActiveColor; + } + public override void SetText() + { + LastMethodsPush("SetText"); + if (MyItemInfo != null) + { + MyStepRTB.MyItemInfo = MyItemInfo; + IdentifyMe(false); + } + LastMethodsPop(); + } + public override void SetExpandAndExpander(ItemInfo itemInfo) + { + CanExpand = false; + } + public override void SaveCurrentAndContents() + { + SaveContents(); + } + public override void RefreshDisplay(bool activeMode) + { + MyStepRTB.VwMode = MyStepPanel.VwMode; + Size sz = GetRtfRawSize(MyStepRTB.Rtf); + if (MyStepRTB.Rtf == null || MyStepRTB.Rtf == "" || !MyStepRTB.Rtf.ToUpper().Contains("EQUAT")) // this is a new insert + { + sz.Width = 50; + sz.Height = 50; + } + MyStepRTB.Width = sz.Width; + MyStepRTB.Height = sz.Height; + if (_MyParentEditItem != null) ItemLocation = new Point(300, _MyParentEditItem.Bottom); + ItemLocation = TableLocation(MyStepSectionLayoutData, ItemWidth); + Width = sz.Width; + Height = _MyStepRTB.Height + _MyStepRTB.Top + 7; + ItemWidth = Width; + MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetButtonAndMenuEnabling(true); + } + public override void ToggleEditView(E_ViewMode vwMode) + { + SaveContents(); + } + public override string TabFormat + { + get { return null; } + set { ;} + } + public override bool Expanded + { + get { return true; } + set { ; } + } + public override bool CanExpand + { + get { return false; } + set { ; } + } + public override int TabLeft { get { return lblTab.Left; } set { lblTab.Left = value; } } //taken from griditem + public override Font TabFont { get { return MyStepRTB.Font; } set { ; } } + public override string TabText { get { return lblTab.Text; } } + public override Point TabLocation { get { return lblTab.Location; } } + public override Font ContentFont { get { return MyStepRTB.Font; } set { /*MyStepRTB.Font = value*/; } } + public override float ContentTop { get { return MyStepRTB.Top; } } + public override DialogResult ReplaceText(string rpltxt, string fndstr, bool caseSensitive, bool matchWholeWord, bool reverse, bool prompt, IWin32Window fndrpldlg) + { + return DialogResult.OK; + } + public override bool FindText(string str, bool caseSensitive, bool matchWholeWord, bool reverse) + { + return false; + } + public override void PositionToEnd() + { + return; + } + public override void PositionToStart() + { + return; + } + public override string SelectedTextForFind + { + get {return null;} + } + public override bool SpellCheckNext() + { + return false; + } + public override bool Empty + { + get + { + return _MyStepRTB.Text == ""; + } + set { _MyStepRTB.Text = value ? "" : " "; } + } + public override void RefreshTab() + { + TabFormat = null; + } + public override void SetupHeader(ItemInfo itemInfo) + { + return; + } + public override void ShowExpanded() {} + #endregion + #region Properties + private static int _RtfRawMargin = 6; // make it a little bigger than rtbitems so it can be seen + /// + /// Margin between the EditItem and the RtfRawItem. Appears on the Right. + /// Will allow space to draw a Change Bar on the right side of the EditItem. + /// + public static int RtfRawMargin + { + get { return _RtfRawMargin; } + set { _RtfRawMargin = value; } + } + #endregion + #region Constructors + public RtfRawItem() + { + InitializeComponent(); + } + //existing objects: + public RtfRawItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand) + { + InitializeComponent(); + MyItemInfo = itemInfo; + SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, null, false); + AdjustTableWidthAndLocation(); + SetupEventHandlers(); + MyStepRTB.ReadOnly = !UserInfo.CanEdit(StepRTB.MyUserInfo, MyItemInfo.MyDocVersion); // reviewer cannot make changes to a table + MyStepRTB.Enabled = UserInfo.CanEdit(StepRTB.MyUserInfo, MyItemInfo.MyDocVersion); + MyStepRTB.OrigRTF = MyStepRTB.Rtf; + this.Controls.Add(this._MyStepRTB); + _origBitmap = GetBitmap(MyStepRTB.Rtf); //kbr + } + // the following is for inserted equations: + public RtfRawItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem) + { + InitializeComponent(); + MyItemInfo = itemInfo; + SetupEditItem(itemInfo, myStepPanel, myParentEditItem, myChildRelation, expand, nextEditItem, false); + SetupEventHandlers(); + if (MyItemInfo.MyContent.Text != null && MyItemInfo.MyContent.Text != "") + { + AdjustTableWidthAndLocation(); + MyStepRTB.OrigRTF = MyStepRTB.Rtf; + } + else + { + MyStepRTB.OrigRTF = ""; + MyStepRTB.Size = new Size(200, 200); + ItemLocation = TableLocation(MyStepSectionLayoutData, ItemWidth); + Width = 200; + Height = 200; + ItemWidth = Width; + } + this.Controls.Add(this._MyStepRTB); + } + private void SetupEventHandlers() + { + MyStepRTB.TextChanged += new EventHandler(MyStepRTB_TextChanged); + MyStepRTB.Resize += new System.EventHandler(MyStepRTB_Resize); + MyStepRTB.Enter += new System.EventHandler(_StepRTB_Enter); + MyStepRTB.HeightChanged += new Volian.Controls.Library.StepRTBEvent(_MyStepRTB_HeightChanged); + MyStepRTB.ContentsResized += new ContentsResizedEventHandler(MyStepRTB_ContentsResized); + MyStepRTB.SetMenu += new StepRTBMenuEvent(MyStepRTB_SetMenu); + MyStepRTB.CursorKeyPress += new Volian.Controls.Library.StepRTBCursorKeysEvent(MyStepRTB_CursorKeyPress); + MyStepRTB.CursorMovement += new Volian.Controls.Library.StepRTBCursorMovementEvent(MyStepRTB_CursorMovement); + Click += new EventHandler(RtfRawItem_Click); + MyStepRTB.Click += new EventHandler(RtfRawItem_Click); + } + #endregion + #region EventHandlers + void RtfRawItem_Click(object sender, EventArgs e) + { + //if (MyStepPanel.DisplayItemChanging) return; + MyStepPanel.SelectedEditItem = this; + } + private void _MyStepRTB_HeightChanged(object sender, EventArgs args) + { + if (this.Height != _MyStepRTB.Height + _MyStepRTB.Top + 7) // add in 7 to make it look good // + 10) + { + LastMethodsPush(string.Format("_StepRTB_HeightChanged {0}", _MyStepRTB.Height)); + this.Height = _MyStepRTB.Height + _MyStepRTB.Top + 7; + LastMethodsPop(); + } + } + public void MyStepRTB_ContentsResized(object sender, ContentsResizedEventArgs e) + { + // need duplicate call for this because for modifies & restores, a single call was not setting size correctly: + RefreshDisplay(false); + RefreshDisplay(false); + } + void MyStepRTB_SetMenu(object sender, StepRTBMenuEventArgs args) + { + if (args.MenuGroup == null) + MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ClearContextMenu(); + else if (args.MenuGroup == "OpenContextMenu") + MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetContextMenu(sender); + else + MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetShortCutContextMenu(args.MenuGroup); + } + private void _StepRTB_Enter(object sender, EventArgs e) + { + if (MyStepPanel.DisplayItemChanging) return; + MyStepPanel.SelectedEditItem = this; + } + #endregion + #region Methods + public override void SetFocus() + { + MyStepRTB.Focus(); + } + public override void SaveContents() + { + SaveText(); + SaveConfig(); + } + public void SaveText() + { + if (MyStepRTB.ReadOnly) return; + if (!IsDirty()) return; + try + { + string res = MyStepRTB.Rtf.Replace("\\par\r\n}", "}"); + using (Item _MyItem = MyItemInfo.Get()) + { + _MyItem.MyContent.Text = res; + _MyItem.MyContent.DTS = DateTime.Now; + _MyItem.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID; + _MyItem.DTS = DateTime.Now; + _MyItem.UserID = Volian.Base.Library.VlnSettings.UserID; + _MyItem.Save(); + } + _origBitmap = GetBitmap(res); + MyStepRTB.ClearUndo(); + } + catch (Exception ex) + { + //MessageBox.Show("The data could not be saved.", "Object Save", MessageBoxButtons.OK, MessageBoxIcon.Information); + return; + } + } + public System.Drawing.Bitmap GetBitmap(string rtf) + { + Bitmap bmap = null; + try + { + System.Drawing.Size sz = RtfRawItem.GetRtfRawSize(rtf); + Volian.Controls.Library.RTF myRtb = new RTF(); + myRtb.Size = sz; + myRtb.Rtf = rtf; + bmap = new System.Drawing.Bitmap((int)sz.Width, (int)sz.Height); + System.Drawing.Graphics gr = System.Drawing.Graphics.FromImage(bmap); + myRtb.RenderClipped(gr, new System.Drawing.Rectangle(0, 0, (int)sz.Width, (int)sz.Height)); + } + catch (Exception ex) + { + return null; + } + return bmap; + } + private System.Drawing.Bitmap _origBitmap = null; + private bool IsDirty() + { + System.Drawing.Bitmap curBitmap = GetBitmap(MyStepRTB.Rtf); + if (_origBitmap == null) return true; + return (!compare(_origBitmap, curBitmap)); + } + // compares 2 bitmaps by comparing pixels between the 2. + private bool compare(Bitmap bmp1, Bitmap bmp2) + { + bool equals = true; + bool flag = true; //Inner loop isn't broken + + //Test to see if we have the same size of image + if (bmp1.Size == bmp2.Size) + { + for (int x = 0; x < bmp1.Width; ++x) + { + for (int y = 0; y < bmp1.Height; ++y) + { + if (bmp1.GetPixel(x, y) != bmp2.GetPixel(x, y)) + { + equals = false; + flag = false; + break; + } + } + if (!flag) + { + break; + } + } + } + else + { + equals = false; + } + return equals; + } + public override void IdentifyMe(bool highlight) + { + if (highlight) + this.BackColor = Color.Gray; + else + { + if (MyStepPanel.SelectedEditItem != null && MyStepPanel.SelectedEditItem.MyItemInfo == this.MyItemInfo) + this.BackColor = MyStepPanel.ActiveColor; + else + this.BackColor = MyItemInfo.ItemAnnotationCount == 0 ? MyStepPanel.PanelColor : MyStepPanel.AnnotationColor; + } + } + public static Size GetRtfRawSize(string rtf) + { + RichTextBox rtb = new RichTextBox(); + if (rtf == "New Step") rtf = ""; // if coming from the tree view/insert before or after - rtf is 'New Step' + rtb.BorderStyle = BorderStyle.None;//Eliminate the border width + rtb.Rtf = rtf; // myRtf.Rtf;// set the contents + rtb.AppendText(" ");// Add a space after the equation + rtb.Width = 10000;// Start with a very wide richtextbox + int w = rtb.GetPositionFromCharIndex(1).X;// Get the width of the equation + rtb.Width = w;// Adjust the width + int h = rtb.GetPositionFromCharIndex(2).Y;// Get the height of the equation + return new Size(w, h);// Return the size of the Equation + } + void MyStepRTB_Resize(object sender, EventArgs e) + { + if (MyStepPanel != null && this == MyStepPanel.SelectedEditItem) + ScrollToCenter(); + } + void MyStepRTB_TextChanged(object sender, EventArgs e) + { + if (MyStepPanel != null && this == MyStepPanel.SelectedEditItem) + ScrollToCenter(); + } + private void MyStepRTB_CursorKeyPress(object sender, KeyEventArgs args) + { + MyStepPanel.StepCursorKeys(this, args); + } + private void MyStepRTB_CursorMovement(object sender, StepRTBCursorMovementEventArgs args) + { + MyStepPanel.CursorMovement(this, args.CursorLocation, args.Key); + } + #endregion + } +} diff --git a/PROMS/Volian.Controls.Library/RtfRawItem.designer.cs b/PROMS/Volian.Controls.Library/RtfRawItem.designer.cs new file mode 100644 index 00000000..1160b6d3 --- /dev/null +++ b/PROMS/Volian.Controls.Library/RtfRawItem.designer.cs @@ -0,0 +1,121 @@ +namespace Volian.Controls.Library +{ + partial class RtfRawItem + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + _BeingDisposed = true; + DisposeOfChildren(MyAfterEditItems); + DisposeOfChildren(MyBeforeEditItems); + DisposeOfChildren(MyRNOEditItems); + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + MyItemInfo.MyContent.Changed -= new VEPROMS.CSLA.Library.ContentInfoEvent(MyContent_Changed); + MyItemInfo.MyProcedure.MyContent.Changed -= new VEPROMS.CSLA.Library.ContentInfoEvent(MyContent_Changed); + } + private void DisposeOfChildren(System.Collections.Generic.List children) + { + if (children == null) return; + foreach (EditItem child in children) + child.Dispose(); + children = null; + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + this._MyStepRTB = new Volian.Controls.Library.StepRTB(this.components); + this.lblTab = new System.Windows.Forms.Label(); + this._MyToolTip = new DevComponents.DotNetBar.SuperTooltip(); + //this._MyvlnExpander = new Volian.Controls.Library.vlnExpander(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this._MyStepRTB.Location = new System.Drawing.Point(5, 5); // moves mysteprtb down so that rtfrawitem selection borders can be seen + //this._MyStepRTB.SelectAll(); + //RTBAPI.SetLineSpacing(this._MyStepRTB, RTBAPI.ParaSpacing.PFS_DOUBLE); + + // RTBAPI.SetSpaceAfter(this._MyStepRTB, 200); + RTBAPI.SetSpaceBefore(this._MyStepRTB, 20); + // + // _MyStepRTB + // + // this._MyStepRTB.AdjustSize = new System.Drawing.Size(0, 0); + this._MyStepRTB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this._MyStepRTB.BackColor = System.Drawing.Color.Linen; + this._MyStepRTB.BorderStyle = System.Windows.Forms.BorderStyle.None; + //KBR this._MyStepRTB.CheckAbove = "|│└┬┼├┌┴┐┤"; + //KBR this._MyStepRTB.CheckBelow = "|│"; + //KBR this._MyStepRTB.CheckLeft = "-─┤┬├┼┌┐└‑"; + //KBR this._MyStepRTB.CheckRight = "-─‑"; + this._MyStepRTB.FieldToEdit = VEPROMS.CSLA.Library.E_FieldToEdit.Text; + //this._MyStepRTB.Font = new System.Drawing.Font("Prestige Elite Tall", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + //this._MyStepRTB.Location = new System.Drawing.Point(107, 0); + this._MyStepRTB.Margin = new System.Windows.Forms.Padding(4); + this._MyStepRTB.MyClassName = "RichEdit20W"; + this._MyStepRTB.MyItemInfo = null; + this._MyStepRTB.MyLinkText = null; + this._MyStepRTB.Name = "_MyStepRTB"; + this._MyStepRTB.ProcessKeystrokes = true; + this._MyStepRTB.RTBRangeStatus = Volian.Controls.Library.StepRTB.RangeStatus.NoContainedLinks; + this._MyStepRTB.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this._MyStepRTB.ShowDebug = false; + //this._MyStepRTB.Size = new System.Drawing.Size(312, 25); + this._MyStepRTB.TabIndex = 2; + this._MyStepRTB.Text = ""; + this._MyStepRTB.VwMode = VEPROMS.CSLA.Library.E_ViewMode.Edit; + //KBR this._MyStepRTB.LinkGoTo += new Volian.Controls.Library.StepRTBLinkEvent(this._MyStepRTB_LinkGoTo); + //this._MyStepRTB.Enter += new System.EventHandler(this._StepRTB_Enter); + this._MyStepRTB.HeightChanged += new Volian.Controls.Library.StepRTBEvent(this._MyStepRTB_HeightChanged); + //this._MyStepRTB.ModeChange += new Volian.Controls.Library.StepRTBModeChangeEvent(this._MyStepRTB_ModeChange); + //KBR this._MyStepRTB.LinkModifyTran += new Volian.Controls.Library.StepRTBLinkEvent(this._MyStepRTB_LinkModifyTran); + //KBR this._MyStepRTB.CursorKeyPress += new Volian.Controls.Library.StepRTBCursorKeysEvent(this._MyStepRTB_CursorKeyPress); + //KBR this._MyStepRTB.CursorMovement += new Volian.Controls.Library.StepRTBCursorMovementEvent(this._MyStepRTB_CursorMovement); + //KBR this._MyStepRTB.LinkModifyRO += new Volian.Controls.Library.StepRTBLinkEvent(this._MyStepRTB_LinkModifyRO); + //KBR this._MyStepRTB.SetMenu += new StepRTBMenuEvent(_MyStepRTB_SetMenu); + //KBR this._MyStepRTB.AdjustTableWidth += new StepRTBTableWidthEvent(_MyStepRTB_AdjustTableWidth); + //KBR this._MyStepRTB.IsNotCurrentSelection += new StepRTBBooleanEvent(_MyStepRTB_IsNotCurrentSelection); + //KBR this._MyStepRTB.OpenAnnotations += new StepRTBEvent(_MyStepRTB_OpenAnnotations); + //KBR this._MyStepRTB.InsertPgBrk += new StepRTBEvent(_MyStepRTB_InsertPgBrk); + //KBR this._MyStepRTB.EnterKeyPressed += new StepRTBCursorKeysEvent(_MyStepRTB_EnterKeyPressed); + //KBR this._MyStepRTB.CheckClipboard += new StepRTBBooleanEvent(_MyStepRTB_CheckClipboard); + //KBR this._MyStepRTB.CopyStep += new StepRTBEvent(_MyStepRTB_CopyStep); + //KBR this._MyStepRTB.OpenContextMenu += new StepRTBLocationEvent(_MyStepRTB_OpenContextMenu); + //KBR this._MyStepRTB.DoMouseWheel += new StepRTBMouseEvent(_MyStepRTB_DoMouseWheel); + //KBR this._MyStepRTB.DoSaveContents += new StepRTBEvent(_MyStepRTB_DoSaveContents); + //KBR this._MyStepRTB.RoInsert += new StepRTBRoEvent(_MyStepRTB_RoInsert); + this._MyStepRTB.Resize += new System.EventHandler(MyStepRTB_Resize); + + // + // lblTab + // + this.lblTab.BackColor = System.Drawing.Color.Transparent; + this.lblTab.Location = new System.Drawing.Point(0, 0); + this.lblTab.Name = "lblTab"; + this.lblTab.Size = new System.Drawing.Size(61, 23); + this.lblTab.TabIndex = 3; + this.lblTab.Visible = false; + } + private StepRTB _MyStepRTB; + private System.Windows.Forms.Label lblTab; + private DevComponents.DotNetBar.SuperTooltip _MyToolTip; + #endregion + } +} diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index 229304d1..52296d23 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -688,7 +688,7 @@ namespace Volian.Controls.Library } public StepRTB(IContainer container) { - container.Add(this); + container.Add(this); InitializeComponent(); _Container = container; SetUpStepRTB(); @@ -833,7 +833,7 @@ namespace Volian.Controls.Library } void StepRTB_SelectionChanged(object sender, EventArgs e) { - if (_InitializingRTB || _IsExperimenting) return; + if (_InitializingRTB || _IsExperimenting || (MyItemInfo!=null && MyItemInfo.IsRtfRaw)) return; HandleSelectionChange(); } private bool _MouseDown = false; @@ -848,6 +848,7 @@ namespace Volian.Controls.Library OnSetMenu(this, new StepRTBMenuEventArgs(inPsi?"PSI":"OpenContextMenu")); _ContextMenuStripChanged = false; CorrectSelectionAtEndOfLine(); + if (e.Button == System.Windows.Forms.MouseButtons.Right && MyItemInfo.IsRtfRaw) OnSetMenu(this, new StepRTBMenuEventArgs("OpenRtfRawContextMenu")); _MouseDown = true; } void StepRTB_MouseUp(object sender, MouseEventArgs e) @@ -1049,6 +1050,13 @@ namespace Volian.Controls.Library } public void AddRtfText(string txt) { + if (MyItemInfo != null && MyItemInfo.IsRtfRaw) + { + if (txt != null && txt != "") SelectedRtf = _LastRtf = txt; + _lastReadOnly = ReadOnly; + OrigRTF = txt; + return; + } //Console.WriteLine("ItemID:{0}", MyItemInfo.ItemID); //if(MyItemInfo.ItemID==10256) // Volian.Base.Library.vlnStackTrace.ShowStackLocal("ItemID:{0}", MyItemInfo.ItemID.ToString()); @@ -1528,6 +1536,7 @@ namespace Volian.Controls.Library private bool _HandlingCtrlA = false; private void HandleLocalSelectionChange() { + if (this.MyItemInfo.IsRtfRaw) return; //if (MyRTBItem != null && MyRTBItem.MyStepPanel.SelectedStepRTB != this) if (OnIsNotCurrentSelection(this, new EventArgs())) return; @@ -1885,6 +1894,10 @@ namespace Volian.Controls.Library { switch (e.KeyCode) { + case Keys.E: + OnSetMenu(this, new StepRTBMenuEventArgs("InsEquation")); + e.Handled = true; + break; case Keys.F: OnSetMenu(this, new StepRTBMenuEventArgs("InsFigure")); e.Handled = true; @@ -1916,6 +1929,11 @@ namespace Volian.Controls.Library } } } + if (MyItemInfo.IsRtfRaw) + { + e.Handled = true; + return; + } if (!e.Shift) return; switch (e.KeyCode) { @@ -1993,6 +2011,16 @@ namespace Volian.Controls.Library // added jcb 20130103 to support set ro from word doc with annotation when right click menu is opened by keyboard if (e.KeyCode == Keys.Apps) OnSetMenu(this, new StepRTBMenuEventArgs("OpenContextMenu")); + + // the following code only allows arrow keys & pageup/down for rtf raw items: + if (!e.Control && !e.Shift && MyItemInfo != null && MyItemInfo.IsRtfRaw) // error message is displayed in keypress for this. + { + if (e.KeyCode != Keys.Up && e.KeyCode != Keys.Down && e.KeyCode != Keys.Right && e.KeyCode != Keys.Left && e.KeyCode != Keys.PageDown && e.KeyCode != Keys.PageUp) + { + e.Handled = true; + return; + } + } if (e.Control) { IsControlChar = true; @@ -2036,6 +2064,46 @@ namespace Volian.Controls.Library // maps the Ctrl-V to btnPaste for those StepRTB's that are associated with the StepTabRibbon, i.e. // EditItems & Grid cells. IDataObject iData = Clipboard.GetDataObject(); + + // verify that data in clipboard is valid for this type. If inserting an equation, need to verify that + // input data has an 'equation', and if not inserting into an equation step type, it must not have + // equation data. + DataFormats.Format frm = DataFormats.GetFormat("Embed Source"); + System.Windows.Forms.RichTextBox richTextBox1; + richTextBox1 = new System.Windows.Forms.RichTextBox(); + richTextBox1.Location = new System.Drawing.Point(35, 32); + richTextBox1.Name = "richTextBox1"; + richTextBox1.Size = new System.Drawing.Size(67, 58); + richTextBox1.TabIndex = 0; + richTextBox1.Text = ""; + richTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + bool hasEquation = false; + try + { + richTextBox1.Paste(frm); + // if (richTextBox1.Rtf.ToUpper().Contains("EQUAT") || richTextBox1.Rtf.ToUpper().Contains("VISIO")) hasEquation = true; + if (richTextBox1.Rtf.ToUpper().Contains("EQUAT")) hasEquation = true; + } + catch (Exception ex) + { + hasEquation = true; + } + if (MyItemInfo != null && MyItemInfo.IsRtfRaw && MyItemInfo.FormatStepData.Type.ToUpper().Contains("EQUATION") && !hasEquation) + { + MessageBox.Show("Cannot paste non-equation data into an equation step type.", "Invalid data", MessageBoxButtons.OK); + richTextBox1.Dispose(); + e.Handled = true; + return; + } + // if inserting anything other than equation, be sure that an equation is not in the buffer: + else if (hasEquation && (MyItemInfo==null || (MyItemInfo != null && !MyItemInfo.IsRtfRaw && !MyItemInfo.FormatStepData.Type.ToUpper().Contains("EQUATION")))) + { + MessageBox.Show("Cannot paste equation data into an non-equation step type.", "Invalid data", MessageBoxButtons.OK); + richTextBox1.Dispose(); + e.Handled = true; + return; + } + // only allow the paste of a screen shot image if using the shortcut switch "/EmbedImages" if (Volian.Base.Library.VlnSettings.GetCommandFlag("EmbedImages") && iData.GetDataPresent(DataFormats.Dib)) // Device Independent Bitmap { @@ -2046,6 +2114,15 @@ namespace Volian.Controls.Library e.Handled = true; return; } + else if (iData.GetDataPresent("Embed Source")) //DS Equation") || iData.GetDataPresent("MathType EF")) + { + Size sz = RtfRawItem.GetRtfRawSize(richTextBox1.Rtf); + this.Rtf = richTextBox1.Rtf; + Width = sz.Width; + Height = sz.Height; + e.Handled = true; + return; + } else if (iData.GetDataPresent(DataFormats.Dib)) { System.Drawing.Image img = Clipboard.GetImage(); @@ -2402,6 +2479,7 @@ namespace Volian.Controls.Library } e.Handled = true; } + } private static Form ParentForm(Control ctrl) { @@ -2433,6 +2511,13 @@ namespace Volian.Controls.Library { if (!ReadOnly) { + if (!IsControlChar && MyItemInfo != null && MyItemInfo.IsRtfRaw) + { + string err = string.Format("Cannot enter text into an equation or incorrect keystroke entered for equation"); + MessageBox.Show(err, "Invalid text.", MessageBoxButtons.OK); + e.Handled = true; + return; + } if (Text == "" && Parent != null && Parent is VlnFlexGrid) { //ShowMyParentsFonts(); diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index b916093c..4fd29361 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -647,7 +647,7 @@ namespace Volian.Controls.Library } SetButtonAndMenuEnabling(true); SetStepButtonAndMenuEnabling(true); - SetMenuEnablingForFigures(); + SetMenuEnablingForObjectsWOText(); _MyLastFormatID = MyItemInfo.ActiveFormat.FormatID; } } @@ -1187,7 +1187,7 @@ namespace Volian.Controls.Library public void SetButtonAndMenuEnabling(bool docontextmenus) { if (_MyStepRTB == null) return; - if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText && !MyItemInfo.IsFigure) // want menu enabling for figures + if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText && !MyItemInfo.IsFigure & !MyItemInfo.IsRtfRaw) // want menu enabling for figures & equations return; // No need to change menu that does not get used DocVersionInfo dvi = MyEditItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; if (dvi == null) return; @@ -1228,11 +1228,30 @@ namespace Volian.Controls.Library try // RHM20150506 Multiline ItemID TextBox { IDataObject iData = Clipboard.GetDataObject(); + DataFormats.Format frm = DataFormats.GetFormat("Embed Source"); + System.Windows.Forms.RichTextBox richTextBox1; + richTextBox1 = new System.Windows.Forms.RichTextBox(); + richTextBox1.Location = new System.Drawing.Point(35, 32); + richTextBox1.Name = "richTextBox1"; + richTextBox1.Size = new System.Drawing.Size(67, 58); + richTextBox1.TabIndex = 0; + richTextBox1.Text = ""; + richTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + bool noEquationData = true; + try + { + richTextBox1.Paste(frm); + if (richTextBox1.Rtf.ToUpper().Contains("EQUAT")) noEquationData = false; + } + catch (Exception ex) + { + noEquationData = false; + } //btnEdit3CMPaste.Enabled = btnPasteText.Enabled = btnCMPasteText.Enabled = btnCMPaste.Enabled = btnPaste.Enabled = (iData.GetDataPresent(DataFormats.Text) || iData.GetDataPresent(DataFormats.Rtf)); //btnPasteText.Enabled = btnPasteStepText.Enabled = btnPaste.Enabled = (iData.GetDataPresent(DataFormats.Text) || iData.GetDataPresent(DataFormats.Rtf)); - btnPaste.Enabled = (iData.GetDataPresent(DataFormats.Text) || iData.GetDataPresent(DataFormats.Rtf)); - btnCMPasteText.Enabled = btnPasteText.Enabled = iData.GetDataPresent(DataFormats.Text); - btnCMPaste.Enabled = btnPasteStepText.Enabled = iData.GetDataPresent(DataFormats.Rtf); + btnPaste.Enabled = noEquationData && (iData.GetDataPresent(DataFormats.Text) || iData.GetDataPresent(DataFormats.Rtf)); + btnCMPasteText.Enabled = btnPasteText.Enabled = noEquationData && iData.GetDataPresent(DataFormats.Text); + btnCMPaste.Enabled = btnPasteStepText.Enabled = noEquationData && iData.GetDataPresent(DataFormats.Rtf); } catch (Exception) // Error while trying to access the clipboard { // This happens when the ItemID Text Box at the bottom of the screen is used to paste @@ -1243,7 +1262,7 @@ namespace Volian.Controls.Library } } // all selected copy while in either Edit or View mode - btnCMCopy.Enabled = btnCopy.Enabled = _MyStepRTB.SelectionLength > 0; + btnCMCopy.Enabled = btnCopy.Enabled = _MyStepRTB.SelectionLength > 0 && !MyItemInfo.IsRtfRaw; // paste step only available if a step was copied. Also, check for valid types: SetPasteButtonEnabled(); @@ -1262,12 +1281,12 @@ namespace Volian.Controls.Library btnCMEditRO.Enabled = false; } // OLD: SetStepButtonAndMenuEnabling(docontextmenus); - SetMenuEnablingForFigures(); + SetMenuEnablingForObjectsWOText(); } - private void SetMenuEnablingForFigures() + private void SetMenuEnablingForObjectsWOText() { - if (MyItemInfo.IsFigure) + if (MyItemInfo.IsFigure || MyItemInfo.IsRtfRaw) { btnInsTrans.Enabled = btnCMTransition.Enabled = false; btnInsRO.Enabled = btnCMRO.Enabled = false; @@ -1286,6 +1305,11 @@ namespace Volian.Controls.Library btnPaste.Enabled = false; btnCMPaste.Enabled = false; btnCMPasteText.Enabled = false; + if (MyItemInfo.IsRtfRaw) + { + btnCopy.Enabled = false; + btnCMCopy.Enabled = false; + } } } @@ -1343,6 +1367,12 @@ namespace Volian.Controls.Library SetPasteButtons(false); return; } + //if copy item is equation, can only paste if from an equation + if ((tmp.MyDisplayTabControl.MyCopyStep.IsRtfRaw && !MyItemInfo.IsRtfRaw) || (!tmp.MyDisplayTabControl.MyCopyStep.IsRtfRaw && MyItemInfo.IsRtfRaw)) + { + SetPasteButtons(false); + return; + } //copy item is procedure, turn all off and return must be done from tree if(tmp.MyDisplayTabControl.MyCopyStep.IsProcedure) { @@ -1531,7 +1561,7 @@ namespace Volian.Controls.Library if (MyItemInfo.IsProcedure || MyItemInfo.IsSection) { btnInsCaut.Enabled = btnInsNote.Enabled = btnInsRNO.Enabled = btnInsFig.Enabled = - btnInsTable.Enabled = btnInsSubstep.Enabled = btnInsBefore.Enabled = btnInsAfter.Enabled = false; + btnInsTable.Enabled = btnInsSubstep.Enabled = btnInsBefore.Enabled = btnInsAfter.Enabled = btnInsEquation.Enabled = false; // if on a section, allow note/caution. May want to add condition that this is a subsection? if (MyItemInfo.IsSection && MyItemInfo.IsStepSection && MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.AllowNoteCautionAdd) { @@ -1589,16 +1619,18 @@ namespace Volian.Controls.Library btnInsSubstep.Enabled = (actable & E_AccStep.AddingSub) > 0; btnInsBefore.Enabled = btnInsBefH.Enabled = !MyItemInfo.IsRNOPart && (actable & E_AccStep.AddingPrev) > 0; btnInsAfter.Enabled = btnInsAftH.Enabled = !MyItemInfo.IsRNOPart && (actable & E_AccStep.AddingNext) > 0; + btnInsEquation.Enabled = (actable & E_AccStep.AddingTable) > 0 && MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Equation != null; - // if this step has a table or figure, disable both of those buttons. + // if this step has a table, figure or equation, disable both of those buttons. if (MyItemInfo.Tables != null && MyItemInfo.Tables.Count > 0) - btnInsTable.Enabled = btnInsFig.Enabled = btnCMInsFigure.Enabled = btnCMInsTable.Enabled = false; + btnInsTable.Enabled = btnInsFig.Enabled = btnInsEquation.Enabled = btnCMInsFigure.Enabled = btnCMInsTable.Enabled = btnCMInsEquation.Enabled = false; btnInsHLS.SubItems.Clear(); btnInsCaut.SubItems.Clear(); btnInsNote.SubItems.Clear(); btnInsRNO.SubItems.Clear(); btnInsFig.SubItems.Clear(); + btnInsEquation.SubItems.Clear(); btnInsTable.SubItems.Clear(); btnInsSubstep.SubItems.Clear(); @@ -1608,9 +1640,12 @@ namespace Volian.Controls.Library btnCMInsCaution.SubItems.Clear(); btnCMInsNote.SubItems.Clear(); btnCMInsFigure.SubItems.Clear(); + btnCMInsEquation.SubItems.Clear(); btnCMInsTable.SubItems.Clear(); btnCMInsSubStps.SubItems.Clear(); btnCMInsRNO.SubItems.Clear(); + btnCMInsEquation.Enabled = btnInsEquation.Enabled; + btnCMInsFigure.Enabled = btnInsFig.Enabled; } btnInsRNO.Enabled = btnCMInsRNO.Enabled = btnInsRNO.Enabled && (MyItemInfo.RNOs == null || MyItemInfo.RNOs.Count == 0); // don't insert an RNO if has an RNO @@ -1628,8 +1663,8 @@ namespace Volian.Controls.Library if (btnInsTable.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Table, sd, btnInsTable, (int)E_FromType.Table, btnCMInsTable, docontextmenus); if (btnInsSubstep.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Substep, sd, btnInsSubstep, (int)E_FromType.Step, btnCMInsSubStps, docontextmenus); if (btnInsRNO.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.RNO, sd, btnInsRNO, 0, btnCMInsRNO, docontextmenus); - - btnInsTrans.Enabled = btnCMTransition.Enabled = !MyItemInfo.IsFigure; + if (btnInsEquation.Enabled) GalleryForSubTypes(MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Equation, sd, btnInsEquation, (int)E_FromType.Table, btnCMInsEquation, docontextmenus); + btnInsTrans.Enabled = btnCMTransition.Enabled = !MyItemInfo.IsFigure && !MyItemInfo.IsRtfRaw; btnInsRO.Enabled = btnCMRO.Enabled = Mydvi.DocVersionAssociationCount > 0; // 2016-128 don't enable if RO Path was not selected at the Working Draft node // if in Calvert Alarms Condition/Response, disable insert of Cautions and Notes @@ -1653,7 +1688,7 @@ namespace Volian.Controls.Library // The first argument (boolean) in StepGetLevelTypes provides the option to get a complete list of step types // regardless of whether in the AER or RNO column (set to true). For all types, get both except for figures // and tables. - bool getall = !(btn.Name == "btnInsFig" || (btn.Name == "btnInsTable")); + bool getall = !(btn.Name == "btnInsFig" || btn.Name == "btnInsTable" || btn.Name == "btnInsEquation"); List sdl = MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepGetLevelTypes(getall, sdc, ref cursel, selType==null?"Section":selType.Type, MyItemInfo); if (sdl != null && sdl.Count > 0) { @@ -2469,7 +2504,7 @@ namespace Volian.Controls.Library MyEditItem.ToggleEditView(MyEditItem.MyStepPanel.VwMode); SetButtonAndMenuEnabling(true); SetStepButtonAndMenuEnabling(true); - SetMenuEnablingForFigures(); + SetMenuEnablingForObjectsWOText(); MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnModeChange(this, new StepRTBModeChangeEventArgs(MyEditItem.MyStepPanel.VwMode)); btnEditMode.Checked = btnCMEditMode1.Checked = MyEditItem.MyStepPanel.VwMode == E_ViewMode.View; MyEditItem.MyStepRTB.SpellCheckContextMenuOn(MyEditItem.MyStepPanel.VwMode != E_ViewMode.View); @@ -2797,6 +2832,10 @@ namespace Volian.Controls.Library //btnInsCaut.Enabled = (actable & E_AccStep.AddingCaution) > 0; switch (menuName) { + case "OpenRtfRawContextMenu": + ClearContextMenu(); + MessageBox.Show("No context menu for equations."); + break; case "PSI": displayMenu = true; _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMPSI); @@ -2851,6 +2890,10 @@ namespace Volian.Controls.Library displayMenu = ((actable & E_AccStep.AddingTable) > 0) && btnCMInsFigure.Enabled; _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsFigure); break; + case "InsEquation": + displayMenu = ((actable & E_AccStep.AddingTable) > 0) && btnCMInsEquation.Enabled; + _ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsEquation); + break; case "StepPaste": displayMenu = true; if (MyFlexGrid != null) @@ -3662,7 +3705,6 @@ namespace Volian.Controls.Library (this.Parent as StepTabPanel).MyDisplayTabControl.ItemsChangeIds.Remove(_MyEditItem.MyStepRTB.MyItemInfo.MyProcedure.ItemID); (this.Parent as StepTabPanel).MyDisplayTabControl.ItemsChangeIds.Add(_MyEditItem.MyStepRTB.MyItemInfo.MyProcedure.ItemID, txtBxChgId.Text); } - private frmImportWordContents fiwc = null; // open the Import Word Text dialog private void rbnImpWrd_ItemClick(object sender, EventArgs e) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 97842456..c0c15a0e 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx index e021848c..e6229be2 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx @@ -118,6 +118,201 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAqVJREFUOE99kntIU1Ecx+9f/dWf/V2U9LD+0B5KoPQg05U1g4iskBRLRQORyBaIZZq9 + FPNRq/nA+ZjOzMd0zuaabT7mcqahIiGCkunEB6bmnPPeb+cc2sVo9cf3wr2c7+d3zuceDgBX1WKDStuL + co0FpfVdKK41QaFuh1zVhoKKVrIEbF2SYlpCIr7TiAABvBhe4LHmErDkEOB3JpoV3OXLGSPs3R32oNNp + UWMcxNvWAVRqelFSa8HQ6BQDuMsV5jXE544iImcO0a/Xd4iAimarOH19g8dPp4D5FQF9I1MIvHibAvBK + twxVpwtPGl2IyltASPIAjT8DlGksNloua/iEoppucm4zsouN6Bmcdu/g8GnZGG4VO3EywYj9YQoExBrg + H9mYyQDK+q64DXJuxzqPxVUeMz8ETMwCm+XeL/yc4XOjH3vOvUH8w5okb6mcPxheZeOOXlPuPh6nn3C4 + eOQqP+JZoQEZL1uR+kLLAO6j0YzbHfC5OcjkHrok13tLFeB2XWh4LE2sT59fcmFuWcD3BQFjMwJGJgU2 + nRY9yT0Qcjd2Z1AWuG2Spuo7zzXxC0RaaZ0VRWoLkp82IOlRHf4nd19wqokArNxWSbfqepqpc2J2A1KZ + FVWGb2jrtUPXYweRy8qe5NLpJEe4LaFf0/de+fDFN1R29XzKEPyjtDgW/iCa2LcRufAkt6PfTv9OHLsH + kVmTtuymVURkDkPZvgpZpZNBzt4bjil51wFPctttDFDOAL7h1YFBiWbka1eQqnYiUs4jLG2cQXLJlpcd + /F9y9VYGIP3fN5FATvlEvEdAjJ6VvYJzcCKxz0+hNoLKTSvQISW7WZRL/fwBoCFCtnuF5LnlBNJvcpUB + 9kWBSJuCuX9alNti8QCg2VymyS/TsYX/CgDuFyf/5MBm5HpaAAAAAElFTkSuQmCC + + + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAGtJREFUOE/NjlEOwCAIQ7n/pdlAOzuDiB9L9ho/hLYqakgXg9lG75CBFTALZoHWr/rd + wtWC0FgtSI2/KEiYCriEZglty+a5YENzPCFTLQgoSOrIXZQd94Q6gGNDRPQyju9DHcCxoYCPfqB6Ac8q + sWuK1nmhAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAS9JREFUOE+1j7lKA1EYRvMcWgh2NmIfsBAkRFQkcRwTspjJTGaymGWMSzoVQQgIgja+ + QMRSX8HeQtHGrRLFJoWIhcVxQghKuE5ibuTjFPdwOfB7gL4ilDJ8P37Z/dM7O7VXrh7eXH456ybYitXO + P0lWb9yjnYI/Y/undczDF9TtWx6fP8TRTsFGbEw9waudsVmrM7lywUjgmCHfUW/B1ibK1xh7dwyO77r8 + ctZtcDR1ybDvgAHv1t+CmVIFq1DBzG+g59bQsqskrDIx0yailwhpBdSlPPOxHIFIlrlwmplFi2nVxK8Y + TqItKL1/D1rF5rnG8jrJxrnpMnHLJmrYhJNFFhI2SjxPMNo4N8NsqHnulJLCH9SdRFuwXwilDEIpg1DK + IJQyCKUMQimDUPYOni9fDipMjj4udQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAATBJREFUOE+lkL1LAgEYxu8vaWuItoZac8tIjezyFE/z4/JOTb3DPmzrY6qlsSgQgyIa + aiwIanAKImgRl8OWFrEtaPzV4XIHZ3TJjwcenuHheV8BGEquoRe5hl7kGnqRa+hFrqEXCXm9hlqukStt + ki2uky6skVKrJHIG8axONF0mslxiMVFkIV5gPqYRkFTmIjn8ovLTMiQ2+z8EtdKfr6xukLHma1WSqoGs + GMQyFZZSBmKyRFi25ucJRvvzZ8UV/OGsvctJ7eQNaatJyLi33jUQm3Wyd9Gl8fCFT7nxVjCdvkI7eMUq + OL79JKDfMSVfMjpz6Fpks31aZo+x0Cm7DZPt8y7STpsJsc5L6/1vBRbtzgeTsTP8RpPx4BGPT+bAM2zW + SbvTY8S3T/36+ZcfIHwDzrV41u405T4AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAOxJREFUOE9j+P//P0UYTIQ3PNLxKT0FZGJXhA+DiZCm+/898g8AmUgSQClCGKwORASW + XdZ0SF793zFplR/MAGIxmHDN3vHfInz6f2P/DiAXu0JcGKsgKRhMBNXf+B9QfeW/S/b2LnQFhDCcEVR3 + Pd0mdgGQCZUAShHCYHUgIqThoY9r1vb/tolL/WEGEIvBhGfBgf+WETP+G/m2ALnYFeLCWAVJwWDCv+ri + f9/yc/8dUlYDudgV4sJwhl/Fuf+O6ZvS4BJAKUIYrA6mwaPoyGyz4AlgQVIwmPAoPAgORJvohYHoCghh + rILE4/8MAGForseyYJRSAAAAAElFTkSuQmCC + + + + + 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 + WA38O3S/ADcvFeh5cZA8AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAchJREFUOE+lkN8vglEcxv1H5sKFG3Nl48Kluc7cmNm4YGNmtsaFzWxUk4WiyG8mKaWk + SCUsDcPmxxsyuZCk3upxzsubzrCxLp73PefsfJ7n+Z4CAHlJ+PROPyBX3boHdKrDaBm+R8PgHSR9t6jp + CaGqi0N5O4fSlhuUNF8TNMdA4wBG7RkorWnITSn0G3j0LiYhnUmgY/INrZpXNKliqB+KoU4WRVHdHmsg + SqoNo200jEbFR3J1dwiVHTco+0wVVShxfxlMrvqQyWSycvkvmP2a80j4J/k0ovE0pgxuFFfUfhmML7sZ + YNN3xuxX7IdIEPiFwJFoCtplF2swMr+FgxNOSN70ncO2ewrLzrGQTOElqx+zJi/0JJnCY/MO1kCp32AS + 1wksrmltCkeiPEKRJM7vklDN2FgDudbMGJicwSz8Ek9Bv+oG98QLcOA6AeWUlTUY0BjhCVzCsk1qbx3B + kFubwLS2esEB1awNSr0VCp35u0Fug0WLX3jtx+cUqc1DTWYOXCXgOYvDHoxBNmH63YDWnqMzE5gjsDjz + B/wK434M9P43A4f3VKhNYfG1afIIrU1mVujWhWR690cDevBfZQ3y0Y+HfxcK3gF0tRyBhFaMKgAAAABJ + RU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAkRJREFUOE+lk11Ik3EUh3cZEUQXQdCFERFdRE0iiMKMkALJleSFIX2gVKCUlFiWy8QF + WVosQUVHKzU/KjNTy4aZqChpH9qczqS5QIvULZ3Sh835tPOGvbswiro479We5/zPOb9pgP8q5ZN3p4PA + yilrJ+tmCxcKG9HnPCYpq4Z4QyWxqeXEJBcTlWhmT4LJjwYIvDP8tj5/A/fULMPuWQY++Ohy+lizM/3v + BC6bHfuhYGwHtVjbbApcUj/I6h3n/yyQzgIzbGH66Ume711Bq93Hjdo3rAoLEMjM88HybNsB7U84O4z2 + yCAs3TMU3rOycnuaKpCFzQfLzPJs6Szw/Qevqe6cIbe8k6Bt51SBbHsO7h8c4USGSamOvk/KzPJs6Sxw + RZsXY1ELy0P0qkBOJbBjyK2AjuFxrANjbI2Iw1T1itDdh5UqqO6nuNlLtqmBZVtSVYHceQ5+P+ph6OMX + nvW4qLD0Eh4dT82TLuqbe/y/1lDwyMXFvDqWbjqrCiQkAo+4JvFMTWN1TGCuecvtBif5/nl1MccoutuE + 8XqtIjFcq2LJxjOqQBL23etjzDNNn3OSkocOrpb2kml+SZa5nURDOdrQKBL1OcSnXFEkizekqAKJ5+j4 + V170uahsfPcLTs9tJvlyLQlppUTGGhRJ+L7jhOriWBR8WhVItu3OCcrqusnIb0VvbCA5s9oP3iI2KZ/o + o5fQ7dcTsusIazdHKLVwfYBA/hiSbYmnJExCIneWU8m2ZWEyszxbOgu8YN0pVfDvheYHcKby8SmeJsQA + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAbtJREFUOE+dkdkvQ0EUxvuneCJiizUeSBCxv+CBBxIJ/42+iIgHtaS2WNLGnpbaCbU0 + 5ZbbRlvUWqSWStHlM3Oa2zR674sv+fKdzJzzm8yMCgB5dlPEX+tWBUwYLBiZ2+fulHrjHSv4gJI0U+so + qOmQhcQK/ZqNhbx6Rgww7ggSRM2WEgFTy1YW8hqYXqVhyUyJgPHFQ0RYEa9IJEJroVAY/ZMmdGuXkF/d + zrcSAWPzZoTDYZycOykdLg+CbNB65kTg+weWs0voDHvKALVmFq7rO7aiguC4pBSdHsoDq51yWLeiDPiv + Y8Wc6ZBOcXseKR3uW0qb44pyyyxQ5pU1snYZwOjMFgSR3Z89nPfZRw8oiC74A984OHHh5uEd6j49UvKr + WLsMQMNeORgKsTIq/oCvH1+49X5AdL/g+PwBXUMLyCpt5tuJgN5RI4uo+OmfgR88vnziwuOD1e7FtuWG + vjG9WOEKfFMS//c3/xfun/wE2D+9g8l8RYDUwjreogzYPbJjcf0YWv0GBqfX0DtmpEHJyXmVvE0ewP84 + t6INOeWtyC5vQWZJEzm9qAFpRfXs9FokZRSzdhnA/wzVLxUADyPRHEmUAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAKBJREFUOE+lktENgzAMRPnuT0dgBEboCBUTMEpnYRJG6SjGD0yF42IUOOkwJPLLGWhE + 5Jb/LtZ4vRzrZdWpBvCx6pQBOvVkHnb3zoeARz++1U97RIwQnAEm9ReQLbEZHADWKIUZoTx9SRcAm7Tp + LAGQFHD2DvIEqvIrsBmcAThhO621CtQpA9DEz4NpppLEKQOU+s29Vw2ABKRyCoDrlmYGMFFlo7aqRrIA + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAH1JREFUOE/tlEEKgDAMBAv9/5sjDU2I46JgPHoY6M4uUkEcZvYpUnaQsoOUHaTsIGWH + Mees2IaexI68fuCCW891kHLDjnDnmYMs9vmO2FVOr3wpH+DOcw1xzhKOcOO5hjhnCUe48VyLKGsOR7gJ + Lp9NGymBuslCbf+/TRsbB+xHoolXXKrrAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA + CvYBwq9wAwAAAgtJREFUOE9j+P//P0UYqyApGM5wKrvD6Vp9V9G1/VWWc+/bWuvpX7eYz/p10Wzq130m + ne+7jSueZhnm37DSijsrhmGAT+0DLteG50V27W83eSdduOgXfmCNT/jhfK/Io+ku0acnWxTeOanZ8+m5 + YvWzO8rBxyrVrPbwoBjgUnXX3rbl9aOggH23Y0K3+MMkkbF51uWJqqnXr0g77bunZb48EiYOJmyaXuw0 + zb//3c95XQdMAhtWTbmwTcZt72cd84VrYWJgwrT66XLdmKvfnC1XZ8MksGHl9PPr5bx2fzW0nL8EJgYm + LIpv+Wv4nbmhZrjtMkwCG1YqufpGxWHjayubOTEwMTBhFndZWdX9xAF56wNf1e23eMAkkbFu9tlE5fIr + f0ysF12zsl6gCROHK9D0O2IhHnHptbTHwV0wMWSsk3/pslrIvs/WtgvckMVRFMkmX5ktmXD2qYbdZntk + caPMU06axZc+aPtuW48sDsJgQrz/80e15HPOKiEHVaVddr7Xsly5EVmRQc7pIzrZp7/r+28z1vRcnyTn + s/onTA5iQP3z9+LZl7/IWq5/omM2742B9bx7MAUgbJBz6oVe+N7P2i6r36s7Lf2p6jT/G0wOTMgHHTmh + aLz6tq75/E+a1nN+aDgt/AtTAMKGSQd+G3tv+GHkveKHjuui9zoO8x7C5OCKyMVYBYnH/xkA0xCX+LGq + wvUAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -163,9 +358,6 @@ SUVORK5CYII= - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -433,198 +625,6 @@ eA4CMA/59IJKpYJSqYRisQhFUWATwsjn81jcjWB+5xlzW0/ghSB41wPcvgu9oGeQR/fALLh+G7i+GXT1 TtO4ZGo6nUYikUA8HockSRSdgCwsJtfvaGReeIR9815HS4KJtVu8fabgES9pg5GmAuvqDf1p87BIL7Mg 95jN/4G52TowfQMrXAwHRYbY0gAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAqVJREFUOE99kntIU1Ecx+9f/dWf/V2U9LD+0B5KoPQg05U1g4iskBRLRQORyBaIZZq9 - FPNRq/nA+ZjOzMd0zuaabT7mcqahIiGCkunEB6bmnPPeb+cc2sVo9cf3wr2c7+d3zuceDgBX1WKDStuL - co0FpfVdKK41QaFuh1zVhoKKVrIEbF2SYlpCIr7TiAABvBhe4LHmErDkEOB3JpoV3OXLGSPs3R32oNNp - UWMcxNvWAVRqelFSa8HQ6BQDuMsV5jXE544iImcO0a/Xd4iAimarOH19g8dPp4D5FQF9I1MIvHibAvBK - twxVpwtPGl2IyltASPIAjT8DlGksNloua/iEoppucm4zsouN6Bmcdu/g8GnZGG4VO3EywYj9YQoExBrg - H9mYyQDK+q64DXJuxzqPxVUeMz8ETMwCm+XeL/yc4XOjH3vOvUH8w5okb6mcPxheZeOOXlPuPh6nn3C4 - eOQqP+JZoQEZL1uR+kLLAO6j0YzbHfC5OcjkHrok13tLFeB2XWh4LE2sT59fcmFuWcD3BQFjMwJGJgU2 - nRY9yT0Qcjd2Z1AWuG2Spuo7zzXxC0RaaZ0VRWoLkp82IOlRHf4nd19wqokArNxWSbfqepqpc2J2A1KZ - FVWGb2jrtUPXYweRy8qe5NLpJEe4LaFf0/de+fDFN1R29XzKEPyjtDgW/iCa2LcRufAkt6PfTv9OHLsH - kVmTtuymVURkDkPZvgpZpZNBzt4bjil51wFPctttDFDOAL7h1YFBiWbka1eQqnYiUs4jLG2cQXLJlpcd - /F9y9VYGIP3fN5FATvlEvEdAjJ6VvYJzcCKxz0+hNoLKTSvQISW7WZRL/fwBoCFCtnuF5LnlBNJvcpUB - 9kWBSJuCuX9alNti8QCg2VymyS/TsYX/CgDuFyf/5MBm5HpaAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAGtJREFUOE/NjlEOwCAIQ7n/pdlAOzuDiB9L9ho/hLYqakgXg9lG75CBFTALZoHWr/rd - wtWC0FgtSI2/KEiYCriEZglty+a5YENzPCFTLQgoSOrIXZQd94Q6gGNDRPQyju9DHcCxoYCPfqB6Ac8q - sWuK1nmhAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAS9JREFUOE+1j7lKA1EYRvMcWgh2NmIfsBAkRFQkcRwTspjJTGaymGWMSzoVQQgIgja+ - QMRSX8HeQtHGrRLFJoWIhcVxQghKuE5ibuTjFPdwOfB7gL4ilDJ8P37Z/dM7O7VXrh7eXH456ybYitXO - P0lWb9yjnYI/Y/undczDF9TtWx6fP8TRTsFGbEw9waudsVmrM7lywUjgmCHfUW/B1ibK1xh7dwyO77r8 - ctZtcDR1ybDvgAHv1t+CmVIFq1DBzG+g59bQsqskrDIx0yailwhpBdSlPPOxHIFIlrlwmplFi2nVxK8Y - TqItKL1/D1rF5rnG8jrJxrnpMnHLJmrYhJNFFhI2SjxPMNo4N8NsqHnulJLCH9SdRFuwXwilDEIpg1DK - IJQyCKUMQimDUPYOni9fDipMjj4udQAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAATBJREFUOE+lkL1LAgEYxu8vaWuItoZac8tIjezyFE/z4/JOTb3DPmzrY6qlsSgQgyIa - aiwIanAKImgRl8OWFrEtaPzV4XIHZ3TJjwcenuHheV8BGEquoRe5hl7kGnqRa+hFrqEXCXm9hlqukStt - ki2uky6skVKrJHIG8axONF0mslxiMVFkIV5gPqYRkFTmIjn8ovLTMiQ2+z8EtdKfr6xukLHma1WSqoGs - GMQyFZZSBmKyRFi25ucJRvvzZ8UV/OGsvctJ7eQNaatJyLi33jUQm3Wyd9Gl8fCFT7nxVjCdvkI7eMUq - OL79JKDfMSVfMjpz6Fpks31aZo+x0Cm7DZPt8y7STpsJsc5L6/1vBRbtzgeTsTP8RpPx4BGPT+bAM2zW - SbvTY8S3T/36+ZcfIHwDzrV41u405T4AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAOxJREFUOE9j+P//P0UYTIQ3PNLxKT0FZGJXhA+DiZCm+/898g8AmUgSQClCGKwORASW - XdZ0SF793zFplR/MAGIxmHDN3vHfInz6f2P/DiAXu0JcGKsgKRhMBNXf+B9QfeW/S/b2LnQFhDCcEVR3 - Pd0mdgGQCZUAShHCYHUgIqThoY9r1vb/tolL/WEGEIvBhGfBgf+WETP+G/m2ALnYFeLCWAVJwWDCv+ri - f9/yc/8dUlYDudgV4sJwhl/Fuf+O6ZvS4BJAKUIYrA6mwaPoyGyz4AlgQVIwmPAoPAgORJvohYHoCghh - rILE4/8MAGForseyYJRSAAAAAElFTkSuQmCC - - - - - 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 - WA38O3S/ADcvFeh5cZA8AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAchJREFUOE+lkN8vglEcxv1H5sKFG3Nl48Kluc7cmNm4YGNmtsaFzWxUk4WiyG8mKaWk - SCUsDcPmxxsyuZCk3upxzsubzrCxLp73PefsfJ7n+Z4CAHlJ+PROPyBX3boHdKrDaBm+R8PgHSR9t6jp - CaGqi0N5O4fSlhuUNF8TNMdA4wBG7RkorWnITSn0G3j0LiYhnUmgY/INrZpXNKliqB+KoU4WRVHdHmsg - SqoNo200jEbFR3J1dwiVHTco+0wVVShxfxlMrvqQyWSycvkvmP2a80j4J/k0ovE0pgxuFFfUfhmML7sZ - YNN3xuxX7IdIEPiFwJFoCtplF2swMr+FgxNOSN70ncO2ewrLzrGQTOElqx+zJi/0JJnCY/MO1kCp32AS - 1wksrmltCkeiPEKRJM7vklDN2FgDudbMGJicwSz8Ek9Bv+oG98QLcOA6AeWUlTUY0BjhCVzCsk1qbx3B - kFubwLS2esEB1awNSr0VCp35u0Fug0WLX3jtx+cUqc1DTWYOXCXgOYvDHoxBNmH63YDWnqMzE5gjsDjz - B/wK434M9P43A4f3VKhNYfG1afIIrU1mVujWhWR690cDevBfZQ3y0Y+HfxcK3gF0tRyBhFaMKgAAAABJ - RU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAkRJREFUOE+lk11Ik3EUh3cZEUQXQdCFERFdRE0iiMKMkALJleSFIX2gVKCUlFiWy8QF - WVosQUVHKzU/KjNTy4aZqChpH9qczqS5QIvULZ3Sh835tPOGvbswiro479We5/zPOb9pgP8q5ZN3p4PA - yilrJ+tmCxcKG9HnPCYpq4Z4QyWxqeXEJBcTlWhmT4LJjwYIvDP8tj5/A/fULMPuWQY++Ohy+lizM/3v - BC6bHfuhYGwHtVjbbApcUj/I6h3n/yyQzgIzbGH66Ume711Bq93Hjdo3rAoLEMjM88HybNsB7U84O4z2 - yCAs3TMU3rOycnuaKpCFzQfLzPJs6Szw/Qevqe6cIbe8k6Bt51SBbHsO7h8c4USGSamOvk/KzPJs6Sxw - RZsXY1ELy0P0qkBOJbBjyK2AjuFxrANjbI2Iw1T1itDdh5UqqO6nuNlLtqmBZVtSVYHceQ5+P+ph6OMX - nvW4qLD0Eh4dT82TLuqbe/y/1lDwyMXFvDqWbjqrCiQkAo+4JvFMTWN1TGCuecvtBif5/nl1MccoutuE - 8XqtIjFcq2LJxjOqQBL23etjzDNNn3OSkocOrpb2kml+SZa5nURDOdrQKBL1OcSnXFEkizekqAKJ5+j4 - V170uahsfPcLTs9tJvlyLQlppUTGGhRJ+L7jhOriWBR8WhVItu3OCcrqusnIb0VvbCA5s9oP3iI2KZ/o - o5fQ7dcTsusIazdHKLVwfYBA/hiSbYmnJExCIneWU8m2ZWEyszxbOgu8YN0pVfDvheYHcKby8SmeJsQA - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAbtJREFUOE+dkdkvQ0EUxvuneCJiizUeSBCxv+CBBxIJ/42+iIgHtaS2WNLGnpbaCbU0 - 5ZbbRlvUWqSWStHlM3Oa2zR674sv+fKdzJzzm8yMCgB5dlPEX+tWBUwYLBiZ2+fulHrjHSv4gJI0U+so - qOmQhcQK/ZqNhbx6Rgww7ggSRM2WEgFTy1YW8hqYXqVhyUyJgPHFQ0RYEa9IJEJroVAY/ZMmdGuXkF/d - zrcSAWPzZoTDYZycOykdLg+CbNB65kTg+weWs0voDHvKALVmFq7rO7aiguC4pBSdHsoDq51yWLeiDPiv - Y8Wc6ZBOcXseKR3uW0qb44pyyyxQ5pU1snYZwOjMFgSR3Z89nPfZRw8oiC74A984OHHh5uEd6j49UvKr - WLsMQMNeORgKsTIq/oCvH1+49X5AdL/g+PwBXUMLyCpt5tuJgN5RI4uo+OmfgR88vnziwuOD1e7FtuWG - vjG9WOEKfFMS//c3/xfun/wE2D+9g8l8RYDUwjreogzYPbJjcf0YWv0GBqfX0DtmpEHJyXmVvE0ewP84 - t6INOeWtyC5vQWZJEzm9qAFpRfXs9FokZRSzdhnA/wzVLxUADyPRHEmUAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAKBJREFUOE+lktENgzAMRPnuT0dgBEboCBUTMEpnYRJG6SjGD0yF42IUOOkwJPLLGWhE - 5Jb/LtZ4vRzrZdWpBvCx6pQBOvVkHnb3zoeARz++1U97RIwQnAEm9ReQLbEZHADWKIUZoTx9SRcAm7Tp - LAGQFHD2DvIEqvIrsBmcAThhO621CtQpA9DEz4NpppLEKQOU+s29Vw2ABKRyCoDrlmYGMFFlo7aqRrIA - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAH1JREFUOE/tlEEKgDAMBAv9/5sjDU2I46JgPHoY6M4uUkEcZvYpUnaQsoOUHaTsIGWH - Mees2IaexI68fuCCW891kHLDjnDnmYMs9vmO2FVOr3wpH+DOcw1xzhKOcOO5hjhnCUe48VyLKGsOR7gJ - Lp9NGymBuslCbf+/TRsbB+xHoolXXKrrAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9gAA - CvYBwq9wAwAAAgtJREFUOE9j+P//P0UYqyApGM5wKrvD6Vp9V9G1/VWWc+/bWuvpX7eYz/p10Wzq130m - ne+7jSueZhnm37DSijsrhmGAT+0DLteG50V27W83eSdduOgXfmCNT/jhfK/Io+ku0acnWxTeOanZ8+m5 - YvWzO8rBxyrVrPbwoBjgUnXX3rbl9aOggH23Y0K3+MMkkbF51uWJqqnXr0g77bunZb48EiYOJmyaXuw0 - zb//3c95XQdMAhtWTbmwTcZt72cd84VrYWJgwrT66XLdmKvfnC1XZ8MksGHl9PPr5bx2fzW0nL8EJgYm - LIpv+Wv4nbmhZrjtMkwCG1YqufpGxWHjayubOTEwMTBhFndZWdX9xAF56wNf1e23eMAkkbFu9tlE5fIr - f0ysF12zsl6gCROHK9D0O2IhHnHptbTHwV0wMWSsk3/pslrIvs/WtgvckMVRFMkmX5ktmXD2qYbdZntk - caPMU06axZc+aPtuW48sDsJgQrz/80e15HPOKiEHVaVddr7Xsly5EVmRQc7pIzrZp7/r+28z1vRcnyTn - s/onTA5iQP3z9+LZl7/IWq5/omM2742B9bx7MAUgbJBz6oVe+N7P2i6r36s7Lf2p6jT/G0wOTMgHHTmh - aLz6tq75/E+a1nN+aDgt/AtTAMKGSQd+G3tv+GHkveKHjuui9zoO8x7C5OCKyMVYBYnH/xkA0xCX+LGq - wvUAAAAASUVORK5CYII= diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 8a45e881..6d18f70a 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -4453,12 +4453,12 @@ namespace Volian.Controls.Library /// /// RTF Should only be used if the contents of the richtextbox are to be converted to an image. /// - class RTF : StepRTB + public class RTF : StepRTB { // messages used by RichEd20.dll internal const int - WM_USER = 0x0400, - EM_FORMATRANGE = WM_USER + 57; + WM_USER = 0x0400, + EM_FORMATRANGE = WM_USER + 57; // FORMATRANGE is used by RichEd20.dll to render RTF internal struct FORMATRANGE diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 162f0cb1..cc75581a 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -924,7 +924,7 @@ namespace Volian.Controls.Library // in the following, 'Copy' is not allowed for any procedure/section/step that is enhanced. Note that this may be // changed later, but for the initial enhanced development it was decided to not allow copy of enhanced since paste would // require clearing of all enhanced config data or mapping it to existing data (quite complicated) - if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection)) + if ((ui.IsAdministrator() || ui.IsSetAdministrator(i.MyProcedure.MyDocVersion) || ui.IsWriter(i.MyProcedure.MyDocVersion)) && (!i.IsEnhancedStep && !i.IsEnhancedProcedure && !i.IsEnhancedSection && !i.IsRtfRaw && !i.IsFigure)) cm.MenuItems.Add("Copy", new EventHandler(mi_Click)); } #endregion @@ -1364,6 +1364,7 @@ namespace Volian.Controls.Library else if (docVersionIsSource && !procIsSource) canPaste = true; else if (docVersionIsSource) canPaste = (!procIsSource || (iiClipboard.MyDocVersion.ItemID == dvi.ItemID)); else if (docVersionIsEnhanced) canPaste = !procIsSource; + if (iiClipboard.IsRtfRaw) canPaste = false; // never paste an equation. if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click)); } #endregion @@ -1411,6 +1412,7 @@ namespace Volian.Controls.Library else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) prCanPaste = true; // 4) //else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID != iiClipboard.MyDocVersion.VersionID) prCanPaste = false; // 5) commented out because already set to false //else if (prToIsEnhanced && prFromIsSource) prCanPaste = false; // 6)commented out because already set to false + if (iiClipboard.IsRtfRaw) prCanPaste = okToReplace = prCanPaste = false; // never paste an equation. if (prCanPaste) cm.MenuItems.Add("Paste Procedure Before", new EventHandler(mi_Click)); if (okToReplace && prCanPaste) cm.MenuItems.Add("Replace Existing Procedure", new EventHandler(mi_Click)); if (prCanPaste) cm.MenuItems.Add("Paste Procedure After", new EventHandler(mi_Click)); @@ -1435,6 +1437,7 @@ namespace Volian.Controls.Library if (!prToIsEnhanced && !prToIsSource && !scFromIsEnhanced && !scFromIsSource) scCanPaste = true; // 1) else if (prToIsSource && !scFromIsEnhanced && !scFromIsSource) scCanPaste = true; else if (prToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) scCanPaste = true; // 3) + if (iiClipboard.IsRtfRaw) scCanPaste = false; // never paste an equation. if (scCanPaste) cm.MenuItems.Add("Paste Section", new EventHandler(mi_Click)); } #endregion @@ -1464,6 +1467,7 @@ namespace Volian.Controls.Library okToReplace = false; } else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true; // 3) + if (iiClipboard.IsRtfRaw) secCanPaste = okToReplace = false; // never paste an equation. if (secCanPaste) cm.MenuItems.Add("Paste Section Before", new EventHandler(mi_Click)); if (okToReplace && secCanPaste) cm.MenuItems.Add("Replace Existing Section", new EventHandler(mi_Click)); if (secCanPaste) cm.MenuItems.Add("Paste Section After", new EventHandler(mi_Click)); @@ -1471,7 +1475,7 @@ namespace Volian.Controls.Library { // only paste a subsection if the paste here is an empty section or has // subsections. - if (iiPasteHere.Sections == null || iiPasteHere.Sections.Count > 0) + if (!iiClipboard.IsRtfRaw && (iiPasteHere.Sections == null || iiPasteHere.Sections.Count > 0)) cm.MenuItems.Add("Paste Subsection", new EventHandler(mi_Click)); } } @@ -1495,6 +1499,7 @@ namespace Volian.Controls.Library if (!secToIsEnhanced && !secToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true; // 1) else if (secToIsSource && !stpFromIsEnhanced && !stpFromIsSource) stpCanPaste = true; // 2) else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) stpCanPaste = true; // 3) + if (iiClipboard.IsRtfRaw) stpCanPaste = false; // never paste an equation. if (stpCanPaste) cm.MenuItems.Add("Paste Step", new EventHandler(mi_Click)); } #endregion @@ -1524,6 +1529,7 @@ namespace Volian.Controls.Library okToReplace = false; } else if (stpToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) stpCanPaste = true; // 3) + if (iiClipboard.IsRtfRaw) stpCanPaste = false; // never paste an equation. if (stpCanPaste && AddToInsertMenu(iiPasteHere, 0)) cm.MenuItems.Add("Paste Step Before", new EventHandler(mi_Click)); if (stpCanPaste && okToReplace) cm.MenuItems.Add("Replace Existing Step", new EventHandler(mi_Click)); if (stpCanPaste && AddToInsertMenu(iiPasteHere, 1)) cm.MenuItems.Add("Paste Step After", new EventHandler(mi_Click)); diff --git a/PROMS/Volian.Print.Library/PDFChronologyReport.cs b/PROMS/Volian.Print.Library/PDFChronologyReport.cs index e40727ca..1f5abe4c 100644 --- a/PROMS/Volian.Print.Library/PDFChronologyReport.cs +++ b/PROMS/Volian.Print.Library/PDFChronologyReport.cs @@ -389,6 +389,8 @@ namespace Volian.Print.Library string txt = null; if ((cai.Text==null || cai.Text=="") && (cai.Type == 20036 || cai.Type == 20037 || cai.Type == 20038 || cai.Type == 20039)) txt = "Embedded Image"; + else if ((cai.Text == null || cai.Text == "") && (cai.Type > 20099)) + txt = "Equation"; else txt = ItemInfo.ConvertToDisplayText(cai.Text); if (MyProc.MyDocVersion.MultiUnitCount > 1) diff --git a/PROMS/Volian.Print.Library/Rtf2Pdf.cs b/PROMS/Volian.Print.Library/Rtf2Pdf.cs index 672a6a2e..65ba6a89 100644 --- a/PROMS/Volian.Print.Library/Rtf2Pdf.cs +++ b/PROMS/Volian.Print.Library/Rtf2Pdf.cs @@ -271,5 +271,52 @@ namespace Volian.Print.Library cb.EndLayer(); cb.RestoreState(); } + + internal static float RtfRawAt(PdfContentByte cb, System.Drawing.Image image, float XOffset, float yLocation, float Width, float Height, string debug, float yBottomMargin, bool hasBorder) + { + VlnSvgPageHelper _MyPageHelper = cb.PdfWriter.PageEvent as VlnSvgPageHelper; + PdfLayer textLayer = _MyPageHelper == null ? null : _MyPageHelper.TextLayer; + float left = XOffset + Offset.X; + float top = yLocation + Offset.Y; + float bottom = top - Height; + float scale = .6f; + iTextSharp.text.Image it_image=null; + try + { + it_image = iTextSharp.text.Image.GetInstance(image,iTextSharp.text.Color.WHITE); + float itxtWid = scale * Width * 300 / 72; + float itxtHt = scale * Height * 300 / 72; + it_image.ScaleAbsoluteWidth(scale * Width); + it_image.ScaleAbsoluteHeight(scale * Height); + it_image.SetAbsolutePosition(left, top-(scale*Height)); + cb.AddImage(it_image); + } + catch (Exception ex) + { + Console.WriteLine("Exception {0}", ex.Message); + } + if (hasBorder) + { + iTextSharp.text.Color boxColor = new iTextSharp.text.Color(System.Drawing.Color.Black); + cb.SetColorStroke(boxColor); + cb.SetLineWidth(.85F); + cb.Rectangle(left - 1.5F, top - (scale * Height) - 1.5F, (scale * Width) + 3, (scale * Height) + 3); + cb.Stroke(); + } + if (textLayer != null) cb.EndLayer(); + if (PdfDebug) + { + // be very careful around the following line, if the cursor 'touches' + // NextTextAtCounter, it is incremented and the 'next' value may not be what + // was seen as the UniqueNumber in the pdf. + int next = NextTextAtCounter; + // buffer (unnecessary comments) so + // that cursor does NOT touch 'NextTextAtCounter' + // as easily + string dbt = string.Format("[{0}]{1}", next, debug ?? ""); + DrawPdfDebug(cb, left, top, left + (scale*Width), top-(scale*Height), dbt, 0); + } + return bottom; + } } } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index fa5141fa..f1bb28e5 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -530,7 +530,10 @@ namespace Volian.Print.Library retval = DrawFigure(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); else retval = DrawText(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation); - + } + else if (MyItemInfo.IsRtfRaw) + { + retval = DrawRaw(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); } else if (!MyItemInfo.IsStepSection || (ShowSectionTitles @@ -551,8 +554,8 @@ namespace Volian.Print.Library if (MyItemInfo.MyContent.MyGrid != null) { int profileDepth = ProfileTimer.Push(">>>> vlnParagraph.DrawDrid"); - // RHM20150507 Include Footer - retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin + (float) MyItemInfo.MyDocStyle.Layout.FooterLength, ref yLocation); // RHM20150429 - Table Scrunch + // RHM20150507 Include Footer + retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin + (float)MyItemInfo.MyDocStyle.Layout.FooterLength, ref yLocation); // RHM20150429 - Table Scrunch ProfileTimer.Pop(profileDepth); } else @@ -607,6 +610,30 @@ namespace Volian.Print.Library //if (localYPageStart != yPageStart) DebugText.WriteLine("ParToPdf-yPagestartDiff:{0},{1},{2}", MyItemInfo.ItemID, localYPageStart, yPageStart); return yPageStart; } + + private float DrawRaw(PdfContentByte cb, float yBottomMargin, float yLocation, float yPageStart, float yTopMargin) + { + if (DebugText.IsOpen) DebugText.WriteLine("{0},'{1}','{2}','<>'", MyItemInfo.ItemID, MyItemInfo.DBSequence, FormattedText); + float retval = yLocation; + System.Drawing.Size sz = RtfRawItem.GetRtfRawSize(MyItemInfo.MyContent.Text); + Height = sz.Height; + Width = sz.Width; + Volian.Controls.Library.RTF myRtb = new RTF(); + myRtb.Size = sz; + myRtb.Rtf = MyItemInfo.MyContent.Text; + try + { + System.Drawing.Image image = new System.Drawing.Bitmap((int)Width, (int)Height); + System.Drawing.Graphics gr = System.Drawing.Graphics.FromImage(image); + myRtb.RenderClipped(gr, new System.Drawing.Rectangle(0, 0, (int)Width, (int)Height)); + retval = Rtf2Pdf.RtfRawAt(cb, image, XOffset + MyItemInfo.FormatStepData.Font.CharsToTwips, yLocation, Width * MyPageHelper.YMultiplier, Height * MyPageHelper.YMultiplier, DebugInfo, yBottomMargin, !MyItemInfo.FormatStepData.Type.ToUpper().Contains("BORDERLESS")); + } + catch (Exception ex) + { + return retval + 2 * SixLinesPerInch; // couldn't print equation, just print 2 blank lines. + } + return retval; + } private bool _SectionContinuePrinted = false; public bool SectionContinuePrinted @@ -888,6 +915,12 @@ namespace Volian.Print.Library if(DebugText.IsOpen)DebugText.WriteLine("{0},'{1}','{2}','<>'", MyItemInfo.ItemID, MyItemInfo.DBSequence, FormattedText); //Console.WriteLine("{0},{1},'{2}','<>'", MyItemInfo.ItemID, MyItemInfo.DBSequence, IParagraph.Content); float retval = yLocation; + if (MyItemInfo.IsRtfRaw) + { + retval = Rtf2Pdf.TextAt(cb, IParagraph, XOffset, yLocation, Width, 100, DebugInfo + string.Format(",YLines = {0}", YSize / SixLinesPerInch), yBottomMargin); + return retval; + } + // Calvert Alarms have a special case, center text if the next/previous is not the same type of caution or note. // Calvert Alarms have a note1 that is a warning. if a regular note preceeded it, this regular note was not centered. bool doAlign = false; @@ -2838,7 +2871,7 @@ namespace Volian.Print.Library BuildPlacekeeper(parent, itemInfo); // Save step text information to be used to create a Continuous Action Summary - BuildContinuousActionSummary(parent, itemInfo); + BuildContinuousActionSummary(parent, itemInfo); if (itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj != null) _MyBoxLeftAdj = float.Parse(itemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj); @@ -2870,7 +2903,7 @@ namespace Volian.Print.Library // This was commented out to fix a Westinghouse print issue 3-21-2014, orignally put in for Farley //if (itemInfo.IsStepSection && !(itemInfo as SectionInfo).IsSeparatePagination() && itemInfo.MyParent.IsSection) // RefreshDocStyle(); - + XOffset = xoff; if (!MyItemInfo.IsStep && !MyItemInfo.IsStepSection && MyItemInfo.MyContent.MyEntry != null) { @@ -3326,6 +3359,14 @@ namespace Volian.Print.Library yoff = (float)Math.Ceiling(yoff); ProfileTimer.Pop(profileDepth1); } + else if (itemInfo.IsRtfRaw) + { + CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo); + YOffset = yoff; + yoff += Height * .6f; // .6 is used as a scale factor in RtfRawAt (rtf2pdf). Use it here too for moving down page after equation. + yoff = (float)Math.Ceiling(yoff); + yoff += AdjustForBlankLines(); + } else if (itemInfo.IsFigure) // if a figure we've got to determine the size: { int profileDepth2 = ProfileTimer.Push(">>>> Before vlnParagraph.Figure"); @@ -3437,7 +3478,7 @@ namespace Volian.Print.Library } yoff = AdjustLocIfLongerRNO(itemInfo, yoff, yoffRightParent); bool noborder = MyItemInfo.FormatStepData.Type.ToUpper().Contains("BORDERLESS"); - yoff += (Height + ((noborder ? 2 : 3) * SixLinesPerInch)); + yoff += (Height + ((noborder ? 2 : 3) * SixLinesPerInch)); CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo); } ProfileTimer.Pop(profileDepth2); @@ -3544,7 +3585,7 @@ namespace Volian.Print.Library || (!itemInfo.IsStepSection && itemInfo.MyHLS != null && itemInfo.MyHLS.FormatStepData.UseSmartTemplate && ((itemInfo.Steps == null || itemInfo.Steps.Count == 0) || !itemInfo.Steps[0].FormatStepData.StepLayoutData.AlignWithParentTab)) - ||((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.IsSection)) // B2016-222 check if is a caution or note and parent is a section + || ((MyItemInfo.IsNote || MyItemInfo.IsCaution) && MyItemInfo.MyParent.IsSection)) // B2016-222 check if is a caution or note and parent is a section { bool doprint = !(MyPageHelper.DidHLSText && MyItemInfo.ItemID == MyPageHelper.HasHLSTextId); if (MyItemInfo.IsSection) @@ -4272,6 +4313,7 @@ namespace Volian.Print.Library } private void CalculateXOffsetGridOrFigure(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo) { + float scale = itemInfo.IsRtfRaw ? 0.6f : 0; bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER"); vlnParagraph hls1 = MyParent; if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) @@ -4306,7 +4348,7 @@ namespace Volian.Print.Library XOffset = XOffset - (this.Width / 2) + (float)itemInfo.MyDocStyle.Layout.LeftMargin; } else if (itemInfo.RNOLevel != 0) // RNO - XOffset = MyParent.XOffset + MyParent.Width / 2 - Width / 2; + XOffset = MyParent.XOffset + (MyParent.Width / 2) - ((scale * Width) / 2); else if (aerTableOrFigure) { // if in the BGE alarm format and the hls is a Window (upper right corner when it prints), use the parent of the table @@ -4325,7 +4367,7 @@ namespace Volian.Print.Library // Add in 1/2 of the width of all RNO columns XOffset += (colR * itemInfo.ColumnMode) / 2; - if (!aerTableOrFigure) + if (!aerTableOrFigure && !MyItemInfo.IsRtfRaw) { // 05/14/12 - 16bit code adjusts the center depending upon the CPI of the table font. // Start with XOffset of table, then calculate the XOffset adjusted for the table font, @@ -4371,9 +4413,13 @@ namespace Volian.Print.Library XOffset = xLowerLimit; // if the right margin exceeds the right edge of the rightmost RNO, then adjust right edge to match. - if (XOffset + Width > xUpperLimit) + // In lines below, the 12 was used for Wolf Creek 2 column format, the pagewidth goes beyond the right border line so that + // the tables, figures & equations were beyond the border. -12 takes it enough so that if boxed, it won't print out of border + // We know this is not ideal. + if (MyItemInfo.IsRtfRaw && (XOffset + (scale * Width) > xUpperLimit-12)) + XOffset = xUpperLimit - (scale * Width) - 12; + if (!MyItemInfo.IsRtfRaw && XOffset + Width > xUpperLimit) XOffset = xUpperLimit - Width; - // because of the above, if it pushes beyond the left margin, use the left margin. if (XOffset < (float)itemInfo.MyDocStyle.Layout.LeftMargin) XOffset = XOffsetBox = (float)itemInfo.MyDocStyle.Layout.LeftMargin; @@ -5526,6 +5572,13 @@ namespace Volian.Print.Library else Width = MyParent.Width; } + else if (itemInfo.IsRtfRaw) // this needs to be before the check for 'IsTablePart' - the rtfraw may be a table part, but the size is defined by raw rtf + { + System.Drawing.Size sz = RtfRawItem.GetRtfRawSize(MyItemInfo.MyContent.Text); + Height = sz.Height; + Width = sz.Width; + Rtf = MyItemInfo.MyContent.Text; + } else if (itemInfo.IsTablePart) { Width = 72 * 7; // TODO: Need to determine the Width of the Table based upon the contents