skim-app-commit Mailing List for Skim (Page 560)

Revision: 1669
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1669&view=rev
Author:   hofman
Date:     2007-03-29 12:16:56 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Use new skim site reverse DNS for app identifier and xattr keys and names.

Modified Paths:
--------------
    trunk/Info.plist
    trunk/NSFileManager_ExtendedAttributes.m
    trunk/SKDocument.m
    trunk/skimnotes.m

Modified: trunk/Info.plist
===================================================================
--- trunk/Info.plist	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/Info.plist	2007-03-29 19:16:56 UTC (rev 1669)
@@ -223,7 +223,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Skim</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.sourceforge.bibdesk.skim</string>
+	<string>net.sourceforge.skim-app.skim</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Modified: trunk/NSFileManager_ExtendedAttributes.m
===================================================================
--- trunk/NSFileManager_ExtendedAttributes.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/NSFileManager_ExtendedAttributes.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -130,9 +130,9 @@
 
 #define MAX_XATTR_LENGTH 2048
 #define UNIQUE_VALUE [[NSProcessInfo processInfo] globallyUniqueString]
-#define UNIQUE_KEY @"net_sourceforge_skim_unique_key"
-#define WRAPPER_KEY @"net_sourceforge_skim_has_wrapper"
-#define FRAGMENTS_KEY @"net_sourceforge_skim_number_of_fragments"
+#define UNIQUE_KEY @"net_sourceforge_skim-app_unique_key"
+#define WRAPPER_KEY @"net_sourceforge_skim-app_has_wrapper"
+#define FRAGMENTS_KEY @"net_sourceforge_skim-app_number_of_fragments"
 
 - (NSData *)extendedAttributeNamed:(NSString *)attr atPath:(NSString *)path traverseLink:(BOOL)follow error:(NSError **)error;
 {

Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/SKDocument.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -305,7 +305,7 @@
         NSError *error = nil;
         
         // first remove all old notes
-        if ([fm removeExtendedAttribute:@"net_sourceforge_skim_notes" atPath:path traverseLink:YES error:&error] == NO) {
+        if ([fm removeExtendedAttribute:@"net_sourceforge_skim-app_notes" atPath:path traverseLink:YES error:&error] == NO) {
             // should we set success to NO and return an error?
             //NSLog(@"%@: %@", self, error);
         }
@@ -315,7 +315,7 @@
             [rootObject addObject:[[notes objectAtIndex:i] dictionaryValue]];
         }
         data = [NSKeyedArchiver archivedDataWithRootObject:rootObject];
-        if ([fm setExtendedAttributeNamed:@"net_sourceforge_skim_notes" toValue:data atPath:path options:nil error:&error] == NO) {
+        if ([fm setExtendedAttributeNamed:@"net_sourceforge_skim-app_notes" toValue:data atPath:path options:nil error:&error] == NO) {
             success = NO;
             if (outError) *outError = error;
             NSLog(@"%@: %@", self, error);
@@ -331,7 +331,7 @@
     
     if ([aURL isFileURL]) {
 
-        NSData *data = [fm extendedAttributeNamed:@"net_sourceforge_skim_notes" atPath:[aURL path] traverseLink:YES error:&error];
+        NSData *data = [fm extendedAttributeNamed:@"net_sourceforge_skim-app_notes" atPath:[aURL path] traverseLink:YES error:&error];
         
         if (noteDicts)
             [noteDicts release];

Modified: trunk/skimnotes.m
===================================================================
--- trunk/skimnotes.m	2007-03-29 18:25:11 UTC (rev 1668)
+++ trunk/skimnotes.m	2007-03-29 19:16:56 UTC (rev 1669)
@@ -1,24 +1,29 @@
 #import <Foundation/Foundation.h>
 #import "NSFileManager_ExtendedAttributes.h"
 
-#define SKIM_NOTES_KEY @"net_sourceforge_skim_notes"
+#define SKIM_NOTES_KEY @"net_sourceforge_skim-app_notes"
 
-static char *usageStr = "Usage: skimnotes get|set file.pdf file.skim";
+static char *usageStr = "Usage:\n skimnotes set PDF_FILE SKIM_FILE\n skimnotes get PDF_FILE SKIM_FILE\n skimnotes remove PDF_FILE";
 static char *versionStr = "SkimNotes command-line client, version 0.1.";
 
+enum {
+    SKNActionGet,
+    SKNActionSet,
+    SKNActionRemove
+};
+
 int main (int argc, const char * argv[]) {
-	BOOL get = YES; 
+	int action = 0;
     
-    if (argc == 2 &&  (strcmp("-h", argv[1]) == 0 || strcmp("-help", argv[1]) == 0)) {
+    if (argc == 2 && (strcmp("-h", argv[1]) == 0 || strcmp("-help", argv[1]) == 0)) {
         fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
         exit (0);
-    } else if (argc < 4 ) {
-        fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
-        exit (1);
-    } else if (strcmp("get", argv[1]) == 0) {
-        get = YES;
-    } else if (strcmp("set", argv[1]) == 0) {
-        get = NO;
+    } else if (argc > 3 && strcmp("get", argv[1]) == 0) {
+        action = SKNActionGet;
+    } else if (argc > 3 && strcmp("set", argv[1]) == 0) {
+        action = SKNActionSet;
+    } else if (argc > 2 && strcmp("remove", argv[1]) == 0) {
+        action = SKNActionRemove;
     } else {
         fprintf (stderr, "%s\n%s\n", usageStr, versionStr);
         exit (1);
@@ -29,20 +34,21 @@
     NSFileManager *fm = [NSFileManager defaultManager];
     BOOL success = NO;
     NSString *pdfPath = [[[[NSProcessInfo processInfo] arguments] objectAtIndex:2] stringByStandardizingPath];
-    NSString *notesPath = [[[[NSProcessInfo processInfo] arguments] objectAtIndex:3] stringByStandardizingPath];
+    NSString *notesPath = action == SKNActionRemove ? nil : [[[[NSProcessInfo processInfo] arguments] objectAtIndex:3] stringByStandardizingPath];
     BOOL isDir = NO;
     
     if ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir) {
-    } else if (get) {
+    } else if (action == SKNActionGet) {
         NSData *data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
         if (data)
             success = [data writeToFile:notesPath atomically:YES];
-    } else if (notesPath && [fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
+    } else if (action == SKNActionSet && notesPath && [fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
         NSData *data = [NSData dataWithContentsOfFile:notesPath];
-        if (data) {
+        if (data)
             success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL] &&
                       [fm setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data atPath:pdfPath options:0 error:NULL];
-        }
+    } else if (action == SKNActionRemove) {
+        success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:NULL];
     }
     
     [pool release];


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

Revision: 1668
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1668&view=rev
Author:   hofman
Date:     2007-03-29 11:25:11 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Use popupmenu window level instead of screensaver window level for presentation mode, so it never covers the force quit window.

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2007-03-29 17:11:16 UTC (rev 1667)
+++ trunk/SKMainWindowController.m	2007-03-29 18:25:11 UTC (rev 1668)
@@ -977,7 +977,7 @@
         [mainWindow makeFirstResponder:nil];
     [fullScreenWindow setMainView:pdfView];
     [fullScreenWindow setBackgroundColor:backgroundColor];
-    [fullScreenWindow setLevel:[self isPresentation] ? NSScreenSaverWindowLevel : NSNormalWindowLevel];
+    [fullScreenWindow setLevel:[self isPresentation] ? NSPopUpMenuWindowLevel : NSNormalWindowLevel];
     [pdfView setBackgroundColor:backgroundColor];
     [pdfView layoutDocumentView];
     [pdfView setNeedsDisplay:YES];
@@ -1156,7 +1156,7 @@
         NSColor *backgroundColor = [NSColor blackColor];
         [pdfView setBackgroundColor:backgroundColor];
         [fullScreenWindow setBackgroundColor:backgroundColor];
-        [fullScreenWindow setLevel:NSScreenSaverWindowLevel];
+        [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
         
         isPresentation = YES;
     //}


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

Revision: 1667
          http://skim-app.svn.sourceforge.net/skim-app/?rev=1667&view=rev
Author:   hofman
Date:     2007-03-29 10:11:16 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
offset side window in y direction. 

Modified Paths:
--------------
    trunk/SKSideWindow.m

Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m	2007-03-29 14:33:17 UTC (rev 1666)
+++ trunk/SKSideWindow.m	2007-03-29 17:11:16 UTC (rev 1667)
@@ -82,10 +82,10 @@
 
 - (void)moveToScreen:(NSScreen *)screen {
     NSRect screenFrame = [screen frame];
-    NSRect frame = [self frame];
-    frame.size.height = NSHeight(screenFrame);
+    NSRect frame = screenFrame;
     frame.size.width = WINDOW_OFFSET;
-    frame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) - WINDOW_OFFSET : NSMinX(screenFrame);
+    if (edge == NSMaxXEdge)
+        frame.origin.x = NSMaxX(screenFrame) - WINDOW_OFFSET;
     frame = NSInsetRect(frame, 0.0, WINDOW_INSET);
     [self setFrame:frame display:NO];
 }


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