Revision: 5371
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5371&view=rev
Author:   hofman
Date:     2009-05-08 19:24:50 +0000 (Fri, 08 May 2009)

Log Message:
-----------
remove imported UTIs and use document type names instead

Modified Paths:
--------------
    trunk/Info.plist
    trunk/SKDocumentController.m

Modified: trunk/Info.plist
===================================================================
--- trunk/Info.plist    2009-05-08 13:14:03 UTC (rev 5370)
+++ trunk/Info.plist    2009-05-08 19:24:50 UTC (rev 5371)
@@ -50,13 +50,13 @@
                        <array>
                                <string>com.adobe.pdf</string>
                                <string>net.sourceforge.skim-app.pdfd</string>
-                               
<string>net.sourceforge.skim-app.embedded.pdf</string>
-                               
<string>net.sourceforge.skim-app.bare.pdf</string>
+                               <string>PDF With Embedded Notes</string>
+                               <string>PDF Without Notes</string>
                                
<string>net.sourceforge.skim-app.skimnotes</string>
-                               <string>public.plain-text</string>
-                               <string>public.rtf</string>
-                               <string>com.apple.rtfd</string>
-                               <string>com.adobe.fdf</string>
+                               <string>Notes as Text</string>
+                               <string>Notes as RTF</string>
+                               <string>Notes as RTFD</string>
+                               <string>Notes as FDF</string>
                        </array>
                </dict>
                <dict>
@@ -100,13 +100,13 @@
                        <array>
                                <string>com.adobe.pdf</string>
                                <string>net.sourceforge.skim-app.pdfd</string>
-                               
<string>net.sourceforge.skim-app.embedded.pdf</string>
-                               
<string>net.sourceforge.skim-app.bare.pdf</string>
+                               <string>PDF With Embedded Notes</string>
+                               <string>PDF Without Notes</string>
                                
<string>net.sourceforge.skim-app.skimnotes</string>
-                               <string>public.plain-text</string>
-                               <string>public.rtf</string>
-                               <string>com.apple.rtfd</string>
-                               <string>com.adobe.fdf</string>
+                               <string>Notes as Text</string>
+                               <string>Notes as RTF</string>
+                               <string>Notes as RTFD</string>
+                               <string>Notes as FDF</string>
                        </array>
                        <key>NSPersistentStoreTypeKey</key>
                        <string>Binary</string>
@@ -143,8 +143,8 @@
                        </array>
                        <key>NSExportableTypes</key>
                        <array>
-                               <string>public.plain-text</string>
-                               <string>public.rtf</string>
+                               <string>Notes as RTF</string>
+                               <string>Notes as Text</string>
                        </array>
                        <key>NSPersistentStoreTypeKey</key>
                        <string>Binary</string>
@@ -193,16 +193,16 @@
                        <key>NSExportableTypes</key>
                        <array>
                                <string>com.adobe.postscript</string>
-                               
<string>net.sourceforge.skim-app.bare.postscript</string>
+                               <string>PostScript Without Notes</string>
                                <string>com.adobe.pdf</string>
                                <string>net.sourceforge.skim-app.pdfd</string>
-                               
<string>net.sourceforge.skim-app.embedded.pdf</string>
-                               
<string>net.sourceforge.skim-app.bare.pdf</string>
+                               <string>PDF With Embedded Notes</string>
+                               <string>PDF Without Notes</string>
                                
<string>net.sourceforge.skim-app.skimnotes</string>
-                               <string>public.plain-text</string>
-                               <string>public.rtf</string>
-                               <string>com.apple.rtfd</string>
-                               <string>com.adobe.fdf</string>
+                               <string>Notes as Text</string>
+                               <string>Notes as RTF</string>
+                               <string>Notes as RTFD</string>
+                               <string>Notes as FDF</string>
                        </array>
                </dict>
                <dict>
@@ -224,10 +224,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>Editor</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               <string>net.sourceforge.skim-app.dvi</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -249,16 +245,16 @@
                        <key>NSExportableTypes</key>
                        <array>
                                <string>net.sourceforge.skim-app.dvi</string>
-                               
<string>net.sourceforge.skim-app.bare.dvi</string>
+                               <string>DVI Without Notes</string>
                                <string>com.adobe.pdf</string>
                                <string>net.sourceforge.skim-app.pdfd</string>
