FabInfra-Mirror/borepin
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/borepin.git synced 2025-03-12 23:01:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/usersearch' into 'main'

Browse Source 
Feature/usersearch

See merge request fabinfra/fabaccess/borepin!64
This commit is contained in:
TheJoKlLa 2022-12-10 22:49:18 +00:00
commit 5b835c4fd5
22 changed files with 286 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Borepin.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.32002.261 VisualStudioVersion = 17.4.33122.133
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.UWP", "Borepin\Borepin.UWP\Borepin.UWP.csproj", "{664AA356-2920-4353-A80A-B89128011381}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.UWP", "Borepin\Borepin.UWP\Borepin.UWP.csproj", "{664AA356-2920-4353-A80A-B89128011381}"
EndProject EndProject
@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.iOS", "Borepin\Bore
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin", "Borepin\Borepin\Borepin.csproj", "{F93856BD-0C8D-4469-A8DB-6E513002BFD7}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Borepin", "Borepin\Borepin\Borepin.csproj", "{F93856BD-0C8D-4469-A8DB-6E513002BFD7}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.GTK", "Borepin\Borepin.GTK\Borepin.GTK.csproj", "{61D956D2-5819-4736-BBD8-AD8208DE6A62}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.macOS", "Borepin\Borepin.macOS\Borepin.macOS.csproj", "{3EC23FE7-395E-4BBC-B56B-9455354BDA34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabAccessAPI", "FabAccessAPI\FabAccessAPI.csproj", "{3251FCE9-FEA3-4662-8BEB-636BE6732D48}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabAccessAPI", "FabAccessAPI\FabAccessAPI.csproj", "{3251FCE9-FEA3-4662-8BEB-636BE6732D48}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S22.Sasl", "external\SASL\S22.Sasl.csproj", "{7FEC3D5E-C240-41B6-BBFA-895C4F4D45CA}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "S22.Sasl", "external\SASL\S22.Sasl.csproj", "{7FEC3D5E-C240-41B6-BBFA-895C4F4D45CA}"
@ -34,6 +30,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitmodules = .gitmodules .gitmodules = .gitmodules
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Borepin.GTK", "Borepin\Borepin.GTK\Borepin.GTK.csproj", "{61D956D2-5819-4736-BBD8-AD8208DE6A62}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -194,54 +192,6 @@ Global
{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.ActiveCfg = Release|Any CPU {F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.ActiveCfg = Release|Any CPU
{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Build.0 = Release|Any CPU {F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Build.0 = Release|Any CPU
{F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Deploy.0 = Release|Any CPU {F93856BD-0C8D-4469-A8DB-6E513002BFD7}.Release|x86.Deploy.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|ARM.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|ARM.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhone.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x64.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x64.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x86.ActiveCfg = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Debug|x86.Build.0 = Debug|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|Any CPU.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|ARM.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|ARM.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhone.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhone.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x64.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x64.Build.0 = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x86.ActiveCfg = Release|Any CPU
{3EC23FE7-395E-4BBC-B56B-9455354BDA34}.Release|x86.Build.0 = Release|Any CPU
{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.Build.0 = Debug|Any CPU {3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|ARM.ActiveCfg = Debug|Any CPU {3251FCE9-FEA3-4662-8BEB-636BE6732D48}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -386,6 +336,30 @@ Global
{A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x64.Build.0 = Release|Any CPU {A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x64.Build.0 = Release|Any CPU
{A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x86.ActiveCfg = Release|Any CPU {A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x86.ActiveCfg = Release|Any CPU
{A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x86.Build.0 = Release|Any CPU {A959A406-91A5-4D81-B90D-EF022812D97D}.Release|x86.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|ARM.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhone.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x64.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.ActiveCfg = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Debug|x86.Build.0 = Debug|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|Any CPU.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|ARM.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhone.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x64.Build.0 = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.ActiveCfg = Release|Any CPU
{61D956D2-5819-4736-BBD8-AD8208DE6A62}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
Borepin/Borepin.Android/Borepin.Android.csproj
View File

@ -67,7 +67,7 @@
<PackageReference Include="Prism.DryIoc.Forms"> <PackageReference Include="Prism.DryIoc.Forms">
<Version>8.1.97</Version> <Version>8.1.97</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" /> <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Borepin/Borepin.Android/Resources/Resource.designer.cs generated
View File

@ -14,7 +14,7 @@ namespace Borepin.Droid
{ {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")]
public partial class Resource public partial class Resource
{ {

24
Borepin/Borepin.GTK/Borepin.GTK.csproj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" /> <Import Project="..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -42,8 +42,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\atk-sharp.dll</HintPath> <HintPath>..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\atk-sharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="DryIoc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL"> <Reference Include="DryIoc, Version=5.3.1.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL">
<HintPath>..\..\packages\DryIoc.dll.5.2.2\lib\net45\DryIoc.dll</HintPath> <HintPath>..\..\packages\DryIoc.dll.5.3.1\lib\net45\DryIoc.dll</HintPath>
</Reference> </Reference>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"> <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@ -93,19 +93,19 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL"> <Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2515\lib\net45\webkit-sharp.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2545\lib\net45\webkit-sharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2515\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2545\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -132,10 +132,10 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets'))" />
</Target> </Target>
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" /> <Import Project="..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets')" />
</Project> </Project>

2
Borepin/Borepin.GTK/app.config
View File

@ -12,7 +12,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="DryIoc" publicKeyToken="dfbf2bd50fcf7768" culture="neutral" /> <assemblyIdentity name="DryIoc" publicKeyToken="dfbf2bd50fcf7768" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" /> <bindingRedirect oldVersion="0.0.0.0-5.3.1.0" newVersion="5.3.1.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

6
Borepin/Borepin.GTK/packages.config
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="DryIoc.dll" version="5.2.2" targetFramework="net48" /> <package id="DryIoc.dll" version="5.3.1" targetFramework="net48" />
<package id="OpenTK" version="3.2" targetFramework="net48" /> <package id="OpenTK" version="3.2" targetFramework="net48" />
<package id="Prism.Core" version="8.1.97" targetFramework="net48" /> <package id="Prism.Core" version="8.1.97" targetFramework="net48" />
<package id="Prism.DryIoc.Forms" version="8.1.97" targetFramework="net48" /> <package id="Prism.DryIoc.Forms" version="8.1.97" targetFramework="net48" />
<package id="Prism.Forms" version="8.1.97" targetFramework="net48" /> <package id="Prism.Forms" version="8.1.97" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" /> <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
<package id="Xamarin.Forms" version="5.0.0.2515" targetFramework="net48" /> <package id="Xamarin.Forms" version="5.0.0.2545" targetFramework="net48" />
<package id="Xamarin.Forms.Platform.GTK" version="5.0.0.2515" targetFramework="net48" /> <package id="Xamarin.Forms.Platform.GTK" version="5.0.0.2545" targetFramework="net48" />
</packages> </packages>

2
Borepin/Borepin.UWP/Borepin.UWP.csproj
View File

@ -181,7 +181,7 @@
<PackageReference Include="Prism.DryIoc.Forms"> <PackageReference Include="Prism.DryIoc.Forms">
<Version>8.1.97</Version> <Version>8.1.97</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" /> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" /> <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup> </ItemGroup>

2
Borepin/Borepin.iOS/Borepin.iOS.csproj
View File

@ -189,7 +189,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" /> <PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>5.0.0.2515</Version> <Version>5.0.0.2545</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

22
Borepin/Borepin.macOS/Borepin.macOS.csproj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" /> <Import Project="..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -59,8 +59,8 @@
</XamMacArch> </XamMacArch>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DryIoc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL"> <Reference Include="DryIoc, Version=5.3.1.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL">
<HintPath>..\..\packages\DryIoc.dll.5.2.2\lib\netstandard2.1\DryIoc.dll</HintPath> <HintPath>..\..\packages\DryIoc.dll.5.3.1\lib\netstandard2.1\DryIoc.dll</HintPath>
</Reference> </Reference>
<Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL"> <Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\..\packages\Prism.Core.8.1.97\lib\netstandard2.0\Prism.dll</HintPath> <HintPath>..\..\packages\Prism.Core.8.1.97\lib\netstandard2.0\Prism.dll</HintPath>
@ -74,16 +74,16 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform.macOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform.macOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Mac" /> <Reference Include="Xamarin.Mac" />
</ItemGroup> </ItemGroup>
@ -131,10 +131,10 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.props'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets'))" />
</Target> </Target>
<Import Project="..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2515\build\Xamarin.Forms.targets')" /> <Import Project="..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.5.0.0.2545\build\Xamarin.Forms.targets')" />
</Project> </Project>

2
Borepin/Borepin.macOS/app.config
View File

@ -8,7 +8,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="DryIoc" publicKeyToken="dfbf2bd50fcf7768" culture="neutral" /> <assemblyIdentity name="DryIoc" publicKeyToken="dfbf2bd50fcf7768" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" /> <bindingRedirect oldVersion="0.0.0.0-5.3.1.0" newVersion="5.3.1.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>

4
Borepin/Borepin.macOS/packages.config
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="DryIoc.dll" version="5.2.2" targetFramework="xamarinmac20" /> <package id="DryIoc.dll" version="5.3.1" targetFramework="xamarinmac20" />
<package id="Prism.Core" version="8.1.97" targetFramework="xamarinmac20" /> <package id="Prism.Core" version="8.1.97" targetFramework="xamarinmac20" />
<package id="Prism.DryIoc.Forms" version="8.1.97" targetFramework="xamarinmac20" /> <package id="Prism.DryIoc.Forms" version="8.1.97" targetFramework="xamarinmac20" />
<package id="Prism.Forms" version="8.1.97" targetFramework="xamarinmac20" /> <package id="Prism.Forms" version="8.1.97" targetFramework="xamarinmac20" />
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="xamarinmac20" /> <package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="xamarinmac20" />
<package id="Xamarin.Forms" version="5.0.0.2515" targetFramework="xamarinmac20" /> <package id="Xamarin.Forms" version="5.0.0.2545" targetFramework="xamarinmac20" />
</packages> </packages>

8
Borepin/Borepin/Borepin.csproj
View File

@ -31,15 +31,15 @@
<None Remove="Properties\**" /> <None Remove="Properties\**" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="1.0.746"> <PackageReference Include="Meziantou.Analyzer" Version="1.0.756">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="NaturalSort.Extension" Version="4.0.0" /> <PackageReference Include="NaturalSort.Extension" Version="4.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="Prism.DryIoc.Forms" Version="8.1.97" /> <PackageReference Include="Prism.DryIoc.Forms" Version="8.1.97" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2545" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" /> <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="ZXing.Net.MobileX.Forms" Version="3.0.1" /> <PackageReference Include="ZXing.Net.MobileX.Forms" Version="3.0.1" />
</ItemGroup> </ItemGroup>

50
Borepin/Borepin/Page/MachinePage.xaml
View File

@ -17,35 +17,37 @@
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
<ScrollView Padding="20"> <ScrollView>
<StackLayout> <StackLayout Padding="20">
<StackLayout IsVisible="{Binding IsBusy}"> <StackLayout IsVisible="{Binding IsConnected}">
<StackLayout IsVisible="{Binding IsBusy}">
<ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator> <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
</StackLayout> </StackLayout>
<StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}"> <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
<Label Text="{Binding MachineItem.Name}" Style="{StaticResource LabelStyle_Title}"/> <Label Text="{Binding MachineItem.Name}" Style="{StaticResource LabelStyle_Title}"/>
<Label Text="{Binding MachineItem.Description}" Style="{StaticResource Style_Label_Text_Center}"/> <Label Text="{Binding MachineItem.Description}" Style="{StaticResource Style_Label_Text_Center}"/>
<StackLayout Orientation="Horizontal" IsVisible="{Binding MachineItem.CurrentUser, Converter={StaticResource IsNotNullBoolConverter}}"> <StackLayout Orientation="Horizontal" IsVisible="{Binding MachineItem.CurrentUser, Converter={StaticResource IsNotNullBoolConverter}}">
<Label Text="{x:Static resource_text:TextResource.MachinePage_CurrentUser}" Style="{StaticResource Style_Label_Property_Title}"/> <Label Text="{x:Static resource_text:TextResource.MachinePage_CurrentUser}" Style="{StaticResource Style_Label_Property_Title}"/>
<Label Text="{Binding MachineItem.CurrentUser.Username}" Style="{StaticResource Style_Label_Property_Text}"/> <Label Text="{Binding MachineItem.CurrentUser.Username}" Style="{StaticResource Style_Label_Property_Text}"/>
</StackLayout> </StackLayout>
<Button Text="{x:Static resource_text:TextResource.MachinePage_Use}" IsVisible="{Binding MachineItem.CanUse}" Command="{Binding UseMachineCommand}" Style="{StaticResource Style_Button_Primary}"/> <Button Text="{x:Static resource_text:TextResource.MachinePage_Use}" IsVisible="{Binding MachineItem.CanUse}" Command="{Binding UseMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
<Label Text="{x:Static resource_text:TextResource.MachinePage_CanNotUseByPermission}" IsVisible="{Binding MachineItem.CanNotUseByPermission}" Style="{StaticResource Style_Label_Text_Center}"/> <Label Text="{x:Static resource_text:TextResource.MachinePage_CanNotUseByPermission}" IsVisible="{Binding MachineItem.CanNotUseByPermission}" Style="{StaticResource Style_Label_Text_Center}"/>
<Button Text="{x:Static resource_text:TextResource.MachinePage_GiveBack}" IsVisible="{Binding MachineItem.CanInUse}" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/> <Button Text="{x:Static resource_text:TextResource.MachinePage_GiveBack}" IsVisible="{Binding MachineItem.CanInUse}" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
<Button VerticalOptions="End" Text="{x:Static resource_text:TextResource.MachinePage_OpenWiki}" IsVisible="{Binding MachineItem.Wiki, Converter={StaticResource IsNotNullBoolConverter}}" Command="{Binding OpenWikiCommand}" Style="{StaticResource Style_Button_Primary}"/> <Button VerticalOptions="End" Text="{x:Static resource_text:TextResource.MachinePage_OpenWiki}" IsVisible="{Binding MachineItem.Wiki, Converter={StaticResource IsNotNullBoolConverter}}" Command="{Binding OpenWikiCommand}" Style="{StaticResource Style_Button_Primary}"/>
<StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}"> <StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}">
<Label Text="{x:Static resource_text:TextResource.MachinePage_ManageMachine}" Style="{StaticResource Style_Label_Property_Title}"/> <Label Text="{x:Static resource_text:TextResource.MachinePage_ManageMachine}" Style="{StaticResource Style_Label_Property_Title}"/>
<StackLayout Margin="10, 0, 0, 20" Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}"> <StackLayout Margin="10, 0, 0, 20" Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}">
<Label Text="{x:Static resource_text:TextResource.MachinePage_LastUser}" Style="{StaticResource Style_Label_Property_Title}"/> <Label Text="{x:Static resource_text:TextResource.MachinePage_LastUser}" Style="{StaticResource Style_Label_Property_Title}"/>
<Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}" Margin="10, 0, 0, 0"/> <Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}" Margin="10, 0, 0, 0"/>
</StackLayout>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceFree}" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceBlock}" Command="{Binding ForceBlockMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceDisable}" Command="{Binding ForceDisableMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
</StackLayout> </StackLayout>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceFree}" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceBlock}" Command="{Binding ForceBlockMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
<Button Text="{x:Static resource_text:TextResource.MachinePage_ForceDisable}" Command="{Binding ForceDisableMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
</StackLayout> </StackLayout>
<Label Text="{x:Static resource_text:TextResource.PLEASECONNECTTOSERVER}" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
</StackLayout> </StackLayout>
<Label Text="{x:Static resource_text:TextResource.PLEASECONNECTTOSERVER}" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
</StackLayout> </StackLayout>
</ScrollView> </ScrollView>
</ContentPage.Content> </ContentPage.Content>

9
Borepin/Borepin/Page/UserListPage.xaml
View File

@ -4,7 +4,7 @@
xmlns:views="clr-namespace:Borepin.View" xmlns:views="clr-namespace:Borepin.View"
x:Class="Borepin.Page.UserListPage" x:Class="Borepin.Page.UserListPage"
xmlns:converters="clr-namespace:Borepin.Converter" xmlns:converters="clr-namespace:Borepin.Converter"
xmlns:resource_text="clr-namespace:Borepin.Resources.Text" xmlns:resource_text="clr-namespace:Borepin.Resources.Text" xmlns:prism="http://prismlibrary.com"
Title="{x:Static resource_text:TextResource.TITLE_Users}"> Title="{x:Static resource_text:TextResource.TITLE_Users}">
<NavigationPage.TitleView> <NavigationPage.TitleView>
<Button Text="Refresh" HorizontalOptions="End" BackgroundColor="{StaticResource SecondColor}" TextColor="{StaticResource FirstColor}" Command="{Binding RefreshCommand}"/> <Button Text="Refresh" HorizontalOptions="End" BackgroundColor="{StaticResource SecondColor}" TextColor="{StaticResource FirstColor}" Command="{Binding RefreshCommand}"/>
@ -23,7 +23,12 @@
<StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}"> <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
<StackLayout IsVisible="{Binding IsConnected}"> <StackLayout IsVisible="{Binding IsConnected}">
<Button Text="{x:Static resource_text:TextResource.UserListPage_AddUser}" Command="{Binding AddUserCommand}" Style="{StaticResource Style_Button_Primary}"/> <Button Text="{x:Static resource_text:TextResource.UserListPage_AddUser}" Command="{Binding AddUserCommand}" Style="{StaticResource Style_Button_Primary}"/>
<ListView ItemsSource="{Binding UserListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent"> <SearchBar Text="{Binding SearchUsername}" SearchCommand="{Binding SearchUserCommand}">
<SearchBar.Behaviors>
<prism:EventToCommandBehavior EventName="TextChanged" Command="{Binding SearchUserCommand}"/>
</SearchBar.Behaviors>
</SearchBar>
<ListView ItemsSource="{Binding FilteredUserListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell>

6
Borepin/Borepin/PageModel/MachineListPageModel.cs
View File

@ -45,7 +45,7 @@ namespace Borepin.PageModel
}; };
MachineViewModelListGroup viewmodel_group_uncategorised = new MachineViewModelListGroup() MachineViewModelListGroup viewmodel_group_uncategorised = new MachineViewModelListGroup()
{ {
Category = null, Category = String.Empty,
}; };
foreach (Machine machine in machine_list) foreach (Machine machine in machine_list)
@ -67,7 +67,7 @@ namespace Borepin.PageModel
MachineListItemViewModel new_viewmodel = new MachineListItemViewModel(_NavigationService, _PageDialogService); MachineListItemViewModel new_viewmodel = new MachineListItemViewModel(_NavigationService, _PageDialogService);
tasks.Add(new_viewmodel.LoadInstance(machine)); tasks.Add(new_viewmodel.LoadInstance(machine));
viewmodel_group_inusebyme.Add(new_viewmodel); viewmodel_group_uncategorised.Add(new_viewmodel);
} }
else else
{ {
@ -100,7 +100,7 @@ namespace Borepin.PageModel
viewmodel_group.Sort_Machines(); viewmodel_group.Sort_Machines();
} }
viewmodel_group_uncategorised.Category = Resources.Text.TextResource.Uncategorised; viewmodel_group_uncategorised.Category = String.Empty;
List<MachineViewModelListGroup> viewmodel_group_list_sorted = new List<MachineViewModelListGroup>(); List<MachineViewModelListGroup> viewmodel_group_list_sorted = new List<MachineViewModelListGroup>();
if(viewmodel_group_inusebyme.Count != 0) if(viewmodel_group_inusebyme.Count != 0)
{ {

21
Borepin/Borepin/PageModel/StartPageModel.cs
View File

@ -2,10 +2,14 @@
using Borepin.Service; using Borepin.Service;
using Borepin.Service.Storage; using Borepin.Service.Storage;
using FabAccessAPI; using FabAccessAPI;
using FabAccessAPI.Exceptions;
using Prism.AppModel; using Prism.AppModel;
using Prism.Navigation; using Prism.Navigation;
using Prism.Services; using Prism.Services;
using Prism.Services.Dialogs;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Security.Authentication;
using Xamarin.Forms; using Xamarin.Forms;
namespace Borepin.PageModel namespace Borepin.PageModel
@ -65,8 +69,23 @@ namespace Borepin.PageModel
} }
}); });
} }
catch catch(Exception ex)
{ {
if (ex is AuthenticationFailedException)
{
Device.BeginInvokeOnMainThread(async () =>
{
await _PageDialogService.DisplayAlertAsync(Resources.Text.TextResource.ALERT_ConnectionFailed, Resources.Text.TextResource.ALERT_AuthServer, Resources.Text.TextResource.OK).ConfigureAwait(false);
});
}
else if (ex is ConnectingFailedException)
{
Device.BeginInvokeOnMainThread(async () =>
{
await _PageDialogService.DisplayAlertAsync(Resources.Text.TextResource.ALERT_ConnectionFailed, Resources.Text.TextResource.ALERT_UnableServer, Resources.Text.TextResource.OK).ConfigureAwait(false);
});
}
Device.BeginInvokeOnMainThread(async () => Device.BeginInvokeOnMainThread(async () =>
{ {
INavigationResult result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/ServerListPage").ConfigureAwait(false); INavigationResult result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/ServerListPage").ConfigureAwait(false);

30
Borepin/Borepin/PageModel/UserListPageModel.cs
View File

@ -12,6 +12,7 @@ using NaturalSort.Extension;
using System.Linq; using System.Linq;
using Borepin.Service; using Borepin.Service;
using Xamarin.Forms; using Xamarin.Forms;
using System.Globalization;
namespace Borepin.PageModel namespace Borepin.PageModel
{ {
@ -22,6 +23,7 @@ namespace Borepin.PageModel
{ {
RefreshCommand = new DelegateCommand(async ()=> await RefreshCommandExecute().ConfigureAwait(true)); RefreshCommand = new DelegateCommand(async ()=> await RefreshCommandExecute().ConfigureAwait(true));
AddUserCommand = new DelegateCommand(AddUserCommandExecute); AddUserCommand = new DelegateCommand(AddUserCommandExecute);
SearchUserCommand = new DelegateCommand(SearchUserCommandExecute);
} }
#endregion #endregion
@ -42,6 +44,8 @@ namespace Borepin.PageModel
await Task.WhenAll(tasks).ConfigureAwait(false); await Task.WhenAll(tasks).ConfigureAwait(false);
UserListItemViewModel_List = new List<UserListItemViewModel>(viewmodel_list.OrderBy(x => x.User.Username, StringComparison.OrdinalIgnoreCase.WithNaturalSort())); UserListItemViewModel_List = new List<UserListItemViewModel>(viewmodel_list.OrderBy(x => x.User.Username, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
FilteredUserListItemViewModel_List = new List<UserListItemViewModel>(viewmodel_list.OrderBy(x => x.User.Username, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
} }
#endregion #endregion
@ -53,12 +57,26 @@ namespace Borepin.PageModel
set => SetProperty(ref _UserListItemViewModel_List, value); set => SetProperty(ref _UserListItemViewModel_List, value);
} }
private IList<UserListItemViewModel> _FilteredUserListItemViewModel_List;
public IList<UserListItemViewModel> FilteredUserListItemViewModel_List
{
get => _FilteredUserListItemViewModel_List;
set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
}
private bool _IsRefreshing; private bool _IsRefreshing;
public bool IsRefreshing public bool IsRefreshing
{ {
get => _IsRefreshing; get => _IsRefreshing;
set => SetProperty(ref _IsRefreshing, value); set => SetProperty(ref _IsRefreshing, value);
} }
private string _SearchUsername;
public string SearchUsername
{
get => _SearchUsername;
set => SetProperty(ref _SearchUsername, value);
}
#endregion #endregion
#region Commands #region Commands
@ -95,6 +113,18 @@ namespace Borepin.PageModel
} }
}); });
} }
private ICommand _SerachUserCommand;
public ICommand SearchUserCommand
{
get => _SerachUserCommand;
set => SetProperty(ref _SerachUserCommand, value);
}
public void SearchUserCommandExecute()
{
List<UserListItemViewModel> users = new List<UserListItemViewModel>(UserListItemViewModel_List);
FilteredUserListItemViewModel_List = users.FindAll(x => x.User.Username.ToLower(CultureInfo.InvariantCulture).Contains(SearchUsername.ToLower(CultureInfo.InvariantCulture)));
}
#endregion #endregion
} }
} }

