diff --git a/Info.plist b/Info.plist index d262d4e..66e4335 100644 --- a/Info.plist +++ b/Info.plist @@ -7,17 +7,17 @@ CFBundleIconFile nbte.icns CFBundleIdentifier - jaquadro.NBTExplorer + jaquadro.nbtexplorer CFBundleName NBTExplorer CFBundleShortVersionString 2.0.3 - CFBundleVersion - 1 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion 10.6 + NSHumanReadableCopyright + Copyright 2012 Justin Aquadro NSMainNibFile MainMenu NSPrincipalClass diff --git a/Mac/ImageAndTextCell.cs b/Mac/ImageAndTextCell.cs index f6e3489..1557aba 100644 --- a/Mac/ImageAndTextCell.cs +++ b/Mac/ImageAndTextCell.cs @@ -12,10 +12,6 @@ namespace NBTExplorer.Mac public class ImageAndTextCell : NSTextFieldCell { private NSImage _image; - private bool _copyCalled; - private bool _disposeCalled; - private bool _deallocCalled; - private bool _drawCalled; public ImageAndTextCell () { @@ -51,7 +47,6 @@ namespace NBTExplorer.Mac //if (_noDispose) // Handle = IntPtr.Zero; - _disposeCalled = true; base.Dispose (disposing); } @@ -131,7 +126,6 @@ namespace NBTExplorer.Mac return cell; }*/ - static IntPtr selRetain = Selector.GetHandle ("retain"); static IntPtr selRetainCount = Selector.GetHandle("retainCount"); public void PeriodicCleanup () @@ -153,7 +147,6 @@ namespace NBTExplorer.Mac // Method 5 static IntPtr selCopyWithZone = Selector.GetHandle("copyWithZone:"); - static IntPtr selDealloc = Selector.GetHandle("dealloc"); [Export("copyWithZone:")] public virtual NSObject CopyWithZone(IntPtr zone) { @@ -268,10 +261,9 @@ namespace NBTExplorer.Mac public override void DrawWithFrame (RectangleF cellFrame, NSView inView) { - Assert (!_deallocCalled, "DrawWithFrame: Dealloc was called on object"); - Assert (!_disposeCalled, "DrawWithFrame: Dispose was called on object"); + //Assert (!_deallocCalled, "DrawWithFrame: Dealloc was called on object"); + //Assert (!_disposeCalled, "DrawWithFrame: Dispose was called on object"); - _drawCalled = true; if (_image != null) { RectangleF imageFrame; cellFrame.Divide (3 + _image.Size.Width, CGRectEdge.MinXEdge, out imageFrame, out cellFrame); diff --git a/Mac/MainWindow.cs b/Mac/MainWindow.cs index ef16bd9..c0ade37 100644 --- a/Mac/MainWindow.cs +++ b/Mac/MainWindow.cs @@ -136,7 +136,7 @@ namespace NBTExplorer { TreeDataNode node = notification.UserInfo ["NSObject"] as TreeDataNode; if (node != null) { - Console.WriteLine ("Preparing to expand: " + node.Data.NodeDisplay); + //Console.WriteLine ("Preparing to expand: " + node.Data.NodeDisplay); _main.ExpandNode(node); } } @@ -145,7 +145,7 @@ namespace NBTExplorer { TreeDataNode node = notification.UserInfo ["NSObject"] as TreeDataNode; if (node != null) { - Console.WriteLine("Finished Expanding: " + node.Data.NodeDisplay); + //Console.WriteLine("Finished Expanding: " + node.Data.NodeDisplay); } } @@ -153,9 +153,9 @@ namespace NBTExplorer { TreeDataNode node = notification.UserInfo ["NSObject"] as TreeDataNode; if (node != null) { - if (node.Data.NodeDisplay == "saves") // The root node - Console.WriteLine ("Uh-oh..."); - Console.WriteLine("Preparing to collapse: " + node.Data.NodeDisplay); + //if (node.Data.NodeDisplay == "saves") // The root node + //Console.WriteLine ("Uh-oh..."); + //Console.WriteLine("Preparing to collapse: " + node.Data.NodeDisplay); } } @@ -191,6 +191,76 @@ namespace NBTExplorer ActionSave (); } + partial void ActionRename (MonoMac.Foundation.NSObject sender) + { + ActionRenameValue(); + } + + partial void ActionEdit (MonoMac.Foundation.NSObject sender) + { + ActionEditValue(); + } + + partial void ActionDelete (MonoMac.Foundation.NSObject sender) + { + ActionDeleteValue(); + } + + partial void ActionInsertByte (MonoMac.Foundation.NSObject sender) + { + ActionInsertByteTag(); + } + + partial void ActionInsertShort (MonoMac.Foundation.NSObject sender) + { + ActionInsertShortTag(); + } + + partial void ActionInsertInt (MonoMac.Foundation.NSObject sender) + { + ActionInsertIntTag(); + } + + partial void ActionInsertLong (MonoMac.Foundation.NSObject sender) + { + ActionInsertLongTag(); + } + + partial void ActionInsertFloat (MonoMac.Foundation.NSObject sender) + { + ActionInsertFloatTag(); + } + + partial void ActionInsertDouble (MonoMac.Foundation.NSObject sender) + { + ActionInsertDoubleTag(); + } + + partial void ActionInsertByteArray (MonoMac.Foundation.NSObject sender) + { + ActionInsertByteArrayTag(); + } + + partial void ActionInsertIntArray (MonoMac.Foundation.NSObject sender) + { + ActionInsertIntArrayTag(); + } + + partial void ActionInsertString (MonoMac.Foundation.NSObject sender) + { + ActionInsertStringTag(); + } + + partial void ActionInsertList (MonoMac.Foundation.NSObject sender) + { + ActionInsertListTag(); + } + + partial void ActionInsertCompound (MonoMac.Foundation.NSObject sender) + { + ActionInsertCompoundTag(); + } + #endregion private string _openFolderPath = null; @@ -272,6 +342,16 @@ namespace NBTExplorer // AddPathToHistory(Settings.Default.RecentDirectories, path); } else if (File.Exists (path)) { DataNode node = null; + + foreach (var item in FileTypeRegistry.RegisteredTypes) { + if (item.Value.NamePatternTest(path)) + node = item.Value.NodeCreate(path); + } + + if (node != null) { + _dataSource.Nodes.Add(new TreeDataNode(node)); + //AddPathToHistory(Settings.Default.RecentFiles, path); + } } } @@ -289,7 +369,7 @@ namespace NBTExplorer if (node == null || node.IsExpanded) return; - Console.WriteLine ("Expand Node: " + node.Data.NodeDisplay); + //Console.WriteLine ("Expand Node: " + node.Data.NodeDisplay); node.IsExpanded = true; node.Nodes.Clear (); @@ -311,7 +391,7 @@ namespace NBTExplorer if (node == null || !node.IsExpanded) return; - Console.WriteLine("Collapse Node: " + node.Data.NodeDisplay); + //Console.WriteLine("Collapse Node: " + node.Data.NodeDisplay); DataNode backNode = node.Data; if (backNode.IsModified) @@ -859,7 +939,22 @@ namespace NBTExplorer _appDelegate.MenuFind.Enabled = node.CanSearchNode; _appDelegate.MenuFindNext.Enabled = _searchState != null; + _toolbarByte.Enabled = _appDelegate.MenuInsertByte.Enabled; + _toolbarShort.Enabled = _appDelegate.MenuInsertShort.Enabled; + _toolbarInt.Enabled = _appDelegate.MenuInsertInt.Enabled; + _toolbarLong.Enabled = _appDelegate.MenuInsertLong.Enabled; + _toolbarFloat.Enabled = _appDelegate.MenuInsertFloat.Enabled; + _toolbarDouble.Enabled = _appDelegate.MenuInsertDouble.Enabled; + _toolbarByteArray.Enabled = _appDelegate.MenuInsertByteArray.Enabled; + _toolbarIntArray.Enabled = _appDelegate.MenuInsertIntArray.Enabled; + _toolbarString.Enabled = _appDelegate.MenuInsertString.Enabled; + _toolbarList.Enabled = _appDelegate.MenuInsertList.Enabled; + _toolbarCompound.Enabled = _appDelegate.MenuInsertCompound.Enabled; + _toolbarSave.Enabled = _appDelegate.MenuSave.Enabled; + _toolbarDelete.Enabled = _appDelegate.MenuDelete.Enabled; + _toolbarEdit.Enabled = _appDelegate.MenuEditValue.Enabled; + _toolbarRename.Enabled = _appDelegate.MenuRename.Enabled; } /*private void UpdateOpenMenu () diff --git a/Mac/MainWindow.designer.cs b/Mac/MainWindow.designer.cs index 677619b..c593e33 100644 --- a/Mac/MainWindow.designer.cs +++ b/Mac/MainWindow.designer.cs @@ -20,6 +20,48 @@ namespace NBTExplorer [Outlet] MonoMac.AppKit.NSToolbarItem _toolbarSave { get; set; } + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarRename { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarEdit { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarDelete { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarByte { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarShort { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarInt { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarLong { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarFloat { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarDouble { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarByteArray { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarIntArray { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarString { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarList { get; set; } + + [Outlet] + MonoMac.AppKit.NSToolbarItem _toolbarCompound { get; set; } + [Outlet] MonoMac.AppKit.NSScrollView _mainScrollView { get; set; } @@ -31,6 +73,48 @@ namespace NBTExplorer [Action ("ActionSave:")] partial void ActionSave (MonoMac.Foundation.NSObject sender); + + [Action ("ActionRename:")] + partial void ActionRename (MonoMac.Foundation.NSObject sender); + + [Action ("ActionEdit:")] + partial void ActionEdit (MonoMac.Foundation.NSObject sender); + + [Action ("ActionDelete:")] + partial void ActionDelete (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertByte:")] + partial void ActionInsertByte (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertShort:")] + partial void ActionInsertShort (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertInt:")] + partial void ActionInsertInt (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertLong:")] + partial void ActionInsertLong (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertFloat:")] + partial void ActionInsertFloat (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertDouble:")] + partial void ActionInsertDouble (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertByteArray:")] + partial void ActionInsertByteArray (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertIntArray:")] + partial void ActionInsertIntArray (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertString:")] + partial void ActionInsertString (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertList:")] + partial void ActionInsertList (MonoMac.Foundation.NSObject sender); + + [Action ("ActionInsertCompound:")] + partial void ActionInsertCompound (MonoMac.Foundation.NSObject sender); void ReleaseDesignerOutlets () { @@ -49,6 +133,76 @@ namespace NBTExplorer _toolbarSave = null; } + if (_toolbarRename != null) { + _toolbarRename.Dispose (); + _toolbarRename = null; + } + + if (_toolbarEdit != null) { + _toolbarEdit.Dispose (); + _toolbarEdit = null; + } + + if (_toolbarDelete != null) { + _toolbarDelete.Dispose (); + _toolbarDelete = null; + } + + if (_toolbarByte != null) { + _toolbarByte.Dispose (); + _toolbarByte = null; + } + + if (_toolbarShort != null) { + _toolbarShort.Dispose (); + _toolbarShort = null; + } + + if (_toolbarInt != null) { + _toolbarInt.Dispose (); + _toolbarInt = null; + } + + if (_toolbarLong != null) { + _toolbarLong.Dispose (); + _toolbarLong = null; + } + + if (_toolbarFloat != null) { + _toolbarFloat.Dispose (); + _toolbarFloat = null; + } + + if (_toolbarDouble != null) { + _toolbarDouble.Dispose (); + _toolbarDouble = null; + } + + if (_toolbarByteArray != null) { + _toolbarByteArray.Dispose (); + _toolbarByteArray = null; + } + + if (_toolbarIntArray != null) { + _toolbarIntArray.Dispose (); + _toolbarIntArray = null; + } + + if (_toolbarString != null) { + _toolbarString.Dispose (); + _toolbarString = null; + } + + if (_toolbarList != null) { + _toolbarList.Dispose (); + _toolbarList = null; + } + + if (_toolbarCompound != null) { + _toolbarCompound.Dispose (); + _toolbarCompound = null; + } + if (_mainScrollView != null) { _mainScrollView.Dispose (); _mainScrollView = null; diff --git a/Mac/MainWindow.xib b/Mac/MainWindow.xib index fae3f15..428cb00 100644 --- a/Mac/MainWindow.xib +++ b/Mac/MainWindow.xib @@ -70,8 +70,21 @@ YES 0156226B-2E18-4406-BBE6-7C88F62B4E27 + 17EACEC3-85E5-4FAA-BE98-B0CE39F84B89 + 1A879477-1C3F-4A4A-8AAB-8A9323437132 + 1B4632F4-67C5-4E5F-95BC-DAECAB3B4B47 + 211207A5-8B0C-475C-86DB-11E1C0E7CF34 + 2165B234-296A-47B1-8BC4-5A0A6B3C3652 + 40136073-3A43-4A71-9F3C-E26CA350D9A4 + 427CF79D-4B22-4CBB-BC2E-74D776E7179E + 43CCAD1E-9D9C-4679-881F-C16DD6256FB7 + 84327462-DDD4-4B04-951E-08307B263FE3 + 9E93B113-F8CF-483F-8BE1-5B570CA4CA92 A7443D4A-610D-4239-8FC6-AD74A87D607E + B4B4CE6E-5C53-4FBA-AB5A-DE72648DE848 B62CA8DD-7D49-4BF3-B4AB-417078852D8B + C67FD8AA-A624-4F8F-B11E-FF9118728ED7 + DC36F820-4D54-489E-9063-57ACD882FC18 NSToolbarFlexibleSpaceItem NSToolbarSpaceItem @@ -83,7 +96,7 @@ Open Open - + Open directory NSImage @@ -99,13 +112,233 @@ YES 0 + + + 17EACEC3-85E5-4FAA-BE98-B0CE39F84B89 + + Double + Double + Insert double tag + + + NSImage + document-d-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 1A879477-1C3F-4A4A-8AAB-8A9323437132 + + Int + Int + Insert int tag + + + NSImage + document-i-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 1B4632F4-67C5-4E5F-95BC-DAECAB3B4B47 + + Long + Long + Insert long tag + + + NSImage + document-l-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 211207A5-8B0C-475C-86DB-11E1C0E7CF34 + + List + List + Insert list tag + + + NSImage + edit-list-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 2165B234-296A-47B1-8BC4-5A0A6B3C3652 + + Short + Short + Insert short tag + + + NSImage + document-s-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 40136073-3A43-4A71-9F3C-E26CA350D9A4 + + Edit + Edit + Edit value of selected node + + + NSImage + pencil-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 427CF79D-4B22-4CBB-BC2E-74D776E7179E + + Int[] + Int Array + Insert int array tag + + + NSImage + edit-code-i-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 43CCAD1E-9D9C-4679-881F-C16DD6256FB7 + + Compound + Compound + Insert compound tag + + + NSImage + box-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 84327462-DDD4-4B04-951E-08307B263FE3 + + Float + Float + Insert float tag + + + NSImage + document-f-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + 9E93B113-F8CF-483F-8BE1-5B570CA4CA92 + + Byte + Byte + Insert byte tag + + + NSImage + document-b-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + A7443D4A-610D-4239-8FC6-AD74A87D607E Rename Rename - + Rename selected node NSImage @@ -121,13 +354,35 @@ YES 0 + + + B4B4CE6E-5C53-4FBA-AB5A-DE72648DE848 + + Delete + Delete + Delete selected node + + + NSImage + cross-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + B62CA8DD-7D49-4BF3-B4AB-417078852D8B Save Save - + Save all changes NSImage @@ -143,6 +398,50 @@ YES 0 + + + C67FD8AA-A624-4F8F-B11E-FF9118728ED7 + + String + String + Insert string tag + + + NSImage + edit-small-caps-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + + + + DC36F820-4D54-489E-9063-57ACD882FC18 + + Byte[] + Byte Array + Insert byte array tag + + + NSImage + edit-code-24 + + + + {0, 0} + {0, 0} + YES + NO + -1 + YES + 0 + NSToolbarFlexibleSpaceItem @@ -205,13 +504,26 @@ - + YES + + + + + + + + + + + + + YES @@ -219,6 +531,8 @@ + + @@ -233,7 +547,7 @@ YES - 286 + 274 YES @@ -364,7 +678,6 @@ {{1, 544}, {761, 15}} - _NS:60 NO 1 @@ -490,6 +803,230 @@ 42 + + + _toolbarRename + + + + 92 + + + + _toolbarEdit + + + + 93 + + + + _toolbarDelete + + + + 94 + + + + _toolbarByte + + + + 95 + + + + _toolbarShort + + + + 96 + + + + _toolbarInt + + + + 97 + + + + _toolbarLong + + + + 98 + + + + _toolbarFloat + + + + 99 + + + + _toolbarDouble + + + + 100 + + + + _toolbarByteArray + + + + 101 + + + + _toolbarIntArray + + + + 102 + + + + _toolbarString + + + + 103 + + + + _toolbarList + + + + 104 + + + + _toolbarCompound + + + + 105 + + + + ActionRename: + + + + 106 + + + + ActionEdit: + + + + 107 + + + + ActionDelete: + + + + 108 + + + + ActionInsertByte: + + + + 109 + + + + ActionInsertShort: + + + + 110 + + + + ActionInsertInt: + + + + 111 + + + + ActionInsertLong: + + + + 112 + + + + ActionInsertFloat: + + + + 113 + + + + ActionInsertDouble: + + + + 114 + + + + ActionInsertByteArray: + + + + 115 + + + + ActionInsertIntArray: + + + + 116 + + + + ActionInsertString: + + + + 117 + + + + ActionInsertList: + + + + 118 + + + + ActionInsertCompound: + + + + 119 + menu @@ -555,6 +1092,19 @@ + + + + + + + + + + + + + @@ -652,6 +1202,71 @@ + + 79 + + + + + 80 + + + + + 81 + + + + + 82 + + + + + 83 + + + + + 84 + + + + + 85 + + + + + 86 + + + + + 87 + + + + + 88 + + + + + 89 + + + + + 90 + + + + + 91 + + + @@ -684,6 +1299,19 @@ 73.IBPluginDependency 74.IBPluginDependency 78.IBPluginDependency + 79.IBPluginDependency + 80.IBPluginDependency + 81.IBPluginDependency + 82.IBPluginDependency + 83.IBPluginDependency + 84.IBPluginDependency + 85.IBPluginDependency + 86.IBPluginDependency + 87.IBPluginDependency + 88.IBPluginDependency + 89.IBPluginDependency + 90.IBPluginDependency + 91.IBPluginDependency YES @@ -713,6 +1341,19 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -727,7 +1368,7 @@ - 78 + 119 @@ -747,28 +1388,126 @@ YES YES + ActionDelete: + ActionEdit: + ActionInsertByte: + ActionInsertByteArray: + ActionInsertCompound: + ActionInsertDouble: + ActionInsertFloat: + ActionInsertInt: + ActionInsertIntArray: + ActionInsertList: + ActionInsertLong: + ActionInsertShort: + ActionInsertString: ActionOpenFolder: + ActionRename: ActionSave: YES id id + id + id + id + id + id + id + id + id + id + id + id + id + id + id YES YES + ActionDelete: + ActionEdit: + ActionInsertByte: + ActionInsertByteArray: + ActionInsertCompound: + ActionInsertDouble: + ActionInsertFloat: + ActionInsertInt: + ActionInsertIntArray: + ActionInsertList: + ActionInsertLong: + ActionInsertShort: + ActionInsertString: ActionOpenFolder: + ActionRename: ActionSave: YES + + ActionDelete: + id + + + ActionEdit: + id + + + ActionInsertByte: + id + + + ActionInsertByteArray: + id + + + ActionInsertCompound: + id + + + ActionInsertDouble: + id + + + ActionInsertFloat: + id + + + ActionInsertInt: + id + + + ActionInsertIntArray: + id + + + ActionInsertList: + id + + + ActionInsertLong: + id + + + ActionInsertShort: + id + + + ActionInsertString: + id + ActionOpenFolder: id + + ActionRename: + id + ActionSave: id @@ -782,8 +1521,22 @@ _mainOutlineView _mainScrollView _toolbar + _toolbarByte + _toolbarByteArray + _toolbarCompound + _toolbarDelete + _toolbarDouble + _toolbarEdit + _toolbarFloat + _toolbarInt + _toolbarIntArray + _toolbarList + _toolbarLong _toolbarOpenFolder + _toolbarRename _toolbarSave + _toolbarShort + _toolbarString YES @@ -792,6 +1545,20 @@ NSToolbar NSToolbarItem NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem + NSToolbarItem @@ -801,8 +1568,22 @@ _mainOutlineView _mainScrollView _toolbar + _toolbarByte + _toolbarByteArray + _toolbarCompound + _toolbarDelete + _toolbarDouble + _toolbarEdit + _toolbarFloat + _toolbarInt + _toolbarIntArray + _toolbarList + _toolbarLong _toolbarOpenFolder + _toolbarRename _toolbarSave + _toolbarShort + _toolbarString YES @@ -818,14 +1599,70 @@ _toolbar NSToolbar + + _toolbarByte + NSToolbarItem + + + _toolbarByteArray + NSToolbarItem + + + _toolbarCompound + NSToolbarItem + + + _toolbarDelete + NSToolbarItem + + + _toolbarDouble + NSToolbarItem + + + _toolbarEdit + NSToolbarItem + + + _toolbarFloat + NSToolbarItem + + + _toolbarInt + NSToolbarItem + + + _toolbarIntArray + NSToolbarItem + + + _toolbarList + NSToolbarItem + + + _toolbarLong + NSToolbarItem + _toolbarOpenFolder NSToolbarItem + + _toolbarRename + NSToolbarItem + _toolbarSave NSToolbarItem + + _toolbarShort + NSToolbarItem + + + _toolbarString + NSToolbarItem + @@ -857,8 +1694,21 @@ YES NSMenuCheckmark NSMenuMixedState + box-24 + cross-24 disk-24 + document-b-24 + document-d-24 + document-f-24 + document-i-24 + document-l-24 + document-s-24 + edit-code-24 + edit-code-i-24 + edit-list-24 + edit-small-caps-24 folder-open-24 + pencil-24 selection-input-24 @@ -868,6 +1718,19 @@ {24, 24} {24, 24} {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} + {24, 24} diff --git a/Mac/NbtClipboardControllerMac.cs b/Mac/NbtClipboardControllerMac.cs index 40ec93c..1de8761 100644 --- a/Mac/NbtClipboardControllerMac.cs +++ b/Mac/NbtClipboardControllerMac.cs @@ -163,6 +163,15 @@ namespace NBTExplorer.Mac return 0; } + public override NSObject InitWithPasteboardPropertyList (NSObject propertyList, string type) + { + if (type == _pasteboardItemName) { + return null; + } + else + return null; + } + // XXX: This is a hack. Not sure how to properly implement, but it's required either by pasteboard reading, // or is a side-effect of our protocol conformance hack. [Export("isSubclassOfClass:")] diff --git a/Model/FileTypeRegistry.cs b/Model/FileTypeRegistry.cs index c2d2cef..270bb29 100644 --- a/Model/FileTypeRegistry.cs +++ b/Model/FileTypeRegistry.cs @@ -61,7 +61,7 @@ namespace NBTExplorer.Model NodeCreate = CubicRegionDataNode.TryCreateFrom, }); } - catch (Exception e) { + catch (Exception) { //Program.StaticInitFailure(e); } } diff --git a/NBTExplorerMac.csproj b/NBTExplorerMac.csproj index 40c75bb..03fae49 100644 --- a/NBTExplorerMac.csproj +++ b/NBTExplorerMac.csproj @@ -36,7 +36,7 @@ 4 False True - Full + SdkOnly False False False @@ -69,8 +69,8 @@ - - ..\monomac\src\MonoMac.dll + + False @@ -79,10 +79,6 @@ - - - - @@ -93,7 +89,6 @@ - @@ -126,23 +121,6 @@ - - - - - - - - - - - - - - - - - @@ -233,21 +211,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/Resources/24/box.png b/Resources/box-24.png similarity index 100% rename from Resources/24/box.png rename to Resources/box-24.png diff --git a/Resources/24/cross-24.png b/Resources/cross-24.png similarity index 100% rename from Resources/24/cross-24.png rename to Resources/cross-24.png diff --git a/Resources/24/document-24.png b/Resources/document-24.png similarity index 100% rename from Resources/24/document-24.png rename to Resources/document-24.png diff --git a/Resources/24/document-b-24.png b/Resources/document-b-24.png similarity index 100% rename from Resources/24/document-b-24.png rename to Resources/document-b-24.png diff --git a/Resources/24/document-d-24.png b/Resources/document-d-24.png similarity index 100% rename from Resources/24/document-d-24.png rename to Resources/document-d-24.png diff --git a/Resources/24/document-f-24.png b/Resources/document-f-24.png similarity index 100% rename from Resources/24/document-f-24.png rename to Resources/document-f-24.png diff --git a/Resources/24/document-i-24.png b/Resources/document-i-24.png similarity index 100% rename from Resources/24/document-i-24.png rename to Resources/document-i-24.png diff --git a/Resources/24/document-l-24.png b/Resources/document-l-24.png similarity index 100% rename from Resources/24/document-l-24.png rename to Resources/document-l-24.png diff --git a/Resources/24/document-s-24.png b/Resources/document-s-24.png similarity index 100% rename from Resources/24/document-s-24.png rename to Resources/document-s-24.png diff --git a/Resources/24/edit-code-24.png b/Resources/edit-code-24.png similarity index 100% rename from Resources/24/edit-code-24.png rename to Resources/edit-code-24.png diff --git a/Resources/24/edit-code-i-24.png b/Resources/edit-code-i-24.png similarity index 100% rename from Resources/24/edit-code-i-24.png rename to Resources/edit-code-i-24.png diff --git a/Resources/24/edit-list-24.png b/Resources/edit-list-24.png similarity index 100% rename from Resources/24/edit-list-24.png rename to Resources/edit-list-24.png diff --git a/Resources/24/edit-small-caps-24.png b/Resources/edit-small-caps-24.png similarity index 100% rename from Resources/24/edit-small-caps-24.png rename to Resources/edit-small-caps-24.png diff --git a/Resources/24/pencil-24.png b/Resources/pencil-24.png similarity index 100% rename from Resources/24/pencil-24.png rename to Resources/pencil-24.png diff --git a/Resources/24/scissors-24.png b/Resources/scissors-24.png similarity index 100% rename from Resources/24/scissors-24.png rename to Resources/scissors-24.png diff --git a/Resources/24/selection-input-24.png b/Resources/selection-input-24.png similarity index 76% rename from Resources/24/selection-input-24.png rename to Resources/selection-input-24.png index f83f1dc..6f50201 100644 Binary files a/Resources/24/selection-input-24.png and b/Resources/selection-input-24.png differ diff --git a/nbte.icns b/nbte.icns index cce3f62..21de7d0 100644 Binary files a/nbte.icns and b/nbte.icns differ