1.1 --- a/GUI/AboutBox.Designer.cs Wed Feb 22 23:36:26 2012 +0000
1.2 +++ b/GUI/AboutBox.Designer.cs Sun May 27 14:23:31 2012 +0000
1.3 @@ -1,38 +1,11 @@
1.4 /*
1.5 -
1.6 - Version: MPL 1.1/GPL 2.0/LGPL 2.1
1.7 -
1.8 - The contents of this file are subject to the Mozilla Public License Version
1.9 - 1.1 (the "License"); you may not use this file except in compliance with
1.10 - the License. You may obtain a copy of the License at
1.11
1.12 - http://www.mozilla.org/MPL/
1.13 -
1.14 - Software distributed under the License is distributed on an "AS IS" basis,
1.15 - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1.16 - for the specific language governing rights and limitations under the License.
1.17 -
1.18 - The Original Code is the Open Hardware Monitor code.
1.19 -
1.20 - The Initial Developer of the Original Code is
1.21 - Michael Möller <m.moeller@gmx.ch>.
1.22 - Portions created by the Initial Developer are Copyright (C) 2009-2012
1.23 - the Initial Developer. All Rights Reserved.
1.24 -
1.25 - Contributor(s):
1.26 -
1.27 - Alternatively, the contents of this file may be used under the terms of
1.28 - either the GNU General Public License Version 2 or later (the "GPL"), or
1.29 - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1.30 - in which case the provisions of the GPL or the LGPL are applicable instead
1.31 - of those above. If you wish to allow use of your version of this file only
1.32 - under the terms of either the GPL or the LGPL, and not to allow others to
1.33 - use your version of this file under the terms of the MPL, indicate your
1.34 - decision by deleting the provisions above and replace them with the notice
1.35 - and other provisions required by the GPL or the LGPL. If you do not delete
1.36 - the provisions above, a recipient may use your version of this file under
1.37 - the terms of any one of the MPL, the GPL or the LGPL.
1.38 + This Source Code Form is subject to the terms of the Mozilla Public
1.39 + License, v. 2.0. If a copy of the MPL was not distributed with this
1.40 + file, You can obtain one at http://mozilla.org/MPL/2.0/.
1.41
1.42 + Copyright (C) 2009-2012 Michael Möller <mmoeller@openhardwaremonitor.org>
1.43 +
1.44 */
1.45
1.46 namespace OpenHardwareMonitor.GUI {
1.47 @@ -66,19 +39,17 @@
1.48 this.label1 = new System.Windows.Forms.Label();
1.49 this.label2 = new System.Windows.Forms.Label();
1.50 this.label3 = new System.Windows.Forms.Label();
1.51 - this.label4 = new System.Windows.Forms.Label();
1.52 - this.linkLabel = new System.Windows.Forms.LinkLabel();
1.53 - this.label5 = new System.Windows.Forms.Label();
1.54 + this.projectLinkLabel = new System.Windows.Forms.LinkLabel();
1.55 this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
1.56 + this.licenseLinkLabel = new System.Windows.Forms.LinkLabel();
1.57 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
1.58 - this.flowLayoutPanel1.SuspendLayout();
1.59 this.SuspendLayout();
1.60 //
1.61 // okButton
1.62 //
1.63 this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1.64 this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
1.65 - this.okButton.Location = new System.Drawing.Point(358, 110);
1.66 + this.okButton.Location = new System.Drawing.Point(269, 79);
1.67 this.okButton.Name = "okButton";
1.68 this.okButton.Size = new System.Drawing.Size(75, 23);
1.69 this.okButton.TabIndex = 0;
1.70 @@ -98,7 +69,7 @@
1.71 // label1
1.72 //
1.73 this.label1.AutoSize = true;
1.74 - this.label1.Location = new System.Drawing.Point(73, 11);
1.75 + this.label1.Location = new System.Drawing.Point(74, 12);
1.76 this.label1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
1.77 this.label1.Name = "label1";
1.78 this.label1.Size = new System.Drawing.Size(120, 13);
1.79 @@ -108,76 +79,67 @@
1.80 // label2
1.81 //
1.82 this.label2.AutoSize = true;
1.83 - this.label2.Location = new System.Drawing.Point(74, 47);
1.84 + this.label2.Location = new System.Drawing.Point(74, 46);
1.85 this.label2.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
1.86 this.label2.Name = "label2";
1.87 - this.label2.Size = new System.Drawing.Size(359, 13);
1.88 + this.label2.Size = new System.Drawing.Size(273, 13);
1.89 this.label2.TabIndex = 3;
1.90 - this.label2.Text = "Copyright © 2009-2012 Michael Möller and contributers. All rights reserved.";
1.91 + this.label2.Text = "Copyright © 2009-2012 Michael Möller and contributers. ";
1.92 //
1.93 // label3
1.94 //
1.95 this.label3.AutoSize = true;
1.96 - this.label3.Location = new System.Drawing.Point(74, 31);
1.97 + this.label3.Location = new System.Drawing.Point(74, 29);
1.98 this.label3.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
1.99 this.label3.Name = "label3";
1.100 this.label3.Size = new System.Drawing.Size(127, 13);
1.101 this.label3.TabIndex = 4;
1.102 this.label3.Text = "Version 9.0.30729.1 Beta";
1.103 //
1.104 - // label4
1.105 + // projectLinkLabel
1.106 //
1.107 - this.label4.AutoSize = true;
1.108 - this.label4.Location = new System.Drawing.Point(8, 82);
1.109 - this.label4.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
1.110 - this.label4.Name = "label4";
1.111 - this.label4.Size = new System.Drawing.Size(374, 13);
1.112 - this.label4.TabIndex = 5;
1.113 - this.label4.Text = "The source code is available under the terms of the Mozilla Public License 1.1";
1.114 - //
1.115 - // linkLabel
1.116 - //
1.117 - this.linkLabel.AutoSize = true;
1.118 - this.linkLabel.Location = new System.Drawing.Point(122, 0);
1.119 - this.linkLabel.Margin = new System.Windows.Forms.Padding(0, 0, 10, 0);
1.120 - this.linkLabel.Name = "linkLabel";
1.121 - this.linkLabel.Size = new System.Drawing.Size(156, 13);
1.122 - this.linkLabel.TabIndex = 6;
1.123 - this.linkLabel.TabStop = true;
1.124 - this.linkLabel.Text = "Open Hardware Monitor Project";
1.125 - this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
1.126 - //
1.127 - // label5
1.128 - //
1.129 - this.label5.AutoSize = true;
1.130 - this.label5.Location = new System.Drawing.Point(0, 0);
1.131 - this.label5.Margin = new System.Windows.Forms.Padding(0);
1.132 - this.label5.Name = "label5";
1.133 - this.label5.Size = new System.Drawing.Size(122, 13);
1.134 - this.label5.TabIndex = 7;
1.135 - this.label5.Text = "from the project website:";
1.136 + this.projectLinkLabel.AutoSize = true;
1.137 + this.projectLinkLabel.Location = new System.Drawing.Point(164, 80);
1.138 + this.projectLinkLabel.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
1.139 + this.projectLinkLabel.Name = "projectLinkLabel";
1.140 + this.projectLinkLabel.Size = new System.Drawing.Size(82, 13);
1.141 + this.projectLinkLabel.TabIndex = 6;
1.142 + this.projectLinkLabel.TabStop = true;
1.143 + this.projectLinkLabel.Text = "Project Website";
1.144 + this.projectLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
1.145 //
1.146 // flowLayoutPanel1
1.147 //
1.148 this.flowLayoutPanel1.AutoSize = true;
1.149 this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
1.150 - this.flowLayoutPanel1.Controls.Add(this.label5);
1.151 - this.flowLayoutPanel1.Controls.Add(this.linkLabel);
1.152 this.flowLayoutPanel1.Location = new System.Drawing.Point(10, 100);
1.153 this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
1.154 this.flowLayoutPanel1.Name = "flowLayoutPanel1";
1.155 - this.flowLayoutPanel1.Size = new System.Drawing.Size(288, 13);
1.156 + this.flowLayoutPanel1.Size = new System.Drawing.Size(0, 0);
1.157 this.flowLayoutPanel1.TabIndex = 8;
1.158 //
1.159 + // licenseLinkLabel
1.160 + //
1.161 + this.licenseLinkLabel.AutoSize = true;
1.162 + this.licenseLinkLabel.Location = new System.Drawing.Point(25, 80);
1.163 + this.licenseLinkLabel.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
1.164 + this.licenseLinkLabel.Name = "licenseLinkLabel";
1.165 + this.licenseLinkLabel.Size = new System.Drawing.Size(107, 13);
1.166 + this.licenseLinkLabel.TabIndex = 9;
1.167 + this.licenseLinkLabel.TabStop = true;
1.168 + this.licenseLinkLabel.Text = "Licensing Information";
1.169 + this.licenseLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
1.170 + //
1.171 // AboutBox
1.172 //
1.173 this.AcceptButton = this.okButton;
1.174 this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
1.175 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
1.176 this.AutoSize = true;
1.177 - this.ClientSize = new System.Drawing.Size(443, 145);
1.178 + this.ClientSize = new System.Drawing.Size(359, 115);
1.179 + this.Controls.Add(this.licenseLinkLabel);
1.180 this.Controls.Add(this.flowLayoutPanel1);
1.181 - this.Controls.Add(this.label4);
1.182 + this.Controls.Add(this.projectLinkLabel);
1.183 this.Controls.Add(this.label3);
1.184 this.Controls.Add(this.label2);
1.185 this.Controls.Add(this.label1);
1.186 @@ -191,8 +153,6 @@
1.187 this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
1.188 this.Text = "About";
1.189 ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
1.190 - this.flowLayoutPanel1.ResumeLayout(false);
1.191 - this.flowLayoutPanel1.PerformLayout();
1.192 this.ResumeLayout(false);
1.193 this.PerformLayout();
1.194
1.195 @@ -205,9 +165,8 @@
1.196 private System.Windows.Forms.Label label1;
1.197 private System.Windows.Forms.Label label2;
1.198 private System.Windows.Forms.Label label3;
1.199 - private System.Windows.Forms.Label label4;
1.200 - private System.Windows.Forms.LinkLabel linkLabel;
1.201 - private System.Windows.Forms.Label label5;
1.202 + private System.Windows.Forms.LinkLabel projectLinkLabel;
1.203 private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
1.204 + private System.Windows.Forms.LinkLabel licenseLinkLabel;
1.205 }
1.206 }
1.207 \ No newline at end of file