Issue with double clicking tray icon. Added list management.

This commit is contained in:
Patrick Fic
2020-01-17 00:41:41 -08:00
parent 32aec8e4ff
commit 2b3d9ac76b
15 changed files with 292 additions and 69 deletions

View File

@@ -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}}" />

View File

@@ -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>

View File

@@ -25,6 +25,9 @@ namespace BodyshopUploader.Views
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
Application.Current.MainWindow = this;
}
}
}