Compare commits
	
		
			13 Commits
		
	
	
		
			C2024-047
			...
			F2025-030_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f3c8c860f5 | |||
| f7b27142c4 | |||
| 4fc37c54c5 | |||
| 849e1e57dd | |||
| c768ca5eba | |||
| c9516d90e9 | |||
| 327aae687a | |||
| 3cbe4617eb | |||
| de69fe6b6f | |||
| e53101dacb | |||
| e87b233713 | |||
| ca38ecb1cf | |||
| 5dfa70dc10 | 
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -1099,7 +1099,9 @@ namespace VEPROMS
 | 
				
			|||||||
					(int)changeBarData.FixedChangeColumn :
 | 
										(int)changeBarData.FixedChangeColumn :
 | 
				
			||||||
					System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 | 
										System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ,".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]);
 | 
				
			||||||
				//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
 | 
									//cbd.MyChangeBarColumn = (int)changeBarData.FixedChangeColumn;
 | 
				
			||||||
				if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 | 
									if (cbd.MyChangeBarText == PrintChangeBarText.UserDef && !string.IsNullOrEmpty(ppTxbxChangeBarUserMsgOne.Text))
 | 
				
			||||||
 | 
										cbd.MyChangeBarMessage = ppTxbxChangeBarUserMsgOne.Text + @"\n" + ppTxbxChangeBarUserMsgTwo.Text;
 | 
				
			||||||
 | 
									else if (cbd.MyChangeBarText == PrintChangeBarText.UserDef)
 | 
				
			||||||
					cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 | 
										cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -188,7 +188,6 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
			this.tabSearchTypes.Controls.Add(this.tabControlPanel5);
 | 
								this.tabSearchTypes.Controls.Add(this.tabControlPanel5);
 | 
				
			||||||
			this.tabSearchTypes.Controls.Add(this.tabControlPanel2);
 | 
								this.tabSearchTypes.Controls.Add(this.tabControlPanel2);
 | 
				
			||||||
			this.tabSearchTypes.Controls.Add(this.tabControlPanel3);
 | 
								this.tabSearchTypes.Controls.Add(this.tabControlPanel3);
 | 
				
			||||||
			this.tabSearchTypes.Controls.Add(this.tabControlPanel1);
 | 
					 | 
				
			||||||
			this.tabSearchTypes.Controls.Add(this.contextMenuBar1);
 | 
								this.tabSearchTypes.Controls.Add(this.contextMenuBar1);
 | 
				
			||||||
			this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top;
 | 
								this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top;
 | 
				
			||||||
			this.tabSearchTypes.Location = new System.Drawing.Point(0, 0);
 | 
								this.tabSearchTypes.Location = new System.Drawing.Point(0, 0);
 | 
				
			||||||
@@ -983,7 +982,6 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
 | 
								this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
 | 
				
			||||||
			this.tabControlPanel1.Controls.Add(this.groupBox1);
 | 
								this.tabControlPanel1.Controls.Add(this.groupBox1);
 | 
				
			||||||
			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
 | 
								this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
 | 
				
			||||||
			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
 | 
					 | 
				
			||||||
			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
 | 
								this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
 | 
				
			||||||
			this.tabControlPanel1.Name = "tabControlPanel1";
 | 
								this.tabControlPanel1.Name = "tabControlPanel1";
 | 
				
			||||||
			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
 | 
								this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
 | 
				
			||||||
@@ -997,6 +995,8 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
			this.tabControlPanel1.Style.GradientAngle = 90;
 | 
								this.tabControlPanel1.Style.GradientAngle = 90;
 | 
				
			||||||
			this.tabControlPanel1.TabIndex = 17;
 | 
								this.tabControlPanel1.TabIndex = 17;
 | 
				
			||||||
			this.tabControlPanel1.TabItem = this.tabIncTrans;
 | 
								this.tabControlPanel1.TabItem = this.tabIncTrans;
 | 
				
			||||||
 | 
								this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
 | 
				
			||||||
 | 
								this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
 | 
				
			||||||
			// 
 | 
								// 
 | 
				
			||||||
			// btnTranCvtSelToTxt
 | 
								// btnTranCvtSelToTxt
 | 
				
			||||||
			// 
 | 
								// 
 | 
				
			||||||
