diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 46280dba..d904afd9 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -33,6 +33,10 @@ namespace Volian.Controls.Library if (value != null) { MyStepRTB = value.MyStepRTB; + if (value is GridItem) + { + ToggleTableDesignButtons(true); + } } } } @@ -1374,6 +1378,7 @@ namespace Volian.Controls.Library private void btnPdfCreate_Click(object sender, EventArgs e) { if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return; + if (MyEditItem != null) MyEditItem.SaveCurrentAndContents(); OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure)); } #region Table Grid @@ -1576,6 +1581,7 @@ namespace Volian.Controls.Library btnTblDgnPaste.Enabled = enable; btnTblDgnSplitCells.Enabled = enable; btnTblDgnTableBorder.Enabled = enable; + btnTblDgnAdjustSize.Checked = !enable; } private void btnTblDgnAdjustSize_Click(object sender, EventArgs e) { @@ -1585,13 +1591,16 @@ namespace Volian.Controls.Library MyFlexGrid.Cols.Fixed = MyFlexGrid.Cols.Count; MyFlexGrid.Rows.Fixed = MyFlexGrid.Rows.Count; ToggleTableDesignButtons(false); + MyFlexGrid.ListStyles(); } else { // set grid back to "normal" mode MyFlexGrid.Cols.Fixed = 0; MyFlexGrid.Rows.Fixed = 0; + MyFlexGrid.StyleBackColor = Color.White; ToggleTableDesignButtons(true); + MyFlexGrid.ListStyles(); } } #endregion @@ -1681,59 +1690,57 @@ namespace Volian.Controls.Library private void btnTblDgnAlgnTxTopLeft_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalTopText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.LeftTop); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Left); } private void btnTblDgnAlgnTxTopCenter_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalTopText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.CenterTop); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Center); } private void btnTblDgnAlgnTxTopRight_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalTopText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.RightTop); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Right); } private void btnTblDgnAlgnTxCenterLeft_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalCenterText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.LeftCenter); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Left); } private void btnTblDgnAlgnTxCenterCenter_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalCenterText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.CenterCenter); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Center); } private void btnTblDgnAlgnTxCenterRight_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalCenterText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.RightCenter); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Right); } private void btnTblDgnAlgnTxBottomLeft_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalBottomText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.LeftBottom); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Left); } private void btnTblDgnAlgnTxBottomCenter_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalBottomText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.CenterBottom); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Center); } private void btnTblDgnAlgnTxBottomRight_Click(object sender, EventArgs e) { - MyFlexGrid.VerticalBottomText(); + MyFlexGrid.ChangeCellAlign(MyFlexGrid.Selection, C1.Win.C1FlexGrid.TextAlignEnum.RightBottom); MyFlexGrid.RTFTextAlignment(MyFlexGrid.Selection, HorizontalAlignment.Right); } - - } public enum E_FieldToEdit { StepText, Text, Number }; public class StepTabRibbonEventArgs : EventArgs