Readme updated

App.xaml

@@ -8,6 +8,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Views/Systray.xaml" />
+                <ResourceDictionary Source="Resources/Resources.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">

App.xaml.cs

@@ -1,39 +1,43 @@
-using System.Windows;
+using System.Globalization;
+using System.Windows;
 using Hardcodet.Wpf.TaskbarNotification;
 
 namespace unison
 {
     public partial class App : Application
     {
-        private TaskbarIcon Systray;
+        private TaskbarIcon _systray;
-        private HotkeyHandler Hotkeys;
+        private HotkeyHandler _hotkeys;
-        private SnapcastHandler Snapcast;
+        private SnapcastHandler _snapcast;
-        private MPDHandler MPD;
+        private MPDHandler _mpd;
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            //debug language
+            //unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("fr-FR");
+
             base.OnStartup(e);
 
-            MPD = new MPDHandler();
+            _mpd = new MPDHandler();
-            Current.Properties["mpd"] = MPD;
+            Current.Properties["mpd"] = _mpd;
 
-            Hotkeys = new HotkeyHandler();
+            _hotkeys = new HotkeyHandler();
-            Current.Properties["hotkeys"] = Hotkeys;
+            Current.Properties["hotkeys"] = _hotkeys;
 
-            Snapcast = new SnapcastHandler();
+            _snapcast = new SnapcastHandler();
-            Current.Properties["snapcast"] = Snapcast;
+            Current.Properties["snapcast"] = _snapcast;
 
             Current.MainWindow = new MainWindow();
 
-            Systray = (TaskbarIcon)FindResource("SystrayTaskbar");
+            _systray = (TaskbarIcon)FindResource("SystrayTaskbar");
-            Current.Properties["systray"] = Systray;
+            Current.Properties["systray"] = _systray;
         }
 
         protected override void OnExit(ExitEventArgs e)
         {
-            Systray.Dispose();
+            _systray.Dispose();
-            Snapcast.Stop();
+            _snapcast.LaunchOrExit(true);
-            Hotkeys.RemoveHotKeys();
+            _hotkeys.RemoveHotKeys();
             base.OnExit(e);
         }
     }

Handlers/HotkeyHandler.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
@@ -31,14 +30,15 @@ namespace unison
         private const uint VK_VOLUME_DOWN = 0xAE;
         private const uint VK_ENTER = 0x0D;
 
+        private MainWindow _appWindow;
+        private readonly MPDHandler _mpd;
+
         private IntPtr _windowHandle;
         private HwndSource _source;
 
-        private readonly MPDHandler mpd;
-
         public HotkeyHandler()
         {
-            mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            _mpd = (MPDHandler)Application.Current.Properties["mpd"];
         }
 
         public void Activate(Window win)
@@ -65,49 +65,45 @@ namespace unison
             if (msg == WM_HOTKEY && wParam.ToInt32() == HOTKEY_ID)
             {
                 uint vkey = ((uint)lParam >> 16) & 0xFFFF;
-                MainWindow AppWindow = (MainWindow)Application.Current.MainWindow;
                 switch (vkey)
                 {
                     case VK_MEDIA_NEXT_TRACK:
-                        mpd.Next();
+                        _mpd.Next();
                         break;
                     case VK_MEDIA_PREV_TRACK:
-                        mpd.Prev();
+                        _mpd.Prev();
                         break;
                     case VK_VOLUME_DOWN:
-                        mpd._currentVolume -= Properties.Settings.Default.volume_offset;
+                        _mpd.VolumeDown();
-                        if (mpd._currentVolume < 0)
-                            mpd._currentVolume = 0;
-                        mpd.SetVolume(mpd._currentVolume);
                         break;
                     case VK_VOLUME_UP:
-                        mpd._currentVolume += Properties.Settings.Default.volume_offset;
+                        _mpd.VolumeUp();
-                        if (mpd._currentVolume > 100)
-                            mpd._currentVolume = 100;
-                        mpd.SetVolume(mpd._currentVolume);
                         break;
                     case VK_MEDIA_PLAY_PAUSE:
-                        mpd.PlayPause();
+                        _mpd.PlayPause();
                         break;
                     case VK_ENTER:
-                        if (AppWindow.WindowState == WindowState.Minimized)
+                        if (_appWindow == null)
+                            _appWindow = (MainWindow)Application.Current.MainWindow;
+
+                        if (_appWindow.WindowState == WindowState.Minimized)
                         {
-                            AppWindow.Show();
+                            _appWindow.Show();
-                            AppWindow.Activate();
+                            _appWindow.Activate();
-                            AppWindow.WindowState = WindowState.Normal;
+                            _appWindow.WindowState = WindowState.Normal;
                         }
                         else
                         {
-                            if (AppWindow.IsActive)
+                            if (_appWindow.IsActive)
                             {
-                                AppWindow.Hide();
+                                _appWindow.Hide();
-                                AppWindow.WindowState = WindowState.Minimized;
+                                _appWindow.WindowState = WindowState.Minimized;
                             }
                             else  // not minimized but not in front
                             {
-                                AppWindow.Show();
+                                _appWindow.Show();
-                                AppWindow.Activate();
+                                _appWindow.Activate();
-                                AppWindow.WindowState = WindowState.Normal;
+                                _appWindow.WindowState = WindowState.Normal;
                             }
                         }
                         break;

Handlers/MPDHandler.cs

@@ -12,7 +12,6 @@ using System.Windows.Threading;
 using MpcNET;
 using MpcNET.Commands.Database;
 using MpcNET.Commands.Playback;
-using MpcNET.Commands.Reflection;
 using MpcNET.Commands.Status;
 using MpcNET.Message;
 using MpcNET.Types;
@@ -21,53 +20,44 @@ namespace unison
 {
     public class MPDHandler
     {
-        public bool _connected;
+        private bool _connected;
         public string _version;
-        public int _currentVolume;
+        private int _currentVolume;
-        public bool _currentRandom;
+        private bool _currentRandom;
-        public bool _currentRepeat;
+        private bool _currentRepeat;
-        public bool _currentSingle;
+        private bool _currentSingle;
-        public bool _currentConsume;
+        private bool _currentConsume;
-        public double _currentTime;
+        private double _currentTime;
-        public double _totalTime;
+        private double _totalTime;
-        BitmapFrame _cover;
-
-        public event EventHandler ConnectionChanged;
-        public event EventHandler StatusChanged;
-        public event EventHandler SongChanged;
-        public event EventHandler CoverChanged;
-
-        public static MpdStatus BOGUS_STATUS = new MpdStatus(0, false, false, false, false, -1, -1, -1, MpdState.Unknown, -1, -1, -1, -1, TimeSpan.Zero, TimeSpan.Zero, -1, -1, -1, -1, -1, "", "");
-        public MpdStatus CurrentStatus { get; private set; } = BOGUS_STATUS;
-
-        IMpdFile CurrentSong { get; set; }
 
+        private MpdStatus _currentStatus;
+        private IMpdFile _currentSong;
+        private BitmapFrame _cover;
         private readonly System.Timers.Timer _elapsedTimer;
-        private async void ElapsedTimer(object sender, System.Timers.ElapsedEventArgs e)
+        private DispatcherTimer _retryTimer;
-        {
+
-            if ((_currentTime < _totalTime) && (CurrentStatus.State == MpdState.Play))
+        bool _isUpdatingStatus = false;
-            {
+        bool _isUpdatingSong = false;
-                _currentTime += 0.5;
+
-                await Task.Delay(5);
+        private event EventHandler ConnectionChanged;
-            }
+        private event EventHandler StatusChanged;
-            else
+        private event EventHandler SongChanged;
-            {
+        private event EventHandler CoverChanged;
-                _elapsedTimer.Stop();
-            }
-        }
 
         private MpcConnection _connection;
         private MpcConnection _commandConnection;
-
         private IPEndPoint _mpdEndpoint;
-
         private CancellationTokenSource cancelToken;
 
         public MPDHandler()
         {
             cancelToken = new CancellationTokenSource();
 
-            Initialize();
+            Initialize(null, null);
+
+            _retryTimer = new DispatcherTimer();
+            _retryTimer.Interval = TimeSpan.FromSeconds(5);
+            _retryTimer.Tick += Initialize;
 
             _elapsedTimer = new System.Timers.Timer(500);
             _elapsedTimer.Elapsed += new System.Timers.ElapsedEventHandler(ElapsedTimer);
@@ -78,8 +68,21 @@ namespace unison
             CoverChanged += OnCoverChanged;
         }
 
-        static void OnConnectionChanged(object sender, EventArgs e)
+        private void ElapsedTimer(object sender, System.Timers.ElapsedEventArgs e)
         {
+            if ((_currentTime < _totalTime || _totalTime == -1) && (_currentStatus.State == MpdState.Play))
+                _currentTime += 0.5;
+            else
+                _elapsedTimer.Stop();
+        }
+
+        void OnConnectionChanged(object sender, EventArgs e)
+        {
+            if (!_connected)
+                _retryTimer.Start();
+            else
+                _retryTimer.Stop();
+
             Application.Current.Dispatcher.Invoke(() =>
             {
                 MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
@@ -87,8 +90,7 @@ namespace unison
 
                 SnapcastHandler Snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
                 Snapcast.OnConnectionChanged(sender, e);
-
+            });
-            }, DispatcherPriority.ContextIdle);
         }
 
         static void OnStatusChanged(object sender, EventArgs e)
@@ -97,7 +99,7 @@ namespace unison
             {
                 MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
                 MainWin.OnStatusChanged(sender, e);
-            }, DispatcherPriority.ContextIdle);
+            });
         }
 
         static void OnSongChanged(object sender, EventArgs e)
@@ -106,7 +108,7 @@ namespace unison
             {
                 MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
                 MainWin.OnSongChanged(sender, e);
-            }, DispatcherPriority.ContextIdle);
+            });
         }
 
         static void OnCoverChanged(object sender, EventArgs e)
