diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
index 806ee734..91ae4fac 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs
@@ -372,6 +372,8 @@ namespace ROEditor
private System.Windows.Forms.TreeView roTreeView;
private System.Windows.Forms.ListView roListView;
private System.Windows.Forms.ToolBar tbar;
+
+ //this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
private bool _duplicate_active;
private bool duplicate_active
{
@@ -1281,7 +1283,16 @@ namespace ROEditor
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
this.imageListRoTree = new System.Windows.Forms.ImageList(this.components);
this.splitter1 = new System.Windows.Forms.Splitter();
- this.mainMenu1 = new System.Windows.Forms.MainMenu(this.components);
+ this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+ this.rbtnSave = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnCancel = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnRestore = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnSaveAs = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnDuplicate = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnZoom = new DevComponents.DotNetBar.ButtonItem();
+ this.rbtnSymbols = new DevComponents.DotNetBar.ButtonItem();
+ this.mainMenu1 = new System.Windows.Forms.MainMenu(this.components);
this.menuRO = new System.Windows.Forms.MenuItem();
this.menuRONew = new System.Windows.Forms.MenuItem();
this.menuNewGroup = new System.Windows.Forms.MenuItem();
@@ -1323,10 +1334,60 @@ namespace ROEditor
this.lblDuplicateRO = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.SuspendLayout();
- //
- // imageListRoTree
- //
- this.imageListRoTree.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListRoTree.ImageStream")));
+ //
+ //
+ // DotNetBar
+
+ //
+ //
+ //
+ this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonControl1.CaptionVisible = true;
+ this.ribbonControl1.Controls.Add(this.ribbonPanel1);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel2);
+ this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ribbonControl1.ForeColor = System.Drawing.Color.Black;
+ //this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ //this.qatCustomizeItem1});
+ this.ribbonControl1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+ this.ribbonControl1.Location = new System.Drawing.Point(0, 0);
+ this.ribbonControl1.Name = "ribbonControl1";
+ this.ribbonControl1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.rbtnSave,
+ this.rbtnCancel,
+ this.rbtnRestore,
+ this.rbtnSaveAs,
+ this.rbtnDuplicate,
+ this.rbtnZoom,
+ this.rbtnSymbols});
+ this.ribbonControl1.Size = new System.Drawing.Size(800, 50);
+ this.ribbonControl1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+ this.ribbonControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+ this.ribbonControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+ this.ribbonControl1.SystemText.QatCustomizeMenuLabel = "Customize Quick Access Toolbar";
+ this.ribbonControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+ this.ribbonControl1.SystemText.QatDialogAddButton = "&Add >>";
+ this.ribbonControl1.SystemText.QatDialogCancelButton = "Cancel";
+ this.ribbonControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+ this.ribbonControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+ this.ribbonControl1.SystemText.QatDialogOkButton = "OK";
+ this.ribbonControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+ this.ribbonControl1.SystemText.QatDialogRemoveButton = "&Remove";
+ this.ribbonControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+ this.ribbonControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+ this.ribbonControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+ this.ribbonControl1.TabGroupHeight = 14;
+ this.ribbonControl1.TabIndex = 0;
+ this.ribbonControl1.Text = "ribbonControl1";
+
+ //
+ //
+ //
+ // imageListRoTree
+ //
+ this.imageListRoTree.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageListRoTree.ImageStream")));
this.imageListRoTree.TransparentColor = System.Drawing.Color.Transparent;
this.imageListRoTree.Images.SetKeyName(0, "");
this.imageListRoTree.Images.SetKeyName(1, "");
@@ -1580,7 +1641,32 @@ namespace ROEditor
this.tbtnSaveAs,
this.tbtnDuplicate,
this.tbtnZoom});
- this.tbar.DropDownArrows = true;
+ //
+ //
+ //
+ this.ribbonControl1.Controls.Add(this.ribbonPanel1);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel2);
+ //
+ //
+ //
+ // ribbonControl1
+ //
+ this.ribbonControl1.BackColor = System.Drawing.Color.White;
+ //
+ //
+ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonControl1.CaptionVisible = true;
+ this.ribbonControl1.Controls.Add(this.ribbonPanel1);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel2);
+ this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.ribbonControl1.ForeColor = System.Drawing.Color.Black;
+ //this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ //this.qatCustomizeItem1});
+ this.ribbonControl1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+ this.ribbonControl1.Location = new System.Drawing.Point(0, 0);
+ this.ribbonControl1.Name = "ribbonControl1";
+
+ this.tbar.DropDownArrows = true;
this.tbar.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbar.ImageList = this.imageListToolBar;
this.tbar.Location = new System.Drawing.Point(0, 0);
@@ -1590,10 +1676,65 @@ namespace ROEditor
this.tbar.TabIndex = 0;
this.tbar.TextAlign = System.Windows.Forms.ToolBarTextAlign.Right;
this.tbar.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tbar_OnClick);
- //
- // tbtnSave
- //
- this.tbtnSave.Enabled = false;
+
+ // ribbonPanel1
+ //
+ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel1.Controls.Add(this.ribbonBar1);
+ this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel1.Location = new System.Drawing.Point(0, 0);
+ this.ribbonPanel1.Name = "ribbonPanel1";
+ this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 2);
+ this.ribbonPanel1.Size = new System.Drawing.Size(800, 154);
+ //
+ //
+ //
+ this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel1.TabIndex = 1;
+
+ //
+ // ribbonBar1
+ //
+ this.ribbonBar1.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.ContainerControlProcessDialogKey = true;
+ this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar1.DragDropSupport = true;
+ this.ribbonBar1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+ this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar1.Name = "ribbonBar1";
+ this.ribbonBar1.Size = new System.Drawing.Size(794, 25);
+ this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar1.TabIndex = 0;
+ this.ribbonBar1.Text = "ribbonBar1";
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+
+ //
+ // tbtnSave
+ //
+ this.tbtnSave.Enabled = false;
this.tbtnSave.ImageIndex = 0;
this.tbtnSave.Name = "tbtnSave";
this.tbtnSave.Text = "Save";
@@ -1663,8 +1804,9 @@ namespace ROEditor
this.Controls.Add(this.panel1);
this.Controls.Add(this.splitter1);
this.Controls.Add(this.roTreeView);
- this.Controls.Add(this.tbar);
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ //this.Controls.Add(this.tbar);
+ this.Controls.Add(this.ribbonControl1);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Menu = this.mainMenu1;
this.Name = "Form1";
this.Text = "RO Edit";
@@ -1672,8 +1814,73 @@ namespace ROEditor
this.ResumeLayout(false);
this.PerformLayout();
+ //
+ // rbtnSave
+ //
+ this.rbtnSave.Name = "rbtnSave";
+ this.rbtnSave.Text = "Save";
+ //this.rbtnSave.Click += new System.EventHandler(this.rbtnSave_Click);
+ //this.rbtnSave.
+ //
+ //
+ // rbtnCancel
+ //
+ this.rbtnCancel.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.rbtnCancel.Name = "rbtnCancel";
+ this.rbtnCancel.SubItemsExpandWidth = 24;
+ this.rbtnCancel.Text = "Cancel";
+ //
+ // rbtnRestore
+ //
+ this.rbtnRestore.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.rbtnRestore.Name = "rbtnRestore";
+ this.rbtnRestore.SubItemsExpandWidth = 24;
+ this.rbtnRestore.Text = "Restore";
+ //
+ // rbtnSaveAs
+ //
+ this.rbtnSaveAs.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.rbtnSaveAs.Name = "rbtnSaveAs";
+ this.rbtnSaveAs.SubItemsExpandWidth = 24;
+ this.rbtnSaveAs.Text = "Save As";
+ //
+ // rbtnDuplicate
+ //
+ this.rbtnDuplicate.BeginGroup = true;
+ this.rbtnDuplicate.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.rbtnDuplicate.Name = "rbtnDuplicate";
+ this.rbtnDuplicate.SubItemsExpandWidth = 24;
+ this.rbtnDuplicate.Text = "Duplicate";
+ //
+ // rbtnZoom
+ //
+ this.rbtnZoom.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.rbtnZoom.Name = "rbtnZoom";
+ this.rbtnZoom.SubItemsExpandWidth = 24;
+ this.rbtnZoom.Text = "Zoom";
+ //
+ //
+ // tbtnSymbols
+ //
+ this.rbtnSymbols.KeyTips = "CS";
+ this.rbtnSymbols.Name = "rbtnSymbols";
+ this.rbtnSymbols.SubItemsExpandWidth = 14;
+ this.rbtnSymbols.Text = "Symbol";
+
}
+ private DevComponents.DotNetBar.RibbonControl ribbonControl1;
+ private DevComponents.DotNetBar.RibbonPanel ribbonPanel1;
+ private DevComponents.DotNetBar.RibbonBar ribbonBar1;
+ private DevComponents.DotNetBar.RibbonPanel ribbonPanel2;
+ private DevComponents.DotNetBar.ButtonItem rbtnCancel;
+ private DevComponents.DotNetBar.ButtonItem rbtnRestore;
+ private DevComponents.DotNetBar.ButtonItem rbtnSaveAs;
+ private DevComponents.DotNetBar.ButtonItem rbtnDuplicate;
+ private DevComponents.DotNetBar.ButtonItem rbtnZoom;
+ private DevComponents.DotNetBar.ButtonItem rbtnSymbols;
+ private DevComponents.DotNetBar.ButtonItem rbtnSave;
+
//Cut/Paste (Move ROs) added as part of CSM-C2024-027 / Part of 2024 PROMS Upgrades
private void menuROCut_Click(object sender, EventArgs e)
{
diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
index 69260b95..3fc441b9 100644
--- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
+++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.csproj
@@ -108,6 +108,10 @@
false
+
+ False
+ ..\..\..\..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.6Build\DevComponents.DotNetBar2.dll
+
System