GTK: Updated project with new TinyIoC assembly.

Related to issue #405.
ycastonguay · Sep 1, 2013 · 6ddfe8d · 6ddfe8d
1 parent 6924498
commit 6ddfe8d
Show file tree

Hide file tree

Showing 5 changed files with 298 additions and 455 deletions.
diff --git a/MPfm/MPfm.GTK/Windows/MainWindow.cs b/MPfm/MPfm.GTK/Windows/MainWindow.cs
@@ -339,7 +339,7 @@ private void SetFontProperties()
 			string textFontName = "Sans 8";
 			string largePositionFontName = "Mono Bold 11";
 
-			btnPitchShiftingMore.ModifyFont(FontDescription.FromString(buttonFontName));
+			//btnPitchShiftingMore.ModifyFont(FontDescription.FromString(buttonFontName));
 			btnTimeShiftingMore.ModifyFont(FontDescription.FromString(buttonFontName));
 
 			lblArtistName.ModifyFont(FontDescription.FromString(defaultFontName +" 16"));
@@ -366,12 +366,12 @@ private void SetFontProperties()
 			lblTimeShifting.ModifyFont(FontDescription.FromString(subtitleFontName));
 			lblTimeShiftingReset.ModifyFont(FontDescription.FromString(textFontName));
 			lblTimeShiftingValue.ModifyFont(FontDescription.FromString(textFontName));
-			lblOriginalTempo.ModifyFont(FontDescription.FromString(textFontName));
-			lblOriginalTempoBPM.ModifyFont(FontDescription.FromString(textFontName));
+			//lblOriginalTempo.ModifyFont(FontDescription.FromString(textFontName));
+			//lblOriginalTempoBPM.ModifyFont(FontDescription.FromString(textFontName));
 			btnDetectTempo.ModifyFont(FontDescription.FromString(textFontName));			
 
 			lblPitchShifting.ModifyFont(FontDescription.FromString(subtitleFontName));
-			lblPitchShiftingReset.ModifyFont(FontDescription.FromString(textFontName));
+			//lblPitchShiftingReset.ModifyFont(FontDescription.FromString(textFontName));
 			lblPitchShiftingValue.ModifyFont(FontDescription.FromString(textFontName));
 
 			lblInformation.ModifyFont(FontDescription.FromString(subtitleFontName));
@@ -694,6 +694,11 @@ private static Gdk.Pixbuf ImageToPixbuf(System.Drawing.Image image)
 			}
 		}
 
+        protected void btnTest_Click(object sender, EventArgs e)
+        {
+            //vboxPitchShifting.Visible = false;
+        }
+
         #region IMainView implementation
 
         public System.Action OnOpenPreferencesWindow { get; set; }
@@ -720,6 +725,10 @@ private static Gdk.Pixbuf ImageToPixbuf(System.Drawing.Image image)
         public System.Action<float> OnPlayerSetVolume { get; set; }
         public System.Action<float> OnPlayerSetPosition { get; set; }
         public Func<float, PlayerPositionEntity> OnPlayerRequestPosition { get; set; }
+        public System.Action OnEditSongMetadata { get; set; }
+        public System.Action OnPlayerShuffle { get; set; }
+        public System.Action OnPlayerRepeat { get; set; }
+        public System.Action OnOpenPlaylist { get; set; }
 
 		public void RefreshPlayerStatus(PlayerStatusType status)
         {
@@ -949,6 +958,8 @@ public void RefreshLibraryBrowserNode(LibraryBrowserEntity entity, IEnumerable<L
 		#region ISongBrowserView implementation
 
         public System.Action<AudioFile> OnTableRowDoubleClicked { get; set; }
+        public Action<AudioFile> OnSongBrowserEditSongMetadata { get; set; }
+        public Action<string> OnSearchTerms { get; set; }
 
 		/// <summary>
 		/// Refreshes the song browser.
@@ -983,6 +994,7 @@ public void RefreshSongBrowser(IEnumerable<AudioFile> audioFiles)
         public Action<MarkerTemplateNameType> OnAddMarker { get; set; }
         public Action<Marker> OnEditMarker { get; set; }
         public Action<Marker> OnSelectMarker { get; set; }
+        public Action<Marker> OnDeleteMarker { get; set; }
 
         public void MarkerError(Exception ex)
         {
@@ -1081,7 +1093,7 @@ public void RefreshPitchShifting(PlayerPitchShiftingEntity entity)
         {
         }
 
-        #endregion
+        #endregion        
 
 	}
 }
diff --git a/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs b/MPfm/MPfm.GTK/Windows/PlaylistWindow.cs
@@ -20,6 +20,7 @@
 using MPfm.MVP.Views;
 using MPfm.Sound.AudioFiles;
 using MPfm.Sound.Playlists;
+using System.Collections.Generic;
 
 namespace MPfm.GTK.Windows
 {
@@ -58,7 +59,7 @@ protected void OnActionSavePlaylistAsActivated(object sender, System.EventArgs e
 
         public Action<Guid, int> OnChangePlaylistItemOrder { get; set; }
         public Action<Guid> OnSelectPlaylistItem { get; set; }
-        public Action<Guid> OnRemovePlaylistItem { get; set; }
+        public Action<List<Guid>> OnRemovePlaylistItems { get; set; }
         public Action OnNewPlaylist { get; set; }
         public Action<string> OnLoadPlaylist { get; set; }
         public Action OnSavePlaylist { get; set; }

diff --git a/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs b/MPfm/MPfm.GTK/Windows/UpdateLibraryWindow.cs
@@ -75,6 +75,7 @@ protected void OnActionSaveLogActivated(object sender, System.EventArgs e)
 
         public System.Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
         public System.Action OnCancelUpdateLibrary { get; set; }
+        public System.Action<string> OnSaveLog { get; set; }
 
 		public void RefreshStatus(UpdateLibraryEntity entity)
 		{