@@ -115,194 +117,30 @@ namespace unison
             {
                 MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
                 MainWin.OnCoverChanged(sender, e);
-            }, DispatcherPriority.ContextIdle);
+            });
         }
 
-        private void Initialize()
+        public void SendCommand<T>(IMpcCommand<T> command)
-        {
-            Connect();
-        }
-
-        public async void Connect()
-        {
-            var token = cancelToken.Token;
-            try
-            {
-                _connection = await ConnectInternal(token);
-                _commandConnection = await ConnectInternal(token);
-            }
-            catch(MpcNET.Exceptions.MpcConnectException exception)
-            {
-                Trace.WriteLine("exception: " + exception);
-            }
-            if (_connection.IsConnected)
-            {
-                _connected = true;
-                _version = _connection.Version;
-                ConnectionChanged?.Invoke(this, EventArgs.Empty);
-            }
-
-            await UpdateStatusAsync();
-            await UpdateSongAsync();
-
-            Loop(token);
-        }
-
-        private async Task<MpcConnection> ConnectInternal(CancellationToken token)
-        {
-            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out IPAddress ipAddress);
-
-            _mpdEndpoint = new IPEndPoint(ipAddress, Properties.Settings.Default.mpd_port);
-            MpcConnection connection = new MpcConnection(_mpdEndpoint);
-            await connection.ConnectAsync(token);
-
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
-            {
-                IMpdMessage<string> result = await connection.SendAsync(new PasswordCommand(Properties.Settings.Default.mpd_password));
-                if (!result.IsResponseValid)
-                {
-                    string mpdError = result.Response?.Result?.MpdError;
-                }
-            }
-
-            return connection;
-        }
-
-        private void Loop(CancellationToken token)
         {
             Task.Run(async () =>
             {
-                while (true)
+                await SafelySendCommandAsync(command);
-                {
+            });
-                    try
-                    {
-                        if (token.IsCancellationRequested || _connection == null)
-                            break;
-
-                        Trace.WriteLine("loop");
-                        var idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options"));
-
-                        if (idleChanges.IsResponseValid)
-                            await HandleIdleResponseAsync(idleChanges.Response.Content);
-                        else
-                            throw new Exception(idleChanges.Response?.Content);
-                    }
-                    catch (Exception e)
-                    {
-                        System.Diagnostics.Debug.WriteLine($"Error in Idle connection thread: {e.Message}");
-                    }
-                }
-
-            }).ConfigureAwait(false);
-        }
-
-        private async Task HandleIdleResponseAsync(string subsystems)
-        {
-            try
-            {
-                if (subsystems.Contains("player") || subsystems.Contains("mixer") || subsystems.Contains("output") || subsystems.Contains("options"))
-                {
-                    await UpdateStatusAsync();
-
-                    if (subsystems.Contains("player"))
-                    {
-                        await UpdateSongAsync();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
-            }
-        }
-
-        private async Task UpdateStatusCommand()
-        {
-            if (_commandConnection == null) return;
-
-            try
-            {
-                MpdStatus response =  await SafelySendCommandAsync(new StatusCommand());
-
-                if (response != null)
-                {
-                    CurrentStatus = response;
-                    UpdateStatus();
-                }
-                else
-                    throw new Exception();
-            }
-            catch (Exception e)
-            {
-                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
-                Connect();
-            }
-        }
-
-        bool _isUpdatingStatus = false;
-        private async Task UpdateStatusAsync()
-        {
-            if (_connection == null) return;
-
-            if (_isUpdatingStatus) return;
-            _isUpdatingStatus = true;
-
-            try
-            {
-                IMpdMessage<MpdStatus> response = await _connection.SendAsync(new StatusCommand());
-                if (response != null && response.IsResponseValid)
-                {
-                    CurrentStatus = response.Response.Content;
-                    UpdateStatus();
-                }
-                else
-                    throw new Exception();
-            }
-            catch (Exception e)
-            {
-                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
-                Connect();
-            }
-            _isUpdatingStatus = false;
-        }
-
-        bool _isUpdatingSong = false;
-        private async Task UpdateSongAsync()
-        {
-            if (_connection == null) return;
-
-            if (_isUpdatingSong) return;
-            _isUpdatingSong = true;
-
-            try
-            {
-                IMpdMessage<IMpdFile> response = await _connection.SendAsync(new CurrentSongCommand());
-                if (response != null && response.IsResponseValid)
-                {
-                    CurrentSong = response.Response.Content;
-                    UpdateSong();
-                }
-                else
-                {
-                    throw new Exception();
-                }
-            }
-            catch (Exception e)
-            {
-                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
-                Connect();
-            }
-            _isUpdatingSong = false;
         }
 
         public async Task<T> SafelySendCommandAsync<T>(IMpcCommand<T> command)
         {
+            if (_commandConnection == null)
+            {
+                Trace.WriteLine("[SafelySendCommandAsync] no command connection");
+                return default(T);
+            }
+
             try
             {
-                var response = await _commandConnection.SendAsync(command);
+                IMpdMessage<T> response = await _commandConnection.SendAsync(command);
                 if (!response.IsResponseValid)
                 {
-                    // If we have an MpdError string, only show that as the error to avoid extra noise
                     var mpdError = response.Response?.Result?.MpdError;
                     if (mpdError != null && mpdError != "")
                         throw new Exception(mpdError);
@@ -320,12 +158,180 @@ namespace unison
             return default(T);
         }
 
-        private async void GetAlbumBitmap(string path, CancellationToken token = default)
+        private void Initialize(object sender, EventArgs e)
+        {
+            if (!_connected)
+                Connect();
+        }
+
+        public async void Connect()
+        {
+            CancellationToken token = cancelToken.Token;
+            try
+            {
+                _connection = await ConnectInternal(token);
+                _commandConnection = await ConnectInternal(token);
+            }
+            catch(MpcNET.Exceptions.MpcConnectException exception)
+            {
+                Trace.WriteLine("exception: " + exception);
+            }
+            if (_connection != null && _commandConnection != null)
+            {
+                if (_connection.IsConnected && _commandConnection.IsConnected)
+                {
+                    _connected = true;
+                    _version = _connection.Version;
+                    ConnectionChanged?.Invoke(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                ConnectionChanged?.Invoke(this, EventArgs.Empty);
+                return;
+            }
+
+            await UpdateStatusAsync();
+            await UpdateSongAsync();
+
+            Loop(token);
+        }
+
+        private async Task<MpcConnection> ConnectInternal(CancellationToken token)
+        {
+            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out IPAddress ipAddress);
+
+            _mpdEndpoint = new IPEndPoint(ipAddress, Properties.Settings.Default.mpd_port);
+            MpcConnection connection = new MpcConnection(_mpdEndpoint);
+            await connection.ConnectAsync(token);
+
+            /*if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
+            {
+                IMpdMessage<string> result = await connection.SendAsync(new PasswordCommand(Properties.Settings.Default.mpd_password));
+                if (!result.IsResponseValid)
+                {
+                    string mpdError = result.Response?.Result?.MpdError;
+                    Trace.WriteLine(mpdError);
+                }
+            }*/
+
+            return connection;
+        }
+
+        private void Disconnected()
+        {
+            _connected = false;
+
+            _connection = null;
+            _commandConnection = null;
+
+            ConnectionChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void Loop(CancellationToken token)
+        {
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    try
+                    {
+                        if (token.IsCancellationRequested || _connection == null)
+                            break;
+
+                        var idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options"));
+
+                        if (idleChanges.IsResponseValid)
+                            await HandleIdleResponseAsync(idleChanges.Response.Content);
+                        else
+                            throw new Exception(idleChanges.Response?.Content);
+                    }
+                    catch (Exception e)
+                    {
+                        Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                        Disconnected();
+                    }
+                }
+
+            }).ConfigureAwait(false);
+        }
+
+        private async Task HandleIdleResponseAsync(string subsystems)
+        {
+            try
+            {
+                if (subsystems.Contains("player") || subsystems.Contains("mixer") || subsystems.Contains("output") || subsystems.Contains("options"))
+                {
+                    await UpdateStatusAsync();
+
+                    if (subsystems.Contains("player"))
+                        await UpdateSongAsync();
+                }
+            }
+            catch (Exception e)
+            {
+                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+            }
+        }
+
+        private async Task UpdateStatusAsync()
+        {
+            if (_connection == null || _isUpdatingStatus)
+                return;
+ 
+            _isUpdatingStatus = true;
+
+            try
+            {
+                IMpdMessage<MpdStatus> response = await _connection.SendAsync(new StatusCommand());
+                if (response != null && response.IsResponseValid)
+                {
+                    _currentStatus = response.Response.Content;
+                    UpdateStatus();
+                }
+                else
+                    throw new Exception();
+            }
+            catch (Exception e)
+            {
+                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+            }
+
+            _isUpdatingStatus = false;
+        }
+
+        private async Task UpdateSongAsync()
+        {
+            if (_connection == null || _isUpdatingSong)
+                return;
+
+            _isUpdatingSong = true;
+
+            try
+            {
+                IMpdMessage<IMpdFile> response = await _connection.SendAsync(new CurrentSongCommand());
+                if (response != null && response.IsResponseValid)
+                {
+                    _currentSong = response.Response.Content;
+                    UpdateSong();
+                }
+                else
+                    throw new Exception();
+            }
+            catch (Exception e)
+            {
+                Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+            }
+
+            _isUpdatingSong = false;
+        }
+
+        private async void GetAlbumCover(string path, CancellationToken token = default)
         {
             List<byte> data = new List<byte>();
             try
             {
-                if (_connection == null) // We got cancelled
+                if (_connection == null)
                     return;
 
                 long totalBinarySize = 9999;
@@ -334,28 +340,26 @@ namespace unison
                 do
                 {
                     var albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
-                    if (!albumReq.IsResponseValid) break;
+                    if (!albumReq.IsResponseValid)
+                        break;
 
                     var response = albumReq.Response.Content;
-                    if (response.Binary == 0) break; // MPD isn't giving us any more data, let's roll with what we have.
+                    if (response.Binary == 0)
+                        break;
 
                     totalBinarySize = response.Size;
                     currentSize += response.Binary;
                     data.AddRange(response.Data);
-                    //Debug.WriteLine($"Downloading albumart: {currentSize}/{totalBinarySize}");
                 } while (currentSize < totalBinarySize && !token.IsCancellationRequested);
             }
             catch (Exception e)
             {
-                Debug.WriteLine("Exception caught while getting albumart: " + e);
+                Trace.WriteLine("Exception caught while getting albumart: " + e);
                 return;
             }
 
             if (data.Count == 0)
-            {
-                Trace.WriteLine("empty cover");
                 _cover = null;
-            }
             else
             {
                 using MemoryStream stream = new MemoryStream(data.ToArray());
@@ -364,22 +368,34 @@ namespace unison
             UpdateCover();
         }
 
-        public void UpdateSong()
+        public void UpdateStatus()
         {
-            if (!_connected)
+            if (!_connected || _currentStatus == null)
-                return;
-            if (CurrentSong == null)
                 return;
 
-            _currentTime = CurrentStatus.Elapsed.TotalSeconds;
+            _currentRandom = _currentStatus.Random;
-            _totalTime = CurrentSong.Time;
+            _currentRepeat = _currentStatus.Repeat;
+            _currentConsume = _currentStatus.Consume;
+            _currentSingle = _currentStatus.Single;
+            _currentVolume = _currentStatus.Volume;
+
+            StatusChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        public void UpdateSong()
+        {
+            if (!_connected || _currentSong == null)
+                return;
+
+            _currentTime = _currentStatus.Elapsed.TotalSeconds;
+            _totalTime = _currentSong.Time;
             if (!_elapsedTimer.Enabled)
                 _elapsedTimer.Start();
 
             SongChanged?.Invoke(this, EventArgs.Empty);
 
-            string uri = Regex.Escape(CurrentSong.Path);
+            string uri = Regex.Escape(_currentSong.Path);
-            GetAlbumBitmap(uri);
+            GetAlbumCover(uri);
         }
 
         public void UpdateCover()
@@ -387,40 +403,41 @@ namespace unison
             CoverChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        public void UpdateStatus()
+        public IMpdFile GetCurrentSong() => _currentSong;
-        {
+        public MpdStatus GetStatus() => _currentStatus;
-            if (!_connected)
-                return;
-
-            if (CurrentStatus == null)
-                return;
-
-            _currentRandom = CurrentStatus.Random;
-            _currentRepeat = CurrentStatus.Repeat;
-            _currentConsume = CurrentStatus.Consume;
-            _currentSingle = CurrentStatus.Single;
-            _currentVolume = CurrentStatus.Volume;
-
-            StatusChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        public IMpdFile GetCurrentSong() => CurrentSong;
-        public MpdStatus GetStatus() => CurrentStatus;
         public BitmapFrame GetCover() => _cover;
         public string GetVersion() => _version;
+        public double GetCurrentTime() => _currentTime;
 
-        public async void Prev() => await SafelySendCommandAsync(new PreviousCommand());
+        public bool IsConnected() => _connected;
-        public async void Next() => await SafelySendCommandAsync(new NextCommand());
+        public bool IsPlaying() => _currentStatus?.State == MpdState.Play;
-        public async void PlayPause() =>await SafelySendCommandAsync(new PauseResumeCommand());
 
-        public async void Random() => await SafelySendCommandAsync(new RandomCommand(!_currentRandom));
+        public void Prev() => SendCommand(new PreviousCommand());
-        public async void Repeat() => await SafelySendCommandAsync(new RepeatCommand(!_currentRepeat));
+        public void Next() => SendCommand(new NextCommand());
-        public async void Single() => await SafelySendCommandAsync(new SingleCommand(!_currentSingle));
+        public void PlayPause() => SendCommand(new PauseResumeCommand());
-        public async void Consume() => await SafelySendCommandAsync(new ConsumeCommand(!_currentConsume));
 
-        public async void SetVolume(int value) => await SafelySendCommandAsync(new SetVolumeCommand((byte)value));
+        public void Random() => SendCommand(new RandomCommand(!_currentRandom));
-        public async void SetTime(double value) => await SafelySendCommandAsync(new SeekCurCommand(value));
+        public void Repeat() => SendCommand(new RepeatCommand(!_currentRepeat));
+        public void Single() => SendCommand(new SingleCommand(!_currentSingle));
+        public void Consume() => SendCommand(new ConsumeCommand(!_currentConsume));
 
-        public bool IsPlaying() => CurrentStatus?.State == MpdState.Play;
+        public void SetTime(double value) => SendCommand(new SeekCurCommand(value));
+        public void SetVolume(int value) => SendCommand(new SetVolumeCommand((byte)value));
+        
+        public void VolumeUp()
+        {
+            _currentVolume += Properties.Settings.Default.volume_offset;
+            if (_currentVolume > 100)
+                _currentVolume = 100;
+            SetVolume(_currentVolume);
+        }
+
+        public void VolumeDown()
+        {
+            _currentVolume -= Properties.Settings.Default.volume_offset;
+            if (_currentVolume < 0)
+                _currentVolume = 0;
+            SetVolume(_currentVolume);
+        }
     }
 }

Handlers/SnapcastHandler.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Threading;
 using Hardcodet.Wpf.TaskbarNotification;
 
 namespace unison
@@ -9,19 +8,15 @@ namespace unison
     public class SnapcastHandler
     {
         private readonly Process _snapcast = new();
-        public bool Started { get; private set; }
+        public bool HasStarted { get; private set; }
-
-        public SnapcastHandler()
-        {
-        }
 
         public void OnConnectionChanged(object sender, EventArgs e)
         {
             if (Properties.Settings.Default.snapcast_startup)
             {
                 var mpd = (MPDHandler)Application.Current.Properties["mpd"];
-                if (mpd._connected)
+                if (mpd.IsConnected())
-                    Start();
+                    LaunchOrExit();
             }
         }
 
@@ -35,12 +30,12 @@ namespace unison
             {
                 MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
                 MainWin.OnSnapcastChanged();
-            }, DispatcherPriority.ContextIdle);
+            });
         }
 
-        public void Start()
+        public void LaunchOrExit(bool ForceExit = false)
         {
-            if (!Started)
+            if (!HasStarted && !ForceExit)
             {
                 _snapcast.StartInfo.FileName = Properties.Settings.Default.snapcast_path + @"\snapclient.exe";
                 _snapcast.StartInfo.Arguments = $"--host {Properties.Settings.Default.mpd_host}";
@@ -51,30 +46,23 @@ namespace unison
                 }
                 catch (Exception err)
                 {
-                    MessageBox.Show($"[Snapcast error]\nInvalid path: {err.Message}\n\nCurrent path: {Properties.Settings.Default.snapcast_path}\nYou can reset it in the settings if needed.",
+                    MessageBox.Show($"[{unison.Resources.Resources.Snapcast_Popup1}]\n" +
+                                    $"{unison.Resources.Resources.Snapcast_Popup2} {err.Message}\n\n" +
+                                    $"{unison.Resources.Resources.Snapcast_Popup3} {Properties.Settings.Default.snapcast_path}\n" +
+                                    $"{unison.Resources.Resources.Snapcast_Popup4}",
                                     "unison", MessageBoxButton.OK, MessageBoxImage.Error);
-                    Trace.WriteLine(err.Message);
                     return;
                 }
-                Started = true;
+                HasStarted = true;
-                UpdateInterface();
             }
-            else
+            else if (HasStarted)
             {
                 _snapcast.Kill();
-                Started = false;
+                HasStarted = false;
-                UpdateInterface();
-            }
             }
 
-        public void Stop()
+            if (!ForceExit)
-        {
-            if (Started)
-            {
-                _snapcast.Kill();
-                Started = false;
                 UpdateInterface();
         }
     }
-    }
 }

