diff --git a/.gitignore b/.gitignore index 55ce135..f491097 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ packages # should NOT be excluded as they contain compiler settings and other important # information for Eclipse / Flash Builder. /WinformGeneralDeveloperFrame.Start/test.json +/.vs/WinformGeneralDeveloperFrame/FileContentIndex diff --git a/.vs/WinformGeneralDeveloperFrame/v17/.suo b/.vs/WinformGeneralDeveloperFrame/v17/.suo index b928a27..7ea98cd 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v17/.suo and b/.vs/WinformGeneralDeveloperFrame/v17/.suo differ diff --git a/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin b/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin index 95cf36e..2150774 100644 Binary files a/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin and b/.vs/WinformGeneralDeveloperFrame/v17/fileList.bin differ diff --git a/Update/Properties/licenses.licx b/Update/Properties/licenses.licx new file mode 100644 index 0000000..c9b1fd0 --- /dev/null +++ b/Update/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Update/Update.csproj b/Update/Update.csproj index 1697a69..a406f50 100644 --- a/Update/Update.csproj +++ b/Update/Update.csproj @@ -67,6 +67,7 @@ Form1.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/Update/updateconfiguration.config b/Update/updateconfiguration.config index 7ed1f8e..31dada9 100644 --- a/Update/updateconfiguration.config +++ b/Update/updateconfiguration.config @@ -1,6 +1,6 @@  diff --git a/WinformGeneralDeveloperFrame.Start/Program.cs b/WinformGeneralDeveloperFrame.Start/Program.cs index 534817a..efa4731 100644 --- a/WinformGeneralDeveloperFrame.Start/Program.cs +++ b/WinformGeneralDeveloperFrame.Start/Program.cs @@ -21,7 +21,7 @@ namespace WinformGeneralDeveloperFrame.Start string str = EncodeHelper.AES_Encrypt("数据库连接"); string str1 = EncodeHelper.AES_Decrypt(str);// DevExpress.Skins.SkinManager.EnableFormSkins(); - UserLookAndFeel.Default.SetSkinStyle("Office 2007 Silver"); + UserLookAndFeel.Default.SetSkinStyle("Basic"); BonusSkins.Register(); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); diff --git a/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs b/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs index 6422917..89e0929 100644 --- a/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs +++ b/WinformGeneralDeveloperFrame/FrmsysDataBase.designer.cs @@ -157,7 +157,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 36); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 767); + this.xtraTabControl1.Size = new System.Drawing.Size(1306, 773); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -167,7 +167,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 771); + this.tabDataList.Size = new System.Drawing.Size(1294, 738); this.tabDataList.Text = "数据列表"; // // grdList @@ -176,7 +176,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 771); + this.grdList.Size = new System.Drawing.Size(1294, 738); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -200,7 +200,7 @@ namespace MES.Form // this.tabDataDetail.Controls.Add(this.panelControl2); this.tabDataDetail.Name = "tabDataDetail"; - this.tabDataDetail.Size = new System.Drawing.Size(1294, 738); + this.tabDataDetail.Size = new System.Drawing.Size(1300, 744); this.tabDataDetail.Text = "数据编辑"; // // panelControl2 @@ -209,7 +209,7 @@ namespace MES.Form this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelControl2.Location = new System.Drawing.Point(0, 0); this.panelControl2.Name = "panelControl2"; - this.panelControl2.Size = new System.Drawing.Size(1294, 738); + this.panelControl2.Size = new System.Drawing.Size(1300, 744); this.panelControl2.TabIndex = 0; // // layoutControl1 @@ -227,7 +227,7 @@ namespace MES.Form this.layoutControl1.Location = new System.Drawing.Point(2, 2); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1290, 734); + this.layoutControl1.Size = new System.Drawing.Size(1296, 740); this.layoutControl1.TabIndex = 0; this.layoutControl1.Text = "layoutControl1"; // @@ -236,15 +236,15 @@ namespace MES.Form this.txtConnUrl.Location = new System.Drawing.Point(64, 132); this.txtConnUrl.Name = "txtConnUrl"; this.txtConnUrl.Properties.ReadOnly = true; - this.txtConnUrl.Size = new System.Drawing.Size(1214, 20); + this.txtConnUrl.Size = new System.Drawing.Size(1220, 20); this.txtConnUrl.StyleController = this.layoutControl1; this.txtConnUrl.TabIndex = 16; // // btnCanel // - this.btnCanel.Location = new System.Drawing.Point(964, 156); + this.btnCanel.Location = new System.Drawing.Point(968, 156); this.btnCanel.Name = "btnCanel"; - this.btnCanel.Size = new System.Drawing.Size(314, 22); + this.btnCanel.Size = new System.Drawing.Size(316, 22); this.btnCanel.StyleController = this.layoutControl1; this.btnCanel.TabIndex = 15; this.btnCanel.Text = "取消"; @@ -252,9 +252,9 @@ namespace MES.Form // // btnOk // - this.btnOk.Location = new System.Drawing.Point(647, 156); + this.btnOk.Location = new System.Drawing.Point(650, 156); this.btnOk.Name = "btnOk"; - this.btnOk.Size = new System.Drawing.Size(313, 22); + this.btnOk.Size = new System.Drawing.Size(314, 22); this.btnOk.StyleController = this.layoutControl1; this.btnOk.TabIndex = 14; this.btnOk.Text = "确定"; @@ -264,7 +264,7 @@ namespace MES.Form // this.btnTestConn.Location = new System.Drawing.Point(12, 156); this.btnTestConn.Name = "btnTestConn"; - this.btnTestConn.Size = new System.Drawing.Size(631, 22); + this.btnTestConn.Size = new System.Drawing.Size(634, 22); this.btnTestConn.StyleController = this.layoutControl1; this.btnTestConn.TabIndex = 13; this.btnTestConn.Text = "测试连接"; @@ -274,7 +274,7 @@ namespace MES.Form // this.txtConnName.Location = new System.Drawing.Point(64, 12); this.txtConnName.Name = "txtConnName"; - this.txtConnName.Size = new System.Drawing.Size(1214, 20); + this.txtConnName.Size = new System.Drawing.Size(1220, 20); this.txtConnName.StyleController = this.layoutControl1; this.txtConnName.TabIndex = 4; // @@ -282,7 +282,7 @@ namespace MES.Form // this.txtServerName.Location = new System.Drawing.Point(64, 36); this.txtServerName.Name = "txtServerName"; - this.txtServerName.Size = new System.Drawing.Size(1214, 20); + this.txtServerName.Size = new System.Drawing.Size(1220, 20); this.txtServerName.StyleController = this.layoutControl1; this.txtServerName.TabIndex = 5; // @@ -290,7 +290,7 @@ namespace MES.Form // this.txtDataBaseName.Location = new System.Drawing.Point(64, 60); this.txtDataBaseName.Name = "txtDataBaseName"; - this.txtDataBaseName.Size = new System.Drawing.Size(1214, 20); + this.txtDataBaseName.Size = new System.Drawing.Size(1220, 20); this.txtDataBaseName.StyleController = this.layoutControl1; this.txtDataBaseName.TabIndex = 6; // @@ -298,7 +298,7 @@ namespace MES.Form // this.txtUserName.Location = new System.Drawing.Point(64, 84); this.txtUserName.Name = "txtUserName"; - this.txtUserName.Size = new System.Drawing.Size(1214, 20); + this.txtUserName.Size = new System.Drawing.Size(1220, 20); this.txtUserName.StyleController = this.layoutControl1; this.txtUserName.TabIndex = 7; // @@ -307,7 +307,7 @@ namespace MES.Form this.txtPassWord.Location = new System.Drawing.Point(64, 108); this.txtPassWord.Name = "txtPassWord"; this.txtPassWord.Properties.PasswordChar = '*'; - this.txtPassWord.Size = new System.Drawing.Size(1214, 20); + this.txtPassWord.Size = new System.Drawing.Size(1220, 20); this.txtPassWord.StyleController = this.layoutControl1; this.txtPassWord.TabIndex = 8; // @@ -327,7 +327,7 @@ namespace MES.Form this.layoutControlItem7, this.layoutControlItem8}); this.Root.Name = "Root"; - this.Root.Size = new System.Drawing.Size(1290, 734); + this.Root.Size = new System.Drawing.Size(1296, 740); this.Root.TextVisible = false; // // layoutControlItem1 @@ -337,7 +337,7 @@ namespace MES.Form this.layoutControlItem1.CustomizationFormText = "连接名："; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem1.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem1.Text = "连接名："; this.layoutControlItem1.TextSize = new System.Drawing.Size(49, 14); // @@ -348,7 +348,7 @@ namespace MES.Form this.layoutControlItem2.CustomizationFormText = "主机："; this.layoutControlItem2.Location = new System.Drawing.Point(0, 24); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem2.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem2.Text = "主机："; this.layoutControlItem2.TextSize = new System.Drawing.Size(49, 14); // @@ -359,7 +359,7 @@ namespace MES.Form this.layoutControlItem3.CustomizationFormText = "数据库："; this.layoutControlItem3.Location = new System.Drawing.Point(0, 48); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem3.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem3.Text = "数据库："; this.layoutControlItem3.TextSize = new System.Drawing.Size(49, 14); // @@ -370,7 +370,7 @@ namespace MES.Form this.layoutControlItem4.CustomizationFormText = "用户名："; this.layoutControlItem4.Location = new System.Drawing.Point(0, 72); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem4.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem4.Text = "用户名："; this.layoutControlItem4.TextSize = new System.Drawing.Size(49, 14); // @@ -381,7 +381,7 @@ namespace MES.Form this.layoutControlItem5.CustomizationFormText = "密码："; this.layoutControlItem5.Location = new System.Drawing.Point(0, 96); this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem5.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem5.Text = "密码："; this.layoutControlItem5.TextSize = new System.Drawing.Size(49, 14); // @@ -390,7 +390,7 @@ namespace MES.Form this.emptySpaceItem1.AllowHotTrack = false; this.emptySpaceItem1.Location = new System.Drawing.Point(0, 170); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(1270, 544); + this.emptySpaceItem1.Size = new System.Drawing.Size(1276, 550); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // // layoutControlItem9 @@ -398,7 +398,7 @@ namespace MES.Form this.layoutControlItem9.Control = this.txtConnUrl; this.layoutControlItem9.Location = new System.Drawing.Point(0, 120); this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24); + this.layoutControlItem9.Size = new System.Drawing.Size(1276, 24); this.layoutControlItem9.Text = "数据源url"; this.layoutControlItem9.TextSize = new System.Drawing.Size(49, 14); // @@ -407,25 +407,25 @@ namespace MES.Form this.layoutControlItem6.Control = this.btnTestConn; this.layoutControlItem6.Location = new System.Drawing.Point(0, 144); this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.Size = new System.Drawing.Size(635, 26); + this.layoutControlItem6.Size = new System.Drawing.Size(638, 26); this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; // // layoutControlItem7 // this.layoutControlItem7.Control = this.btnOk; - this.layoutControlItem7.Location = new System.Drawing.Point(635, 144); + this.layoutControlItem7.Location = new System.Drawing.Point(638, 144); this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.Size = new System.Drawing.Size(317, 26); + this.layoutControlItem7.Size = new System.Drawing.Size(318, 26); this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; // // layoutControlItem8 // this.layoutControlItem8.Control = this.btnCanel; - this.layoutControlItem8.Location = new System.Drawing.Point(952, 144); + this.layoutControlItem8.Location = new System.Drawing.Point(956, 144); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.Size = new System.Drawing.Size(318, 26); + this.layoutControlItem8.Size = new System.Drawing.Size(320, 26); this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // @@ -433,12 +433,11 @@ namespace MES.Form // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1300, 800); + this.ClientSize = new System.Drawing.Size(1306, 806); this.Controls.Add(this.xtraTabControl1); this.Name = "FrmsysDataBase"; this.Text = "数据源维护"; this.Load += new System.EventHandler(this.FrmsysDataBase_Load); - this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.tabDataList.ResumeLayout(false); diff --git a/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs b/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs index 56111f6..84e6e0b 100644 --- a/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs +++ b/WinformGeneralDeveloperFrame/FrmsysDataTable.designer.cs @@ -121,7 +121,7 @@ namespace MES.Form this.xtraTabControl1.Location = new System.Drawing.Point(0, 33); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabDataList; - this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766); + this.xtraTabControl1.Size = new System.Drawing.Size(1306, 772); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabDataList, @@ -131,7 +131,7 @@ namespace MES.Form // this.tabDataList.Controls.Add(this.grdList); this.tabDataList.Name = "tabDataList"; - this.tabDataList.Size = new System.Drawing.Size(1294, 737); + this.tabDataList.Size = new System.Drawing.Size(1300, 743); this.tabDataList.Text = "数据列表"; // // grdList @@ -140,7 +140,7 @@ namespace MES.Form this.grdList.Location = new System.Drawing.Point(0, 0); this.grdList.MainView = this.grdListView; this.grdList.Name = "grdList"; - this.grdList.Size = new System.Drawing.Size(1294, 737); + this.grdList.Size = new System.Drawing.Size(1300, 743); this.grdList.TabIndex = 0; this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grdListView}); @@ -248,6 +248,7 @@ namespace MES.Form this.comboBoxEdit1.Name = "comboBoxEdit1"; this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.comboBoxEdit1.Size = new System.Drawing.Size(1203, 20); this.comboBoxEdit1.StyleController = this.layoutControl1; this.comboBoxEdit1.TabIndex = 4; @@ -265,6 +266,7 @@ namespace MES.Form // this.txtDataTableUrl.Location = new System.Drawing.Point(75, 60); this.txtDataTableUrl.Name = "txtDataTableUrl"; + this.txtDataTableUrl.Properties.ReadOnly = true; this.txtDataTableUrl.Size = new System.Drawing.Size(1203, 20); this.txtDataTableUrl.StyleController = this.layoutControl1; this.txtDataTableUrl.TabIndex = 3; @@ -354,11 +356,12 @@ namespace MES.Form // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1300, 800); + this.ClientSize = new System.Drawing.Size(1306, 806); this.Controls.Add(this.xtraTabControl1); this.Name = "FrmsysDataTable"; this.Text = "数据集维护"; this.Load += new System.EventHandler(this.FrmsysDataTable_Load); + this.Controls.SetChildIndex(this.xtraTabControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.tabDataList.ResumeLayout(false);