From 219b7905ab1955555767dfdc66b1ec4baecfacd7 Mon Sep 17 00:00:00 2001 From: Sparronator9999 <86388887+Sparronator9999@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:20:21 +1100 Subject: [PATCH] Attempt to fix some misaligned UI elements This problem will never go away entirely as long as WinForms is used for UI, at least not without work that I'm not willing to put in right now. --- .../Dialogs/TextInputDialog.Designer.cs | 2 - .../Dialogs/VersionDialog.Designer.cs | 35 ++-- .../Dialogs/VersionDialog.resx | 138 ++++++------- YAMDCC.ConfigEditor/MainWindow.Designer.cs | 189 ++++++++++-------- YAMDCC.ConfigEditor/MainWindow.cs | 6 +- YAMDCC.ConfigEditor/MainWindow.resx | 13 +- 6 files changed, 199 insertions(+), 184 deletions(-) diff --git a/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs index 51c1065..b92430a 100644 --- a/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs +++ b/YAMDCC.ConfigEditor/Dialogs/TextInputDialog.Designer.cs @@ -85,7 +85,6 @@ private void InitializeComponent() this.lblCaption.Name = "lblCaption"; this.lblCaption.Size = new System.Drawing.Size(280, 15); this.lblCaption.TabIndex = 1; - this.lblCaption.Text = "Caption"; // // txtInput // @@ -147,7 +146,6 @@ private void InitializeComponent() this.MinimizeBox = false; this.Name = "TextInputDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Title"; tblMain.ResumeLayout(false); tblMain.PerformLayout(); flwButtons.ResumeLayout(false); diff --git a/YAMDCC.ConfigEditor/Dialogs/VersionDialog.Designer.cs b/YAMDCC.ConfigEditor/Dialogs/VersionDialog.Designer.cs index 9372bc4..dc4eb0e 100644 --- a/YAMDCC.ConfigEditor/Dialogs/VersionDialog.Designer.cs +++ b/YAMDCC.ConfigEditor/Dialogs/VersionDialog.Designer.cs @@ -104,16 +104,6 @@ private void InitializeComponent() lblSubtitle.TabIndex = 2; lblSubtitle.Text = "(Yet Another MSI Dragon Center Clone)"; // - // lblVersion - // - this.lblVersion.AutoSize = true; - this.lblVersion.Location = new System.Drawing.Point(140, 56); - this.lblVersion.Margin = new System.Windows.Forms.Padding(3); - this.lblVersion.Name = "lblVersion"; - this.lblVersion.Size = new System.Drawing.Size(48, 15); - this.lblVersion.TabIndex = 3; - this.lblVersion.Text = "Version "; - // // tblMain // tblMain.AutoSize = true; @@ -125,10 +115,10 @@ private void InitializeComponent() tblMain.Controls.Add(lblTitle, 1, 0); tblMain.Controls.Add(lblSubtitle, 1, 1); tblMain.Controls.Add(this.lblVersion, 1, 2); - tblMain.Controls.Add(this.lblCopyright, 0, 6); + tblMain.Controls.Add(this.lblRevision, 1, 3); tblMain.Controls.Add(this.lblDesc, 1, 4); tblMain.Controls.Add(flwLinks, 1, 5); - tblMain.Controls.Add(this.lblRevision, 1, 3); + tblMain.Controls.Add(this.lblCopyright, 0, 6); tblMain.Dock = System.Windows.Forms.DockStyle.Fill; tblMain.Location = new System.Drawing.Point(0, 0); tblMain.Name = "tblMain"; @@ -144,16 +134,25 @@ private void InitializeComponent() tblMain.Size = new System.Drawing.Size(524, 181); tblMain.TabIndex = 5; // + // lblVersion + // + this.lblVersion.AutoSize = true; + this.lblVersion.Location = new System.Drawing.Point(140, 56); + this.lblVersion.Margin = new System.Windows.Forms.Padding(3); + this.lblVersion.Name = "lblVersion"; + this.lblVersion.Size = new System.Drawing.Size(48, 15); + this.lblVersion.TabIndex = 3; + this.lblVersion.Text = "Version "; + // // lblCopyright // this.lblCopyright.Anchor = System.Windows.Forms.AnchorStyles.Top; this.lblCopyright.AutoSize = true; tblMain.SetColumnSpan(this.lblCopyright, 2); - this.lblCopyright.Location = new System.Drawing.Point(232, 151); + this.lblCopyright.Location = new System.Drawing.Point(262, 151); this.lblCopyright.Name = "lblCopyright"; - this.lblCopyright.Size = new System.Drawing.Size(60, 15); + this.lblCopyright.Size = new System.Drawing.Size(0, 15); this.lblCopyright.TabIndex = 4; - this.lblCopyright.Text = "Copyright"; this.lblCopyright.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // lblDesc @@ -162,9 +161,8 @@ private void InitializeComponent() this.lblDesc.Location = new System.Drawing.Point(140, 98); this.lblDesc.Margin = new System.Windows.Forms.Padding(3); this.lblDesc.Name = "lblDesc"; - this.lblDesc.Size = new System.Drawing.Size(67, 15); + this.lblDesc.Size = new System.Drawing.Size(0, 15); this.lblDesc.TabIndex = 5; - this.lblDesc.Text = "Description"; // // flwLinks // @@ -254,9 +252,10 @@ private void InitializeComponent() } #endregion + private System.Windows.Forms.Label lblVersion; + private System.Windows.Forms.Label lblRevision; private System.Windows.Forms.Label lblDesc; private System.Windows.Forms.Label lblCopyright; - private System.Windows.Forms.Label lblRevision; } } diff --git a/YAMDCC.ConfigEditor/Dialogs/VersionDialog.resx b/YAMDCC.ConfigEditor/Dialogs/VersionDialog.resx index 97ab25d..6f295b9 100644 --- a/YAMDCC.ConfigEditor/Dialogs/VersionDialog.resx +++ b/YAMDCC.ConfigEditor/Dialogs/VersionDialog.resx @@ -123,75 +123,75 @@ - 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 + cYpynlGOM8oxQjmvpDfZiW6oEoNXUpMr0xGcaS1OUc4zynFGOUYo55X0JjvRDVVi8EpqcmU6ghGt5SnK + eaT/nFGOM8pxJ73JTnRDlRi8kppcmY5iRGt5inIe6T9nlOOMctxJb7IT3VAlBq+kJlemoxjRWp6inEf6 + zxnlOKMcd9Kb7EQ3VInBK6nJlekoRrSWpyjnkf5zRjnOKMed9CY70Q1VYvBKanIlrcR/0VGM6PPNqs5f + ne+/9N8bpTd7M91QJQavpCZX0kosXdg+36zq/NX5/kv/vVF6szfTDVVi8EpqciWtxNKF7fPNqs5fne+/ + 9N8bpTd7M91QJQavpCZX0kosXdg+36zq/NX5/kv/vVF6szfTDVVisJKaWlkruXRhe33+WephhHLOUM+V + 1MOb6aYqMVhJTa2slXzpQvf5Z6mHEco5Qz1XUg9vppuqxGAlNbWyVvKlC93nn6UeRijnDPVcST28mW6q + EoOV1NTKWsmXLnSff5Z6GKGcM9RzJfXwZrqpSgxWUlMraSUO0VLO0DeOVPOdVNORerqTan4T3VQlBiup + qZW0EodoCWfoG0eq+U6q6Ug93Uk1v4luqhKDldTUSlqJQ7SEM/SNI9V8J9V0pJ7upJrfRDdVicFKamol + rcQhWsIZ+saRar6TajpST3dSzW+im6rEYCU1tZJW4hQt5Yw+v2q+U1+Pav4m1fwmuqlKDFZSUytpJU7R + Us7o86vmO/X1qOZvUs1vopuqxGAlNbWSVuIULeWMPr9qvlNfj2r+JtX8JrqpSgxWUlMraSVO0VLO6POr + 5jv19ajmb1LNb6KbqsRgJTW1klbipbS0R/3vVeNK+npnaSYjVOOb6KYqMVhJTa2klXgpLe1R/3vVuJK+ + 3lmayQjV+Ca6qUoMVlJTK2klXkpLe9T/XjWupK93lmYyQjW+iW6qEoOV1NRKWomX0tIe9b9XjSvp652l + mYxQjW+im6rEYCU1tZJ+oVrJX6UaV6Kar9S/T081voluqhKDldTUSvqFaiV/lWpciWq+Uv8+PdX4Jrqp + SgxWUlMr6ReqlfxVqnElqvlK/fv0VOOb6KYqMVhJTa2kX6hW8lepxpWo5iv179NTjW+im6rEYCU1tRIt + 1VFr4VaqcSWq+U79+6jGN9FNVWKwkppaSb9QvdbCrVTjSlTznfr3UY1vopuqxGAlNbWSfqF6rYVbqcaV + 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 diff --git a/YAMDCC.ConfigEditor/MainWindow.Designer.cs b/YAMDCC.ConfigEditor/MainWindow.Designer.cs index 09a6078..a1154c9 100644 --- a/YAMDCC.ConfigEditor/MainWindow.Designer.cs +++ b/YAMDCC.ConfigEditor/MainWindow.Designer.cs @@ -99,8 +99,8 @@ private void InitializeComponent() this.lblKeyLight = new System.Windows.Forms.Label(); this.tbKeyLight = new System.Windows.Forms.TrackBar(); this.chkFullBlast = new System.Windows.Forms.CheckBox(); - this.btnApply = new System.Windows.Forms.Button(); this.btnRevert = new System.Windows.Forms.Button(); + this.btnApply = new System.Windows.Forms.Button(); this.lblStatus = new System.Windows.Forms.Label(); this.lblFanSpd = new System.Windows.Forms.Label(); this.lblFanRPM = new System.Windows.Forms.Label(); @@ -403,9 +403,11 @@ private void InitializeComponent() // this.lblSpeed.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSpeed.AutoSize = true; - this.lblSpeed.Location = new System.Drawing.Point(5, 0); + this.lblSpeed.Location = new System.Drawing.Point(4, 2); + this.lblSpeed.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.lblSpeed.Name = "lblSpeed"; - this.lblSpeed.Size = new System.Drawing.Size(60, 15); + this.lblSpeed.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.lblSpeed.Size = new System.Drawing.Size(60, 18); this.lblSpeed.TabIndex = 0; this.lblSpeed.Text = "Speed (%)"; // @@ -413,9 +415,11 @@ private void InitializeComponent() // this.lblUpT.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblUpT.AutoSize = true; - this.lblUpT.Location = new System.Drawing.Point(19, 277); + this.lblUpT.Location = new System.Drawing.Point(18, 265); + this.lblUpT.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.lblUpT.Name = "lblUpT"; - this.lblUpT.Size = new System.Drawing.Size(46, 15); + this.lblUpT.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.lblUpT.Size = new System.Drawing.Size(46, 18); this.lblUpT.TabIndex = 1; this.lblUpT.Text = "Up (°C)"; // @@ -423,9 +427,11 @@ private void InitializeComponent() // this.lblDownT.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblDownT.AutoSize = true; - this.lblDownT.Location = new System.Drawing.Point(3, 292); + this.lblDownT.Location = new System.Drawing.Point(2, 287); + this.lblDownT.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.lblDownT.Name = "lblDownT"; - this.lblDownT.Size = new System.Drawing.Size(62, 15); + this.lblDownT.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.lblDownT.Size = new System.Drawing.Size(62, 18); this.lblDownT.TabIndex = 2; this.lblDownT.Text = "Down (°C)"; // @@ -447,11 +453,13 @@ private void InitializeComponent() // // lblFanSel // + this.lblFanSel.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblFanSel.AutoSize = true; - this.lblFanSel.Location = new System.Drawing.Point(3, 7); - this.lblFanSel.Margin = new System.Windows.Forms.Padding(3, 7, 0, 3); + this.lblFanSel.Location = new System.Drawing.Point(4, 6); + this.lblFanSel.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.lblFanSel.Name = "lblFanSel"; - this.lblFanSel.Size = new System.Drawing.Size(29, 15); + this.lblFanSel.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); + this.lblFanSel.Size = new System.Drawing.Size(29, 17); this.lblFanSel.TabIndex = 0; this.lblFanSel.Text = "Fan:"; // @@ -459,19 +467,22 @@ private void InitializeComponent() // this.cboFanSel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboFanSel.FormattingEnabled = true; - this.cboFanSel.Location = new System.Drawing.Point(35, 3); + this.cboFanSel.Location = new System.Drawing.Point(37, 3); + this.cboFanSel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.cboFanSel.Name = "cboFanSel"; - this.cboFanSel.Size = new System.Drawing.Size(120, 23); + this.cboFanSel.Size = new System.Drawing.Size(119, 23); this.cboFanSel.TabIndex = 1; this.cboFanSel.SelectedIndexChanged += new System.EventHandler(this.cboFanSel_IndexChanged); // // lblProfSel // + this.lblProfSel.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblProfSel.AutoSize = true; - this.lblProfSel.Location = new System.Drawing.Point(161, 7); - this.lblProfSel.Margin = new System.Windows.Forms.Padding(3, 7, 0, 3); + this.lblProfSel.Location = new System.Drawing.Point(164, 6); + this.lblProfSel.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.lblProfSel.Name = "lblProfSel"; - this.lblProfSel.Size = new System.Drawing.Size(44, 15); + this.lblProfSel.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); + this.lblProfSel.Size = new System.Drawing.Size(44, 17); this.lblProfSel.TabIndex = 2; this.lblProfSel.Text = "Profile:"; // @@ -479,16 +490,17 @@ private void InitializeComponent() // this.cboProfSel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboProfSel.FormattingEnabled = true; - this.cboProfSel.Location = new System.Drawing.Point(208, 3); + this.cboProfSel.Location = new System.Drawing.Point(212, 3); + this.cboProfSel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.cboProfSel.Name = "cboProfSel"; - this.cboProfSel.Size = new System.Drawing.Size(120, 23); + this.cboProfSel.Size = new System.Drawing.Size(119, 23); this.cboProfSel.TabIndex = 3; this.cboProfSel.SelectedIndexChanged += new System.EventHandler(this.cboProfSel_IndexChanged); // // btnProfAdd // - this.btnProfAdd.Location = new System.Drawing.Point(334, 3); - this.btnProfAdd.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3); + this.btnProfAdd.Location = new System.Drawing.Point(339, 3); + this.btnProfAdd.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.btnProfAdd.Name = "btnProfAdd"; this.btnProfAdd.Size = new System.Drawing.Size(23, 23); this.btnProfAdd.TabIndex = 4; @@ -498,8 +510,8 @@ private void InitializeComponent() // // btnProfDel // - this.btnProfDel.Location = new System.Drawing.Point(357, 3); - this.btnProfDel.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.btnProfDel.Location = new System.Drawing.Point(362, 3); + this.btnProfDel.Margin = new System.Windows.Forms.Padding(0, 3, 4, 3); this.btnProfDel.Name = "btnProfDel"; this.btnProfDel.Size = new System.Drawing.Size(23, 23); this.btnProfDel.TabIndex = 5; @@ -513,7 +525,7 @@ private void InitializeComponent() tabOptions.Controls.Add(tblExtra); tabOptions.Location = new System.Drawing.Point(4, 24); tabOptions.Name = "tabOptions"; - tabOptions.Size = new System.Drawing.Size(526, 392); + tabOptions.Size = new System.Drawing.Size(526, 336); tabOptions.TabIndex = 1; tabOptions.Text = "Extras"; // @@ -532,6 +544,7 @@ private void InitializeComponent() tblExtra.Controls.Add(flwKeyLight, 1, 3); tblExtra.Dock = System.Windows.Forms.DockStyle.Fill; tblExtra.Location = new System.Drawing.Point(0, 0); + tblExtra.Margin = new System.Windows.Forms.Padding(0); tblExtra.Name = "tblExtra"; tblExtra.RowCount = 5; tblExtra.RowStyles.Add(new System.Windows.Forms.RowStyle()); @@ -539,24 +552,26 @@ private void InitializeComponent() tblExtra.RowStyles.Add(new System.Windows.Forms.RowStyle()); tblExtra.RowStyles.Add(new System.Windows.Forms.RowStyle()); tblExtra.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - tblExtra.Size = new System.Drawing.Size(526, 392); + tblExtra.Size = new System.Drawing.Size(526, 336); tblExtra.TabIndex = 4; // // lblChgLim // this.lblChgLim.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblChgLim.AutoSize = true; - this.lblChgLim.Location = new System.Drawing.Point(55, 5); - this.lblChgLim.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.lblChgLim.Location = new System.Drawing.Point(56, 4); + this.lblChgLim.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.lblChgLim.Name = "lblChgLim"; - this.lblChgLim.Size = new System.Drawing.Size(75, 15); + this.lblChgLim.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.lblChgLim.Size = new System.Drawing.Size(75, 18); this.lblChgLim.TabIndex = 2; this.lblChgLim.Text = "Charge limit:"; // // numChgLim // this.numChgLim.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.numChgLim.Location = new System.Drawing.Point(136, 3); + this.numChgLim.Location = new System.Drawing.Point(133, 2); + this.numChgLim.Margin = new System.Windows.Forms.Padding(2); this.numChgLim.Name = "numChgLim"; this.numChgLim.Size = new System.Drawing.Size(50, 23); this.numChgLim.TabIndex = 3; @@ -566,7 +581,8 @@ private void InitializeComponent() // this.lblPerfMode.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblPerfMode.AutoSize = true; - this.lblPerfMode.Location = new System.Drawing.Point(18, 36); + this.lblPerfMode.Location = new System.Drawing.Point(19, 34); + this.lblPerfMode.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.lblPerfMode.Name = "lblPerfMode"; this.lblPerfMode.Size = new System.Drawing.Size(112, 15); this.lblPerfMode.TabIndex = 4; @@ -577,7 +593,8 @@ private void InitializeComponent() this.cboPerfMode.Anchor = System.Windows.Forms.AnchorStyles.Left; this.cboPerfMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboPerfMode.FormattingEnabled = true; - this.cboPerfMode.Location = new System.Drawing.Point(136, 32); + this.cboPerfMode.Location = new System.Drawing.Point(135, 30); + this.cboPerfMode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.cboPerfMode.Name = "cboPerfMode"; this.cboPerfMode.Size = new System.Drawing.Size(150, 23); this.cboPerfMode.TabIndex = 5; @@ -587,10 +604,11 @@ private void InitializeComponent() // this.lblWinFnSwap.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblWinFnSwap.AutoSize = true; - this.lblWinFnSwap.Location = new System.Drawing.Point(3, 61); - this.lblWinFnSwap.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.lblWinFnSwap.Location = new System.Drawing.Point(4, 60); + this.lblWinFnSwap.Margin = new System.Windows.Forms.Padding(4, 3, 0, 3); this.lblWinFnSwap.Name = "lblWinFnSwap"; - this.lblWinFnSwap.Size = new System.Drawing.Size(127, 15); + this.lblWinFnSwap.Padding = new System.Windows.Forms.Padding(0, 0, 0, 2); + this.lblWinFnSwap.Size = new System.Drawing.Size(127, 17); this.lblWinFnSwap.TabIndex = 6; this.lblWinFnSwap.Text = "Swap Win and Fn keys:"; // @@ -598,7 +616,8 @@ private void InitializeComponent() // this.chkWinFnSwap.Anchor = System.Windows.Forms.AnchorStyles.Left; this.chkWinFnSwap.AutoSize = true; - this.chkWinFnSwap.Location = new System.Drawing.Point(136, 61); + this.chkWinFnSwap.Location = new System.Drawing.Point(135, 59); + this.chkWinFnSwap.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.chkWinFnSwap.Name = "chkWinFnSwap"; this.chkWinFnSwap.Size = new System.Drawing.Size(68, 19); this.chkWinFnSwap.TabIndex = 7; @@ -610,8 +629,8 @@ private void InitializeComponent() // this.lblKeyLight.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblKeyLight.AutoSize = true; - this.lblKeyLight.Location = new System.Drawing.Point(19, 100); - this.lblKeyLight.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblKeyLight.Location = new System.Drawing.Point(19, 99); + this.lblKeyLight.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3); this.lblKeyLight.Name = "lblKeyLight"; this.lblKeyLight.Size = new System.Drawing.Size(112, 15); this.lblKeyLight.TabIndex = 8; @@ -623,17 +642,18 @@ private void InitializeComponent() flwKeyLight.Controls.Add(lblKeyLightLow); flwKeyLight.Controls.Add(this.tbKeyLight); flwKeyLight.Controls.Add(lblKeyLightHigh); - flwKeyLight.Location = new System.Drawing.Point(133, 83); + flwKeyLight.Location = new System.Drawing.Point(131, 81); flwKeyLight.Margin = new System.Windows.Forms.Padding(0); flwKeyLight.Name = "flwKeyLight"; - flwKeyLight.Size = new System.Drawing.Size(229, 49); + flwKeyLight.Size = new System.Drawing.Size(225, 51); flwKeyLight.TabIndex = 10; // // lblKeyLightLow // lblKeyLightLow.Anchor = System.Windows.Forms.AnchorStyles.Left; lblKeyLightLow.AutoSize = true; - lblKeyLightLow.Location = new System.Drawing.Point(3, 17); + lblKeyLightLow.Location = new System.Drawing.Point(3, 18); + lblKeyLightLow.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3); lblKeyLightLow.Name = "lblKeyLightLow"; lblKeyLightLow.Size = new System.Drawing.Size(24, 15); lblKeyLightLow.TabIndex = 10; @@ -641,8 +661,7 @@ private void InitializeComponent() // // tbKeyLight // - this.tbKeyLight.Location = new System.Drawing.Point(32, 2); - this.tbKeyLight.Margin = new System.Windows.Forms.Padding(2); + this.tbKeyLight.Location = new System.Drawing.Point(30, 3); this.tbKeyLight.Maximum = 3; this.tbKeyLight.Name = "tbKeyLight"; this.tbKeyLight.Size = new System.Drawing.Size(150, 45); @@ -654,7 +673,8 @@ private void InitializeComponent() // lblKeyLightHigh.Anchor = System.Windows.Forms.AnchorStyles.Left; lblKeyLightHigh.AutoSize = true; - lblKeyLightHigh.Location = new System.Drawing.Point(187, 17); + lblKeyLightHigh.Location = new System.Drawing.Point(183, 18); + lblKeyLightHigh.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); lblKeyLightHigh.Name = "lblKeyLightHigh"; lblKeyLightHigh.Size = new System.Drawing.Size(39, 15); lblKeyLightHigh.TabIndex = 11; @@ -668,8 +688,8 @@ private void InitializeComponent() tblFCBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); tblFCBottom.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); tblFCBottom.Controls.Add(this.chkFullBlast, 0, 0); - tblFCBottom.Controls.Add(this.btnApply, 2, 0); tblFCBottom.Controls.Add(this.btnRevert, 1, 0); + tblFCBottom.Controls.Add(this.btnApply, 2, 0); tblFCBottom.Dock = System.Windows.Forms.DockStyle.Fill; tblFCBottom.Location = new System.Drawing.Point(2, 369); tblFCBottom.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); @@ -691,22 +711,11 @@ private void InitializeComponent() this.chkFullBlast.UseVisualStyleBackColor = true; this.chkFullBlast.CheckedChanged += new System.EventHandler(this.chkFullBlast_Toggled); // - // btnApply - // - this.btnApply.Location = new System.Drawing.Point(458, 2); - this.btnApply.Margin = new System.Windows.Forms.Padding(2, 2, 3, 2); - this.btnApply.Name = "btnApply"; - this.btnApply.Size = new System.Drawing.Size(75, 25); - this.btnApply.TabIndex = 4; - this.btnApply.Text = "Apply"; - this.btnApply.UseVisualStyleBackColor = true; - this.btnApply.Click += new System.EventHandler(this.btnApply_Click); - // // btnRevert // this.btnRevert.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnRevert.Location = new System.Drawing.Point(378, 2); - this.btnRevert.Margin = new System.Windows.Forms.Padding(2, 2, 3, 2); + this.btnRevert.Location = new System.Drawing.Point(376, 2); + this.btnRevert.Margin = new System.Windows.Forms.Padding(2, 2, 4, 2); this.btnRevert.Name = "btnRevert"; this.btnRevert.Size = new System.Drawing.Size(75, 25); this.btnRevert.TabIndex = 5; @@ -714,6 +723,17 @@ private void InitializeComponent() this.btnRevert.UseVisualStyleBackColor = true; this.btnRevert.Click += new System.EventHandler(this.btnRevert_Click); // + // btnApply + // + this.btnApply.Location = new System.Drawing.Point(457, 2); + this.btnApply.Margin = new System.Windows.Forms.Padding(2, 2, 4, 2); + this.btnApply.Name = "btnApply"; + this.btnApply.Size = new System.Drawing.Size(75, 25); + this.btnApply.TabIndex = 4; + this.btnApply.Text = "Apply"; + this.btnApply.UseVisualStyleBackColor = true; + this.btnApply.Click += new System.EventHandler(this.btnApply_Click); + // // flwStats // flwStats.AutoSize = true; @@ -731,7 +751,8 @@ private void InitializeComponent() // lblStatus // this.lblStatus.AutoSize = true; - this.lblStatus.Location = new System.Drawing.Point(3, 0); + this.lblStatus.Location = new System.Drawing.Point(4, 0); + this.lblStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStatus.Name = "lblStatus"; this.lblStatus.Size = new System.Drawing.Size(39, 15); this.lblStatus.TabIndex = 0; @@ -740,7 +761,8 @@ private void InitializeComponent() // lblFanSpd // this.lblFanSpd.AutoSize = true; - this.lblFanSpd.Location = new System.Drawing.Point(48, 0); + this.lblFanSpd.Location = new System.Drawing.Point(51, 0); + this.lblFanSpd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblFanSpd.Name = "lblFanSpd"; this.lblFanSpd.Size = new System.Drawing.Size(86, 15); this.lblFanSpd.TabIndex = 1; @@ -750,7 +772,8 @@ private void InitializeComponent() // lblFanRPM // this.lblFanRPM.AutoSize = true; - this.lblFanRPM.Location = new System.Drawing.Point(140, 0); + this.lblFanRPM.Location = new System.Drawing.Point(145, 0); + this.lblFanRPM.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblFanRPM.Name = "lblFanRPM"; this.lblFanRPM.Size = new System.Drawing.Size(58, 15); this.lblFanRPM.TabIndex = 2; @@ -760,7 +783,8 @@ private void InitializeComponent() // lblTemp // this.lblTemp.AutoSize = true; - this.lblTemp.Location = new System.Drawing.Point(204, 0); + this.lblTemp.Location = new System.Drawing.Point(211, 0); + this.lblTemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblTemp.Name = "lblTemp"; this.lblTemp.Size = new System.Drawing.Size(65, 15); this.lblTemp.TabIndex = 3; @@ -772,9 +796,10 @@ private void InitializeComponent() this.tblMain.ColumnCount = 1; this.tblMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tblMain.Controls.Add(tcMain, 0, 0); - this.tblMain.Controls.Add(flwStats, 0, 2); this.tblMain.Controls.Add(tblFCBottom, 0, 1); + this.tblMain.Controls.Add(flwStats, 0, 2); this.tblMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tblMain.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tblMain.Location = new System.Drawing.Point(0, 24); this.tblMain.Margin = new System.Windows.Forms.Padding(0); this.tblMain.Name = "tblMain"; @@ -794,9 +819,9 @@ private void InitializeComponent() this.ClientSize = new System.Drawing.Size(540, 440); this.Controls.Add(this.tblMain); this.Controls.Add(menuStrip); - this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MainMenuStrip = menuStrip; + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.MaximizeBox = false; this.Name = "MainWindow"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -832,31 +857,25 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.ToolStripMenuItem tsiECMon; - private System.Windows.Forms.CheckBox chkFullBlast; - private System.Windows.Forms.Button btnApply; - private System.Windows.Forms.Label lblFanSpd; - private System.Windows.Forms.Label lblFanRPM; - private System.Windows.Forms.Label lblTemp; + private System.Windows.Forms.ToolStripMenuItem tsiFile; private System.Windows.Forms.ToolStripMenuItem tsiLoadConf; private System.Windows.Forms.ToolStripMenuItem tsiSaveConf; - private System.Windows.Forms.Label lblStatus; - private System.Windows.Forms.ToolStripMenuItem tsiExit; private System.Windows.Forms.ToolStripMenuItem tsiApply; - private System.Windows.Forms.Button btnRevert; private System.Windows.Forms.ToolStripMenuItem tsiRevert; - private System.Windows.Forms.ToolStripMenuItem tsiAbout; - private System.Windows.Forms.ToolStripMenuItem tsiSource; - private System.Windows.Forms.ToolStripMenuItem tsiUninstall; + private System.Windows.Forms.ToolStripMenuItem tsiExit; + private System.Windows.Forms.ToolStripMenuItem tsiOptions; + private System.Windows.Forms.ToolStripMenuItem tsiProfAdd; private System.Windows.Forms.ToolStripMenuItem tsiProfEdit; private System.Windows.Forms.ToolStripMenuItem tsiProfRename; private System.Windows.Forms.ToolStripMenuItem tsiProfChangeDesc; private System.Windows.Forms.ToolStripMenuItem tsiProfDel; + private System.Windows.Forms.ToolStripMenuItem tsiECtoConf; + private System.Windows.Forms.ToolStripMenuItem tsiECMon; private System.Windows.Forms.ToolStripMenuItem tsiStopSvc; - private System.Windows.Forms.ToolStripMenuItem tsiFile; - private System.Windows.Forms.ToolStripMenuItem tsiOptions; + private System.Windows.Forms.ToolStripMenuItem tsiUninstall; private System.Windows.Forms.ToolStripMenuItem tsiHelp; - private System.Windows.Forms.TableLayoutPanel tblMain; + private System.Windows.Forms.ToolStripMenuItem tsiAbout; + private System.Windows.Forms.ToolStripMenuItem tsiSource; private System.Windows.Forms.TableLayoutPanel tblFanControl; private System.Windows.Forms.TableLayoutPanel tblCurve; private System.Windows.Forms.Label lblSpeed; @@ -868,15 +887,21 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox cboProfSel; private System.Windows.Forms.Button btnProfAdd; private System.Windows.Forms.Button btnProfDel; - private System.Windows.Forms.NumericUpDown numChgLim; - private System.Windows.Forms.ComboBox cboPerfMode; - private System.Windows.Forms.CheckBox chkWinFnSwap; - private System.Windows.Forms.TrackBar tbKeyLight; private System.Windows.Forms.Label lblChgLim; + private System.Windows.Forms.NumericUpDown numChgLim; private System.Windows.Forms.Label lblPerfMode; + private System.Windows.Forms.ComboBox cboPerfMode; private System.Windows.Forms.Label lblWinFnSwap; + private System.Windows.Forms.CheckBox chkWinFnSwap; private System.Windows.Forms.Label lblKeyLight; - private System.Windows.Forms.ToolStripMenuItem tsiProfAdd; - private System.Windows.Forms.ToolStripMenuItem tsiECtoConf; + private System.Windows.Forms.TrackBar tbKeyLight; + private System.Windows.Forms.CheckBox chkFullBlast; + private System.Windows.Forms.Button btnApply; + private System.Windows.Forms.Button btnRevert; + private System.Windows.Forms.Label lblStatus; + private System.Windows.Forms.Label lblFanSpd; + private System.Windows.Forms.Label lblFanRPM; + private System.Windows.Forms.Label lblTemp; + private System.Windows.Forms.TableLayoutPanel tblMain; } } diff --git a/YAMDCC.ConfigEditor/MainWindow.cs b/YAMDCC.ConfigEditor/MainWindow.cs index 42d203f..179a04f 100644 --- a/YAMDCC.ConfigEditor/MainWindow.cs +++ b/YAMDCC.ConfigEditor/MainWindow.cs @@ -132,7 +132,8 @@ public MainWindow() tblCurve.Controls.Add(new Label { Dock = DockStyle.Fill, - Margin = new Padding(4), + Margin = new Padding(2), + Padding = new Padding(0, 0, 0, 3), Text = "Default", TextAlign = ContentAlignment.MiddleCenter, }, @@ -156,7 +157,8 @@ public MainWindow() tblCurve.Controls.Add(new Label { Dock = DockStyle.Fill, - Margin = new Padding(4), + Margin = new Padding(2), + Padding = new Padding(0, 0, 0, 3), Text = "Max", TextAlign = ContentAlignment.MiddleCenter, }, diff --git a/YAMDCC.ConfigEditor/MainWindow.resx b/YAMDCC.ConfigEditor/MainWindow.resx index 1216582..c5f2171 100644 --- a/YAMDCC.ConfigEditor/MainWindow.resx +++ b/YAMDCC.ConfigEditor/MainWindow.resx @@ -159,21 +159,12 @@ False - - False - False False - - False - - - False - False @@ -183,10 +174,10 @@ False - + False - + False