• R/O
  • HTTP
  • SSH
  • HTTPS

main: Commit

メインで使われるリポジトリです。


Commit MetaInfo

Revisionf890b8838821f2b6d43ed8ed9c76699676cc3f24 (tree)
Zeit2020-01-14 12:27:44
AutorOMasato <tpwmjdjwt@gmai...>
CommiterOMasato

Log Message

一部のプログラムをメソッドにしました。

Ändern Zusammenfassung

Diff

--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
1+################################################################################
2+# この .gitignore ファイルは Microsoft(R) Visual Studio によって自動的に作成されました。
3+################################################################################
4+
5+/.vs/税金計算ソフト(Windows)/v16/Server/sqlite3
Binary files /dev/null and b/.vs/税金計算ソフト(Windows)/v16/.suo differ
--- a/税金計算ソフト(Windows)/Form1.Designer.cs
+++ b/税金計算ソフト(Windows)/Form1.Designer.cs
@@ -33,31 +33,31 @@
3333 this.calc = new System.Windows.Forms.GroupBox();
3434 this.calc_start = new System.Windows.Forms.Button();
3535 this.yen2 = new System.Windows.Forms.Label();
36- this.tortr_check = new System.Windows.Forms.CheckBox();
36+ this.r_taxrate_check = new System.Windows.Forms.CheckBox();
3737 this.tax_included_price = new System.Windows.Forms.Label();
3838 this.result = new System.Windows.Forms.TextBox();
3939 this.yen1 = new System.Windows.Forms.Label();
4040 this.base_price_input = new System.Windows.Forms.TextBox();
4141 this.base_price = new System.Windows.Forms.Label();
42- this.groupBox1 = new System.Windows.Forms.GroupBox();
43- this.label4 = new System.Windows.Forms.Label();
44- this.label3 = new System.Windows.Forms.Label();
45- this.label2 = new System.Windows.Forms.Label();
46- this.mainMenu1 = new System.Windows.Forms.MainMenu(this.components);
47- this.menu = new System.Windows.Forms.MenuItem();
42+ this.taxrate_groupbox = new System.Windows.Forms.GroupBox();
43+ this.tax_date = new System.Windows.Forms.Label();
44+ this.r_taxrate = new System.Windows.Forms.Label();
45+ this.sales_taxrate = new System.Windows.Forms.Label();
46+ this.menu = new System.Windows.Forms.MainMenu(this.components);
47+ this.menu_help = new System.Windows.Forms.MenuItem();
4848 this.mh_taxhelp = new System.Windows.Forms.MenuItem();
4949 this.mh_mittaxhelp = new System.Windows.Forms.MenuItem();
50- this.menuItem5 = new System.Windows.Forms.MenuItem();
50+ this.menu_help_bar = new System.Windows.Forms.MenuItem();
5151 this.mh_version = new System.Windows.Forms.MenuItem();
5252 this.calc.SuspendLayout();
53- this.groupBox1.SuspendLayout();
53+ this.taxrate_groupbox.SuspendLayout();
5454 this.SuspendLayout();
5555 //
5656 // calc
5757 //
5858 this.calc.Controls.Add(this.calc_start);
5959 this.calc.Controls.Add(this.yen2);
60- this.calc.Controls.Add(this.tortr_check);
60+ this.calc.Controls.Add(this.r_taxrate_check);
6161 this.calc.Controls.Add(this.tax_included_price);
6262 this.calc.Controls.Add(this.result);
6363 this.calc.Controls.Add(this.yen1);
@@ -66,7 +66,6 @@
6666 resources.ApplyResources(this.calc, "calc");
6767 this.calc.Name = "calc";
6868 this.calc.TabStop = false;
69- this.calc.Enter += new System.EventHandler(this.groupBox1_Enter);
7069 //
7170 // calc_start
7271 //
@@ -81,11 +80,11 @@
8180 resources.ApplyResources(this.yen2, "yen2");
8281 this.yen2.Name = "yen2";
8382 //
84- // tortr_check
83+ // r_taxrate_check
8584 //
86- resources.ApplyResources(this.tortr_check, "tortr_check");
87- this.tortr_check.Name = "tortr_check";
88- this.tortr_check.UseVisualStyleBackColor = true;
85+ resources.ApplyResources(this.r_taxrate_check, "r_taxrate_check");
86+ this.r_taxrate_check.Name = "r_taxrate_check";
87+ this.r_taxrate_check.UseVisualStyleBackColor = true;
8988 //
9089 // tax_included_price
9190 //
@@ -116,44 +115,44 @@
116115 resources.ApplyResources(this.base_price, "base_price");
117116 this.base_price.Name = "base_price";
118117 //
119- // groupBox1
118+ // taxrate_groupbox
120119 //
121- this.groupBox1.Controls.Add(this.label4);
122- this.groupBox1.Controls.Add(this.label3);
123- this.groupBox1.Controls.Add(this.label2);
124- resources.ApplyResources(this.groupBox1, "groupBox1");
125- this.groupBox1.Name = "groupBox1";
126- this.groupBox1.TabStop = false;
120+ this.taxrate_groupbox.Controls.Add(this.tax_date);
121+ this.taxrate_groupbox.Controls.Add(this.r_taxrate);
122+ this.taxrate_groupbox.Controls.Add(this.sales_taxrate);
123+ resources.ApplyResources(this.taxrate_groupbox, "taxrate_groupbox");
124+ this.taxrate_groupbox.Name = "taxrate_groupbox";
125+ this.taxrate_groupbox.TabStop = false;
127126 //
128- // label4
127+ // tax_date
129128 //
130- resources.ApplyResources(this.label4, "label4");
131- this.label4.Name = "label4";
129+ resources.ApplyResources(this.tax_date, "tax_date");
130+ this.tax_date.Name = "tax_date";
132131 //
133- // label3
132+ // r_taxrate
134133 //
135- resources.ApplyResources(this.label3, "label3");
136- this.label3.Name = "label3";
134+ resources.ApplyResources(this.r_taxrate, "r_taxrate");
135+ this.r_taxrate.Name = "r_taxrate";
137136 //
138- // label2
137+ // sales_taxrate
139138 //
140- resources.ApplyResources(this.label2, "label2");
141- this.label2.Name = "label2";
142- //
143- // mainMenu1
144- //
145- this.mainMenu1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
146- this.menu});
139+ resources.ApplyResources(this.sales_taxrate, "sales_taxrate");
140+ this.sales_taxrate.Name = "sales_taxrate";
147141 //
148142 // menu
149143 //
150- this.menu.Index = 0;
151144 this.menu.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
145+ this.menu_help});
146+ //
147+ // menu_help
148+ //
149+ this.menu_help.Index = 0;
150+ this.menu_help.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
152151 this.mh_taxhelp,
153152 this.mh_mittaxhelp,
154- this.menuItem5,
153+ this.menu_help_bar,
155154 this.mh_version});
156- resources.ApplyResources(this.menu, "menu");
155+ resources.ApplyResources(this.menu_help, "menu_help");
157156 //
158157 // mh_taxhelp
159158 //
@@ -167,10 +166,10 @@
167166 resources.ApplyResources(this.mh_mittaxhelp, "mh_mittaxhelp");
168167 this.mh_mittaxhelp.Click += new System.EventHandler(this.mh_mittaxhelp_Click);
169168 //
170- // menuItem5
169+ // menu_help_bar
171170 //
172- this.menuItem5.Index = 2;
173- resources.ApplyResources(this.menuItem5, "menuItem5");
171+ this.menu_help_bar.Index = 2;
172+ resources.ApplyResources(this.menu_help_bar, "menu_help_bar");
174173 //
175174 // mh_version
176175 //
@@ -183,19 +182,18 @@
183182 resources.ApplyResources(this, "$this");
184183 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
185184 this.BackColor = System.Drawing.Color.White;
186- this.Controls.Add(this.groupBox1);
185+ this.Controls.Add(this.taxrate_groupbox);
187186 this.Controls.Add(this.calc);
188187 this.ForeColor = System.Drawing.SystemColors.ControlText;
189188 this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
190189 this.MaximizeBox = false;
191- this.Menu = this.mainMenu1;
190+ this.Menu = this.menu;
192191 this.Name = "MainForm";
193192 this.ShowIcon = false;
194- this.Load += new System.EventHandler(this.MainForm_Load);
195193 this.calc.ResumeLayout(false);
196194 this.calc.PerformLayout();
197- this.groupBox1.ResumeLayout(false);
198- this.groupBox1.PerformLayout();
195+ this.taxrate_groupbox.ResumeLayout(false);
196+ this.taxrate_groupbox.PerformLayout();
199197 this.ResumeLayout(false);
200198
201199 }
@@ -207,19 +205,19 @@
207205 private System.Windows.Forms.Label yen1;
208206 private System.Windows.Forms.TextBox base_price_input;
209207 private System.Windows.Forms.Label yen2;
210- private System.Windows.Forms.CheckBox tortr_check;
208+ private System.Windows.Forms.CheckBox r_taxrate_check;
211209 private System.Windows.Forms.Label tax_included_price;
212210 private System.Windows.Forms.TextBox result;
213211 private System.Windows.Forms.Button calc_start;
214- private System.Windows.Forms.GroupBox groupBox1;
215- private System.Windows.Forms.Label label4;
216- private System.Windows.Forms.Label label3;
217- private System.Windows.Forms.Label label2;
218- private System.Windows.Forms.MainMenu mainMenu1;
219- private System.Windows.Forms.MenuItem menu;
212+ private System.Windows.Forms.GroupBox taxrate_groupbox;
213+ private System.Windows.Forms.Label tax_date;
214+ private System.Windows.Forms.Label r_taxrate;
215+ private System.Windows.Forms.Label sales_taxrate;
216+ private System.Windows.Forms.MainMenu menu;
217+ private System.Windows.Forms.MenuItem menu_help;
220218 private System.Windows.Forms.MenuItem mh_taxhelp;
221219 private System.Windows.Forms.MenuItem mh_mittaxhelp;
222- private System.Windows.Forms.MenuItem menuItem5;
220+ private System.Windows.Forms.MenuItem menu_help_bar;
223221 private System.Windows.Forms.MenuItem mh_version;
224222 }
225223 }
--- a/税金計算ソフト(Windows)/Form1.cs
+++ b/税金計算ソフト(Windows)/Form1.cs
@@ -1,12 +1,11 @@
1-// 税金計算ソフト O.Masato
2-// このソースコードをダウンロードしていただき、ありがとうございます。
3-// このソフトウェアは、MITライセンスで公開されています。
4-//
5-//
1+////////////////////////////////////////////////////////////////
2+// 税金計算ソフト Source Cord //
3+// Copyright (c) 2020 Akashigi //
4+// //
5+// このソースコード、はMITライセンス上で公開されています。 //
6+////////////////////////////////////////////////////////////////
67 using System;
7-using System.ComponentModel;
88 using System.Windows.Forms;
9-using System.Security.Permissions;
109
1110 namespace 税金計算ソフト_Windows_
1211 {
@@ -18,21 +17,7 @@ namespace 税金計算ソフト_Windows_
1817 InitializeComponent();
1918 }
2019
21- private void label6_Click(object sender, EventArgs e)
22- {
23-
24- }
25-
26- private void MainForm_Load(object sender, EventArgs e)
27- {
28-
29- }
30-
31- private void groupBox1_Enter(object sender, EventArgs e)
32- {
33-
34- }
35-
20+ // base_price_inputのキー入力制限
3621 private void base_price_input_KeyPress(object sender, KeyPressEventArgs e)
3722 {
3823 if ((e.KeyChar < '0' || e.KeyChar > '9') && e.KeyChar != '\b')
@@ -41,122 +26,62 @@ namespace 税金計算ソフト_Windows_
4126 }
4227 }
4328
29+ // 計算スタート
4430 private void calc_start_Click(object sender, EventArgs e)
4531 {
46- string bp_int1 = base_price_input.Text; //「base_price_input」を「bp_int1」に代入
47-
48- if (bp_int1 == "") //「bp_int1」が何も入っていないか確認する
32+ int bp_int1 = tax_calc_verif(base_price_input.Text); //値をチェックします。
33+
34+ if (r_taxrate_check.Checked == true) //チェックボックスがONになっているか確かめます。
4935 {
50- bp_int1 = "0"; //「bp_int1」に0を代入
36+ string rp = tax_calc(bp_int1, 1.08);
37+ result.Text = rp;
5138 }
52-
53- int bp_int2 = int.Parse(bp_int1); //「bp_int1」をintに変換して「bp_int2」に代入
54-
55- if (tortr_check.Checked == true)
39+ else
5640 {
57- double result_num1 = bp_int2 * 1.08; // 税金計算
58- result.Text = result_num1.ToString();
41+ string rp = tax_calc(bp_int1, 1.1);
42+ result.Text = rp;
5943 }
60- else
44+
45+
46+ }
47+
48+ // 値を確認
49+ private int tax_calc_verif(string base_price)
50+ {
51+ if (base_price == "") //値が無であるか確認します。
6152 {
62- double result_num2 = bp_int2 * 1.1;
63- result.Text = result_num2.ToString();
53+ base_price = "0"; //値が無であれば、数値を代入します。
6454 }
55+ return int.Parse(base_price);
56+ }
57+
58+ // 税込価格を計算
59+ private string tax_calc(int base_price2, double tax_rate)
60+ {
61+ double result_price = base_price2 * tax_rate;
62+ return result_price.ToString();
6563 }
6664
6765
66+ // 消費税のヘルプを表示
6867 private void mh_taxhelp_Click(object sender, EventArgs e)
6968 {
7069 tax_help th = new tax_help();
7170 th.Show();
7271 }
7372
73+ // 軽減税率のヘルプを表示
7474 private void mh_mittaxhelp_Click(object sender, EventArgs e)
7575 {
7676 mitigation_help mhw = new mitigation_help();
7777 mhw.Show();
7878 }
7979
80+ // バージョンを表示
8081 private void mh_version_Click(object sender, EventArgs e)
8182 {
8283 about ab = new about();
8384 ab.Show();
8485 }
8586 }
86-
87-
88- /// <summary>
89- /// 数字とバックスペース以外の入力を無効にしたTextBox
90- /// </summary>
91- public class NumericTextBox : TextBox
92- {
93- private const int WM_PASTE = 0x302;
94-
95- [SecurityPermission(SecurityAction.Demand,
96- Flags = SecurityPermissionFlag.UnmanagedCode)]
97- protected override void WndProc(ref Message m)
98- {
99- if (m.Msg == WM_PASTE)
100- {
101- IDataObject iData = Clipboard.GetDataObject();
102- //文字列がクリップボードにあるか
103- if (iData != null && iData.GetDataPresent(DataFormats.Text))
104- {
105- string clipStr = (string)iData.GetData(DataFormats.Text);
106- //クリップボードの文字列が数字のみか調べる
107- if (!System.Text.RegularExpressions.Regex.IsMatch(
108- clipStr,
109- @"^[0-9]+$"))
110- {
111- return;
112- }
113- }
114- }
115-
116- base.WndProc(ref m);
117- }
118-
119- public NumericTextBox()
120- : base()
121- {
122- //IMEを無効にする
123- base.ImeMode = ImeMode.Disable;
124- //数字以外で入力が可能な文字
125- this.SetAllowKeyChars(new char[] { '\b' });
126- }
127-
128- [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
129- public new ImeMode ImeMode
130- {
131- get { return base.ImeMode; }
132- set { }
133- }
134-
135- private char[] _allowKeyChars;
136- /// <summary>
137- /// 数字以外で入力が可能な文字を設定する
138- /// </summary>
139- public void SetAllowKeyChars(char[] keyChars)
140- {
141- this._allowKeyChars = keyChars;
142- }
143- /// <summary>
144- /// 数字以外で入力が可能な文字を取得する
145- /// </summary>
146- public char[] GetAllowKeyChars()
147- {
148- return this._allowKeyChars;
149- }
150-
151- protected override void OnKeyPress(KeyPressEventArgs e)
152- {
153- base.OnKeyPress(e);
154- //数字以外が入力された時はキャンセルする
155- if ((e.KeyChar < '0' || '9' < e.KeyChar) &&
156- Array.IndexOf(this._allowKeyChars, e.KeyChar) < 0)
157- {
158- e.Handled = true;
159- }
160- }
161- }
16287 }
--- a/税金計算ソフト(Windows)/Form1.resx
+++ b/税金計算ソフト(Windows)/Form1.resx
@@ -118,17 +118,41 @@
118118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120120 <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+ <data name="numericTextBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
122+ <value>Disable</value>
123+ </data>
124+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
125+ <data name="numericTextBox1.Location" type="System.Drawing.Point, System.Drawing">
126+ <value>122, 56</value>
127+ </data>
128+ <data name="numericTextBox1.Size" type="System.Drawing.Size, System.Drawing">
129+ <value>100, 20</value>
130+ </data>
131+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
132+ <data name="numericTextBox1.TabIndex" type="System.Int32, mscorlib">
133+ <value>7</value>
134+ </data>
135+ <data name="&gt;&gt;numericTextBox1.Name" xml:space="preserve">
136+ <value>numericTextBox1</value>
137+ </data>
138+ <data name="&gt;&gt;numericTextBox1.Type" xml:space="preserve">
139+ <value>税金計算ソフト_Windows_.NumericTextBox, 税金計算ソフト(Windows), Version=0.1.0.0, Culture=neutral, PublicKeyToken=null</value>
140+ </data>
141+ <data name="&gt;&gt;numericTextBox1.Parent" xml:space="preserve">
142+ <value>calc</value>
143+ </data>
144+ <data name="&gt;&gt;numericTextBox1.ZOrder" xml:space="preserve">
145+ <value>0</value>
146+ </data>
121147 <data name="calc_start.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
122148 <value>System</value>
123149 </data>
124- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
125150 <data name="calc_start.Location" type="System.Drawing.Point, System.Drawing">
126151 <value>6, 79</value>
127152 </data>
128153 <data name="calc_start.Size" type="System.Drawing.Size, System.Drawing">
129154 <value>227, 39</value>
130155 </data>
131- <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
132156 <data name="calc_start.TabIndex" type="System.Int32, mscorlib">
133157 <value>1</value>
134158 </data>
@@ -145,7 +169,7 @@
145169 <value>calc</value>
146170 </data>
147171 <data name="&gt;&gt;calc_start.ZOrder" xml:space="preserve">
148- <value>0</value>
172+ <value>1</value>
149173 </data>
150174 <data name="yen2.AutoSize" type="System.Boolean, mscorlib">
151175 <value>True</value>
@@ -172,40 +196,40 @@
172196 <value>calc</value>
173197 </data>
174198 <data name="&gt;&gt;yen2.ZOrder" xml:space="preserve">
175- <value>1</value>
199+ <value>2</value>
176200 </data>
177- <data name="tortr_check.AutoSize" type="System.Boolean, mscorlib">
201+ <data name="r_taxrate_check.AutoSize" type="System.Boolean, mscorlib">
178202 <value>True</value>
179203 </data>
180- <data name="tortr_check.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
204+ <data name="r_taxrate_check.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
181205 <value>System</value>
182206 </data>
183- <data name="tortr_check.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
207+ <data name="r_taxrate_check.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
184208 <value>NoControl</value>
185209 </data>
186- <data name="tortr_check.Location" type="System.Drawing.Point, System.Drawing">
210+ <data name="r_taxrate_check.Location" type="System.Drawing.Point, System.Drawing">
187211 <value>8, 56</value>
188212 </data>
189- <data name="tortr_check.Size" type="System.Drawing.Size, System.Drawing">
213+ <data name="r_taxrate_check.Size" type="System.Drawing.Size, System.Drawing">
190214 <value>120, 18</value>
191215 </data>
192- <data name="tortr_check.TabIndex" type="System.Int32, mscorlib">
216+ <data name="r_taxrate_check.TabIndex" type="System.Int32, mscorlib">
193217 <value>5</value>
194218 </data>
195- <data name="tortr_check.Text" xml:space="preserve">
219+ <data name="r_taxrate_check.Text" xml:space="preserve">
196220 <value>軽減税率を適用</value>
197221 </data>
198- <data name="&gt;&gt;tortr_check.Name" xml:space="preserve">
199- <value>tortr_check</value>
222+ <data name="&gt;&gt;r_taxrate_check.Name" xml:space="preserve">
223+ <value>r_taxrate_check</value>
200224 </data>
201- <data name="&gt;&gt;tortr_check.Type" xml:space="preserve">
225+ <data name="&gt;&gt;r_taxrate_check.Type" xml:space="preserve">
202226 <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
203227 </data>
204- <data name="&gt;&gt;tortr_check.Parent" xml:space="preserve">
228+ <data name="&gt;&gt;r_taxrate_check.Parent" xml:space="preserve">
205229 <value>calc</value>
206230 </data>
207- <data name="&gt;&gt;tortr_check.ZOrder" xml:space="preserve">
208- <value>2</value>
231+ <data name="&gt;&gt;r_taxrate_check.ZOrder" xml:space="preserve">
232+ <value>3</value>
209233 </data>
210234 <data name="tax_included_price.AutoSize" type="System.Boolean, mscorlib">
211235 <value>True</value>
@@ -232,7 +256,7 @@
232256 <value>calc</value>
233257 </data>
234258 <data name="&gt;&gt;tax_included_price.ZOrder" xml:space="preserve">
235- <value>3</value>
259+ <value>4</value>
236260 </data>
237261 <data name="result.Location" type="System.Drawing.Point, System.Drawing">
238262 <value>73, 124</value>
@@ -253,7 +277,7 @@
253277 <value>calc</value>
254278 </data>
255279 <data name="&gt;&gt;result.ZOrder" xml:space="preserve">
256- <value>4</value>
280+ <value>5</value>
257281 </data>
258282 <data name="yen1.AutoSize" type="System.Boolean, mscorlib">
259283 <value>True</value>
@@ -280,7 +304,7 @@
280304 <value>calc</value>
281305 </data>
282306 <data name="&gt;&gt;yen1.ZOrder" xml:space="preserve">
283- <value>5</value>
307+ <value>6</value>
284308 </data>
285309 <data name="base_price_input.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
286310 <value>Disable</value>
@@ -304,7 +328,7 @@
304328 <value>calc</value>
305329 </data>
306330 <data name="&gt;&gt;base_price_input.ZOrder" xml:space="preserve">
307- <value>6</value>
331+ <value>7</value>
308332 </data>
309333 <data name="base_price.AutoSize" type="System.Boolean, mscorlib">
310334 <value>True</value>
@@ -334,7 +358,7 @@
334358 <value>calc</value>
335359 </data>
336360 <data name="&gt;&gt;base_price.ZOrder" xml:space="preserve">
337- <value>7</value>
361+ <value>8</value>
338362 </data>
339363 <data name="calc.Font" type="System.Drawing.Font, System.Drawing">
340364 <value>MS UI Gothic, 9.75pt</value>
@@ -363,115 +387,118 @@
363387 <data name="&gt;&gt;calc.ZOrder" xml:space="preserve">
364388 <value>1</value>
365389 </data>
366- <data name="label4.AutoSize" type="System.Boolean, mscorlib">
390+ <data name="tax_date.AutoSize" type="System.Boolean, mscorlib">
367391 <value>True</value>
368392 </data>
369- <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
393+ <data name="tax_date.Location" type="System.Drawing.Point, System.Drawing">
370394 <value>6, 79</value>
371395 </data>
372- <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
373- <value>121, 36</value>
396+ <data name="tax_date.Size" type="System.Drawing.Size, System.Drawing">
397+ <value>91, 36</value>
374398 </data>
375- <data name="label4.TabIndex" type="System.Int32, mscorlib">
399+ <data name="tax_date.TabIndex" type="System.Int32, mscorlib">
376400 <value>2</value>
377401 </data>
378- <data name="label4.Text" xml:space="preserve">
402+ <data name="tax_date.Text" xml:space="preserve">
379403 <value>これらの税率は、
380-2019/10/26(日本時刻)
404+(日本時刻)
381405 時点の税率です。
382406 </value>
383407 </data>
384- <data name="&gt;&gt;label4.Name" xml:space="preserve">
385- <value>label4</value>
408+ <data name="&gt;&gt;tax_date.Name" xml:space="preserve">
409+ <value>tax_date</value>
386410 </data>
387- <data name="&gt;&gt;label4.Type" xml:space="preserve">
411+ <data name="&gt;&gt;tax_date.Type" xml:space="preserve">
388412 <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
389413 </data>
390- <data name="&gt;&gt;label4.Parent" xml:space="preserve">
391- <value>groupBox1</value>
414+ <data name="&gt;&gt;tax_date.Parent" xml:space="preserve">
415+ <value>taxrate_groupbox</value>
392416 </data>
393- <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
417+ <data name="&gt;&gt;tax_date.ZOrder" xml:space="preserve">
394418 <value>0</value>
395419 </data>
396- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
420+ <data name="r_taxrate.AutoSize" type="System.Boolean, mscorlib">
397421 <value>True</value>
398422 </data>
399- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
423+ <data name="r_taxrate.Location" type="System.Drawing.Point, System.Drawing">
400424 <value>6, 46</value>
401425 </data>
402- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
426+ <data name="r_taxrate.Size" type="System.Drawing.Size, System.Drawing">
403427 <value>71, 12</value>
404428 </data>
405- <data name="label3.TabIndex" type="System.Int32, mscorlib">
429+ <data name="r_taxrate.TabIndex" type="System.Int32, mscorlib">
406430 <value>1</value>
407431 </data>
408- <data name="label3.Text" xml:space="preserve">
432+ <data name="r_taxrate.Text" xml:space="preserve">
409433 <value>軽減税率: 8%</value>
410434 </data>
411- <data name="&gt;&gt;label3.Name" xml:space="preserve">
412- <value>label3</value>
435+ <data name="&gt;&gt;r_taxrate.Name" xml:space="preserve">
436+ <value>r_taxrate</value>
413437 </data>
414- <data name="&gt;&gt;label3.Type" xml:space="preserve">
438+ <data name="&gt;&gt;r_taxrate.Type" xml:space="preserve">
415439 <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
416440 </data>
417- <data name="&gt;&gt;label3.Parent" xml:space="preserve">
418- <value>groupBox1</value>
441+ <data name="&gt;&gt;r_taxrate.Parent" xml:space="preserve">
442+ <value>taxrate_groupbox</value>
419443 </data>
420- <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
444+ <data name="&gt;&gt;r_taxrate.ZOrder" xml:space="preserve">
421445 <value>1</value>
422446 </data>
423- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
447+ <data name="sales_taxrate.AutoSize" type="System.Boolean, mscorlib">
424448 <value>True</value>
425449 </data>
426- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
450+ <data name="sales_taxrate.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
451+ <value>NoControl</value>
452+ </data>
453+ <data name="sales_taxrate.Location" type="System.Drawing.Point, System.Drawing">
427454 <value>6, 25</value>
428455 </data>
429- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
456+ <data name="sales_taxrate.Size" type="System.Drawing.Size, System.Drawing">
430457 <value>77, 12</value>
431458 </data>
432- <data name="label2.TabIndex" type="System.Int32, mscorlib">
459+ <data name="sales_taxrate.TabIndex" type="System.Int32, mscorlib">
433460 <value>0</value>
434461 </data>
435- <data name="label2.Text" xml:space="preserve">
462+ <data name="sales_taxrate.Text" xml:space="preserve">
436463 <value>消費税率: 10%</value>
437464 </data>
438- <data name="&gt;&gt;label2.Name" xml:space="preserve">
439- <value>label2</value>
465+ <data name="&gt;&gt;sales_taxrate.Name" xml:space="preserve">
466+ <value>sales_taxrate</value>
440467 </data>
441- <data name="&gt;&gt;label2.Type" xml:space="preserve">
468+ <data name="&gt;&gt;sales_taxrate.Type" xml:space="preserve">
442469 <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
443470 </data>
444- <data name="&gt;&gt;label2.Parent" xml:space="preserve">
445- <value>groupBox1</value>
471+ <data name="&gt;&gt;sales_taxrate.Parent" xml:space="preserve">
472+ <value>taxrate_groupbox</value>
446473 </data>
447- <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
474+ <data name="&gt;&gt;sales_taxrate.ZOrder" xml:space="preserve">
448475 <value>2</value>
449476 </data>
450- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
477+ <data name="taxrate_groupbox.Location" type="System.Drawing.Point, System.Drawing">
451478 <value>257, 12</value>
452479 </data>
453- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
480+ <data name="taxrate_groupbox.Size" type="System.Drawing.Size, System.Drawing">
454481 <value>131, 161</value>
455482 </data>
456- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
483+ <data name="taxrate_groupbox.TabIndex" type="System.Int32, mscorlib">
457484 <value>2</value>
458485 </data>
459- <data name="groupBox1.Text" xml:space="preserve">
486+ <data name="taxrate_groupbox.Text" xml:space="preserve">
460487 <value>税率</value>
461488 </data>
462- <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
463- <value>groupBox1</value>
489+ <data name="&gt;&gt;taxrate_groupbox.Name" xml:space="preserve">
490+ <value>taxrate_groupbox</value>
464491 </data>
465- <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
492+ <data name="&gt;&gt;taxrate_groupbox.Type" xml:space="preserve">
466493 <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
467494 </data>
468- <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
495+ <data name="&gt;&gt;taxrate_groupbox.Parent" xml:space="preserve">
469496 <value>$this</value>
470497 </data>
471- <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
498+ <data name="&gt;&gt;taxrate_groupbox.ZOrder" xml:space="preserve">
472499 <value>0</value>
473500 </data>
474- <metadata name="mainMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
501+ <metadata name="menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
475502 <value>17, 17</value>
476503 </metadata>
477504 <data name="mh_taxhelp.Text" xml:space="preserve">
@@ -480,13 +507,13 @@
480507 <data name="mh_mittaxhelp.Text" xml:space="preserve">
481508 <value>軽減税率について</value>
482509 </data>
483- <data name="menuItem5.Text" xml:space="preserve">
510+ <data name="menu_help_bar.Text" xml:space="preserve">
484511 <value>-</value>
485512 </data>
486513 <data name="mh_version.Text" xml:space="preserve">
487514 <value>バージョン情報(&amp;A)</value>
488515 </data>
489- <data name="menu.Text" xml:space="preserve">
516+ <data name="menu_help.Text" xml:space="preserve">
490517 <value>ヘルプ(&amp;H)</value>
491518 </data>
492519 <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -501,16 +528,16 @@
501528 <data name="$this.Text" xml:space="preserve">
502529 <value>税金計算ソフト</value>
503530 </data>
504- <data name="&gt;&gt;mainMenu1.Name" xml:space="preserve">
505- <value>mainMenu1</value>
506- </data>
507- <data name="&gt;&gt;mainMenu1.Type" xml:space="preserve">
508- <value>System.Windows.Forms.MainMenu, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
509- </data>
510531 <data name="&gt;&gt;menu.Name" xml:space="preserve">
511532 <value>menu</value>
512533 </data>
513534 <data name="&gt;&gt;menu.Type" xml:space="preserve">
535+ <value>System.Windows.Forms.MainMenu, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
536+ </data>
537+ <data name="&gt;&gt;menu_help.Name" xml:space="preserve">
538+ <value>menu_help</value>
539+ </data>
540+ <data name="&gt;&gt;menu_help.Type" xml:space="preserve">
514541 <value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
515542 </data>
516543 <data name="&gt;&gt;mh_taxhelp.Name" xml:space="preserve">
@@ -525,10 +552,10 @@
525552 <data name="&gt;&gt;mh_mittaxhelp.Type" xml:space="preserve">
526553 <value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
527554 </data>
528- <data name="&gt;&gt;menuItem5.Name" xml:space="preserve">
529- <value>menuItem5</value>
555+ <data name="&gt;&gt;menu_help_bar.Name" xml:space="preserve">
556+ <value>menu_help_bar</value>
530557 </data>
531- <data name="&gt;&gt;menuItem5.Type" xml:space="preserve">
558+ <data name="&gt;&gt;menu_help_bar.Type" xml:space="preserve">
532559 <value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
533560 </data>
534561 <data name="&gt;&gt;mh_version.Name" xml:space="preserve">
--- a/税金計算ソフト(Windows)/about.Designer.cs
+++ b/税金計算ソフト(Windows)/about.Designer.cs
@@ -29,52 +29,51 @@
2929 private void InitializeComponent()
3030 {
3131 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(about));
32- this.label1 = new System.Windows.Forms.Label();
33- this.button1 = new System.Windows.Forms.Button();
34- this.label3 = new System.Windows.Forms.Label();
35- this.button2 = new System.Windows.Forms.Button();
32+ this.version_label = new System.Windows.Forms.Label();
33+ this.osdn_btn = new System.Windows.Forms.Button();
34+ this.mit_license = new System.Windows.Forms.Button();
35+ this.description_label = new System.Windows.Forms.Label();
3636 this.SuspendLayout();
3737 //
38- // label1
38+ // version_label
3939 //
40- resources.ApplyResources(this.label1, "label1");
41- this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
42- this.label1.Name = "label1";
40+ resources.ApplyResources(this.version_label, "version_label");
41+ this.version_label.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
42+ this.version_label.Name = "version_label";
4343 //
44- // button1
44+ // osdn_btn
4545 //
46- resources.ApplyResources(this.button1, "button1");
47- this.button1.Name = "button1";
48- this.button1.UseVisualStyleBackColor = true;
49- this.button1.Click += new System.EventHandler(this.button1_Click);
46+ resources.ApplyResources(this.osdn_btn, "osdn_btn");
47+ this.osdn_btn.Name = "osdn_btn";
48+ this.osdn_btn.UseVisualStyleBackColor = true;
49+ this.osdn_btn.Click += new System.EventHandler(this.button1_Click);
5050 //
51- // label3
51+ // mit_license
5252 //
53- resources.ApplyResources(this.label3, "label3");
54- this.label3.BackColor = System.Drawing.SystemColors.ControlLightLight;
55- this.label3.Name = "label3";
53+ resources.ApplyResources(this.mit_license, "mit_license");
54+ this.mit_license.Name = "mit_license";
55+ this.mit_license.UseVisualStyleBackColor = true;
56+ this.mit_license.Click += new System.EventHandler(this.button2_Click);
5657 //
57- // button2
58+ // description_label
5859 //
59- resources.ApplyResources(this.button2, "button2");
60- this.button2.Name = "button2";
61- this.button2.UseVisualStyleBackColor = true;
62- this.button2.Click += new System.EventHandler(this.button2_Click);
60+ resources.ApplyResources(this.description_label, "description_label");
61+ this.description_label.BackColor = System.Drawing.SystemColors.ControlLightLight;
62+ this.description_label.Name = "description_label";
6363 //
6464 // about
6565 //
6666 resources.ApplyResources(this, "$this");
6767 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
68- this.Controls.Add(this.button2);
69- this.Controls.Add(this.label3);
70- this.Controls.Add(this.button1);
71- this.Controls.Add(this.label1);
68+ this.Controls.Add(this.mit_license);
69+ this.Controls.Add(this.description_label);
70+ this.Controls.Add(this.osdn_btn);
71+ this.Controls.Add(this.version_label);
7272 this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
7373 this.MaximizeBox = false;
7474 this.MinimizeBox = false;
7575 this.Name = "about";
7676 this.ShowIcon = false;
77- this.Load += new System.EventHandler(this.about_Load);
7877 this.ResumeLayout(false);
7978 this.PerformLayout();
8079
@@ -82,9 +81,10 @@
8281
8382 #endregion
8483
85- private System.Windows.Forms.Label label1;
86- private System.Windows.Forms.Button button1;
87- private System.Windows.Forms.Label label3;
88- private System.Windows.Forms.Button button2;
84+ private System.Windows.Forms.Label version_label;
85+ private System.Windows.Forms.Button mit_license;
86+ private System.Windows.Forms.Button osdn_btn;
87+ private System.Windows.Forms.Label description_label;
88+
8989 }
9090 }
\ No newline at end of file
--- a/税金計算ソフト(Windows)/about.resx
+++ b/税金計算ソフト(Windows)/about.resx
@@ -118,123 +118,129 @@
118118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120120 <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121- <data name="label1.AutoSize" type="System.Boolean, mscorlib">
121+ <data name="version_label.AutoSize" type="System.Boolean, mscorlib">
122122 <value>True</value>
123123 </data>
124124 <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
125- <data name="label1.Font" type="System.Drawing.Font, System.Drawing">
125+ <data name="version_label.Font" type="System.Drawing.Font, System.Drawing">
126126 <value>メイリオ, 18pt</value>
127127 </data>
128- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
128+ <data name="version_label.Location" type="System.Drawing.Point, System.Drawing">
129129 <value>12, 9</value>
130130 </data>
131- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
131+ <data name="version_label.Size" type="System.Drawing.Size, System.Drawing">
132132 <value>183, 36</value>
133133 </data>
134- <data name="label1.TabIndex" type="System.Int32, mscorlib">
134+ <data name="version_label.TabIndex" type="System.Int32, mscorlib">
135135 <value>0</value>
136136 </data>
137- <data name="label1.Text" xml:space="preserve">
137+ <data name="version_label.Text" xml:space="preserve">
138138 <value>バージョン情報</value>
139139 </data>
140- <data name="&gt;&gt;label1.Name" xml:space="preserve">
141- <value>label1</value>
140+ <data name="&gt;&gt;version_label.Name" xml:space="preserve">
141+ <value>version_label</value>
142142 </data>
143- <data name="&gt;&gt;label1.Type" xml:space="preserve">
143+ <data name="&gt;&gt;version_label.Type" xml:space="preserve">
144144 <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
145145 </data>
146- <data name="&gt;&gt;label1.Parent" xml:space="preserve">
146+ <data name="&gt;&gt;version_label.Parent" xml:space="preserve">
147147 <value>$this</value>
148148 </data>
149- <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
149+ <data name="&gt;&gt;version_label.ZOrder" xml:space="preserve">
150150 <value>3</value>
151151 </data>
152152 <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
153- <data name="button1.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
153+ <data name="osdn_btn.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
154154 <value>System</value>
155155 </data>
156- <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
156+ <data name="osdn_btn.Location" type="System.Drawing.Point, System.Drawing">
157157 <value>278, 146</value>
158158 </data>
159- <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
159+ <data name="osdn_btn.Size" type="System.Drawing.Size, System.Drawing">
160160 <value>111, 23</value>
161161 </data>
162- <data name="button1.TabIndex" type="System.Int32, mscorlib">
162+ <data name="osdn_btn.TabIndex" type="System.Int32, mscorlib">
163163 <value>3</value>
164164 </data>
165- <data name="button1.Text" xml:space="preserve">
165+ <data name="osdn_btn.Text" xml:space="preserve">
166166 <value>OSDNプロジェクト</value>
167167 </data>
168- <data name="&gt;&gt;button1.Name" xml:space="preserve">
169- <value>button1</value>
168+ <data name="&gt;&gt;osdn_btn.Name" xml:space="preserve">
169+ <value>osdn_btn</value>
170170 </data>
171- <data name="&gt;&gt;button1.Type" xml:space="preserve">
171+ <data name="&gt;&gt;osdn_btn.Type" xml:space="preserve">
172172 <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
173173 </data>
174- <data name="&gt;&gt;button1.Parent" xml:space="preserve">
174+ <data name="&gt;&gt;osdn_btn.Parent" xml:space="preserve">
175175 <value>$this</value>
176176 </data>
177- <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
177+ <data name="&gt;&gt;osdn_btn.ZOrder" xml:space="preserve">
178178 <value>2</value>
179179 </data>
180- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
180+ <data name="mit_license.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
181+ <value>System</value>
182+ </data>
183+ <data name="mit_license.Location" type="System.Drawing.Point, System.Drawing">
184+ <value>12, 146</value>
185+ </data>
186+ <data name="mit_license.Size" type="System.Drawing.Size, System.Drawing">
187+ <value>87, 23</value>
188+ </data>
189+ <data name="mit_license.TabIndex" type="System.Int32, mscorlib">
190+ <value>5</value>
191+ </data>
192+ <data name="mit_license.Text" xml:space="preserve">
193+ <value>MITライセンス</value>
194+ </data>
195+ <data name="&gt;&gt;mit_license.Name" xml:space="preserve">
196+ <value>mit_license</value>
197+ </data>
198+ <data name="&gt;&gt;mit_license.Type" xml:space="preserve">
199+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
200+ </data>
201+ <data name="&gt;&gt;mit_license.Parent" xml:space="preserve">
202+ <value>$this</value>
203+ </data>
204+ <data name="&gt;&gt;mit_license.ZOrder" xml:space="preserve">
205+ <value>0</value>
206+ </data>
207+ <data name="description_label.AutoSize" type="System.Boolean, mscorlib">
181208 <value>True</value>
182209 </data>
183- <data name="label3.Font" type="System.Drawing.Font, System.Drawing">
210+ <data name="description_label.Font" type="System.Drawing.Font, System.Drawing">
184211 <value>メイリオ, 9pt</value>
185212 </data>
186- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
213+ <data name="description_label.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
214+ <value>NoControl</value>
215+ </data>
216+ <data name="description_label.Location" type="System.Drawing.Point, System.Drawing">
187217 <value>16, 45</value>
188218 </data>
189- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
219+ <data name="description_label.Size" type="System.Drawing.Size, System.Drawing">
190220 <value>367, 90</value>
191221 </data>
192- <data name="label3.TabIndex" type="System.Int32, mscorlib">
222+ <data name="description_label.TabIndex" type="System.Int32, mscorlib">
193223 <value>4</value>
194224 </data>
195- <data name="label3.Text" xml:space="preserve">
196- <value>作成者: O.Masato
225+ <data name="description_label.Text" xml:space="preserve">
226+ <value>作成者: アカシギ
197227 バージョン: 0.1
198228
199229 このソフトウェアは、完全無料で使用でき、MITライセンスの元で
200230 ソースコードが公開されています。</value>
201231 </data>
202- <data name="&gt;&gt;label3.Name" xml:space="preserve">
203- <value>label3</value>
232+ <data name="&gt;&gt;description_label.Name" xml:space="preserve">
233+ <value>description_label</value>
204234 </data>
205- <data name="&gt;&gt;label3.Type" xml:space="preserve">
235+ <data name="&gt;&gt;description_label.Type" xml:space="preserve">
206236 <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
207237 </data>
208- <data name="&gt;&gt;label3.Parent" xml:space="preserve">
238+ <data name="&gt;&gt;description_label.Parent" xml:space="preserve">
209239 <value>$this</value>
210240 </data>
211- <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
241+ <data name="&gt;&gt;description_label.ZOrder" xml:space="preserve">
212242 <value>1</value>
213243 </data>
214- <data name="button2.Location" type="System.Drawing.Point, System.Drawing">
215- <value>12, 146</value>
216- </data>
217- <data name="button2.Size" type="System.Drawing.Size, System.Drawing">
218- <value>87, 23</value>
219- </data>
220- <data name="button2.TabIndex" type="System.Int32, mscorlib">
221- <value>5</value>
222- </data>
223- <data name="button2.Text" xml:space="preserve">
224- <value>MITライセンス</value>
225- </data>
226- <data name="&gt;&gt;button2.Name" xml:space="preserve">
227- <value>button2</value>
228- </data>
229- <data name="&gt;&gt;button2.Type" xml:space="preserve">
230- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
231- </data>
232- <data name="&gt;&gt;button2.Parent" xml:space="preserve">
233- <value>$this</value>
234- </data>
235- <data name="&gt;&gt;button2.ZOrder" xml:space="preserve">
236- <value>0</value>
237- </data>
238244 <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
239245 <value>True</value>
240246 </metadata>
Binary files a/税金計算ソフト(Windows)/bin/Debug/税金計算ソフト(Windows).exe and b/税金計算ソフト(Windows)/bin/Debug/税金計算ソフト(Windows).exe differ
Binary files a/税金計算ソフト(Windows)/bin/Debug/税金計算ソフト(Windows).pdb and b/税金計算ソフト(Windows)/bin/Debug/税金計算ソフト(Windows).pdb differ
Binary files /dev/null and b/税金計算ソフト(Windows)/bin/Release/税金計算ソフト v0.1.exe differ
Binary files a/税金計算ソフト(Windows)/bin/Release/税金計算ソフト(Windows).exe and b/税金計算ソフト(Windows)/bin/Release/税金計算ソフト(Windows).exe differ
Binary files a/税金計算ソフト(Windows)/bin/Release/税金計算ソフト(Windows).pdb and b/税金計算ソフト(Windows)/bin/Release/税金計算ソフト(Windows).pdb differ
--- a/税金計算ソフト(Windows)/license.Designer.cs
+++ b/税金計算ソフト(Windows)/license.Designer.cs
@@ -29,28 +29,29 @@
2929 private void InitializeComponent()
3030 {
3131 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(license));
32- this.textBox1 = new System.Windows.Forms.TextBox();
32+ this.license_textbox = new System.Windows.Forms.TextBox();
3333 this.SuspendLayout();
3434 //
35- // textBox1
35+ // license_textbox
3636 //
37- this.textBox1.Cursor = System.Windows.Forms.Cursors.Default;
38- this.textBox1.Font = new System.Drawing.Font("Yu Gothic UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
39- this.textBox1.Location = new System.Drawing.Point(0, 0);
40- this.textBox1.Multiline = true;
41- this.textBox1.Name = "textBox1";
42- this.textBox1.ReadOnly = true;
43- this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
44- this.textBox1.Size = new System.Drawing.Size(317, 310);
45- this.textBox1.TabIndex = 0;
46- this.textBox1.Text = resources.GetString("textBox1.Text");
37+ this.license_textbox.Cursor = System.Windows.Forms.Cursors.Default;
38+ this.license_textbox.Font = new System.Drawing.Font("Yu Gothic UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
39+ this.license_textbox.Location = new System.Drawing.Point(0, 0);
40+ this.license_textbox.Multiline = true;
41+ this.license_textbox.Name = "license_textbox";
42+ this.license_textbox.ReadOnly = true;
43+ this.license_textbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
44+ this.license_textbox.Size = new System.Drawing.Size(317, 310);
45+ this.license_textbox.TabIndex = 0;
46+ this.license_textbox.Text = resources.GetString("license_textbox.Text");
4747 //
4848 // license
4949 //
5050 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
5151 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
5252 this.ClientSize = new System.Drawing.Size(317, 310);
53- this.Controls.Add(this.textBox1);
53+ this.Controls.Add(this.license_textbox);
54+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
5455 this.MaximizeBox = false;
5556 this.MaximumSize = new System.Drawing.Size(333, 349);
5657 this.MinimizeBox = false;
@@ -66,6 +67,6 @@
6667
6768 #endregion
6869
69- private System.Windows.Forms.TextBox textBox1;
70+ private System.Windows.Forms.TextBox license_textbox;
7071 }
7172 }
\ No newline at end of file
--- a/税金計算ソフト(Windows)/license.cs
+++ b/税金計算ソフト(Windows)/license.cs
@@ -19,7 +19,7 @@ namespace 税金計算ソフト_Windows_
1919
2020 private void license_Load(object sender, EventArgs e)
2121 {
22- this.textBox1.SelectionStart = 0;
22+ this.license_textbox.SelectionStart = 0;
2323 }
2424 }
2525 }
--- a/税金計算ソフト(Windows)/license.resx
+++ b/税金計算ソフト(Windows)/license.resx
@@ -117,10 +117,10 @@
117117 <resheader name="writer">
118118 <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119 </resheader>
120- <data name="textBox1.Text" xml:space="preserve">
120+ <data name="license_textbox.Text" xml:space="preserve">
121121 <value>The MIT License
122122
123-Copyright 2020 OMasato
123+Copyright 2020 Akashigi
124124
125125 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
126126
--- a/税金計算ソフト(Windows)/mitigation_help.Designer.cs
+++ b/税金計算ソフト(Windows)/mitigation_help.Designer.cs
@@ -31,7 +31,6 @@
3131 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(mitigation_help));
3232 this.mittax_title = new System.Windows.Forms.Label();
3333 this.mittax = new System.Windows.Forms.Label();
34- this.mittax_web = new System.Windows.Forms.Button();
3534 this.SuspendLayout();
3635 //
3736 // mittax_title
@@ -45,18 +44,10 @@
4544 resources.ApplyResources(this.mittax, "mittax");
4645 this.mittax.Name = "mittax";
4746 //
48- // mittax_web
49- //
50- resources.ApplyResources(this.mittax_web, "mittax_web");
51- this.mittax_web.Name = "mittax_web";
52- this.mittax_web.UseVisualStyleBackColor = true;
53- this.mittax_web.Click += new System.EventHandler(this.mittax_web_Click);
54- //
5547 // mitigation_help
5648 //
5749 resources.ApplyResources(this, "$this");
5850 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
59- this.Controls.Add(this.mittax_web);
6051 this.Controls.Add(this.mittax);
6152 this.Controls.Add(this.mittax_title);
6253 this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -73,6 +64,5 @@
7364
7465 private System.Windows.Forms.Label mittax_title;
7566 private System.Windows.Forms.Label mittax;
76- private System.Windows.Forms.Button mittax_web;
7767 }
7868 }
\ No newline at end of file
--- a/税金計算ソフト(Windows)/mitigation_help.cs
+++ b/税金計算ソフト(Windows)/mitigation_help.cs
@@ -16,10 +16,5 @@ namespace 税金計算ソフト_Windows_
1616 {
1717 InitializeComponent();
1818 }
19-
20- private void mittax_web_Click(object sender, EventArgs e)
21- {
22- System.Diagnostics.Process.Start("https://www.gov-online.go.jp/cam/shouhizei/keigenzeiritsu/");
23- }
2419 }
2520 }
--- a/税金計算ソフト(Windows)/mitigation_help.resx
+++ b/税金計算ソフト(Windows)/mitigation_help.resx
@@ -147,7 +147,7 @@
147147 <value>$this</value>
148148 </data>
149149 <data name="&gt;&gt;mittax_title.ZOrder" xml:space="preserve">
150- <value>2</value>
150+ <value>1</value>
151151 </data>
152152 <data name="mittax.AutoSize" type="System.Boolean, mscorlib">
153153 <value>True</value>
@@ -159,7 +159,7 @@
159159 <value>12, 45</value>
160160 </data>
161161 <data name="mittax.Size" type="System.Drawing.Size, System.Drawing">
162- <value>349, 90</value>
162+ <value>349, 144</value>
163163 </data>
164164 <data name="mittax.TabIndex" type="System.Int32, mscorlib">
165165 <value>1</value>
@@ -169,7 +169,10 @@
169169 に導入された制度です。飲料食品や定期購読新聞などに適用さ
170170 れます。
171171 パン、お菓子、牛乳、新聞(定期購読、週2発行)などが軽減税率
172-対象で、文房具、鞄、衣服などは軽減税率非対象です。</value>
172+対象で、文房具、鞄、衣服などは軽減税率非対象です。
173+
174+詳しくはGoogleで調べてみて下さい。
175+(この情報の正確さは保証しません)</value>
173176 </data>
174177 <data name="&gt;&gt;mittax.Name" xml:space="preserve">
175178 <value>mittax</value>
@@ -181,34 +184,6 @@
181184 <value>$this</value>
182185 </data>
183186 <data name="&gt;&gt;mittax.ZOrder" xml:space="preserve">
184- <value>1</value>
185- </data>
186- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
187- <data name="mittax_web.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
188- <value>System</value>
189- </data>
190- <data name="mittax_web.Location" type="System.Drawing.Point, System.Drawing">
191- <value>12, 160</value>
192- </data>
193- <data name="mittax_web.Size" type="System.Drawing.Size, System.Drawing">
194- <value>346, 23</value>
195- </data>
196- <data name="mittax_web.TabIndex" type="System.Int32, mscorlib">
197- <value>2</value>
198- </data>
199- <data name="mittax_web.Text" xml:space="preserve">
200- <value>軽減税率制度について (政府広報オンライン)</value>
201- </data>
202- <data name="&gt;&gt;mittax_web.Name" xml:space="preserve">
203- <value>mittax_web</value>
204- </data>
205- <data name="&gt;&gt;mittax_web.Type" xml:space="preserve">
206- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
207- </data>
208- <data name="&gt;&gt;mittax_web.Parent" xml:space="preserve">
209- <value>$this</value>
210- </data>
211- <data name="&gt;&gt;mittax_web.ZOrder" xml:space="preserve">
212187 <value>0</value>
213188 </data>
214189 <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -218,7 +193,7 @@
218193 <value>6, 12</value>
219194 </data>
220195 <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
221- <value>370, 197</value>
196+ <value>370, 198</value>
222197 </data>
223198 <data name="$this.Text" xml:space="preserve">
224199 <value>軽減税率について</value>
--- a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csproj.FileListAbsolute.txt
+++ b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csproj.FileListAbsolute.txt
@@ -23,3 +23,16 @@ C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税
2323 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).exe
2424 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).pdb
2525 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.license.resources
26+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Debug\税金計算ソフト(Windows).exe.config
27+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Debug\税金計算ソフト(Windows).exe
28+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Debug\税金計算ソフト(Windows).pdb
29+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).csprojAssemblyReference.cache
30+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.about.resources
31+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.MainForm.resources
32+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.license.resources
33+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.mitigation_help.resources
34+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.Properties.Resources.resources
35+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト_Windows_.tax_help.resources
36+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).csproj.GenerateResource.cache
37+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).exe
38+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Debug\税金計算ソフト(Windows).pdb
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csproj.GenerateResource.cache and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csproj.GenerateResource.cache differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csprojAssemblyReference.cache and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).csprojAssemblyReference.cache differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).exe and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).exe differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).pdb and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト(Windows).pdb differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.MainForm.resources and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.MainForm.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.about.resources and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.about.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.license.resources and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.license.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.mitigation_help.resources and b/税金計算ソフト(Windows)/obj/Debug/税金計算ソフト_Windows_.mitigation_help.resources differ
--- a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csproj.FileListAbsolute.txt
+++ b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csproj.FileListAbsolute.txt
@@ -23,3 +23,16 @@ C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Release\
2323 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).csproj.GenerateResource.cache
2424 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).exe
2525 C:\Users\user\source\repos\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).pdb
26+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Release\税金計算ソフト(Windows).exe.config
27+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Release\税金計算ソフト(Windows).exe
28+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\bin\Release\税金計算ソフト(Windows).pdb
29+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).csprojAssemblyReference.cache
30+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.about.resources
31+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.MainForm.resources
32+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.license.resources
33+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.mitigation_help.resources
34+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.Properties.Resources.resources
35+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト_Windows_.tax_help.resources
36+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).csproj.GenerateResource.cache
37+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).exe
38+C:\Users\user\Documents\Git\Tax-Calc\税金計算ソフト(Windows)\obj\Release\税金計算ソフト(Windows).pdb
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csproj.GenerateResource.cache and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csproj.GenerateResource.cache differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csprojAssemblyReference.cache and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).csprojAssemblyReference.cache differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).exe and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).exe differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).pdb and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト(Windows).pdb differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.MainForm.resources and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.MainForm.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.about.resources and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.about.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.license.resources and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.license.resources differ
Binary files a/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.mitigation_help.resources and b/税金計算ソフト(Windows)/obj/Release/税金計算ソフト_Windows_.mitigation_help.resources differ
--- a/税金計算ソフト(Windows)/tax_help.Designer.cs
+++ b/税金計算ソフト(Windows)/tax_help.Designer.cs
@@ -30,7 +30,6 @@
3030 {
3131 this.tax_title = new System.Windows.Forms.Label();
3232 this.tax = new System.Windows.Forms.Label();
33- this.tax_web = new System.Windows.Forms.Button();
3433 this.SuspendLayout();
3534 //
3635 // tax_title
@@ -52,27 +51,16 @@
5251 this.tax.ImeMode = System.Windows.Forms.ImeMode.NoControl;
5352 this.tax.Location = new System.Drawing.Point(12, 45);
5453 this.tax.Name = "tax";
55- this.tax.Size = new System.Drawing.Size(344, 54);
54+ this.tax.Size = new System.Drawing.Size(344, 108);
5655 this.tax.TabIndex = 3;
57- this.tax.Text = "消費税は、消費一般に対して課される税です。そのため、原則\r\nとして全ての財貨・サービスの国内における販売、提供などに\r\n消費税が課されます。";
58- //
59- // tax_web
60- //
61- this.tax_web.ImeMode = System.Windows.Forms.ImeMode.NoControl;
62- this.tax_web.Location = new System.Drawing.Point(10, 122);
63- this.tax_web.Name = "tax_web";
64- this.tax_web.Size = new System.Drawing.Size(346, 23);
65- this.tax_web.TabIndex = 4;
66- this.tax_web.Text = "消費税の基本的なしくみ (Youtube, 国税庁動画チャンネル)";
67- this.tax_web.UseVisualStyleBackColor = true;
68- this.tax_web.Click += new System.EventHandler(this.tax_web_Click);
56+ this.tax.Text = "消費税は、消費一般に対して課される税です。そのため、原則\r\nとして全ての財貨・サービスの国内における販売、提供などに\r\n消費税が課されます。\r\n\r\n詳しくはGoo" +
57+ "gleで調べてみて下さい。\r\n(この情報の正確さは保証しません)";
6958 //
7059 // tax_help
7160 //
7261 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
7362 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
74- this.ClientSize = new System.Drawing.Size(363, 154);
75- this.Controls.Add(this.tax_web);
63+ this.ClientSize = new System.Drawing.Size(363, 164);
7664 this.Controls.Add(this.tax);
7765 this.Controls.Add(this.tax_title);
7866 this.MaximizeBox = false;
@@ -80,7 +68,6 @@
8068 this.Name = "tax_help";
8169 this.ShowIcon = false;
8270 this.Text = "消費税について";
83- this.Load += new System.EventHandler(this.tax_help_Load);
8471 this.ResumeLayout(false);
8572 this.PerformLayout();
8673
@@ -90,6 +77,5 @@
9077
9178 private System.Windows.Forms.Label tax_title;
9279 private System.Windows.Forms.Label tax;
93- private System.Windows.Forms.Button tax_web;
9480 }
9581 }
\ No newline at end of file
--- a/税金計算ソフト(Windows)/tax_help.cs
+++ b/税金計算ソフト(Windows)/tax_help.cs
@@ -16,20 +16,5 @@ namespace 税金計算ソフト_Windows_
1616 {
1717 InitializeComponent();
1818 }
19-
20- private void tax_help_Load(object sender, EventArgs e)
21- {
22-
23- }
24-
25- private void mittax_Click(object sender, EventArgs e)
26- {
27-
28- }
29-
30- private void tax_web_Click(object sender, EventArgs e)
31- {
32- System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=6b6GuGudPBQ");
33- }
3419 }
3520 }
Show on old repository browser