From 1260ee89dc94ad22daf12ac282535e0af00cfbbd Mon Sep 17 00:00:00 2001 From: John Date: Fri, 18 Dec 2009 14:41:52 +0000 Subject: [PATCH] fixed ribbon and context button enabling for approved procedures --- .../Volian.Controls.Library/StepTabRibbon.cs | 17 +++++++++++------ .../StepTabRibbon.designer.cs | Bin 229366 -> 229356 bytes .../StepTabRibbon.resx | 9 +++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 9f5df64a..7267fc78 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -272,15 +272,16 @@ namespace Volian.Controls.Library btnCMUnderline.Enabled = btnUnderline.Enabled = setting; btnCMSubscript.Enabled = btnSubscript.Enabled = setting; btnCMSuperscript.Enabled = btnSuperscript.Enabled = setting; - btnCMCut.Enabled = btnCMCopy.Enabled = btnCut.Enabled = btnCopy.Enabled = setting; + btnCMCut.Enabled = btnCut.Enabled = setting; btnCMUndo.Enabled = btnUndo.Enabled = setting; btnCMRedo.Enabled = btnRedo.Enabled = setting; btnCMPaste.Enabled = btnPaste.Enabled = setting; + btnCMCopy.Enabled = btnCopy.Enabled = setting; } private void SetButtonMenuEnabledDisabledOnStepType(bool setting) { - btnInsPgBrk.Enabled = setting; - btnChgTyp.Enabled = setting; + btnPageBreak.Enabled = btnInsPgBrk.Enabled = setting; + btnCMChgStep.Enabled = btnChgTyp.Enabled = setting; btnInsHLS.Enabled = btnInsCaut.Enabled = btnInsNote.Enabled = btnInsRNO.Enabled = btnInsFig.Enabled = btnInsTable.Enabled = btnInsSubstep.Enabled = btnInsBefore.Enabled = btnInsAfter.Enabled = setting; btnInsTrans.Enabled = btnCMTransition.Enabled = btnInsRO.Enabled = btnCMRO.Enabled = setting; @@ -316,7 +317,7 @@ namespace Volian.Controls.Library } SetButtonForStyle(); - btnCMCut.Enabled = btnCMCopy.Enabled = btnCut.Enabled = btnCopy.Enabled = _MyStepRTB.SelectionLength > 0; + btnCMCut.Enabled = btnCut.Enabled = _MyStepRTB.SelectionLength > 0; btnCMUndo.Enabled = btnUndo.Enabled = _MyStepRTB.CanUndo; btnCMRedo.Enabled = btnRedo.Enabled = _MyStepRTB.CanRedo; @@ -324,6 +325,8 @@ namespace Volian.Controls.Library IDataObject iData = Clipboard.GetDataObject(); btnCMPaste.Enabled = btnPaste.Enabled = (iData.GetDataPresent(DataFormats.Text) || iData.GetDataPresent(DataFormats.Rtf)); } + // all selected copy while in either Edit or View mode + btnCMCopy.Enabled = btnCopy.Enabled = _MyStepRTB.SelectionLength > 0; // do all Transition and ReferencedObject menu items/buttons based on whether a 'link is selected' and the link type. btnCMGoTo.Enabled = btnGoTo.Enabled = _MyStepRTB.IsSelectionLinked(_MyStepRTB.SelectionStart, _MyStepRTB.SelectionLength); //(_MyStepRTB.MyLinkText != null); @@ -344,6 +347,8 @@ namespace Volian.Controls.Library if (MyStepItem == null) return; DocVersionInfo dvi = MyStepItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; if (dvi == null) return; + if (dvi.VersionType > 127) + btnCMEditMode1.Enabled = btnEditMode.Enabled = false; // in approved if (dvi.VersionType > 127 || MyStepItem.MyStepPanel.PanelViewEditMode == E_ViewMode.View) { SetButtonMenuEnabledDisabledOnStepType(false); @@ -670,8 +675,8 @@ namespace Volian.Controls.Library { string roapp = Environment.GetEnvironmentVariable("roapp"); LinkText lt = new LinkText(_MyStepRTB.MyLinkText); - string roloc = "\"" + lt.MyRoUsageInfo.MyRODb.FolderPath + "\""; - System.Diagnostics.Process.Start(roapp, roloc + " " + lt.MyRoUsageInfo.ROID); + string args = "\"" + lt.MyRoUsageInfo.MyRODb.FolderPath + "\" " + lt.MyRoUsageInfo.ROID.ToLower(); + System.Diagnostics.Process.Start(roapp, args); } } private void btnChgTyp_Click(object sender, EventArgs e) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index cb4bf02907f10ab50cc5975692abbe244ad226e5..f75c9990927a63c0f86073e6cc05e2bc0cba53b2 100644 GIT binary patch delta 508 zcmX|;O-K}B7{~k1#5BCUPU|!*wnR;VCc26(VpN+aPeQQNB_w2aX+15nXy1tJsrBGN zdSIVhNT&!7!boq2*gSP!C^IThL^>>s?MWddd)-NI&&U7yJzu*AZHgc&v6&gV3_ z5J9)|L*d*+m&L^$xZ!G{3iYiMOO`os;woKw-$|Qq6SVwNlAm??ejjYrNTP1xI^(o) zkylfY>f|7{I-# z9diaPOkZy8p;j8Gf@U7wX}Mhc4Z(VV2gk0*rF9e{vCi(F;?xE%@Z_GR{@sI<;Q1+2 zDE~9O7Pj&Ql9!$tu6nozKSJw6#nt{-4B0%mhVvZ!fKc}~@J5uSYbfcOFU}plQSeT$ bIila_@S--N8RnDbNDDfw4OL5;U3dQho{G2X delta 498 zcmYLGze`(D6z1I5K3^}_*Z6pdzxsyQh7v^{4k@IzgdzwIE; zl;WX1YlhOHlp@^1Egkgz2L`QJibDzxA|g&5YBjy@1l7S#qo zpm;h-Zzl|nMc<>~5eQlCTk68#wS{Zxb_p+cExBpsx@hVOxE%1$0E>A`UJO0FLzfN{ z=#I6!srrD~`1RRySsxW6A(4%Kb_}Z}fv59nx@hV|kWEwlNK4?k$6LNb#a z6nK))X@*y=<>h=zZY(BD`j#}(^0e?C=&T=v+UbWWC0Ca|oAf0PGn&Aqn;Tfrz@yqA z6lAsZ?=I~pAs$|Ue#MlZDvh32CWA5g{oR}7ZQYfXpme_#)%Jw+>gJOuq6~nmUUtB& zi@)-m63Z+>wQF$H>=hgXeduQKP_8~|6rA?&m#m3GFuN97drsCcZ2tltpp!@pUvZaYlbj System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + @@ -130,9 +133,6 @@ 2CVVWYKhQwAAAABJRU5ErkJggg== - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -142,9 +142,6 @@ hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8