Skip to content

trkall / tt2018

Go to a project
Commit d3c2044d by Trevor Kallaste
Options

Lisa kodut66 2 parandused

parent 4ee52bc4
Inline Side-by-side
Showing with 50 additions and 82 deletions
kodu2/PrjTest/PrjTest/Form1.Designer.vb
...@@ -32,109 +32,108 @@ Partial Class Form1 ...@@ -32,109 +32,108 @@ Partial Class Form1
Me.btnPuhasta = New System.Windows.Forms.Button() Me.btnPuhasta = New System.Windows.Forms.Button()
Me.UBulb1 = New UBulb.UBulb() Me.UBulb1 = New UBulb.UBulb()
Me.USwitch1 = New USwitch.USwitch() Me.USwitch1 = New USwitch.USwitch()
Me.Button1 = New System.Windows.Forms.Label()
Me.SuspendLayout() Me.SuspendLayout()
' '
'btnConfused 'btnConfused
' '
Me.btnConfused.Location = New System.Drawing.Point(634, 52) Me.btnConfused.Location = New System.Drawing.Point(423, 34)
Me.btnConfused.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnConfused.Name = "btnConfused" Me.btnConfused.Name = "btnConfused"
Me.btnConfused.Size = New System.Drawing.Size(112, 35) Me.btnConfused.Size = New System.Drawing.Size(75, 23)
Me.btnConfused.TabIndex = 1 Me.btnConfused.TabIndex = 1
Me.btnConfused.Text = "Confused" Me.btnConfused.Text = "Confused"
Me.btnConfused.UseVisualStyleBackColor = True Me.btnConfused.UseVisualStyleBackColor = True
' '
'btnCool 'btnCool
' '
Me.btnCool.Location = New System.Drawing.Point(634, 97) Me.btnCool.Location = New System.Drawing.Point(423, 63)
Me.btnCool.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnCool.Name = "btnCool" Me.btnCool.Name = "btnCool"
Me.btnCool.Size = New System.Drawing.Size(112, 35) Me.btnCool.Size = New System.Drawing.Size(75, 23)
Me.btnCool.TabIndex = 2 Me.btnCool.TabIndex = 2
Me.btnCool.Text = "Cool" Me.btnCool.Text = "Cool"
Me.btnCool.UseVisualStyleBackColor = True Me.btnCool.UseVisualStyleBackColor = True
' '
'btnSmile 'btnSmile
' '
Me.btnSmile.Location = New System.Drawing.Point(634, 142) Me.btnSmile.Location = New System.Drawing.Point(423, 92)
Me.btnSmile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnSmile.Name = "btnSmile" Me.btnSmile.Name = "btnSmile"
Me.btnSmile.Size = New System.Drawing.Size(112, 35) Me.btnSmile.Size = New System.Drawing.Size(75, 23)
Me.btnSmile.TabIndex = 3 Me.btnSmile.TabIndex = 3
Me.btnSmile.Text = "Smile" Me.btnSmile.Text = "Smile"
Me.btnSmile.UseVisualStyleBackColor = True Me.btnSmile.UseVisualStyleBackColor = True
' '
'btnStar 'btnStar
' '
Me.btnStar.Location = New System.Drawing.Point(634, 186) Me.btnStar.Location = New System.Drawing.Point(423, 121)
Me.btnStar.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnStar.Name = "btnStar" Me.btnStar.Name = "btnStar"
Me.btnStar.Size = New System.Drawing.Size(112, 35) Me.btnStar.Size = New System.Drawing.Size(75, 23)
Me.btnStar.TabIndex = 4 Me.btnStar.TabIndex = 4
Me.btnStar.Text = "Star" Me.btnStar.Text = "Star"
Me.btnStar.UseVisualStyleBackColor = True Me.btnStar.UseVisualStyleBackColor = True
' '
'btnTeeth 'btnTeeth
' '
Me.btnTeeth.Location = New System.Drawing.Point(634, 231) Me.btnTeeth.Location = New System.Drawing.Point(423, 150)
Me.btnTeeth.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnTeeth.Name = "btnTeeth" Me.btnTeeth.Name = "btnTeeth"
Me.btnTeeth.Size = New System.Drawing.Size(112, 35) Me.btnTeeth.Size = New System.Drawing.Size(75, 23)
Me.btnTeeth.TabIndex = 5 Me.btnTeeth.TabIndex = 5
Me.btnTeeth.Text = "Teeth" Me.btnTeeth.Text = "Teeth"
Me.btnTeeth.UseVisualStyleBackColor = True Me.btnTeeth.UseVisualStyleBackColor = True
' '
'btnYell 'btnYell
' '
Me.btnYell.Location = New System.Drawing.Point(634, 275) Me.btnYell.Location = New System.Drawing.Point(423, 179)
Me.btnYell.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnYell.Name = "btnYell" Me.btnYell.Name = "btnYell"
Me.btnYell.Size = New System.Drawing.Size(112, 35) Me.btnYell.Size = New System.Drawing.Size(75, 23)
Me.btnYell.TabIndex = 6 Me.btnYell.TabIndex = 6
Me.btnYell.Text = "Yell" Me.btnYell.Text = "Yell"
Me.btnYell.UseVisualStyleBackColor = True Me.btnYell.UseVisualStyleBackColor = True
' '
'UCtrlEmotion1 'UCtrlEmotion1
' '
Me.UCtrlEmotion1.Location = New System.Drawing.Point(18, 18) Me.UCtrlEmotion1.Location = New System.Drawing.Point(12, 12)
Me.UCtrlEmotion1.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8)
Me.UCtrlEmotion1.Name = "UCtrlEmotion1" Me.UCtrlEmotion1.Name = "UCtrlEmotion1"
Me.UCtrlEmotion1.Size = New System.Drawing.Size(182, 114) Me.UCtrlEmotion1.Size = New System.Drawing.Size(121, 74)
Me.UCtrlEmotion1.TabIndex = 0 Me.UCtrlEmotion1.TabIndex = 0
' '
'btnPuhasta 'btnPuhasta
' '
Me.btnPuhasta.Location = New System.Drawing.Point(602, 374) Me.btnPuhasta.Location = New System.Drawing.Point(401, 243)
Me.btnPuhasta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnPuhasta.Name = "btnPuhasta" Me.btnPuhasta.Name = "btnPuhasta"
Me.btnPuhasta.Size = New System.Drawing.Size(146, 35) Me.btnPuhasta.Size = New System.Drawing.Size(97, 23)
Me.btnPuhasta.TabIndex = 7 Me.btnPuhasta.TabIndex = 7
Me.btnPuhasta.Text = "Puhasta" Me.btnPuhasta.Text = "Puhasta"
Me.btnPuhasta.UseVisualStyleBackColor = True Me.btnPuhasta.UseVisualStyleBackColor = True
' '
'UBulb1 'UBulb1
' '
Me.UBulb1.Location = New System.Drawing.Point(286, 108) Me.UBulb1.Location = New System.Drawing.Point(191, 70)
Me.UBulb1.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8)
Me.UBulb1.Name = "UBulb1" Me.UBulb1.Name = "UBulb1"
Me.UBulb1.Size = New System.Drawing.Size(208, 302) Me.UBulb1.Size = New System.Drawing.Size(139, 196)
Me.UBulb1.TabIndex = 9 Me.UBulb1.TabIndex = 9
' '
'USwitch1 'USwitch1
' '
Me.USwitch1.Location = New System.Drawing.Point(320, 425) Me.USwitch1.Location = New System.Drawing.Point(213, 276)
Me.USwitch1.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8)
Me.USwitch1.Name = "USwitch1" Me.USwitch1.Name = "USwitch1"
Me.USwitch1.Size = New System.Drawing.Size(96, 65) Me.USwitch1.Size = New System.Drawing.Size(64, 42)
Me.USwitch1.TabIndex = 8 Me.USwitch1.TabIndex = 8
' '
'Button1
'
Me.Button1.Location = New System.Drawing.Point(216, 283)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(64, 42)
Me.Button1.TabIndex = 10
'
'Form1 'Form1
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(800, 508) Me.ClientSize = New System.Drawing.Size(533, 330)
Me.Controls.Add(Me.USwitch1) Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.UBulb1) Me.Controls.Add(Me.UBulb1)
Me.Controls.Add(Me.USwitch1)
Me.Controls.Add(Me.btnPuhasta) Me.Controls.Add(Me.btnPuhasta)
Me.Controls.Add(Me.btnYell) Me.Controls.Add(Me.btnYell)
Me.Controls.Add(Me.btnTeeth) Me.Controls.Add(Me.btnTeeth)
...@@ -143,7 +142,6 @@ Partial Class Form1 ...@@ -143,7 +142,6 @@ Partial Class Form1
Me.Controls.Add(Me.btnCool) Me.Controls.Add(Me.btnCool)
Me.Controls.Add(Me.btnConfused) Me.Controls.Add(Me.btnConfused)
Me.Controls.Add(Me.UCtrlEmotion1) Me.Controls.Add(Me.UCtrlEmotion1)
Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Name = "Form1" Me.Name = "Form1"
Me.Text = "Form1" Me.Text = "Form1"
Me.ResumeLayout(False) Me.ResumeLayout(False)
...@@ -158,6 +156,7 @@ Partial Class Form1 ...@@ -158,6 +156,7 @@ Partial Class Form1
Friend WithEvents btnTeeth As Button Friend WithEvents btnTeeth As Button
Friend WithEvents btnYell As Button Friend WithEvents btnYell As Button
Friend WithEvents btnPuhasta As Button Friend WithEvents btnPuhasta As Button
Friend WithEvents USwitch1 As USwitch.USwitch
Friend WithEvents UBulb1 As UBulb.UBulb Friend WithEvents UBulb1 As UBulb.UBulb
Public WithEvents USwitch1 As USwitch.USwitch
Friend WithEvents Button1 As Label
End Class End Class
kodu2/PrjTest/PrjTest/Form1.vb
...@@ -34,10 +34,13 @@ ...@@ -34,10 +34,13 @@
UBulb1.setLevel("off") UBulb1.setLevel("off")
USwitch1.setMode("on") USwitch1.setMode("on")
mode = 0 mode = 0
Button1.Parent = USwitch1.pbBox
Button1.BackColor = Color.Transparent
Button1.BringToFront()
Button1.Location = New Point(0, 0)
End Sub End Sub
Private Sub USwitch1_Click(sender As Object, e As EventArgs) Handles USwitch1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
If (mode = 0) Then If (mode = 0) Then
UBulb1.setLevel("on") UBulb1.setLevel("on")
USwitch1.setMode("off") USwitch1.setMode("off")
...@@ -51,6 +54,4 @@ ...@@ -51,6 +54,4 @@
End If End If
End Sub End Sub
End Class End Class
kodu2/PrjTest/PrjTest/obj/Debug/PrjTest.vbproj.CoreCompileInputs.cache
b2c0f81f97d18f546bd537c3f14da9e08b832507 3d7054f373ffe2fb059462ee99b7df27007474de
kodu2/PrjTest/PrjTest/obj/Debug/PrjTest.vbproj.FileListAbsolute.txt
...@@ -20,24 +20,3 @@ C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\UBulb.pdb ...@@ -20,24 +20,3 @@ C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\UBulb.pdb
C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\UBulb.xml C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\UBulb.xml
C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\USwitch.pdb C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\USwitch.pdb
C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\USwitch.xml C:\Users\Tref\source\repos\PrjTest\PrjTest\bin\Debug\USwitch.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjTest.exe.config
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjTest.exe
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjTest.pdb
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjTest.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjFaces.dll
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\UBulb.dll
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\USwitch.dll
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjFaces.pdb
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\PrjFaces.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\UBulb.pdb
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\UBulb.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\USwitch.pdb
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\bin\Debug\USwitch.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.vbprojResolveAssemblyReference.cache
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.Form1.resources
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.Resources.resources
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.vbproj.GenerateResource.Cache
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.vbproj.CoreCompileInputs.cache
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.exe
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.xml
P:\tt_projekt\tt2018\kodu2\PrjTest\PrjTest\obj\Debug\PrjTest.pdb
kodu2/Thumbs.db 0 → 100644
File added
kodu2/USwitch/USwitch/USwitch.Designer.vb
...@@ -31,10 +31,9 @@ Partial Class USwitch ...@@ -31,10 +31,9 @@ Partial Class USwitch
' '
'pbBox 'pbBox
' '
Me.pbBox.Location = New System.Drawing.Point(4, 0) Me.pbBox.Location = New System.Drawing.Point(3, 0)
Me.pbBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pbBox.Name = "pbBox" Me.pbBox.Name = "pbBox"
Me.pbBox.Size = New System.Drawing.Size(96, 65) Me.pbBox.Size = New System.Drawing.Size(64, 42)
Me.pbBox.TabIndex = 0 Me.pbBox.TabIndex = 0
Me.pbBox.TabStop = False Me.pbBox.TabStop = False
' '
...@@ -47,17 +46,15 @@ Partial Class USwitch ...@@ -47,17 +46,15 @@ Partial Class USwitch
' '
'USwitch 'USwitch
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.pbBox) Me.Controls.Add(Me.pbBox)
Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Name = "USwitch" Me.Name = "USwitch"
Me.Size = New System.Drawing.Size(96, 65) Me.Size = New System.Drawing.Size(64, 42)
CType(Me.pbBox, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pbBox, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False) Me.ResumeLayout(False)
End Sub End Sub
Friend WithEvents pbBox As PictureBox
Friend WithEvents imgLoend As ImageList Friend WithEvents imgLoend As ImageList
Public WithEvents pbBox As PictureBox
End Class End Class
kodu2/USwitch/USwitch/USwitch.resx
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACa ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACa
CwAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABQAEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CwAAAk1TRnQBSQFMAgEBAgEAARgBAAEYAQABQAEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
BAABAQIAASoDAAEBAQABCAYAASoYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA BAABAQIAASoDAAEBAQABCAYAASoYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
......
kodu2/USwitch/USwitch/USwitch.vb
Public Class USwitch Public Class USwitch
' Klassisisene meetod kuvatava pildi määramiseks ' Klassisisene meetod kuvatava pildi määramiseks
Private Sub selectMode(ByVal intMode As Integer) Private Sub selectMode(ByVal intMode As Integer)
pbBox.Image = imgLoend.Images(intMode) pbBox.Image = imgLoend.Images(intMode)
End Sub End Sub
...@@ -14,4 +15,6 @@ ...@@ -14,4 +15,6 @@
Me.selectMode(0) Me.selectMode(0)
End Select End Select
End Sub End Sub
End Class End Class
kodu2/USwitch/USwitch/obj/Release/USwitch.vbproj.CoreCompileInputs.cache
d488464bde6c7b11694387ca1b9f8ebc8b085bab 3f971ea586d341fbd1608fa78181683992f8a743
kodu2/USwitch/USwitch/obj/Release/USwitch.vbproj.FileListAbsolute.txt
...@@ -9,14 +9,3 @@ C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.dll ...@@ -9,14 +9,3 @@ C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.dll
C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.xml C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.xml
C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.pdb C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.pdb
C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.USwitch.resources C:\Users\Tref\source\repos\USwitch\USwitch\obj\Release\USwitch.USwitch.resources
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\bin\Release\USwitch.dll
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\bin\Release\USwitch.pdb
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\bin\Release\USwitch.xml
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.vbprojResolveAssemblyReference.cache
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.Resources.resources
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.USwitch.resources
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.vbproj.GenerateResource.Cache
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.vbproj.CoreCompileInputs.cache
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.dll
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.xml
P:\tt_projekt\tt2018\kodu2\USwitch\USwitch\obj\Release\USwitch.pdb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment