Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CloudlogCAT.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2019
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CloudlogCAT", "OmniRig_VB_DEMO\CloudlogCAT.vbproj", "{ADCB9205-EB9A-4E96-B32F-1590B1784786}"
EndProject
Expand Down
106 changes: 53 additions & 53 deletions OmniRig_VB_DEMO/AboutBox1.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions OmniRig_VB_DEMO/App.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="CloudlogCAT.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="CloudlogCAT.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<CloudlogCAT.My.MySettings>
Expand All @@ -25,6 +25,9 @@
<setting name="TransverterOffsetType" serializeAs="String">
<value />
</setting>
<setting name="MultiCloudlog" serializeAs="String">
<value />
</setting>
</CloudlogCAT.My.MySettings>
</userSettings>
</configuration>
</configuration>
20 changes: 9 additions & 11 deletions OmniRig_VB_DEMO/CloudlogCAT.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
<AssemblyName>CloudlogCAT</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>CloudlogCAT\</PublishUrl>
<TargetFrameworkProfile />
<PublishUrl>CloudlogCAT Publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
Expand All @@ -29,13 +30,8 @@
<ProductName>CloudlogCAT</ProductName>
<PublisherName>Magicbug</PublisherName>
<SuiteName>Cloudlog</SuiteName>
<<<<<<< HEAD
<ApplicationRevision>6</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
=======
<ApplicationRevision>4</ApplicationRevision>
<ApplicationVersion>1.3.0.%2a</ApplicationVersion>
>>>>>>> e221a03032e5c6a6f33ade8747dc3b7de93a3a4e
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.3.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -65,7 +61,7 @@
<OptionExplicit>On</OptionExplicit>
</PropertyGroup>
<PropertyGroup>
<OptionCompare>Binary</OptionCompare>
<OptionCompare>Text</OptionCompare>
</PropertyGroup>
<PropertyGroup>
<OptionStrict>Off</OptionStrict>
Expand Down Expand Up @@ -127,6 +123,7 @@
<Compile Include="AboutBox1.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="CloudlogTarget.vb" />
<Compile Include="Form1.vb">
<SubType>Form</SubType>
</Compile>
Expand All @@ -150,6 +147,7 @@
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
Expand Down Expand Up @@ -215,7 +213,7 @@
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 und x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
Expand Down
115 changes: 115 additions & 0 deletions OmniRig_VB_DEMO/CloudlogTarget.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
Imports CloudlogCAT.My
Imports Microsoft.VisualBasic
Imports System.ComponentModel
Imports System.IO
Imports System.Runtime.Serialization
Imports System.Runtime.Serialization.Formatters.Binary

<Serializable()>
Public Class CloudlogTarget

Private _name As String ' The name of this target, this is only visible in the error messages and in settings window
Private _radioName As String ' the String which is displayed in Cloudlog, Appended by 1 or 2 depending on the RIG Radio Button Setting
Private _url As String
Private _key As String
Private _active As Boolean ' Determines weather CloudlogCAT should push to this variable

' Empty construcor, initializes the object with basic Names, sets it to not be active
Public Sub New()
_name = "Target"
_radioName = "OmniRig"
_active = False
_url = ""
_key = ""
End Sub

' Complete Constructor
Public Sub New(ByVal name As String, ByVal radioName As String, ByVal url As String, ByVal key As String, ByVal active As Boolean)
_name = name
_radioName = radioName
_url = url
_key = key
_active = active
End Sub


' A shared function which allows to serialize an ArrayList Object of CloudlogTargets objects into a string
' This is needed as the settings functions only allows to store basic datatypes
' Argument: ArrayList
' Returns: String
Public Shared Function toSettingsString(ByVal list As ArrayList) As String
Dim serialized As String
Dim formatter As New BinaryFormatter()
Using memoryStream As New MemoryStream()
formatter.Serialize(memoryStream, list)
serialized = Convert.ToBase64String(memoryStream.ToArray())
End Using
Return serialized
End Function

' A shared function which allows to deserialize a string into an ArrayList Object of CloudlogTarget objects into a string
' This is needed as the settings functions only allows to store basic datatypes
' Argument: ArrayList
' Returns: String
Public Shared Function fromSettingsString(ByVal str As String) As ArrayList
Dim formatter As New BinaryFormatter()
Dim retrievedTargets As ArrayList
Using memoryStream As New MemoryStream(Convert.FromBase64String(str))
retrievedTargets = DirectCast(formatter.Deserialize(memoryStream), ArrayList)
End Using
Return retrievedTargets
End Function


' Setter and Getter Functions
<Category("Target"), Description("Name of the target, only visible within CloudlogCAT")>
Public Property name() As String
Get
Return _name
End Get
Set(ByVal value As String)
_name = value
End Set
End Property

<Category("Target"), Description("The Radio Name displayed by Cloudlog")>
Public Property radioName() As String
Get
Return _radioName
End Get
Set(ByVal value As String)
_radioName = value
End Set
End Property

<Category("Target"), Description("URL of Cloudlog")>
Public Property url() As String
Get
Return _url
End Get
Set(ByVal value As String)
_url = value
End Set
End Property

<Category("Target"), Description("API Key of Cloudlog")>
Public Property key() As String
Get
Return _key
End Get
Set(ByVal value As String)
_key = value
End Set
End Property

<Category("Target"), Description("Should CloudlogCAT publish to this target?")>
Public Property active() As Boolean
Get
Return _active
End Get
Set(ByVal value As Boolean)
_active = value
End Set
End Property

End Class
Loading