228
Borepin/Borepin/Resources/Text/TextResource.Designer.cs generated
View File

@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Dieser Code wurde von einem Tool generiert.
// Runtime Version:4.0.30319.42000 // Laufzeitversion:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// the code is regenerated. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,13 +13,13 @@ namespace Borepin.Resources.Text {
/// <summary> /// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc. /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary> /// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// class via a tool like ResGen or Visual Studio. // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// To add or remove a member, edit your .ResX file then rerun ResGen // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// with the /str option, or rebuild your VS project. // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class TextResource { internal class TextResource {
@ -33,7 +33,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Returns the cached ResourceManager instance used by this class. /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
@ -47,8 +47,8 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Overrides the current thread's CurrentUICulture property for all /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// resource lookups using this strongly typed resource class. /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture { internal static global::System.Globalization.CultureInfo Culture {
@ -61,7 +61,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Login. /// Sucht eine lokalisierte Zeichenfolge, die Login ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_AuthPlainPage_Login { internal static string AddServerProcess_AuthPlainPage_Login {
get { get {
@ -70,7 +70,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Login with Card. /// Sucht eine lokalisierte Zeichenfolge, die Login with Card ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_ChooseAuthTypePage_LoginCard { internal static string AddServerProcess_ChooseAuthTypePage_LoginCard {
get { get {
@ -79,7 +79,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Login with Password. /// Sucht eine lokalisierte Zeichenfolge, die Login with Password ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_ChooseAuthTypePage_LoginPassword { internal static string AddServerProcess_ChooseAuthTypePage_LoginPassword {
get { get {
@ -88,7 +88,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Register. /// Sucht eine lokalisierte Zeichenfolge, die Register ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_ChooseAuthTypePage_Register { internal static string AddServerProcess_ChooseAuthTypePage_Register {
get { get {
@ -97,7 +97,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Sign In:. /// Sucht eine lokalisierte Zeichenfolge, die Sign In: ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_ChooseAuthTypePage_SignIn { internal static string AddServerProcess_ChooseAuthTypePage_SignIn {
get { get {
@ -106,7 +106,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Sign Up:. /// Sucht eine lokalisierte Zeichenfolge, die Sign Up: ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_ChooseAuthTypePage_SignUp { internal static string AddServerProcess_ChooseAuthTypePage_SignUp {
get { get {
@ -115,7 +115,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connect to Server. /// Sucht eine lokalisierte Zeichenfolge, die Connect to Server ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_SelectServerPage_Connect { internal static string AddServerProcess_SelectServerPage_Connect {
get { get {
@ -124,9 +124,9 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to FabAccess is a decentralized machine management system. Each Space thus uses its own server. /// Sucht eine lokalisierte Zeichenfolge, die FabAccess is a decentralized machine management system. Each Space thus uses its own server.
///Ask your Space for the address of your server. ///Ask your Space for the address of your server.
///You can also put down several servers and then connect to the desired server.. ///You can also put down several servers and then connect to the desired server. ähnelt.
/// </summary> /// </summary>
internal static string AddServerProcess_SelectServerPage_Info { internal static string AddServerProcess_SelectServerPage_Info {
get { get {
@ -135,7 +135,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Add User. /// Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
/// </summary> /// </summary>
internal static string AddUserPage_AddUser { internal static string AddUserPage_AddUser {
get { get {
@ -144,7 +144,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Alert. /// Sucht eine lokalisierte Zeichenfolge, die Alert ähnelt.
/// </summary> /// </summary>
internal static string ALERT { internal static string ALERT {
get { get {
@ -153,7 +153,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Server address is invaild.. /// Sucht eine lokalisierte Zeichenfolge, die Server address is invaild. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_AddressInvalid { internal static string ALERT_AddressInvalid {
get { get {
@ -162,7 +162,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Add User failed. /// Sucht eine lokalisierte Zeichenfolge, die Add User failed ähnelt.
/// </summary> /// </summary>
internal static string ALERT_AddUserFailed { internal static string ALERT_AddUserFailed {
get { get {
@ -171,7 +171,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Unable to authenticate to server.. /// Sucht eine lokalisierte Zeichenfolge, die Unable to authenticate to server. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_AuthServer { internal static string ALERT_AuthServer {
get { get {
@ -180,7 +180,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connection failed. /// Sucht eine lokalisierte Zeichenfolge, die Connection failed ähnelt.
/// </summary> /// </summary>
internal static string ALERT_ConnectionFailed { internal static string ALERT_ConnectionFailed {
get { get {
@ -189,7 +189,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connection already exist. Please delete old Connection before adding the new Connection.. /// Sucht eine lokalisierte Zeichenfolge, die Connection already exist. Please delete old Connection before adding the new Connection. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_DuplicateConnection { internal static string ALERT_DuplicateConnection {
get { get {
@ -198,7 +198,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Password is invalid.. /// Sucht eine lokalisierte Zeichenfolge, die Password is invalid. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_PasswordInvalid { internal static string ALERT_PasswordInvalid {
get { get {
@ -207,7 +207,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to QR Code is invalid. /// Sucht eine lokalisierte Zeichenfolge, die QR Code is invalid ähnelt.
/// </summary> /// </summary>
internal static string Alert_QRInvalid { internal static string Alert_QRInvalid {
get { get {
@ -216,7 +216,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Unable to connect to server.. /// Sucht eine lokalisierte Zeichenfolge, die Unable to connect to server. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_UnableServer { internal static string ALERT_UnableServer {
get { get {
@ -225,7 +225,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Unexpected Error.. /// Sucht eine lokalisierte Zeichenfolge, die Unexpected Error. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_UnexpectedError { internal static string ALERT_UnexpectedError {
get { get {
@ -234,7 +234,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to User allready exist.. /// Sucht eine lokalisierte Zeichenfolge, die User allready exist. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_UserExist { internal static string ALERT_UserExist {
get { get {
@ -243,7 +243,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Username is invalid.. /// Sucht eine lokalisierte Zeichenfolge, die Username is invalid. ähnelt.
/// </summary> /// </summary>
internal static string ALERT_UsernameInvalid { internal static string ALERT_UsernameInvalid {
get { get {
@ -252,7 +252,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to It&apos;s Bionade. /// Sucht eine lokalisierte Zeichenfolge, die It&apos;s Bionade ähnelt.
/// </summary> /// </summary>
internal static string Bionade { internal static string Bionade {
get { get {
@ -261,7 +261,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Build. /// Sucht eine lokalisierte Zeichenfolge, die Build ähnelt.
/// </summary> /// </summary>
internal static string BUILD { internal static string BUILD {
get { get {
@ -270,7 +270,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Cancel. /// Sucht eine lokalisierte Zeichenfolge, die Cancel ähnelt.
/// </summary> /// </summary>
internal static string CANCEL { internal static string CANCEL {
get { get {
@ -279,7 +279,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Confirm. /// Sucht eine lokalisierte Zeichenfolge, die Confirm ähnelt.
/// </summary> /// </summary>
internal static string CONFIRM { internal static string CONFIRM {
get { get {
@ -288,7 +288,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Delete. /// Sucht eine lokalisierte Zeichenfolge, die Delete ähnelt.
/// </summary> /// </summary>
internal static string DELETE { internal static string DELETE {
get { get {
@ -297,7 +297,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Delete Server. /// Sucht eine lokalisierte Zeichenfolge, die Delete Server ähnelt.
/// </summary> /// </summary>
internal static string DIALOG_DeleteServer { internal static string DIALOG_DeleteServer {
get { get {
@ -306,7 +306,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to &quot;Do you really want to delete this Server?&quot;. /// Sucht eine lokalisierte Zeichenfolge, die &quot;Do you really want to delete this Server?&quot; ähnelt.
/// </summary> /// </summary>
internal static string DIALOG_DeleteServerConfirm { internal static string DIALOG_DeleteServerConfirm {
get { get {
@ -315,7 +315,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Delete User. /// Sucht eine lokalisierte Zeichenfolge, die Delete User ähnelt.
/// </summary> /// </summary>
internal static string DIALOG_DeleteUser { internal static string DIALOG_DeleteUser {
get { get {
@ -324,7 +324,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Do you really want to delete this User?. /// Sucht eine lokalisierte Zeichenfolge, die Do you really want to delete this User? ähnelt.
/// </summary> /// </summary>
internal static string DIALOG_DeleteUserConfirm { internal static string DIALOG_DeleteUserConfirm {
get { get {
@ -333,7 +333,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to FabAccess. /// Sucht eine lokalisierte Zeichenfolge, die FabAccess ähnelt.
/// </summary> /// </summary>
internal static string FABACCESS { internal static string FABACCESS {
get { get {
@ -342,7 +342,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Host. /// Sucht eine lokalisierte Zeichenfolge, die Host ähnelt.
/// </summary> /// </summary>
internal static string HOST { internal static string HOST {
get { get {
@ -351,7 +351,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to In Use By Me. /// Sucht eine lokalisierte Zeichenfolge, die In Use By Me ähnelt.
/// </summary> /// </summary>
internal static string InUseByMe { internal static string InUseByMe {
get { get {
@ -360,8 +360,17 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to You do not have the authorization to use this machine. /// Sucht eine lokalisierte Zeichenfolge, die Machine ähnelt.
///Ask in your Space if you can be trained on the machine to be unlocked for the machine.. /// </summary>
internal static string MACHINE {
get {
return ResourceManager.GetString("MACHINE", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die You do not have the authorization to use this machine.
///Ask in your Space if you can be trained on the machine to be unlocked for the machine. ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_CanNotUseByPermission { internal static string MachinePage_CanNotUseByPermission {
get { get {
@ -370,7 +379,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Current User:. /// Sucht eine lokalisierte Zeichenfolge, die Current User: ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_CurrentUser { internal static string MachinePage_CurrentUser {
get { get {
@ -379,7 +388,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Block Machine. /// Sucht eine lokalisierte Zeichenfolge, die Block Machine ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_ForceBlock { internal static string MachinePage_ForceBlock {
get { get {
@ -388,7 +397,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Disable Machine. /// Sucht eine lokalisierte Zeichenfolge, die Disable Machine ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_ForceDisable { internal static string MachinePage_ForceDisable {
get { get {
@ -397,7 +406,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Free Machine. /// Sucht eine lokalisierte Zeichenfolge, die Free Machine ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_ForceFree { internal static string MachinePage_ForceFree {
get { get {
@ -406,7 +415,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to GiveBack. /// Sucht eine lokalisierte Zeichenfolge, die GiveBack ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_GiveBack { internal static string MachinePage_GiveBack {
get { get {
@ -415,7 +424,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Last User:. /// Sucht eine lokalisierte Zeichenfolge, die Last User: ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_LastUser { internal static string MachinePage_LastUser {
get { get {
@ -424,7 +433,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Manage Machine:. /// Sucht eine lokalisierte Zeichenfolge, die Manage Machine: ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_ManageMachine { internal static string MachinePage_ManageMachine {
get { get {
@ -433,7 +442,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Open Wiki. /// Sucht eine lokalisierte Zeichenfolge, die Open Wiki ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_OpenWiki { internal static string MachinePage_OpenWiki {
get { get {
@ -442,7 +451,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Use. /// Sucht eine lokalisierte Zeichenfolge, die Use ähnelt.
/// </summary> /// </summary>
internal static string MachinePage_Use { internal static string MachinePage_Use {
get { get {
@ -451,7 +460,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Build. /// Sucht eine lokalisierte Zeichenfolge, die Build ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Build { internal static string MainPage_Build {
get { get {
@ -460,7 +469,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Machines. /// Sucht eine lokalisierte Zeichenfolge, die Machines ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Machines { internal static string MainPage_Machines {
get { get {
@ -469,7 +478,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to My Profile. /// Sucht eine lokalisierte Zeichenfolge, die My Profile ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Profile { internal static string MainPage_Profile {
get { get {
@ -478,7 +487,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Servers. /// Sucht eine lokalisierte Zeichenfolge, die Servers ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Servers { internal static string MainPage_Servers {
get { get {
@ -487,7 +496,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Users. /// Sucht eine lokalisierte Zeichenfolge, die Users ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Users { internal static string MainPage_Users {
get { get {
@ -496,7 +505,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Version. /// Sucht eine lokalisierte Zeichenfolge, die Version ähnelt.
/// </summary> /// </summary>
internal static string MainPage_Version { internal static string MainPage_Version {
get { get {
@ -505,7 +514,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Ok. /// Sucht eine lokalisierte Zeichenfolge, die Ok ähnelt.
/// </summary> /// </summary>
internal static string OK { internal static string OK {
get { get {
@ -514,7 +523,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to or. /// Sucht eine lokalisierte Zeichenfolge, die or ähnelt.
/// </summary> /// </summary>
internal static string OR { internal static string OR {
get { get {
@ -523,7 +532,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Password. /// Sucht eine lokalisierte Zeichenfolge, die Password ähnelt.
/// </summary> /// </summary>
internal static string PASSWORD { internal static string PASSWORD {
get { get {
@ -532,7 +541,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Please connect to Server. /// Sucht eine lokalisierte Zeichenfolge, die Please connect to Server ähnelt.
/// </summary> /// </summary>
internal static string PLEASECONNECTTOSERVER { internal static string PLEASECONNECTTOSERVER {
get { get {
@ -541,7 +550,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Change Password. /// Sucht eine lokalisierte Zeichenfolge, die Change Password ähnelt.
/// </summary> /// </summary>
internal static string ProfilePage_ChangePassword { internal static string ProfilePage_ChangePassword {
get { get {
@ -550,7 +559,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to New Password. /// Sucht eine lokalisierte Zeichenfolge, die New Password ähnelt.
/// </summary> /// </summary>
internal static string ProfilePage_NewPassword { internal static string ProfilePage_NewPassword {
get { get {
@ -559,7 +568,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Old Password. /// Sucht eine lokalisierte Zeichenfolge, die Old Password ähnelt.
/// </summary> /// </summary>
internal static string ProfilePage_OldPassword { internal static string ProfilePage_OldPassword {
get { get {
@ -568,7 +577,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Update Password. /// Sucht eine lokalisierte Zeichenfolge, die Update Password ähnelt.
/// </summary> /// </summary>
internal static string ProfilePage_UpdatePassword { internal static string ProfilePage_UpdatePassword {
get { get {
@ -577,7 +586,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Scan QR-Code. /// Sucht eine lokalisierte Zeichenfolge, die Scan QR-Code ähnelt.
/// </summary> /// </summary>
internal static string SCANQR { internal static string SCANQR {
get { get {
@ -586,7 +595,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Active Connection. /// Sucht eine lokalisierte Zeichenfolge, die Active Connection ähnelt.
/// </summary> /// </summary>
internal static string ServerListPage_ActiveConnection { internal static string ServerListPage_ActiveConnection {
get { get {
@ -595,7 +604,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connect to new Server. /// Sucht eine lokalisierte Zeichenfolge, die Connect to new Server ähnelt.
/// </summary> /// </summary>
internal static string ServerListPage_ConnectToNewServer { internal static string ServerListPage_ConnectToNewServer {
get { get {
@ -604,7 +613,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Last Connections. /// Sucht eine lokalisierte Zeichenfolge, die Last Connections ähnelt.
/// </summary> /// </summary>
internal static string ServerListPage_LastConnection { internal static string ServerListPage_LastConnection {
get { get {
@ -613,7 +622,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connect. /// Sucht eine lokalisierte Zeichenfolge, die Connect ähnelt.
/// </summary> /// </summary>
internal static string ServerPage_Connect { internal static string ServerPage_Connect {
get { get {
@ -622,7 +631,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Disconnect. /// Sucht eine lokalisierte Zeichenfolge, die Disconnect ähnelt.
/// </summary> /// </summary>
internal static string ServerPage_Disconnect { internal static string ServerPage_Disconnect {
get { get {
@ -631,7 +640,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Is Default Connection. /// Sucht eine lokalisierte Zeichenfolge, die Is Default Connection ähnelt.
/// </summary> /// </summary>
internal static string ServerPage_IsDefault { internal static string ServerPage_IsDefault {
get { get {
@ -640,7 +649,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Set as Default Connection. /// Sucht eine lokalisierte Zeichenfolge, die Set as Default Connection ähnelt.
/// </summary> /// </summary>
internal static string ServerPage_SetDefault { internal static string ServerPage_SetDefault {
get { get {
@ -649,7 +658,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connection failed. /// Sucht eine lokalisierte Zeichenfolge, die Connection failed ähnelt.
/// </summary> /// </summary>
internal static string ServerPageModel_ConnectionFailed { internal static string ServerPageModel_ConnectionFailed {
get { get {
@ -658,7 +667,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Login to your Space. /// Sucht eine lokalisierte Zeichenfolge, die Login to your Space ähnelt.
/// </summary> /// </summary>
internal static string SetUpProcess_ScanPage_Button { internal static string SetUpProcess_ScanPage_Button {
get { get {
@ -667,7 +676,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Begin working. /// Sucht eine lokalisierte Zeichenfolge, die Begin working ähnelt.
/// </summary> /// </summary>
internal static string SetUpProcess_WelcomePage_Button { internal static string SetUpProcess_WelcomePage_Button {
get { get {
@ -676,7 +685,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Automate your Space with FabAccess. /// Sucht eine lokalisierte Zeichenfolge, die Automate your Space with FabAccess ähnelt.
/// </summary> /// </summary>
internal static string SetUpProcess_WelcomePage_Text { internal static string SetUpProcess_WelcomePage_Text {
get { get {
@ -685,7 +694,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Welcome. /// Sucht eine lokalisierte Zeichenfolge, die Welcome ähnelt.
/// </summary> /// </summary>
internal static string SetUpProcess_WelcomePage_Title { internal static string SetUpProcess_WelcomePage_Title {
get { get {
@ -694,7 +703,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connecting to Server. /// Sucht eine lokalisierte Zeichenfolge, die Connecting to Server ähnelt.
/// </summary> /// </summary>
internal static string StartPage_Connecting { internal static string StartPage_Connecting {
get { get {
@ -703,7 +712,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Starting App. /// Sucht eine lokalisierte Zeichenfolge, die Starting App ähnelt.
/// </summary> /// </summary>
internal static string StartPage_Starting { internal static string StartPage_Starting {
get { get {
@ -712,7 +721,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Add User. /// Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
/// </summary> /// </summary>
internal static string TITLE_AddUser { internal static string TITLE_AddUser {
get { get {
@ -721,7 +730,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Connect to Server. /// Sucht eine lokalisierte Zeichenfolge, die Connect to Server ähnelt.
/// </summary> /// </summary>
internal static string TITLE_ConnectToServer { internal static string TITLE_ConnectToServer {
get { get {
@ -730,7 +739,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Machine. /// Sucht eine lokalisierte Zeichenfolge, die Machine ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Machine { internal static string TITLE_Machine {
get { get {
@ -739,7 +748,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Machines. /// Sucht eine lokalisierte Zeichenfolge, die Machines ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Machines { internal static string TITLE_Machines {
get { get {
@ -748,7 +757,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to My Profile. /// Sucht eine lokalisierte Zeichenfolge, die My Profile ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Profile { internal static string TITLE_Profile {
get { get {
@ -757,7 +766,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Server. /// Sucht eine lokalisierte Zeichenfolge, die Server ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Server { internal static string TITLE_Server {
get { get {
@ -766,7 +775,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Servers. /// Sucht eine lokalisierte Zeichenfolge, die Servers ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Servers { internal static string TITLE_Servers {
get { get {
@ -775,7 +784,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Settings. /// Sucht eine lokalisierte Zeichenfolge, die Settings ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Settings { internal static string TITLE_Settings {
get { get {
@ -784,7 +793,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to User. /// Sucht eine lokalisierte Zeichenfolge, die User ähnelt.
/// </summary> /// </summary>
internal static string TITLE_User { internal static string TITLE_User {
get { get {
@ -793,7 +802,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Users. /// Sucht eine lokalisierte Zeichenfolge, die Users ähnelt.
/// </summary> /// </summary>
internal static string TITLE_Users { internal static string TITLE_Users {
get { get {
@ -802,7 +811,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Uncategorised. /// Sucht eine lokalisierte Zeichenfolge, die Uncategorised ähnelt.
/// </summary> /// </summary>
internal static string Uncategorised { internal static string Uncategorised {
get { get {
@ -811,7 +820,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Add User. /// Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
/// </summary> /// </summary>
internal static string UserListPage_AddUser { internal static string UserListPage_AddUser {
get { get {
@ -820,7 +829,16 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Username. /// Sucht eine lokalisierte Zeichenfolge, die Search Username ... ähnelt.
/// </summary>
internal static string UserListPage_SearchUser {
get {
return ResourceManager.GetString("UserListPage_SearchUser", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Username ähnelt.
/// </summary> /// </summary>
internal static string USERNAME { internal static string USERNAME {
get { get {
@ -829,7 +847,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Update Password. /// Sucht eine lokalisierte Zeichenfolge, die Update Password ähnelt.
/// </summary> /// </summary>
internal static string UserPage_ChangePassword { internal static string UserPage_ChangePassword {
get { get {
@ -838,7 +856,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to New Password. /// Sucht eine lokalisierte Zeichenfolge, die New Password ähnelt.
/// </summary> /// </summary>
internal static string UserPage_NewPassword { internal static string UserPage_NewPassword {
get { get {
@ -847,7 +865,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Force Password Update. /// Sucht eine lokalisierte Zeichenfolge, die Force Password Update ähnelt.
/// </summary> /// </summary>
internal static string UserPage_UpdatePassword { internal static string UserPage_UpdatePassword {
get { get {
@ -856,7 +874,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Version. /// Sucht eine lokalisierte Zeichenfolge, die Version ähnelt.
/// </summary> /// </summary>
internal static string VERSION { internal static string VERSION {
get { get {
@ -865,7 +883,7 @@ namespace Borepin.Resources.Text {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to YAY. /// Sucht eine lokalisierte Zeichenfolge, die YAY ähnelt.
/// </summary> /// </summary>
internal static string YAY { internal static string YAY {
get { get {

6
Borepin/Borepin/Resources/Text/TextResource.resx
View File

@ -218,6 +218,9 @@ You can also put down several servers and then connect to the desired server.</v
<data name="InUseByMe" xml:space="preserve"> <data name="InUseByMe" xml:space="preserve">
<value>In Use By Me</value> <value>In Use By Me</value>
</data> </data>
<data name="MACHINE" xml:space="preserve">
<value>Machine</value>
</data>
<data name="MachinePage_CanNotUseByPermission" xml:space="preserve"> <data name="MachinePage_CanNotUseByPermission" xml:space="preserve">
<value>You do not have the authorization to use this machine. <value>You do not have the authorization to use this machine.
Ask in your Space if you can be trained on the machine to be unlocked for the machine.</value> Ask in your Space if you can be trained on the machine to be unlocked for the machine.</value>
@ -372,6 +375,9 @@ Ask in your Space if you can be trained on the machine to be unlocked for the ma
<data name="UserListPage_AddUser" xml:space="preserve"> <data name="UserListPage_AddUser" xml:space="preserve">
<value>Add User</value> <value>Add User</value>
</data> </data>
<data name="UserListPage_SearchUser" xml:space="preserve">
<value>Search Username ...</value>
</data>
<data name="USERNAME" xml:space="preserve"> <data name="USERNAME" xml:space="preserve">
<value>Username</value> <value>Username</value>
</data> </data>

4
Borepin_Test/Borepin_Test.csproj
View File

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="NSubstitute" Version="4.4.0" /> <PackageReference Include="NSubstitute" Version="4.4.0" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
FabAccessAPI/FabAccessAPI.csproj
View File

@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.118" /> <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.118" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
FabAccessAPI_Test/FabAccessAPI_Test.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="NUnit" Version="3.13.3" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" /> <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
</ItemGroup> </ItemGroup>