keb/unison
1
0
Fork 0
Code Releases 7 Activity

Pass of code standardisation

Browse Source
This commit is contained in:
Théo Marchal
2021-09-01 02:35:37 +02:00
parent 984d2056de
commit 48b5bc5d28
9 changed files with 249 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Views/SystrayViewModel.cs
View File

@ -8,6 +8,8 @@ namespace unison
{
public class SystrayViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
public static string GetAppText => "unison v" + Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
public static ICommand ShowWindowCommand => new DelegateCommand
@ -26,10 +28,7 @@ namespace unison
public static ICommand ExitApplicationCommand => new DelegateCommand
{
CommandAction = () =>
{
Application.Current.Shutdown();
},
CommandAction = () => Application.Current.Shutdown(),
CanExecuteFunc = () => true
};
@ -38,7 +37,7 @@ namespace unison
get
{
SnapcastHandler snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
return snapcast.Started ? "Stop Snapcast" : "Start Snapcast";
return snapcast.HasStarted ? "Stop Snapcast" : "Start Snapcast";
}
}
@ -51,7 +50,9 @@ namespace unison
CommandAction = () =>
{
Application.Current.Dispatcher.BeginInvoke(new Action(() => OnPropertyChanged("SnapcastText")));
((MainWindow)Application.Current.MainWindow).Snapcast_Clicked(null, null);
SnapcastHandler snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
snapcast.LaunchOrExit();
},
CanExecuteFunc = () => true
};
@ -64,17 +65,12 @@ namespace unison
{
return new DelegateCommand
{
CommandAction = () =>
{
((MainWindow)Application.Current.MainWindow).Settings_Clicked(null, null);
},
CommandAction = () => ((MainWindow)Application.Current.MainWindow).Settings_Clicked(null, null),
CanExecuteFunc = () => true
};
}
}
public event PropertyChangedEventHandler PropertyChanged;
public virtual void OnPropertyChanged(string propertyName)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));