Added the actioon to ignore the current playing song for a month (a.k…

….a. "Tired of this song") from system tray right-click menu.
adammhaile · Jun 6, 2015 · 08876f1 · 08876f1
1 parent f755a9f
commit 08876f1
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 35 deletions.
diff --git a/BetaChangeLog.txt b/BetaChangeLog.txt
@@ -1,3 +1,6 @@
+v1.4.12
+Added the actioon to ignore the current playing song for a month (a.k.a. "Tired of this song") from system tray right-click menu.
+
 v1.4.11
 Added http api command "toggleplaypause".
 

diff --git a/Elpis/MainWindow.xaml.cs b/Elpis/MainWindow.xaml.cs
@@ -87,6 +87,7 @@ public partial class MainWindow : Window
         private ToolStripMenuItem _notifyMenu_Title;
         private ToolStripMenuItem _notifyMenu_UpVote;
         private ToolStripMenuItem _notifyMenu_DownVote;
+        private ToolStripMenuItem _notifyMenu_Tired;
         private ToolStripMenuItem _notifyMenu_Exit;
         public static Player _player;
         public static PlaylistPage _playlistPage;
@@ -562,6 +563,7 @@ private void LoadNotifyMenu()
                 _notifyMenu_BreakSong.Visible = 
                 _notifyMenu_DownVote.Visible =
                 _notifyMenu_UpVote.Visible =
+                _notifyMenu_Tired.Visible = 
                 _notifyMenu_BreakVote.Visible = showSongInfo;
 
             _notifyMenu_PlayPause.Enabled =
@@ -615,10 +617,12 @@ private void SetupNotifyIcon()
             _notifyMenu_DownVote = new ToolStripMenuItem("Dislike Song");
             _notifyMenu_DownVote.Click += ((o, e) => _playlistPage.ThumbDownCurrent() );
 
+            _notifyMenu_Tired = new ToolStripMenuItem("Tired of This Song");
+            _notifyMenu_Tired.Click += ((o, e) => _playlistPage.TiredOfCurrentSongFromSystemTray());
+
             _notifyMenu_UpVote = new ToolStripMenuItem("Like Song");
             _notifyMenu_UpVote.Click += ((o, e) => _playlistPage.ThumbUpCurrent() );
-
-
+
             _notifyMenu_Exit = new ToolStripMenuItem("Exit Elpis");
             _notifyMenu_Exit.Click += ((o, e) => { _forceClose = true; Close(); });
 
@@ -633,6 +637,7 @@ private void SetupNotifyIcon()
                                 _notifyMenu_BreakVote,
                                 _notifyMenu_UpVote,
                                 _notifyMenu_DownVote,
+                                _notifyMenu_Tired,
                                 _notifyMenu_BreakStation,
                                 _notifyMenu_Stations,
                                 _notifyMenu_BreakExit,

diff --git a/Elpis/Pages/PlaylistPage.xaml.cs b/Elpis/Pages/PlaylistPage.xaml.cs
@@ -377,6 +377,12 @@ private void mnuTired_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        public void TiredOfCurrentSongFromSystemTray()
+        {
+            _player.SongTired(_player.CurrentSong);
+            _player.Next();
+        }
+
         private void mnuBookArtist_Click(object sender, RoutedEventArgs e)
         {
             if (_currMenuSong != null)

diff --git a/Elpis/Properties/AssemblyInfo.cs b/Elpis/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.4.11")]
+[assembly: AssemblyVersion("1.4.12")]
 //[assembly: AssemblyFileVersion("0.0.0.0")]