• R/O
  • SSH
  • HTTPS

mlapplication: Commit


Commit MetaInfo

Revision66 (tree)
Time2017-05-30 09:46:42
Authoryukio_miura

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/ML.Controls/uc6DateText.vb (revision 65)
+++ trunk/ML.Controls/uc6DateText.vb (revision 66)
@@ -103,6 +103,7 @@
103103 Me.DateTimePicker.Value = value
104104 Else
105105 Me.m_bCalcFlg = True
106+ Me.DateTimePicker.Text = String.Empty
106107 Me.txtUc6TextBox.Text = String.Empty
107108 Me.m_bCalcFlg = False
108109 End If
--- trunk/MLApp.TRN0000/Form1.Designer.vb (revision 65)
+++ trunk/MLApp.TRN0000/Form1.Designer.vb (revision 66)
@@ -22,7 +22,7 @@
2222 'コード エディターを使って変更しないでください。
2323 <System.Diagnostics.DebuggerStepThrough()> _
2424 Private Sub InitializeComponent()
25- Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
25+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
2626 Me.Uc6Button8 = New ML.Controls.uc6Button()
2727 Me.Uc6FolderBrowserDialog1 = New ML.Controls.uc6FolderBrowserDialog()
2828 Me.DataGridView1 = New System.Windows.Forms.DataGridView()
@@ -86,6 +86,7 @@
8686 Me.Uc6Button13 = New ML.Controls.uc6Button()
8787 Me.Button3 = New System.Windows.Forms.Button()
8888 Me.Uc6DateText1 = New ML.Controls.uc6DateText()
89+ Me.Uc6Button14 = New ML.Controls.uc6Button()
8990 Me.MenuBtnPanel.SuspendLayout()
9091 CType(Me.m_dtM9, System.ComponentModel.ISupportInitialize).BeginInit()
9192 CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -173,14 +174,14 @@
173174 '
174175 'DataGridView1
175176 '
176- DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
177- DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
178- DataGridViewCellStyle1.Font = New System.Drawing.Font("MS UI Gothic", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(128, Byte))
179- DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
180- DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
181- DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
182- DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
183- Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
177+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
178+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control
179+ DataGridViewCellStyle2.Font = New System.Drawing.Font("MS UI Gothic", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(128, Byte))
180+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
181+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
182+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
183+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
184+ Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
184185 Me.DataGridView1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Column4, Me.Column5})
185186 Me.DataGridView1.Location = New System.Drawing.Point(18, 400)
186187 Me.DataGridView1.Name = "DataGridView1"
@@ -350,7 +351,7 @@
350351 Me.Uc6DatetimePicker1.Name = "Uc6DatetimePicker1"
351352 Me.Uc6DatetimePicker1.Size = New System.Drawing.Size(150, 20)
352353 Me.Uc6DatetimePicker1.TabIndex = 19
353- Me.Uc6DatetimePicker1.Value = New Date(2017, 3, 28, 0, 0, 0, 0)
354+ Me.Uc6DatetimePicker1.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
354355 '
355356 'Uc6Button4
356357 '
@@ -693,7 +694,7 @@
693694 Me.Uc6Date2.Name = "Uc6Date2"
694695 Me.Uc6Date2.Size = New System.Drawing.Size(159, 20)
695696 Me.Uc6Date2.TabIndex = 36
696- Me.Uc6Date2.Value = New Date(2017, 3, 28, 0, 0, 0, 0)
697+ Me.Uc6Date2.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
697698 '
698699 'Uc6Date3
699700 '
@@ -705,7 +706,7 @@
705706 Me.Uc6Date3.Name = "Uc6Date3"
706707 Me.Uc6Date3.Size = New System.Drawing.Size(118, 20)
707708 Me.Uc6Date3.TabIndex = 37
708- Me.Uc6Date3.Value = New Date(2017, 3, 28, 0, 0, 0, 0)
709+ Me.Uc6Date3.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
709710 '
710711 'Uc6Date1
711712 '
@@ -716,7 +717,7 @@
716717 Me.Uc6Date1.Name = "Uc6Date1"
717718 Me.Uc6Date1.Size = New System.Drawing.Size(134, 20)
718719 Me.Uc6Date1.TabIndex = 38
719- Me.Uc6Date1.Value = New Date(2017, 3, 28, 0, 0, 0, 0)
720+ Me.Uc6Date1.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
720721 '
721722 'Uc6Button9
722723 '
@@ -848,16 +849,26 @@
848849 Me.Uc6DateText1.DateFormat = ""
849850 Me.Uc6DateText1.Location = New System.Drawing.Point(975, 295)
850851 Me.Uc6DateText1.Name = "Uc6DateText1"
851- Me.Uc6DateText1.Size = New System.Drawing.Size(87, 20)
852+ Me.Uc6DateText1.Size = New System.Drawing.Size(97, 20)
852853 Me.Uc6DateText1.TabIndex = 50
853854 Me.Uc6DateText1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
854- Me.Uc6DateText1.Value = Nothing
855+ Me.Uc6DateText1.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
855856 '
857+ 'Uc6Button14
858+ '
859+ Me.Uc6Button14.Location = New System.Drawing.Point(1073, 294)
860+ Me.Uc6Button14.Name = "Uc6Button14"
861+ Me.Uc6Button14.Size = New System.Drawing.Size(53, 23)
862+ Me.Uc6Button14.TabIndex = 51
863+ Me.Uc6Button14.Text = "セット"
864+ Me.Uc6Button14.UseVisualStyleBackColor = True
865+ '
856866 'Form1
857867 '
858868 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
859869 Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
860870 Me.ClientSize = New System.Drawing.Size(1207, 486)
871+ Me.Controls.Add(Me.Uc6Button14)
861872 Me.Controls.Add(Me.Uc6DateText1)
862873 Me.Controls.Add(Me.Button3)
863874 Me.Controls.Add(Me.Uc6Button13)
@@ -955,6 +966,7 @@
955966 Me.Controls.SetChildIndex(Me.Uc6Button13, 0)
956967 Me.Controls.SetChildIndex(Me.Button3, 0)
957968 Me.Controls.SetChildIndex(Me.Uc6DateText1, 0)
969+ Me.Controls.SetChildIndex(Me.Uc6Button14, 0)
958970 Me.MenuBtnPanel.ResumeLayout(False)
959971 CType(Me.m_dtM9, System.ComponentModel.ISupportInitialize).EndInit()
960972 CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1038,4 +1050,5 @@
10381050 Friend WithEvents Uc6Button13 As ML.Controls.uc6Button
10391051 Friend WithEvents Button3 As System.Windows.Forms.Button
10401052 Friend WithEvents Uc6DateText1 As ML.Controls.uc6DateText
1053+ Friend WithEvents Uc6Button14 As ML.Controls.uc6Button
10411054 End Class
--- trunk/MLApp.TRN0000/Form1.vb (revision 65)
+++ trunk/MLApp.TRN0000/Form1.vb (revision 66)
@@ -197,4 +197,10 @@
197197 Me.Uc6Date3.Value = db.GetNowDate
198198 db.Close()
199199 End Sub
200+
201+ Private Sub Uc6Button14_Click(sender As System.Object, e As System.EventArgs) Handles Uc6Button14.Click
202+ Me.Uc6DateText1.Value = CDate("2017/04/26")
203+ Me.Uc6DateText1.Value = Nothing
204+ Me.Uc6DateText1.Value = CDate("2017/04/26")
205+ End Sub
200206 End Class
\ No newline at end of file
--- trunk/MLApp.TRN0000/Form2.Designer.vb (revision 65)
+++ trunk/MLApp.TRN0000/Form2.Designer.vb (revision 66)
@@ -22,10 +22,21 @@
2222 'コード エディターを使って変更しないでください。
2323 <System.Diagnostics.DebuggerStepThrough()> _
2424 Private Sub InitializeComponent()
25+ Me.Button1 = New System.Windows.Forms.Button()
2526 Me.UcSearchBox1 = New MLApp.Base.ucSearchBox()
26- Me.Button1 = New System.Windows.Forms.Button()
27+ Me.Uc6Button14 = New ML.Controls.uc6Button()
28+ Me.Uc6DateText1 = New ML.Controls.uc6DateText()
2729 Me.SuspendLayout()
2830 '
31+ 'Button1
32+ '
33+ Me.Button1.Location = New System.Drawing.Point(50, 133)
34+ Me.Button1.Name = "Button1"
35+ Me.Button1.Size = New System.Drawing.Size(75, 23)
36+ Me.Button1.TabIndex = 1
37+ Me.Button1.Text = "Button1"
38+ Me.Button1.UseVisualStyleBackColor = True
39+ '
2940 'UcSearchBox1
3041 '
3142 Me.UcSearchBox1.CodeControlEnabled = True
@@ -47,20 +58,34 @@
4758 Me.UcSearchBox1.Size = New System.Drawing.Size(272, 20)
4859 Me.UcSearchBox1.TabIndex = 0
4960 '
50- 'Button1
61+ 'Uc6Button14
5162 '
52- Me.Button1.Location = New System.Drawing.Point(50, 133)
53- Me.Button1.Name = "Button1"
54- Me.Button1.Size = New System.Drawing.Size(75, 23)
55- Me.Button1.TabIndex = 1
56- Me.Button1.Text = "Button1"
57- Me.Button1.UseVisualStyleBackColor = True
63+ Me.Uc6Button14.Location = New System.Drawing.Point(116, 177)
64+ Me.Uc6Button14.Name = "Uc6Button14"
65+ Me.Uc6Button14.Size = New System.Drawing.Size(53, 23)
66+ Me.Uc6Button14.TabIndex = 53
67+ Me.Uc6Button14.Text = "セット"
68+ Me.Uc6Button14.UseVisualStyleBackColor = True
5869 '
70+ 'Uc6DateText1
71+ '
72+ Me.Uc6DateText1.BackColor = System.Drawing.SystemColors.Control
73+ Me.Uc6DateText1.BackColorText = System.Drawing.SystemColors.Window
74+ Me.Uc6DateText1.DateFormat = ""
75+ Me.Uc6DateText1.Location = New System.Drawing.Point(18, 178)
76+ Me.Uc6DateText1.Name = "Uc6DateText1"
77+ Me.Uc6DateText1.Size = New System.Drawing.Size(97, 20)
78+ Me.Uc6DateText1.TabIndex = 52
79+ Me.Uc6DateText1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
80+ Me.Uc6DateText1.Value = New Date(2017, 5, 25, 0, 0, 0, 0)
81+ '
5982 'Form2
6083 '
6184 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
6285 Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
6386 Me.ClientSize = New System.Drawing.Size(284, 261)
87+ Me.Controls.Add(Me.Uc6Button14)
88+ Me.Controls.Add(Me.Uc6DateText1)
6489 Me.Controls.Add(Me.Button1)
6590 Me.Controls.Add(Me.UcSearchBox1)
6691 Me.Name = "Form2"
@@ -70,4 +95,6 @@
7095 End Sub
7196 Friend WithEvents UcSearchBox1 As MLApp.Base.ucSearchBox
7297 Friend WithEvents Button1 As System.Windows.Forms.Button
98+ Friend WithEvents Uc6Button14 As ML.Controls.uc6Button
99+ Friend WithEvents Uc6DateText1 As ML.Controls.uc6DateText
73100 End Class
--- trunk/MLApp.TRN0000/Form2.vb (revision 65)
+++ trunk/MLApp.TRN0000/Form2.vb (revision 66)
@@ -3,4 +3,10 @@
33 Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles Button1.Click
44
55 End Sub
6+
7+ Private Sub Uc6Button14_Click(sender As System.Object, e As System.EventArgs) Handles Uc6Button14.Click
8+ Me.Uc6DateText1.Value = CDate("2017/04/26")
9+ Me.Uc6DateText1.Value = Nothing
10+ Me.Uc6DateText1.Value = CDate("2017/04/26")
11+ End Sub
612 End Class
\ No newline at end of file
Show on old repository browser