keb/unison
1
0
Fork 0
Code Releases 6 Activity

Compare commits

base: keb:c95094a003316704de590e9de6e6004ec8ed2153
Branches Tags
keb:main
keb:interface-rework
keb:shuffle
keb:1.4
keb:v1.3.1
keb:v1.3
keb:v1.2
keb:v1.1
keb:v1.0
...
compare: keb:fc7ad1ec22a4213f843cdf11d1adc096a712c33a
Branches Tags
keb:main
keb:interface-rework
keb:shuffle
keb:1.4
keb:v1.3.1
keb:v1.3
keb:v1.2
keb:v1.1
keb:v1.0

2 Commits
c95094a003 ... fc7ad1ec22

Author SHA1 Message Date
Théo Marchal
fc7ad1ec22 Remove useless image 2021-08-14 12:03:27 +02:00
Théo Marchal
4f97443d09 Fix Systray binding errors 2021-08-14 12:03:09 +02:00
3 changed files with 40 additions and 46 deletions
Show Stats Expand all files Collapse all files

1
Views/MainWindow.xaml
View File

@ -121,6 +121,5 @@
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Image Margin="0,0,503,127" Stretch="Fill" Source="pack://siteoforigin:,,,/Image1.png"/>
</Grid> </Grid>
</Window> </Window>

9
Views/Systray.xaml
View File

@ -1,12 +1,10 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:tb="http://www.hardcodet.net/taskbar" xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
xmlns:local="clr-namespace:unison"> xmlns:local="clr-namespace:unison">
<tb:TaskbarIcon x:Name="SystrayTaskbar" xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf" <ContextMenu x:Shared="false" x:Key="SystrayMenu">
IconSource="/images/unison.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" x:Key="SystrayTaskbar">
<tb:TaskbarIcon.ContextMenu>
<ContextMenu>
<MenuItem IsEnabled="False"> <MenuItem IsEnabled="False">
<MenuItem.Icon> <MenuItem.Icon>
<Image Source="/images/unison.ico" Width="16" Height="16"/> <Image Source="/images/unison.ico" Width="16" Height="16"/>
@ -43,7 +41,8 @@
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</ContextMenu> </ContextMenu>
</tb:TaskbarIcon.ContextMenu>
<tb:TaskbarIcon x:Key="SystrayTaskbar" IconSource="/images/unison.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" ContextMenu="{StaticResource SystrayMenu}">
<tb:TaskbarIcon.DataContext> <tb:TaskbarIcon.DataContext>
<local:SystrayViewModel /> <local:SystrayViewModel />
</tb:TaskbarIcon.DataContext> </tb:TaskbarIcon.DataContext>

4
Views/SystrayViewModel.cs
View File

@ -8,10 +8,6 @@ namespace unison
{ {
public class SystrayViewModel : INotifyPropertyChanged public class SystrayViewModel : INotifyPropertyChanged
{ {
public SystrayViewModel()
{
}
public string GetAppText => "unison v" + Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion; public string GetAppText => "unison v" + Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
public ICommand ShowWindowCommand => new DelegateCommand public ICommand ShowWindowCommand => new DelegateCommand