-                               
<string>net.sourceforge.skim-app.embedded.pdf</string>
-                               
<string>net.sourceforge.skim-app.bare.pdf</string>
+                               <string>PDF With Embedded Notes</string>
+                               <string>PDF Without Notes</string>
                                
<string>net.sourceforge.skim-app.skimnotes</string>
-                               <string>public.plain-text</string>
-                               <string>public.rtf</string>
-                               <string>com.apple.rtfd</string>
-                               <string>com.adobe.fdf</string>
+                               <string>Notes as Text</string>
+                               <string>Notes as RTF</string>
+                               <string>Notes as RTFD</string>
+                               <string>Notes as FDF</string>
                        </array>
                        <key>NSPersistentStoreTypeKey</key>
                        <string>Binary</string>
@@ -282,10 +278,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               
<string>net.sourceforge.skim-app.embedded.pdf</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -312,10 +304,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               
<string>net.sourceforge.skim-app.bare.pdf</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -338,10 +326,6 @@
                        <string>PostScript Without Notes</string>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               
<string>net.sourceforge.skim-app.bare.postscript</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -368,10 +352,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               
<string>net.sourceforge.skim-app.bare.dvi</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -392,10 +372,6 @@
                        <string>Notes as Text</string>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               <string>public.plain-text</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSPersistentStoreTypeKey</key>
@@ -418,10 +394,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               <string>public.rtf</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSPersistentStoreTypeKey</key>
@@ -444,10 +416,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>None</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               <string>com.apple.rtfd</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <true/>
                        <key>NSPersistentStoreTypeKey</key>
@@ -470,10 +438,6 @@
                        </array>
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
-                       <key>LSItemContentTypes</key>
-                       <array>
-                               <string>com.adobe.fdf</string>
-                       </array>
                        <key>LSTypeIsPackage</key>
                        <false/>
                        <key>NSDocumentClass</key>
@@ -603,125 +567,5 @@
                        </dict>
                </dict>
        </array>
-       <key>UTImportedTypeDeclarations</key>
-       <array>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                               <string>public.composite-content</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>FDF</string>
-                       <key>UTTypeIdentifier</key>
-                       <string>com.adobe.fdf</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>com.apple.ostype</key>
-                               <string>FDF </string>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>fdf</string>
-                               </array>
-                       </dict>
-               </dict>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>DVI document</string>
-                       <key>UTTypeIdentifier</key>
-                       <string>net.sourceforge.skim-app.dvi</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>dvi</string>
-                               </array>
-                       </dict>
-               </dict>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                               <string>public.composite-content</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>PDF With Embedded Notes</string>
-                       <key>UTTypeIconFile</key>
-                       <string>PDFDocument</string>
-                       <key>UTTypeIdentifier</key>
-                       <string>net.sourceforge.skim-app.embedded.pdf</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>pdf</string>
-                               </array>
-                       </dict>
-               </dict>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                               <string>public.composite-content</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>PDF Without Notes</string>
-                       <key>UTTypeIconFile</key>
-                       <string>PDFDocument</string>
-                       <key>UTTypeIdentifier</key>
-                       <string>net.sourceforge.skim-app.bare.pdf</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>pdf</string>
-                               </array>
-                       </dict>
-               </dict>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                               <string>public.composite-content</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>PostScript Without Notes</string>
-                       <key>UTTypeIconFile</key>
-                       <string>PSDocument</string>
-                       <key>UTTypeIdentifier</key>
-                       
<string>net.sourceforge.skim-app.bare.postscript</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>ps</string>
-                               </array>
-                       </dict>
-               </dict>
-               <dict>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                               <string>public.composite-content</string>
-                       </array>
-                       <key>UTTypeDescription</key>
-                       <string>DVI Without Notes</string>
-                       <key>UTTypeIconFile</key>
-                       <string>DVIDocument</string>
-                       <key>UTTypeIdentifier</key>
-                       <string>net.sourceforge.skim-app.bare.dvi</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>dvi</string>
-                               </array>
-                       </dict>
-               </dict>
-       </array>
 </dict>
 </plist>

Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m        2009-05-08 13:14:03 UTC (rev 5370)
+++ trunk/SKDocumentController.m        2009-05-08 19:24:50 UTC (rev 5371)
@@ -53,35 +53,24 @@
 
 
 // See CFBundleTypeName in Info.plist
