Windows: More work on Sync and SyncMenu implementations.

Related to issue #422.
ycastonguay · Aug 14, 2013 · a852c06 · a852c06
1 parent fb38038
commit a852c06
Show file tree

Hide file tree

Showing 9 changed files with 941 additions and 240 deletions.
diff --git a/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs b/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs
@@ -270,7 +270,7 @@ private void SelectItem(SyncMenuItemEntity item)
             }
         }
 
-        private void ExpandItem(SyncMenuItemEntity item)
+        private void ExpandItem(SyncMenuItemEntity item, object userData)
         {
             try
             {
@@ -285,7 +285,7 @@ private void ExpandItem(SyncMenuItemEntity item)
                             if(index == -1 || lastIndex == -1)
                                 return;
 
-                            View.RemoveItems(index, lastIndex - index + 1);
+                            View.RemoveItems(index, lastIndex - index + 1, userData);
                         }
                         else
                         {
@@ -307,7 +307,7 @@ private void ExpandItem(SyncMenuItemEntity item)
                             }
 
                             _items.InsertRange(index, items);
-                            View.InsertItems(index + 1, items);
+                            View.InsertItems(index + 1, items, userData);
                         }
                         break;
                     case SyncMenuItemEntityType.Album:
@@ -318,7 +318,7 @@ private void ExpandItem(SyncMenuItemEntity item)
                             if(index == -1 || lastIndex == -1)
                                 return;
 
-                            View.RemoveItems(index, lastIndex - index + 1);
+                            View.RemoveItems(index, lastIndex - index + 1, userData);
                         }
                         else
                         {
@@ -339,7 +339,7 @@ private void ExpandItem(SyncMenuItemEntity item)
                                     Selection = (selectionCount == 0) ? StateSelectionType.None : StateSelectionType.Selected
                                 });
                             }
-                            View.InsertItems(index + 1, items);
+                            View.InsertItems(index + 1, items, userData);
                         }
                         break;
                     case SyncMenuItemEntityType.Song:

diff --git a/MPfm/MPfm.MVP/Views/ISyncMenuView.cs b/MPfm/MPfm.MVP/Views/ISyncMenuView.cs
@@ -28,7 +28,7 @@ namespace MPfm.MVP.Views
 	/// </summary>
 	public interface ISyncMenuView : IBaseView
 	{
-        Action<SyncMenuItemEntity> OnExpandItem { get; set; }
+        Action<SyncMenuItemEntity, object> OnExpandItem { get; set; }
         Action<SyncMenuItemEntity> OnSelectItem { get; set; }
         Action OnSync { get; set; }
         Action OnSelectButtonClick { get; set; }
@@ -40,7 +40,7 @@ public interface ISyncMenuView : IBaseView
         void RefreshSelectButton(string text);
         void RefreshItems(List<SyncMenuItemEntity> items);
         void RefreshSyncTotal(string title, string subtitle, bool enoughFreeSpace);
-        void InsertItems(int index, List<SyncMenuItemEntity> items);
-        void RemoveItems(int index, int count);
+        void InsertItems(int index, List<SyncMenuItemEntity> items, object userData);
+        void RemoveItems(int index, int count, object userData);
 	}
 }
diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSplash.cs b/MPfm/MPfm.Windows/Classes/Forms/frmSplash.cs
@@ -311,14 +311,24 @@ public void ShowView(bool shown)
 
         public void RefreshStatus(string message)
         {
-            BeginInvoke((MethodInvoker)(delegate {
+            MethodInvoker methodUIUpdate = delegate {
                 lblStatus.Text = message;
-            }));
+            };
+
+            if (InvokeRequired)
+                BeginInvoke(methodUIUpdate);
+            else
+                methodUIUpdate.Invoke();
         }
 
         void ISplashView.InitDone(bool isAppFirstStart)
         {
-            BeginInvoke((MethodInvoker) Close);
+            MethodInvoker methodUIUpdate = Close;
+
+            if (InvokeRequired)
+                BeginInvoke(methodUIUpdate);
+            else
+                methodUIUpdate.Invoke();
         }
 
         #endregion

diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSync.Designer.cs b/MPfm/MPfm.Windows/Classes/Forms/frmSync.Designer.cs
diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs b/MPfm/MPfm.Windows/Classes/Forms/frmSync.cs
@@ -43,6 +43,7 @@ private void btnConnect_Click(object sender, EventArgs e)
             if (listView.SelectedItems.Count == 0)
                 return;
 
+            OnCancelDiscovery();
             OnConnectDevice((SyncDevice) listView.SelectedItems[0].Tag);
         }
 

diff --git a/MPfm/MPfm.Windows/Classes/Forms/frmSync.resx b/MPfm/MPfm.Windows/Classes/Forms/frmSync.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0
-        BwAAAk1TRnQBSQFMAwEBAAEYAQABGAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        BwAAAk1TRnQBSQFMAwEBAAEoAQABKAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
         AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm