Fixed dpi scaling. Rearranged menus.

tig · Oct 7, 2019 · 9e62f46 · 9e62f46
1 parent 9fb1962
commit 9e62f46
Show file tree

Hide file tree

Showing 9 changed files with 562 additions and 526 deletions.
diff --git a/AboutBox.cs b/AboutBox.cs
@@ -66,18 +66,19 @@ private void InitializeComponent() {
             // 
             // _labelTitle
             // 
-            this._labelTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this._labelTitle.Location = new System.Drawing.Point(216, 16);
+            this._labelTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F);
+            this._labelTitle.Location = new System.Drawing.Point(206, 16);
             this._labelTitle.Name = "_labelTitle";
-            this._labelTitle.Size = new System.Drawing.Size(280, 41);
+            this._labelTitle.Size = new System.Drawing.Size(290, 41);
             this._labelTitle.TabIndex = 0;
             this._labelTitle.Text = "MCE Controller";
+            this._labelTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // _linkLabelMceController
             // 
-            this._linkLabelMceController.Location = new System.Drawing.Point(216, 144);
+            this._linkLabelMceController.Location = new System.Drawing.Point(220, 144);
             this._linkLabelMceController.Name = "_linkLabelMceController";
-            this._linkLabelMceController.Size = new System.Drawing.Size(280, 16);
+            this._linkLabelMceController.Size = new System.Drawing.Size(272, 16);
             this._linkLabelMceController.TabIndex = 3;
             this._linkLabelMceController.TabStop = true;
             this._linkLabelMceController.Tag = "https://github.com/tig/mcec/blob/master/license.md";
