From 253f2ee2248762ba593a666ad49df67139dfe996 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 11 May 2016 12:26:38 +0000 Subject: [PATCH] Enhanced: remove unnecessary step button enabling code --- .../Volian.Controls.Library/StepTabRibbon.cs | 28 ++++++++---------- .../StepTabRibbon.designer.cs | Bin 524040 -> 526660 bytes .../StepTabRibbon.resx | 6 ++-- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 32488510..528ba0e9 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1211,24 +1211,20 @@ namespace Volian.Controls.Library // it can be deleted: bool allowDel = false; EnhancedDocuments eds = MyItemInfo.GetMyEnhancedDocuments(); - if (!setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0)) - { - allowDel = true; - rbSteps.Enabled = true; //just in case it was disabled, enable it so specific buttons can be turned off/on - btnDelelete.Enabled = true; - itemContainer1.Enabled = false; - btnCpyStp.Enabled = false; - btnStepPaste.Enabled = false; - } - else - { - itemContainer1.Enabled = true; // enable this back on, in case it was turned off above. Other buttons are specifically set for step that is selected. - rbSteps.Enabled = setting; - } - rbnCharacters.Enabled = rbnParagraph.Enabled = rbnSiblings.Enabled = rbnLinks.Enabled = setting; + // note in follow if statements, 'setting' == false when in enhanced document: + if (!setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0)) // this step is in enhanced, but not linked + allowDel = true; // allow delete if not linked + btnCpyStp.Enabled = setting; + btnStepPaste.Enabled = setting; + rbnCharacters.Enabled = rbnParagraph.Enabled = rbnLinks.Enabled = setting; btnCMEdit.Enabled = setting; btnDelStep.Enabled = setting; // context menu item - if (allowDel) btnDelStep.Enabled = true; // enhanced step with no links can be deleted (see above) + btnDelelete.Enabled = setting; + if (allowDel) + { + btnDelStep.Enabled = true; + btnDelelete.Enabled = true; + } btnPageBreak.Enabled = setting; // context menu item btnCMHardSpace.Enabled = btnCMTransition.Enabled = btnCMRO.Enabled = btnCMSymbol.Enabled = setting; btnFindRplDlg.Enabled = setting; // no find replace button is available when in an enhanced document diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 20ddedaf184d22b23a89bb0bf3ee74d781e4a556..c7c71c86b091efb7d634f5646496c04e0536c76f 100644 GIT binary patch delta 3209 zcmZ`+e{56N752UNJwL~B9FrP1OFYL3c%`(f96P^O_(O;zhuRfSd>jEcI6QtD{!G$re_bMLbg zCw1k2-h1cX@0@$icfNBy^uLDjVQ*@;1v00oP2YIBTTeaI0+RvFt{;EDTaUb-gv2H4 zcqRNm4WxccEc*UmuLl3mG^-w6?t$EHVoo2sYsfYHg)JSk#H@PHN0#*c%M%PX#+fx8 z38i9s>Y7(yp6!Cn72`OuSo_u~+$YBn{STJU$j$!ltcMHkrjg$D@R$&hrl=B6|4nC!Fh z>|1n1okeg%&nfBz?`x_9j?X9-y=%e-iFfFpDg(+d0b8K)JZm(TZW^WCi{^O~p84CO z^a;k30c}84J53#?Agr9GKFDFpW}SIpO^0?2L-m_ljX*`HD@cRLtOK_8v$)*AuXbuz z%#e72DcpXRMpe=Qhc43RtAd4H;*jV-Q??zKr2#!ioZ$Gjv-edY=z37ID`l z8m(8`G1^uU+dYu_ggRtwVm5)h!d90$b<$=o%7=oEBNghYTLkqMpQoV_OhqTq2(WAE_kn(O;@(!5lZ9XXv)@- z7P!>M4wc&){S7+}*(OD)n7n7o+8;CJ32`G6|cN#y$=dKHiAx?UbRlEb7X zuag5+0ZdNG=`m7{#+%F307A7HLHfzk+Nk$IVa&HUX+jTynG6*aaYI?C_Bo$fu8d z#09rMXKwk*hq}q0M#%KBrQna0N6-8c(UG4{xE&z_mF=@c@N-P$<9GAe@8~{Ss2^l^ z;tcy%0by{EHp7Qenvf-geS>uK!W!zkrXCfO&I!+W$e08I`yPDFN6BA>!2|IhX>r3t z_$wE<&#*eP53XPP9sRF|HEv}~^Od$E81bC3?>XectWkSS?0x>zil%akzi zlZR->Vk1-81g!(ltL1x88qd8-6OwcbTnHmS{wEr!;NAO~m%{3I=u$D(Z4f)aimW&0 zZP1vsj)QE}NZJq1W7YZ(F(+7JOsFhMDGEbD|4l)@Hpb3aj1VKk-wC+{q;X@XS_9XB zZN(u{oJD?U9%BuL{mmG&^4Jl!VUY;ZBd;8Don^eblPpzk6o~5y9DYs>RWAq;2f@$f zR-So-y;#Z6HCzuU_d((-+?=57ot zbEF4AK+QUfU4aYHDJ{$(|M(Emfl#&bdCNRx~obRV~#ng3*)YZ#nf2bQ!dEJ0{|0pCv+A)-kpA_=j1{424eoTh68o01h zv+#kHnwyls9(hoUq6#d$jYH@m?X>tiVTb%GZI$@fV1*uh8veo#RD22T!g+jLJPB#w Kp&x5k&io%hzOfYm delta 2792 zcmZ`*4Qx|Y6n^*K_xkhNb)|zcWNaOCFya{P+HEZs13IP-fy#(MVhRq6S{z$Rv+nhtd(J!O zyWe-t{j9~aZZNO?RSP)JPkuz3{oU|m`XS6Y`^RiuQwyc6dnW$S$ zsw)whb+B2B{pHde){9zaPp($f6$bAQ)Tvc>PZt4HZGTrdUdL4Jf$lK+JG7O!;EPM<*iC%OHYm#J?BnrI$Ljt$IenaxXYAD z(0PVt!}VIW4Pw1Cpm|QIu=WbIaC=V3 z^rbS0_0fAW{!as+;QaUGVUDF#Ta^mTD+q_JBp=!?)6o#TLSwcHOj-mDN&#rNM5l4n zRl3Cq?Z=r+O2y^^=o+L;hb1uU20d&omC6lQc%p_Cg7F z#4?!^9&@uMG?q*L)VsC(aT5$%m5ns>_OYze%@9r_gXk3Ig5nZ390yFJ0NP8~78~M? z)#-)sC#JFYCZ>{an~Sa`3(~nxfyMKf9WI0si*FaO)z-39K^zNubS!_Nha6JieB0PBRa(X>ei~KFa z5i6M(f0n9Hw+1sh`2t;O^WN$qtbFy0^x|~5JOMQm*@MR!-@)7v+)J<8LO1zc3jH5b zA78eQt}NvHYuOuA7nx8s)U6l+9%^i|ZW~;|+LBBjA~wTzrk!UtYvIqnpr*S^i}fJn=Tgz;>8Z9&P%5#?;S zi_NBLxfz5TU){^WQ?fJkfyd90k92JZjw!4V7dHoSTetyB(Qh zcOs8BOeU?iaw(8vF?3HNK3-Qu&)}cCc84QOW`M}1Q8>j zJE}1lkpgFT0Y4kbYj2>~YU;uR3xN8b?J?fmLT?5I;O5ob`L*46D0 z(7K@d3QE8E6V^I}oMKFgEl#NIVBwKP%z;P;Qa$HW)@oA%NRuGUy1}M^_jBfe2YzPG zcO9|{O<%H?^bwSzQ3z&z$$Y%(D>f)YPdD3+r&-QlIl=yrSx8Lt{`~kURszevWk(_B zPhuec*l~6R&v#(Ijf5JiSJl#A-2&n_@GX{3x2(UqX~y@3WB|xi&yb&8^O4%W;p=K(dR4?CKV^GY~ zAv+=Wh}?ux{x7HhusoGtI3j1y7r=^P6?ZFkC~+ynySm=$gsu2)#RblKW`ff$MNDX+ zj$4|ZTXDelEF}%>4`XzOV~ga*C{Crsausz=5$it43NS zy(ra5PfBy8B~m^9Jq6@C%TmPBQs~}9CWy_6=)cGCdQffNm{BfO>81GaEmesAI9@Wx xTuwx>PUw5c98Ggytbh%3&2i|OXI@}jESlz-EA?SgJl|XiUR>wV`R1Mj{{iVQ5~u(G diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx index 2c80be53..e021848c 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx @@ -163,6 +163,9 @@ SUVORK5CYII= + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -450,9 +453,6 @@ 9kWBSJuCuX9alNti8QCg2VymyS/TsYX/CgDuFyf/5MBm5HpaAAAAAElFTkSuQmCC - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8