README.md

@@ -1,3 +1,44 @@
 # unison
 
-mpd client
+![Main window](Screenshots/screen1.png)
+
+**unison** is a very simple [Music Player Daemon (MPD)](https://www.musicpd.org/) daemon client with the following goals:
+
+* lightweight window that can be toggled with shortcuts
+* music control through shortcuts
+* [Snapcast](https://mjaggard.github.io/snapcast/) integration
+
+## Features
+
+### Window
+
+By default, unison works as a daemon in the taskbar system tray. You can display the main window when needed at any time with a shortcut.
+
+![Systray](Screenshots/screen2.png)
+
+### Shortcuts
+
+You can control your music at anytime with the shortcuts. They can of course be used if the window is not visible.
+
+![Settings => shortcuts](Screenshots/screen3.png)
+
+### Snapcast
+
+The main goal of embedding Snapcast is the ability to listen locally to music when I'm not using my main audio system. The computer running unison can then play music easily.
+
+## Caveats
+
+### Missing features
+
+* Custom shortcuts.
+* MPD passwords: I don't really see the point, but if asked, I will integrate them.
+* Any sort of playlist and queue management. I use other software to do it, but I might implement them at some point.
+
+### Wanted features
+
+* A complete shuffle system based on set criteria, aka a smart playlist.
+* Radio integration.
+
+## Translations
+
+unison is translated in English and French. You can contribute if you want!

Resources/Resources.Designer.cs

@@ -0,0 +1,423 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace unison.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("unison.Resources.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Exit.
+        /// </summary>
+        public static string Exit {
+            get {
+                return ResourceManager.GetString("Exit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        public static string Settings {
+            get {
+                return ResourceManager.GetString("Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to About.
+        /// </summary>
+        public static string Settings_About {
+            get {
+                return ResourceManager.GetString("Settings_About", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to unison is a free software. It is built with the following technologies:.
+        /// </summary>
+        public static string Settings_AboutInfo {
+            get {
+                return ResourceManager.GetString("Settings_AboutInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connect.
+        /// </summary>
+        public static string Settings_ConnectButton {
+            get {
+                return ResourceManager.GetString("Settings_ConnectButton", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection.
+        /// </summary>
+        public static string Settings_Connection {
+            get {
+                return ResourceManager.GetString("Settings_Connection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connected to MPD.
+        /// </summary>
+        public static string Settings_ConnectionStatusConnected {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionStatusConnected", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connecting....
+        /// </summary>
+        public static string Settings_ConnectionStatusConnecting {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionStatusConnecting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Not connected..
+        /// </summary>
+        public static string Settings_ConnectionStatusOffline {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionStatusOffline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Host.
+        /// </summary>
+        public static string Settings_Host {
+            get {
+                return ResourceManager.GetString("Settings_Host", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to License.
+        /// </summary>
+        public static string Settings_License {
+            get {
+                return ResourceManager.GetString("Settings_License", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Made by.
+        /// </summary>
+        public static string Settings_MadeBy {
+            get {
+                return ResourceManager.GetString("Settings_MadeBy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;s updated MpcNET.
+        /// </summary>
+        public static string Settings_MpcNET {
+            get {
+                return ResourceManager.GetString("Settings_MpcNET", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Next track.
+        /// </summary>
+        public static string Settings_NextTrack {
+            get {
+                return ResourceManager.GetString("Settings_NextTrack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Play / pause.
+        /// </summary>
+        public static string Settings_PlayPause {
+            get {
+                return ResourceManager.GetString("Settings_PlayPause", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port.
+        /// </summary>
+        public static string Settings_Port {
+            get {
+                return ResourceManager.GetString("Settings_Port", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Previous track.
+        /// </summary>
+        public static string Settings_PreviousTrack {
+            get {
+                return ResourceManager.GetString("Settings_PreviousTrack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Shortcuts.
+        /// </summary>
+        public static string Settings_Shortcuts {
+            get {
+                return ResourceManager.GetString("Settings_Shortcuts", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show window.
+        /// </summary>
+        public static string Settings_ShowWindow {
+            get {
+                return ResourceManager.GetString("Settings_ShowWindow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can change to your own locally installed version of the Snapcast client with an.
+        /// </summary>
+        public static string Settings_SnapcastInfo1 {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastInfo1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to  absolute .
+        /// </summary>
+        public static string Settings_SnapcastInfo2 {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastInfo2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to path..
+        /// </summary>
+        public static string Settings_SnapcastInfo3 {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastInfo3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Launch at startup.
+        /// </summary>
+        public static string Settings_SnapcastLauch {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastLauch", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Executable path.
+        /// </summary>
+        public static string Settings_SnapcastPath {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastPath", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port.
+        /// </summary>
+        public static string Settings_SnapcastPort {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastPort", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Reset.
+        /// </summary>
+        public static string Settings_SnapcastResetButton {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastResetButton", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show Snapcast window.
+        /// </summary>
+        public static string Settings_SnapcastWindow {
+            get {
+                return ResourceManager.GetString("Settings_SnapcastWindow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Source code freely available.
+        /// </summary>
+        public static string Settings_SourceCode1 {
+            get {
+                return ResourceManager.GetString("Settings_SourceCode1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to here.
+        /// </summary>
+        public static string Settings_SourceCode2 {
+            get {
+                return ResourceManager.GetString("Settings_SourceCode2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Version:.
+        /// </summary>
+        public static string Settings_Version {
+            get {
+                return ResourceManager.GetString("Settings_Version", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Volume down.
+        /// </summary>
+        public static string Settings_VolumeDown {
+            get {
+                return ResourceManager.GetString("Settings_VolumeDown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Volume offset.
+        /// </summary>
+        public static string Settings_VolumeOffset {
+            get {
+                return ResourceManager.GetString("Settings_VolumeOffset", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Volume up.
+        /// </summary>
+        public static string Settings_VolumeUp {
+            get {
+                return ResourceManager.GetString("Settings_VolumeUp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show window.
+        /// </summary>
+        public static string ShowWindow {
+            get {
+                return ResourceManager.GetString("ShowWindow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Snapcast error.
+        /// </summary>
+        public static string Snapcast_Popup1 {
+            get {
+                return ResourceManager.GetString("Snapcast_Popup1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid path:.
+        /// </summary>
+        public static string Snapcast_Popup2 {
+            get {
+                return ResourceManager.GetString("Snapcast_Popup2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Current path:.
+        /// </summary>
+        public static string Snapcast_Popup3 {
+            get {
+                return ResourceManager.GetString("Snapcast_Popup3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You can reset it in the settings if needed..
+        /// </summary>
+        public static string Snapcast_Popup4 {
+            get {
+                return ResourceManager.GetString("Snapcast_Popup4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Start Snapcast.
+        /// </summary>
+        public static string StartSnapcast {
+            get {
+                return ResourceManager.GetString("StartSnapcast", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Stop Snapcast.
+        /// </summary>
+        public static string StopSnapcast {
+            get {
+                return ResourceManager.GetString("StopSnapcast", resourceCulture);
+            }
+        }
+    }
+}

Resources/Resources.fr-FR.resx

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Exit" xml:space="preserve">
+    <value>Quitter</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="Settings_About" xml:space="preserve">
+    <value>À propos</value>
+  </data>
+  <data name="Settings_AboutInfo" xml:space="preserve">
+    <value>unison est un logiciel libre. Il est développé avec les technologies suivantes :</value>
+  </data>
+  <data name="Settings_ConnectButton" xml:space="preserve">
+    <value>Connexion</value>
+  </data>
+  <data name="Settings_Connection" xml:space="preserve">
+    <value>Connexion</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
+    <value>Connecté à MPD</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
+    <value>Connexion en cours...</value>
+  </data>
+  <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
+    <value>Non connecté.</value>
+  </data>
+  <data name="Settings_Host" xml:space="preserve">
+    <value>Hôte</value>
+  </data>
+  <data name="Settings_License" xml:space="preserve">
+    <value>Licence</value>
+  </data>
+  <data name="Settings_MadeBy" xml:space="preserve">
+    <value>Créé par</value>
+  </data>
+  <data name="Settings_MpcNET" xml:space="preserve">
+    <value> et sa version de MpcNET</value>
+  </data>
+  <data name="Settings_NextTrack" xml:space="preserve">
+    <value>Piste suivante</value>
+  </data>
+  <data name="Settings_PlayPause" xml:space="preserve">
+    <value>Jouer / pause</value>
+  </data>
+  <data name="Settings_Port" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="Settings_PreviousTrack" xml:space="preserve">
+    <value>Piste précédente</value>
+  </data>
+  <data name="Settings_Shortcuts" xml:space="preserve">
+    <value>Raccourcis</value>
+  </data>
+  <data name="Settings_ShowWindow" xml:space="preserve">
+    <value>Afficher la fenêtre</value>
+  </data>
+  <data name="Settings_SnapcastInfo1" xml:space="preserve">
+    <value>Il est possible de mettre votre version localement installé de Snapcast avec un </value>
+  </data>
+  <data name="Settings_SnapcastInfo2" xml:space="preserve">
+    <value>chemin absolu</value>
+  </data>
+  <data name="Settings_SnapcastInfo3" xml:space="preserve">
+    <value>.</value>
+  </data>
+  <data name="Settings_SnapcastLauch" xml:space="preserve">
+    <value>Lancer au démarrage</value>
+  </data>
+  <data name="Settings_SnapcastPath" xml:space="preserve">
+    <value>Chemin de l'exécutable</value>
+  </data>
+  <data name="Settings_SnapcastPort" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="Settings_SnapcastResetButton" xml:space="preserve">
+    <value>Réinitialiser</value>
+  </data>
+  <data name="Settings_SnapcastWindow" xml:space="preserve">
+    <value>Afficher la fenêtre de Snapcast</value>
+  </data>
+  <data name="Settings_SourceCode1" xml:space="preserve">
+    <value>Code source librement disponible</value>
+  </data>
+  <data name="Settings_SourceCode2" xml:space="preserve">
+    <value>ici</value>
+  </data>
+  <data name="Settings_Version" xml:space="preserve">
+    <value>Version :</value>
+  </data>
+  <data name="Settings_VolumeDown" xml:space="preserve">
+    <value>Baisse de volume</value>
+  </data>
+  <data name="Settings_VolumeOffset" xml:space="preserve">
+    <value>Écart de volume</value>
+  </data>
+  <data name="Settings_VolumeUp" xml:space="preserve">
+    <value>Augmentation de volume</value>
+  </data>
+  <data name="ShowWindow" xml:space="preserve">
+    <value>Montrer la fenêtre</value>
+  </data>
+  <data name="Snapcast_Popup1" xml:space="preserve">
+    <value>Erreur Snapcast</value>
+  </data>
+  <data name="Snapcast_Popup2" xml:space="preserve">
+    <value>Chemin invalide :</value>
+  </data>
+  <data name="Snapcast_Popup3" xml:space="preserve">
+    <value>Chemin actuel :</value>
+  </data>
+  <data name="Snapcast_Popup4" xml:space="preserve">
+    <value>Vous pouvez le réinitialiser dans la configuration.</value>
+  </data>
+  <data name="StartSnapcast" xml:space="preserve">
+    <value>Démarrer Snapcast</value>
+  </data>
+  <data name="StopSnapcast" xml:space="preserve">
+    <value>Stopper Snapcast</value>
+  </data>
+</root>

Resources/Resources.resx

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Exit" xml:space="preserve">
+    <value>Exit</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Settings_About" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="Settings_AboutInfo" xml:space="preserve">
+    <value>unison is a free software. It is built with the following technologies:</value>
+  </data>
+  <data name="Settings_ConnectButton" xml:space="preserve">
+    <value>Connect</value>
+  </data>
+  <data name="Settings_Connection" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
+    <value>Connected to MPD</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
+    <value>Connecting...</value>
+  </data>
+  <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
+    <value>Not connected.</value>
+  </data>
+  <data name="Settings_Host" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="Settings_License" xml:space="preserve">
+    <value>License</value>
+  </data>
+  <data name="Settings_MadeBy" xml:space="preserve">
+    <value>Made by</value>
+  </data>
+  <data name="Settings_MpcNET" xml:space="preserve">
+    <value>'s updated MpcNET</value>
+  </data>
+  <data name="Settings_NextTrack" xml:space="preserve">
+    <value>Next track</value>
+  </data>
+  <data name="Settings_PlayPause" xml:space="preserve">
+    <value>Play / pause</value>
+  </data>
+  <data name="Settings_Port" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="Settings_PreviousTrack" xml:space="preserve">
+    <value>Previous track</value>
+  </data>
+  <data name="Settings_Shortcuts" xml:space="preserve">
+    <value>Shortcuts</value>
+  </data>
+  <data name="Settings_ShowWindow" xml:space="preserve">
+    <value>Show window</value>
+  </data>
+  <data name="Settings_SnapcastInfo1" xml:space="preserve">
+    <value>You can change to your own locally installed version of the Snapcast client with an</value>
+  </data>
+  <data name="Settings_SnapcastInfo2" xml:space="preserve">
+    <value> absolute </value>
+  </data>
+  <data name="Settings_SnapcastInfo3" xml:space="preserve">
+    <value>path.</value>
+  </data>
+  <data name="Settings_SnapcastLauch" xml:space="preserve">
+    <value>Launch at startup</value>
+  </data>
+  <data name="Settings_SnapcastPath" xml:space="preserve">
+    <value>Executable path</value>
+  </data>
+  <data name="Settings_SnapcastPort" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="Settings_SnapcastResetButton" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Settings_SnapcastWindow" xml:space="preserve">
+    <value>Show Snapcast window</value>
+  </data>
+  <data name="Settings_SourceCode1" xml:space="preserve">
+    <value>Source code freely available</value>
+  </data>
+  <data name="Settings_SourceCode2" xml:space="preserve">
+    <value>here</value>
+  </data>
+  <data name="Settings_Version" xml:space="preserve">
+    <value>Version:</value>
+  </data>
+  <data name="Settings_VolumeDown" xml:space="preserve">
+    <value>Volume down</value>
+  </data>
+  <data name="Settings_VolumeOffset" xml:space="preserve">
+    <value>Volume offset</value>
+  </data>
+  <data name="Settings_VolumeUp" xml:space="preserve">
+    <value>Volume up</value>
+  </data>
+  <data name="ShowWindow" xml:space="preserve">
+    <value>Show window</value>
+  </data>
+  <data name="Snapcast_Popup1" xml:space="preserve">
+    <value>Snapcast error</value>
+  </data>
+  <data name="Snapcast_Popup2" xml:space="preserve">
+    <value>Invalid path:</value>
+  </data>
+  <data name="Snapcast_Popup3" xml:space="preserve">
+    <value>Current path:</value>
+  </data>
+  <data name="Snapcast_Popup4" xml:space="preserve">
+    <value>You can reset it in the settings if needed.</value>
+  </data>
+  <data name="StartSnapcast" xml:space="preserve">
+    <value>Start Snapcast</value>
+  </data>
+  <data name="StopSnapcast" xml:space="preserve">
+    <value>Stop Snapcast</value>
+  </data>
+</root>

Resources/Resources.xaml

@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:String x:Key="snapcastPath">snapclient_0.25.0-1_win64</system:String>
+    <system:String x:Key="snapcastPort">1704</system:String>
+
+    <system:String x:Key="connectionOk1">&#xf385;</system:String>
+    <system:String x:Key="connectionOk2">&#xf386;</system:String>
+    <system:String x:Key="connectionFail">&#xf384;</system:String>
+
+    <system:String x:Key="playButton">&#xedb4;</system:String>
+    <system:String x:Key="pauseButton">&#xedb5;</system:String>
+
+</ResourceDictionary>

Views/MainWindow.xaml

@@ -4,11 +4,9 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
-        xmlns:clr="clr-namespace:System;assembly=mscorlib"
+        xmlns:properties="clr-namespace:unison.Resources"
-        xmlns:local="clr-namespace:unison"
         mc:Ignorable="d"
-        Title="unison"
+        Title="unison" Closing="Window_Closing" Icon="/Resources/icon-full.ico" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight">
-        Closing="Window_Closing" Icon="/images/icon-full.ico" ResizeMode="CanMinimize" SizeToContent="WidthAndHeight">
 
     <Window.Resources>
         <Style TargetType="Border" x:Key="UnselectedButton">
@@ -19,7 +17,7 @@
         </Style>
     </Window.Resources>
 
-    <Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270">
+    <Grid Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" MinHeight="270" MinWidth="650">
         <Grid x:Name="TopLayout" Margin="10,0,10,0" VerticalAlignment="Stretch" Width="Auto" Height="Auto">
             <Grid x:Name="Display" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="225,0,0,0" Height="Auto" Width="Auto">
                 <GroupBox Height="220" VerticalAlignment="Center">
@@ -34,10 +32,10 @@
                                 <TextBlock x:Name="SongTitle" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" FontSize="20" Text="Title"/>
                                 <TextBlock x:Name="SongArtist" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Bold" FontSize="18"  Text="Artist"/>
                                 <TextBlock x:Name="SongAlbum" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" FontSize="16"  Text="Album"/>
-                                <TextBlock TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Margin="0,2,0,0">
+                                <TextBlock x:Name="SongInfo" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Margin="0,2,0,0">
                                     <Run x:Name="SongGenre"/>
-                                    <Run> – </Run>
+                                    <Run x:Name="SongInfoDash"> – </Run>
-                                    <Run x:Name="Format"/>
+                                    <Run x:Name="SongFormat"/>
                                 </TextBlock>
                             </StackPanel>
                         </Grid>
@@ -63,7 +61,7 @@
                                     </Button>
                                 </StackPanel>
                                 <Grid VerticalAlignment="Stretch" Margin="0,18,0,0">
-                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,2,0,0">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="10,2,10,0">
                                         <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xe992;" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"/>
                                         <Slider x:Name="VolumeSlider" Maximum="100" Value="50" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" MinWidth="180" FlowDirection="LeftToRight" PreviewMouseUp="VolumeSlider_DragCompleted" FocusVisualStyle="{x:Null}"/>
                                         <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xe995;" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="7.5,0,0,0" FontSize="16"/>
@@ -105,8 +103,8 @@
                         <StackPanel.OpacityMask>
                             <VisualBrush Visual="{Binding ElementName=mask}"/>
                         </StackPanel.OpacityMask>
-                        <Image x:Name="Cover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/images/nocover.png" Visibility="Collapsed" />
+                        <Image x:Name="Cover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" Visibility="Collapsed" />
-                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/images/nocover.png" />
+                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" />
                     </StackPanel>
                 </Grid>
             </Border>
@@ -115,10 +113,19 @@
             <Button x:Name="Snapcast" HorizontalAlignment="Left" VerticalAlignment="Center" Click="Snapcast_Clicked" Margin="10,0,0,0" Padding="5, 2" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                 <StackPanel Orientation="Horizontal">
                     <emoji:TextBlock Text="🔊" Padding="0,0,0,2"/>
-                    <TextBlock x:Name="SnapcastText" Text="Start Snapcast" Margin="5, 0, 0, 0"/>
+                    <TextBlock x:Name="SnapcastText" Text="{x:Static properties:Resources.StartSnapcast}" Margin="5, 0, 0, 0"/>
                 </StackPanel>
             </Button>
-            <TextBlock x:Name="Connection" HorizontalAlignment="Center" Text="Not connected" TextWrapping="Wrap" VerticalAlignment="Center" TextAlignment="Center" MinWidth="350" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Grid x:Name="ConnectionOkIcon" HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xf385;" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xf386;" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </Grid>
+                <Grid x:Name="ConnectionFailIcon" HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xf384;" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                </Grid>
+                <TextBlock x:Name="Connection" HorizontalAlignment="Center" Text="Not connected" TextWrapping="Wrap" VerticalAlignment="Top" TextAlignment="Center" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" Margin="5,0,0,0" />
+            </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,10,0">
                 <!--<Button x:Name="Shuffle" Padding="5, 2" HorizontalAlignment="Right" Margin="0,0,10,0" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
                     <StackPanel Orientation="Horizontal">
@@ -129,7 +136,7 @@
                 <Button x:Name="Settings" Padding="5, 2" Click="Settings_Clicked" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}">
                     <StackPanel Orientation="Horizontal">
                         <emoji:TextBlock Text="🛠️"  Padding="0,0,0,2"/>
-                        <TextBlock Text="Settings" Margin="5, 0, 0, 0"/>
+                        <TextBlock Text="{x:Static properties:Resources.Settings}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
             </StackPanel>

Views/MainWindow.xaml.cs

@@ -9,35 +9,177 @@ using System.Windows.Controls.Primitives;
 
 namespace unison
 {
-    public partial class MainWindow : Window, INotifyPropertyChanged
+    public partial class MainWindow : Window
     {
-        public readonly Settings SettingsWindow = new Settings();
+        private readonly Settings _settingsWin;
-
+        private readonly DispatcherTimer _timer;
-        private readonly MPDHandler mpd;
+        private readonly MPDHandler _mpd;
-
-        DispatcherTimer timer = new DispatcherTimer();
 
         public MainWindow()
         {
             InitHwnd();
             InitializeComponent();
-
+            DefaultState(true);
             WindowState = WindowState.Minimized;
 
-            mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            _settingsWin = new Settings();
+            _timer = new DispatcherTimer();
+            _mpd = (MPDHandler)Application.Current.Properties["mpd"];
 
-            timer.Interval = TimeSpan.FromSeconds(0.5);
+            _timer.Interval = TimeSpan.FromSeconds(0.5);
-            timer.Tick += Timer_Tick;
+            _timer.Tick += Timer_Tick;
-            timer.Start();
+            _timer.Start();
         }
 
         private void Timer_Tick(object sender, EventArgs e)
         {
-            if (mpd.GetCurrentSong() == null)
+            if (_mpd.GetCurrentSong() == null)
                 return;
 
-            CurrentTime.Text = FormatSeconds(mpd._currentTime);
+            CurrentTime.Text = FormatSeconds(_mpd.GetCurrentTime());
-            TimeSlider.Value = mpd._currentTime / mpd.GetCurrentSong().Time * 100;
+            TimeSlider.Value = _mpd.GetCurrentTime() / _mpd.GetCurrentSong().Time * 100;
+        }
+
+        public void OnConnectionChanged(object sender, EventArgs e)
+        {
+            if (_mpd.IsConnected())
+            {
+                Snapcast.IsEnabled = true;
+                ConnectionOkIcon.Visibility = Visibility.Visible;
+                ConnectionFailIcon.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                _timer.Stop();
+                DefaultState(true);
+                ConnectionOkIcon.Visibility = Visibility.Collapsed;
+                ConnectionFailIcon.Visibility = Visibility.Visible;
+            }
+            _settingsWin.UpdateConnectionStatus();
+            Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
+        }
+
+        public void OnSongChanged(object sender, EventArgs e)
+        {
+            if (_mpd.GetCurrentSong() == null)
+                return;
+
+            if (_mpd.GetCurrentSong().HasTitle && _mpd.GetCurrentSong().Title.Length > 0)
+                SongTitle.Text = _mpd.GetCurrentSong().Title;
+            else if (_mpd.GetCurrentSong().HasName && _mpd.GetCurrentSong().Name.Length > 0)
+                SongTitle.Text = _mpd.GetCurrentSong().Name;
+            else
+            {
+                int start = _mpd.GetCurrentSong().Path.LastIndexOf("/") + 1;
+                int end = _mpd.GetCurrentSong().Path.LastIndexOf(".");
+                SongTitle.Text = _mpd.GetCurrentSong().Path.Substring(start, end - start);
+            }
+
+            SongTitle.ToolTip = _mpd.GetCurrentSong().Path;
+            SongArtist.Text = _mpd.GetCurrentSong().Artist;
+            SongAlbum.Text = _mpd.GetCurrentSong().Album;
+
+            if (_mpd.GetCurrentSong().Date != null)
+                SongAlbum.Text += $" ({ _mpd.GetCurrentSong().Date})";
+
+            SongGenre.Text = _mpd.GetCurrentSong().Genre;
+            SongFormat.Text = _mpd.GetCurrentSong().Path.Substring(_mpd.GetCurrentSong().Path.LastIndexOf(".") + 1);
+            if (SongGenre.Text.Length == 0 || SongFormat.Text.Length == 0)
+                SongInfoDash.Text = "";
+            else
+                SongInfoDash.Text = " – ";
+
+            TimeSlider.IsEnabled = true;
+            if (_mpd.GetCurrentSong().Time == -1)
+            {
+                CurrentTime.Text = "";
+                EndTime.Text = "";
+                _timer.Stop();
+                TimeSlider.Value = 50;
+                TimeSlider.IsEnabled = false;
+            }
+            else
+            {
+                if (!_timer.IsEnabled)
+                    _timer.Start();
+                EndTime.Text = FormatSeconds(_mpd.GetCurrentSong().Time);
+            }
+        }
+
+        public void OnStatusChanged(object sender, EventArgs e)
+        {
+            if (_mpd.GetStatus() == null)
+                return;
+
+            if (VolumeSlider.Value != _mpd.GetStatus().Volume)
+            {
+                VolumeSlider.Value = _mpd.GetStatus().Volume;
+                VolumeSlider.ToolTip = _mpd.GetStatus().Volume;
+            }
+
+            UpdateButton(ref BorderRandom, _mpd.GetStatus().Random);
+            UpdateButton(ref BorderRepeat, _mpd.GetStatus().Repeat);
+            UpdateButton(ref BorderSingle, _mpd.GetStatus().Single);
+            UpdateButton(ref BorderConsume, _mpd.GetStatus().Consume);
+
+            if (_mpd.IsPlaying())
+                PlayPause.Text = (string)Application.Current.FindResource("playButton");
+            else
+            {
+                PlayPause.Text = (string)Application.Current.FindResource("pauseButton");
+                if (_mpd.GetStatus().State == MpcNET.MpdState.Stop)
+                {
+                    DefaultState();
+                }
+            }
+        }
+
+        private void DefaultState(bool LostConnection = false)
+        {
+            SongTitle.Text = "";
+            SongArtist.Text = "";
+            SongAlbum.Text = "";
+            SongGenre.Text = "";
+            SongInfoDash.Text = "";
+            SongFormat.Text = "";
+            CurrentTime.Text = "";
+            EndTime.Text = "";
+            PlayPause.Text = (string)Application.Current.FindResource("pauseButton");
+            TimeSlider.Value = 50;
+            TimeSlider.IsEnabled = false;
+            NoCover.Visibility = Visibility.Visible;
+            Cover.Visibility = Visibility.Collapsed;
+
+            if (LostConnection)
+            {
+                ConnectionOkIcon.Visibility = Visibility.Collapsed;
+                ConnectionFailIcon.Visibility = Visibility.Visible;
+            }
+            Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
+        }
+
+        public void OnCoverChanged(object sender, EventArgs e)
+        {
+            if (_mpd.GetCover() == null)
+            {
+                NoCover.Visibility = Visibility.Visible;
+                Cover.Visibility = Visibility.Collapsed;
+            }
+            else if (Cover.Source != _mpd.GetCover())
+            {
+                Cover.Source = _mpd.GetCover();
+                Cover.Visibility = Visibility.Visible;
+                NoCover.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        public void OnSnapcastChanged()
+        {
+            SnapcastHandler snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
+            if (snapcast.HasStarted)
+                SnapcastText.Text = unison.Resources.Resources.StopSnapcast; 
+            else
+                SnapcastText.Text = unison.Resources.Resources.StartSnapcast;
         }
 
         public void UpdateButton(ref Border border, bool b)
@@ -56,119 +198,34 @@ namespace unison
             return timespan.ToString(@"mm\:ss");
         }
 
-        public void OnConnectionChanged(object sender, EventArgs e)
+        public void Pause_Clicked(object sender, RoutedEventArgs e) => _mpd.PlayPause();
-        {
+        public void Previous_Clicked(object sender, RoutedEventArgs e) =>  _mpd.Prev();
-            Connection.Text = (mpd._connected ? "✔️" : "❌") + $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
+        public void Next_Clicked(object sender, RoutedEventArgs e) => _mpd.Next();
-            SettingsWindow.UpdateConnectionStatus();
-            if (mpd._connected)
-                Snapcast.IsEnabled = true;
-        }
 
-        public void OnSongChanged(object sender, EventArgs e)
+        public void Random_Clicked(object sender, RoutedEventArgs e) => _mpd.Random();
-        {
+        public void Repeat_Clicked(object sender, RoutedEventArgs e) => _mpd.Repeat();
-            if (mpd.GetCurrentSong() == null)
+        public void Single_Clicked(object sender, RoutedEventArgs e) => _mpd.Single();
-                return;
+        public void Consume_Clicked(object sender, RoutedEventArgs e) => _mpd.Consume();
-
+        public void ChangeVolume(int value) => _mpd.SetVolume(value);
-            if (!mpd.GetCurrentSong().HasName)
-                SongTitle.Text = mpd.GetCurrentSong().Title;
-            else
-                SongTitle.Text = mpd.GetCurrentSong().Title;
-            SongTitle.ToolTip = mpd.GetCurrentSong().Path;
-            SongArtist.Text = mpd.GetCurrentSong().Artist;
-            SongAlbum.Text = mpd.GetCurrentSong().Album;
-            SongGenre.Text = mpd.GetCurrentSong().Genre;
-
-            if (mpd.GetCurrentSong().Date != null)
-                SongAlbum.Text += $" ({ mpd.GetCurrentSong().Date})";
-            Format.Text = mpd.GetCurrentSong().Path.Substring(mpd.GetCurrentSong().Path.LastIndexOf(".") + 1);
-
-            EndTime.Text = FormatSeconds(mpd.GetCurrentSong().Time);
-        }
-
-        public void OnStatusChanged(object sender, EventArgs e)
-        {
-            if (mpd.GetStatus() == null)
-                return;
-
-            if (VolumeSlider.Value != mpd._currentVolume)
-            {
-                VolumeSlider.Value = mpd._currentVolume;
-                VolumeSlider.ToolTip = mpd._currentVolume;
-            }
-
-            if (mpd.IsPlaying())
-                PlayPause.Text = "\xedb4";
-            else
-                PlayPause.Text = "\xedb5";
-
-            UpdateButton(ref BorderRandom, mpd._currentRandom);
-            UpdateButton(ref BorderRepeat, mpd._currentRepeat);
-            UpdateButton(ref BorderSingle, mpd._currentSingle);
-            UpdateButton(ref BorderConsume, mpd._currentConsume);
-        }
-
-        public void OnCoverChanged(object sender, EventArgs e)
-        {
-            if (mpd.GetCover() == null)
-            {
-                NoCover.Visibility = Visibility.Visible;
-                Cover.Visibility = Visibility.Collapsed;
-            }
-            else if (Cover.Source != mpd.GetCover())
-            {
-                Cover.Source = mpd.GetCover();
-                Cover.Visibility = Visibility.Visible;
-                NoCover.Visibility = Visibility.Collapsed;
-            }
-        }
-
-        public void OnSnapcastChanged()
-        {
-            SnapcastHandler snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
-            if (snapcast.Started)
-                SnapcastText.Text = "Stop Snapcast";
-            else
-                SnapcastText.Text = "Start Snapcast";
-        }
-
-        public void Pause_Clicked(object sender, RoutedEventArgs e) => mpd.PlayPause();
-        public void Previous_Clicked(object sender, RoutedEventArgs e) =>  mpd.Prev();
-        public void Next_Clicked(object sender, RoutedEventArgs e) => mpd.Next();
-
-        public void Random_Clicked(object sender, RoutedEventArgs e) => mpd.Random();
-        public void Repeat_Clicked(object sender, RoutedEventArgs e) => mpd.Repeat();
-        public void Single_Clicked(object sender, RoutedEventArgs e) => mpd.Single();
-        public void Consume_Clicked(object sender, RoutedEventArgs e) => mpd.Consume();
-        public void ChangeVolume(int value) => mpd.SetVolume(value);
 
         public void Snapcast_Clicked(object sender, RoutedEventArgs e)
         {
             SnapcastHandler snapcast = (SnapcastHandler)Application.Current.Properties["snapcast"];
-            if (!snapcast.Started)
+            snapcast.LaunchOrExit();
-                snapcast.Start();
-            else
-                snapcast.Stop();
         }
 
         public void Settings_Clicked(object sender, RoutedEventArgs e)
         {
-            SettingsWindow.Show();
+            _settingsWin.Show();
-            SettingsWindow.Activate();
+            _settingsWin.Activate();
 
-            if (SettingsWindow.WindowState == WindowState.Minimized)
+            if (_settingsWin.WindowState == WindowState.Minimized)
-                SettingsWindow.WindowState = WindowState.Normal;
+                _settingsWin.WindowState = WindowState.Normal;
-        }
-
-        private void Window_Closing(object sender, CancelEventArgs e)
-        {
-            e.Cancel = true;
-            WindowState = WindowState.Minimized;
-            Hide();
         }
 
         private void TimeSlider_DragStarted(object sender, DragStartedEventArgs e)
         {
-            timer.Stop();
+            _timer.Stop();
         }
 
         private void TimeSlider_DragCompleted(object sender, MouseButtonEventArgs e)
@@ -176,18 +233,18 @@ namespace unison
             Slider slider = (Slider)sender;
 
             double SongPercentage = slider.Value;
-            double SongTime = mpd._totalTime;
+            double SongTime = _mpd.GetCurrentSong().Time;
             double SeekTime = SongPercentage / 100 * SongTime;
 
-            mpd.SetTime(SeekTime);
+            _mpd.SetTime(SeekTime);
-            timer.Start();
+            _timer.Start();
         }
 
         private void VolumeSlider_DragCompleted(object sender, MouseButtonEventArgs e)
         {
             Slider slider = (Slider)sender;
-            mpd.SetVolume((int)slider.Value);
+            _mpd.SetVolume((int)slider.Value);
-            slider.ToolTip = mpd._currentVolume;
+            slider.ToolTip = (int)slider.Value;
         }
 
         protected override void OnSourceInitialized(EventArgs e)
@@ -203,11 +260,11 @@ namespace unison
             helper.EnsureHandle();
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+        private void Window_Closing(object sender, CancelEventArgs e)
-
-        protected virtual void OnPropertyChanged(string propertyName)
         {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            e.Cancel = true;
+            WindowState = WindowState.Minimized;
+            Hide();
         }
     }
 }

Views/Settings.xaml

@@ -4,9 +4,9 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
-        xmlns:local="clr-namespace:unison"
+        xmlns:properties="clr-namespace:unison.Resources" 
         mc:Ignorable="d"
-        Closing="Window_Closing" Title="Settings" ResizeMode="CanMinimize" Icon="/images/icon-full.ico" WindowStyle="ToolWindow" SizeToContent="WidthAndHeight">
+        Closing="Window_Closing" Title="{x:Static properties:Resources.Settings}" ResizeMode="CanMinimize" Icon="/Resources/icon-full.ico" WindowStyle="ToolWindow" SizeToContent="WidthAndHeight">
     <Grid>
         <StackPanel Orientation="Vertical">
             <TabControl Margin="10">
@@ -15,28 +15,31 @@
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <emoji:TextBlock Text="📶 Connection"/>
+                                    <TextBlock>
+                                        <emoji:EmojiInline Text="📶"/>
+                                        <Run Text="{x:Static properties:Resources.Settings_Connection}"/>
+                                    </TextBlock>
                                 </StackPanel>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <StackPanel>
                                     <StackPanel>
-                                        <TextBlock Text="Host" TextWrapping="Wrap" Margin="5,0,0,0"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_Host}" TextWrapping="Wrap" Margin="5,0,0,0"/>
                                         <TextBox x:Name="MpdHost" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
                                     <StackPanel Margin="0,5,0,0">
-                                        <TextBlock Text="Port" TextWrapping="Wrap" Margin="5,0,0,0"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_Port}" TextWrapping="Wrap" Margin="5,0,0,0"/>
                                         <TextBox x:Name="MpdPort" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
-                                    <StackPanel Margin="0,5,0,0">
+                                    <!--<StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="Password" TextWrapping="Wrap" Margin="5,0,0,0"/>
                                         <TextBox x:Name="MpdPassword" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
-                                    </StackPanel>
+                                    </StackPanel>-->
 
-                                    <TextBlock x:Name="ConnectionStatus" Text="Not connected." TextWrapping="Wrap" Margin="5,10,0,0"/>
+                                    <TextBlock x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}" TextWrapping="Wrap" Margin="5,10,0,0"/>
-                                    <Button x:Name="ConnectButton" Content="Connect" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
+                                    <Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
                                 </StackPanel>
                             </Grid>
                         </GroupBox>
@@ -55,19 +58,19 @@
                                 <StackPanel>
                                     <StackPanel>
                                         <CheckBox x:Name="SnapcastStartup" Margin="5, 5, 0, 0">
-                                            <TextBlock Text="Launch at startup" TextWrapping="Wrap"/>
+                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastLauch}" TextWrapping="Wrap"/>
                                         </CheckBox>
                                         <CheckBox x:Name="SnapcastWindow" Margin="5,2.5,0,0">
-                                            <TextBlock Text="Show Snapcast window" TextWrapping="Wrap"/>
+                                            <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastWindow}" TextWrapping="Wrap"/>
                                         </CheckBox>
-                                        <TextBlock Text="Port" TextWrapping="Wrap" Margin="5,5,0,0"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPort}" TextWrapping="Wrap" Margin="5,5,0,0"/>
                                         <TextBox x:Name="SnapcastPort" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
-                                        <TextBlock Text="Executable path" TextWrapping="Wrap" Margin="5,5,0,0"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_SnapcastPath}" TextWrapping="Wrap" Margin="5,5,0,0"/>
                                         <TextBox x:Name="SnapcastPath" TextWrapping="Wrap" Width="250" Margin="10,2,5,0" HorizontalAlignment="Left"/>
                                         <TextBlock TextWrapping="Wrap" Margin="5,5,0,0" TextAlignment="Left" Width="250">
-                                            You can change to your own locally installed version of the Snapcast client with an <Run FontStyle="Italic" FontWeight="DemiBold">absolute</Run> path.
+                                            <Run Text="{x:Static properties:Resources.Settings_SnapcastInfo1}" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo2}" FontStyle="Italic" FontWeight="DemiBold" /><Run Text="{x:Static properties:Resources.Settings_SnapcastInfo3}" />
                                         </TextBlock>
-                                        <Button Content="Reset" Margin="0,10,0,0" Width="120" Click="SnapcastReset_Clicked"/>
+                                        <Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="SnapcastReset_Clicked"/>
                                     </StackPanel>
                                 </StackPanel>
                             </Grid>
@@ -75,21 +78,24 @@
                     </DockPanel>
                 </TabItem>
 
-                <TabItem Header="Shortcuts">
+                <TabItem Header="{x:Static properties:Resources.Settings_Shortcuts}">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
                                 <StackPanel Orientation="Horizontal">
-                                    <emoji:TextBlock Text="⌨️ Shortcuts"/>
+                                    <TextBlock>
+                                        <emoji:EmojiInline Text="⌨️ "/>
+                                        <Run Text="{x:Static properties:Resources.Settings_Shortcuts}"></Run>
+                                    </TextBlock>
                                 </StackPanel>
                             </GroupBox.Header>
                             <Grid>
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="Volume offset" TextWrapping="Wrap"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeOffset}" TextWrapping="Wrap"/>
                                         <TextBox x:Name="VolumeOffset" TextWrapping="Wrap" Width="25" PreviewTextInput="NumberValidationTextBox" Margin="8,2,0,0"/>
                                     </StackPanel>
-                                    <Grid MinWidth="220" Margin="0,5,0,0">
+                                    <Grid MinWidth="300" Margin="0,5,0,0">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
@@ -102,12 +108,12 @@
                                             <RowDefinition/>
                                             <RowDefinition/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Text="Next track" TextWrapping="Wrap" Grid.Column="0" Grid.Row="0" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_NextTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="0" Margin="1"/>
-                                        <TextBlock Text="Previous track" TextWrapping="Wrap" Grid.Column="0" Grid.Row="1" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_PreviousTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="1" Margin="1"/>
-                                        <TextBlock Text="Play / Pause" TextWrapping="Wrap" Grid.Column="0" Grid.Row="2" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_PlayPause}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="2" Margin="1"/>
-                                        <TextBlock Text="Volume up" TextWrapping="Wrap" Grid.Column="0" Grid.Row="3" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeUp}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="3" Margin="1"/>
-                                        <TextBlock Text="Volume down" TextWrapping="Wrap" Grid.Column="0" Grid.Row="4" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeDown}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="4" Margin="1"/>
-                                        <TextBlock Text="Show window" TextWrapping="Wrap" Grid.Column="0" Grid.Row="5" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShowWindow}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="5" Margin="1"/>
 
                                         <TextBlock Text="ctrl + media_next" TextWrapping="Wrap" Grid.Column="1" Grid.Row="0" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                         <TextBlock Text="ctrl + media_prev" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
@@ -122,7 +128,7 @@
                     </DockPanel>
                 </TabItem>
 
-                <TabItem Header="About" Height="20" VerticalAlignment="Bottom">
+                <TabItem Header="{x:Static properties:Resources.Settings_About}" Height="20" VerticalAlignment="Bottom">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
@@ -131,23 +137,23 @@
                             <Grid VerticalAlignment="Top">
                                 <StackPanel Orientation="Vertical">
                                     <TextBlock TextWrapping="Wrap" Margin="0,0,0,10" VerticalAlignment="Top">
-                                        <Run Text="Version:"/>
+                                        <Run Text="{x:Static properties:Resources.Settings_Version}"/>
                                         <Run Text="{Binding GetVersion, Mode = OneWay}"/>
                                     </TextBlock>
                                     <TextBlock TextWrapping="Wrap" VerticalAlignment="Top">
-                                        unison is free software. It is built with the following technologies:<LineBreak/>
+                                        <Run Text="{x:Static properties:Resources.Settings_AboutInfo}" /><LineBreak/>
-                                        ※ <Hyperlink NavigateUri="https://github.com/Difegue/Stylophone" RequestNavigate="Hyperlink_RequestNavigate">Stylophone</Hyperlink>'s updated MpcNET<LineBreak/>
+                                        ※ <Hyperlink NavigateUri="https://github.com/Difegue/Stylophone" RequestNavigate="Hyperlink_RequestNavigate">Stylophone</Hyperlink><Run Text="{x:Static properties:Resources.Settings_MpcNET}" /><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/hardcodet/wpf-notifyicon" RequestNavigate="Hyperlink_RequestNavigate">wpf-notifyicon</Hyperlink><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/samhocevar/emoji.wpf" RequestNavigate="Hyperlink_RequestNavigate">Emoji.WPF</Hyperlink>
                                     </TextBlock>
                                     <TextBlock Margin="0,10,0,0">
-                                        Source code freely available
+                                        <Run Text="{x:Static properties:Resources.Settings_SourceCode1}" />
                                         <Hyperlink NavigateUri="https://git.n700.ovh/keb/unison" RequestNavigate="Hyperlink_RequestNavigate">
-                                            here
+                                            <Run Text="{x:Static properties:Resources.Settings_SourceCode2}" />
                                         </Hyperlink>.
                                     </TextBlock>
                                     <TextBlock Margin="0,10,0,0">
-                                        Made by
+                                        <Run Text="{x:Static properties:Resources.Settings_MadeBy}" />
                                         <Hyperlink NavigateUri="https://marchal.dev" RequestNavigate="Hyperlink_RequestNavigate">
                                             Théo Marchal
                                         </Hyperlink>.
@@ -158,7 +164,10 @@
 
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0" Margin="0,10,0,0">
                             <GroupBox.Header>
-                                <emoji:TextBlock Text="📝 License"/>
+                                <TextBlock>
+                                    <emoji:EmojiInline Text="📝 "/>
+                                    <Run Text="{x:Static properties:Resources.Settings_License}" />
+                                </TextBlock>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <TextBlock Text="{Binding GetLicense, Mode = OneWay}" TextWrapping="Wrap" Width="500" TextAlignment="Justify" />

Views/Settings.xaml.cs

@@ -13,9 +13,6 @@ namespace unison
 {
     public partial class Settings : Window
     {
-        private string defaultSnapcastPath = "snapclient_0.25.0-1_win64";
-        private string defaultSnapcastPort = "1704";
-
         public static string GetVersion => Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
 
         public static string GetLicense
@@ -46,7 +43,7 @@ namespace unison
 
             MpdHost.Text = Properties.Settings.Default.mpd_host;
             MpdPort.Text = Properties.Settings.Default.mpd_port.ToString();
-            MpdPassword.Text = Properties.Settings.Default.mpd_password;
+            //MpdPassword.Text = Properties.Settings.Default.mpd_password;
             SnapcastStartup.IsChecked = Properties.Settings.Default.snapcast_startup;
             SnapcastWindow.IsChecked = Properties.Settings.Default.snapcast_window;
             SnapcastPath.Text = Properties.Settings.Default.snapcast_path;
@@ -71,31 +68,31 @@ namespace unison
         public void UpdateConnectionStatus()
         {
             MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            if (mpd._connected)
+            if (mpd.IsConnected())
-                ConnectionStatus.Text = "Connected to MPD " + mpd.GetVersion() + ".";
+                ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
             else
-                ConnectionStatus.Text = "Not connected.";
+                ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
         }
 
         private void MPDConnect_Clicked(object sender, RoutedEventArgs e)
         {
             SaveSettings();
-            ConnectionStatus.Text = "Connecting...";
+            ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusConnecting;
             MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
             mpd.Connect();
         }
 
         private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
         {
-            SnapcastPath.Text = defaultSnapcastPath;
+            SnapcastPath.Text = (string)Application.Current.FindResource("snapcastPath");
-            SnapcastPort.Text = defaultSnapcastPort;
+            SnapcastPort.Text = (string)Application.Current.FindResource("snapcastPort");
         }
 
         public void SaveSettings()
         {
             Properties.Settings.Default.mpd_host = MpdHost.Text;
             Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
-            Properties.Settings.Default.mpd_password = MpdPassword.Text;
+            //Properties.Settings.Default.mpd_password = MpdPassword.Text;
             Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
             Properties.Settings.Default.snapcast_window = (bool)SnapcastWindow.IsChecked;
             Properties.Settings.Default.snapcast_path = SnapcastPath.Text;

Views/Systray.xaml

@@ -2,24 +2,25 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:tb="http://www.hardcodet.net/taskbar"
                     xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
+                    xmlns:properties="clr-namespace:unison.Resources"
                     xmlns:local="clr-namespace:unison">
 
     <ContextMenu x:Shared="false" x:Key="SystrayMenu">
         <MenuItem IsEnabled="False">
             <MenuItem.Icon>
-                <Image Source="/images/icon-full.ico" Width="16" Height="16"/>
+                <Image Source="/Resources/icon-full.ico" Width="16" Height="16"/>
             </MenuItem.Icon>
             <MenuItem.Header>
                 <TextBlock Text="{Binding GetAppText}" />
             </MenuItem.Header>
         </MenuItem>
         <Separator />
-        <MenuItem Header="Show window" Command="{Binding ShowWindowCommand}">
+        <MenuItem Header="{x:Static properties:Resources.ShowWindow}" Command="{Binding ShowWindowCommand}">
             <MenuItem.Icon>
                 <Image Width="16" Height="16" emoji:Image.Source="▶️" />
             </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Name="test_snapcast_item" Header="{Binding SnapcastText}" Command="{Binding Snapcast}">
+        <MenuItem Header="{Binding SnapcastText}" Command="{Binding Snapcast}">
             <MenuItem.Icon>
                 <Image Width="16" Height="16" emoji:Image.Source="🔊" />
             </MenuItem.Icon>
@@ -29,20 +30,20 @@
                 <Image Width="16" Height="16" emoji:Image.Source="🔀" />
             </MenuItem.Icon>
         </MenuItem>-->
-        <MenuItem Header="Settings" Command="{Binding Settings}">
+        <MenuItem Header="{x:Static properties:Resources.Settings}" Command="{Binding Settings}">
             <MenuItem.Icon>
                 <Image Width="16" Height="16" emoji:Image.Source="🛠️" />
             </MenuItem.Icon>
         </MenuItem>
         <Separator />
-        <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}">
+        <MenuItem Header="{x:Static properties:Resources.Exit}" Command="{Binding ExitApplicationCommand}">
             <MenuItem.Icon>
                 <Image Width="16" Height="16" emoji:Image.Source="❌" />
             </MenuItem.Icon>
         </MenuItem>
     </ContextMenu>
 
-    <tb:TaskbarIcon x:Key="SystrayTaskbar" IconSource="/images/icon-mini.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" ContextMenu="{StaticResource SystrayMenu}">
+    <tb:TaskbarIcon x:Key="SystrayTaskbar" IconSource="/Resources/icon-mini.ico" ToolTipText="{Binding GetAppText}" DoubleClickCommand="{Binding ShowWindowCommand}" ContextMenu="{StaticResource SystrayMenu}">
         <tb:TaskbarIcon.DataContext>
             <local:SystrayViewModel />
         </tb:TaskbarIcon.DataContext>

Views/SystrayViewModel.cs

@@ -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 = () =>
+            CommandAction = () => Application.Current.Shutdown(),
-            {
-                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 ? unison.Resources.Resources.StopSnapcast : unison.Resources.Resources.StartSnapcast;
             }
         }
 
@@ -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 = () =>
+                    CommandAction = () => ((MainWindow)Application.Current.MainWindow).Settings_Clicked(null, null),
-                    {
-                        ((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));

unison.csproj

@@ -4,10 +4,10 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>images\icon-full.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
     <Win32Resource></Win32Resource>
     <StartupObject>unison.App</StartupObject>
-    <Version>0.0.1</Version>
+    <Version>1.0</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -18,9 +18,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="images\icon-full.ico" />
+    <None Remove="Resources\icon-full.ico" />
-    <None Remove="images\icon-mini.ico" />
+    <None Remove="Resources\icon-mini.ico" />
-    <None Remove="images\nocover.png" />
+    <None Remove="Resources\nocover.png" />
     <None Remove="LICENSE" />
     <None Remove="snapclient_0.25.0-1_win64\FLAC.dll" />
     <None Remove="snapclient_0.25.0-1_win64\ogg.dll" />
@@ -36,13 +36,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="images\icon-full.ico">
+    <Resource Include="Resources\icon-full.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="images\icon-mini.ico">
+    <Resource Include="Resources\icon-mini.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="images\nocover.png">
+    <Resource Include="Resources\nocover.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
     <Content Include="LICENSE">
@@ -86,6 +86,21 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Update="Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.fr-FR.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>