From 8d13f2ea3c9cf6f49014e6d745a75812d1b38531 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 30 Aug 2023 15:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocManager/frmDocument.Designer.cs | 2 +- .../DocManager/frmDocument3.designer.cs | 2 +- AIMSControls/FormMainManage.cs | 20 ++++++++++++++---- AIMSControls/FormMainManage.designer.cs | Bin 231416 -> 233972 bytes .../frmAanesthesiaPainlessRecord.Designer.cs | 2 +- .../frmAanesthesiaRecord.Designer.cs | 4 ++-- .../frmAanesthesiaRecordNew.Designer.cs | 4 ++-- .../frmAanesthesiaRecover.Designer.cs | 2 +- .../frmFactEventsNew.Designer.cs | 2 +- .../frmInstrumentRecord.Designer.cs | 4 ++-- .../frmOperationSchedulePlan.cs | 12 +++++------ .../frmPrintingArrangemen.designer.cs | 2 +- .../frmSelectiveOperationsPrint.designer.cs | 2 +- DrawGraph/frmMessageBox.designer.cs | 2 +- 14 files changed, 36 insertions(+), 24 deletions(-) diff --git a/AIMSControls/DocManager/frmDocument.Designer.cs b/AIMSControls/DocManager/frmDocument.Designer.cs index c0b64c9..8c31ce1 100644 --- a/AIMSControls/DocManager/frmDocument.Designer.cs +++ b/AIMSControls/DocManager/frmDocument.Designer.cs @@ -197,7 +197,7 @@ // this.expandablePanel1.CanvasColor = System.Drawing.SystemColors.Control; this.expandablePanel1.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.RightToLeft; - this.expandablePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.expandablePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.expandablePanel1.DisabledBackColor = System.Drawing.Color.Empty; this.expandablePanel1.Dock = System.Windows.Forms.DockStyle.Left; this.expandablePanel1.Font = new System.Drawing.Font("宋体", 9.5F); diff --git a/AIMSControls/DocManager/frmDocument3.designer.cs b/AIMSControls/DocManager/frmDocument3.designer.cs index 5ce6ee6..6b0dd0b 100644 --- a/AIMSControls/DocManager/frmDocument3.designer.cs +++ b/AIMSControls/DocManager/frmDocument3.designer.cs @@ -374,7 +374,7 @@ // this.expandablePanel1.CanvasColor = System.Drawing.SystemColors.Control; this.expandablePanel1.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.RightToLeft; - this.expandablePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.expandablePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.expandablePanel1.DisabledBackColor = System.Drawing.Color.Empty; this.expandablePanel1.Dock = System.Windows.Forms.DockStyle.Left; this.expandablePanel1.Font = new System.Drawing.Font("宋体", 9.5F); diff --git a/AIMSControls/FormMainManage.cs b/AIMSControls/FormMainManage.cs index 3efbd26..a0119f8 100644 --- a/AIMSControls/FormMainManage.cs +++ b/AIMSControls/FormMainManage.cs @@ -4,18 +4,20 @@ using AIMSBLL; using AIMSExtension; using AIMSModel; using DevComponents.DotNetBar; +using DevComponents.DotNetBar.Metro.ColorTables; using DocumentManagement; using System; using System.Collections.Generic; using System.Data; using System.Drawing; +using System.Linq; using System.Reflection; using System.Threading.Tasks; using System.Windows.Forms; namespace AIMS { - public partial class FormMainManage : OfficeForm + public partial class FormMainManage : Office2007Form { public FormMainManage() { @@ -39,8 +41,10 @@ namespace AIMS eStyle.VisualStudio2012Dark , eStyle.OfficeMobile2014 }); comboBoxEx1.SelectedIndex = 1; - - SetGridAlternatingRows(lv1); + comboBoxEx2.Items.AddRange(MetroColorGeneratorParameters.GetAllPredefinedThemes().Cast() + .ToArray()); + + SetGridAlternatingRows(lv1); SetGridAlternatingRows(lv2); SetGridAlternatingRows(lv3); SetGridAlternatingRows(lv4); @@ -92,8 +96,16 @@ namespace AIMS eStyle style = (eStyle)comboBoxEx1.SelectedItem; if (styleManager1.ManagerStyle != style) styleManager1.ManagerStyle = style; + styleManager1.MetroColorParameters = MetroColorGeneratorParameters.Cherry; + } + private void comboBoxEx2_SelectedIndexChanged(object sender, EventArgs e) + { + if (comboBoxEx1.SelectedItem == null) return; + var style = (MetroColorGeneratorParameters)comboBoxEx2.SelectedItem; + //if (styleManager1.MetroColorParameters != style) + styleManager1.MetroColorParameters = style; + //styleManager1.MetroColorParameters = MetroColorGeneratorParameters.Cherry; } - private void FormMainManage_Load(object sender, EventArgs e) { diff --git a/AIMSControls/FormMainManage.designer.cs b/AIMSControls/FormMainManage.designer.cs index b8b1bc9d65b93a5c0dc943651226df702398e636..b5f39bdca7e10ea59eff6ac4067fa031f1ccade2 100644 GIT binary patch delta 318 zcmey-&-Z09--bC_lMVKYOuiHwG<`!9v&iNGExnM*a&;n;nNGV*-cX@2+2I1)NO z%(rLN^aCx76;KJ+z4_cm40;Tn3?(4F(;xaV3QxYY*I{~*B$E%bF@x#k#C@LAnWUIR zChyxPGX0V@lMYnp#4XN@rqdTnF_}UI7VbYieUc56)O5Q^j9`y20}Y;>SS~y{=AhW* z4+p}4E{HD|ZH_s(J?0=|%$vz355y)vTDE0+!g3~^>3*e*0^2XGWlC5(d4sVK$p2c? lCkZi1O#cwf>@eM~iCJX2LliR`Tr6R-oHEz;bJ5INIsl_IcK!eW delta 83 zcmV-Z0IdJ?qYn6w4zQdmld#PWvrsGaQ>Y_lOV5f pld#PYm$ZNZypu4R29w~-1cS)Sx5&!@Z0fflw*q>tw=QJ^#w=K&CUpP+ diff --git a/AIMSControls/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs b/AIMSControls/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs index 94153f5..da938b3 100644 --- a/AIMSControls/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs @@ -822,7 +822,7 @@ this.circularProgress1.Name = "circularProgress1"; this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress1.TabIndex = 6; this.circularProgress1.Value = 100; // diff --git a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index f53ba05..eea6297 100644 --- a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -959,7 +959,7 @@ this.circularProgress1.Name = "circularProgress1"; this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress1.TabIndex = 6; this.circularProgress1.Value = 100; // @@ -1049,7 +1049,7 @@ this.circularProgress2.Name = "circularProgress2"; this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress2.Size = new System.Drawing.Size(389, 239); - this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress2.TabIndex = 6; this.circularProgress2.Value = 100; // diff --git a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecordNew.Designer.cs b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecordNew.Designer.cs index 81adb8e..18a44c9 100644 --- a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecordNew.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecordNew.Designer.cs @@ -959,7 +959,7 @@ this.circularProgress1.Name = "circularProgress1"; this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress1.TabIndex = 6; this.circularProgress1.Value = 100; // @@ -1049,7 +1049,7 @@ this.circularProgress2.Name = "circularProgress2"; this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress2.Size = new System.Drawing.Size(389, 239); - this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress2.TabIndex = 6; this.circularProgress2.Value = 100; // diff --git a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs index 0b34a5a..cd40b3d 100644 --- a/AIMSControls/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs @@ -748,7 +748,7 @@ this.circularProgress1.Name = "circularProgress1"; this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress1.TabIndex = 6; this.circularProgress1.Value = 100; // diff --git a/AIMSControls/OperationAanesthesia/frmFactEventsNew.Designer.cs b/AIMSControls/OperationAanesthesia/frmFactEventsNew.Designer.cs index 92454e4..4eb7aac 100644 --- a/AIMSControls/OperationAanesthesia/frmFactEventsNew.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmFactEventsNew.Designer.cs @@ -127,7 +127,7 @@ namespace AIMS.PublicUI.UI this.btnDelete.Location = new System.Drawing.Point(861, 6); this.btnDelete.Name = "btnDelete"; this.btnDelete.Size = new System.Drawing.Size(106, 30); - this.btnDelete.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeMobile2014; + this.btnDelete.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnDelete.TabIndex = 2; this.btnDelete.Text = "删除"; this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click); diff --git a/AIMSControls/OperationAanesthesia/frmInstrumentRecord.Designer.cs b/AIMSControls/OperationAanesthesia/frmInstrumentRecord.Designer.cs index 106cafa..d1edbd5 100644 --- a/AIMSControls/OperationAanesthesia/frmInstrumentRecord.Designer.cs +++ b/AIMSControls/OperationAanesthesia/frmInstrumentRecord.Designer.cs @@ -1339,7 +1339,7 @@ this.circularProgress1.Name = "circularProgress1"; this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress1.Size = new System.Drawing.Size(389, 239); - this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress1.TabIndex = 6; this.circularProgress1.Value = 100; // @@ -1985,7 +1985,7 @@ this.circularProgress2.Name = "circularProgress2"; this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue; this.circularProgress2.Size = new System.Drawing.Size(389, 239); - this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP; + this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.circularProgress2.TabIndex = 6; this.circularProgress2.Value = 100; // diff --git a/AIMSControls/OperationFront/frmOperationSchedulePlan.cs b/AIMSControls/OperationFront/frmOperationSchedulePlan.cs index b0d0472..29ca79e 100644 --- a/AIMSControls/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMSControls/OperationFront/frmOperationSchedulePlan.cs @@ -664,13 +664,13 @@ namespace AIMS.OperationFront.UI this.navigationPane1.NavigationBarHeight = 190; this.navigationPane1.Padding = new System.Windows.Forms.Padding(1); this.navigationPane1.Size = new System.Drawing.Size(320, 737); - this.navigationPane1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPane1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPane1.TabIndex = 0; // // // this.navigationPane1.TitlePanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.navigationPane1.TitlePanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPane1.TitlePanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPane1.TitlePanel.DisabledBackColor = System.Drawing.Color.Empty; this.navigationPane1.TitlePanel.Dock = System.Windows.Forms.DockStyle.Top; this.navigationPane1.TitlePanel.Font = new System.Drawing.Font("΢ÈíÑźÚ", 11.5F, System.Drawing.FontStyle.Bold); @@ -692,7 +692,7 @@ namespace AIMS.OperationFront.UI // // navigationPanePanel1 // - this.navigationPanePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPanePanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPanePanel1.Controls.Add(this.groupBoxsel); this.navigationPanePanel1.DisabledBackColor = System.Drawing.Color.Empty; this.navigationPanePanel1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1069,7 +1069,7 @@ namespace AIMS.OperationFront.UI // // navigationPanePanel4 // - this.navigationPanePanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPanePanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPanePanel4.Controls.Add(this.groupBox2); this.navigationPanePanel4.DisabledBackColor = System.Drawing.Color.Empty; this.navigationPanePanel4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1410,7 +1410,7 @@ namespace AIMS.OperationFront.UI // // navigationPanePanel5 // - this.navigationPanePanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPanePanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPanePanel5.Controls.Add(this.v); this.navigationPanePanel5.DisabledBackColor = System.Drawing.Color.Empty; this.navigationPanePanel5.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1751,7 +1751,7 @@ namespace AIMS.OperationFront.UI // // navigationPanePanel2 // - this.navigationPanePanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2013; + this.navigationPanePanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.navigationPanePanel2.Controls.Add(this.groupBox1); this.navigationPanePanel2.DisabledBackColor = System.Drawing.Color.Empty; this.navigationPanePanel2.Dock = System.Windows.Forms.DockStyle.Fill; diff --git a/AIMSControls/OperationFront/frmPrintingArrangemen.designer.cs b/AIMSControls/OperationFront/frmPrintingArrangemen.designer.cs index 04a2403..3ff28bc 100644 --- a/AIMSControls/OperationFront/frmPrintingArrangemen.designer.cs +++ b/AIMSControls/OperationFront/frmPrintingArrangemen.designer.cs @@ -172,7 +172,7 @@ this.cboOperationRoom.Location = new System.Drawing.Point(452, 12); this.cboOperationRoom.Name = "cboOperationRoom"; this.cboOperationRoom.Size = new System.Drawing.Size(103, 28); - this.cboOperationRoom.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeMobile2014; + this.cboOperationRoom.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cboOperationRoom.TabIndex = 500; this.cboOperationRoom.Visible = false; // diff --git a/AIMSControls/OperationFront/frmSelectiveOperationsPrint.designer.cs b/AIMSControls/OperationFront/frmSelectiveOperationsPrint.designer.cs index 93a0229..97f7a96 100644 --- a/AIMSControls/OperationFront/frmSelectiveOperationsPrint.designer.cs +++ b/AIMSControls/OperationFront/frmSelectiveOperationsPrint.designer.cs @@ -161,7 +161,7 @@ namespace AIMS.OperationFront.UI this.cboOperationRoom.Location = new System.Drawing.Point(462, 12); this.cboOperationRoom.Name = "cboOperationRoom"; this.cboOperationRoom.Size = new System.Drawing.Size(103, 28); - this.cboOperationRoom.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeMobile2014; + this.cboOperationRoom.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cboOperationRoom.TabIndex = 0; this.cboOperationRoom.Visible = false; // diff --git a/DrawGraph/frmMessageBox.designer.cs b/DrawGraph/frmMessageBox.designer.cs index 043d326..7773a0d 100644 --- a/DrawGraph/frmMessageBox.designer.cs +++ b/DrawGraph/frmMessageBox.designer.cs @@ -36,7 +36,7 @@ // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2010; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Font = new System.Drawing.Font("微软雅黑", 13F);