Compare commits
105 Commits
C2024-041-
...
1cf7d81aa5
Author | SHA1 | Date | |
---|---|---|---|
1cf7d81aa5 | |||
f11a9536f0 | |||
c7bdcf0104 | |||
df026499d5 | |||
a3aa4157b8 | |||
8f3268e1bc | |||
5721d440e9 | |||
505c396283 | |||
643e6bc94f | |||
76502e6d97 | |||
851a0b3810 | |||
fd8dbb4c8b | |||
4ffd994c5e | |||
a34828113a | |||
461329468c | |||
35de5df04d | |||
4f0548fd60 | |||
5c1d96cc51 | |||
57049c0c52 | |||
31326e1c91 | |||
3c60994a0a | |||
773cc42346 | |||
f46a1f39dc | |||
b7175bf77f | |||
ec22232aa8 | |||
f303cd2236 | |||
f40cef4416 | |||
fbca97d38d | |||
28bd2cba5c | |||
4b35f73bbf | |||
f4706eb126 | |||
21bcb90558 | |||
ae48ac0cae | |||
cb4979d5bc | |||
7d3ae74e1f | |||
9d680aa500 | |||
0d50b1c2fe | |||
75e034863f | |||
3b42de1571 | |||
668472286e | |||
e00d34c99d | |||
9fb496dfb3 | |||
f4eaa4a3ef | |||
5d50ed6bdf | |||
d7ace4eaf9 | |||
16a4d335ea | |||
ba69bb0772 | |||
455940caa2 | |||
439344757e | |||
ad912691c9 | |||
237144aff6 | |||
810332d558 | |||
f8431d0ba1 | |||
57c3bfa16a | |||
61f1077608 | |||
8877e968b9 | |||
4575c90bee | |||
21279a87ae | |||
3d5ad4a17e | |||
9bb7b044a8 | |||
dc8f2f7561 | |||
829dbf84da | |||
7b156c17f8 | |||
cbf7cbc164 | |||
b04faa816e | |||
517ebe2902 | |||
03d0d314e3 | |||
3e804c5cce | |||
ee2b8b538e | |||
fdfd34fe92 | |||
2d6fb6523b | |||
3084bf3982 | |||
5ba51e8392 | |||
fb5eb43e34 | |||
b154056276 | |||
c67b8f9ca1 | |||
95e4181360 | |||
32dffbe56b | |||
6b3c8d373b | |||
db29107f47 | |||
355537f2ab | |||
0729ef0c21 | |||
6fe82bfd0f | |||
39bf072363 | |||
da7c384fd8 | |||
95130fd9a0 | |||
978e2344a3 | |||
c9bf45602c | |||
aa160b2036 | |||
f82b32d351 | |||
e519dc9a57 | |||
f020c37db9 | |||
5a4ec3b6b1 | |||
2602d6c9d2 | |||
ff403583d7 | |||
c5577cc2bd | |||
78be6e5dc1 | |||
b954a41375 | |||
0100a11cfe | |||
04cf2e8534 | |||
be00724818 | |||
274d93c61a | |||
7dc4c30436 | |||
028ef4bc31 | |||
42124d65c7 |
Binary file not shown.
@@ -42,7 +42,7 @@ namespace VEPROMS
|
||||
this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
|
||||
this.tcSysOpts = new DevComponents.DotNetBar.TabControl();
|
||||
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.cbUCFLUseAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
this.cbUCFLOnlyImport = new DevComponents.DotNetBar.Controls.CheckBoxX();
|
||||
@@ -86,7 +86,7 @@ namespace VEPROMS
|
||||
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
|
||||
this.tcSysOpts.SuspendLayout();
|
||||
this.tabControlPanel3.SuspendLayout();
|
||||
//this.grPanUCFImpOpt.SuspendLayout(); // C2024-041 remove from Options panel in V button.
|
||||
this.grPanUCFImpOpt.SuspendLayout();
|
||||
this.gpVisioPath.SuspendLayout();
|
||||
this.gpSeparateWindows.SuspendLayout();
|
||||
this.gpEnhancedDocs.SuspendLayout();
|
||||
@@ -305,7 +305,7 @@ namespace VEPROMS
|
||||
//
|
||||
this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
|
||||
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.gpSeparateWindows);
|
||||
this.tabControlPanel3.Controls.Add(this.gpEnhancedDocs);
|
||||
@@ -334,50 +334,48 @@ namespace VEPROMS
|
||||
//
|
||||
// grPanUCFImpOpt
|
||||
//
|
||||
// C2024-041 remove from Options panel in V button.
|
||||
/*this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; // C2024-041 remove from Options panel in V button.
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly); // C2024-041 remove from Options panel in V button.
|
||||
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.cbUCFLNotUsed);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
|
||||
this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
|
||||
this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
|
||||
this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
|
||||
this.grPanUCFImpOpt.CanvasColor = System.Drawing.SystemColors.Control;
|
||||
this.grPanUCFImpOpt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLForSetOnly);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLUseAll);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLOnlyImport);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
|
||||
this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
|
||||
this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
|
||||
this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
|
||||
this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
|
||||
this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
|
||||
//
|
||||
//
|
||||
//
|
||||
this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
|
||||
this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90;
|
||||
this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
|
||||
this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderBottomWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderLeftWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderRightWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderTopWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.CornerDiameter = 4;
|
||||
this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
||||
this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
|
||||
this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
|
||||
this.grPanUCFImpOpt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
|
||||
this.grPanUCFImpOpt.Style.BackColorGradientAngle = 90;
|
||||
this.grPanUCFImpOpt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
|
||||
this.grPanUCFImpOpt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderBottomWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.grPanUCFImpOpt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderLeftWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderRightWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
|
||||
this.grPanUCFImpOpt.Style.BorderTopWidth = 1;
|
||||
this.grPanUCFImpOpt.Style.CornerDiameter = 4;
|
||||
this.grPanUCFImpOpt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
||||
this.grPanUCFImpOpt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
|
||||
this.grPanUCFImpOpt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||
this.grPanUCFImpOpt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.grPanUCFImpOpt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
//
|
||||
//
|
||||
//
|
||||
this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.grPanUCFImpOpt.TabIndex = 12;
|
||||
this.grPanUCFImpOpt.Text = "UCF Import Options";
|
||||
*/ // C2024-041 remove from Options panel in V button.
|
||||
this.grPanUCFImpOpt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
|
||||
this.grPanUCFImpOpt.TabIndex = 12;
|
||||
this.grPanUCFImpOpt.Text = "UCF Import Options";
|
||||
//
|
||||
// cbUCFLForSetOnly
|
||||
//
|
||||
@@ -1265,7 +1263,7 @@ namespace VEPROMS
|
||||
((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit();
|
||||
this.tcSysOpts.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.gpSeparateWindows.ResumeLayout(false);
|
||||
this.gpEnhancedDocs.ResumeLayout(false);
|
||||
@@ -1325,8 +1323,8 @@ namespace VEPROMS
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbSeparateWindows;
|
||||
private DevComponents.DotNetBar.Controls.GroupPanel gpVisioPath;
|
||||
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.CheckBoxX cbUCFLForSetOnly;
|
||||
private DevComponents.DotNetBar.Controls.GroupPanel grPanUCFImpOpt;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLForSetOnly;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLUseAll;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
|
||||
private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed;
|
||||
|
@@ -2118,45 +2118,24 @@ namespace VEPROMS
|
||||
InitializeSecurity();
|
||||
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
|
||||
btnFormats = new ButtonItem("btnFormats", "Formats");
|
||||
btnAdmin.SubItems.Add(btnSecurity);
|
||||
// btnAdmin.SubItems.Add(btnFormats); // C2024 - 041 remove from Admin(V button) menu
|
||||
btnAdmin.SubItems.Add(btnUpdateFormats); // C2024 - 041 remove from Admin(V button) menu
|
||||
btnAdmin.SubItems.Add(btnFormats);
|
||||
btnUserControlOfFormats = new ButtonItem("btnUserControlOfFormats", "User Control of Formats");
|
||||
//btnFormats.SubItems.Add(btnUpdateFormats);
|
||||
//btnFormats.SubItems.Add(btnUserControlOfFormats); // C2024-041 remove from Admin (V button) menu
|
||||
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); // C2024-041 remove from Admin (V button) menu
|
||||
btnFormats.SubItems.Add(btnUserControlOfFormatsExport);
|
||||
btnUserControlOfFormatsExport.Click += new EventHandler(btnUserControlOfFormatsExport_Click);
|
||||
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);
|
||||
btnManageSecurity = new ButtonItem("btnManageSecurity", "Manage Security");
|
||||
btnSecurity.SubItems.Add(btnManageSecurity);
|
||||
btnManageSecurity.Click += new EventHandler(btnManageSecurity_Click);
|
||||
|
||||
|
||||
//added by jcb: menu item to reset security requires password to implement
|
||||
btnResetSecurity = new ButtonItem("btnResetSecurity", "Reset Security");
|
||||
btnSecurity.SubItems.Add(btnResetSecurity);
|
||||
|
Reference in New Issue
Block a user