Permalink
Browse files

Removed the agent references.

  • Loading branch information...
1 parent 6828bef commit 760eb4df87e22ab34d513a72f8245cc5a4196545 @IAmCoder IAmCoder committed Apr 11, 2016
Oops, something went wrong.
Oops, something went wrong.
@@ -81,14 +81,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxInterop.AgentObjects, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\References\AxInterop.AgentObjects.dll</HintPath>
- </Reference>
- <Reference Include="Interop.AgentObjects, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\References\Interop.AgentObjects.dll</HintPath>
- </Reference>
<Reference Include="lucidcode.Controls, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\lucidcode.Controls.dll</HintPath>
Oops, something went wrong.
Oops, something went wrong.
@@ -46,7 +46,6 @@ Public Class MainForm
Private m_formAbout As AboutForm
Private m_objUpdateControl As New UpdateControl
- Friend objMerlin As New AxAgentObjects.AxAgent
Private resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(MainForm))
Private m_objDreams As Series
@@ -84,8 +83,6 @@ Public Class MainForm
If strImportType = "REM" Then
strNewPath = m_strPath & "Lucidity\REM Cycles\" & strImportFileName
- ElseIf strImportType = "Check" Then
- strNewPath = m_strPath & "Lucidity\Checks\" & strImportFileName
ElseIf strImportType = "Subliminal" Then
strNewPath = m_strPath & "Lucidity\Subliminals\" & strImportFileName
ElseIf strImportType = "Exercises" Then
@@ -183,29 +180,6 @@ Public Class MainForm
m_objDreamViewControl.txtDream.Focus()
End Sub
- Public Sub LoadMerlin()
- Try
- Me.Controls.Add(objMerlin)
- objMerlin.Enabled = True
- objMerlin.Location = New System.Drawing.Point(0, 0)
- objMerlin.Name = "objMerlin"
- objMerlin.Size = New System.Drawing.Size(0, 0)
- objMerlin.TabIndex = 29
- objMerlin.Characters.Load("Merlin", "C:\Windows\msagent\chars\merlin.acs")
- objMerlin.Characters("Merlin").Activate()
- objMerlin.Characters("Merlin").MoveTo(trvMain.Width + trvMain.Left - objMerlin.Characters("Merlin").Width, trvMain.Height + trvMain.Top)
-
- If (My.MySettings.Default("ShowMerlin") = True) Then
- objMerlin.Characters("Merlin").Show()
- End If
-
- m_objLucidItemControl.SetMerlin(objMerlin)
- m_boolAgentWorks = True
- Catch ex As Exception
- 'MessageBox.Show(ex.Message, "LightenedDream.LoadMerlin()", MessageBoxButtons.OK, MessageBoxIcon.Error)
- End Try
- End Sub
-
Public Sub LoadImport()
If Not trvNodeImported Is Nothing Then
trvMain.SelectedNode = trvNodeImported
@@ -505,7 +479,7 @@ Public Class MainForm
Dim objLucidityFolderTag As New Lucidity.Tags.LucidityFolder(m_strPath + "Lucidity")
trvLucidity.Tag = objLucidityFolderTag
- Dim strLucidity As String = "REM Cycles,Checks,Subliminals,Recordings,Readings"
+ Dim strLucidity As String = "REM Cycles,Subliminals,Recordings,Readings"
' Load each Category
For Each strCategory As String In strLucidity.Split(",")
@@ -896,17 +870,6 @@ Public Class MainForm
m_objLucidFolderViewControl.Dock = DockStyle.Fill
m_objLucidFolderViewControl.LoadFolder(CType(trvMain.SelectedNode.Tag, Lucidity.Tags.LucidItemFolder).Type)
pnlContainer.Controls.Add(m_objLucidFolderViewControl)
-
- If trvMain.SelectedNode.Text = "Checks" Then
- toolPlay.Enabled = True
- If m_objLucidFolderViewControl.Playing Then
- toolPlay.Image = My.Resources.Function_Stop
- toolPlay.Text = "&Stop"
- Else
- toolPlay.Image = My.Resources.Function_Play
- toolPlay.Text = "&Play"
- End If
- End If
ElseIf TypeOf (trvMain.SelectedNode.Tag) Is Lucidity.Tags.REMCycleFile Then
pnlContainer.Controls.Clear()
m_objREMCyclesControl.Dock = DockStyle.Fill
@@ -1893,11 +1856,9 @@ Public Class MainForm
ElseIf TypeOf (trvMain.SelectedNode.Tag) Is Lucidity.Tags.LucidItemFolder Then
If m_objLucidFolderViewControl.Playing Then
- m_objLucidFolderViewControl.StopRunning()
toolPlay.Image = My.Resources.Function_Play
toolPlay.Text = "&Play"
Else
- m_objLucidFolderViewControl.Play(objMerlin)
toolPlay.Image = My.Resources.Function_Stop
toolPlay.Text = "&Stop"
End If
@@ -1999,7 +1960,7 @@ Public Class MainForm
Application.Exit()
End Sub
- Private Sub toolLucidity_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles toolREMCycles.Click, toolReadings.Click, toolSubliminals.Click, toolChecks.Click, toolRecordings.Click, toolLucidityExercises.Click
+ Private Sub toolLucidity_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles toolREMCycles.Click, toolReadings.Click, toolSubliminals.Click, toolRecordings.Click, toolLucidityExercises.Click
SelectLucidItem(CType(sender, ToolStripButton).Tag)
End Sub
@@ -2069,7 +2030,7 @@ Public Class MainForm
If UpdateAvailable(Version) Then
If MessageBox.Show("A new version (" & Version & ") is available. Would you like to download it now?", "Lightened Dream", MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1) = Windows.Forms.DialogResult.Yes Then
Try
- System.Diagnostics.Process.Start(URL)
+ System.Diagnostics.Process.Start("explorer.exe", URL)
Catch ex As Exception
MessageBox.Show(ex.Message, "LightenedDream.Update.Launch()", MessageBoxButtons.OK, MessageBoxIcon.Error)
End Try
@@ -2244,7 +2205,7 @@ Public Class MainForm
CreateNewREMCycle()
End Sub
- Private Sub CheckToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CheckToolStripMenuItem.Click, SubliminalToolStripMenuItem.Click, RecordingToolStripMenuItem1.Click, ReadingToolStripMenuItem.Click, ToolStripMenuItem19.Click, ToolStripMenuItem18.Click, ToolStripMenuItem17.Click, ToolStripMenuItem16.Click
+ Private Sub CheckToolStripMenuItem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles SubliminalToolStripMenuItem.Click, RecordingToolStripMenuItem1.Click, ReadingToolStripMenuItem.Click, ToolStripMenuItem19.Click, ToolStripMenuItem18.Click, ToolStripMenuItem17.Click
CreateNewLucidityItem(CType(sender, ToolStripMenuItem).Tag)
End Sub
@@ -2256,7 +2217,7 @@ Public Class MainForm
MessageBox.Show("This feature is still dreaming itself into existence.", "Lightened Dream", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1)
End Sub
- Private Sub mnuLucidity_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuLucidityREMCycles.Click, mnuLuciditySubliminals.Click, mnuLucidityRecordings.Click, mnuLucidityReadings.Click, mnuLucidityChecks.Click
+ Private Sub mnuLucidity_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnuLucidityREMCycles.Click, mnuLuciditySubliminals.Click, mnuLucidityRecordings.Click, mnuLucidityReadings.Click
If FindNode(trvMain.Nodes(2), CType(sender, ToolStripMenuItem).Tag) IsNot Nothing Then
trvMain.SelectedNode = FindNode(trvMain.Nodes(2), CType(sender, ToolStripMenuItem).Tag)
End If
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("A journal designed for dreamers in search of lucidity")>
<Assembly: AssemblyCompany("lucidcode")>
<Assembly: AssemblyProduct("Lightened Dream")>
-<Assembly: AssemblyCopyright("Copyright © lucidcode 2000 - 2015")>
+<Assembly: AssemblyCopyright("Copyright © lucidcode 2000 - 2016")>
<Assembly: AssemblyTrademark("")>
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("3.3.7")>
-<Assembly: AssemblyFileVersion("3.3.7")>
+<Assembly: AssemblyVersion("3.3.8")>
+<Assembly: AssemblyFileVersion("3.3.8")>
@@ -48,8 +48,6 @@ Public Class SplashForm
strDirectory = m_strPath & "Lucidity"
If Not Directory.Exists(strDirectory) Then Directory.CreateDirectory(strDirectory)
- strDirectory = m_strPath & "Lucidity\Checks"
- If Not Directory.Exists(strDirectory) Then Directory.CreateDirectory(strDirectory)
strDirectory = m_strPath & "Lucidity\Readings"
If Not Directory.Exists(strDirectory) Then Directory.CreateDirectory(strDirectory)
strDirectory = m_strPath & "Lucidity\Recordings"
@@ -196,64 +194,63 @@ Public Class SplashForm
System.Threading.Thread.Sleep(128)
Next
- ' Lucidity
- For Each strCategory As String In "REM Cycles,Checks,Subliminals,Recordings,Readings".Split(",")
- intPos = objDreams.Points.AddY(Directory.GetFiles(m_strPath & "Lucidity\" & strCategory, "*.ld3").Length)
-
- Dim objCategoryAnnotation As New Charting.CalloutAnnotation
- objCategoryAnnotation.AllowMoving = True
- objCategoryAnnotation.AllowResizing = True
- objCategoryAnnotation.AllowSelecting = True
- objCategoryAnnotation.CalloutStyle = System.Windows.Forms.DataVisualization.Charting.CalloutStyle.Cloud
- objCategoryAnnotation.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- objCategoryAnnotation.ForeColor = System.Drawing.Color.SteelBlue
- objCategoryAnnotation.LineColor = System.Drawing.Color.LightSteelBlue
- objCategoryAnnotation.Name = Guid.NewGuid.ToString
- objCategoryAnnotation.ShadowColor = System.Drawing.Color.SteelBlue
- objCategoryAnnotation.ShadowOffset = 1
- objCategoryAnnotation.Text = strCategory & " (" & objDreams.Points(intPos).YValues(0) & ")"
- objCategoryAnnotation.AnchorAlignment = ContentAlignment.BottomCenter
- objCategoryAnnotation.AnchorDataPoint = objDreams.Points(intPos)
- Me.graph.Annotations.Add(objCategoryAnnotation)
-
- Application.DoEvents()
- System.Threading.Thread.Sleep(128)
- Next
-
- Application.DoEvents()
- m_formMain = New MainForm
+ ' Lucidity
+ For Each strCategory As String In "REM Cycles,Subliminals,Recordings,Readings".Split(",")
+ intPos = objDreams.Points.AddY(Directory.GetFiles(m_strPath & "Lucidity\" & strCategory, "*.ld3").Length)
- Do While Not m_formMain.Loaded
- Application.DoEvents()
- System.Threading.Thread.Sleep(10)
- Loop
-
- Me.Opacity = 0.6
- Application.DoEvents()
- m_formMain.Show()
- Application.DoEvents()
- m_formMain.LoadMerlin()
+ Dim objCategoryAnnotation As New Charting.CalloutAnnotation
+ objCategoryAnnotation.AllowMoving = True
+ objCategoryAnnotation.AllowResizing = True
+ objCategoryAnnotation.AllowSelecting = True
+ objCategoryAnnotation.CalloutStyle = System.Windows.Forms.DataVisualization.Charting.CalloutStyle.Cloud
+ objCategoryAnnotation.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ objCategoryAnnotation.ForeColor = System.Drawing.Color.SteelBlue
+ objCategoryAnnotation.LineColor = System.Drawing.Color.LightSteelBlue
+ objCategoryAnnotation.Name = Guid.NewGuid.ToString
+ objCategoryAnnotation.ShadowColor = System.Drawing.Color.SteelBlue
+ objCategoryAnnotation.ShadowOffset = 1
+ objCategoryAnnotation.Text = strCategory & " (" & objDreams.Points(intPos).YValues(0) & ")"
+ objCategoryAnnotation.AnchorAlignment = ContentAlignment.BottomCenter
+ objCategoryAnnotation.AnchorDataPoint = objDreams.Points(intPos)
+ Me.graph.Annotations.Add(objCategoryAnnotation)
- Application.DoEvents()
- System.Threading.Thread.Sleep(128)
- Application.DoEvents()
- Hide()
+ Application.DoEvents()
+ System.Threading.Thread.Sleep(128)
+ Next
- m_formMain.LoadImport()
+ Application.DoEvents()
+ m_formMain = New MainForm
- Catch ex As Exception
- If ex.Message.Contains("80040154") Then
- If MessageBox.Show("Lightened Dream requires Windows Media Player, which can be downloaded for free from Microsoft. Would you like to download it now?", "Lightened Dream", MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1) = Windows.Forms.DialogResult.Yes Then
- Try
- System.Diagnostics.Process.Start("http://windows.microsoft.com/en-us/windows/download-windows-media-player")
- Catch mediaException As Exception
- MessageBox.Show(mediaException.Message, "LightenedDream.MediaPlayer.Download()", MessageBoxButtons.OK, MessageBoxIcon.Error)
- End Try
- End If
- Else
- MessageBox.Show(ex.Message, "LightenedDream.Splash.LoadGraph()", MessageBoxButtons.OK, MessageBoxIcon.Error)
- End If
- Application.Exit()
- End Try
- End Sub
+ Do While Not m_formMain.Loaded
+ Application.DoEvents()
+ System.Threading.Thread.Sleep(10)
+ Loop
+
+ Me.Opacity = 0.6
+ Application.DoEvents()
+ m_formMain.Show()
+ Application.DoEvents()
+
+ Application.DoEvents()
+ System.Threading.Thread.Sleep(128)
+ Application.DoEvents()
+ Hide()
+
+ m_formMain.LoadImport()
+
+ Catch ex As Exception
+ If ex.Message.Contains("80040154") Then
+ If MessageBox.Show("Lightened Dream requires Windows Media Player, which can be downloaded for free from Microsoft. Would you like to download it now?", "Lightened Dream", MessageBoxButtons.YesNo, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1) = Windows.Forms.DialogResult.Yes Then
+ Try
+ System.Diagnostics.Process.Start("http://windows.microsoft.com/en-us/windows/download-windows-media-player")
+ Catch mediaException As Exception
+ MessageBox.Show(mediaException.Message, "LightenedDream.MediaPlayer.Download()", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ End Try
+ End If
+ Else
+ MessageBox.Show(ex.Message, "LightenedDream.Splash.LoadGraph()", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ End If
+ Application.Exit()
+ End Try
+ End Sub
End Class
Oops, something went wrong.

0 comments on commit 760eb4d

Please sign in to comment.