-#define SKPDFDocumentTypeName NSPDFPboardType
-#define SKPDFBundleDocumentTypeName @"PDF Bundle"
-#define SKEmbeddedPDFDocumentTypeName @"PDF With Embedded Notes"
-#define SKBarePDFDocumentTypeName @"PDF Without Notes"
-#define SKNotesDocumentTypeName @"Skim Notes"
-#define SKNotesTextDocumentTypeName @"Notes as Text"
-#define SKNotesRTFDocumentTypeName @"Notes as RTF"
-#define SKNotesRTFDDocumentTypeName @"Notes as RTFD"
-#define SKNotesFDFDocumentTypeName @"Notes as FDF"
-#define SKPostScriptDocumentTypeName NSPostScriptPboardType
+#define SKPDFDocumentTypeName            NSPDFPboardType
+#define SKPDFBundleDocumentTypeName      @"PDF Bundle"
+#define SKEmbeddedPDFDocumentTypeName    @"PDF With Embedded Notes"
+#define SKBarePDFDocumentTypeName        @"PDF Without Notes"
+#define SKNotesDocumentTypeName          @"Skim Notes"
+#define SKNotesTextDocumentTypeName      @"Notes as Text"
+#define SKNotesRTFDocumentTypeName       @"Notes as RTF"
+#define SKNotesRTFDDocumentTypeName      @"Notes as RTFD"
+#define SKNotesFDFDocumentTypeName       @"Notes as FDF"
+#define SKPostScriptDocumentTypeName     NSPostScriptPboardType
 #define SKBarePostScriptDocumentTypeName @"PostScript Without Notes"
-#define SKDVIDocumentTypeName @"DVI document"
-#define SKBareDVIDocumentTypeName @"DVI Without Notes"
+#define SKDVIDocumentTypeName            @"DVI document"
+#define SKBareDVIDocumentTypeName        @"DVI Without Notes"
 
-#define SKPDFDocumentTypeUTI @"com.adobe.pdf"
-#define SKPDFBundleDocumentTypeUTI @"net.sourceforge.skim-app.pdfd"
-#define SKEmbeddedPDFDocumentTypeUTI @"net.sourceforge.skim-app.embedded.pdf"
-#define SKBarePDFDocumentTypeUTI @"net.sourceforge.skim-app.bare.pdf"
-#define SKNotesDocumentTypeUTI @"net.sourceforge.skim-app.skimnotes"
-#define SKNotesTextDocumentTypeUTI @"public.plain-text"
-#define SKNotesRTFDocumentTypeUTI @"public.rtf"
-#define SKNotesRTFDDocumentTypeUTI @"com.apple.rtfd"
-// I don't know the UTI for fdf, is there one?
-#define SKNotesFDFDocumentTypeUTI @"com.adobe.fdf"
-#define SKPostScriptDocumentTypeUTI @"com.adobe.postscript"
-#define SKBarePostScriptDocumentTypeUTI 
@"net.sourceforge.skim-app.bare.postscript"
-// I don't know the UTI for dvi, is there one?
-#define SKDVIDocumentTypeUTI @"net.sourceforge.skim-app.dvi"
-#define SKBareDVIDocumentTypeUTI @"net.sourceforge.skim-app.bare.dvi"
+#define SKPDFDocumentTypeUTI             @"com.adobe.pdf"
+#define SKPDFBundleDocumentTypeUTI       @"net.sourceforge.skim-app.pdfd"
+#define SKNotesDocumentTypeUTI           @"net.sourceforge.skim-app.skimnotes"
+#define SKPostScriptDocumentTypeUTI      @"com.adobe.postscript"
 
 NSString *SKPDFDocumentType = nil;
 NSString *SKPDFBundleDocumentType = nil;
@@ -97,24 +86,21 @@
 NSString *SKDVIDocumentType = nil;
 NSString *SKBareDVIDocumentType = nil;
 
