Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing
2009-03-05 16:05:33 +00:00
parent 8a343e24eb
commit 768561ca7a
5 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PROMS/Volian.Controls.Library/DisplayTags.cs
View File

@@ -182,7 +182,7 @@ namespace Volian.Controls.Library
private int DoListStepTypes(FormatData fmtdata, StepData topType, string curType)
{
int cursel=-1;
List<StepDataRetval> sdl = fmtdata.StepGetLevelTypes(topType, ref cursel, curType, _CurItemInfo);
List<StepDataRetval> sdl = fmtdata.StepGetLevelTypes(false, topType, ref cursel, curType, _CurItemInfo);
if (sdl==null || sdl.Count==0)
{
if (listBoxStepTypes.Items.Count==0)lblNoTypeChgReason.Text = topType.StepEditData.TypeMenu.NoChgReason;

73
PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs generated
View File

@@ -62,8 +62,9 @@ namespace Volian.Controls.Library
this.groupPanelBtns.Controls.Add(this.btnTranSave);
this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
this.groupPanelBtns.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelBtns.Name = "groupPanelBtns";
this.groupPanelBtns.Size = new System.Drawing.Size(376, 42);
this.groupPanelBtns.Size = new System.Drawing.Size(501, 52);
//
//
//
@@ -92,8 +93,8 @@ namespace Volian.Controls.Library
this.btnTranCancel.AutoSize = true;
this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
this.btnTranCancel.Location = new System.Drawing.Point(407, 0);
this.btnTranCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnTranCancel.Name = "btnTranCancel";
this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
this.btnTranCancel.TabIndex = 25;
@@ -107,6 +108,7 @@ namespace Volian.Controls.Library
this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left;
this.btnTranSave.Location = new System.Drawing.Point(0, 0);
this.btnTranSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTranSave.Name = "btnTranSave";
this.btnTranSave.Size = new System.Drawing.Size(103, 36);
this.btnTranSave.TabIndex = 24;
@@ -119,9 +121,10 @@ namespace Volian.Controls.Library
this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 42);
this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 52);
this.groupPanelTranFmt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelTranFmt.Name = "groupPanelTranFmt";
this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 112);
this.groupPanelTranFmt.Size = new System.Drawing.Size(501, 138);
//
//
//
@@ -150,9 +153,11 @@ namespace Volian.Controls.Library
this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
this.listBoxTranFmt.FormattingEnabled = true;
this.listBoxTranFmt.HorizontalScrollbar = true;
this.listBoxTranFmt.ItemHeight = 16;
this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0);
this.listBoxTranFmt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.listBoxTranFmt.Name = "listBoxTranFmt";
this.listBoxTranFmt.Size = new System.Drawing.Size(370, 82);
this.listBoxTranFmt.Size = new System.Drawing.Size(495, 100);
this.listBoxTranFmt.TabIndex = 13;
this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click);
//
@@ -162,9 +167,10 @@ namespace Volian.Controls.Library
this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 154);
this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 190);
this.groupPanelTransitionSets.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
this.groupPanelTransitionSets.Size = new System.Drawing.Size(501, 59);
//
//
//
@@ -192,8 +198,9 @@ namespace Volian.Controls.Library
//
this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.vlnTreeComboSets.Name = "vlnTreeComboSets";
this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
this.vlnTreeComboSets.Size = new System.Drawing.Size(495, 24);
this.vlnTreeComboSets.TabIndex = 33;
this.vlnTreeComboSets.Value = null;
this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
@@ -204,9 +211,10 @@ namespace Volian.Controls.Library
this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 202);
this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 249);
this.groupPanelTransitionProcs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
this.groupPanelTransitionProcs.Size = new System.Drawing.Size(501, 57);
//
//
//
@@ -235,8 +243,9 @@ namespace Volian.Controls.Library
this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill;
this.cbTranProcs.FormattingEnabled = true;
this.cbTranProcs.Location = new System.Drawing.Point(0, 0);
this.cbTranProcs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbTranProcs.Name = "cbTranProcs";
this.cbTranProcs.Size = new System.Drawing.Size(370, 21);
this.cbTranProcs.Size = new System.Drawing.Size(495, 24);
this.cbTranProcs.TabIndex = 14;
this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged);
//
@@ -246,9 +255,10 @@ namespace Volian.Controls.Library
this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 248);
this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 306);
this.groupPanelTransitionSect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
this.groupPanelTransitionSect.Size = new System.Drawing.Size(501, 60);
//
//
//
@@ -277,8 +287,9 @@ namespace Volian.Controls.Library
this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill;
this.cbTranSects.FormattingEnabled = true;
this.cbTranSects.Location = new System.Drawing.Point(0, 0);
this.cbTranSects.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cbTranSects.Name = "cbTranSects";
this.cbTranSects.Size = new System.Drawing.Size(370, 21);
this.cbTranSects.Size = new System.Drawing.Size(495, 24);
this.cbTranSects.TabIndex = 20;
this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
@@ -290,9 +301,10 @@ namespace Volian.Controls.Library
this.groupPanelTranstionSteps.Controls.Add(this.tvTran);
this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 297);
this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
this.groupPanelTranstionSteps.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 379);
this.groupPanelTranstionSteps.Size = new System.Drawing.Size(501, 466);
//
//
//
@@ -320,9 +332,10 @@ namespace Volian.Controls.Library
//
this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
this.tvTran.HideSelection = false;
this.tvTran.Location = new System.Drawing.Point(0, 46);
this.tvTran.Location = new System.Drawing.Point(0, 57);
this.tvTran.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tvTran.Name = "tvTran";
this.tvTran.Size = new System.Drawing.Size(370, 312);
this.tvTran.Size = new System.Drawing.Size(495, 386);
this.tvTran.TabIndex = 31;
this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
//
@@ -333,17 +346,19 @@ namespace Volian.Controls.Library
this.pnlTranStepBtns.Controls.Add(this.btnUp1);
this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top;
this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0);
this.pnlTranStepBtns.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pnlTranStepBtns.Name = "pnlTranStepBtns";
this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46);
this.pnlTranStepBtns.Size = new System.Drawing.Size(495, 57);
this.pnlTranStepBtns.TabIndex = 30;
//
// lblxTranRangeTip
//
this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right;
this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0);
this.lblxTranRangeTip.Location = new System.Drawing.Point(355, 0);
this.lblxTranRangeTip.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lblxTranRangeTip.Name = "lblxTranRangeTip";
this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46);
this.lblxTranRangeTip.Size = new System.Drawing.Size(140, 57);
this.lblxTranRangeTip.TabIndex = 33;
this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range";
//
@@ -352,9 +367,10 @@ namespace Volian.Controls.Library
this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left;
this.btnTranRangeClear.Location = new System.Drawing.Point(43, 0);
this.btnTranRangeClear.Location = new System.Drawing.Point(57, 0);
this.btnTranRangeClear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTranRangeClear.Name = "btnTranRangeClear";
this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46);
this.btnTranRangeClear.Size = new System.Drawing.Size(77, 57);
this.btnTranRangeClear.TabIndex = 31;
this.btnTranRangeClear.Text = "Clear Range Selection";
this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click);
@@ -366,14 +382,15 @@ namespace Volian.Controls.Library
this.btnUp1.Dock = System.Windows.Forms.DockStyle.Left;
this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS;
this.btnUp1.Location = new System.Drawing.Point(0, 0);
this.btnUp1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUp1.Name = "btnUp1";
this.btnUp1.Size = new System.Drawing.Size(43, 46);
this.btnUp1.Size = new System.Drawing.Size(57, 57);
this.btnUp1.TabIndex = 30;
this.btnUp1.Click += new System.EventHandler(this.btnUp1_Click);
//
// DisplayTransition
//
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.groupPanelTranstionSteps);
this.Controls.Add(this.groupPanelTransitionSect);
@@ -381,9 +398,9 @@ namespace Volian.Controls.Library
this.Controls.Add(this.groupPanelTransitionSets);
this.Controls.Add(this.groupPanelTranFmt);
this.Controls.Add(this.groupPanelBtns);
this.Margin = new System.Windows.Forms.Padding(2);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "DisplayTransition";
this.Size = new System.Drawing.Size(376, 676);
this.Size = new System.Drawing.Size(501, 832);
this.groupPanelBtns.ResumeLayout(false);
this.groupPanelBtns.PerformLayout();
this.groupPanelTranFmt.ResumeLayout(false);

