Revision: 7126
http://skim-app.svn.sourceforge.net/skim-app/?rev=7126&view=rev
Author: hofman
Date: 2011-02-23 17:56:25 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
add menu item to move document file to trash
Modified Paths:
--------------
trunk/Dutch.lproj/MainMenu.strings
trunk/English.lproj/MainMenu.strings
trunk/French.lproj/MainMenu.strings
trunk/German.lproj/MainMenu.strings
trunk/Italian.lproj/MainMenu.strings
trunk/Japanese.lproj/MainMenu.strings
trunk/MainMenu.xib
trunk/SKMainDocument.h
trunk/SKMainDocument.m
trunk/Spanish.lproj/MainMenu.strings
trunk/pl.lproj/MainMenu.strings
trunk/ru.lproj/MainMenu.strings
trunk/zh_TW.lproj/MainMenu.strings
Modified: trunk/Dutch.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/German.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/Japanese.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/MainMenu.xib
===================================================================
--- trunk/MainMenu.xib 2011-02-22 11:21:01 UTC (rev 7125)
+++ trunk/MainMenu.xib 2011-02-23 17:56:25 UTC (rev 7126)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.SystemVersion">10J567</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.HIToolboxVersion">462.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">823</string>
@@ -314,6 +314,26 @@
<reference key="NSOnImage" ref="1022008517"/>
<reference key="NSMixedImage" ref="290280874"/>
</object>
+ <object
class="NSMenuItem" id="221839630">
+
<reference key="NSMenu" ref="812152972"/>
+ <string
key="NSTitle">Move to Trash</string>
+ <string
type="base64-UTF8" key="NSKeyEquiv">CA</string>
+ <int
key="NSKeyEquivModMask">1048576</int>
+ <int
key="NSMnemonicLoc">2147483647</int>
+
<reference key="NSOnImage" ref="1022008517"/>
+
<reference key="NSMixedImage" ref="290280874"/>
+ </object>
+ <object
class="NSMenuItem" id="572160035">
+
<reference key="NSMenu" ref="812152972"/>
+ <bool
key="NSIsDisabled">YES</bool>
+ <bool
key="NSIsSeparator">YES</bool>
+ <string
key="NSTitle"/>
+ <string
key="NSKeyEquiv"/>
+ <int
key="NSKeyEquivModMask">1048576</int>
+ <int
key="NSMnemonicLoc">2147483647</int>
+
<reference key="NSOnImage" ref="1022008517"/>
+
<reference key="NSMixedImage" ref="290280874"/>
+ </object>
<object
class="NSMenuItem" id="145817286">
<reference key="NSMenu" ref="812152972"/>
<string
key="NSTitle">Save Archive…</string>
@@ -3646,6 +3666,14 @@
</object>
<int key="connectionID">1088</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection"
key="connection">
+ <string
key="label">moveToTrash:</string>
+ <reference key="source"
ref="660174102"/>
+ <reference key="destination"
ref="221839630"/>
+ </object>
+ <int key="connectionID">1092</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3890,6 +3918,8 @@
<reference
ref="831386359"/>
<reference
ref="568392804"/>
<reference
ref="746700930"/>
+ <reference
ref="572160035"/>
+ <reference
ref="221839630"/>
</object>
<reference key="parent"
ref="141697992"/>
</object>
@@ -5319,6 +5349,16 @@
<reference key="object"
ref="1012095061"/>
<reference key="parent"
ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1089</int>
+ <reference key="object"
ref="572160035"/>
+ <reference key="parent"
ref="812152972"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1090</int>
+ <reference key="object"
ref="221839630"/>
+ <reference key="parent"
ref="812152972"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary"
key="flattenedProperties">
@@ -5345,6 +5385,10 @@
<string>106.ImportedFromIB2</string>
<string>1085.IBPluginDependency</string>
<string>1086.IBPluginDependency</string>
+ <string>1089.IBPluginDependency</string>
+ <string>1089.ImportedFromIB2</string>
+ <string>1090.IBPluginDependency</string>
+ <string>1090.ImportedFromIB2</string>
<string>111.IBPluginDependency</string>
<string>111.ImportedFromIB2</string>
<string>124.IBPluginDependency</string>
@@ -5862,6 +5906,10 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES"/>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES"/>
<string>{{541, 359}, {238,
133}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -6155,7 +6203,7 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{249, 309}, {230,
403}}</string>
+ <string>{{103, 342}, {235,
433}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6310,7 +6358,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1088</int>
+ <int key="maxID">1092</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -7216,8 +7264,6 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>editBookmarks:</string>
-
<string>openBookmarkAction:</string>
<string>orderFrontLineInspector:</string>
<string>orderFrontNotesPanel:</string>
<string>showDownloads:</string>
@@ -7235,16 +7281,12 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary"
key="actionInfosByName">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>editBookmarks:</string>
-
<string>openBookmarkAction:</string>
<string>orderFrontLineInspector:</string>
<string>orderFrontNotesPanel:</string>
<string>showDownloads:</string>
@@ -7256,14 +7298,6 @@
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object
class="IBActionInfo">
- <string
key="name">editBookmarks:</string>
- <string
key="candidateClassName">id</string>
- </object>
- <object
class="IBActionInfo">
- <string
key="name">openBookmarkAction:</string>
- <string
key="candidateClassName">id</string>
- </object>
- <object
class="IBActionInfo">
<string
key="name">orderFrontLineInspector:</string>
<string
key="candidateClassName">id</string>
</object>
@@ -7349,6 +7383,7 @@
<string>doubleClickBookmark:</string>
<string>insertBookmarkFolder:</string>
<string>insertBookmarkSeparator:</string>
+
<string>openBookmark:</string>
<string>toggleStatusBar:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -7358,6 +7393,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary"
key="actionInfosByName">
@@ -7368,6 +7404,7 @@
<string>doubleClickBookmark:</string>
<string>insertBookmarkFolder:</string>
<string>insertBookmarkSeparator:</string>
+
<string>openBookmark:</string>
<string>toggleStatusBar:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
@@ -7389,6 +7426,10 @@
<string
key="candidateClassName">id</string>
</object>
<object
class="IBActionInfo">
+ <string
key="name">openBookmark:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
<string
key="name">toggleStatusBar:</string>
<string
key="candidateClassName">id</string>
</object>
@@ -7716,6 +7757,7 @@
<string>convertNotes:</string>
<string>emailArchive:</string>
<string>emailDiskImage:</string>
+
<string>moveToTrash:</string>
<string>readNotes:</string>
<string>saveArchive:</string>
<string>saveDiskImage:</string>
@@ -7728,6 +7770,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary"
key="actionInfosByName">
@@ -7737,6 +7780,7 @@
<string>convertNotes:</string>
<string>emailArchive:</string>
<string>emailDiskImage:</string>
+
<string>moveToTrash:</string>
<string>readNotes:</string>
<string>saveArchive:</string>
<string>saveDiskImage:</string>
@@ -7756,6 +7800,10 @@
<string
key="candidateClassName">id</string>
</object>
<object
class="IBActionInfo">
+ <string
key="name">moveToTrash:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
<string
key="name">readNotes:</string>
<string
key="candidateClassName">id</string>
</object>
Modified: trunk/SKMainDocument.h
===================================================================
--- trunk/SKMainDocument.h 2011-02-22 11:21:01 UTC (rev 7125)
+++ trunk/SKMainDocument.h 2011-02-23 17:56:25 UTC (rev 7126)
@@ -77,6 +77,7 @@
- (IBAction)saveDiskImage:(id)sender;
- (IBAction)emailArchive:(id)sender;
- (IBAction)emailDiskImage:(id)sender;
+- (IBAction)moveToTrash:(id)sender;
@property (nonatomic, readonly) SKMainWindowController *mainWindowController;
@property (nonatomic, readonly) PDFDocument *pdfDocument;
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-02-22 11:21:01 UTC (rev 7125)
+++ trunk/SKMainDocument.m 2011-02-23 17:56:25 UTC (rev 7126)
@@ -1243,6 +1243,18 @@
}
}
+- (IBAction)moveToTrash:(id)sender {
+ NSString *path = [[self fileURL] path];
+ if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
+ NSString *folderPath = [path stringByDeletingLastPathComponent];
+ NSString *fileName = [path lastPathComponent];
+ NSInteger tag = 0;
+ if ([[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation source:folderPath
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag])
+ [self close];
+ else NSBeep();
+ } else NSBeep();
+}
+
- (void)revertAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
if (returnCode == NSAlertDefaultReturn) {
NSError *error = nil;
@@ -1290,6 +1302,9 @@
} else if ([anItem action] == @selector(saveArchive:) || [anItem action]
== @selector(saveDiskImage:) || [anItem action] == @selector(emailArchive:) ||
[anItem action] == @selector(emailDiskImage:)) {
NSString *path = [[self fileURL] path];
return path && [[NSFileManager defaultManager] fileExistsAtPath:path]
&& [self isDocumentEdited] == NO;
+ } else if ([anItem action] == @selector(moveToTrash:)) {
+ NSString *path = [[self fileURL] path];
+ return path && [[NSFileManager defaultManager] fileExistsAtPath:path];
}
return [super validateUserInterfaceItem:anItem];
}
Modified: trunk/Spanish.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/MainMenu.strings
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
