• R/O
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

練習用です。いろんなものがごちゃまぜです。


コミットメタ情報

リビジョン391 (tree)
日時2018-05-10 16:26:52
作者bellyoshi

ログメッセージ

変更サマリ

差分

--- Calc/Calc/Form1.Designer.vb (revision 390)
+++ Calc/Calc/Form1.Designer.vb (revision 391)
@@ -39,11 +39,12 @@
3939 Me.Button14 = New System.Windows.Forms.Button()
4040 Me.TextBox1 = New System.Windows.Forms.TextBox()
4141 Me.ListBox1 = New System.Windows.Forms.ListBox()
42+ Me.Label1 = New System.Windows.Forms.Label()
4243 Me.SuspendLayout()
4344 '
4445 'Button1
4546 '
46- Me.Button1.Location = New System.Drawing.Point(178, 164)
47+ Me.Button1.Location = New System.Drawing.Point(178, 208)
4748 Me.Button1.Name = "Button1"
4849 Me.Button1.Size = New System.Drawing.Size(75, 23)
4950 Me.Button1.TabIndex = 0
@@ -52,7 +53,7 @@
5253 '
5354 'Button2
5455 '
55- Me.Button2.Location = New System.Drawing.Point(259, 164)
56+ Me.Button2.Location = New System.Drawing.Point(259, 208)
5657 Me.Button2.Name = "Button2"
5758 Me.Button2.Size = New System.Drawing.Size(75, 23)
5859 Me.Button2.TabIndex = 0
@@ -61,7 +62,7 @@
6162 '
6263 'Button3
6364 '
64- Me.Button3.Location = New System.Drawing.Point(340, 164)
65+ Me.Button3.Location = New System.Drawing.Point(340, 208)
6566 Me.Button3.Name = "Button3"
6667 Me.Button3.Size = New System.Drawing.Size(75, 23)
6768 Me.Button3.TabIndex = 0
@@ -70,7 +71,7 @@
7071 '
7172 'Button4
7273 '
73- Me.Button4.Location = New System.Drawing.Point(178, 193)
74+ Me.Button4.Location = New System.Drawing.Point(178, 237)
7475 Me.Button4.Name = "Button4"
7576 Me.Button4.Size = New System.Drawing.Size(75, 23)
7677 Me.Button4.TabIndex = 0
@@ -79,7 +80,7 @@
7980 '
8081 'Button5
8182 '
82- Me.Button5.Location = New System.Drawing.Point(259, 193)
83+ Me.Button5.Location = New System.Drawing.Point(259, 237)
8384 Me.Button5.Name = "Button5"
8485 Me.Button5.Size = New System.Drawing.Size(75, 23)
8586 Me.Button5.TabIndex = 0
@@ -88,7 +89,7 @@
8889 '
8990 'Button6
9091 '
91- Me.Button6.Location = New System.Drawing.Point(340, 193)
92+ Me.Button6.Location = New System.Drawing.Point(340, 237)
9293 Me.Button6.Name = "Button6"
9394 Me.Button6.Size = New System.Drawing.Size(75, 23)
9495 Me.Button6.TabIndex = 0
@@ -97,7 +98,7 @@
9798 '
9899 'Button7
99100 '
100- Me.Button7.Location = New System.Drawing.Point(178, 222)
101+ Me.Button7.Location = New System.Drawing.Point(178, 266)
101102 Me.Button7.Name = "Button7"
102103 Me.Button7.Size = New System.Drawing.Size(75, 23)
103104 Me.Button7.TabIndex = 0
@@ -106,7 +107,7 @@
106107 '
107108 'Button8
108109 '
109- Me.Button8.Location = New System.Drawing.Point(259, 222)
110+ Me.Button8.Location = New System.Drawing.Point(259, 266)
110111 Me.Button8.Name = "Button8"
111112 Me.Button8.Size = New System.Drawing.Size(75, 23)
112113 Me.Button8.TabIndex = 0
@@ -115,7 +116,7 @@
115116 '
116117 'Button9
117118 '
118- Me.Button9.Location = New System.Drawing.Point(340, 222)
119+ Me.Button9.Location = New System.Drawing.Point(340, 266)
119120 Me.Button9.Name = "Button9"
120121 Me.Button9.Size = New System.Drawing.Size(75, 23)
121122 Me.Button9.TabIndex = 0
@@ -124,7 +125,7 @@
124125 '
125126 'Button0
126127 '
127- Me.Button0.Location = New System.Drawing.Point(259, 251)
128+ Me.Button0.Location = New System.Drawing.Point(259, 295)
128129 Me.Button0.Name = "Button0"
129130 Me.Button0.Size = New System.Drawing.Size(75, 23)
130131 Me.Button0.TabIndex = 0
@@ -133,7 +134,7 @@
133134 '
134135 'ButtonPlus
135136 '
136- Me.ButtonPlus.Location = New System.Drawing.Point(421, 222)
137+ Me.ButtonPlus.Location = New System.Drawing.Point(421, 266)
137138 Me.ButtonPlus.Name = "ButtonPlus"
138139 Me.ButtonPlus.Size = New System.Drawing.Size(75, 23)
139140 Me.ButtonPlus.TabIndex = 0
@@ -142,7 +143,7 @@
142143 '
143144 'Button11
144145 '
145- Me.Button11.Location = New System.Drawing.Point(502, 222)
146+ Me.Button11.Location = New System.Drawing.Point(502, 266)
146147 Me.Button11.Name = "Button11"
147148 Me.Button11.Size = New System.Drawing.Size(75, 23)
148149 Me.Button11.TabIndex = 0
@@ -151,7 +152,7 @@
151152 '
152153 'Button12
153154 '
154- Me.Button12.Location = New System.Drawing.Point(502, 251)
155+ Me.Button12.Location = New System.Drawing.Point(502, 295)
155156 Me.Button12.Name = "Button12"
156157 Me.Button12.Size = New System.Drawing.Size(75, 23)
157158 Me.Button12.TabIndex = 0
@@ -160,7 +161,7 @@
160161 '
161162 'Button13
162163 '
163- Me.Button13.Location = New System.Drawing.Point(421, 251)
164+ Me.Button13.Location = New System.Drawing.Point(421, 295)
164165 Me.Button13.Name = "Button13"
165166 Me.Button13.Size = New System.Drawing.Size(75, 23)
166167 Me.Button13.TabIndex = 0
@@ -169,7 +170,7 @@
169170 '
170171 'Button14
171172 '
172- Me.Button14.Location = New System.Drawing.Point(502, 280)
173+ Me.Button14.Location = New System.Drawing.Point(502, 324)
173174 Me.Button14.Name = "Button14"
174175 Me.Button14.Size = New System.Drawing.Size(75, 23)
175176 Me.Button14.TabIndex = 0
@@ -178,7 +179,7 @@
178179 '
179180 'TextBox1
180181 '
181- Me.TextBox1.Location = New System.Drawing.Point(178, 117)
182+ Me.TextBox1.Location = New System.Drawing.Point(178, 161)
182183 Me.TextBox1.Name = "TextBox1"
183184 Me.TextBox1.Size = New System.Drawing.Size(318, 22)
184185 Me.TextBox1.TabIndex = 1
@@ -192,11 +193,21 @@
192193 Me.ListBox1.Size = New System.Drawing.Size(318, 94)
193194 Me.ListBox1.TabIndex = 2
194195 '
196+ 'Label1
197+ '
198+ Me.Label1.AutoSize = True
199+ Me.Label1.Location = New System.Drawing.Point(175, 126)
200+ Me.Label1.Name = "Label1"
201+ Me.Label1.Size = New System.Drawing.Size(48, 15)
202+ Me.Label1.TabIndex = 3
203+ Me.Label1.Text = "Label1"
204+ '
195205 'Form1
196206 '
197207 Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 15.0!)
198208 Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
199209 Me.ClientSize = New System.Drawing.Size(800, 450)
210+ Me.Controls.Add(Me.Label1)
200211 Me.Controls.Add(Me.ListBox1)
201212 Me.Controls.Add(Me.TextBox1)
202213 Me.Controls.Add(Me.Button9)
@@ -238,4 +249,5 @@
238249 Friend WithEvents Button14 As Button
239250 Friend WithEvents TextBox1 As TextBox
240251 Friend WithEvents ListBox1 As ListBox
252+ Friend WithEvents Label1 As Label
241253 End Class
--- Calc/Calc/Form1.vb (revision 390)
+++ Calc/Calc/Form1.vb (revision 391)
@@ -7,10 +7,12 @@
77 Dim t = DirectCast(sender, Button).Text(0)
88 r.add(t)
99 TextBox1.Text = r.LastValue()
10- ListBox1.Items(0) = r.Last
10+ Label1.Text = r.Last
11+ ListBox1.DataSource = Nothing
12+ ListBox1.DataSource = r.history
1113 End Sub
1214
1315 Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
14- ListBox1.Items.Add(s)
16+
1517 End Sub
1618 End Class
--- Calc/Calc/calcModel.vb (revision 390)
+++ Calc/Calc/calcModel.vb (revision 391)
@@ -1,7 +1,7 @@
11 Public Class calcModel
22
33
4- Public history As List(Of String)
4+ Public history As New List(Of String)
55
66 Public Last As String
77
@@ -31,6 +31,7 @@
3131
3232 If c = "="c Then
3333 isNew = True
34+ history.Add(Last + LastValue())
3435 End If
3536
3637 End Sub