From ec626b6cb964fc4ee59c953f6b271fe8118731bd Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Thu, 18 Aug 2011 18:06:04 +0200
Subject: [PATCH] Remove (unimplemented) copying option

---
 Medianno/MAAddMediaSheet.h       |  1 -
 Medianno/MAAddMediaSheet.mm      |  6 +--
 Medianno/MADocument.h            |  2 +-
 Medianno/MADocument.mm           |  2 +-
 Medianno/en.lproj/MAAddMedia.xib | 77 ++------------------------------
 5 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/Medianno/MAAddMediaSheet.h b/Medianno/MAAddMediaSheet.h
index 90e328b..e0afb33 100644
--- a/Medianno/MAAddMediaSheet.h
+++ b/Medianno/MAAddMediaSheet.h
@@ -12,7 +12,6 @@
 }
 
 @property (readonly) NSArray *  media;
-@property            BOOL       copyMedia;
 
 - (void)runWithParentWindow:(NSWindowController *)parent media:(NSArray *)urls;
 
diff --git a/Medianno/MAAddMediaSheet.mm b/Medianno/MAAddMediaSheet.mm
index 6e17741..83ac080 100644
--- a/Medianno/MAAddMediaSheet.mm
+++ b/Medianno/MAAddMediaSheet.mm
@@ -12,14 +12,12 @@
 
 @implementation MAAddMediaSheet
 
-@synthesize media, copyMedia;
+@synthesize media;
 
 - (id)init
 {
  	self		= [super initWithWindowNibName:@"MAAddMedia"];
     
-    copyMedia   = YES;
-    
     return self;
 }
 
@@ -37,7 +35,7 @@
                 NSURL *     url = [obj objectForKey:@"url"];
                 NSString *  name= [[url lastPathComponent] stringByDeletingPathExtension];
                 NSDate *    date= [obj objectForKey:@"date"];
-                [doc addMediaURL:url name:name date:date copying:copyMedia];
+                [doc addMediaURL:url name:name date:date];
             }];
         }
         [[self window] orderOut:self];
diff --git a/Medianno/MADocument.h b/Medianno/MADocument.h
index 014b436..0721706 100644
--- a/Medianno/MADocument.h
+++ b/Medianno/MADocument.h
@@ -17,7 +17,7 @@
     NSFileWrapper * mediaWrapper;
 }
 
-- (void)addMediaURL:(NSURL *)url name:(NSString *)name date:(NSDate *)date copying:(BOOL)copying;
+- (void)addMediaURL:(NSURL *)url name:(NSString *)name date:(NSDate *)date;
 - (MAAnno *)addAnnotationForMedia:(MAMedia *)media location:(QTTime)location;
 - (MATagDescription *)tagDescriptionForName:(NSString *)name;
 - (MATagDescription *)tagDescriptionForName:(NSString *)name notes:(NSString *)notes;
diff --git a/Medianno/MADocument.mm b/Medianno/MADocument.mm
index 4120edb..3e16378 100644
--- a/Medianno/MADocument.mm
+++ b/Medianno/MADocument.mm
@@ -40,7 +40,7 @@
 
 #pragma mark Media management
 
-- (void)addMediaURL:(NSURL *)url name:(NSString *)name date:(NSDate *)date copying:(BOOL)copying
+- (void)addMediaURL:(NSURL *)url name:(NSString *)name date:(NSDate *)date
 {
     NSManagedObjectContext *moc = [self managedObjectContext];
     MAMedia * media = [NSEntityDescription insertNewObjectForEntityForName:@"MAMedia" inManagedObjectContext:moc];
diff --git a/Medianno/en.lproj/MAAddMedia.xib b/Medianno/en.lproj/MAAddMedia.xib
index 76700e6..e0774a6 100644
--- a/Medianno/en.lproj/MAAddMedia.xib
+++ b/Medianno/en.lproj/MAAddMedia.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11A511</string>
+		<string key="IBDocument.SystemVersion">11B26</string>
 		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
 		<string key="IBDocument.AppKitVersion">1138</string>
 		<string key="IBDocument.HIToolboxVersion">566.00</string>
@@ -74,7 +74,6 @@
 							<string key="NSFrame">{{660, 12}, {107, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:161</string>
 							<int key="NSTag">1000</int>
 							<bool key="NSEnabled">YES</bool>
@@ -138,7 +137,7 @@
 											<string key="NSFrameSize">{781, 380}</string>
 											<reference key="NSSuperview" ref="482978525"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="635678385"/>
+											<reference key="NSNextKeyView" ref="106724295"/>
 											<string key="NSReuseIdentifierKey">_NS:1197</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="678384619">
@@ -341,7 +340,7 @@
 							<string key="NSFrame">{{-1, 54}, {783, 398}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="106724295"/>
+							<reference key="NSNextKeyView" ref="482978525"/>
 							<string key="NSReuseIdentifierKey">_NS:1193</string>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="635678385"/>
@@ -350,44 +349,13 @@
 							<reference key="NSHeaderClipView" ref="106724295"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
-						<object class="NSButton" id="253140813">
-							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{625, 458}, {138, 18}}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="333350533"/>
-							<string key="NSReuseIdentifierKey">_NS:239</string>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="770800797">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Copy to Collection</string>
-								<reference key="NSSupport" ref="706852951"/>
-								<string key="NSCellIdentifier">_NS:239</string>
-								<reference key="NSControlView" ref="253140813"/>
-								<int key="NSButtonFlags">1211912703</int>
-								<int key="NSButtonFlags2">2</int>
-								<object class="NSCustomResource" key="NSNormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSSwitch</string>
-								</object>
-								<object class="NSButtonImageSource" key="NSAlternateImage">
-									<string key="NSImageName">NSSwitch</string>
-								</object>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
 						<object class="NSPopUpButton" id="19618719">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{137, 456}, {371, 26}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="253140813"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:179</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="247335376">
@@ -525,22 +493,6 @@
 					</object>
 					<int key="connectionID">42</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: copyMedia</string>
-						<reference key="source" ref="253140813"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="253140813"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: copyMedia</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">copyMedia</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">68</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentArray: media</string>
@@ -653,7 +605,6 @@
 							<reference ref="128002513"/>
 							<reference ref="169511556"/>
 							<reference ref="333350533"/>
-							<reference ref="253140813"/>
 							<reference ref="988925013"/>
 							<reference ref="19618719"/>
 						</object>
@@ -756,20 +707,6 @@
 						<reference key="object" ref="437451264"/>
 						<reference key="parent" ref="767196666"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">16</int>
-						<reference key="object" ref="253140813"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="770800797"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="770800797"/>
-						<reference key="parent" ref="253140813"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">18</int>
 						<reference key="object" ref="19618719"/>
@@ -856,8 +793,6 @@
 					<string>13.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
 					<string>15.IBPluginDependency</string>
-					<string>16.IBPluginDependency</string>
-					<string>17.IBPluginDependency</string>
 					<string>18.IBPluginDependency</string>
 					<string>19.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
@@ -900,8 +835,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="2"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -967,13 +900,11 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>NSMenuCheckmark</string>
 				<string>NSMenuMixedState</string>
-				<string>NSSwitch</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<string>{9, 8}</string>
 				<string>{7, 2}</string>
-				<string>{15, 15}</string>
 			</object>
 		</object>
 	</data>