@@ -87,17 +88,17 @@ private void InitializeComponent() {
             // _buttonOk
             // 
             this._buttonOk.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this._buttonOk.Location = new System.Drawing.Point(416, 184);
+            this._buttonOk.Location = new System.Drawing.Point(416, 176);
             this._buttonOk.Name = "_buttonOk";
-            this._buttonOk.Size = new System.Drawing.Size(80, 32);
+            this._buttonOk.Size = new System.Drawing.Size(80, 27);
             this._buttonOk.TabIndex = 0;
             this._buttonOk.Text = "OK";
             this._buttonOk.Click += new System.EventHandler(this.ButtonOkClick);
             // 
             // _linkLabelKindelSystems
             // 
             this._linkLabelKindelSystems.AutoSize = true;
-            this._linkLabelKindelSystems.Location = new System.Drawing.Point(216, 88);
+            this._linkLabelKindelSystems.Location = new System.Drawing.Point(220, 88);
             this._linkLabelKindelSystems.Name = "_linkLabelKindelSystems";
             this._linkLabelKindelSystems.Size = new System.Drawing.Size(145, 13);
             this._linkLabelKindelSystems.TabIndex = 1;
@@ -108,7 +109,7 @@ private void InitializeComponent() {
             // 
             // _labelSummary
             // 
-            this._labelSummary.Location = new System.Drawing.Point(216, 112);
+            this._labelSummary.Location = new System.Drawing.Point(220, 112);
             this._labelSummary.Name = "_labelSummary";
             this._labelSummary.Size = new System.Drawing.Size(272, 32);
             this._labelSummary.TabIndex = 2;
@@ -129,17 +130,17 @@ private void InitializeComponent() {
             // _label1
             // 
             this._label1.AutoSize = true;
-            //this._label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
-            this._label1.Location = new System.Drawing.Point(56, 176);
+            this._label1.Location = new System.Drawing.Point(51, 183);
             this._label1.Name = "_label1";
-            this._label1.Size = new System.Drawing.Size(96, 12);
+            this._label1.Size = new System.Drawing.Size(113, 13);
             this._label1.TabIndex = 7;
             this._label1.Text = "Icon by Guillen Design";
+            this._label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // labelVersion
             // 
             this.labelVersion.AutoSize = true;
-            this.labelVersion.Location = new System.Drawing.Point(216, 64);
+            this.labelVersion.Location = new System.Drawing.Point(220, 64);
             this.labelVersion.Name = "labelVersion";
             this.labelVersion.Size = new System.Drawing.Size(78, 13);
             this.labelVersion.TabIndex = 7;
@@ -151,7 +152,7 @@ private void InitializeComponent() {
             this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
             this.BackColor = System.Drawing.SystemColors.Window;
             this.CancelButton = this._buttonOk;
-            this.ClientSize = new System.Drawing.Size(507, 228);
+            this.ClientSize = new System.Drawing.Size(507, 214);
             this.ControlBox = false;
             this.Controls.Add(this.labelVersion);
             this.Controls.Add(this._label1);
@@ -161,7 +162,6 @@ private void InitializeComponent() {
             this.Controls.Add(this._buttonOk);
             this.Controls.Add(this._linkLabelMceController);
             this.Controls.Add(this._labelTitle);
-            //this.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;

diff --git a/CommandWindow.Designer.cs b/CommandWindow.Designer.cs
diff --git a/CommandWindow.cs b/CommandWindow.cs
@@ -74,5 +74,6 @@ private void listCmds_DoubleClick(object sender, EventArgs e) {
             textBoxSendCommand.Text = listCmds.SelectedItems[0].Text;
             Send();
         }
+
     }
 }
diff --git a/MCEControl.csproj b/MCEControl.csproj
@@ -380,20 +380,13 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>if "$(VisualStudioVersion)"=="14.0" set textTemplatingPath="%25CommonProgramFiles(x86)%25\Microsoft Shared\TextTemplating\14.0\texttransform.exe"
-if "$(VisualStudioVersion)"=="16.0" set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2019\Community\Common7\IDE\TextTransform.exe"
-%25textTemplatingPath%25 "$(SolutionDir)AssemblyFileVersion.tt"</PreBuildEvent>
-    <PostBuildEvent>if "$(ConfigurationName)"=="Debug" goto SKIP
+    <PreBuildEvent>"$(DevEnvDir)TextTransform.exe" -out "$(SolutionDir)AssemblyFileVersion.cs" "$(SolutionDir)AssemblyFileVersion.tt"</PreBuildEvent>
+    <PostBuildEvent>if "$(ConfigurationName)"=="Release" copy "$(SolutionDir)\install_version.txt" "$(SolutionDir)\docs"
 
-copy "$(SolutionDir)\install_version.txt" "$(SolutionDir)\docs"
-
-if "$(VisualStudioVersion)"=="14.0" set textTemplatingPath="%25CommonProgramFiles(x86)%25\Microsoft Shared\TextTemplating\14.0\texttransform.exe"
-if "$(VisualStudioVersion)"=="16.0" set textTemplatingPath="%25ProgramFiles(x86)%25\Microsoft Visual Studio\2019\Community\Common7\IDE\TextTransform.exe"
-%25textTemplatingPath%25 "$(SolutionDir)Installer.tt"
+"$(DevEnvDir)TextTransform.exe" "$(SolutionDir)Installer.tt"
 copy "$(SolutionDir)Installer.nsi" "$(SolutionDir)Installer" 
-copy "$(SolutionDir)bin\Release\MCEControl.exe" "$(SolutionDir)Installer" 
-copy "$(SolutionDir)bin\Release\log4net.dll" "$(SolutionDir)Installer"
-
-:SKIP</PostBuildEvent>
+copy "$(SolutionDir)bin\$(ConfigurationName)\MCEControl.exe" "$(SolutionDir)Installer" 
+copy "$(SolutionDir)bin\$(ConfigurationName)\log4net.dll" "$(SolutionDir)Installer"
+</PostBuildEvent>
   </PropertyGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up @@
                 textBoxSendCommand.Text = listCmds.SelectedItems[0].Text;
                 Send();
             }
         }
     }