Fixed some font issues.
authormoel.mich
Sat, 15 May 2010 12:50:28 +0000
changeset 11714329d236f05
parent 116 c92e98bc2073
child 118 407f98562c3b
Fixed some font issues.
GUI/AboutBox.Designer.cs
GUI/MainForm.Designer.cs
GUI/PlotPanel.Designer.cs
GUI/SensorNotifyIcon.cs
     1.1 --- a/GUI/AboutBox.Designer.cs	Sat May 15 11:34:36 2010 +0000
     1.2 +++ b/GUI/AboutBox.Designer.cs	Sat May 15 12:50:28 2010 +0000
     1.3 @@ -97,8 +97,7 @@
     1.4        // 
     1.5        // label1
     1.6        // 
     1.7 -      this.label1.AutoSize = true;
     1.8 -      this.label1.Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Bold);
     1.9 +      this.label1.AutoSize = true;      
    1.10        this.label1.Location = new System.Drawing.Point(85, 13);
    1.11        this.label1.Margin = new System.Windows.Forms.Padding(12, 0, 12, 0);
    1.12        this.label1.Name = "label1";
    1.13 @@ -183,8 +182,7 @@
    1.14        this.Controls.Add(this.label2);
    1.15        this.Controls.Add(this.label1);
    1.16        this.Controls.Add(this.pictureBox1);
    1.17 -      this.Controls.Add(this.okButton);
    1.18 -      this.Font = new System.Drawing.Font("Segoe UI", 9F);
    1.19 +      this.Controls.Add(this.okButton);      
    1.20        this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
    1.21        this.MaximizeBox = false;
    1.22        this.MinimizeBox = false;
     2.1 --- a/GUI/MainForm.Designer.cs	Sat May 15 11:34:36 2010 +0000
     2.2 +++ b/GUI/MainForm.Designer.cs	Sat May 15 12:50:28 2010 +0000
     2.3 @@ -122,8 +122,7 @@
     2.4        this.treeView.Columns.Add(this.limit);
     2.5        this.treeView.DefaultToolTipProvider = null;
     2.6        this.treeView.Dock = System.Windows.Forms.DockStyle.Fill;
     2.7 -      this.treeView.DragDropMarkColor = System.Drawing.Color.Black;
     2.8 -      this.treeView.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     2.9 +      this.treeView.DragDropMarkColor = System.Drawing.Color.Black;      
    2.10        this.treeView.FullRowSelect = true;
    2.11        this.treeView.GridLineStyle = Aga.Controls.Tree.GridLineStyle.Horizontal;
    2.12        this.treeView.LineColor = System.Drawing.SystemColors.ControlDark;
    2.13 @@ -440,8 +439,7 @@
    2.14        // plotPanel
    2.15        // 
    2.16        this.plotPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
    2.17 -      this.plotPanel.Dock = System.Windows.Forms.DockStyle.Fill;
    2.18 -      this.plotPanel.Font = new System.Drawing.Font("Segoe UI", 9F);
    2.19 +      this.plotPanel.Dock = System.Windows.Forms.DockStyle.Fill;      
    2.20        this.plotPanel.Location = new System.Drawing.Point(0, 0);
    2.21        this.plotPanel.Name = "plotPanel";
    2.22        this.plotPanel.Size = new System.Drawing.Size(478, 198);
    2.23 @@ -457,8 +455,7 @@
    2.24        this.notifyContextMenuStrip.Size = new System.Drawing.Size(137, 54);
    2.25        // 
    2.26        // hideShowToolStripMenuItem
    2.27 -      // 
    2.28 -      this.hideShowToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
    2.29 +      //       
    2.30        this.hideShowToolStripMenuItem.Name = "hideShowToolStripMenuItem";
    2.31        this.hideShowToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
    2.32        this.hideShowToolStripMenuItem.Text = "Hide/Show";
    2.33 @@ -500,8 +497,7 @@
    2.34        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    2.35        this.ClientSize = new System.Drawing.Size(478, 792);
    2.36        this.Controls.Add(this.splitContainer);
    2.37 -      this.Controls.Add(this.menuStrip);
    2.38 -      this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    2.39 +      this.Controls.Add(this.menuStrip);      
    2.40        this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
    2.41        this.MainMenuStrip = this.menuStrip;
    2.42        this.Name = "MainForm";
     3.1 --- a/GUI/PlotPanel.Designer.cs	Sat May 15 11:34:36 2010 +0000
     3.2 +++ b/GUI/PlotPanel.Designer.cs	Sat May 15 12:50:28 2010 +0000
     3.3 @@ -67,7 +67,6 @@
     3.4        this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
     3.5        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     3.6        this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
     3.7 -      this.Font = new System.Drawing.Font("Segoe UI", 9F);
     3.8        this.Name = "PlotPanel";
     3.9        this.Size = new System.Drawing.Size(170, 168);
    3.10        this.ResumeLayout(false);
     4.1 --- a/GUI/SensorNotifyIcon.cs	Sat May 15 11:34:36 2010 +0000
     4.2 +++ b/GUI/SensorNotifyIcon.cs	Sat May 15 12:50:28 2010 +0000
     4.3 @@ -75,7 +75,7 @@
     4.4          "traycolor").ToString(), defaultColor);      
     4.5        
     4.6        this.pen = new Pen(Color.FromArgb(96, Color.Black));
     4.7 -      this.font = new Font(SystemFonts.MessageBoxFont.FontFamily, 9);
     4.8 +      this.font = SystemFonts.MessageBoxFont;
     4.9  
    4.10        ContextMenuStrip contextMenuStrip = new ContextMenuStrip();
    4.11        ToolStripMenuItem removeItem = new ToolStripMenuItem("Remove");
    4.12 @@ -98,8 +98,11 @@
    4.13  
    4.14        this.bitmap = new Bitmap(16, 16, PixelFormat.Format32bppArgb);
    4.15        this.graphics = Graphics.FromImage(this.bitmap);
    4.16 -      this.graphics.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
    4.17 -      this.graphics.SmoothingMode = SmoothingMode.HighQuality;
    4.18 +
    4.19 +      if (Environment.OSVersion.Version.Major > 5) {
    4.20 +        this.graphics.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
    4.21 +        this.graphics.SmoothingMode = SmoothingMode.HighQuality;
    4.22 +      }
    4.23      }
    4.24  
    4.25      public ISensor Sensor {
    4.26 @@ -137,7 +140,6 @@
    4.27        if (darkBrush != null)
    4.28          darkBrush.Dispose();
    4.29        pen.Dispose();
    4.30 -      font.Dispose();
    4.31        graphics.Dispose();      
    4.32        bitmap.Dispose();      
    4.33      }
    4.34 @@ -164,7 +166,7 @@
    4.35  
    4.36        graphics.Clear(Color.Black);
    4.37        TextRenderer.DrawText(graphics, GetString(), font,
    4.38 -        new Point(-2, 0), Color.White, Color.Black);
    4.39 +        new Point(-2, 0), Color.White, Color.Black);        
    4.40  
    4.41        BitmapData data = bitmap.LockBits(
    4.42          new Rectangle(0, 0, bitmap.Width, bitmap.Height),