Compare commits
No commits in common. "eaf2b14cfcef6363a754481571703f222c6b4602" and "1cf7d81aa5070c80e41d7e833a3e68c45df68327" have entirely different histories.
eaf2b14cfc
...
1cf7d81aa5
Binary file not shown.
@ -42,7 +42,7 @@ namespace VEPROMS
|
|||||||
this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
|
this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
|
||||||
this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
|
this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
|
||||||
this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
|
this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
|
||||||
//this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel(); // C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt = new DevComponents.DotNetBar.Controls.GroupPanel();
|
||||||
this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
this.cbUCFLForSetOnly = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||||
this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
this.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||||
this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||||
@ -86,7 +86,7 @@ namespace VEPROMS
|
|||||||
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
|
||||||
this.tcSysOpts.SuspendLayout();
|
this.tcSysOpts.SuspendLayout();
|
||||||
this.tabControlPanel3.SuspendLayout();
|
this.tabControlPanel3.SuspendLayout();
|
||||||
//this.grPanUCFImpOpt.SuspendLayout(); // C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt.SuspendLayout();
|
||||||
this.gpVisioPath.SuspendLayout();
|
this.gpVisioPath.SuspendLayout();
|
||||||
this.gpSeparateWindows.SuspendLayout();
|
this.gpSeparateWindows.SuspendLayout();
|
||||||
this.gpEnhancedDocs.SuspendLayout();
|
this.gpEnhancedDocs.SuspendLayout();
|
||||||
@ -305,7 +305,7 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
|
this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
|
||||||
this.tabControlPanel3.Controls.Add(this.gpShwRplWords);
|
this.tabControlPanel3.Controls.Add(this.gpShwRplWords);
|
||||||
//this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt); // C2024-041 remove from Options panel in V button.
|
this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt);
|
||||||
this.tabControlPanel3.Controls.Add(this.gpVisioPath);
|
this.tabControlPanel3.Controls.Add(this.gpVisioPath);
|
||||||
this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
|
this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
|
||||||
this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs);
|
this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs);
|
||||||
@ -334,11 +334,10 @@ namespace VEPROMS
|
|||||||
//
|
//
|
||||||
// grPanUCFImpOpt
|
// grPanUCFImpOpt
|
||||||
//
|
//
|
||||||
// C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control;
|
||||||
/*this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control;
|
this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||||
this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; // C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly);
|
||||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly); // C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll);
|
||||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll); // C2024-041 remove from Options panel in V button.
|
|
||||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport);
|
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport);
|
||||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
|
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
|
||||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
|
this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
|
||||||
@ -377,7 +376,6 @@ namespace VEPROMS
|
|||||||
this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||||
this.grPanUCFImpOpt.TabIndex = 12;
|
this.grPanUCFImpOpt.TabIndex = 12;
|
||||||
this.grPanUCFImpOpt.Text = "UCF Import Options";
|
this.grPanUCFImpOpt.Text = "UCF Import Options";
|
||||||
*/ // C2024-041 remove from Options panel in V button.
|
|
||||||
//
|
//
|
||||||
// cbUCFLForSetOnly
|
// cbUCFLForSetOnly
|
||||||
//
|
//
|
||||||
@ -1265,7 +1263,7 @@ namespace VEPROMS
|
|||||||
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
|
||||||
this.tcSysOpts.ResumeLayout(false);
|
this.tcSysOpts.ResumeLayout(false);
|
||||||
this.tabControlPanel3.ResumeLayout(false);
|
this.tabControlPanel3.ResumeLayout(false);
|
||||||
//this.grPanUCFImpOpt.ResumeLayout(false); // C2024-041 remove from Options panel in V button.
|
this.grPanUCFImpOpt.ResumeLayout(false);
|
||||||
this.gpVisioPath.ResumeLayout(false);
|
this.gpVisioPath.ResumeLayout(false);
|
||||||
this.gpSeparateWindows.ResumeLayout(false);
|
this.gpSeparateWindows.ResumeLayout(false);
|
||||||
this.gpEnhancedDocs.ResumeLayout(false);
|
this.gpEnhancedDocs.ResumeLayout(false);
|
||||||
@ -1325,7 +1323,7 @@ namespace VEPROMS
|
|||||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows;
|
private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows;
|
||||||
private DevComponents.DotNetBar.Controls.GroupPanel gpVisioPath;
|
private DevComponents.DotNetBar.Controls.GroupPanel gpVisioPath;
|
||||||
private DevComponents.DotNetBar.Controls.TextBoxX txbxVisioPath;
|
private DevComponents.DotNetBar.Controls.TextBoxX txbxVisioPath;
|
||||||
//private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt; // C2024-041 remove from Options panel in V button.
|
private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt;
|
||||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly;
|
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly;
|
||||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLUseAll;
|
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLUseAll;
|
||||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
|
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
|
||||||
|
|||||||
@ -2118,45 +2118,24 @@ namespace VEPROMS
|
|||||||
InitializeSecurity();
|
InitializeSecurity();
|
||||||
UpdateUser();
|
UpdateUser();
|
||||||
|
|
||||||
//btnSecurity = new ButtonItem("btnSecurity", "Security"); // C2019-002: move security & format items into submenus
|
|
||||||
//btnFormats = new ButtonItem("btnFormats", "Formats");
|
|
||||||
//btnAdmin.SubItems.Add(btnSecurity);
|
|
||||||
//btnAdmin.SubItems.Add(btnFormats);
|
|
||||||
//btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
|
|
||||||
//btnFormats.SubItems.Add(btnUpdateFormats);
|
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormats);
|
|
||||||
//btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
|
|
||||||
//btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
|
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
|
|
||||||
//btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
|
|
||||||
//btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
|
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormatsImport);
|
|
||||||
//btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
|
|
||||||
//btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
|
|
||||||
//btnSecurity.SubItems.Add(btnManageSecurity);
|
|
||||||
//btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
|
|
||||||
|
|
||||||
|
|
||||||
btnSecurity = new ButtonItem("btnSecurity", "Security"); // C2019-002: move security & format items into submenus
|
btnSecurity = new ButtonItem("btnSecurity", "Security"); // C2019-002: move security & format items into submenus
|
||||||
btnFormats = new ButtonItem("btnFormats", "Formats");
|
btnFormats = new ButtonItem("btnFormats", "Formats");
|
||||||
btnAdmin.SubItems.Add(btnSecurity);
|
btnAdmin.SubItems.Add(btnSecurity);
|
||||||
// btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu
|
btnAdmin.SubItems.Add(btnFormats);
|
||||||
btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu
|
|
||||||
btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
|
btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
|
||||||
//btnFormats.SubItems.Add(btnUpdateFormats);
|
btnFormats.SubItems.Add(btnUpdateFormats);
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormats); // C2024-041 remove from Admin (V button) menu
|
btnFormats.SubItems.Add(btnUserControlOfFormats);
|
||||||
btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
|
btnUserControlOfFormats.Click += new EventHandler(btnUserControlOfFormats_Click);
|
||||||
btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
|
btnUserControlOfFormatsExport = new ButtonItem("btnUserControlOfFormatsExport", "Export User Control of Formats");
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormatsExport); // C2024-041 remove from Admin (V button) menu
|
btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
|
||||||
btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
|
btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
|
||||||
btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
|
btnUserControlOfFormatsImport = new ButtonItem("btnUserControlOfFormatsImport", "Import User Control of Formats");
|
||||||
//btnFormats.SubItems.Add(btnUserControlOfFormatsImport); // C2024-041 remove from Admin (V button) menu
|
btnFormats.SubItems.Add(btnUserControlOfFormatsImport);
|
||||||
btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
|
btnUserControlOfFormatsImport.Click += new EventHandler(btnUserControlOfFormatsImport_Click);
|
||||||
btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
|
btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
|
||||||
btnSecurity.SubItems.Add(btnManageSecurity);
|
btnSecurity.SubItems.Add(btnManageSecurity);
|
||||||
btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
|
btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
|
||||||
|
|
||||||
|
|
||||||
//added by jcb: menu item to reset security requires password to implement
|
//added by jcb: menu item to reset security requires password to implement
|
||||||
btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
|
btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
|
||||||
btnSecurity.SubItems.Add(btnResetSecurity);
|
btnSecurity.SubItems.Add(btnResetSecurity);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user