-static BOOL SKIsEqualToDocumentType(NSString *docType, NSString *docTypeName, 
NSString *docUTI) {
-    return ([[NSWorkspace sharedWorkspace] 
respondsToSelector:@selector(type:conformsToType:)] && [[NSWorkspace 
sharedWorkspace] type:docType conformsToType:docUTI]) || [docType 
isEqualToString:docTypeName];
-}
+#define DEFINE_IS_DOCUMENT_TYPE(name) BOOL SKIs##name##DocumentType(NSString 
*docType) { return [docType isEqualToString:SK##name##DocumentTypeName]; }
+#define DEFINE_IS_DOCUMENT_TYPE_UTI(name) BOOL 
SKIs##name##DocumentType(NSString *docType) { return ([[NSWorkspace 
sharedWorkspace] respondsToSelector:@selector(type:conformsToType:)] && 
[[NSWorkspace sharedWorkspace] type:docType 
conformsToType:SK##name##DocumentTypeUTI]) || [docType 
isEqualToString:SK##name##DocumentTypeName]; }
 
-#define DEFINE_IS_DOCUMENT_TYPE(name) BOOL SKIs##name##DocumentType(NSString 
*docType) { return SKIsEqualToDocumentType(docType, SK##name##DocumentTypeName, 
SK##name##DocumentTypeUTI); }
-
-DEFINE_IS_DOCUMENT_TYPE(PDF)
-DEFINE_IS_DOCUMENT_TYPE(PDFBundle)
+DEFINE_IS_DOCUMENT_TYPE_UTI(PDF)
+DEFINE_IS_DOCUMENT_TYPE_UTI(PDFBundle)
+DEFINE_IS_DOCUMENT_TYPE_UTI(Notes)
+DEFINE_IS_DOCUMENT_TYPE_UTI(PostScript)
+DEFINE_IS_DOCUMENT_TYPE(DVI)
 DEFINE_IS_DOCUMENT_TYPE(EmbeddedPDF)
 DEFINE_IS_DOCUMENT_TYPE(BarePDF)
-DEFINE_IS_DOCUMENT_TYPE(Notes)
 DEFINE_IS_DOCUMENT_TYPE(NotesText)
 DEFINE_IS_DOCUMENT_TYPE(NotesRTF)
 DEFINE_IS_DOCUMENT_TYPE(NotesRTFD)
 DEFINE_IS_DOCUMENT_TYPE(NotesFDF)
-DEFINE_IS_DOCUMENT_TYPE(PostScript)
 DEFINE_IS_DOCUMENT_TYPE(BarePostScript)
-DEFINE_IS_DOCUMENT_TYPE(DVI)
 DEFINE_IS_DOCUMENT_TYPE(BareDVI)
 
 #define RETURN_IF_IS_DOCUMENT_TYPE(name) if 
(SKIs##name##DocumentType(docType)) return SK##name##DocumentType
@@ -149,23 +135,31 @@
 
 @implementation SKDocumentController
 
-#define DEFINE_DOCUMENT_TYPE(name) SK##name##DocumentType = 
floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4 ? 
SK##name##DocumentTypeName : SK##name##DocumentTypeUTI
+#define DEFINE_DOCUMENT_TYPE(name) SK##name##DocumentType = 
SK##name##DocumentTypeName
+#define DEFINE_DOCUMENT_TYPE_UTI(name) SK##name##DocumentType = 
SK##name##DocumentTypeUTI
 
 + (void)initialize {
     SKINITIALIZE;
     
-    DEFINE_DOCUMENT_TYPE(PDF);
-    DEFINE_DOCUMENT_TYPE(PDFBundle);
+    if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+        DEFINE_DOCUMENT_TYPE(PDF);
+        DEFINE_DOCUMENT_TYPE(PDFBundle);
+        DEFINE_DOCUMENT_TYPE(Notes);
+        DEFINE_DOCUMENT_TYPE(PostScript);
+    } else {
+        DEFINE_DOCUMENT_TYPE_UTI(PDF);
+        DEFINE_DOCUMENT_TYPE_UTI(PDFBundle);
+        DEFINE_DOCUMENT_TYPE_UTI(Notes);
+        DEFINE_DOCUMENT_TYPE_UTI(PostScript);
+    }
+    DEFINE_DOCUMENT_TYPE(DVI);
     DEFINE_DOCUMENT_TYPE(EmbeddedPDF);
     DEFINE_DOCUMENT_TYPE(BarePDF);
-    DEFINE_DOCUMENT_TYPE(Notes);
     DEFINE_DOCUMENT_TYPE(NotesText);
     DEFINE_DOCUMENT_TYPE(NotesRTF);
     DEFINE_DOCUMENT_TYPE(NotesRTFD);
     DEFINE_DOCUMENT_TYPE(NotesFDF);
-    DEFINE_DOCUMENT_TYPE(PostScript);
     DEFINE_DOCUMENT_TYPE(BarePostScript);
-    DEFINE_DOCUMENT_TYPE(DVI);
     DEFINE_DOCUMENT_TYPE(BareDVI);
 }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to