개정판 e3ced1c9
dev issue #000 : edit default ui
Change-Id: I26de7f84545f2c6c985189c580c299a7d49b1370
DTI_PID/APIDConverter/AVEVA.PID.CustomizationUtility_ACAD2018_x64.csproj | ||
---|---|---|
70 | 70 |
<HintPath>C:\Program Files\AVEVA\P&ID 12.2.SP1\Install\Exe\AVEVA.PID.GUI.dll</HintPath> |
71 | 71 |
<Private>False</Private> |
72 | 72 |
</Reference> |
73 |
<Reference Include="DevExpress.Data.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> |
|
74 |
<Reference Include="DevExpress.Printing.v18.2.Core, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> |
|
75 |
<Reference Include="DevExpress.Utils.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> |
|
76 |
<Reference Include="DevExpress.XtraBars.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> |
|
77 |
<Reference Include="DevExpress.XtraEditors.v18.2, Version=18.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> |
|
73 | 78 |
<Reference Include="Microsoft.VisualBasic" /> |
74 | 79 |
<Reference Include="PresentationCore" /> |
75 | 80 |
<Reference Include="PresentationFramework" /> |
76 | 81 |
<Reference Include="System" /> |
82 |
<Reference Include="System.ComponentModel.DataAnnotations" /> |
|
77 | 83 |
<Reference Include="System.Core" /> |
78 | 84 |
<Reference Include="System.Drawing" /> |
85 |
<Reference Include="System.Runtime.Remoting" /> |
|
79 | 86 |
<Reference Include="System.Windows.Forms" /> |
80 | 87 |
<Reference Include="System.Xaml" /> |
81 | 88 |
<Reference Include="System.Xml.Linq" /> |
82 | 89 |
<Reference Include="System.Data.DataSetExtensions" /> |
83 | 90 |
<Reference Include="System.Data" /> |
84 | 91 |
<Reference Include="System.Xml" /> |
92 |
<Reference Include="UIAutomationClient" /> |
|
85 | 93 |
<Reference Include="WindowsBase" /> |
86 | 94 |
</ItemGroup> |
87 | 95 |
<ItemGroup> |
... | ... | |
127 | 135 |
<EmbeddedResource Include="Form\MappingForm.resx"> |
128 | 136 |
<DependentUpon>MappingForm.cs</DependentUpon> |
129 | 137 |
</EmbeddedResource> |
138 |
<EmbeddedResource Include="Properties\licenses.licx" /> |
|
130 | 139 |
</ItemGroup> |
131 | 140 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
132 | 141 |
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
DTI_PID/APIDConverter/Form/APIDConverter.Designer.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
private void InitializeComponent() |
30 | 30 |
{ |
31 |
this.button1 = new System.Windows.Forms.Button(); |
|
31 |
this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); |
|
32 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); |
|
32 | 33 |
this.SuspendLayout(); |
33 | 34 |
// |
34 |
// button1
|
|
35 |
// ribbonControl
|
|
35 | 36 |
// |
36 |
this.button1.Location = new System.Drawing.Point(94, 54); |
|
37 |
this.button1.Name = "button1"; |
|
38 |
this.button1.Size = new System.Drawing.Size(75, 23); |
|
39 |
this.button1.TabIndex = 0; |
|
40 |
this.button1.Text = "button1"; |
|
41 |
this.button1.UseVisualStyleBackColor = true; |
|
42 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
37 |
this.ribbonControl.ExpandCollapseItem.Id = 0; |
|
38 |
this.ribbonControl.Items.AddRange(new DevExpress.XtraBars.BarItem[] { |
|
39 |
this.ribbonControl.ExpandCollapseItem}); |
|
40 |
this.ribbonControl.Location = new System.Drawing.Point(0, 0); |
|
41 |
this.ribbonControl.MaxItemId = 1; |
|
42 |
this.ribbonControl.Name = "ribbonControl"; |
|
43 |
this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; |
|
44 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
|
45 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
|
46 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
|
47 |
this.ribbonControl.Size = new System.Drawing.Size(979, 32); |
|
48 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
|
43 | 49 |
// |
44 | 50 |
// APIDConverter |
45 | 51 |
// |
46 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
|
52 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
|
|
47 | 53 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
48 |
this.ClientSize = new System.Drawing.Size(979, 516);
|
|
49 |
this.Controls.Add(this.button1);
|
|
54 |
this.ClientSize = new System.Drawing.Size(979, 602);
|
|
55 |
this.Controls.Add(this.ribbonControl);
|
|
50 | 56 |
this.Name = "APIDConverter"; |
57 |
this.Ribbon = this.ribbonControl; |
|
51 | 58 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; |
52 |
this.Text = "APIDConverter"; |
|
59 |
this.Text = "APID Converter"; |
|
60 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).EndInit(); |
|
53 | 61 |
this.ResumeLayout(false); |
62 |
this.PerformLayout(); |
|
54 | 63 |
|
55 | 64 |
} |
56 | 65 |
|
57 | 66 |
#endregion |
58 |
|
|
59 |
private System.Windows.Forms.Button button1; |
|
67 |
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl; |
|
60 | 68 |
} |
61 | 69 |
} |
DTI_PID/APIDConverter/Form/APIDConverter.cs | ||
---|---|---|
10 | 10 |
|
11 | 11 |
namespace AVEVA.PID.CustomizationUtility |
12 | 12 |
{ |
13 |
public partial class APIDConverter : Form |
|
13 |
public partial class APIDConverter : DevExpress.XtraBars.Ribbon.RibbonForm
|
|
14 | 14 |
{ |
15 | 15 |
public APIDConverter() |
16 | 16 |
{ |
DTI_PID/APIDConverter/Form/MappingForm.Designer.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
private void InitializeComponent() |
30 | 30 |
{ |
31 |
this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); |
|
32 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); |
|
31 | 33 |
this.SuspendLayout(); |
32 | 34 |
// |
35 |
// ribbonControl |
|
36 |
// |
|
37 |
this.ribbonControl.ExpandCollapseItem.Id = 0; |
|
38 |
this.ribbonControl.Items.AddRange(new DevExpress.XtraBars.BarItem[] { |
|
39 |
this.ribbonControl.ExpandCollapseItem}); |
|
40 |
this.ribbonControl.Location = new System.Drawing.Point(0, 0); |
|
41 |
this.ribbonControl.MaxItemId = 1; |
|
42 |
this.ribbonControl.Name = "ribbonControl"; |
|
43 |
this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; |
|
44 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
|
45 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
|
46 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
|
47 |
this.ribbonControl.Size = new System.Drawing.Size(800, 55); |
|
48 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
|
49 |
// |
|
33 | 50 |
// MappingForm |
34 | 51 |
// |
35 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
|
52 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
|
|
36 | 53 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
37 |
this.ClientSize = new System.Drawing.Size(800, 450); |
|
54 |
this.ClientSize = new System.Drawing.Size(800, 525); |
|
55 |
this.Controls.Add(this.ribbonControl); |
|
38 | 56 |
this.Name = "MappingForm"; |
57 |
this.Ribbon = this.ribbonControl; |
|
39 | 58 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; |
40 | 59 |
this.Text = "MappingForm"; |
60 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).EndInit(); |
|
41 | 61 |
this.ResumeLayout(false); |
62 |
this.PerformLayout(); |
|
42 | 63 |
|
43 | 64 |
} |
44 | 65 |
|
45 | 66 |
#endregion |
67 |
|
|
68 |
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl; |
|
46 | 69 |
} |
47 | 70 |
} |
DTI_PID/APIDConverter/Form/MappingForm.cs | ||
---|---|---|
10 | 10 |
|
11 | 11 |
namespace AVEVA.PID.CustomizationUtility |
12 | 12 |
{ |
13 |
public partial class MappingForm : Form |
|
13 |
public partial class MappingForm : DevExpress.XtraBars.Ribbon.RibbonForm
|
|
14 | 14 |
{ |
15 | 15 |
public MappingForm() |
16 | 16 |
{ |
DTI_PID/APIDConverter/Form/ProjectForm.Designer.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
private void InitializeComponent() |
30 | 30 |
{ |
31 |
this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); |
|
32 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); |
|
31 | 33 |
this.SuspendLayout(); |
32 | 34 |
// |
35 |
// ribbonControl |
|
36 |
// |
|
37 |
this.ribbonControl.ExpandCollapseItem.Id = 0; |
|
38 |
this.ribbonControl.Items.AddRange(new DevExpress.XtraBars.BarItem[] { |
|
39 |
this.ribbonControl.ExpandCollapseItem}); |
|
40 |
this.ribbonControl.Location = new System.Drawing.Point(0, 0); |
|
41 |
this.ribbonControl.MaxItemId = 1; |
|
42 |
this.ribbonControl.Name = "ribbonControl"; |
|
43 |
this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; |
|
44 |
this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False; |
|
45 |
this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; |
|
46 |
this.ribbonControl.ShowToolbarCustomizeItem = false; |
|
47 |
this.ribbonControl.Size = new System.Drawing.Size(800, 32); |
|
48 |
this.ribbonControl.Toolbar.ShowCustomizeItem = false; |
|
49 |
// |
|
33 | 50 |
// ProjectForm |
34 | 51 |
// |
35 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
|
|
52 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
|
|
36 | 53 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
37 |
this.ClientSize = new System.Drawing.Size(800, 450); |
|
54 |
this.ClientSize = new System.Drawing.Size(800, 525); |
|
55 |
this.Controls.Add(this.ribbonControl); |
|
38 | 56 |
this.Name = "ProjectForm"; |
57 |
this.Ribbon = this.ribbonControl; |
|
39 | 58 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; |
40 | 59 |
this.Text = "ProjectForm"; |
60 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).EndInit(); |
|
41 | 61 |
this.ResumeLayout(false); |
62 |
this.PerformLayout(); |
|
42 | 63 |
|
43 | 64 |
} |
44 | 65 |
|
45 | 66 |
#endregion |
67 |
|
|
68 |
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl; |
|
46 | 69 |
} |
47 | 70 |
} |
DTI_PID/APIDConverter/Form/ProjectForm.cs | ||
---|---|---|
10 | 10 |
|
11 | 11 |
namespace AVEVA.PID.CustomizationUtility |
12 | 12 |
{ |
13 |
public partial class ProjectForm : Form |
|
13 |
public partial class ProjectForm : DevExpress.XtraBars.Ribbon.RibbonForm
|
|
14 | 14 |
{ |
15 | 15 |
public ProjectForm() |
16 | 16 |
{ |
DTI_PID/APIDConverter/PIDCustomization.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
public class PIDCustomization |
30 | 30 |
{ |
31 |
private DevExpress.LookAndFeel.DefaultLookAndFeel defaultLookAndFeel = new DevExpress.LookAndFeel.DefaultLookAndFeel(); |
|
32 |
|
|
31 | 33 |
public string ProjectName { get; set; } |
32 | 34 |
public string DrawingID { get; set; } |
33 | 35 |
public string DrawingName { get; set; } |
... | ... | |
58 | 60 |
if (_instance == null) |
59 | 61 |
{ |
60 | 62 |
_instance = new PIDCustomization(); |
63 |
_instance.defaultLookAndFeel.LookAndFeel.SkinName = "Office 2016 Colorful"; |
|
61 | 64 |
} |
62 | 65 |
return _instance; |
63 | 66 |
} |
... | ... | |
84 | 87 |
SetColorForEntity(BlockId,0);// white color |
85 | 88 |
} |
86 | 89 |
|
90 |
#region Command |
|
87 | 91 |
/// <summary> |
88 | 92 |
/// This is test command which gives the idea regarding selection of an entity and assigning different color to it |
89 | 93 |
/// </summary> |
... | ... | |
95 | 99 |
[CommandMethod("AC")] |
96 | 100 |
public static void AC() |
97 | 101 |
{ |
102 |
GetInstance(); |
|
98 | 103 |
ConverterRibbonUI.InitUI(); |
99 | 104 |
} |
100 | 105 |
[CommandMethod("ConverterForm")] |
... | ... | |
124 | 129 |
|
125 | 130 |
} |
126 | 131 |
} |
132 |
#endregion |
|
127 | 133 |
#region private methods |
128 | 134 |
private string SaveBinaryDrawing() |
129 | 135 |
{ |
DTI_PID/SPPIDConverter/Form/ID2DBSetting.Designer.cs | ||
---|---|---|
28 | 28 |
/// </summary> |
29 | 29 |
private void InitializeComponent() |
30 | 30 |
{ |
31 |
this.components = new System.ComponentModel.Container(); |
|
32 | 31 |
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ID2DBSetting)); |
33 | 32 |
this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); |
34 | 33 |
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); |
... | ... | |
51 | 50 |
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); |
52 | 51 |
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); |
53 | 52 |
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); |
54 |
this.xtraFolderBrowserDialog = new DevExpress.XtraEditors.XtraFolderBrowserDialog(this.components);
|
|
53 |
this.xtraFolderBrowserDialog = new DevExpress.XtraEditors.XtraFolderBrowserDialog(); |
|
55 | 54 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); |
56 | 55 |
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); |
57 | 56 |
this.layoutControl1.SuspendLayout(); |
내보내기 Unified diff