@@ -1732,6 +1732,12 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
			this.Controls.Add(this.xpStepTypes);
 | 
								this.Controls.Add(this.xpStepTypes);
 | 
				
			||||||
			this.Controls.Add(this.xpSetToSearch);
 | 
								this.Controls.Add(this.xpSetToSearch);
 | 
				
			||||||
			this.Controls.Add(this.tabSearchTypes);
 | 
								this.Controls.Add(this.tabSearchTypes);
 | 
				
			||||||
 | 
								this.Controls.Add(this.tabControlPanel1);
 | 
				
			||||||
 | 
								//B2025-056 Click on Incoming Transitions
 | 
				
			||||||
 | 
								// This needs to be part of overall control
 | 
				
			||||||
 | 
								// since if it is part of tabSearchTypes,
 | 
				
			||||||
 | 
								// then when that is disabled, buttons on
 | 
				
			||||||
 | 
								// this will be also
 | 
				
			||||||
			this.Margin = new System.Windows.Forms.Padding(2);
 | 
								this.Margin = new System.Windows.Forms.Padding(2);
 | 
				
			||||||
			this.Name = "DisplaySearch";
 | 
								this.Name = "DisplaySearch";
 | 
				
			||||||
			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
 | 
								this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1857,14 +1857,15 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
				lbSrchResultsIncTrans.Enabled = false;
 | 
									lbSrchResultsIncTrans.Enabled = false;
 | 
				
			||||||
				lbSrchResultsIncTrans.UseWaitCursor = true;
 | 
									lbSrchResultsIncTrans.UseWaitCursor = true;
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			ListBox mylb = sender as ListBox;
 | 
								//B2025-056 Click on Incoming Transitions
 | 
				
			||||||
 | 
								// Clicking on Incoming Transitions
 | 
				
			||||||
 | 
								// will now open that item
 | 
				
			||||||
 | 
								ListBox mylb_lbSrchResults = sender as ListBox;
 | 
				
			||||||
 | 
								ListBoxAdv mylb_lbSrchResultsIncTrans = sender as ListBoxAdv;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			// If the list is being refreshed, then set the selection index to -1 (no selection)
 | 
								// If the list is being refreshed, then set the selection index to -1 (no selection)
 | 
				
			||||||
			// B2022-044: don't set selection to top of list (commented out/changed if)
 | 
								// B2022-044: don't set selection to top of list (commented out/changed if)
 | 
				
			||||||
			//if (mylb != null && _SearchResults.RefreshingList && mylb.SelectedIndex != -1)
 | 
								if ((mylb_lbSrchResults != null || mylb_lbSrchResultsIncTrans != null) && !_SearchResults.RefreshingList)
 | 
				
			||||||
			//	//mylb.SelectedIndex = -1;
 | 
					 | 
				
			||||||
			//else
 | 
					 | 
				
			||||||
			if (mylb != null && !_SearchResults.RefreshingList)
 | 
					 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				_ItemInfo = (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) ? lbSrchResultsIncTrans.SelectedValue as ItemInfo : lbSrchResults.SelectedValue as ItemInfo;
 | 
									_ItemInfo = (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) ? lbSrchResultsIncTrans.SelectedValue as ItemInfo : lbSrchResults.SelectedValue as ItemInfo;
 | 
				
			||||||
				if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null))
 | 
									if ((tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) && (_ItemInfo != null))
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4190,15 +4190,19 @@ namespace Volian.Controls.Library
 | 
				
			|||||||
			if (oring == eEventSource.Keyboard)
 | 
								if (oring == eEventSource.Keyboard)
 | 
				
			||||||
				_OringFlg = 1;
 | 
									_OringFlg = 1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 | 
				
			||||||
			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 | 
								if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 | 
				
			||||||
			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
 | 
								if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
 | 
				
			||||||
 | 
								MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 | 
				
			||||||
			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 | 
								OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 | 
							private void btnPdfQuickCreate_Click(object sender, EventArgs e)
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
 | 
								int selectedSlave = MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave;
 | 
				
			||||||
			if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 | 
								if (MyItemInfo == null) return;   // if creating a pdf before rtb exists, return;
 | 
				
			||||||
			if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
 | 
								if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
 | 
				
			||||||
 | 
								MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = selectedSlave;
 | 
				
			||||||
			OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 | 
								OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user