Commit 6c33eeff authored by Manu's avatar Manu 🏅
Browse files

Change project name to "DirectoTalk.Sender"

parent 97b6857b
......@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DirectoTalk", "DirectoTalk\DirectoTalk.csproj", "{F1071CCA-C3E3-4B0A-8F45-C230E0A4955B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DirectoTalk.Sender", "DirectoTalk.Sender\DirectoTalk.Sender.csproj", "{E76BBB1A-E82D-4B8F-A058-8094FAC1C5C2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -11,15 +11,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F1071CCA-C3E3-4B0A-8F45-C230E0A4955B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1071CCA-C3E3-4B0A-8F45-C230E0A4955B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1071CCA-C3E3-4B0A-8F45-C230E0A4955B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1071CCA-C3E3-4B0A-8F45-C230E0A4955B}.Release|Any CPU.Build.0 = Release|Any CPU
{E76BBB1A-E82D-4B8F-A058-8094FAC1C5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E76BBB1A-E82D-4B8F-A058-8094FAC1C5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E76BBB1A-E82D-4B8F-A058-8094FAC1C5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E76BBB1A-E82D-4B8F-A058-8094FAC1C5C2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FD0E7140-AF9F-4576-AD7C-55BEB5E678DD}
SolutionGuid = {96795B6D-4C58-4EE3-B8EA-AD16A82EBD8A}
EndGlobalSection
EndGlobal
<Application x:Class="DirectoTalk.App"
<Application x:Class="DirectoTalk.Sender.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:DirectoTalk"
xmlns:local="clr-namespace:DirectoTalk.Sender"
StartupUri="TalkWindow.xaml">
<Application.Resources>
......
......@@ -6,7 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace DirectoTalk
namespace DirectoTalk.Sender
{
/// <summary>
/// Interaction logic for App.xaml
......
using DirectoTalk.ViewModels;
using DirectoTalk.Sender.ViewModels;
using NAudio.Wave;
using System;
using System.Globalization;
using System.Linq;
using System.Windows;
namespace DirectoTalk
namespace DirectoTalk.Sender
{
public class CallingMachine : IDisposable
{
......
......@@ -4,7 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<StartupObject>DirectoTalk.App</StartupObject>
<StartupObject>DirectoTalk.Sender.App</StartupObject>
<ApplicationIcon>call.ico</ApplicationIcon>
</PropertyGroup>
......@@ -13,14 +13,6 @@
<None Remove="call.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NAudio" Version="1.10.0" />
</ItemGroup>
<ItemGroup>
<Content Include="call.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......@@ -31,18 +23,11 @@
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NAudio" Version="1.10.0" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -3,7 +3,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
namespace DirectoTalk
namespace DirectoTalk.Sender
{
public class NetworkHandler : IDisposable
{
......
namespace DirectoTalk
namespace DirectoTalk.Sender
{
public class SendResult
{
......
<Window x:Class="DirectoTalk.TalkWindow"
<Window x:Class="DirectoTalk.Sender.TalkWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:DirectoTalk"
xmlns:local="clr-namespace:DirectoTalk.Sender"
mc:Ignorable="d"
Title="DirectoTalk" MinHeight="240" Height="540" MinWidth="400" Width="400" Icon="call.ico">
Title="DirectoTalk Sender" MinHeight="240" Height="540" MinWidth="400" Width="400" Icon="call.ico">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="48"></RowDefinition>
......@@ -38,4 +38,4 @@
</TextBlock.Inlines>
</TextBlock>
</Grid>
</Window>
</Window>
\ No newline at end of file
using DirectoTalk.ViewModels;
using DirectoTalk.Sender.ViewModels;
using System;
using System.Windows;
namespace DirectoTalk
namespace DirectoTalk.Sender
{
/// <summary>
/// Interaction logic for TalkWindow.xaml
......
using System;
namespace DirectoTalk.ViewModels
namespace DirectoTalk.Sender.ViewModels
{
public class TalkViewModel : ViewModel, IDisposable
{
......
using System.ComponentModel;
namespace DirectoTalk.ViewModels
namespace DirectoTalk.Sender.ViewModels
{
public class ViewModel : INotifyPropertyChanged
{
......
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DirectoTalk.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DirectoTalk.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] call {
get {
object obj = ResourceManager.GetObject("call", resourceCulture);
return ((byte[])(obj));
}
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="call" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\call.ico;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
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 to comment