2
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@@ -707,7 +707,7 @@ namespace Volian.Controls.Library
}
private void btnTranSave_Click(object sender, EventArgs e)
{
string trantxt = "{Resolved Transition Text}";
string trantxt = "*Resolved Transition Text*";
string linktxt = null;
E_TransUI etm = (E_TransUI)_CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[listBoxTranFmt.SelectedIndex].TransUI;
// if must have a step, test for this first.

2
PROMS/Volian.Controls.Library/Properties/Resources.Designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.1433
// Runtime Version:2.0.50727.1434
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

28
PROMS/Volian.Controls.Library/RTBAPI.cs
View File

@@ -794,6 +794,11 @@ namespace Volian.Controls.Library
}
public static CharFormatTwo GetCharFormat(RichTextBox richTextBox, RTBSelection selection)
{
/*
* You can still call SendMessage, passing the EM_GETCHARFORMAT message.
You just need to check the dwMask field to see which attributes are
consistent throughout the selection.
*/
CharFormat2 cf = new CharFormat2();
cf.cbSize = Marshal.SizeOf(cf);
if (SendMessage(new HandleRef(richTextBox, richTextBox.Handle), Messages.EM_GETCHARFORMAT, selection, ref cf) == 0)
@@ -805,6 +810,14 @@ namespace Volian.Controls.Library
try
{
CharFormat2 cf2 = cft.CharFormat2;
try
{
HandleRef hr = new HandleRef(richTextBox, richTextBox.Handle);
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
if (SendMessage(new HandleRef(richTextBox, richTextBox.Handle), Messages.EM_SETCHARFORMAT, selection, ref cf2) == 0)
throw new Win32Exception();
}
@@ -846,13 +859,15 @@ namespace Volian.Controls.Library
public static bool IsSuperScript(RichTextBox richTextBox)
{
CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
return ((cft.dwEffects & CharFormatEffects.CFE_SUPERSCRIPT) == CharFormatEffects.CFE_SUPERSCRIPT);
return (((cft.dwMask & CharFormatMasks.CFM_SUPERSCRIPT) == CharFormatMasks.CFM_SUPERSCRIPT) &&
((cft.dwEffects & CharFormatEffects.CFE_SUPERSCRIPT) == CharFormatEffects.CFE_SUPERSCRIPT));
}
public static bool IsSubScript(RichTextBox richTextBox)
{
CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
return ((cft.dwEffects & CharFormatEffects.CFE_SUBSCRIPT) == CharFormatEffects.CFE_SUBSCRIPT);
return (((cft.dwMask & CharFormatMasks.CFM_SUBSCRIPT) == CharFormatMasks.CFM_SUBSCRIPT) &&
((cft.dwEffects & CharFormatEffects.CFE_SUBSCRIPT) == CharFormatEffects.CFE_SUBSCRIPT));
}
public static void ToggleSubscript(bool bSet, RichTextBox richTextBox, RTBSelection selection)
{
@@ -885,7 +900,8 @@ namespace Volian.Controls.Library
public static bool IsBold(RichTextBox richTextBox)
{
CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
return ((cft.dwEffects & CharFormatEffects.CFE_BOLD) == CharFormatEffects.CFE_BOLD);
return (((cft.dwMask & CharFormatMasks.CFM_BOLD) == CharFormatMasks.CFM_BOLD) &&
((cft.dwEffects & CharFormatEffects.CFE_BOLD) == CharFormatEffects.CFE_BOLD));
}
public static void ToggleBold(bool bSet, RichTextBox richTextBox, RTBSelection selection)
{
@@ -904,7 +920,8 @@ namespace Volian.Controls.Library
public static bool IsUnderline(RichTextBox richTextBox)
{
CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
return ((cft.dwEffects & CharFormatEffects.CFE_UNDERLINE) == CharFormatEffects.CFE_UNDERLINE);
return (((cft.dwMask & CharFormatMasks.CFM_UNDERLINE) == CharFormatMasks.CFM_UNDERLINE) &&
((cft.dwEffects & CharFormatEffects.CFE_UNDERLINE) == CharFormatEffects.CFE_UNDERLINE));
}
public static void ToggleUnderline(bool bSet, RichTextBox richTextBox, RTBSelection selection)
{
@@ -923,7 +940,8 @@ namespace Volian.Controls.Library
public static bool IsItalic(RichTextBox richTextBox)
{
CharFormatTwo cft = GetCharFormat(richTextBox, RTBSelection.SCF_SELECTION);
return ((cft.dwEffects & CharFormatEffects.CFE_ITALIC) == CharFormatEffects.CFE_ITALIC);
return (((cft.dwMask & CharFormatMasks.CFM_ITALIC) == CharFormatMasks.CFM_ITALIC) &&
((cft.dwEffects & CharFormatEffects.CFE_ITALIC) == CharFormatEffects.CFE_ITALIC));
}
public static void ToggleItalic(bool bSet, RichTextBox richTextBox, RTBSelection selection)
{