diff --git a/Csharp/Calculator/Calculator/Form1.Designer.cs b/Csharp/Calculator/Calculator/Form1.Designer.cs index 325b92b..235fd00 100644 --- a/Csharp/Calculator/Calculator/Form1.Designer.cs +++ b/Csharp/Calculator/Calculator/Form1.Designer.cs @@ -53,17 +53,19 @@ private void InitializeComponent() // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(16, 60); + this.textBox1.Location = new System.Drawing.Point(21, 75); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Name = "textBox1"; this.textBox1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.textBox1.Size = new System.Drawing.Size(254, 21); + this.textBox1.Size = new System.Drawing.Size(337, 25); this.textBox1.TabIndex = 0; // // button1 // - this.button1.Location = new System.Drawing.Point(16, 96); + this.button1.Location = new System.Drawing.Point(21, 120); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(46, 41); + this.button1.Size = new System.Drawing.Size(61, 51); this.button1.TabIndex = 1; this.button1.Text = "1"; this.button1.UseVisualStyleBackColor = true; @@ -71,9 +73,10 @@ private void InitializeComponent() // // button2 // - this.button2.Location = new System.Drawing.Point(68, 96); + this.button2.Location = new System.Drawing.Point(91, 120); + this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(46, 41); + this.button2.Size = new System.Drawing.Size(61, 51); this.button2.TabIndex = 2; this.button2.Text = "2"; this.button2.UseVisualStyleBackColor = true; @@ -81,9 +84,10 @@ private void InitializeComponent() // // button3 // - this.button3.Location = new System.Drawing.Point(120, 96); + this.button3.Location = new System.Drawing.Point(160, 120); + this.button3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(46, 41); + this.button3.Size = new System.Drawing.Size(61, 51); this.button3.TabIndex = 3; this.button3.Text = "3"; this.button3.UseVisualStyleBackColor = true; @@ -91,9 +95,10 @@ private void InitializeComponent() // // button4 // - this.button4.Location = new System.Drawing.Point(16, 142); + this.button4.Location = new System.Drawing.Point(21, 178); + this.button4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(46, 41); + this.button4.Size = new System.Drawing.Size(61, 51); this.button4.TabIndex = 4; this.button4.Text = "4"; this.button4.UseVisualStyleBackColor = true; @@ -101,9 +106,10 @@ private void InitializeComponent() // // button5 // - this.button5.Location = new System.Drawing.Point(68, 142); + this.button5.Location = new System.Drawing.Point(91, 178); + this.button5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(46, 41); + this.button5.Size = new System.Drawing.Size(61, 51); this.button5.TabIndex = 5; this.button5.Text = "5"; this.button5.UseVisualStyleBackColor = true; @@ -111,9 +117,10 @@ private void InitializeComponent() // // button6 // - this.button6.Location = new System.Drawing.Point(120, 142); + this.button6.Location = new System.Drawing.Point(160, 178); + this.button6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(46, 41); + this.button6.Size = new System.Drawing.Size(61, 51); this.button6.TabIndex = 6; this.button6.Text = "6"; this.button6.UseVisualStyleBackColor = true; @@ -121,9 +128,10 @@ private void InitializeComponent() // // button7 // - this.button7.Location = new System.Drawing.Point(16, 185); + this.button7.Location = new System.Drawing.Point(21, 231); + this.button7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(46, 41); + this.button7.Size = new System.Drawing.Size(61, 51); this.button7.TabIndex = 7; this.button7.Text = "7"; this.button7.UseVisualStyleBackColor = true; @@ -131,9 +139,10 @@ private void InitializeComponent() // // button8 // - this.button8.Location = new System.Drawing.Point(68, 185); + this.button8.Location = new System.Drawing.Point(91, 231); + this.button8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(46, 41); + this.button8.Size = new System.Drawing.Size(61, 51); this.button8.TabIndex = 8; this.button8.Text = "8"; this.button8.UseVisualStyleBackColor = true; @@ -141,9 +150,10 @@ private void InitializeComponent() // // button9 // - this.button9.Location = new System.Drawing.Point(120, 185); + this.button9.Location = new System.Drawing.Point(160, 231); + this.button9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(46, 41); + this.button9.Size = new System.Drawing.Size(61, 51); this.button9.TabIndex = 9; this.button9.Text = "9"; this.button9.UseVisualStyleBackColor = true; @@ -151,9 +161,10 @@ private void InitializeComponent() // // button0 // - this.button0.Location = new System.Drawing.Point(16, 231); + this.button0.Location = new System.Drawing.Point(21, 289); + this.button0.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button0.Name = "button0"; - this.button0.Size = new System.Drawing.Size(98, 41); + this.button0.Size = new System.Drawing.Size(131, 51); this.button0.TabIndex = 10; this.button0.Text = "0"; this.button0.UseVisualStyleBackColor = true; @@ -161,18 +172,20 @@ private void InitializeComponent() // // buttonPoint // - this.buttonPoint.Location = new System.Drawing.Point(120, 232); + this.buttonPoint.Location = new System.Drawing.Point(160, 290); + this.buttonPoint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonPoint.Name = "buttonPoint"; - this.buttonPoint.Size = new System.Drawing.Size(46, 41); + this.buttonPoint.Size = new System.Drawing.Size(61, 51); this.buttonPoint.TabIndex = 11; this.buttonPoint.Text = "."; this.buttonPoint.UseVisualStyleBackColor = true; // // buttonAdd // - this.buttonAdd.Location = new System.Drawing.Point(172, 231); + this.buttonAdd.Location = new System.Drawing.Point(229, 289); + this.buttonAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(46, 41); + this.buttonAdd.Size = new System.Drawing.Size(61, 51); this.buttonAdd.TabIndex = 12; this.buttonAdd.Text = "+"; this.buttonAdd.UseVisualStyleBackColor = true; @@ -180,9 +193,10 @@ private void InitializeComponent() // // buttonSub // - this.buttonSub.Location = new System.Drawing.Point(172, 185); + this.buttonSub.Location = new System.Drawing.Point(229, 231); + this.buttonSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonSub.Name = "buttonSub"; - this.buttonSub.Size = new System.Drawing.Size(46, 41); + this.buttonSub.Size = new System.Drawing.Size(61, 51); this.buttonSub.TabIndex = 13; this.buttonSub.Text = "-"; this.buttonSub.UseVisualStyleBackColor = true; @@ -190,9 +204,10 @@ private void InitializeComponent() // // buttonMul // - this.buttonMul.Location = new System.Drawing.Point(172, 142); + this.buttonMul.Location = new System.Drawing.Point(229, 178); + this.buttonMul.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonMul.Name = "buttonMul"; - this.buttonMul.Size = new System.Drawing.Size(46, 41); + this.buttonMul.Size = new System.Drawing.Size(61, 51); this.buttonMul.TabIndex = 14; this.buttonMul.Text = "*"; this.buttonMul.UseVisualStyleBackColor = true; @@ -200,9 +215,10 @@ private void InitializeComponent() // // buttonDiv // - this.buttonDiv.Location = new System.Drawing.Point(172, 96); + this.buttonDiv.Location = new System.Drawing.Point(229, 120); + this.buttonDiv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonDiv.Name = "buttonDiv"; - this.buttonDiv.Size = new System.Drawing.Size(46, 41); + this.buttonDiv.Size = new System.Drawing.Size(61, 51); this.buttonDiv.TabIndex = 15; this.buttonDiv.Text = "/"; this.buttonDiv.UseVisualStyleBackColor = true; @@ -210,9 +226,10 @@ private void InitializeComponent() // // buttonEquals // - this.buttonEquals.Location = new System.Drawing.Point(224, 184); + this.buttonEquals.Location = new System.Drawing.Point(299, 230); + this.buttonEquals.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonEquals.Name = "buttonEquals"; - this.buttonEquals.Size = new System.Drawing.Size(46, 88); + this.buttonEquals.Size = new System.Drawing.Size(61, 110); this.buttonEquals.TabIndex = 16; this.buttonEquals.Text = "="; this.buttonEquals.UseVisualStyleBackColor = true; @@ -220,9 +237,10 @@ private void InitializeComponent() // // buttonRec // - this.buttonRec.Location = new System.Drawing.Point(224, 142); + this.buttonRec.Location = new System.Drawing.Point(299, 178); + this.buttonRec.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRec.Name = "buttonRec"; - this.buttonRec.Size = new System.Drawing.Size(46, 41); + this.buttonRec.Size = new System.Drawing.Size(61, 51); this.buttonRec.TabIndex = 17; this.buttonRec.Text = "1/x"; this.buttonRec.UseVisualStyleBackColor = true; @@ -230,9 +248,10 @@ private void InitializeComponent() // // buttonClear // - this.buttonClear.Location = new System.Drawing.Point(224, 96); + this.buttonClear.Location = new System.Drawing.Point(299, 120); + this.buttonClear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonClear.Name = "buttonClear"; - this.buttonClear.Size = new System.Drawing.Size(46, 41); + this.buttonClear.Size = new System.Drawing.Size(61, 51); this.buttonClear.TabIndex = 18; this.buttonClear.Text = "C"; this.buttonClear.UseVisualStyleBackColor = true; @@ -242,9 +261,10 @@ private void InitializeComponent() // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Verdana", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(40, 9); + this.label1.Location = new System.Drawing.Point(53, 11); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(218, 35); + this.label1.Size = new System.Drawing.Size(279, 45); this.label1.TabIndex = 19; this.label1.Text = "Calculator 1.0"; // @@ -252,17 +272,18 @@ private void InitializeComponent() // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Segoe UI Symbol", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(135, 289); + this.label2.Location = new System.Drawing.Point(121, 362); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(135, 15); + this.label2.Size = new System.Drawing.Size(237, 20); this.label2.TabIndex = 20; - this.label2.Text = "copyright:David@HBU"; + this.label2.Text = "copyright:David@HBU 2021.3.15"; // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(287, 313); + this.ClientSize = new System.Drawing.Size(383, 391); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.buttonClear); @@ -285,6 +306,7 @@ private void InitializeComponent() this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); this.KeyPreview = true; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "Form1"; this.Text = "Calculator"; this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1_KeyDown); diff --git "a/PPT/PPT2021/2019-2020\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" "b/PPT/PPT2021/2020-2021\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" similarity index 60% rename from "PPT/PPT2021/2019-2020\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" rename to "PPT/PPT2021/2020-2021\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" index 93939e2..296baa4 100644 Binary files "a/PPT/PPT2021/2019-2020\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" and "b/PPT/PPT2021/2020-2021\346\230\245-\346\225\260\346\215\256\345\272\223\346\225\231\345\255\246\346\227\245\345\216\206.doc" differ diff --git "a/PPT/PPT2021/DB\347\254\25401\347\253\240-2021.pdf" "b/PPT/PPT2021/DB\347\254\25401\347\253\240-2021.pdf" new file mode 100644 index 0000000..2a71345 Binary files /dev/null and "b/PPT/PPT2021/DB\347\254\25401\347\253\240-2021.pdf" differ diff --git "a/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pdf" "b/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pdf" new file mode 100644 index 0000000..8b1baca Binary files /dev/null and "b/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pdf" differ diff --git "a/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pptx" "b/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pptx" index b0b798c..71af4a9 100644 Binary files "a/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pptx" and "b/PPT/PPT2021/DB\347\254\25402\347\253\240-2021.pptx" differ diff --git "a/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pdf" "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pdf" new file mode 100644 index 0000000..c30feaa Binary files /dev/null and "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pdf" differ diff --git "a/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2020.pptx" "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pptx" similarity index 86% rename from "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2020.pptx" rename to "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pptx" index 18e23ef..02ca7f7 100644 Binary files "a/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2020.pptx" and "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2101\357\274\211-2021.pptx" differ diff --git "a/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2102\357\274\211-2020.pptx" "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2102\357\274\211.pptx" similarity index 100% rename from "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2102\357\274\211-2020.pptx" rename to "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2102\357\274\211.pptx" diff --git "a/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2103\357\274\211-2020.pptx" "b/PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2103\357\274\211.pptx" similarity index 100% rename from "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2103\357\274\211-2020.pptx" rename to "PPT/PPT2021/DB\347\254\25403\347\253\240\357\274\2103\357\274\211.pptx"