Issue with double clicking tray icon. Added list management.
This commit is contained in:
@@ -14,6 +14,22 @@
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<userSettings>
|
||||
|
||||
@@ -84,22 +84,28 @@
|
||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Ookii.Dialogs.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0c15020868fd6249, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Ookii.Dialogs.1.0\lib\net35\Ookii.Dialogs.Wpf.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.AppContext, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ComponentModel.Composition" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
|
||||
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
|
||||
@@ -147,8 +153,11 @@
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
|
||||
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
@@ -158,18 +167,24 @@
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
|
||||
<Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
|
||||
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
@@ -185,7 +200,7 @@
|
||||
</Reference>
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
@@ -199,14 +214,14 @@
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
|
||||
<HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
@@ -220,7 +235,7 @@
|
||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
@@ -250,6 +265,7 @@
|
||||
<Compile Include="Utils\GraphQL.cs" />
|
||||
<Compile Include="Utils\LoginHelpers.cs" />
|
||||
<Compile Include="Utils\RelayCommand.cs" />
|
||||
<Compile Include="Utils\TrayIcon.cs" />
|
||||
<Compile Include="Utils\UiConverters.cs" />
|
||||
<Compile Include="ViewModels\LoginViewModel.commands.cs" />
|
||||
<Compile Include="ViewModels\LoginViewModel.cs" />
|
||||
@@ -340,5 +356,7 @@
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
||||
</Project>
|
||||
@@ -105,6 +105,15 @@ namespace BodyshopUploader.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Add Path.
|
||||
/// </summary>
|
||||
public static string Label_AddMonitoringPath {
|
||||
get {
|
||||
return ResourceManager.GetString("Label_AddMonitoringPath", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Login.
|
||||
/// </summary>
|
||||
|
||||
@@ -132,6 +132,9 @@
|
||||
<data name="Exit" xml:space="preserve">
|
||||
<value>Exit</value>
|
||||
</data>
|
||||
<data name="Label_AddMonitoringPath" xml:space="preserve">
|
||||
<value>Add Path</value>
|
||||
</data>
|
||||
<data name="Login" xml:space="preserve">
|
||||
<value>Login</value>
|
||||
</data>
|
||||
|
||||
12
BodyshopUploader/Properties/Settings.Designer.cs
generated
12
BodyshopUploader/Properties/Settings.Designer.cs
generated
@@ -45,5 +45,17 @@ namespace BodyshopUploader.Properties {
|
||||
this["Password"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("C:\\ImEX\r\nC:\\000")]
|
||||
public global::System.Collections.ObjectModel.ObservableCollection<System.String> MonitoringPaths {
|
||||
get {
|
||||
return ((global::System.Collections.ObjectModel.ObservableCollection<System.String>)(this["MonitoringPaths"]));
|
||||
}
|
||||
set {
|
||||
this["MonitoringPaths"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,5 +8,9 @@
|
||||
<Setting Name="Password" Type="System.Security.SecureString" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="MonitoringPaths" Type="System.Collections.ObjectModel.ObservableCollection<System.String>" Scope="User">
|
||||
<Value Profile="(Default)">C:\ImEX
|
||||
C:\000</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
24
BodyshopUploader/Utils/TrayIcon.cs
Normal file
24
BodyshopUploader/Utils/TrayIcon.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Input;
|
||||
|
||||
namespace BodyshopUploader.Utils
|
||||
{
|
||||
public class OpenMainWindowCommand : ICommand
|
||||
{
|
||||
public void Execute(object parameter)
|
||||
{
|
||||
new Views.Main().Show();
|
||||
}
|
||||
|
||||
public bool CanExecute(object parameter)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public event EventHandler CanExecuteChanged;
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ namespace BodyshopUploader.ViewModels
|
||||
if (_loginCommand == null)
|
||||
{
|
||||
_loginCommand = new RelayCommand(
|
||||
p => !string.IsNullOrEmpty(UserName) && UserPassword?.Length > 6,
|
||||
p => !string.IsNullOrEmpty(UserName) && UserPassword?.Length > 5,
|
||||
async p => { await LoginAsync(p as Window); });
|
||||
}
|
||||
return _loginCommand;
|
||||
|
||||
@@ -22,5 +22,53 @@ namespace BodyshopUploader.ViewModels
|
||||
return _testCommand;
|
||||
}
|
||||
}
|
||||
|
||||
private ICommand _openMainWindowCommand;
|
||||
public ICommand OpenMainWindowCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_openMainWindowCommand == null)
|
||||
{
|
||||
_openMainWindowCommand = new RelayCommand(
|
||||
p => true,
|
||||
p => Console.WriteLine("nada")
|
||||
); ;
|
||||
}
|
||||
return _openMainWindowCommand;
|
||||
}
|
||||
}
|
||||
|
||||
private ICommand _addMonitoringPathCommand;
|
||||
public ICommand AddMonitoringPathCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_addMonitoringPathCommand == null)
|
||||
{
|
||||
_addMonitoringPathCommand = new RelayCommand(
|
||||
p => true,
|
||||
p => AddFolderMonitoringPath()
|
||||
);
|
||||
}
|
||||
return _addMonitoringPathCommand;
|
||||
}
|
||||
}
|
||||
|
||||
private ICommand _removeMonitoringPathCommand;
|
||||
public ICommand RemoveMonitoringPathCommand
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_removeMonitoringPathCommand == null)
|
||||
{
|
||||
_removeMonitoringPathCommand = new RelayCommand(
|
||||
p => true,
|
||||
p => RemoveFolderMonitoringPath(p as string)
|
||||
);
|
||||
}
|
||||
return _removeMonitoringPathCommand;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
using GraphQL.Common.Request;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
namespace BodyshopUploader.ViewModels
|
||||
{
|
||||
@@ -15,41 +17,62 @@ namespace BodyshopUploader.ViewModels
|
||||
public MainViewModel()
|
||||
{
|
||||
logger.Trace("Main VM Created.");
|
||||
|
||||
//Create Variables
|
||||
if (MonitoringPaths == null) MonitoringPaths = new ObservableCollection<string>();
|
||||
MonitoringPaths.CollectionChanged += MonitoringPathsChanged;
|
||||
}
|
||||
|
||||
private void MonitoringPathsChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
|
||||
{
|
||||
logger.Warn("TODO: Change monitoring lifecycles for folder watchers.");
|
||||
}
|
||||
|
||||
public void AddFolderMonitoringPath()
|
||||
{
|
||||
var dialog = new Ookii.Dialogs.Wpf.VistaFolderBrowserDialog();
|
||||
if (dialog.ShowDialog().GetValueOrDefault())
|
||||
{
|
||||
logger.Debug("Adding folder {0} to monitoring paths.", dialog.SelectedPath);
|
||||
MonitoringPaths.Add(dialog.SelectedPath);
|
||||
Properties.Settings.Default.MonitoringPaths = MonitoringPaths;
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
}
|
||||
|
||||
public void RemoveFolderMonitoringPath(string Path)
|
||||
{
|
||||
logger.Debug("Removing folder {0} to monitoring paths.", Path);
|
||||
MonitoringPaths.Remove(Path);
|
||||
Properties.Settings.Default.MonitoringPaths = MonitoringPaths;
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
|
||||
public async Task TestGql()
|
||||
{
|
||||
var r = new GraphQLRequest
|
||||
{
|
||||
Query = @"
|
||||
query {
|
||||
jobs {
|
||||
id
|
||||
est_number
|
||||
ro_number
|
||||
job_status {
|
||||
id
|
||||
name
|
||||
}
|
||||
scheduled_completion
|
||||
scheduled_delivery
|
||||
vehicle {
|
||||
id
|
||||
v_model_yr
|
||||
v_make_desc
|
||||
v_model_desc
|
||||
plate_no
|
||||
}
|
||||
}
|
||||
}
|
||||
"
|
||||
};
|
||||
if (MonitoringPaths == null) MonitoringPaths = new ObservableCollection<string>();
|
||||
MonitoringPaths.Add(@"C:\IMEX");
|
||||
Properties.Settings.Default.MonitoringPaths = MonitoringPaths;
|
||||
Properties.Settings.Default.Save();
|
||||
|
||||
using (var g = Utils.GraphQL.CreateGQLClient())
|
||||
{
|
||||
var graphQLResponse = await g.PostAsync(r);
|
||||
logger.Info(graphQLResponse.Data.jobs);
|
||||
}
|
||||
//var r = new GraphQLRequest
|
||||
//{
|
||||
// Query = @"
|
||||
// query {
|
||||
// jobs {
|
||||
// id
|
||||
// est_number
|
||||
// ro_number
|
||||
// }
|
||||
// }
|
||||
// "
|
||||
//};
|
||||
|
||||
//using (var g = Utils.GraphQL.CreateGQLClient())
|
||||
//{
|
||||
// var graphQLResponse = await g.PostAsync(r);
|
||||
// logger.Info(graphQLResponse.Data.jobs);
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,12 @@ namespace BodyshopUploader.ViewModels
|
||||
get { return _progress; }
|
||||
set { SetProperty(ref _progress, value); }
|
||||
}
|
||||
|
||||
private ObservableCollection<string> _monitoringPaths = Properties.Settings.Default.MonitoringPaths ;
|
||||
public ObservableCollection<string> MonitoringPaths
|
||||
{
|
||||
get { return _monitoringPaths; }
|
||||
set { SetProperty(ref _monitoringPaths, value); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
|
||||
mc:Ignorable="d"
|
||||
Title="{x:Static p:Resources.Title_Login}"
|
||||
Height="450"
|
||||
Width="800"
|
||||
Height="169.084"
|
||||
Width="389.618"
|
||||
xmlns:p="clr-namespace:BodyshopUploader.Properties"
|
||||
xmlns:util="clr-namespace:BodyshopUploader.Utils"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
@@ -35,6 +35,7 @@
|
||||
VerticalAlignment="Center" />
|
||||
<TextBox materialDesign:HintAssist.Hint="{x:Static p:Resources.Username}"
|
||||
Width="300"
|
||||
materialDesign:TextFieldAssist.HasClearButton="True"
|
||||
Style="{StaticResource MaterialDesignFloatingHintTextBox}"
|
||||
Text="{Binding UserName}" />
|
||||
</StackPanel>
|
||||
@@ -45,10 +46,11 @@
|
||||
KeyDown="PasswordBox_KeyDown"
|
||||
PasswordChanged="PasswordBox_PasswordChanged"
|
||||
Width="300"
|
||||
materialDesign:TextFieldAssist.HasClearButton="True"
|
||||
Style="{StaticResource MaterialDesignFloatingHintPasswordBox}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
<TextBlock Text="{Binding ErrorMsg}"
|
||||
Visibility="{Binding ErrorMsg, Converter={StaticResource NullVisibilityConverter}}" />
|
||||
|
||||
|
||||
@@ -10,12 +10,26 @@
|
||||
xmlns:vm="clr-namespace:BodyshopUploader.ViewModels"
|
||||
Width="800"
|
||||
xmlns:tb="http://www.hardcodet.net/taskbar"
|
||||
xmlns:p="clr-namespace:BodyshopUploader.Properties">
|
||||
xmlns:p="clr-namespace:BodyshopUploader.Properties"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
|
||||
TextElement.FontWeight="Regular"
|
||||
TextElement.FontSize="13"
|
||||
TextOptions.TextFormattingMode="Ideal"
|
||||
TextOptions.TextRenderingMode="Auto"
|
||||
Background="{DynamicResource MaterialDesignPaper}"
|
||||
FontFamily="{DynamicResource MaterialDesignFont}"
|
||||
Loaded="Window_Loaded"
|
||||
xmlns:util="clr-namespace:BodyshopUploader.Utils">
|
||||
<Window.DataContext>
|
||||
<vm:MainViewModel />
|
||||
</Window.DataContext>
|
||||
<Window.Resources>
|
||||
<util:OpenMainWindowCommand x:Key="OpenMainWindowCommand"/>
|
||||
</Window.Resources>
|
||||
<StackPanel>
|
||||
<tb:TaskbarIcon IconSource="../favicon.ico"
|
||||
DoubleClickCommand="{StaticResource OpenMainWindowCommand}"
|
||||
PopupActivation="LeftClick"
|
||||
MenuActivation="RightClick"
|
||||
ToolTipText="Bodyshop Uploader">
|
||||
@@ -37,10 +51,45 @@
|
||||
</ContextMenu>
|
||||
</tb:TaskbarIcon.ContextMenu>
|
||||
</tb:TaskbarIcon>
|
||||
<TextBlock>
|
||||
Main Window
|
||||
</TextBlock>
|
||||
<TextBlock Text="{Binding Progress}" />
|
||||
<Button Command="{Binding TestCommand}" />
|
||||
<Button Command="{Binding TestCommand}"
|
||||
Content="Test Command" />
|
||||
|
||||
<Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}"
|
||||
Command="{Binding AddMonitoringPathCommand}"
|
||||
ToolTip="{x:Static p:Resources.Label_AddMonitoringPath}">
|
||||
<materialDesign:PackIcon Kind="Add"
|
||||
Height="24"
|
||||
Width="24" />
|
||||
</Button>
|
||||
|
||||
<ItemsControl ItemsSource="{Binding MonitoringPaths}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0"
|
||||
Text="{Binding .}" />
|
||||
|
||||
|
||||
<materialDesign:PackIcon Kind="RemoveCircle"
|
||||
Grid.Column="1"
|
||||
Height="16"
|
||||
Width="16" >
|
||||
<materialDesign:PackIcon.InputBindings>
|
||||
<MouseBinding Gesture="LeftClick"
|
||||
Command="{Binding DataContext.RemoveMonitoringPathCommand,
|
||||
RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
|
||||
CommandParameter="{Binding .}" />
|
||||
</materialDesign:PackIcon.InputBindings>
|
||||
</materialDesign:PackIcon>
|
||||
|
||||
</Grid>
|
||||
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</StackPanel>
|
||||
</Window>
|
||||
|
||||
@@ -25,6 +25,9 @@ namespace BodyshopUploader.Views
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Application.Current.MainWindow = this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,20 +6,22 @@
|
||||
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net472" />
|
||||
<package id="MaterialDesignColors" version="1.2.2" targetFramework="net472" />
|
||||
<package id="MaterialDesignThemes" version="3.0.1" targetFramework="net472" />
|
||||
<package id="Microsoft.CSharp" version="4.4.1" targetFramework="net472" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
|
||||
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
|
||||
<package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net472" />
|
||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="NETStandard.Library" version="1.6.1" targetFramework="net472" />
|
||||
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
|
||||
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
|
||||
<package id="NLog" version="4.6.8" targetFramework="net472" />
|
||||
<package id="NLog.Config" version="4.6.8" targetFramework="net472" />
|
||||
<package id="NLog.Schema" version="4.6.8" targetFramework="net472" />
|
||||
<package id="Ookii.Dialogs" version="1.0" targetFramework="net472" />
|
||||
<package id="System.AppContext" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Buffers" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Console" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Console" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
|
||||
@@ -31,30 +33,33 @@
|
||||
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Linq" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Net.Http" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
|
||||
<package id="System.Net.Http" version="4.3.4" targetFramework="net472" />
|
||||
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
|
||||
<package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net472" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net472" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net472" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user