From f5648552b96f7de2e53db9d0bdc9b8427dfa08f3 Mon Sep 17 00:00:00 2001 From: ycastonguay Date: Tue, 13 Aug 2013 01:22:03 -0400 Subject: [PATCH] Mac: Fixed visible centering/sizing before windows were visible. Started implementing SyncMenu view. Related to issue #381. --- MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs | 17 +- .../Controllers/SyncMenuWindowController.cs | 150 +- .../Controllers/SyncWindowController.cs | 7 +- .../Windows/SyncMenuWindow.designer.cs | 121 +- MPfm/MPfm.Mac/Windows/XIB/EditLoopWindow.xib | 6 +- .../MPfm.Mac/Windows/XIB/EditMarkerWindow.xib | 6 +- MPfm/MPfm.Mac/Windows/XIB/EffectsWindow.xib | 8 +- MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib | 43 +- .../Windows/XIB/PreferencesWindow.xib | 8 +- MPfm/MPfm.Mac/Windows/XIB/SplashWindow.xib | 17 +- .../Windows/XIB/SyncDownloadWindow.xib | 2 +- MPfm/MPfm.Mac/Windows/XIB/SyncMenuWindow.xib | 1351 ++++++++++------- MPfm/MPfm.Mac/Windows/XIB/SyncWindow.xib | 8 +- .../Windows/XIB/UpdateLibraryWindow.xib | 6 +- 14 files changed, 1077 insertions(+), 673 deletions(-) diff --git a/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs b/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs index 298f1076..fef901a0 100644 --- a/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs +++ b/MPfm/MPfm.MVP/Presenters/SyncMenuPresenter.cs @@ -27,6 +27,7 @@ using MPfm.MVP.Models; using MPfm.Library; using MPfm.MVP.Navigation; +using MPfm.MVP.Bootstrap; namespace MPfm.MVP.Presenters { @@ -35,7 +36,8 @@ namespace MPfm.MVP.Presenters /// public class SyncMenuPresenter : BasePresenter, ISyncMenuPresenter { - readonly MobileNavigationManager _navigationManager; + readonly MobileNavigationManager _mobileNavigationManager; + readonly NavigationManager _navigationManager; readonly ISyncClientService _syncClientService; readonly ISyncDeviceSpecifications _syncDeviceSpecifications; @@ -43,13 +45,18 @@ public class SyncMenuPresenter : BasePresenter, ISyncMenuPresente List _items = new List(); List _audioFilesToSync = new List(); - public SyncMenuPresenter(MobileNavigationManager navigationManager, ISyncClientService syncClientService, ISyncDeviceSpecifications syncDeviceSpecifications) + public SyncMenuPresenter(ISyncClientService syncClientService, ISyncDeviceSpecifications syncDeviceSpecifications) { - _navigationManager = navigationManager; _syncClientService = syncClientService; _syncDeviceSpecifications = syncDeviceSpecifications; _syncClientService.OnDownloadIndexProgress += HandleOnDownloadIndexProgress; _syncClientService.OnReceivedIndex += HandleOnReceivedIndex; + +#if IOS || ANDROID + _mobileNavigationManager = Bootstrapper.GetContainer().Resolve(); +#else + _navigationManager = Bootstrapper.GetContainer().Resolve(); +#endif } public override void BindView(ISyncMenuView view) @@ -151,7 +158,11 @@ private void Sync() return; } +#if IOS || ANDROID + _mobileNavigationManager.CreateSyncDownloadView(_device, _audioFilesToSync); +#else _navigationManager.CreateSyncDownloadView(_device, _audioFilesToSync); +#endif } catch(Exception ex) { diff --git a/MPfm/MPfm.Mac/Windows/Controllers/SyncMenuWindowController.cs b/MPfm/MPfm.Mac/Windows/Controllers/SyncMenuWindowController.cs index 6a92ee7d..7624f504 100644 --- a/MPfm/MPfm.Mac/Windows/Controllers/SyncMenuWindowController.cs +++ b/MPfm/MPfm.Mac/Windows/Controllers/SyncMenuWindowController.cs @@ -20,46 +20,141 @@ using MPfm.MVP.Views; using MPfm.Library.Objects; using MPfm.MVP.Models; +using System.Text; +using MPfm.Core; +using MPfm.Mac.Classes.Helpers; +using MonoMac.Foundation; +using MonoMac.AppKit; +using MPfm.Mac.Classes.Objects; +using System.Linq; namespace MPfm.Mac { public partial class SyncMenuWindowController : BaseWindowController, ISyncMenuView { - #region Constructors + List _items; - // Called when created from unmanaged code public SyncMenuWindowController(IntPtr handle) : base (handle) { Initialize(); } - // Call to load from the XIB/NIB file public SyncMenuWindowController(Action onViewReady) : base ("SyncMenuWindow", onViewReady) { Initialize(); } - // Shared initialization code void Initialize() { + this.Window.Center(); + this.Window.MakeKeyAndOrderFront(this); } - #endregion + public override void AwakeFromNib() + { + base.AwakeFromNib(); + + viewTable.Hidden = true; + } + + public override void WindowDidLoad() + { + base.WindowDidLoad(); + + outlineView.WeakDelegate = this; + outlineView.WeakDataSource = this; + + OnViewReady.Invoke(this); + } + + [Export ("numberOfRowsInTableView:")] + public int GetRowCount(NSTableView tableView) + { + return _items.Count; + } + + [Export ("tableView:heightOfRow:")] + public float GetRowHeight(NSTableView tableView, int row) + { + return 20; + } + + [Export ("tableView:dataCellForTableColumn:row:")] + public NSObject GetObjectValue(NSTableView tableView, NSTableColumn tableColumn, int row) + { + return new NSString(); + } - //strongly typed window accessor - public new SyncMenuWindow Window +// [Export ("tableView:viewForTableColumn:row:")] +// public NSView GetViewForItem(NSTableView tableView, NSTableColumn tableColumn, int row) + + [Export("outlineView:viewForTableColumn:item:")] + public NSView GetViewForItem(NSOutlineView outlineView, NSTableColumn tableColumn, NSObject item) { - get + //Console.WriteLine("GetViewForItem - tableColumn: {0} row: {1}", tableColumn.Identifier.ToString(), row); + NSTableCellView view; + if(tableColumn.Identifier.ToString() == "columnTitle") { - return (SyncMenuWindow)base.Window; + view = (NSTableCellView)outlineView.MakeView("cellTitle", this); + //view.TextField.StringValue = _items[row].ArtistName; } + else + { + view = (NSTableCellView)outlineView.MakeView("cellSelection", this); + //view.TextField.StringValue = _items[row].Url; + } +// //view.TextField.Font = NSFont.FromFontName("Junction", 11); +// +// if (view.ImageView != null) +// { +// string iconName = string.Empty; +// switch (_items[row].ItemType) +// { +// case SyncMenuItemEntityType.Artist: +// iconName = "16_icomoon_android"; +// break; +// case SyncMenuItemEntityType.Album: +// iconName = "16_icomoon_android"; +// break; +// case SyncMenuItemEntityType.Song: +// iconName = "16_icomoon_android"; +// break; +// } +// view.ImageView.Image = ImageResources.images16x16.FirstOrDefault(x => x.Name == iconName); +// } + return view; } - public override void AwakeFromNib() + [Export ("tableViewSelectionDidChange:")] + public void SelectionDidChange(NSNotification notification) + { + //btnConnect.Enabled = (tableViewDevices.SelectedRow == -1) ? false : true; + } + + [Export ("outlineView:numberOfChildrenOfItem:")] + public int GetChildrenCount(NSOutlineView outlineView, NSObject item) { - base.AwakeFromNib(); + return 0; + } + + [Export ("outlineView:objectValueForTableColumn:byItem:")] + public NSObject GetObjectValue(NSOutlineView outlineView, NSTableColumn forTableColumn, NSObject byItem) + { + return new NSObject(); + } + + [Export ("outlineView:child:ofItem:")] + public NSObject GetChild(NSOutlineView outlineView, int childIndex, NSObject ofItem) + { + return new NSObject(); + } + + [Export ("outlineView:isItemExpandable:")] + public bool ItemExpandable(NSOutlineView outlineView, NSObject item) + { + return false; } #region ISyncMenuView implementation @@ -71,33 +166,62 @@ public override void AwakeFromNib() public void SyncMenuError(Exception ex) { + InvokeOnMainThread(delegate { + string message = string.Format("An error occured in SyncMenu: {0}", ex); + Tracing.Log(message); + CocoaHelper.ShowCriticalAlert(message); + }); } public void SyncEmptyError(Exception ex) { + InvokeOnMainThread(delegate { + CocoaHelper.ShowCriticalAlert(ex.Message); + }); } public void RefreshDevice(SyncDevice device) { + InvokeOnMainThread(delegate { + lblTitle.StringValue = "Sync library with " + device.Name; + Window.Title = "Sync library with " + device.Name; + }); } public void RefreshLoading(bool isLoading, int progressPercentage) { + InvokeOnMainThread(delegate { + viewLoading.Hidden = !isLoading; + viewTable.Hidden = isLoading; + + if(!isLoading) + Console.WriteLine("VIEW TABLE NOT HIDDEN ANYMORE"); + + if(progressPercentage < 100) + lblLoading.StringValue = String.Format("Loading index ({0}%)...", progressPercentage); + else + lblLoading.StringValue = "Processing index..."; + }); } public void RefreshSelectButton(string text) { } - public void RefreshItems(List items) + public void RefreshItems(List items) { + Console.WriteLine("REFRESITEMS"); + InvokeOnMainThread(delegate { + _items = items.ToList(); + outlineView.ReloadData(); + }); } public void RefreshSyncTotal(string title, string subtitle, bool enoughFreeSpace) { } - public void InsertItems(int index, List items) + public void InsertItems(int index, List items) { } diff --git a/MPfm/MPfm.Mac/Windows/Controllers/SyncWindowController.cs b/MPfm/MPfm.Mac/Windows/Controllers/SyncWindowController.cs index 4d182379..c290e061 100644 --- a/MPfm/MPfm.Mac/Windows/Controllers/SyncWindowController.cs +++ b/MPfm/MPfm.Mac/Windows/Controllers/SyncWindowController.cs @@ -158,9 +158,12 @@ public void SelectionDidChange(NSNotification notification) public void SyncError(Exception ex) { - InvokeOnMainThread(() => { - CocoaHelper.ShowCriticalAlert(ex.Message + "\n" + ex.StackTrace); + InvokeOnMainThread(delegate { + string message = string.Format("An error occured in Sync: {0}", ex); + Tracing.Log(message); + CocoaHelper.ShowCriticalAlert(message); }); + } public void RefreshIPAddress(string address) diff --git a/MPfm/MPfm.Mac/Windows/SyncMenuWindow.designer.cs b/MPfm/MPfm.Mac/Windows/SyncMenuWindow.designer.cs index b7362bb3..8119ad49 100644 --- a/MPfm/MPfm.Mac/Windows/SyncMenuWindow.designer.cs +++ b/MPfm/MPfm.Mac/Windows/SyncMenuWindow.designer.cs @@ -1,15 +1,114 @@ +// WARNING +// +// This file has been generated automatically by Xamarin Studio to store outlets and +// actions made in the Xcode designer. If it is removed, they will be lost. +// Manual changes to this file may not be handled correctly. +// +using MonoMac.Foundation; namespace MPfm.Mac { - // Should subclass MonoMac.AppKit.NSWindow - [MonoMac.Foundation.Register("SyncMenuWindow")] - public partial class SyncMenuWindow - { - } - // Should subclass MonoMac.AppKit.NSWindowController - [MonoMac.Foundation.Register("SyncMenuWindowController")] - public partial class SyncMenuWindowController - { - } -} + [Register ("SyncMenuWindowController")] + partial class SyncMenuWindowController + { + [Outlet] + MonoMac.AppKit.NSView viewLoading { get; set; } + + [Outlet] + MonoMac.AppKit.NSView viewTable { get; set; } + + [Outlet] + MonoMac.AppKit.NSProgressIndicator progressIndicator { get; set; } + + [Outlet] + MPfm.Mac.Classes.Controls.MPfmButton btnSync { get; set; } + + [Outlet] + MPfm.Mac.Classes.Controls.MPfmButton btnSelectAll { get; set; } + + [Outlet] + MonoMac.AppKit.NSTextField lblTotal { get; set; } + + [Outlet] + MonoMac.AppKit.NSTextField lblFreeSpace { get; set; } + + [Outlet] + MonoMac.AppKit.NSOutlineView outlineView { get; set; } + + [Outlet] + MonoMac.AppKit.NSTextField lblSubtitle { get; set; } + + [Outlet] + MonoMac.AppKit.NSTextField lblTitle { get; set; } + + [Outlet] + MonoMac.AppKit.NSTextField lblLoading { get; set; } + + void ReleaseDesignerOutlets () + { + if (viewLoading != null) { + viewLoading.Dispose (); + viewLoading = null; + } + if (viewTable != null) { + viewTable.Dispose (); + viewTable = null; + } + + if (progressIndicator != null) { + progressIndicator.Dispose (); + progressIndicator = null; + } + + if (btnSync != null) { + btnSync.Dispose (); + btnSync = null; + } + + if (btnSelectAll != null) { + btnSelectAll.Dispose (); + btnSelectAll = null; + } + + if (lblTotal != null) { + lblTotal.Dispose (); + lblTotal = null; + } + + if (lblFreeSpace != null) { + lblFreeSpace.Dispose (); + lblFreeSpace = null; + } + + if (outlineView != null) { + outlineView.Dispose (); + outlineView = null; + } + + if (lblSubtitle != null) { + lblSubtitle.Dispose (); + lblSubtitle = null; + } + + if (lblTitle != null) { + lblTitle.Dispose (); + lblTitle = null; + } + + if (lblLoading != null) { + lblLoading.Dispose (); + lblLoading = null; + } + } + } + + [Register ("SyncMenuWindow")] + partial class SyncMenuWindow + { + + void ReleaseDesignerOutlets () + { + } + } +} diff --git a/MPfm/MPfm.Mac/Windows/XIB/EditLoopWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/EditLoopWindow.xib index 00808b8f..61333b24 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/EditLoopWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/EditLoopWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -132,7 +132,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MPfm/MPfm.Mac/Windows/XIB/EditMarkerWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/EditMarkerWindow.xib index 315d85d0..9a1bdf0b 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/EditMarkerWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/EditMarkerWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -132,7 +132,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MPfm/MPfm.Mac/Windows/XIB/EffectsWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/EffectsWindow.xib index fb8e49d4..8bdce2a7 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/EffectsWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/EffectsWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -1754,7 +1754,7 @@ {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} - YES + NO @@ -3896,7 +3896,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib index cc1d1ebb..c71882af 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/MainWindow.xib @@ -403,7 +403,7 @@ - + YES @@ -2002,7 +2002,7 @@ {402, 152} - + _NS:13 YES NO @@ -2257,7 +2257,7 @@ {{0, -5}, {402, 169}} - + _NS:9 133680 @@ -2440,7 +2440,7 @@ {377, 150} - + _NS:13 YES NO @@ -2631,7 +2631,7 @@ {{0, -3}, {377, 167}} - + _NS:9 133680 @@ -2703,7 +2703,7 @@ {256, 143} - + _NS:13 YES NO @@ -2834,7 +2834,7 @@ {256, 160} - + _NS:9 133680 @@ -2879,7 +2879,7 @@ {523, 143} - + _NS:13 YES NO @@ -3128,7 +3128,6 @@ {{1, 161}, {422, 15}} - _NS:60 NO 1 @@ -3157,7 +3156,7 @@ {523, 160} - + _NS:9 133680 @@ -7267,7 +7266,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin MPfmCell @@ -7729,7 +7728,6 @@ actionOpenPlaylistWindow: actionOpenPreferencesWindow: actionOpenSyncWindow: - actionPause: actionPlay: actionPlayLoop: actionPlaySelectedSong: @@ -7739,7 +7737,6 @@ actionRepeatType: actionShuffle: actionSoundFormatChanged: - actionStop: actionStopLoop: actionUpdateLibrary: @@ -7775,8 +7772,6 @@ id id id - id - id @@ -7802,7 +7797,6 @@ actionOpenPlaylistWindow: actionOpenPreferencesWindow: actionOpenSyncWindow: - actionPause: actionPlay: actionPlayLoop: actionPlaySelectedSong: @@ -7812,7 +7806,6 @@ actionRepeatType: actionShuffle: actionSoundFormatChanged: - actionStop: actionStopLoop: actionUpdateLibrary: @@ -7894,10 +7887,6 @@ actionOpenSyncWindow: id - - actionPause: - id - actionPlay: id @@ -7934,10 +7923,6 @@ actionSoundFormatChanged: id - - actionStop: - id - actionStopLoop: id @@ -8489,14 +8474,6 @@ ./Classes/MainWindowController.h - - NSTableRowView - NSView - - IBProjectSource - ./Classes/NSTableRowView.h - - 0 diff --git a/MPfm/MPfm.Mac/Windows/XIB/PreferencesWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/PreferencesWindow.xib index 82acf8c0..b02438d9 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/PreferencesWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/PreferencesWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -1257,7 +1257,7 @@ {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} - YES + NO @@ -2206,7 +2206,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MPfm/MPfm.Mac/Windows/XIB/SplashWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/SplashWindow.xib index 996103d6..27887809 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/SplashWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/SplashWindow.xib @@ -1,14 +1,14 @@ - 1070 - 11E53 - 2549 - 1138.47 - 569.00 + 1080 + 12E55 + 3084 + 1187.39 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 2549 + 3084 YES @@ -82,6 +82,7 @@ 0 NO + NO YES @@ -90,7 +91,6 @@ {{6, 6}, {621, 18}} - _NS:1535 YES @@ -118,6 +118,7 @@ MQA + NO {640, 504} @@ -127,7 +128,7 @@ {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} - YES + NO diff --git a/MPfm/MPfm.Mac/Windows/XIB/SyncDownloadWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/SyncDownloadWindow.xib index 0d3f2292..a0ed2bf8 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/SyncDownloadWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/SyncDownloadWindow.xib @@ -312,7 +312,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + MPfmView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MPfm/MPfm.Mac/Windows/XIB/SyncMenuWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/SyncMenuWindow.xib index 2ea5e8e8..ac675afd 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/SyncMenuWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/SyncMenuWindow.xib @@ -15,15 +15,13 @@ NSButton NSButtonCell NSCustomObject - NSImageCell - NSImageView + NSCustomView + NSOutlineView NSProgressIndicator NSScrollView NSScroller NSTableCellView NSTableColumn - NSTableHeaderView - NSTableView NSTextField NSTextFieldCell NSView @@ -62,357 +60,377 @@ 256 YES - - - 289 - {{464, 17}, {127, 32}} - - - - _NS:9 - YES - - 67108864 - 134217728 - Select all - - HelveticaNeue - 12 - 16 - - _NS:9 - - -2038284288 - 162 - - LucidaGrande - 12 - 16 - - - - 200 - 25 - - NO - - - - 268 - {{12, 446}, {457, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Choose audio files to sync - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 3 - MC43OTc3ODg1NTg1AA - - - NO - - - - 292 - {{12, 33}, {447, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Total: 0 files (0.0 MB) - - _NS:1535 - - - - 3 - MC43OTc3ODg1NTg1AA - - - NO - - - - 292 - {{12, 15}, {437, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Free space: 3043.2 MB - - _NS:1535 - - - - 3 - MC43OTc3ODg1NTg1AA - - - NO - - - - 265 - {{514, 459}, {77, 12}} - - - - _NS:945 - 16650 - 100 - - + 274 YES - - - 2304 + + + 268 YES - - - 256 + + + 2304 YES - - {579, 363} - - - - _NS:13 - YES - NO - YES - - - 256 - {579, 17} - - - - _NS:16 - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - _NS:19 - - - YES - - columnDeviceName - 202.7890625 - 40 - 1000 - - 75497536 - 2048 - Device Name - - HelveticaNeue - 11 - 16 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - + + + 256 + + YES - - 337641536 - 2048 - Text Cell - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlBackgroundColor - + {579, 378} + + + + _NS:13 + YES + NO + YES + + + -2147483392 + {{224, 0}, {16, 17}} + + _NS:18 + + + YES + + columnTitle + 430.859375 + 16 + 1000 + + 75497536 + 2048 + + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5ODU2AA + + + 6 + System + headerTextColor + + 3 + MAA + + + + + 337641537 + 272631808 + Text + + LucidaGrande + 13 + 1044 + + _NS:9 + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + 3 + YES + YES + - - 6 - System - controlTextColor - + + columnSelection + 142 + 40 + 1000 + + 75497536 + 2048 + + + + + + + 337641536 + 2048 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + + 3 + YES + YES + - 3 - YES - YES - - - - columnDescription - 370 - 40 - 1000 - - 75497536 - 2048 - Description - - - + 3 + 2 + + 3 + MQA - - 337641536 - 2048 - Text Cell - - - - + + 6 + System + gridColor + + 3 + MC41AA + - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA + 17 + 1379926016 + + + 4 + 15 + 0 + YES + 0 + 1 + NO - 20 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 + {579, 378} + + + + _NS:11 + + + 4 + + + + -2147483392 + {{224, 17}, {15, 102}} + + + + _NS:58 + NO + + _doScroller: + 0.99736147757255933 + + + + -2147483392 + {{1, 364}, {577, 15}} + + + + _NS:60 + NO + 1 + + _doScroller: + 0.99827586206896557 - {{0, 17}, {579, 363}} - + {{13, 60}, {579, 378}} + - - _NS:11 - - - 4 + + _NS:9 + 133680 + + + + QSAAAEEgAABBmAAAQZgAAA + 0.25 + 4 + 1 - - - -2147483392 - {{224, 17}, {15, 102}} - + + + 292 + {{12, 20}, {437, 17}} + - - _NS:58 + + _NS:1535 + YES + + 68157504 + 272630784 + Free space: 3043.2 MB + + HelveticaNeue + 12 + 16 + + _NS:1535 + + + + 3 + MC43OTc3ODg1NTg1AA + + NO - - _doScroller: - 37 - 0.1947367936372757 - - - -2147483392 - {{1, 119}, {223, 15}} - + + + 292 + {{12, 38}, {447, 17}} + - - _NS:60 + + _NS:1535 + YES + + 68157504 + 272630784 + Total: 0 files (0.0 MB) + + _NS:1535 + + + + 3 + MC43OTc3ODg1NTg1AA + + NO - 1 - - _doScroller: - 0.57142859697341919 - - - 2304 - - YES - + + + 289 + {{465, 21}, {127, 32}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Select all + + _NS:9 + + -2038284288 + 162 + + LucidaGrande + 12 + 16 + + + + 200 + 25 - {579, 17} - + NO + + + {606, 438} + + + + _NS:9 + NSView + + + + 274 + + YES + + + 266 + {{17, 265}, {572, 25}} + + + + _NS:1535 + YES + + 68157504 + 138413056 + Loading... + + HelveticaNeue + 13 + 16 + + _NS:1535 + + + + + NO + + + + 266 + {{20, 251}, {566, 12}} + - - _NS:15 - - - 4 + _NS:945 + 16648 + 100 - - {{12, 58}, {579, 380}} + {606, 438} - + _NS:9 - 133680 - - - - - - QSAAAEEgAABBsAAAQbAAAA - 0.25 - 4 - 1 + NSView + + + + 268 + {{12, 446}, {457, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Choose audio files to sync + + _NS:1535 + + + + 3 + MC43OTc3ODg1NTg1AA + + + NO @@ -420,13 +438,13 @@ {{12, 459}, {457, 29}} - + _NS:1535 YES 68157504 272630784 - Sync library with [device name] + Sync library with HelveticaNeue-Bold 16 @@ -445,6 +463,32 @@ NO + + + 289 + {{510, 450}, {82, 24}} + + + + _NS:9 + YES + + 67108864 + 134217728 + Sync + + _NS:9 + + -2038284288 + 162 + + + + 200 + 25 + + NO + {606, 497} @@ -469,123 +513,126 @@ - textField - - - 274 - - YES - - - 266 - {{0, 3}, {370, 17}} - - - _NS:20 - {250, 750} - YES - - 67108928 - 272631808 - Table View Cell - - _NS:20 - - - - - NO - - - {{207, 1}, {370, 20}} - - _NS:9 - - + viewLoading + + - 37 + 91 - imageView - + viewTable + + + + 92 + + + + progressIndicator + + + + 95 + + + + btnSync + + + + 96 + + + + btnSelectAll + + + + 97 + + + + lblTotal + + + + 100 + + + + lblFreeSpace + + + + 101 + + + + outlineView + + + + 102 + + + + lblSubtitle + + + + 103 + + + + lblTitle + + + + 104 + + + + lblLoading + + + + 105 + + + + textField + 274 YES - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{3, -2}, {17, 17}} - - - _NS:11 - YES - - 134217728 - 33554432 - - NSImage - NSActionTemplate - - _NS:11 - 0 - 0 - 0 - NO - - NO - YES - - - + + 266 - {{25, 0}, {178, 17}} - - - _NS:20 + {431, 17} + + {250, 750} YES - + 67108928 272631808 Table View Cell - - _NS:20 - + + NO - {{1, 1}, {203, 17}} - - _NS:9 + {{1, 1}, {431, 17}} + - - - 35 - - - - textField - - + - 36 + 110 @@ -633,11 +680,9 @@ YES - - - - - + + + @@ -650,23 +695,6 @@ - - 10 - - - - - 11 - - - YES - - - - - - - 12 @@ -682,167 +710,233 @@ - 16 - + 33 + + + + + 83 + YES - - + + + + - - - - 17 - - + - 18 - - + 42 + + + YES + + + - 19 - - + 43 + + - 20 - + 38 + YES - - + - + - 21 - + 39 + + + + + 40 + YES - - + - + - 22 - - + 41 + + - 23 - + 53 + YES - + + + - + - 24 - - - YES - - - + 57 + + - 25 - - + 55 + + - 26 - - + 54 + + + YES + + + + - 27 - + 59 + YES - - + + + + 268 + {{435, 1}, {142, 18}} + + _NS:9 + YES + + -2080374784 + 268435456 + Check + + _NS:9 + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + NO + - + - 28 - + 58 + YES - + + - + - 29 - + 60 + + + + + 84 + YES - + + - + - 30 - - + 10 + + - 31 - - + 89 + + + YES + + + - 33 - - + 90 + + - 38 - + 93 + YES - + - 39 - - + 94 + + - 40 - + 106 + + + + + 107 + YES - + - + - 41 - - + 108 + + + YES + + + - 42 - + 109 + + + + + 115 + YES - + - + - 43 - - + 116 + + @@ -854,38 +948,23 @@ -2.IBPluginDependency -3.IBPluginDependency 10.IBPluginDependency - 11.IBPluginDependency + 106.IBPluginDependency + 107.IBPluginDependency + 107.userInterfaceItemIdentifier + 108.IBPluginDependency + 109.IBPluginDependency + 115.IBPluginDependency + 115.userInterfaceItemIdentifier + 116.IBPluginDependency 12.IBPluginDependency 15.IBPluginDependency - 16.IBPluginDependency - 16.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight - 17.IBPluginDependency - 18.CustomClassName - 18.IBPluginDependency - 19.IBPluginDependency + 2.IBNSWindowAutoPositionCentersHorizontal + 2.IBNSWindowAutoPositionCentersVertical 2.IBPluginDependency 2.IBWindowTemplateEditedContentRect 2.NSWindowTemplate.visibleAtLaunch - 20.IBPluginDependency - 20.isInViewBasedMode - 20.prototypeCellViews - 21.IBPluginDependency - 21.isInViewBasedMode - 21.prototypeCellViews - 22.IBPluginDependency - 23.IBPluginDependency - 23.userInterfaceItemIdentifier - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 27.IBPluginDependency - 27.userInterfaceItemIdentifier - 28.IBPluginDependency - 29.IBPluginDependency 3.CustomClassName 3.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency 33.IBPluginDependency 38.IBPluginDependency 39.IBPluginDependency @@ -894,7 +973,26 @@ 42.CustomClassName 42.IBPluginDependency 43.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 54.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight + 55.IBPluginDependency + 57.IBPluginDependency + 58.IBPluginDependency + 58.isInViewBasedMode + 58.prototypeCellViews + 59.IBPluginDependency + 59.isInViewBasedMode + 59.prototypeCellViews + 60.IBPluginDependency 8.IBPluginDependency + 83.IBPluginDependency + 84.IBPluginDependency + 89.IBPluginDependency + 90.IBPluginDependency + 93.CustomClassName + 93.IBPluginDependency + 94.IBPluginDependency YES @@ -904,50 +1002,54 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + cellTitle com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - MPfmTableHeaderView + cellSelection com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{319, 371}, {606, 354}} - com.apple.InterfaceBuilder.CocoaPlugin - - YES - - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - + {{319, 371}, {606, 354}} + + MPfmView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - cellDeviceDescription com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - cellDeviceName + MPfmButton com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - MPfmView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - MPfmButton com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + MPfmButton + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -963,7 +1065,7 @@ - 43 + 116 @@ -976,14 +1078,6 @@ ./Classes/MPfmButton.h - - MPfmTableHeaderView - NSTableHeaderView - - IBProjectSource - ./Classes/MPfmTableHeaderView.h - - MPfmView NSView @@ -1003,6 +1097,101 @@ SyncMenuWindowController NSWindowController + + YES + + YES + btnSelectAll + btnSync + lblFreeSpace + lblLoading + lblSubtitle + lblTitle + lblTotal + outlineView + progressIndicator + viewLoading + viewTable + + + YES + MPfmButton + MPfmButton + NSTextField + NSTextField + NSTextField + NSTextField + NSTextField + NSOutlineView + NSProgressIndicator + NSView + NSView + + + + YES + + YES + btnSelectAll + btnSync + lblFreeSpace + lblLoading + lblSubtitle + lblTitle + lblTotal + outlineView + progressIndicator + viewLoading + viewTable + + + YES + + btnSelectAll + MPfmButton + + + btnSync + MPfmButton + + + lblFreeSpace + NSTextField + + + lblLoading + NSTextField + + + lblSubtitle + NSTextField + + + lblTitle + NSTextField + + + lblTotal + NSTextField + + + outlineView + NSOutlineView + + + progressIndicator + NSProgressIndicator + + + viewLoading + NSView + + + viewTable + NSView + + + IBProjectSource ./Classes/SyncMenuWindowController.h @@ -1019,7 +1208,7 @@ YES 3 - NSActionTemplate + NSSwitch {15, 15} diff --git a/MPfm/MPfm.Mac/Windows/XIB/SyncWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/SyncWindow.xib index 0ba42e37..b49a9a05 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/SyncWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/SyncWindow.xib @@ -227,7 +227,7 @@ {579, 118} - + _NS:13 YES NO @@ -353,7 +353,7 @@ 20 - -700448768 + 1447034880 4 @@ -422,7 +422,7 @@ {{12, 40}, {579, 135}} - + _NS:9 133680 @@ -1009,7 +1009,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{319, 371}, {606, 354}} - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin MPfmButton diff --git a/MPfm/MPfm.Mac/Windows/XIB/UpdateLibraryWindow.xib b/MPfm/MPfm.Mac/Windows/XIB/UpdateLibraryWindow.xib index 2a449510..3cf524de 100644 --- a/MPfm/MPfm.Mac/Windows/XIB/UpdateLibraryWindow.xib +++ b/MPfm/MPfm.Mac/Windows/XIB/UpdateLibraryWindow.xib @@ -2,9 +2,9 @@ 1080 - 12D78 + 12E55 3084 - 1187.37 + 1187.39 626.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -449,7 +449,7 @@ {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} - YES + NO