Merge pull request #169 from Wires77/Issue-#162

Adding thumbs and down icons to the Notify Menu

Author: Wires77

Elpis/Elpis.csproj

@@ -433,6 +433,12 @@
   <ItemGroup>
     <None Include="Resources\thumbUp.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Images\thumbs-down.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Images\thumbs-up.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>"$(ProjectDir)Resources\InsertIcons.exe" "$(TargetPath)" "$(ProjectDir)Resources\icon-list.txt"</PostBuildEvent>

Elpis/Images/thumbs-down.png

@@ -577,6 +577,22 @@ private void LoadNotifyMenu()
                 _notifyMenu_Album.Tag = _player.CurrentSong.AlbumDetailUrl;
 
                 _notifyMenu_PlayPause.Text = _player.Playing ? "Pause" : "Play";
+                if (_player.CurrentSong.Banned)
+                {
+                    _notifyMenu_DownVote.Image = Properties.Resources.thumbs_down;
+                }
+                else
+                {
+                    _notifyMenu_DownVote.Image = null;
+                }
+                if (_player.CurrentSong.Loved)
+                {
+                    _notifyMenu_UpVote.Image = Properties.Resources.thumbs_up;
+                }
+                else
+                {
+                    _notifyMenu_UpVote.Image = null;
+                }
             }
 
             _notifyMenu_BreakStation.Visible =
@@ -611,13 +627,13 @@ private void SetupNotifyIcon()
             _notifyMenu_Stations = new ToolStripMenuItem("Stations");
 
             _notifyMenu_DownVote = new ToolStripMenuItem("Dislike Song");
-            _notifyMenu_DownVote.Click += ((o, e) => _playlistPage.ThumbDownCurrent() );
+            _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_UpVote.Click += ((o, e) => _playlistPage.ThumbUpCurrent() );               
 
             _notifyMenu_Exit = new ToolStripMenuItem("Exit Elpis");
             _notifyMenu_Exit.Click += ((o, e) => { _forceClose = true; Close(); });

Elpis/Images/thumbs-up.png

@@ -130,6 +130,12 @@
   <data name="skip_song" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\skip-song.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="thumbs_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\thumbs-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="thumbs_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\thumbs-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="thumb_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\thumb-down.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>