[Skim-app-commit] SF.net SVN: skim-app:[7033] trunk/SKMainDocument.m
Revision: 7033
http://skim-app.svn.sourceforge.net/skim-app/?rev=7033&view=rev
Author: hofman
Date: 2011-01-03 12:50:17 + (Mon, 03 Jan 2011)
Log Message:
---
Check for locking in tryToUnlockDocument:, avoid one unnecessary call of this
method, small code changes
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-03 12:26:05 UTC (rev 7032)
+++ trunk/SKMainDocument.m 2011-01-03 12:50:17 UTC (rev 7033)
@@ -182,8 +182,7 @@
- (void)setDataFromTmpData {
PDFDocument *pdfDoc = [tmpData pdfDocument];
-if ([pdfDoc isLocked])
-[self tryToUnlockDocument:pdfDoc];
+[self tryToUnlockDocument:pdfDoc];
[[self mainWindowController] setPdfDocument:pdfDoc];
[[self mainWindowController] addAnnotationsFromDictionaries:[tmpData
noteDicts] replace:YES];
@@ -962,8 +961,8 @@
return;
}
-if (pdfDocWithoutNotes && [pdfDocWithoutNotes
unlockWithPassword:[controller stringValue]] == NO) {
-[[controller window] orderOut:self];
+if (pdfDocWithoutNotes && [pdfDocWithoutNotes isLocked] &&
[pdfDocWithoutNotes unlockWithPassword:[controller stringValue]] == NO) {
+[[controller window] orderOut:nil];
SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
@@ -975,8 +974,8 @@
return;
}
-[[[self windowForSheet] attachedSheet] orderOut:self];
-
+[[controller window] orderOut:nil];
+
[[self progressController] setMessage:[NSLocalizedString(@"Converting
notes", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] setIndeterminate:YES];
[[self progressController] beginSheetModalForWindow:[self windowForSheet]];
@@ -1016,10 +1015,9 @@
}
if (didConvert) {
+// if pdfDocWithoutNotes was nil, the document was not encrypted, so
no need to try to unlock
if (pdfDocWithoutNotes == nil)
pdfDocWithoutNotes = [[PDFDocument alloc] initWithData:pdfData];
-if ([pdfDocWithoutNotes isLocked])
-[self tryToUnlockDocument:pdfDocWithoutNotes];
count = [pdfDocWithoutNotes pageCount];
for (i = 0; i < count; i++) {
PDFPage *page = [pdfDocWithoutNotes pageAtIndex:i];
@@ -1048,8 +1046,8 @@
if ([[self pdfDocument] isEncrypted]) {
pdfDocWithoutNotes = [[PDFDocument alloc] initWithData:pdfData];
-if ([pdfDocWithoutNotes isLocked] && [self
tryToUnlockDocument:pdfDocWithoutNotes] == NO) {
-[[[self windowForSheet] attachedSheet] orderOut:self];
+if ([self tryToUnlockDocument:pdfDocWithoutNotes] == NO) {
+[[alert window] orderOut:nil];
SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
@@ -1682,7 +1680,9 @@
- (BOOL)tryToUnlockDocument:(PDFDocument *)document {
BOOL didUnlock = NO;
-if (NSAlertAlternateReturn != [[NSUserDefaults standardUserDefaults]
integerForKey:SKSavePasswordOptionKey]) {
+if ([document isLocked] == NO) {
+didUnlock = YES;
+} else if (NSAlertAlternateReturn != [[NSUserDefaults
standardUserDefaults] integerForKey:SKSavePasswordOptionKey]) {
NSString *fileID = [[self fileIDStrings] lastObject] ?: [pdfData
md5String];
if (fileID) {
NSString *password = nil;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7034] trunk/SKMainDocument.m
Revision: 7034
http://skim-app.svn.sourceforge.net/skim-app/?rev=7034&view=rev
Author: hofman
Date: 2011-01-03 15:15:30 + (Mon, 03 Jan 2011)
Log Message:
---
fix a check
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-03 12:50:17 UTC (rev 7033)
+++ trunk/SKMainDocument.m 2011-01-03 15:15:30 UTC (rev 7034)
@@ -874,9 +874,7 @@
callback = [NSInvocation invocationWithTarget:delegate
selector:didPrintSelector argument:&self];
[callback setArgument:&contextInfo atIndex:4];
}
-if ([[self pdfDocument] allowsPrinting] == NO || (showPrintPanel &&
[printWindow attachedSheet])) {
-invokePrintCallback(callback, NO);
-} else if (callback) {
+if ([[self pdfDocument] allowsPrinting] && (showPrintPanel == NO ||
[printWindow attachedSheet] == nil)) {
NSPrintInfo *printInfo = [[[self printInfo] copy] autorelease];
NSMutableDictionary *infoDict = [printInfo dictionary];
@@ -894,6 +892,8 @@
invokePrintCallback(callback, YES);
}
}
+} else if (callback) {
+invokePrintCallback(callback, NO);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7035] trunk
Revision: 7035 http://skim-app.svn.sourceforge.net/skim-app/?rev=7035&view=rev Author: hofman Date: 2011-01-03 18:18:21 + (Mon, 03 Jan 2011) Log Message: --- update copyright dates Modified Paths: -- trunk/Dutch.lproj/InfoPlist.strings trunk/English.lproj/InfoPlist.strings trunk/French.lproj/InfoPlist.strings trunk/German.lproj/InfoPlist.strings trunk/Italian.lproj/InfoPlist.strings trunk/LICENSE trunk/QuickLook-Skim/Dutch.lproj/InfoPlist.strings trunk/QuickLook-Skim/English.lproj/InfoPlist.strings trunk/QuickLook-Skim/French.lproj/InfoPlist.strings trunk/QuickLook-Skim/German.lproj/InfoPlist.strings trunk/QuickLook-Skim/Italian.lproj/InfoPlist.strings trunk/QuickLook-Skim/Spanish.lproj/InfoPlist.strings trunk/QuickLook-Skim/pl.lproj/InfoPlist.strings trunk/QuickLook-Skim/ru.lproj/InfoPlist.strings trunk/QuickLook-Skim/zh_TW.lproj/InfoPlist.strings trunk/SkimImporter/Dutch.lproj/InfoPlist.strings trunk/SkimImporter/English.lproj/InfoPlist.strings trunk/SkimImporter/French.lproj/InfoPlist.strings trunk/SkimImporter/German.lproj/InfoPlist.strings trunk/SkimImporter/Italian.lproj/InfoPlist.strings trunk/SkimImporter/Spanish.lproj/InfoPlist.strings trunk/SkimImporter/pl.lproj/InfoPlist.strings trunk/SkimImporter/ru.lproj/InfoPlist.strings trunk/SkimImporter/zh_TW.lproj/InfoPlist.strings trunk/SkimNotes/Info.plist trunk/SkimNotes/License.txt trunk/Spanish.lproj/InfoPlist.strings trunk/pl.lproj/InfoPlist.strings trunk/ru.lproj/InfoPlist.strings trunk/zh_TW.lproj/InfoPlist.strings Modified: trunk/Dutch.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/English.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/French.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/German.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/Italian.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/LICENSE === --- trunk/LICENSE 2011-01-03 15:15:30 UTC (rev 7034) +++ trunk/LICENSE 2011-01-03 18:18:21 UTC (rev 7035) @@ -1,5 +1,5 @@ -Copyright (c) 2006, Michael O. McCracken and contributors +Copyright (c) 2006-2011, Michael O. McCracken and contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Modified: trunk/QuickLook-Skim/Dutch.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/English.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/French.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/German.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/Italian.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/Spanish.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/pl.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/ru.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/QuickLook-Skim/zh_TW.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/SkimImporter/Dutch.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/SkimImporter/English.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/SkimImporter/French.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/SkimImporter/German.lproj/InfoPlist.strings === (Binary files differ) Modified: trunk/SkimImporter/Italian.lproj/InfoPlist.strings === (Binary files di
[Skim-app-commit] SF.net SVN: skim-app:[7037] trunk/SKMainDocument.m
Revision: 7037
http://skim-app.svn.sourceforge.net/skim-app/?rev=7037&view=rev
Author: hofman
Date: 2011-01-04 11:59:37 + (Tue, 04 Jan 2011)
Log Message:
---
move some code out of sheet callbacks to call immediately
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-03 18:42:14 UTC (rev 7036)
+++ trunk/SKMainDocument.m 2011-01-04 11:59:37 UTC (rev 7037)
@@ -953,29 +953,7 @@
contextInfo:NULL];
}
-- (void)convertNotesPasswordSheetDidEnd:(SKPasswordSheetController
*)controller returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
-PDFDocument *pdfDocWithoutNotes = (PDFDocument *)contextInfo;
-
-if (returnCode == NSCancelButton) {
-[pdfDocWithoutNotes release];
-return;
-}
-
-if (pdfDocWithoutNotes && [pdfDocWithoutNotes isLocked] &&
[pdfDocWithoutNotes unlockWithPassword:[controller stringValue]] == NO) {
-[[controller window] orderOut:nil];
-
-SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
-
-[passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window]
-modalDelegate:self
-
didEndSelector:@selector(convertNotesPasswordSheetDidEnd:returnCode:contextInfo:)
- contextInfo:pdfDocWithoutNotes];
-
-return;
-}
-
-[[controller window] orderOut:nil];
-
+- (void)convertNotesUsingPDFDocument:(PDFDocument *)pdfDocWithoutNotes {
[[self progressController] setMessage:[NSLocalizedString(@"Converting
notes", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] setIndeterminate:YES];
[[self progressController] beginSheetModalForWindow:[self windowForSheet]];
@@ -1033,11 +1011,26 @@
[[self undoManager] setActionName:NSLocalizedString(@"Convert Notes",
@"Undo action name")];
}
-[pdfDocWithoutNotes release];
-
[[self progressController] dismissSheet:nil];
}
+- (void)convertNotesPasswordSheetDidEnd:(SKPasswordSheetController
*)controller returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+PDFDocument *pdfDocWithoutNotes = (PDFDocument *)contextInfo;
+
+if (returnCode == NSCancelButton) {
+[pdfDocWithoutNotes release];
+} else {
+[[controller window] orderOut:nil];
+
+if (pdfDocWithoutNotes && [pdfDocWithoutNotes isLocked] &&
[pdfDocWithoutNotes unlockWithPassword:[controller stringValue]] == NO) {
+SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
+[passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window] modalDelegate:self didEndSelector:_cmd
contextInfo:pdfDocWithoutNotes];
+} else {
+[self convertNotesUsingPDFDocument:[pdfDocWithoutNotes
autorelease]];
+}
+}
+}
+
- (void)convertNotesSheetDidEnd:(NSAlert *)alert
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
if (returnCode == NSAlertAlternateReturn)
return;
@@ -1059,7 +1052,7 @@
return;
}
}
-[self convertNotesPasswordSheetDidEnd:nil returnCode:NSOKButton
contextInfo:pdfDocWithoutNotes];
+[self convertNotesUsingPDFDocument:[pdfDocWithoutNotes autorelease]];
}
- (IBAction)convertNotes:(id)sender {
@@ -1642,28 +1635,31 @@
}
}
+- (void)doSavePasswordInKeychain:(NSString *)password {
+NSString *fileID = [[self fileIDStrings] lastObject] ?: [pdfData
md5String];
+if (fileID) {
+// first see if the password exists in the keychain
+SecKeychainItemRef itemRef = NULL;
+NSInteger status = [self getPDFPassword:nil item:&itemRef
forFileID:fileID];
+
+if (status != SKPDFPasswordStatusError)
+[self setPDFPassword:password item:itemRef forFileID:fileID];
+}
+}
+
- (void)passwordAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
NSString *password = [(NSString *)contextInfo autorelease];
-if (returnCode == NSAlertDefaultReturn) {
-NSString *fileID = [[self fileIDStrings] lastObject] ?: [pdfData
md5String];
-if (fileID) {
-// first see if the password exists in the keychain
-SecKeychainItemRef itemRef = NULL;
-NSInteger status = [self getPDFPassword:nil item:&itemRef
forFileID:fileID];
-
-if (status != SKPDFPasswordStatusError)
-[self setPDFPassword:password item:itemRef forFileID:fileID];
-}
-}
+if (returnCode == NSAle
[Skim-app-commit] SF.net SVN: skim-app:[7038] trunk
Revision: 7038
http://skim-app.svn.sourceforge.net/skim-app/?rev=7038&view=rev
Author: hofman
Date: 2011-01-05 18:06:09 + (Wed, 05 Jan 2011)
Log Message:
---
Add japanese localization
Added Paths:
---
trunk/Japanese.lproj/
trunk/Japanese.lproj/Credits.rtf
trunk/Japanese.lproj/InfoPlist.strings
trunk/Japanese.lproj/Localizable.strings
Removed Paths:
-
trunk/Japanese.lproj/Credits.rtf
trunk/Japanese.lproj/InfoPlist.strings
trunk/Japanese.lproj/Localizable.strings
Deleted: trunk/Japanese.lproj/Credits.rtf
===
--- trunk/English.lproj/Credits.rtf 2010-11-26 22:28:48 UTC (rev 6897)
+++ trunk/Japanese.lproj/Credits.rtf2011-01-05 18:06:09 UTC (rev 7038)
@@ -1,51 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 ArialMT;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\b\fs24 \cf0 Website
-\b0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-{\field{\*\fldinst{HYPERLINK "http://skim-app.sourceforge.net"}}{\fldrslt \cf0
http://skim-app.sourceforge.net}}\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\b \cf0 Design and Engineering
-\b0 \
-Christiaan M. Hofman\
-Adam R. Maxwell\
-Michael O. McCracken\
-
-\b \
-Icon
-\b0 \
-Kim Does\
-
-\b \
-Translators
-\b0 \
-Mauro Mazzieri (Italian)\
-Corentin Cras-M\'e9neur (French)\
-Alejandro C\'e1mara Iglesias (Spanish)\
-Christiaan M. Hofman (Dutch)\
-Jonas Zimmermann (German)\
-Michael Krekin (Russian)\
-Jim Chiu (Traditional Chinese)\
-Adam Strzelecki (Polish)\
-
-\b \
-With special thanks
-\b0 \
-Andy Matuschak for {\field{\*\fldinst{HYPERLINK
"http://sparkle.andymatuschak.org"}}{\fldrslt Sparkle}}\
-Martin Kahr for {\field{\*\fldinst{HYPERLINK
"http://www.martinkahr.com/source-code"}}{\fldrslt Apple Remote Controller}}\
-M. Uli Kusterer for {\field{\*\fldinst{HYPERLINK
"http://www.zathras.de"}}{\fldrslt UKKqueue}}\
-J\'e9r\'f4me Laurens for {\field{\*\fldinst{HYPERLINK
"http://itexmac.sourceforge.net/SyncTeX.html"}}{\fldrslt SyncTeX}}\
-\
-
-\b Warranty Information\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\pardirnatural
-
-\f1\b0 \cf0 This software is licensed under the BSD License:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-{\field{\*\fldinst{HYPERLINK
"http://www.opensource.org/licenses/bsd-license.php"}}{\fldrslt \cf0
http://www.opensource.org/licenses/bsd-license.php}}\
-}
\ No newline at end of file
Copied: trunk/Japanese.lproj/Credits.rtf (from rev 6990,
trunk/English.lproj/Credits.rtf)
===
--- trunk/Japanese.lproj/Credits.rtf(rev 0)
+++ trunk/Japanese.lproj/Credits.rtf2011-01-05 18:06:09 UTC (rev 7038)
@@ -0,0 +1,51 @@
+{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf350
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 ArialMT;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\b\fs24 \cf0 Website
+\b0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+{\field{\*\fldinst{HYPERLINK "http://skim-app.sourceforge.net"}}{\fldrslt \cf0
http://skim-app.sourceforge.net}}\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\b \cf0 Design and Engineering
+\b0 \
+Christiaan M. Hofman\
+Adam R. Maxwell\
+Michael O. McCracken\
+
+\b \
+Icon
+\b0 \
+Kim Does\
+
+\b \
+Translators
+\b0 \
+Mauro Mazzieri (Italian)\
+Corentin Cras-M\'e9neur (French)\
+Alejandro C\'e1mara Iglesias (Spanish)\
+Christiaan M. Hofman (Dutch)\
+Jonas Zimmermann (German)\
+Michael Krekin (Russian)\
+Jim Chiu (Traditional Chinese)\
+Adam Strzelecki (Polish)\
+
+\b \
+With special thanks
+\b0 \
+Andy Matuschak for {\field{\*\fldinst{HYPERLINK
"http://sparkle.andymatuschak.org"}}{\fldrslt Sparkle}}\
+IOSpirit for {\field{\*\fldinst{HYPERLINK
"http://www.iospirit.com/developers/"}}{\fldrslt HID Remote}}\
+M. Uli Kusterer for {\field{\*\fldinst{HYPERLINK
"http://www.zathras.de"}}{\fldrslt UKKqueue}}\
+J\'e9r\'f4me Laurens for {\field{\*\fldinst{HYPERLINK
"http://itexmac.sourceforge.net/SyncTeX.html"}}{\fldrslt SyncTeX}}\
+\
+
+\b Warranty Information\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\pardirnatural
+
+\f1\b0 \cf0 This software is licensed under the BSD License:\
+\pard\tx560\tx1120\t
[Skim-app-commit] SF.net SVN: skim-app:[7040] trunk/Japanese.lproj
Revision: 7040
http://skim-app.svn.sourceforge.net/skim-app/?rev=7040&view=rev
Author: hofman
Date: 2011-01-05 18:16:51 + (Wed, 05 Jan 2011)
Log Message:
---
Update Japanese localization, thanks Toru Ishizaki
Modified Paths:
--
trunk/Japanese.lproj/BookmarkSheet.strings
trunk/Japanese.lproj/BookmarksWindow.strings
trunk/Japanese.lproj/ConversionProgressWindow.strings
trunk/Japanese.lproj/Credits.rtf
trunk/Japanese.lproj/DisplayPreferences.strings
trunk/Japanese.lproj/DownloadPreferenceSheet.strings
trunk/Japanese.lproj/DownloadsWindow.strings
trunk/Japanese.lproj/FindPanel.strings
trunk/Japanese.lproj/GeneralPreferences.strings
trunk/Japanese.lproj/InfoPlist.strings
trunk/Japanese.lproj/InfoWindow.strings
trunk/Japanese.lproj/LeftSideView.strings
trunk/Japanese.lproj/LineInspector.strings
trunk/Japanese.lproj/Localizable.strings
trunk/Japanese.lproj/MainMenu.strings
trunk/Japanese.lproj/MainToolbar.strings
trunk/Japanese.lproj/MainWindow.strings
trunk/Japanese.lproj/NoteTypeSheet.strings
trunk/Japanese.lproj/NoteWindow.strings
trunk/Japanese.lproj/NotesDocument.strings
trunk/Japanese.lproj/NotesPanel.strings
trunk/Japanese.lproj/NotesPreferences.strings
trunk/Japanese.lproj/PageSheet.strings
trunk/Japanese.lproj/PasswordSheet.strings
trunk/Japanese.lproj/PreferenceWindow.strings
trunk/Japanese.lproj/PrintAccessoryView.strings
trunk/Japanese.lproj/ProgressSheet.strings
trunk/Japanese.lproj/ReleaseNotes.strings
trunk/Japanese.lproj/RightSideView.strings
trunk/Japanese.lproj/ScaleSheet.strings
trunk/Japanese.lproj/ServicesMenu.strings
trunk/Japanese.lproj/SnapshotWindow.strings
trunk/Japanese.lproj/SyncPreferences.strings
trunk/Japanese.lproj/TransitionSheet.strings
trunk/Japanese.lproj/ZoomValues.strings
Modified: trunk/Japanese.lproj/BookmarkSheet.strings
===
(Binary files differ)
Modified: trunk/Japanese.lproj/BookmarksWindow.strings
===
(Binary files differ)
Modified: trunk/Japanese.lproj/ConversionProgressWindow.strings
===
(Binary files differ)
Modified: trunk/Japanese.lproj/Credits.rtf
===
--- trunk/Japanese.lproj/Credits.rtf2011-01-05 18:09:02 UTC (rev 7039)
+++ trunk/Japanese.lproj/Credits.rtf2011-01-05 18:16:51 UTC (rev 7040)
@@ -1,5 +1,6 @@
-{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 ArialMT;}
+{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128
HiraKakuProN-W3;\f2\fswiss\fcharset0 ArialMT;
+}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -10,42 +11,71 @@
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\b \cf0 Design and Engineering
-\b0 \
+\f1\b \cf0
\'83\'66\'83\'55\'83\'43\'83\'93\'82\'c6\'83\'76\'83\'8d\'83\'4f\'83\'89\'83\'7e\'83\'93\'83\'4f
+\f0\b0 \
Christiaan M. Hofman\
Adam R. Maxwell\
Michael O. McCracken\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\b \
-Icon
-\b0 \
+\b \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f1 \cf0 \'83\'41\'83\'43\'83\'52\'83\'93
+\f0\b0 \
Kim Does\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\b \
-Translators
-\b0 \
-Mauro Mazzieri (Italian)\
-Corentin Cras-M\'e9neur (French)\
-Alejandro C\'e1mara Iglesias (Spanish)\
-Christiaan M. Hofman (Dutch)\
-Jonas Zimmermann (German)\
-Michael Krekin (Russian)\
-Jim Chiu (Traditional Chinese)\
-Adam Strzelecki (Polish)\
+\b \cf0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-\b \
-With special thanks
-\b0 \
+\f1 \cf0 \'96\'7c\'96\'f3
+\f0\b0 \
+Mauro Mazzieri (
+\f1 \'83\'43\'83\'5e\'83\'8a\'83\'41\'8c\'ea
+\f0 )\
+Corentin Cras-M\'e9neur (
+\f1 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea
+\f0 )\
+Alejandro C\'e1mara Iglesias (
+\f1 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea
+\f0 )\
+Christiaan M. Hofman (
+\f1 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea
+\f0 )\
+Jonas Zimmermann (
+\f1 \'83\&
[Skim-app-commit] SF.net SVN: skim-app:[7041] trunk/SkimNotes/Japanese.lproj/
Revision: 7041 http://skim-app.svn.sourceforge.net/skim-app/?rev=7041&view=rev Author: hofman Date: 2011-01-05 18:17:40 + (Wed, 05 Jan 2011) Log Message: --- Add Japanese localization Added Paths: --- trunk/SkimNotes/Japanese.lproj/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7043] trunk/SkimNotes/Japanese.lproj/SkimNotes. strings
Revision: 7043 http://skim-app.svn.sourceforge.net/skim-app/?rev=7043&view=rev Author: hofman Date: 2011-01-05 18:19:09 + (Wed, 05 Jan 2011) Log Message: --- Update Japanese localization Modified Paths: -- trunk/SkimNotes/Japanese.lproj/SkimNotes.strings Modified: trunk/SkimNotes/Japanese.lproj/SkimNotes.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7044] trunk/SkimNotes/SkimNotes.xcodeproj/project. pbxproj
Revision: 7044
http://skim-app.svn.sourceforge.net/skim-app/?rev=7044&view=rev
Author: hofman
Date: 2011-01-05 18:20:20 + (Wed, 05 Jan 2011)
Log Message:
---
Add Japanese localization to skimnotes project
Modified Paths:
--
trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
Modified: trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
===
--- trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2011-01-05 18:19:09 UTC
(rev 7043)
+++ trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2011-01-05 18:20:20 UTC
(rev 7044)
@@ -170,6 +170,7 @@
CE1414161229B7A000C9EBA0 /* SkimPDF-Tool.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimPDF-Tool.xcconfig"; sourceTree = ""; };
CE1414221229B80300C9EBA0 /* skimpdf.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= skimpdf.m; sourceTree = ""; };
CE1414251229B86500C9EBA0 /* SkimPDF_Tool_Prefix.pch */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimPDF_Tool_Prefix.pch; sourceTree = ""; };
+ CE157F2712D4EDC700515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/SkimNotes.strings; sourceTree = ""; };
CE17EF840E250E8A00DE06EA /* SkimNotes-Debug.xcconfig */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimNotes-Debug.xcconfig"; sourceTree = ""; };
CE17EF850E250E8A00DE06EA /* SkimNotes-Framework.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Framework.xcconfig"; sourceTree = ""; };
CE17EF880E250E8A00DE06EA /* SkimNotes-Release.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Release.xcconfig"; sourceTree = ""; };
@@ -788,6 +789,7 @@
CE5A82DD0E6C5403008C0AA9 /* Italian */,
CEB540910F261E9D00723C1F /* zh_TW */,
CEF877D211905CED006436A2 /* pl */,
+ CE157F2712D4EDC700515B85 /* Japanese */,
);
name = SkimNotes.strings;
sourceTree = "";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7045] trunk
Revision: 7045
http://skim-app.svn.sourceforge.net/skim-app/?rev=7045&view=rev
Author: hofman
Date: 2011-01-05 18:20:59 + (Wed, 05 Jan 2011)
Log Message:
---
Update copyright dates
Modified Paths:
--
trunk/Dutch.lproj/InfoPlist.strings
trunk/English.lproj/InfoPlist.strings
trunk/French.lproj/InfoPlist.strings
trunk/German.lproj/InfoPlist.strings
trunk/Italian.lproj/InfoPlist.strings
trunk/Skim.xcodeproj/project.pbxproj
trunk/Spanish.lproj/InfoPlist.strings
trunk/pl.lproj/InfoPlist.strings
trunk/ru.lproj/InfoPlist.strings
trunk/zh_TW.lproj/InfoPlist.strings
Modified: trunk/Dutch.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/English.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/French.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/German.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Italian.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Skim.xcodeproj/project.pbxproj
===
--- trunk/Skim.xcodeproj/project.pbxproj2011-01-05 18:20:20 UTC (rev
7044)
+++ trunk/Skim.xcodeproj/project.pbxproj2011-01-05 18:20:59 UTC (rev
7045)
@@ -591,6 +591,41 @@
CE121B2C1180770900951425 /* ScriptMenu.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; path = ScriptMenu.tiff;
sourceTree = ""; };
CE121BF911529D15001D92ED /* SKIBArray.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKIBArray.h; sourceTree = ""; };
CE121BFA11529D15001D92ED /* SKIBArray.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKIBArray.m; sourceTree = ""; };
+ CE157ED212D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/BookmarkSheet.strings; sourceTree = ""; };
+ CE157ED312D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/BookmarksWindow.strings; sourceTree = ""; };
+ CE157ED412D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/ConversionProgressWindow.strings; sourceTree = ""; };
+ CE157ED512D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/DisplayPreferences.strings; sourceTree = ""; };
+ CE157ED612D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/DownloadPreferenceSheet.strings; sourceTree = ""; };
+ CE157ED712D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/DownloadsWindow.strings; sourceTree = ""; };
+ CE157ED812D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/FindPanel.strings; sourceTree = ""; };
+ CE157ED912D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/GeneralPreferences.strings; sourceTree = ""; };
+ CE157EDA12D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/InfoWindow.strings; sourceTree = ""; };
+ CE157EDB12D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/LeftSideView.strings; sourceTree = ""; };
+ CE157EDC12D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/LineInspector.strings; sourceTree = ""; };
+ CE157EDD12D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/MainMenu.strings; sourceTree = ""; };
+ CE157EDE12D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Jap
[Skim-app-commit] SF.net SVN: skim-app:[7046] trunk
Revision: 7046
http://skim-app.svn.sourceforge.net/skim-app/?rev=7046&view=rev
Author: hofman
Date: 2011-01-05 18:25:58 + (Wed, 05 Jan 2011)
Log Message:
---
Add Japanese localizations
Modified Paths:
--
trunk/QuickLook-Skim/QuickLook-Skim.xcodeproj/project.pbxproj
trunk/SkimImporter/Japanese.lproj/schema.strings
trunk/SkimImporter/SkimImporter.xcodeproj/project.pbxproj
Added Paths:
---
trunk/QuickLook-Skim/Japanese.lproj/
trunk/QuickLook-Skim/Japanese.lproj/InfoPlist.strings
trunk/SkimImporter/Japanese.lproj/
trunk/SkimImporter/Japanese.lproj/InfoPlist.strings
Removed Paths:
-
trunk/QuickLook-Skim/Japanese.lproj/InfoPlist.strings
trunk/SkimImporter/Japanese.lproj/InfoPlist.strings
Deleted: trunk/QuickLook-Skim/Japanese.lproj/InfoPlist.strings
===
(Binary files differ)
Copied: trunk/QuickLook-Skim/Japanese.lproj/InfoPlist.strings (from rev 7035,
trunk/QuickLook-Skim/English.lproj/InfoPlist.strings)
===
(Binary files differ)
Modified: trunk/QuickLook-Skim/QuickLook-Skim.xcodeproj/project.pbxproj
===
--- trunk/QuickLook-Skim/QuickLook-Skim.xcodeproj/project.pbxproj
2011-01-05 18:20:59 UTC (rev 7045)
+++ trunk/QuickLook-Skim/QuickLook-Skim.xcodeproj/project.pbxproj
2011-01-05 18:25:58 UTC (rev 7046)
@@ -40,6 +40,7 @@
8D576316048677EA00EA77CD /* Skim.qlgenerator */ = {isa =
PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path
= Skim.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
8D576317048677EA00EA77CD /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path =
Info.plist; sourceTree = ""; };
C86B05260671AA6E00DD9006 /* CoreServices.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreServices.framework; path =
/System/Library/Frameworks/CoreServices.framework; sourceTree = ""; };
+ CE157F3512D4EE6900515B85 /* Japanese */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path
= Japanese.lproj/InfoPlist.strings; sourceTree = ""; };
CE4F80E90CFB06EE00DBEA14 /* SKQLConverter.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKQLConverter.h; sourceTree = ""; };
CE4F80EA0CFB06EE00DBEA14 /* SKQLConverter.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKQLConverter.m; sourceTree = ""; };
CE82D0AA0ED347B100020950 /* Ink.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = Ink.png; sourceTree =
""; };
@@ -284,6 +285,7 @@
CECB027F0DC5EB5DB16B /* Spanish */,
CEB5409B0F261EEF00723C1F /* zh_TW */,
CEF8779E11905C53006436A2 /* pl */,
+ CE157F3512D4EE6900515B85 /* Japanese */,
);
name = InfoPlist.strings;
sourceTree = "";
Deleted: trunk/SkimImporter/Japanese.lproj/InfoPlist.strings
===
(Binary files differ)
Copied: trunk/SkimImporter/Japanese.lproj/InfoPlist.strings (from rev 7035,
trunk/SkimImporter/English.lproj/InfoPlist.strings)
===
(Binary files differ)
Modified: trunk/SkimImporter/Japanese.lproj/schema.strings
===
(Binary files differ)
Modified: trunk/SkimImporter/SkimImporter.xcodeproj/project.pbxproj
===
--- trunk/SkimImporter/SkimImporter.xcodeproj/project.pbxproj 2011-01-05
18:20:59 UTC (rev 7045)
+++ trunk/SkimImporter/SkimImporter.xcodeproj/project.pbxproj 2011-01-05
18:25:58 UTC (rev 7046)
@@ -90,6 +90,8 @@
C86B05260671AA6E00DD9006 /* CoreServices.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreServices.framework; path =
/System/Library/Frameworks/CoreServices.framework; sourceTree = ""; };
C88FB7D7067446EC006EBB30 /* schema.xml */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path =
schema.xml; sourceTree = ""; };
C88FB7DB0674470F006EBB30 /* English */ = {isa =
PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings;
name = English; path = English.lproj/schema.strings; sourceTree = ""; };
+ CE157F5D12D4EEFD00515B85
[Skim-app-commit] SF.net SVN: skim-app:[7047] trunk/vendorsrc/andymatuschak/Sparkle
Revision: 7047
http://skim-app.svn.sourceforge.net/skim-app/?rev=7047&view=rev
Author: hofman
Date: 2011-01-05 18:30:44 + (Wed, 05 Jan 2011)
Log Message:
---
Add Japanese localizations to Sparkle
Modified Paths:
--
trunk/vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj/project.pbxproj
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/Sparkle.strings
Added Paths:
---
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUAutomaticUpdateAlert.nib/
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUAutomaticUpdateAlert.nib/classes.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUAutomaticUpdateAlert.nib/info.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdateAlert.nib/
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdateAlert.nib/classes.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdateAlert.nib/info.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdateAlert.nib/keyedobjects.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdatePermissionPrompt.nib/
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdatePermissionPrompt.nib/classes.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdatePermissionPrompt.nib/info.nib
trunk/vendorsrc/andymatuschak/Sparkle/ja.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
Modified:
trunk/vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj/project.pbxproj
===
--- trunk/vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj/project.pbxproj
2011-01-05 18:25:58 UTC (rev 7046)
+++ trunk/vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj/project.pbxproj
2011-01-05 18:30:44 UTC (rev 7047)
@@ -256,6 +256,10 @@
61F83F700DBFE137006FDD30 /* SUBasicUpdateDriver.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SUBasicUpdateDriver.m; sourceTree = ""; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path =
Info.plist; sourceTree = ""; };
8DC2EF5B0486A6940098B216 /* Sparkle.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ CE157F7912D4F00C00515B85 /* ja */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = ja; path =
ja.lproj/Sparkle.strings; sourceTree = ""; };
+ CE157F7A12D4F00C00515B85 /* ja */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = ja; path =
ja.lproj/SUAutomaticUpdateAlert.nib; sourceTree = ""; };
+ CE157F7B12D4F00C00515B85 /* ja */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = ja; path = ja.lproj/SUUpdateAlert.nib;
sourceTree = ""; };
+ CE157F7C12D4F00C00515B85 /* ja */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = ja; path =
ja.lproj/SUUpdatePermissionPrompt.nib; sourceTree = ""; };
CE5C82DF10039D2C000649DC /* CoreServices.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreServices.framework; path =
/System/Library/Frameworks/CoreServices.framework; sourceTree = ""; };
CEA7C6CB11905D8200071179 /* pl */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path =
pl.lproj/Sparkle.strings; sourceTree = ""; };
CEA7C6CC11905D8200071179 /* pl */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = pl; path =
pl.lproj/SUAutomaticUpdateAlert.nib; sourceTree = ""; };
@@ -899,6 +903,7 @@
6195D4920E404AD700D41A50 /* ru */,
CEB34AC70F5C40880037E086 /* zh_TW */,
CEA7C6CB11905D8200071179 /* pl */,
+ CE157F7912D4F00C00515B85 /* ja */,
);
name = Sparkle.strings;
sourceTree = "";
@@ -915,6 +920,7 @@
6195D4910E404AD600D41A50 /* ru */,
CEB34AC50F5C40880037E086 /* zh_TW */,
CEA7C6CC11905D8200071179 /* pl */,
+ CE157F7A12D4F00C00515B85 /* ja */,
);
name = SUAutomaticUpdateAlert.nib;
sourceTree = "";
@@ -931,6 +937,7 @@
6195D4900E404AD600D41A50 /* ru */,
CEB34AC40F5C40880037E086 /* zh_TW */,
[Skim-app-commit] SF.net SVN: skim-app:[7048] trunk
Revision: 7048
http://skim-app.svn.sourceforge.net/skim-app/?rev=7048&view=rev
Author: hofman
Date: 2011-01-05 18:59:18 + (Wed, 05 Jan 2011)
Log Message:
---
update credits for Japanese localization
Modified Paths:
--
trunk/Dutch.lproj/Credits.rtf
trunk/English.lproj/Credits.rtf
trunk/French.lproj/Credits.rtf
trunk/German.lproj/Credits.rtf
trunk/Italian.lproj/Credits.rtf
trunk/Japanese.lproj/Credits.rtf
trunk/Spanish.lproj/Credits.rtf
trunk/pl.lproj/Credits.rtf
trunk/ru.lproj/Credits.rtf
trunk/zh_TW.lproj/Credits.rtf
Modified: trunk/Dutch.lproj/Credits.rtf
===
--- trunk/Dutch.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/Dutch.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Russisch)\
Jim Chiu (Traditioneel Chinees)\
Adam Strzelecki (Pools)\
+Toru Ishizaki (Japans)\
\b \
Met speciale dank
Modified: trunk/English.lproj/Credits.rtf
===
--- trunk/English.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/English.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Russian)\
Jim Chiu (Traditional Chinese)\
Adam Strzelecki (Polish)\
+Toru Ishizaki (Japanese)\
\b \
With special thanks
Modified: trunk/French.lproj/Credits.rtf
===
--- trunk/French.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/French.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (russe)\
Jim Chiu (chinois traditionnel)\
Adam Strzelecki (Polonais)\
+Toru Ishizaki (Japonais)\
\b \
Remerciements particuliers
Modified: trunk/German.lproj/Credits.rtf
===
--- trunk/German.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/German.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Russisch)\
Jim Chiu (Traditionelles Chinesisch)\
Adam Strzelecki (Polnisch)\
+Toru Ishizaki (Japanisch)\
\b \
Besonderer Dank an
Modified: trunk/Italian.lproj/Credits.rtf
===
--- trunk/Italian.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/Italian.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Russo)\
Jim Chiu (Cinese tradizionale)\
Adam Strzelecki (Polacco)\
+Toru Ishizaki (Giapponese)\
\b \
Ringraziamenti particolari
Modified: trunk/Japanese.lproj/Credits.rtf
===
--- trunk/Japanese.lproj/Credits.rtf2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/Japanese.lproj/Credits.rtf2011-01-05 18:59:18 UTC (rev 7048)
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
+{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf350
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128
HiraKakuProN-W3;\f2\fswiss\fcharset0 ArialMT;
}
{\colortbl;\red255\green255\blue255;}
@@ -55,7 +55,7 @@
Adam Strzelecki (
\f1 \'83\'7c\'81\'5b\'83\'89\'83\'93\'83\'68\'8c\'ea
\f0 )\
-Toru Ishizaki(
+Toru Ishizaki (
\f1 \'93\'fa\'96\'7b\'8c\'ea
\f0 )\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
Modified: trunk/Spanish.lproj/Credits.rtf
===
--- trunk/Spanish.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/Spanish.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Ruso)\
Jim Chiu (Chino tradicional)\
Adam Strzelecki (Polaco)\
+Toru Ishizaki (Japon\'e9s)\
\b \
Agradecimiento Especial
Modified: trunk/pl.lproj/Credits.rtf
===
--- trunk/pl.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/pl.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Rosyjski)\
Jim Chiu (Chi\uc0\u324 ski Tradycyjny)\
Adam Strzelecki (Polski)\
+Toru Ishizaki (Japo\uc0\u324 ski)\
\b \
Specjalne podzi\uc0\u281 kowania
Modified: trunk/ru.lproj/Credits.rtf
===
--- trunk/ru.lproj/Credits.rtf 2011-01-05 18:30:44 UTC (rev 7047)
+++ trunk/ru.lproj/Credits.rtf 2011-01-05 18:59:18 UTC (rev 7048)
@@ -32,6 +32,7 @@
Michael Krekin (Russian)\
Jim Chiu (Traditional Chinese)\
Adam Strzelecki (Polish)\
+Toru Ishizaki (Japanese)\
\b \
\uc0\u1054 \u1089 \u1086 \u1073 \u1072 \u1103 \u1073 \u1083 \u1072 \u1075
\u108
[Skim-app-commit] SF.net SVN: skim-app:[7049] trunk/Skim.dmg.zip
Revision: 7049 http://skim-app.svn.sourceforge.net/skim-app/?rev=7049&view=rev Author: hofman Date: 2011-01-05 19:41:44 + (Wed, 05 Jan 2011) Log Message: --- increase size of disk image Modified Paths: -- trunk/Skim.dmg.zip Modified: trunk/Skim.dmg.zip === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7050] trunk
Revision: 7050
http://skim-app.svn.sourceforge.net/skim-app/?rev=7050&view=rev
Author: hofman
Date: 2011-01-05 23:04:06 + (Wed, 05 Jan 2011)
Log Message:
---
disable some actions for locked documents.
Modified Paths:
--
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/SKMainToolbarController.m
===
--- trunk/SKMainToolbarController.m 2011-01-05 19:41:44 UTC (rev 7049)
+++ trunk/SKMainToolbarController.m 2011-01-05 23:04:06 UTC (rev 7050)
@@ -768,11 +768,11 @@
if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
return NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
-return fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01;
+return [mainController.pdfView.document isLocked] == NO &&
fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
-return [mainController.pdfView autoScales] == NO;
+return [mainController.pdfView.document isLocked] == NO &&
[mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
-return NSIsEmptyRect([mainController.pdfView currentSelectionRect]) ==
NO;
+return [mainController.pdfView.document isLocked] == NO &&
NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
@@ -783,6 +783,8 @@
[noteButton setEnabled:enabled forSegment:SKUnderlineNote];
[noteButton setEnabled:enabled forSegment:SKStrikeOutNote];
return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO;
+} else if ([identifier
isEqualToString:SKDocumentToolbarFullScreenItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
+return [mainController.pdfView.document isLocked] == NO;
}
return YES;
}
@@ -1040,9 +1042,9 @@
[zoomInOutButton setEnabled:[mainController.pdfView canZoomOut]
forSegment:0];
[zoomInOutButton setEnabled:[mainController.pdfView canZoomIn]
forSegment:1];
[zoomInActualOutButton setEnabled:[mainController.pdfView canZoomOut]
forSegment:0];
-[zoomInActualOutButton setEnabled:fabs([mainController.pdfView
scaleFactor] - 1.0 ) > 0.01 forSegment:1];
+[zoomInActualOutButton setEnabled:[mainController.pdfView.document
isLocked] == NO && fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01
forSegment:1];
[zoomInActualOutButton setEnabled:[mainController.pdfView canZoomIn]
forSegment:2];
-[zoomActualButton setEnabled:fabs([mainController.pdfView scaleFactor] -
1.0 ) > 0.01];
+[zoomActualButton setEnabled:[mainController.pdfView.document isLocked] ==
NO && fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01];
}
- (void)handleToolModeChangedNotification:(NSNotification *)notification {
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-01-05 19:41:44 UTC (rev 7049)
+++ trunk/SKMainWindowController_UI.m 2011-01-05 23:04:06 UTC (rev 7050)
@@ -1437,13 +1437,13 @@
} else if (action == @selector(doZoomOut:)) {
return [self interactionMode] != SKPresentationMode && [pdfView
canZoomOut];
} else if (action == @selector(doZoomToActualSize:)) {
-return fabs([pdfView scaleFactor] - 1.0 ) > 0.01;
+return [[self pdfDocument] isLocked] == NO && fabs([pdfView
scaleFactor] - 1.0 ) > 0.01;
} else if (action == @selector(doZoomToPhysicalSize:)) {
return [self interactionMode] != SKPresentationMode;
} else if (action == @selector(doZoomToSelection:)) {
-return [self interactionMode] != SKPresentationMode &&
NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
+return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO && NSIsEmptyRect([pdfView currentSelectionRect])
== NO;
} else if (action == @selector(doZoomToFit:)) {
-return [self interactionMode] != SKPresenta
[Skim-app-commit] SF.net SVN: skim-app:[7051] trunk/Japanese.lproj/Localizable.strings
Revision: 7051 http://skim-app.svn.sourceforge.net/skim-app/?rev=7051&view=rev Author: hofman Date: 2011-01-06 00:26:48 + (Thu, 06 Jan 2011) Log Message: --- fix quote escapes in japanese localization Modified Paths: -- trunk/Japanese.lproj/Localizable.strings Modified: trunk/Japanese.lproj/Localizable.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7052] trunk/Japanese.lproj/MainMenu.strings
Revision: 7052 http://skim-app.svn.sourceforge.net/skim-app/?rev=7052&view=rev Author: hofman Date: 2011-01-06 00:31:17 + (Thu, 06 Jan 2011) Log Message: --- fix trile dot in japanese menu items Modified Paths: -- trunk/Japanese.lproj/MainMenu.strings Modified: trunk/Japanese.lproj/MainMenu.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7053] trunk/SKPDFDocument.m
Revision: 7053 http://skim-app.svn.sourceforge.net/skim-app/?rev=7053&view=rev Author: hofman Date: 2011-01-07 14:41:26 + (Fri, 07 Jan 2011) Log Message: --- Enable PDF popup items in print panel for encrypted documents, to e.g. allow saving as PDF Modified Paths: -- trunk/SKPDFDocument.m Modified: trunk/SKPDFDocument.m === --- trunk/SKPDFDocument.m 2011-01-06 00:31:17 UTC (rev 7052) +++ trunk/SKPDFDocument.m 2011-01-07 14:41:26 UTC (rev 7053) @@ -59,6 +59,9 @@ printOperation = [super getPrintOperationForPrintInfo:printInfo autoRotate:autoRotate]; if (printOperation printInfo] dictionary] objectForKey:SKSuppressPrintPanel] boolValue]) [printOperation setShowsPrintPanel:NO]; +// NSPrintProtected is a private key that disables the items in the PDF popup of the Print panel, and is set for encrypted documents +if ([self isEncrypted]) +[[[printOperation printInfo] dictionary] setValue:[NSNumber numberWithBool:NO] forKey:@"NSPrintProtected"]; NSPrintPanel *printPanel = [printOperation printPanel]; [printPanel setOptions:NSPrintPanelShowsCopies | NSPrintPanelShowsPageRange | NSPrintPanelShowsPaperSize | NSPrintPanelShowsOrientation | NSPrintPanelShowsScaling | NSPrintPanelShowsPreview]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7054] trunk
Revision: 7054
http://skim-app.svn.sourceforge.net/skim-app/?rev=7054&view=rev
Author: hofman
Date: 2011-01-07 16:13:52 + (Fri, 07 Jan 2011)
Log Message:
---
Disable more menu and toolbar items when the document is locked. Fix rotate
toolbar items.
Modified Paths:
--
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/SKMainToolbarController.m
===
--- trunk/SKMainToolbarController.m 2011-01-07 14:41:26 UTC (rev 7053)
+++ trunk/SKMainToolbarController.m 2011-01-07 16:13:52 UTC (rev 7054)
@@ -362,6 +362,7 @@
[item setLabels:NSLocalizedString(@"Rotate Right", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Rotate Right", @"Tool tip
message")];
[item setViewWithSizes:rotateRightButton];
+[item setMenuFormRepresentation:menuItem];
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier]) {
@@ -374,7 +375,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier]) {
-menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Rotate Left", @"Menu item title")
action:@selector(rotateAllLeft:) target:mainController] autorelease];
+menu = [NSMenu menu];
+[menu addItemWithTitle:NSLocalizedString(@"Rotate Right", @"Menu
item title") action:@selector(rotateAllRight:) target:mainController];
+[menu addItemWithTitle:NSLocalizedString(@"Rotate Left", @"Menu
item title") action:@selector(rotateAllLeft:) target:mainController];
+menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Rotate", @"Toolbar item label") submenu:menu]
autorelease];
[item setLabels:NSLocalizedString(@"Rotate", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Rotate Left or Right", @"Tool
tip message")];
@@ -773,18 +777,24 @@
return [mainController.pdfView.document isLocked] == NO &&
[mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO;
+} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarContinuousItemIdentifier]) {
+return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
-return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO;
+return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO && [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) {
-return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO && [[mainController.pdfView currentSelection] hasCharacters];
+return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO && [mainController.pdfView.document isLocked] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
+} else if ([identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
+return ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView toolMode] == SKNoteToolMode) && [mainController.pdfView
hideNotes] == NO && [mainController.pdfView.document isLocked] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
} else if ([identifier
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
BOOL enabled = ([mainController.pdfView toolMode] == SKTextToolMode ||
[mainController.pdfView too
[Skim-app-commit] SF.net SVN: skim-app:[7055] trunk/SKMainToolbarController.m
Revision: 7055 http://skim-app.svn.sourceforge.net/skim-app/?rev=7055&view=rev Author: hofman Date: 2011-01-07 18:38:38 + (Fri, 07 Jan 2011) Log Message: --- fix menus for toolbar items Modified Paths: -- trunk/SKMainToolbarController.m Modified: trunk/SKMainToolbarController.m === --- trunk/SKMainToolbarController.m 2011-01-07 16:13:52 UTC (rev 7054) +++ trunk/SKMainToolbarController.m 2011-01-07 18:38:38 UTC (rev 7055) @@ -225,7 +225,8 @@ menu = [NSMenu menu]; [menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item title") action:@selector(doGoToPreviousPage:) target:mainController]; -menuItem = [menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item title") action:@selector(doGoToFirstPage:) target:mainController]; +[menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item title") action:@selector(doGoToFirstPage:) target:mainController]; +menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Previous", @"Toolbar item label") submenu:menu] autorelease]; [item setLabels:NSLocalizedString(@"Previous", @"Toolbar item label")]; [item setToolTip:NSLocalizedString(@"Go To Previous Page", @"Tool tip message")]; @@ -239,7 +240,7 @@ menu = [NSMenu menu]; [menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item title") action:@selector(doGoToNextPage:) target:mainController]; [menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item title") action:@selector(doGoToLastPage:) target:mainController]; -menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Page", @"Toolbar item label") submenu:menu] autorelease]; +menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") submenu:menu] autorelease]; [item setLabels:NSLocalizedString(@"Next", @"Toolbar item label")]; [item setToolTip:NSLocalizedString(@"Go To Next Page", @"Tool tip message")]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7056] trunk/SKMainToolbarController.m
Revision: 7056
http://skim-app.svn.sourceforge.net/skim-app/?rev=7056&view=rev
Author: hofman
Date: 2011-01-07 18:44:58 + (Fri, 07 Jan 2011)
Log Message:
---
some more disabling on locked documents
Modified Paths:
--
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===
--- trunk/SKMainToolbarController.m 2011-01-07 18:38:38 UTC (rev 7055)
+++ trunk/SKMainToolbarController.m 2011-01-07 18:44:58 UTC (rev 7056)
@@ -778,6 +778,10 @@
return [mainController.pdfView.document isLocked] == NO &&
[mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO;
+} else if ([identifier
isEqualToString:SKDocumentToolbarScaleItemIdentifier]) {
+return [mainController.pdfView.document isLocked] == NO;
+} else if ([identifier
isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
+return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarContinuousItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
@@ -802,15 +806,17 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
-if (action == @selector(createNewTextNote:)) {
+if (action == @selector(chooseScale:)) {
+return [mainController.pdfView.document isLocked] == NO;
+} else if (action == @selector(createNewTextNote:)) {
[menuItem setState:[textNoteButton tagForSegment:0] == [menuItem tag]
? NSOnState : NSOffState];
-return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
} else if (action == @selector(createNewCircleNote:)) {
[menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
-return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
} else if (action == @selector(createNewMarkupNote:)) {
[menuItem setState:[markupNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
-return [mainController interactionMode] != SKPresentationMode &&
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
+return [mainController interactionMode] != SKPresentationMode &&
[mainController.pdfView.document isLocked] == NO && ([mainController.pdfView
toolMode] == SKTextToolMode || [mainController.pdfView toolMode] ==
SKNoteToolMode) && [mainController.pdfView hideNotes] == NO &&
[[mainController.pdfView currentSelection] hasCharacters];
}
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with tran
[Skim-app-commit] SF.net SVN: skim-app:[7057] trunk/SKMainToolbarController.m
Revision: 7057
http://skim-app.svn.sourceforge.net/skim-app/?rev=7057&view=rev
Author: hofman
Date: 2011-01-07 19:18:23 + (Fri, 07 Jan 2011)
Log Message:
---
disable print toolbar item for locked documents
Modified Paths:
--
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===
--- trunk/SKMainToolbarController.m 2011-01-07 18:44:58 UTC (rev 7056)
+++ trunk/SKMainToolbarController.m 2011-01-07 19:18:23 UTC (rev 7057)
@@ -800,6 +800,8 @@
return [mainController.pdfView.document isLocked] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateRightItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier] || [identifier
isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO;
+} else if ([identifier isEqualToString:NSToolbarPrintItemIdentifier]) {
+return [mainController.pdfView.document isLocked] == NO;
}
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7058] trunk
Revision: 7058
http://skim-app.svn.sourceforge.net/skim-app/?rev=7058&view=rev
Author: hofman
Date: 2011-01-07 20:09:41 + (Fri, 07 Jan 2011)
Log Message:
---
no snapshots of locked documents
Modified Paths:
--
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-01-07 19:18:23 UTC (rev 7057)
+++ trunk/SKMainWindowController_UI.m 2011-01-07 20:09:41 UTC (rev 7058)
@@ -1467,6 +1467,8 @@
return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO;
} else if (action == @selector(autoSelectContent:)) {
return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO && [pdfView toolMode] == SKSelectToolMode;
+} else if (action == @selector(takeSnapshot:)) {
+return [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(toggleLeftSidePane:)) {
if ([self leftSidePaneIsOpen])
[menuItem setTitle:NSLocalizedString(@"Hide Contents Pane", @"Menu
item title")];
Modified: trunk/SKPDFView.m
===
--- trunk/SKPDFView.m 2011-01-07 19:18:23 UTC (rev 7057)
+++ trunk/SKPDFView.m 2011-01-07 20:09:41 UTC (rev 7058)
@@ -2349,6 +2349,8 @@
return [[self currentSelection] hasCharacters] != 0;
} else if (action == @selector(autoSelectContent:)) {
return toolMode == SKSelectToolMode;
+} else if (action == @selector(takeSnapshot:)) {
+return [[self document] isLocked] == NO;
} else {
return [super validateMenuItem:menuItem];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7059] trunk/SKMainWindowController_UI.m
Revision: 7059
http://skim-app.svn.sourceforge.net/skim-app/?rev=7059&view=rev
Author: hofman
Date: 2011-01-07 20:16:44 + (Fri, 07 Jan 2011)
Log Message:
---
always allow to exit fullscreen or presentation mode
Modified Paths:
--
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-01-07 20:09:41 UTC (rev 7058)
+++ trunk/SKMainWindowController_UI.m 2011-01-07 20:16:44 UTC (rev 7059)
@@ -1506,13 +1506,13 @@
[menuItem setTitle:NSLocalizedString(@"Remove Full Screen", @"Menu
item title")];
else
[menuItem setTitle:NSLocalizedString(@"Full Screen", @"Menu item
title")];
-return [[self pdfDocument] isLocked] == NO;
+return [self interactionMode] != SKNormalMode || [[self pdfDocument]
isLocked] == NO;
} else if (action == @selector(togglePresentation:)) {
if ([self interactionMode] == SKPresentationMode)
[menuItem setTitle:NSLocalizedString(@"Remove Presentation",
@"Menu item title")];
else
[menuItem setTitle:NSLocalizedString(@"Presentation", @"Menu item
title")];
-return [[self pdfDocument] isLocked] == NO;
+return [self interactionMode] != SKNormalMode || [[self pdfDocument]
isLocked] == NO;
} else if (action == @selector(enterFullScreen:) || action ==
@selector(enterPresentation:)) {
return [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(getInfo:)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7060] trunk/SKMainWindowController.m
Revision: 7060
http://skim-app.svn.sourceforge.net/skim-app/?rev=7060&view=rev
Author: hofman
Date: 2011-01-08 00:04:00 + (Sat, 08 Jan 2011)
Log Message:
---
draw locked badge in placeholder thumbnail page for locked PDFs
Modified Paths:
--
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===
--- trunk/SKMainWindowController.m 2011-01-07 20:16:44 UTC (rev 7059)
+++ trunk/SKMainWindowController.m 2011-01-08 00:04:00 UTC (rev 7060)
@@ -2484,6 +2484,8 @@
CGFloat width = 0.8 * fmin(NSWidth(imgRect), NSHeight(imgRect));
imgRect = NSInsetRect(imgRect, 0.5 * (NSWidth(imgRect) - width), 0.5 *
(NSHeight(imgRect) - width));
[[NSImage imageNamed:@"NSApplicationIcon"] drawInRect:imgRect
fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:0.5];
+if ([[pdfView document] isLocked])
+[[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kLockedBadgeIcon)] drawInRect:imgRect
fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:0.5];
[image unlockFocus];
for (i = 0; i < count; i++) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7061] trunk/Japanese.lproj
Revision: 7061 http://skim-app.svn.sourceforge.net/skim-app/?rev=7061&view=rev Author: hofman Date: 2011-01-09 10:15:10 + (Sun, 09 Jan 2011) Log Message: --- Final update of japanese localization Modified Paths: -- trunk/Japanese.lproj/GeneralPreferences.strings trunk/Japanese.lproj/Localizable.strings Modified: trunk/Japanese.lproj/GeneralPreferences.strings === (Binary files differ) Modified: trunk/Japanese.lproj/Localizable.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7062] trunk/SkimNotes
Revision: 7062
http://skim-app.svn.sourceforge.net/skim-app/?rev=7062&view=rev
Author: hofman
Date: 2011-01-09 12:22:20 + (Sun, 09 Jan 2011)
Log Message:
---
bump skimnotes version number
Modified Paths:
--
trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
trunk/SkimNotes/Info.plist
trunk/SkimNotes/ReleaseNotes.rtf
Modified: trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
===
--- trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2011-01-09
10:15:10 UTC (rev 7061)
+++ trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2011-01-09
12:22:20 UTC (rev 7062)
@@ -3,7 +3,7 @@
INSTALL_PATH = @executable_path/../Frameworks
DYLIB_COMPATIBILITY_VERSION = 1.1
-DYLIB_CURRENT_VERSION = 1.2.5
+DYLIB_CURRENT_VERSION = 1.2.6
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Info.plist
Modified: trunk/SkimNotes/Info.plist
===
--- trunk/SkimNotes/Info.plist 2011-01-09 10:15:10 UTC (rev 7061)
+++ trunk/SkimNotes/Info.plist 2011-01-09 12:22:20 UTC (rev 7062)
@@ -19,7 +19,7 @@
CFBundleSignature
CFBundleVersion
- 1.2.5
+ 1.2.6
NSHumanReadableCopyright
© Christiaan M. Hofman, 2008-2011
NSPrincipalClass
Modified: trunk/SkimNotes/ReleaseNotes.rtf
===
--- trunk/SkimNotes/ReleaseNotes.rtf2011-01-09 10:15:10 UTC (rev 7061)
+++ trunk/SkimNotes/ReleaseNotes.rtf2011-01-09 12:22:20 UTC (rev 7062)
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf320
+{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf350
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}
@@ -28,8 +28,9 @@
{\list\listtemplateid25\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid2401\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid25}
{\list\listtemplateid26\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid2501\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid26}
{\list\listtemplateid27\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid2601\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid27}
-{\list\listtemplateid28\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid2701\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid28}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}}
+{\list\listtemplateid28\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker
\{disc\}}{\leveltext\leveltemplateid2701\'01\uc0\u8226
;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid28}
+{\list\listtemplateid29\listhybrid{\listlevel\levelnf
[Skim-app-commit] SF.net SVN: skim-app:[7063] trunk
Revision: 7063
http://skim-app.svn.sourceforge.net/skim-app/?rev=7063&view=rev
Author: hofman
Date: 2011-01-10 10:42:31 + (Mon, 10 Jan 2011)
Log Message:
---
convenience method for equal case insensitive strings
Modified Paths:
--
trunk/NSDocument_SKExtensions.m
trunk/NSString_SKExtensions.h
trunk/NSString_SKExtensions.m
trunk/SKFileUpdateChecker.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/SKTemplateParser.m
trunk/SKTypeSelectHelper.m
Modified: trunk/NSDocument_SKExtensions.m
===
--- trunk/NSDocument_SKExtensions.m 2011-01-09 12:22:20 UTC (rev 7062)
+++ trunk/NSDocument_SKExtensions.m 2011-01-10 10:42:31 UTC (rev 7063)
@@ -185,7 +185,7 @@
- (NSFileWrapper *)notesFileWrapperUsingTemplateFile:(NSString *)templateFile {
NSFileWrapper *fileWrapper = nil;
-if ([[templateFile pathExtension] caseInsensitiveCompare:@"rtfd"] ==
NSOrderedSame) {
+if ([[templateFile pathExtension] isCaseInsensitiveEqual:@"rtfd"]) {
NSString *templatePath = [[NSFileManager defaultManager]
pathForApplicationSupportFile:[templateFile stringByDeletingPathExtension]
ofType:[templateFile pathExtension] inDirectory:TEMPLATES_FOLDER_NAME];
NSDictionary *docAttributes = nil;
NSAttributedString *templateAttrString = [[NSAttributedString alloc]
initWithPath:templatePath documentAttributes:&docAttributes];
Modified: trunk/NSString_SKExtensions.h
===
--- trunk/NSString_SKExtensions.h 2011-01-09 12:22:20 UTC (rev 7062)
+++ trunk/NSString_SKExtensions.h 2011-01-10 10:42:31 UTC (rev 7063)
@@ -57,6 +57,8 @@
- (NSComparisonResult)localizedCaseInsensitiveNumericCompare:(NSString *)aStr;
+- (BOOL)isCaseInsensitiveEqual:(NSString *)aString;
+
- (NSString *)lossyASCIIString;
- (NSString *)lossyISOLatin1String;
Modified: trunk/NSString_SKExtensions.m
===
--- trunk/NSString_SKExtensions.m 2011-01-09 12:22:20 UTC (rev 7062)
+++ trunk/NSString_SKExtensions.m 2011-01-10 10:42:31 UTC (rev 7063)
@@ -295,6 +295,10 @@
locale:[NSLocale currentLocale]];
}
+- (BOOL)isCaseInsensitiveEqual:(NSString *)aString {
+return [aString caseInsensitiveCompare:aString] == NSOrderedSame;
+}
+
- (NSString *)lossyASCIIString {
return [[[NSString alloc] initWithData:[self
dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]
encoding:NSASCIIStringEncoding] autorelease];
}
Modified: trunk/SKFileUpdateChecker.m
===
--- trunk/SKFileUpdateChecker.m 2011-01-09 12:22:20 UTC (rev 7062)
+++ trunk/SKFileUpdateChecker.m 2011-01-10 10:42:31 UTC (rev 7063)
@@ -43,6 +43,7 @@
#import "NSData_SKExtensions.h"
#import
#import "NSUserDefaultsController_SKExtensions.h"
+#import "NSString_SKExtensions.h"
#define SKAutoReloadFileUpdateKey @"SKAutoReloadFileUpdate"
@@ -184,11 +185,11 @@
if (extension) {
NSWorkspace *ws = [NSWorkspace sharedWorkspace];
NSString *theUTI = [ws typeOfFile:[[fileName
stringByStandardizingPath] stringByResolvingSymlinksInPath] error:NULL];
-if ([extension caseInsensitiveCompare:@"pdfd"] == NSOrderedSame || [ws
type:theUTI conformsToType:@"net.sourceforge.skim-app.pdfd"]) {
+if ([extension isCaseInsensitiveEqual:@"pdfd"] || [ws type:theUTI
conformsToType:@"net.sourceforge.skim-app.pdfd"]) {
fileName = [[NSFileManager defaultManager]
bundledFileWithExtension:@"pdf" inPDFBundleAtPath:fileName error:NULL];
if (fileName == nil)
return NO;
-} else if ([extension caseInsensitiveCompare:@"dvi"] == NSOrderedSame
|| [extension caseInsensitiveCompare:@"xdv"] == NSOrderedSame) {
+} else if ([extension :@"dvi"] || [extension
isCaseInsensitiveEqual:@"xdv"]) {
isDVI = YES;
}
}
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-09 12:22:20 UTC (rev 7062)
+++ trunk/SKMainDocument.m 2011-01-10 10:42:31 UTC (rev 7063)
@@ -494,7 +494,7 @@
}
- (NSFileWrapper *)PDFBundleFileWrapperForName:(NSString *)name {
-if ([name caseInsensitiveCompare:BUNDLE_DATA_FILENAME] == NSOrderedSame)
+if ([name isCaseInsensitiveEqual:BUNDLE_DATA_FILENAME])
name = [name stringByAppendingString:@"1"];
NSData *data;
NSFileWrapper *fileWrapper = [[NSFileWrapper alloc]
initDirectoryWithFileWrappers:[NSDictionary dictionary]];
@@ -576,7 +576,7 @@
didWrite = [data writeToU
[Skim-app-commit] SF.net SVN: skim-app:[7064] trunk/SKMainWindowController.m
Revision: 7064
http://skim-app.svn.sourceforge.net/skim-app/?rev=7064&view=rev
Author: hofman
Date: 2011-01-10 13:08:03 + (Mon, 10 Jan 2011)
Log Message:
---
cancel only delayed thumbnail requests when resetting thumbnails
Modified Paths:
--
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===
--- trunk/SKMainWindowController.m 2011-01-10 10:42:31 UTC (rev 7063)
+++ trunk/SKMainWindowController.m 2011-01-10 13:08:03 UTC (rev 7064)
@@ -2468,7 +2468,8 @@
- (void)resetThumbnails {
NSUInteger i, count = [pageLabels count];
// cancel all delayed perform requests for makeImageForThumbnail:
-[[self class] cancelPreviousPerformRequestsWithTarget:self];
+for (SKThumbnail *tn in thumbnails)
+[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(makeImageForThumbnail:) object:tn];
[self willChangeValueForKey:THUMBNAILS_KEY];
[thumbnails removeAllObjects];
if (count) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7065] trunk/zh_TW.lproj/Credits.rtf
Revision: 7065
http://skim-app.svn.sourceforge.net/skim-app/?rev=7065&view=rev
Author: hofman
Date: 2011-01-10 18:21:58 + (Mon, 10 Jan 2011)
Log Message:
---
fix font
Modified Paths:
--
trunk/zh_TW.lproj/Credits.rtf
Modified: trunk/zh_TW.lproj/Credits.rtf
===
--- trunk/zh_TW.lproj/Credits.rtf 2011-01-10 13:08:03 UTC (rev 7064)
+++ trunk/zh_TW.lproj/Credits.rtf 2011-01-10 18:21:58 UTC (rev 7065)
@@ -1,6 +1,6 @@
{\rtf1\ansi\ansicpg65001\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset136 LiHeiPro;\f1\fswiss\fcharset0
Helvetica;\f2\fnil\fcharset128 HiraKakuProN-W3;
-\f3\fswiss\fcharset0 ArialMT;}
+{\fonttbl\f0\fnil\fcharset136 LiHeiPro;\f1\fswiss\fcharset0
Helvetica;\f2\fswiss\fcharset0 ArialMT;
+}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -56,7 +56,7 @@
\f0 \'aa\'69\'c4\'f5\'a4\'e5
\f1 )\
Toru Ishizaki (
-\f2 \'93\'fa\'95\'b6
+\f0 \'a4\'e9\'a4\'e5
\f1 )\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -84,9 +84,9 @@
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc\pardirnatural
\f0\b0 \cf0 \'b3\'6f\'ae\'4d\'b3\'6e\'c5\'e9\'a5\'d1
-\f3 BSD
+\f2 BSD
\f0 \'b3\'5c\'a5\'69\'c3\'d2\'b1\'c2\'c5\'76
-\f3 :\
+\f2 :\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
{\field{\*\fldinst{HYPERLINK
"http://www.opensource.org/licenses/bsd-license.php"}}{\fldrslt \cf0
http://www.opensource.org/licenses/bsd-license.php}}\
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7066] trunk/Spanish.lproj/MainMenu.strings
Revision: 7066 http://skim-app.svn.sourceforge.net/skim-app/?rev=7066&view=rev Author: hofman Date: 2011-01-10 18:36:54 + (Mon, 10 Jan 2011) Log Message: --- fix spanish localization Modified Paths: -- trunk/Spanish.lproj/MainMenu.strings Modified: trunk/Spanish.lproj/MainMenu.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7067] trunk/displayline
Revision: 7067
http://skim-app.svn.sourceforge.net/skim-app/?rev=7067&view=rev
Author: hofman
Date: 2011-01-11 11:07:58 + (Tue, 11 Jan 2011)
Log Message:
---
-g option for displayline script to update in background
Modified Paths:
--
trunk/displayline
Modified: trunk/displayline
===
--- trunk/displayline 2011-01-10 18:36:54 UTC (rev 7066)
+++ trunk/displayline 2011-01-11 11:07:58 UTC (rev 7067)
@@ -5,18 +5,21 @@
# Usage: displayline [-r] [-b] LINE PDFFILE [TEXSOURCEFILE]
if [ $# == 0 -o "$1" == "-h" -o "$1" == "-help" ]; then
- echo "Usage: displayline [-r] [-b] LINE PDFFILE [TEXSOURCEFILE]"
+ echo "Usage: displayline [-r] [-b] [-g] LINE PDFFILE [TEXSOURCEFILE]"
exit 0
fi
# get arguments
revert=0
bar=0
+activate=1
while [ "${1:0:1}" == "-" ]; do
if [ "$1" == "-r" -o "$1" == "-revert" ]; then
revert=1;
elif [ "$1" == "-b" -o "$1" == "-readingbar" ]; then
bar=1
+ elif [ "$1" == "-g" -o "$1" == "-background" ]; then
+activate=0
fi
shift
done
@@ -30,19 +33,20 @@
# pass arguments as NULL-separated string to osascript
# pass through cat to get them as raw bytes to preserve non-ASCII characters
-echo -ne "${line}\x00${file}\x00${source}\x00${revert}\x00${bar}\x00" | \
+echo -ne
"${line}\x00${file}\x00${source}\x00${revert}\x00${bar}\x00${activate}\x00" | \
/usr/bin/osascript \
-e "set theArgv to do shell script \"/bin/cat\"" \
-e "set AppleScript's text item delimiters to ASCII character 0" \
- -e "set {theLine, theFile, theSource, shouldRevert, shouldShowBar} to text
items of theArgv" \
+ -e "set {theLine, theFile, theSource, shouldRevert, shouldShowBar,
shouldActivate} to text items of theArgv" \
-e "set theLine to theLine as integer" \
-e "set theFile to POSIX file theFile" \
-e "set theSource to POSIX file theSource" \
-e "set shouldRevert to (shouldRevert as integer) as boolean" \
-e "set shouldShowBar to (shouldShowBar as integer) as boolean" \
+ -e "set shouldActivate to (shouldActivate as integer) as boolean" \
-e "set thePath to POSIX path of (theFile as alias)" \
-e "tell application \"Skim\"" \
- -e " activate" \
+ -e " if shouldActivate then activate" \
-e " if shouldRevert then" \
-e "try" \
-e " set theDocs to get documents whose path is thePath" \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7068] trunk/displayline
Revision: 7068 http://skim-app.svn.sourceforge.net/skim-app/?rev=7068&view=rev Author: hofman Date: 2011-01-11 11:47:43 + (Tue, 11 Jan 2011) Log Message: --- document displayline options Modified Paths: -- trunk/displayline Modified: trunk/displayline === --- trunk/displayline 2011-01-11 11:07:58 UTC (rev 7067) +++ trunk/displayline 2011-01-11 11:47:43 UTC (rev 7068) @@ -2,10 +2,14 @@ # displayline (Skim) # -# Usage: displayline [-r] [-b] LINE PDFFILE [TEXSOURCEFILE] +# Usage: displayline [-r] [-b] [-g] LINE PDFFILE [TEXSOURCEFILE] if [ $# == 0 -o "$1" == "-h" -o "$1" == "-help" ]; then - echo "Usage: displayline [-r] [-b] [-g] LINE PDFFILE [TEXSOURCEFILE]" + echo "Usage: displayline [-r] [-b] [-g] LINE PDFFILE [TEXSOURCEFILE] +Options: +-r, -revert Revert the file from disk if it was open +-b, -readingbar Indicate the line using the reading bar +-g, -background Do not bring Skim to the foreground" exit 0 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7069] trunk/displayline
Revision: 7069
http://skim-app.svn.sourceforge.net/skim-app/?rev=7069&view=rev
Author: hofman
Date: 2011-01-11 15:30:32 + (Tue, 11 Jan 2011)
Log Message:
---
set some options in displayline script directly in applescript text
Modified Paths:
--
trunk/displayline
Modified: trunk/displayline
===
--- trunk/displayline 2011-01-11 11:47:43 UTC (rev 7068)
+++ trunk/displayline 2011-01-11 15:30:32 UTC (rev 7069)
@@ -14,16 +14,16 @@
fi
# get arguments
-revert=0
-bar=0
-activate=1
+revert=false
+bar=false
+activate=true
while [ "${1:0:1}" == "-" ]; do
if [ "$1" == "-r" -o "$1" == "-revert" ]; then
-revert=1;
+revert=true
elif [ "$1" == "-b" -o "$1" == "-readingbar" ]; then
-bar=1
+bar=true
elif [ "$1" == "-g" -o "$1" == "-background" ]; then
-activate=0
+activate=false
fi
shift
done
@@ -35,28 +35,24 @@
[ "${file:0:1}" == "/" ] || file="${PWD}/${file}"
[ "${source:0:1}" == "/" ] || source="${PWD}/${source}"
-# pass arguments as NULL-separated string to osascript
+# pass file arguments as NULL-separated string to osascript
# pass through cat to get them as raw bytes to preserve non-ASCII characters
-echo -ne
"${line}\x00${file}\x00${source}\x00${revert}\x00${bar}\x00${activate}\x00" | \
+echo -ne "${file}\x00${source}" | \
/usr/bin/osascript \
-e "set theArgv to do shell script \"/bin/cat\"" \
-e "set AppleScript's text item delimiters to ASCII character 0" \
- -e "set {theLine, theFile, theSource, shouldRevert, shouldShowBar,
shouldActivate} to text items of theArgv" \
- -e "set theLine to theLine as integer" \
+ -e "set {theFile, theSource} to text items of theArgv" \
-e "set theFile to POSIX file theFile" \
-e "set theSource to POSIX file theSource" \
- -e "set shouldRevert to (shouldRevert as integer) as boolean" \
- -e "set shouldShowBar to (shouldShowBar as integer) as boolean" \
- -e "set shouldActivate to (shouldActivate as integer) as boolean" \
-e "set thePath to POSIX path of (theFile as alias)" \
-e "tell application \"Skim\"" \
- -e " if shouldActivate then activate" \
- -e " if shouldRevert then" \
+ -e " if $activate then activate" \
+ -e " if $revert then" \
-e "try" \
-e " set theDocs to get documents whose path is thePath" \
-e " if (count of theDocs) > 0 then revert theDocs" \
-e "end try" \
-e " end if" \
-e " open theFile" \
- -e " tell front document to go to TeX line theLine from theSource showing
reading bar shouldShowBar" \
+ -e " tell front document to go to TeX line $line from theSource showing
reading bar $bar" \
-e "end tell" -
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7070] trunk/SKMainDocument.m
Revision: 7070
http://skim-app.svn.sourceforge.net/skim-app/?rev=7070&view=rev
Author: hofman
Date: 2011-01-12 13:39:54 + (Wed, 12 Jan 2011)
Log Message:
---
rename method and enum values for open/save panels
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-11 15:30:32 UTC (rev 7069)
+++ trunk/SKMainDocument.m 2011-01-12 13:39:54 UTC (rev 7070)
@@ -918,8 +918,8 @@
NSBeep();
}
-- (void)openPanelDidEnd:(NSOpenPanel *)oPanel returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
-if (returnCode == NSOKButton) {
+- (void)readNotesPanelDidEnd:(NSOpenPanel *)oPanel
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+if (returnCode == NSFileHandlingPanelOKButton) {
NSURL *notesURL = [[oPanel URLs] objectAtIndex:0];
BOOL replace = ([[oPanel accessoryView]
isEqual:readNotesAccessoryView] && [replaceNotesCheckButton state] ==
NSOnState);
[self readNotesFromURL:notesURL replace:replace];
@@ -949,7 +949,7 @@
types:[NSArray arrayWithObjects:@"skim", @"fdf",
nil]
modalForWindow:[self windowForSheet]
modalDelegate:self
-
didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
+
didEndSelector:@selector(readNotesPanelDidEnd:returnCode:contextInfo:)
contextInfo:NULL];
}
@@ -1075,7 +1075,7 @@
}
- (void)archiveSavePanelDidEnd:(NSSavePanel *)sheet
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
-if (NSOKButton == returnCode && [self fileURL])
+if (NSFileHandlingPanelOKButton == returnCode && [self fileURL])
[self saveArchiveToFile:[sheet filename]];
}
@@ -1202,7 +1202,7 @@
}
- (void)diskImageSavePanelDidEnd:(NSSavePanel *)sheet
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
-if (NSOKButton == returnCode && [self fileURL])
+if (NSFileHandlingPanelOKButton == returnCode && [self fileURL])
[self saveDiskImageToFile:[sheet filename] email:NO];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7071] trunk/SKFileUpdateChecker.m
Revision: 7071
http://skim-app.svn.sourceforge.net/skim-app/?rev=7071&view=rev
Author: hofman
Date: 2011-01-14 13:50:11 + (Fri, 14 Jan 2011)
Log Message:
---
fix typo
Modified Paths:
--
trunk/SKFileUpdateChecker.m
Modified: trunk/SKFileUpdateChecker.m
===
--- trunk/SKFileUpdateChecker.m 2011-01-12 13:39:54 UTC (rev 7070)
+++ trunk/SKFileUpdateChecker.m 2011-01-14 13:50:11 UTC (rev 7071)
@@ -189,7 +189,7 @@
fileName = [[NSFileManager defaultManager]
bundledFileWithExtension:@"pdf" inPDFBundleAtPath:fileName error:NULL];
if (fileName == nil)
return NO;
-} else if ([extension :@"dvi"] || [extension
isCaseInsensitiveEqual:@"xdv"]) {
+} else if ([extension isCaseInsensitiveEqual:@"dvi"] || [extension
isCaseInsensitiveEqual:@"xdv"]) {
isDVI = YES;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7072] trunk/SKFileUpdateChecker.m
Revision: 7072
http://skim-app.svn.sourceforge.net/skim-app/?rev=7072&view=rev
Author: hofman
Date: 2011-01-15 15:54:37 + (Sat, 15 Jan 2011)
Log Message:
---
set fileChangedOnDisk flag when it is moved, so we can override the
revertDocument: action
Modified Paths:
--
trunk/SKFileUpdateChecker.m
Modified: trunk/SKFileUpdateChecker.m
===
--- trunk/SKFileUpdateChecker.m 2011-01-14 13:50:11 UTC (rev 7071)
+++ trunk/SKFileUpdateChecker.m 2011-01-15 15:54:37 UTC (rev 7072)
@@ -286,6 +286,7 @@
if ([watchedFile isEqualToString:[[notification userInfo]
objectForKey:PATH_KEY]])
[self stopCheckingFileUpdates];
// If the file is moved, NSDocument will notice and will call setFileURL,
where we start watching again
+fucFlags.fileChangedOnDisk = YES;
}
- (void)handleFileDeleteNotification:(NSNotification *)notification {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7073] trunk/NSString_SKExtensions.m
Revision: 7073
http://skim-app.svn.sourceforge.net/skim-app/?rev=7073&view=rev
Author: hofman
Date: 2011-01-16 16:47:00 + (Sun, 16 Jan 2011)
Log Message:
---
fix comparison method
Modified Paths:
--
trunk/NSString_SKExtensions.m
Modified: trunk/NSString_SKExtensions.m
===
--- trunk/NSString_SKExtensions.m 2011-01-15 15:54:37 UTC (rev 7072)
+++ trunk/NSString_SKExtensions.m 2011-01-16 16:47:00 UTC (rev 7073)
@@ -296,7 +296,7 @@
}
- (BOOL)isCaseInsensitiveEqual:(NSString *)aString {
-return [aString caseInsensitiveCompare:aString] == NSOrderedSame;
+return [self caseInsensitiveCompare:aString] == NSOrderedSame;
}
- (NSString *)lossyASCIIString {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7074] trunk/SKMainDocument.m
Revision: 7074 http://skim-app.svn.sourceforge.net/skim-app/?rev=7074&view=rev Author: hofman Date: 2011-01-20 15:59:28 + (Thu, 20 Jan 2011) Log Message: --- don't read notes from FDF on 10.6 as we cannot parse them Modified Paths: -- trunk/SKMainDocument.m Modified: trunk/SKMainDocument.m === --- trunk/SKMainDocument.m 2011-01-16 16:47:00 UTC (rev 7073) +++ trunk/SKMainDocument.m 2011-01-20 15:59:28 UTC (rev 7074) @@ -946,7 +946,7 @@ [oPanel beginSheetForDirectory:[path stringByDeletingLastPathComponent] file:[path lastPathComponentReplacingPathExtension:@"skim"] - types:[NSArray arrayWithObjects:@"skim", @"fdf", nil] + types:[NSArray arrayWithObjects:@"skim", NSAppKitVersionNumber > NSAppKitVersionNumber10_5 ? nil : @"fdf", nil] modalForWindow:[self windowForSheet] modalDelegate:self didEndSelector:@selector(readNotesPanelDidEnd:returnCode:contextInfo:) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7075] trunk
Revision: 7075
http://skim-app.svn.sourceforge.net/skim-app/?rev=7075&view=rev
Author: hofman
Date: 2011-01-21 16:10:14 + (Fri, 21 Jan 2011)
Log Message:
---
convenience class factory method for our errors
Modified Paths:
--
trunk/NSDocument_SKExtensions.h
trunk/NSDocument_SKExtensions.m
trunk/SKConversionProgressController.m
trunk/SKDocumentController.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
---
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
Modified: trunk/NSDocument_SKExtensions.h
===
--- trunk/NSDocument_SKExtensions.h 2011-01-20 15:59:28 UTC (rev 7074)
+++ trunk/NSDocument_SKExtensions.h 2011-01-21 16:10:14 UTC (rev 7075)
@@ -39,15 +39,7 @@
#import
#import
-extern NSString *SKDocumentErrorDomain;
-
enum {
-SKWriteFileError = 1,
-SKReadFileError = 2,
-SKReadPasteboardError = 3
-};
-
-enum {
SKNormalMode,
SKFullScreenMode,
SKPresentationMode
Modified: trunk/NSDocument_SKExtensions.m
===
--- trunk/NSDocument_SKExtensions.m 2011-01-20 15:59:28 UTC (rev 7074)
+++ trunk/NSDocument_SKExtensions.m 2011-01-21 16:10:14 UTC (rev 7075)
@@ -51,8 +51,6 @@
#import "NSWindowController_SKExtensions.h"
#import "PDFPage_SKExtensions.h"
-NSString *SKDocumentErrorDomain = @"SKDocumentErrorDomain";
-
#define SKDisableExportAttributesKey @"SKDisableExportAttributes"
#define TEMPLATES_FOLDER_NAME @"Templates"
Added: trunk/NSError_SKExtensions.h
===
--- trunk/NSError_SKExtensions.h(rev 0)
+++ trunk/NSError_SKExtensions.h2011-01-21 16:10:14 UTC (rev 7075)
@@ -0,0 +1,56 @@
+//
+// NSError_SKExtensions.h
+// Skim
+//
+// Created by Christiaan Hofman on 1/21/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import
+
+extern NSString *SKDocumentErrorDomain;
+
+enum {
+SKWriteFileError = 1,
+SKReadFileError = 2,
+SKReadPasteboardError = 3
+};
+
+@interface NSError (SKExtensions)
+
++ (id)writeFileErrorWithLocalizedDescription:(NSString *)description;
++ (id)readFileErrorWithLocalizedDescription:(NSString *)description;
++ (id)readPasteboardErrorWithLocalizedDescription:(NSString *)description;
++ (id)userCancelledErrorWithUnderlyingError:(NSError *)error;
+
+@end
Added: trunk/NSError_SKExtensions.m
===
--- trunk/NSError_SKExtensions.m(rev 0)
+++ trunk/NSError_SKExtensions.m2011-01-21 16:10:14 UTC (rev 7075)
@@ -0,0 +1,61 @@
+//
+// NSError_SKExtensions.m
+// Skim
+//
+// Created by Christiaan Hofman on 1/21/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the follo
[Skim-app-commit] SF.net SVN: skim-app:[7076] trunk
Revision: 7076
http://skim-app.svn.sourceforge.net/skim-app/?rev=7076&view=rev
Author: hofman
Date: 2011-01-21 16:16:05 + (Fri, 21 Jan 2011)
Log Message:
---
convenience method to identify user cancelled error
Modified Paths:
--
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
trunk/SKApplicationController.m
trunk/SKBookmarkController.m
trunk/SKDocumentController.m
trunk/SKDownloadController.m
trunk/SKFileUpdateChecker.m
trunk/SKMainDocument.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
Modified: trunk/NSError_SKExtensions.h
===
--- trunk/NSError_SKExtensions.h2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/NSError_SKExtensions.h2011-01-21 16:16:05 UTC (rev 7076)
@@ -53,4 +53,6 @@
+ (id)readPasteboardErrorWithLocalizedDescription:(NSString *)description;
+ (id)userCancelledErrorWithUnderlyingError:(NSError *)error;
+- (BOOL)isUserCancelledError;
+
@end
Modified: trunk/NSError_SKExtensions.m
===
--- trunk/NSError_SKExtensions.m2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/NSError_SKExtensions.m2011-01-21 16:16:05 UTC (rev 7076)
@@ -58,4 +58,8 @@
return [NSError errorWithDomain:NSCocoaErrorDomain
code:NSUserCancelledError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:error, NSUnderlyingErrorKey, nil]];
}
+- (BOOL)isUserCancelledError {
+return [[self domain] isEqualToString:NSCocoaErrorDomain] && [self code]
== NSUserCancelledError;
+}
+
@end
Modified: trunk/SKApplicationController.m
===
--- trunk/SKApplicationController.m 2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKApplicationController.m 2011-01-21 16:16:05 UTC (rev 7076)
@@ -73,6 +73,7 @@
#import "SKScriptMenu.h"
#import "NSScreen_SKExtensions.h"
#import "PDFAnnotation_SKExtensions.h"
+#import "NSError_SKExtensions.h"
#define WEBSITE_URL @"http://skim-app.sourceforge.net/";
#define WIKI_URL@"http://sourceforge.net/apps/mediawiki/skim-app/";
@@ -165,8 +166,7 @@
while (dict = [fileEnum nextObject]) {
error = nil;
-if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:dict error:&error] && error &&
-([[error domain] isEqualToString:NSCocoaErrorDomain] == NO ||
[error code] != NSUserCancelledError))
+if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:dict error:&error] && error && [error
isUserCancelledError] == NO)
[NSApp presentError:error];
}
}
Modified: trunk/SKBookmarkController.m
===
--- trunk/SKBookmarkController.m2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKBookmarkController.m2011-01-21 16:16:05 UTC (rev 7076)
@@ -51,6 +51,7 @@
#import "SKDocumentController.h"
#import "SKSeparatorCell.h"
#import "NSMenu_SKExtensions.h"
+#import "NSError_SKExtensions.h"
#define SKBookmarkRowsPboardType @"SKBookmarkRowsPboardType"
@@ -358,7 +359,7 @@
[bookmark pageIndex] != NSNotFound)
[[document mainWindowController] setPageNumber:[bookmark
pageIndex] + 1];
}
-if (document == nil && error && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError))
+if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
}
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKDocumentController.m2011-01-21 16:16:05 UTC (rev 7076)
@@ -271,7 +271,7 @@
NSError *error = nil;
id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
-if (document == nil && error && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError))
+if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
}
Modified: trunk/SKDownloadController.m
===
--- trunk/SKDownloadController.m2011-01-21 16:10:14 UTC (rev 7075)
+++ trunk/SKDownloadController.m2011-01-21 16:16:05 UTC (rev 7076)
@@ -48,6 +48,7 @@
#import "NSGeometry_SKExtensions.h"
#import "NSWindowController_SKExtensions.h"
#import "SKDownloadPrefe
[Skim-app-commit] SF.net SVN: skim-app:[7077] trunk/SKMainDocument.m
Revision: 7077
http://skim-app.svn.sourceforge.net/skim-app/?rev=7077&view=rev
Author: hofman
Date: 2011-01-21 18:08:03 + (Fri, 21 Jan 2011)
Log Message:
---
use convenience method
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-01-21 16:16:05 UTC (rev 7076)
+++ trunk/SKMainDocument.m 2011-01-21 18:08:03 UTC (rev 7077)
@@ -701,7 +701,7 @@
defaultButton:NSLocalizedString(@"No", @"Button title")
alternateButton:NSLocalizedString(@"Yes", @"Button title")
otherButton:nil
-
informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the
notes at %@. %@ Do you want to continue to open the PDF document anyway?",
@"Informative text in alert dialog"), [path
stringByAbbreviatingWithTildeInPath], [[error userInfo]
objectForKey:NSLocalizedDescriptionKey]];
+
informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the
notes at %@. %@ Do you want to continue to open the PDF document anyway?",
@"Informative text in alert dialog"), [path
stringByAbbreviatingWithTildeInPath], [error localizedDescription]];
if ([alert runModal] == NSAlertDefaultReturn) {
[data release];
data = nil;
@@ -741,7 +741,7 @@
defaultButton:NSLocalizedString(@"No", @"Button title")
alternateButton:NSLocalizedString(@"Yes", @"Button title")
otherButton:nil
-
informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the
notes at %@. %@ Do you want to continue to open the PDF document anyway?",
@"Informative text in alert dialog"), [[absoluteURL path]
stringByAbbreviatingWithTildeInPath], [[error userInfo]
objectForKey:NSLocalizedDescriptionKey]];
+
informativeTextWithFormat:NSLocalizedString(@"Skim was not able to read the
notes at %@. %@ Do you want to continue to open the PDF document anyway?",
@"Informative text in alert dialog"), [[absoluteURL path]
stringByAbbreviatingWithTildeInPath], [error localizedDescription]];
if ([alert runModal] == NSAlertDefaultReturn) {
[fileData release];
fileData = nil;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7078] trunk/SKDownloadController.m
Revision: 7078 http://skim-app.svn.sourceforge.net/skim-app/?rev=7078&view=rev Author: hofman Date: 2011-01-21 18:23:02 + (Fri, 21 Jan 2011) Log Message: --- explicitly change enabled state of downloads Clear button when a download did end, because the binding mechanism does not notice the changes Modified Paths: -- trunk/SKDownloadController.m Modified: trunk/SKDownloadController.m === --- trunk/SKDownloadController.m2011-01-21 18:08:03 UTC (rev 7077) +++ trunk/SKDownloadController.m2011-01-21 18:23:02 UTC (rev 7078) @@ -319,6 +319,8 @@ [[self window] close]; } } +// binding does not notice the change to canRemove +[clearButton setEnabled:[[downloads valueForKeyPath:@"@max.canRemove"] boolValue]]; } #pragma mark NSTableViewDataSource This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7079] trunk
Revision: 7079
http://skim-app.svn.sourceforge.net/skim-app/?rev=7079&view=rev
Author: hofman
Date: 2011-01-24 11:03:32 + (Mon, 24 Jan 2011)
Log Message:
---
move bookmark opening code to bookmark class
Modified Paths:
--
trunk/SKBookmark.h
trunk/SKBookmark.m
trunk/SKBookmarkController.h
trunk/SKBookmarkController.m
Modified: trunk/SKBookmark.h
===
--- trunk/SKBookmark.h 2011-01-21 18:23:02 UTC (rev 7078)
+++ trunk/SKBookmark.h 2011-01-24 11:03:32 UTC (rev 7079)
@@ -93,4 +93,6 @@
- (BOOL)isDescendantOf:(SKBookmark *)bookmark;
- (BOOL)isDescendantOfArray:(NSArray *)bookmarks;
+- (void)open;
+
@end
Modified: trunk/SKBookmark.m
===
--- trunk/SKBookmark.m 2011-01-21 18:23:02 UTC (rev 7078)
+++ trunk/SKBookmark.m 2011-01-24 11:03:32 UTC (rev 7079)
@@ -39,9 +39,12 @@
#import "SKBookmark.h"
#import "BDAlias.h"
#import "NSImage_SKExtensions.h"
-#import "SKBookmarkController.h"
#import "NSDocument_SKExtensions.h"
#import "SKDocumentController.h"
+#import "NSFileManager_SKExtensions.h"
+#import "SKMainDocument.h"
+#import "SKMainWindowController.h"
+#import "NSError_SKExtensions.h"
#define BOOKMARK_STRING @"bookmark"
#define SESSION_STRING @"session"
@@ -291,6 +294,8 @@
return NO;
}
+- (void)open {}
+
@end
#pragma mark -
@@ -505,6 +510,23 @@
}
}
+- (void)open {
+id document = nil;
+NSError *error = nil;
+if (setup) {
+document = [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:[self properties] error:&error];
+} else {
+NSString *path = [self path];
+NSURL *fileURL = path ? [NSURL fileURLWithPath:path] : nil;
+if (fileURL && NO == [[NSFileManager defaultManager]
isTrashedFileAtURL:fileURL] &&
+(document = [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:fileURL display:YES error:&error]) &&
+[document isPDFDocument] && [self pageIndex] != NSNotFound)
+[[document mainWindowController] setPageNumber:[self pageIndex] +
1];
+}
+if (document == nil && error && [error isUserCancelledError] == NO)
+[NSApp presentError:error];
+}
+
@end
#pragma mark -
@@ -658,6 +680,12 @@
return [super newScriptingObjectOfClass:objectClass forValueForKey:key
withContentsValue:contentsValue properties:properties];
}
+- (void)open {
+NSInteger i = [children count];
+while (i--)
+[[children objectAtIndex:i] open];
+}
+
@end
#pragma mark -
Modified: trunk/SKBookmarkController.h
===
--- trunk/SKBookmarkController.h2011-01-21 18:23:02 UTC (rev 7078)
+++ trunk/SKBookmarkController.h2011-01-24 11:03:32 UTC (rev 7079)
@@ -64,10 +64,8 @@
- (void)addBookmarkForSetup:(NSDictionary *)setupDict label:(NSString *)label
toFolder:(SKBookmark *)folder;
- (void)addBookmarkForSetups:(NSArray *)setupDicts label:(NSString *)label
toFolder:(SKBookmark *)folder;
-- (void)openBookmark:(SKBookmark *)bookmark;
+- (IBAction)openBookmark:(id)sender;
-- (IBAction)openBookmarkAction:(id)sender;
-
- (IBAction)doubleClickBookmark:(id)sender;
- (IBAction)insertBookmarkFolder:(id)sender;
- (IBAction)insertBookmarkSeparator:(id)sender;
Modified: trunk/SKBookmarkController.m
===
--- trunk/SKBookmarkController.m2011-01-21 18:23:02 UTC (rev 7078)
+++ trunk/SKBookmarkController.m2011-01-24 11:03:32 UTC (rev 7079)
@@ -39,19 +39,14 @@
#import "SKBookmarkController.h"
#import "SKBookmark.h"
#import "BDAlias.h"
-#import "SKMainDocument.h"
-#import "SKMainWindowController.h"
-#import "NSFileManager_SKExtensions.h"
#import "SKTypeSelectHelper.h"
#import "SKStatusBar.h"
#import "SKTextWithIconCell.h"
#import "SKToolbarItem.h"
#import "NSImage_SKExtensions.h"
#import "SKStringConstants.h"
-#import "SKDocumentController.h"
#import "SKSeparatorCell.h"
#import "NSMenu_SKExtensions.h"
-#import "NSError_SKExtensions.h"
#define SKBookmarkRowsPboardType @"SKBookmarkRowsPboardType"
@@ -344,50 +339,17 @@
*indexPtr = idx;
}
-- (void)openFileBookmark:(SKBookmark *)bookmark {
-id document = nil;
-NSError *error = nil;
-NSDictionary *dict = [bookmark properties];
-if ([dict objectForKey:@"windowFrame"]) {
-document = [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:dict error:&er
[Skim-app-commit] SF.net SVN: skim-app:[7080] trunk/SKMainWindowController.m
Revision: 7080
http://skim-app.svn.sourceforge.net/skim-app/?rev=7080&view=rev
Author: hofman
Date: 2011-01-25 16:22:04 + (Tue, 25 Jan 2011)
Log Message:
---
set fullscreen window level later when fading out, because child windows mess
up the window ordering
Modified Paths:
--
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===
--- trunk/SKMainWindowController.m 2011-01-24 11:03:32 UTC (rev 7079)
+++ trunk/SKMainWindowController.m 2011-01-25 16:22:04 UTC (rev 7080)
@@ -1395,11 +1395,11 @@
- (void)fadeOutFullScreenWindow {
SKMainFullScreenWindow *fullScreenWindow = (SKMainFullScreenWindow
*)[[[self window] retain] autorelease];
-[fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
[self setWindow:mainWindow];
// trick to make sure the main window shows up in the same space as the
fullscreen window
[fullScreenWindow addChildWindow:mainWindow ordered:NSWindowBelow];
[fullScreenWindow removeChildWindow:mainWindow];
+[fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
// these can change due to the child window trick
[mainWindow setLevel:NSNormalWindowLevel];
[mainWindow setCollectionBehavior:NSWindowCollectionBehaviorDefault];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7081] trunk/SKMainWindowController_UI.m
Revision: 7081
http://skim-app.svn.sourceforge.net/skim-app/?rev=7081&view=rev
Author: hofman
Date: 2011-01-26 10:30:48 + (Wed, 26 Jan 2011)
Log Message:
---
enable password action always when file is encrypted, because this may be
needed for a password for e.g. printing
Modified Paths:
--
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-01-25 16:22:04 UTC (rev 7080)
+++ trunk/SKMainWindowController_UI.m 2011-01-26 10:30:48 UTC (rev 7081)
@@ -1521,7 +1521,7 @@
} else if (action == @selector(performFit:)) {
return [self interactionMode] == SKNormalMode && [[self pdfDocument]
isLocked] == NO;
} else if (action == @selector(password:)) {
-return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked];
+return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isEncrypted];
} else if (action == @selector(toggleReadingBar:)) {
if ([[self pdfView] hasReadingBar])
[menuItem setTitle:NSLocalizedString(@"Hide Reading Bar", @"Menu
item title")];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7082] trunk/SKPDFDocument.m
Revision: 7082
http://skim-app.svn.sourceforge.net/skim-app/?rev=7082&view=rev
Author: hofman
Date: 2011-01-26 11:08:49 + (Wed, 26 Jan 2011)
Log Message:
---
also try saving owner password to override reader password in keychain
Modified Paths:
--
trunk/SKPDFDocument.m
Modified: trunk/SKPDFDocument.m
===
--- trunk/SKPDFDocument.m 2011-01-26 10:30:48 UTC (rev 7081)
+++ trunk/SKPDFDocument.m 2011-01-26 11:08:49 UTC (rev 7082)
@@ -72,9 +72,13 @@
- (BOOL)unlockWithPassword:(NSString *)password {
BOOL wasLocked = [self isLocked];
+BOOL allowedPrinting = [self allowsPrinting];
+BOOL allowedCopying = [self allowsCopying];
if ([super unlockWithPassword:password]) {
-if (wasLocked && [[self delegate]
respondsToSelector:@selector(document:didUnlockWithPassword:)])
+if ([[self delegate]
respondsToSelector:@selector(document:didUnlockWithPassword:)] &&
+([self isLocked] > wasLocked || [self allowsPrinting] >
allowedPrinting || [self allowsCopying] > allowedCopying)) {
[[self delegate] document:self didUnlockWithPassword:password];
+}
return YES;
}
return NO;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7083] trunk/SKMainWindowController_UI.m
Revision: 7083
http://skim-app.svn.sourceforge.net/skim-app/?rev=7083&view=rev
Author: hofman
Date: 2011-01-30 10:39:32 + (Sun, 30 Jan 2011)
Log Message:
---
disable password menu item when the document is fully unlocked
Modified Paths:
--
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-01-26 11:08:49 UTC (rev 7082)
+++ trunk/SKMainWindowController_UI.m 2011-01-30 10:39:32 UTC (rev 7083)
@@ -1521,7 +1521,7 @@
} else if (action == @selector(performFit:)) {
return [self interactionMode] == SKNormalMode && [[self pdfDocument]
isLocked] == NO;
} else if (action == @selector(password:)) {
-return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isEncrypted];
+return [self interactionMode] != SKPresentationMode && ([[self
pdfDocument] isLocked] || [[self pdfDocument] allowsPrinting] == NO || [[self
pdfDocument] allowsCopying] == NO);
} else if (action == @selector(toggleReadingBar:)) {
if ([[self pdfView] hasReadingBar])
[menuItem setTitle:NSLocalizedString(@"Hide Reading Bar", @"Menu
item title")];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7085] trunk/SKPDFView.m
Revision: 7085
http://skim-app.svn.sourceforge.net/skim-app/?rev=7085&view=rev
Author: hofman
Date: 2011-02-04 21:51:18 + (Fri, 04 Feb 2011)
Log Message:
---
scroll page in continuous mode after fitting window
Modified Paths:
--
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===
--- trunk/SKPDFView.m 2011-01-30 22:24:16 UTC (rev 7084)
+++ trunk/SKPDFView.m 2011-02-04 21:51:18 UTC (rev 7085)
@@ -2142,7 +2142,7 @@
if ([[self currentPage] isEqual:page] == NO)
[self goToPage:page];
NSDivideRect([self convertRect:rect fromPage:page], &rect, &ignored, 1.0,
NSMaxYEdge);
-[self goToRect:[self convertRect:rect toPage:page] onPage:page];
+[self goToRect:rect onPage:page];
}
- (void)scrollAnnotationToVisible:(PDFAnnotation *)annotation {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7086] trunk/SKPDFView.m
Revision: 7086
http://skim-app.svn.sourceforge.net/skim-app/?rev=7086&view=rev
Author: hofman
Date: 2011-02-04 21:54:03 + (Fri, 04 Feb 2011)
Log Message:
---
revert previous commit, wrong file
Modified Paths:
--
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===
--- trunk/SKPDFView.m 2011-02-04 21:51:18 UTC (rev 7085)
+++ trunk/SKPDFView.m 2011-02-04 21:54:03 UTC (rev 7086)
@@ -2142,7 +2142,7 @@
if ([[self currentPage] isEqual:page] == NO)
[self goToPage:page];
NSDivideRect([self convertRect:rect fromPage:page], &rect, &ignored, 1.0,
NSMaxYEdge);
-[self goToRect:rect onPage:page];
+[self goToRect:[self convertRect:rect toPage:page] onPage:page];
}
- (void)scrollAnnotationToVisible:(PDFAnnotation *)annotation {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7087] trunk/SKMainWindowController_Actions.m
Revision: 7087
http://skim-app.svn.sourceforge.net/skim-app/?rev=7087&view=rev
Author: hofman
Date: 2011-02-04 21:54:18 + (Fri, 04 Feb 2011)
Log Message:
---
scroll page in continuous mode after fitting window
Modified Paths:
--
trunk/SKMainWindowController_Actions.m
Modified: trunk/SKMainWindowController_Actions.m
===
--- trunk/SKMainWindowController_Actions.m 2011-02-04 21:54:03 UTC (rev
7086)
+++ trunk/SKMainWindowController_Actions.m 2011-02-04 21:54:18 UTC (rev
7087)
@@ -758,7 +758,7 @@
return;
}
-PDFDisplayMode displayMode = [pdfView displayMode];
+PDFDisplayMode displayMode = [[self pdfView] displayMode];
CGFloat scaleFactor = [[self pdfView] scaleFactor];
BOOL autoScales = [[self pdfView] autoScales];
BOOL isSingleRow;
@@ -773,6 +773,8 @@
NSRect frame = [[self window] frame];
NSSize size, oldSize = [[self pdfView] frame].size;
NSRect documentRect = [[[self pdfView] documentView] convertRect:[[[self
pdfView] documentView] bounds] toView:nil];
+PDFPage *page = [[self pdfView] currentPage];
+PDFDisplayBox box = [[self pdfView] displayBox];
// Calculate the new size for the pdfView
size.width = NSWidth(documentRect);
@@ -781,7 +783,7 @@
if (isSingleRow) {
size.height = NSHeight(documentRect);
} else {
-size.height = NSHeight([[self pdfView] convertRect:[[[self pdfView]
currentPage] boundsForBox:[[self pdfView] displayBox]] fromPage:[[self pdfView]
currentPage]]);
+size.height = NSHeight([[self pdfView] convertRect:[page
boundsForBox:box] fromPage:page]);
if ([[self pdfView] displaysPageBreaks])
size.height += 8.0 * scaleFactor;
size.width += [NSScroller scrollerWidth];
@@ -798,6 +800,9 @@
frame = [[self window] constrainFrameRect:frame toScreen:[[self window]
screen] ?: [NSScreen mainScreen]];
[[self window] setFrame:frame display:[[self window] isVisible]];
+
+if (displayMode == kPDFDisplaySinglePageContinuous || displayMode ==
kPDFDisplayTwoUpContinuous)
+[[self pdfView] goToRect:[page boundsForBox:box] onPage:page];
}
- (void)passwordSheetDidEnd:(SKPasswordSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The modern datacenter depends on network connectivity to access resources
and provide services. The best practices for maximizing a physical server's
connectivity to a physical network are well understood - see how these
rules translate into the virtual world?
http://p.sf.net/sfu/oracle-sfdevnlfb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7088] trunk
Revision: 7088
http://skim-app.svn.sourceforge.net/skim-app/?rev=7088&view=rev
Author: hofman
Date: 2011-02-08 00:19:10 + (Tue, 08 Feb 2011)
Log Message:
---
fix links in help
Modified Paths:
--
trunk/Dutch.lproj/SkimHelp/skim.texi
trunk/English.lproj/SkimHelp/skim.texi
Modified: trunk/Dutch.lproj/SkimHelp/skim.texi
===
--- trunk/Dutch.lproj/SkimHelp/skim.texi2011-02-04 21:54:18 UTC (rev
7087)
+++ trunk/Dutch.lproj/SkimHelp/skim.texi2011-02-08 00:19:10 UTC (rev
7088)
@@ -1332,7 +1332,7 @@
@heading Open dit voor mij
@multitable {}
-@item
@uref{http://sourceforge.net/apps/mediawiki/skim/index.php?title=AppleScript,
AppleScript pagina op de Skim Wiki}
+@item
@uref{http://sourceforge.net/apps/mediawiki/skim-app/index.php?title=AppleScript,
AppleScript pagina op de Skim Wiki}
@item @uref{help:runscript=SkimHelp/scripts/OpenAppDict.scpt
string='net.sourceforge.skim-app.skim', Skim woordenboek in Scripteditor}
@item @uref{help:anchor='access' bookID=AppleScript Help, AppleScript Help}
@item @uref{http://www.apple.com/nl/macosx/features/applescript/, AppleScript
webpagina}
@@ -1358,7 +1358,7 @@
@heading Open dit voor mij
@multitable {}
-@item
@uref{http://sourceforge.net/apps/mediawiki/skim/index.php?title=TeX_and_PDF_Synchronization,
TeX-PDF Synchronisatie pagina op de Skim Wiki}
+@item
@uref{http://sourceforge.net/apps/mediawiki/skim-app/index.php?title=TeX_and_PDF_Synchronization,
TeX-PDF Synchronisatie pagina op de Skim Wiki}
@end multitable
@c
==
Modified: trunk/English.lproj/SkimHelp/skim.texi
===
--- trunk/English.lproj/SkimHelp/skim.texi 2011-02-04 21:54:18 UTC (rev
7087)
+++ trunk/English.lproj/SkimHelp/skim.texi 2011-02-08 00:19:10 UTC (rev
7088)
@@ -1324,7 +1324,7 @@
@heading Open this for me
@multitable {}
-@item
@uref{http://sourceforge.net/apps/mediawiki/skim/index.php?title=AppleScript,
AppleScript page on the Skim Wiki}
+@item
@uref{http://sourceforge.net/apps/mediawiki/skim-app/index.php?title=AppleScript,
AppleScript page on the Skim Wiki}
@item @uref{help:runscript=SkimHelp/scripts/OpenAppDict.scpt
string='net.sourceforge.skim-app.skim', Skim dictionary in Script Editor}
@item @uref{help:anchor='access' bookID=AppleScript Help, AppleScript Help}
@item @uref{http://www.apple.com/macosx/features/applescript/, AppleScript
website}
@@ -1350,7 +1350,7 @@
@heading Open this for me
@multitable {}
-@item
@uref{http://sourceforge.net/apps/mediawiki/skim/index.php?title=TeX_and_PDF_Synchronization,
TeX-PDF Synchronization page on the Skim Wiki}
+@item
@uref{http://sourceforge.net/apps/mediawiki/skim-app/index.php?title=TeX_and_PDF_Synchronization,
TeX-PDF Synchronization page on the Skim Wiki}
@end multitable
@c
==
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7089] trunk/Info.plist
Revision: 7089 http://skim-app.svn.sourceforge.net/skim-app/?rev=7089&view=rev Author: hofman Date: 2011-02-09 16:17:05 + (Wed, 09 Feb 2011) Log Message: --- Allow URL for Open File In Skim service, as that's what Finder uses Modified Paths: -- trunk/Info.plist Modified: trunk/Info.plist === --- trunk/Info.plist2011-02-08 00:19:10 UTC (rev 7088) +++ trunk/Info.plist2011-02-09 16:17:05 UTC (rev 7089) @@ -572,7 +572,9 @@ NSSendTypes + NSURLPboardType NSStringPboardType + CorePasteboardFlavorType 0x75726C20 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7090] trunk
Revision: 7090
http://skim-app.svn.sourceforge.net/skim-app/?rev=7090&view=rev
Author: hofman
Date: 2011-02-09 18:34:02 + (Wed, 09 Feb 2011)
Log Message:
---
Add a service to open a notes document with the attached notes for a file
Modified Paths:
--
trunk/Dutch.lproj/ServicesMenu.strings
trunk/English.lproj/ServicesMenu.strings
trunk/French.lproj/ServicesMenu.strings
trunk/German.lproj/ServicesMenu.strings
trunk/Info.plist
trunk/Italian.lproj/ServicesMenu.strings
trunk/Japanese.lproj/ServicesMenu.strings
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
trunk/Spanish.lproj/ServicesMenu.strings
trunk/pl.lproj/ServicesMenu.strings
trunk/ru.lproj/ServicesMenu.strings
trunk/zh_TW.lproj/ServicesMenu.strings
Modified: trunk/Dutch.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/English.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/French.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/German.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/Info.plist
===
--- trunk/Info.plist2011-02-09 16:17:05 UTC (rev 7089)
+++ trunk/Info.plist2011-02-09 18:34:02 UTC (rev 7090)
@@ -616,6 +616,28 @@
NSTIFFPboardType
+
+ NSMenuItem
+
+ default
+ Skim/Show Skim Notes
+
+ NSMessage
+ openNotesDocumentFromURLOnPboard
+ NSPortName
+ Skim
+ NSRequiredContext
+
+ NSTextContent
+ FilePath
+
+ NSSendTypes
+
+ NSURLPboardType
+ NSStringPboardType
+ CorePasteboardFlavorType
0x75726C20
+
+
OSAScriptingDefinition
Skim.sdef
Modified: trunk/Italian.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/Japanese.lproj/ServicesMenu.strings
===
(Binary files differ)
Modified: trunk/SKApplicationController.m
===
--- trunk/SKApplicationController.m 2011-02-09 16:17:05 UTC (rev 7089)
+++ trunk/SKApplicationController.m 2011-02-09 18:34:02 UTC (rev 7090)
@@ -257,6 +257,14 @@
*errorString = [error localizedDescription];
}
+- (void)openNotesDocumentFromURLOnPboard:(NSPasteboard *)pboard
userData:(NSString *)userData error:(NSString **)errorString {
+NSError *error;
+id document = [[NSDocumentController sharedDocumentController]
openNotesDocumentWithURLFromPasteboard:pboard error:&error];
+
+if (document == nil && errorString)
+*errorString = [error localizedDescription];
+}
+
#pragma mark Actions
- (IBAction)orderFrontLineInspector:(id)sender {
Modified: trunk/SKDocumentController.h
===
--- trunk/SKDocumentController.h2011-02-09 16:17:05 UTC (rev 7089)
+++ trunk/SKDocumentController.h2011-02-09 18:34:02 UTC (rev 7090)
@@ -75,6 +75,7 @@
// this method may return an SKDownload instance
- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
- (id)openDocumentWithSetup:(NSDictionary *)setup error:(NSError **)outError;
+- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-09 16:17:05 UTC (rev 7089)
+++ trunk/SKDocumentController.m2011-02-09 18:34:02 UTC (rev 7090)
@@ -47,9 +47,11 @@
#import "BDAlias.h"
#import "SKMainWindowController.h"
#import "NSError_SKExtensions.h"
+#import
#define SKAutosaveIntervalKey @"SKAutosaveInterval"
+#define SKIM_NOTES_KEY @"net_sourceforge_skim-app_notes"
// See CFBundleTypeName in Info.plist
NSString *SKPDFDocument
[Skim-app-commit] SF.net SVN: skim-app:[7091] trunk/SKDocumentController.m
Revision: 7091
http://skim-app.svn.sourceforge.net/skim-app/?rev=7091&view=rev
Author: hofman
Date: 2011-02-09 19:21:11 + (Wed, 09 Feb 2011)
Log Message:
---
show notes from ps, dvi, xdv files from service
Modified Paths:
--
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-09 18:34:02 UTC (rev 7090)
+++ trunk/SKDocumentController.m2011-02-09 19:21:11 UTC (rev 7091)
@@ -278,7 +278,7 @@
NSString *type = [self typeForContentsOfURL:theURL error:&error];
NSData *data = nil;
-if ([type isEqualToString:SKPDFDocumentType]) {
+if ([type isEqualToString:SKPDFDocumentType] || [type
isEqualToString:SKPostScriptDocumentType] || [type
isEqualToString:SKDVIDocumentType] || [type isEqualToString:SKXDVDocumentType])
{
data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
} else if ([type isEqualToString:SKPDFBundleDocumentType]) {
NSString *skimFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"skim" inPDFBundleAtPath:[theURL path] error:&error];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7092] trunk/SKDocumentController.m
Revision: 7092
http://skim-app.svn.sourceforge.net/skim-app/?rev=7092&view=rev
Author: hofman
Date: 2011-02-10 13:05:02 + (Thu, 10 Feb 2011)
Log Message:
---
just open .skim file from Show Skim Notes service
Modified Paths:
--
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-09 19:21:11 UTC (rev 7091)
+++ trunk/SKDocumentController.m2011-02-10 13:05:02 UTC (rev 7092)
@@ -48,6 +48,7 @@
#import "SKMainWindowController.h"
#import "NSError_SKExtensions.h"
#import
+#import "SKNotesDocument.h"
#define SKAutosaveIntervalKey @"SKAutosaveInterval"
@@ -276,28 +277,30 @@
if ([theURL isFileURL]) {
NSError *error = nil;
NSString *type = [self typeForContentsOfURL:theURL error:&error];
-NSData *data = nil;
-if ([type isEqualToString:SKPDFDocumentType] || [type
isEqualToString:SKPostScriptDocumentType] || [type
isEqualToString:SKDVIDocumentType] || [type isEqualToString:SKXDVDocumentType])
{
-data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
-} else if ([type isEqualToString:SKPDFBundleDocumentType]) {
-NSString *skimFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"skim" inPDFBundleAtPath:[theURL path] error:&error];
-data = skimFile ? [NSData dataWithContentsOfFile:skimFile
options:0 error:&error] : nil;
-} else if ([type isEqualToString:SKNotesDocumentType]) {
-data = [NSData dataWithContentsOfURL:theURL options:0
error:&error];
-}
-
-if (data)
-document = [self makeUntitledDocumentOfType:SKNotesDocumentType
error:&error];
-
-if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
-[self addDocument:document];
-[document makeWindowControllers];
-[document showWindows];
+if ([[SKNotesDocument readableTypes] containsObject:type]) {
+document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
} else {
-document = nil;
-if (outError)
-*outError = error;
+NSData *data = nil;
+if ([type isEqualToString:SKPDFBundleDocumentType]) {
+NSString *skimFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"skim" inPDFBundleAtPath:[theURL path] error:&error];
+data = skimFile ? [NSData dataWithContentsOfFile:skimFile
options:0 error:&error] : nil;
+} else if ([[SKMainDocument readableTypes] containsObject:type]) {
+data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
+}
+
+if (data)
+document = [self
makeUntitledDocumentOfType:SKNotesDocumentType error:&error];
+
+if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
+[self addDocument:document];
+[document makeWindowControllers];
+[document showWindows];
+} else {
+document = nil;
+if (outError)
+*outError = error;
+}
}
} else if (outError) {
*outError = [NSError
readPasteboardErrorWithLocalizedDescription:NSLocalizedString(@"Unable to load
data from clipboard", @"Error description")];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7093] trunk
Revision: 7093
http://skim-app.svn.sourceforge.net/skim-app/?rev=7093&view=rev
Author: hofman
Date: 2011-02-10 16:13:06 + (Thu, 10 Feb 2011)
Log Message:
---
use pdf filename as displayname for notes document shown through service
Modified Paths:
--
trunk/SKDocumentController.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-10 13:05:02 UTC (rev 7092)
+++ trunk/SKDocumentController.m2011-02-10 16:13:06 UTC (rev 7093)
@@ -294,6 +294,7 @@
if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
[self addDocument:document];
+[document setSourceFileURL:theURL];
[document makeWindowControllers];
[document showWindows];
} else {
Modified: trunk/SKNotesDocument.h
===
--- trunk/SKNotesDocument.h 2011-02-10 13:05:02 UTC (rev 7092)
+++ trunk/SKNotesDocument.h 2011-02-10 16:13:06 UTC (rev 7093)
@@ -51,6 +51,7 @@
NSDictionary *toolbarItems;
NSArray *notes;
PDFDocument *pdfDocument;
+NSURL *sourceFileURL;
SKFloatMapTable *rowHeights;
SKNoteTypeSheetController *noteTypeSheetController;
NSRect windowRect;
@@ -63,6 +64,7 @@
@property (nonatomic, retain) IBOutlet NSSearchField *searchField;
@property (nonatomic, readonly) NSArray *notes;
@property (nonatomic, readonly) PDFDocument *pdfDocument;
+@property (nonatomic, retain) NSURL *sourceFileURL;
- (IBAction)openPDF:(id)sender;
- (IBAction)searchNotes:(id)sender;
Modified: trunk/SKNotesDocument.m
===
--- trunk/SKNotesDocument.m 2011-02-10 13:05:02 UTC (rev 7092)
+++ trunk/SKNotesDocument.m 2011-02-10 16:13:06 UTC (rev 7093)
@@ -86,7 +86,7 @@
@implementation SKNotesDocument
-@synthesize outlineView, arrayController, searchField, notes, pdfDocument;
+@synthesize outlineView, arrayController, searchField, notes, pdfDocument,
sourceFileURL;
- (id)init {
if (self = [super init]) {
@@ -104,6 +104,7 @@
[outlineView setDataSource:nil];
SKDESTROY(notes);
SKDESTROY(pdfDocument);
+SKDESTROY(sourceFileURL);
SKDESTROY(rowHeights);
SKDESTROY(toolbarItems);
SKDESTROY(statusBar);
@@ -353,6 +354,18 @@
}
}
+- (void)setFileURL:(NSURL *)absoluteURL {
+if (absoluteURL)
+[self setSourceFileURL:nil];
+[super setFileURL:absoluteURL];
+}
+
+- (NSString *)displayName {
+if (sourceFileURL)
+return [[[NSFileManager defaultManager]
displayNameAtPath:[sourceFileURL path]] stringByDeletingPathExtension];
+return [super displayName];
+}
+
#pragma mark Printing
- (NSPrintOperation *)printOperationWithSettings:(NSDictionary *)printSettings
error:(NSError **)outError {
@@ -385,7 +398,7 @@
#pragma mark Actions
- (IBAction)openPDF:(id)sender {
-NSString *path = [[self fileURL] pathReplacingPathExtension:@"pdf"];
+NSString *path = [sourceFileURL path] ?: [[self fileURL]
pathReplacingPathExtension:@"pdf"];
NSError *error = nil;
if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
// resolve symlinks and aliases
@@ -757,7 +770,7 @@
if ([self windowControllers] objectAtIndex:0] window] toolbar]
customizationPaletteIsRunning])
return NO;
else if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
-return [[NSFileManager defaultManager] fileExistsAtPath:[[self
fileURL] pathReplacingPathExtension:@"pdf"]];
+return [[NSFileManager defaultManager] fileExistsAtPath:[sourceFileURL
path] ?: [[self fileURL] pathReplacingPathExtension:@"pdf"]];
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7094] trunk/SKDocumentController.m
Revision: 7094
http://skim-app.svn.sourceforge.net/skim-app/?rev=7094&view=rev
Author: hofman
Date: 2011-02-10 17:49:19 + (Thu, 10 Feb 2011)
Log Message:
---
don't open multiple notes documents for the same pdf
Modified Paths:
--
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-10 16:13:06 UTC (rev 7093)
+++ trunk/SKDocumentController.m2011-02-10 17:49:19 UTC (rev 7094)
@@ -280,27 +280,36 @@
if ([[SKNotesDocument readableTypes] containsObject:type]) {
document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
-} else {
-NSData *data = nil;
-if ([type isEqualToString:SKPDFBundleDocumentType]) {
-NSString *skimFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"skim" inPDFBundleAtPath:[theURL path] error:&error];
-data = skimFile ? [NSData dataWithContentsOfFile:skimFile
options:0 error:&error] : nil;
-} else if ([[SKMainDocument readableTypes] containsObject:type]) {
-data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
+} else if ([[SKMainDocument readableTypes] containsObject:type]) {
+for (document in [self documents]) {
+if ([document respondsToSelector:@selector(sourceFileURL)] &&
[[document sourceFileURL] isEqual:theURL])
+break;
}
-
-if (data)
-document = [self
makeUntitledDocumentOfType:SKNotesDocumentType error:&error];
-
-if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
-[self addDocument:document];
-[document setSourceFileURL:theURL];
-[document makeWindowControllers];
+if (document) {
[document showWindows];
} else {
-document = nil;
-if (outError)
-*outError = error;
+NSData *data = nil;
+
+if ([type isEqualToString:SKPDFBundleDocumentType]) {
+NSString *skimFile = [[NSFileManager defaultManager]
bundledFileWithExtension:@"skim" inPDFBundleAtPath:[theURL path] error:&error];
+data = skimFile ? [NSData dataWithContentsOfFile:skimFile
options:0 error:&error] : nil;
+} else {
+data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
+}
+
+if (data)
+document = [self
makeUntitledDocumentOfType:SKNotesDocumentType error:&error];
+
+if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
+[self addDocument:document];
+[document setSourceFileURL:theURL];
+[document makeWindowControllers];
+[document showWindows];
+} else {
+document = nil;
+if (outError)
+*outError = error;
+}
}
}
} else if (outError) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7095] trunk/SKDocumentController.m
Revision: 7095
http://skim-app.svn.sourceforge.net/skim-app/?rev=7095&view=rev
Author: hofman
Date: 2011-02-10 18:09:01 + (Thu, 10 Feb 2011)
Log Message:
---
open empty notes document from show skim notes service when there are no notes
Modified Paths:
--
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-10 17:49:19 UTC (rev 7094)
+++ trunk/SKDocumentController.m2011-02-10 18:09:01 UTC (rev 7095)
@@ -297,12 +297,11 @@
data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:[theURL path] traverseLink:YES
error:&error];
}
-if (data)
-document = [self
makeUntitledDocumentOfType:SKNotesDocumentType error:&error];
+document = [self
makeUntitledDocumentOfType:SKNotesDocumentType error:&error];
+[document setSourceFileURL:theURL];
-if ([document readFromData:data ofType:SKNotesDocumentType
error:&error]) {
+if (data == nil || [document readFromData:data
ofType:SKNotesDocumentType error:&error]) {
[self addDocument:document];
-[document setSourceFileURL:theURL];
[document makeWindowControllers];
[document showWindows];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7096] trunk/SKNotesDocument.m
Revision: 7096
http://skim-app.svn.sourceforge.net/skim-app/?rev=7096&view=rev
Author: hofman
Date: 2011-02-11 12:26:37 + (Fri, 11 Feb 2011)
Log Message:
---
just use last path component for displayname
Modified Paths:
--
trunk/SKNotesDocument.m
Modified: trunk/SKNotesDocument.m
===
--- trunk/SKNotesDocument.m 2011-02-10 18:09:01 UTC (rev 7095)
+++ trunk/SKNotesDocument.m 2011-02-11 12:26:37 UTC (rev 7096)
@@ -362,7 +362,7 @@
- (NSString *)displayName {
if (sourceFileURL)
-return [[[NSFileManager defaultManager]
displayNameAtPath:[sourceFileURL path]] stringByDeletingPathExtension];
+return [[[sourceFileURL path] lastPathComponent]
stringByDeletingPathExtension];
return [super displayName];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7097] trunk/vendorsrc/andymatuschak/Sparkle/ru.lproj/ Sparkle.strings
Revision: 7097 http://skim-app.svn.sourceforge.net/skim-app/?rev=7097&view=rev Author: hofman Date: 2011-02-11 16:00:23 + (Fri, 11 Feb 2011) Log Message: --- fix triple dot Modified Paths: -- trunk/vendorsrc/andymatuschak/Sparkle/ru.lproj/Sparkle.strings Modified: trunk/vendorsrc/andymatuschak/Sparkle/ru.lproj/Sparkle.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7098] trunk
Revision: 7098 http://skim-app.svn.sourceforge.net/skim-app/?rev=7098&view=rev Author: hofman Date: 2011-02-11 16:01:49 + (Fri, 11 Feb 2011) Log Message: --- fix localizations for non-breaking spaces and triple-dots Modified Paths: -- trunk/French.lproj/BookmarkSheet.strings trunk/French.lproj/DisplayPreferences.strings trunk/French.lproj/FindPanel.strings trunk/French.lproj/LineInspector.strings trunk/French.lproj/Localizable.strings trunk/French.lproj/NoteTypeSheet.strings trunk/French.lproj/NoteWindow.strings trunk/French.lproj/NotesPreferences.strings trunk/French.lproj/PageSheet.strings trunk/French.lproj/PasswordSheet.strings trunk/French.lproj/ScaleSheet.strings trunk/French.lproj/TransitionSheet.strings trunk/ru.lproj/Localizable.strings Modified: trunk/French.lproj/BookmarkSheet.strings === (Binary files differ) Modified: trunk/French.lproj/DisplayPreferences.strings === (Binary files differ) Modified: trunk/French.lproj/FindPanel.strings === (Binary files differ) Modified: trunk/French.lproj/LineInspector.strings === (Binary files differ) Modified: trunk/French.lproj/Localizable.strings === (Binary files differ) Modified: trunk/French.lproj/NoteTypeSheet.strings === (Binary files differ) Modified: trunk/French.lproj/NoteWindow.strings === (Binary files differ) Modified: trunk/French.lproj/NotesPreferences.strings === (Binary files differ) Modified: trunk/French.lproj/PageSheet.strings === (Binary files differ) Modified: trunk/French.lproj/PasswordSheet.strings === (Binary files differ) Modified: trunk/French.lproj/ScaleSheet.strings === (Binary files differ) Modified: trunk/French.lproj/TransitionSheet.strings === (Binary files differ) Modified: trunk/ru.lproj/Localizable.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7099] trunk/French.lproj
Revision: 7099 http://skim-app.svn.sourceforge.net/skim-app/?rev=7099&view=rev Author: hofman Date: 2011-02-11 16:06:30 + (Fri, 11 Feb 2011) Log Message: --- fix localizations for non-breaking spaces Modified Paths: -- trunk/French.lproj/Localizable.strings trunk/French.lproj/NotesPreferences.strings Modified: trunk/French.lproj/Localizable.strings === (Binary files differ) Modified: trunk/French.lproj/NotesPreferences.strings === (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7100] trunk
Revision: 7100
http://skim-app.svn.sourceforge.net/skim-app/?rev=7100&view=rev
Author: hofman
Date: 2011-02-13 13:01:30 + (Sun, 13 Feb 2011)
Log Message:
---
remove an intermediate method that was used only in one place
Modified Paths:
--
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.h
===
--- trunk/SKDocumentController.h2011-02-11 16:06:30 UTC (rev 7099)
+++ trunk/SKDocumentController.h2011-02-13 13:01:30 UTC (rev 7100)
@@ -69,8 +69,6 @@
}
- (IBAction)newDocumentFromClipboard:(id)sender;
-// this method may return an SKDownload instance
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
// this method may return an SKDownload instance
- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-11 16:06:30 UTC (rev 7099)
+++ trunk/SKDocumentController.m2011-02-13 13:01:30 UTC (rev 7100)
@@ -259,17 +259,6 @@
return document;
}
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
-NSError *error;
-id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
-if (document == nil) {
-document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
-if (document == nil && outError)
-*outError = error;
-}
-return document;
-}
-
- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
id document = nil;
@@ -320,8 +309,10 @@
- (IBAction)newDocumentFromClipboard:(id)sender {
NSError *error = nil;
-id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
-
+NSPasteboard *pboard = [NSPasteboard generalPasteboard];
+id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
+if (document == nil)
+document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7101] trunk
Revision: 7101
http://skim-app.svn.sourceforge.net/skim-app/?rev=7101&view=rev
Author: hofman
Date: 2011-02-13 16:20:37 + (Sun, 13 Feb 2011)
Log Message:
---
combine two methods
Modified Paths:
--
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKApplicationController.m
===
--- trunk/SKApplicationController.m 2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKApplicationController.m 2011-02-13 16:20:37 UTC (rev 7101)
@@ -243,7 +243,7 @@
- (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)errorString {
NSError *error;
-id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard error:&error];
+id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard showNotes:NO error:&error];
if (document == nil && errorString)
*errorString = [error localizedDescription];
@@ -259,7 +259,7 @@
- (void)openNotesDocumentFromURLOnPboard:(NSPasteboard *)pboard
userData:(NSString *)userData error:(NSString **)errorString {
NSError *error;
-id document = [[NSDocumentController sharedDocumentController]
openNotesDocumentWithURLFromPasteboard:pboard error:&error];
+id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard showNotes:YES error:&error];
if (document == nil && errorString)
*errorString = [error localizedDescription];
Modified: trunk/SKDocumentController.h
===
--- trunk/SKDocumentController.h2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKDocumentController.h2011-02-13 16:20:37 UTC (rev 7101)
@@ -69,11 +69,12 @@
}
- (IBAction)newDocumentFromClipboard:(id)sender;
+
- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
// this method may return an SKDownload instance
-- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes error:(NSError **)outError;
+
- (id)openDocumentWithSetup:(NSDictionary *)setup error:(NSError **)outError;
-- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKDocumentController.m2011-02-13 16:20:37 UTC (rev 7101)
@@ -242,32 +242,15 @@
return document;
}
-- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError {
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes error:(NSError **)outError {
NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
id document = nil;
if ([theURL isFileURL]) {
-document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
-} else if (theURL) {
-document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
-if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
-[[SKDownloadController sharedDownloadController] showWindow:self];
-} else if (outError) {
-*outError = [NSError
readPasteboardErrorWithLocalizedDescription:NSLocalizedString(@"Unable to load
data from clipboard", @"Error description")];
-}
-
-return document;
-}
-
-- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
-NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
-id document = nil;
-
-if ([theURL isFileURL]) {
NSError *error = nil;
NSString *type = [self typeForContentsOfURL:theURL error:&error];
-if ([[SKNotesDocument readableTypes] containsObject:type]) {
+if (showNotes == NO || [[SKNotesDocument readableTypes]
containsObject:type]) {
document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
} else if ([[SKMainDocument readableTypes] containsObject:type]) {
for (document in [self documents]) {
@@ -300,6 +283,10 @@
}
}
}
+} else if (showNotes == NO && theURL) {
+document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
+if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
+[[SKDownloadC
[Skim-app-commit] SF.net SVN: skim-app:[7102] trunk/ReleaseNotes.rtf
Revision: 7102
http://skim-app.svn.sourceforge.net/skim-app/?rev=7102&view=rev
Author: hofman
Date: 2011-02-13 21:24:56 + (Sun, 13 Feb 2011)
Log Message:
---
update release notes
Modified Paths:
--
trunk/ReleaseNotes.rtf
Modified: trunk/ReleaseNotes.rtf
===
--- trunk/ReleaseNotes.rtf 2011-02-13 16:20:37 UTC (rev 7101)
+++ trunk/ReleaseNotes.rtf 2011-02-13 21:24:56 UTC (rev 7102)
@@ -229,6 +229,7 @@
\ls2\ilvl0\cf0 {\listtext \'95}Codesigning for enhanced security and
portability of saved PDF passwords.\
{\listtext \'95}Added Japanese localization (thanks Toru Ishizaki).\
{\listtext \'95}New background option for displayline script.\
+{\listtext \'95}New service to show Skim notes.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f0\b\fs28 \cf0 \
@@ -238,8 +239,7 @@
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls3\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'95}Fixes and improvements for scripting
selections.\
-\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls3\ilvl0\cf0 {\listtext \'95}Complete support for webarchive
templates.\
+{\listtext \'95}Complete support for webarchive templates.\
{\listtext \'95}Warn before opening a folder containing a large number
of documents.\
{\listtext \'95}Make sure we don't crash when reading corrupted
bookmarks.\
{\listtext \'95}Don't show duplicate error alert when opening a file
was already cancelled.\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7103] trunk/ReleaseNotes.rtf
Revision: 7103
http://skim-app.svn.sourceforge.net/skim-app/?rev=7103&view=rev
Author: hofman
Date: 2011-02-13 23:37:48 + (Sun, 13 Feb 2011)
Log Message:
---
fix spacing
Modified Paths:
--
trunk/ReleaseNotes.rtf
Modified: trunk/ReleaseNotes.rtf
===
--- trunk/ReleaseNotes.rtf 2011-02-13 21:24:56 UTC (rev 7102)
+++ trunk/ReleaseNotes.rtf 2011-02-13 23:37:48 UTC (rev 7103)
@@ -225,14 +225,12 @@
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls2\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'95}Hold down Option to open all bookmarks
in a bookmark folder at once.\
-\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls2\ilvl0\cf0 {\listtext \'95}Codesigning for enhanced security and
portability of saved PDF passwords.\
+{\listtext \'95}Codesigning for enhanced security and portability of
saved PDF passwords.\
{\listtext \'95}Added Japanese localization (thanks Toru Ishizaki).\
{\listtext \'95}New background option for displayline script.\
{\listtext \'95}New service to show Skim notes.\
-\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-
-\f0\b\fs28 \cf0 \
+\ls2\ilvl0
+\f0\b\fs28 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\i\fs26 \cf0 Bugs Fixed\
@@ -257,8 +255,6 @@
{\listtext \'95}Allow setting owner password when it's different from
the user password.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls4\ilvl0\cf0 \
-\pard\tx560\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
-\cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f0\b\fs28 \cf0 Changes since 1.3.9\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7104] trunk
Revision: 7104
http://skim-app.svn.sourceforge.net/skim-app/?rev=7104&view=rev
Author: hofman
Date: 2011-02-14 10:14:48 + (Mon, 14 Feb 2011)
Log Message:
---
update version numbers for release
Modified Paths:
--
trunk/Dutch.lproj/InfoPlist.strings
trunk/Dutch.lproj/SkimHelp/version.texi
trunk/English.lproj/InfoPlist.strings
trunk/English.lproj/SkimHelp/version.texi
trunk/French.lproj/InfoPlist.strings
trunk/German.lproj/InfoPlist.strings
trunk/Info.plist
trunk/Italian.lproj/InfoPlist.strings
trunk/Japanese.lproj/InfoPlist.strings
trunk/Skim.xcodeproj/project.pbxproj
trunk/pl.lproj/InfoPlist.strings
trunk/ru.lproj/InfoPlist.strings
trunk/zh_TW.lproj/InfoPlist.strings
Modified: trunk/Dutch.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Dutch.lproj/SkimHelp/version.texi
===
--- trunk/Dutch.lproj/SkimHelp/version.texi 2011-02-13 23:37:48 UTC (rev
7103)
+++ trunk/Dutch.lproj/SkimHelp/version.texi 2011-02-14 10:14:48 UTC (rev
7104)
@@ -1 +1 @@
-@set VERSION 1.3.10
+@set VERSION 1.3.11
Modified: trunk/English.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/English.lproj/SkimHelp/version.texi
===
--- trunk/English.lproj/SkimHelp/version.texi 2011-02-13 23:37:48 UTC (rev
7103)
+++ trunk/English.lproj/SkimHelp/version.texi 2011-02-14 10:14:48 UTC (rev
7104)
@@ -1 +1 @@
-@set VERSION 1.3.10
+@set VERSION 1.3.11
Modified: trunk/French.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/German.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Info.plist
===
--- trunk/Info.plist2011-02-13 23:37:48 UTC (rev 7103)
+++ trunk/Info.plist2011-02-14 10:14:48 UTC (rev 7104)
@@ -535,7 +535,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.3.10
+ 1.3.11
CFBundleSignature
SKim
CFBundleVersion
Modified: trunk/Italian.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Japanese.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/Skim.xcodeproj/project.pbxproj
===
--- trunk/Skim.xcodeproj/project.pbxproj2011-02-13 23:37:48 UTC (rev
7103)
+++ trunk/Skim.xcodeproj/project.pbxproj2011-02-14 10:14:48 UTC (rev
7104)
@@ -3297,7 +3297,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE460E24ED7C00DE06EA
/* Skim-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 59;
+ CURRENT_PROJECT_VERSION = 60;
};
name = Debug;
};
@@ -3305,7 +3305,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE460E24ED7C00DE06EA
/* Skim-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 59;
+ CURRENT_PROJECT_VERSION = 60;
};
name = Release;
};
Modified: trunk/pl.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/ru.lproj/InfoPlist.strings
===
(Binary files differ)
Modified: trunk/zh_TW.lproj/InfoPlist.strings
===
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7105] tags/REL_1_3_11/
Revision: 7105 http://skim-app.svn.sourceforge.net/skim-app/?rev=7105&view=rev Author: hofman Date: 2011-02-14 10:15:15 + (Mon, 14 Feb 2011) Log Message: --- Tag for release Added Paths: --- tags/REL_1_3_11/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7106] trunk/SKFileUpdateChecker.m
Revision: 7106
http://skim-app.svn.sourceforge.net/skim-app/?rev=7106&view=rev
Author: hofman
Date: 2011-02-14 15:57:17 + (Mon, 14 Feb 2011)
Log Message:
---
invert a check for edits for file updating
Modified Paths:
--
trunk/SKFileUpdateChecker.m
Modified: trunk/SKFileUpdateChecker.m
===
--- trunk/SKFileUpdateChecker.m 2011-02-14 10:15:15 UTC (rev 7105)
+++ trunk/SKFileUpdateChecker.m 2011-02-14 15:57:17 UTC (rev 7106)
@@ -237,7 +237,7 @@
} else if ([self canUpdateFromFile:fileName]) {
BOOL shouldAutoUpdate = fucFlags.autoUpdate || [[NSUserDefaults
standardUserDefaults] boolForKey:SKAutoReloadFileUpdateKey];
BOOL documentHasEdits = [document isDocumentEdited] || [[document
notes] count] > 0;
-if (fucFlags.disableAutoReload == NO && shouldAutoUpdate &&
documentHasEdits) {
+if (fucFlags.disableAutoReload == NO && shouldAutoUpdate &&
documentHasEdits == NO) {
// tried queuing this with a delayed perform/cancel previous,
but revert takes long enough that the cancel was never used
[self fileUpdateAlertDidEnd:nil
returnCode:NSAlertDefaultReturn contextInfo:NULL];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7107] trunk/Skim.xcodeproj/project.pbxproj
Revision: 7107
http://skim-app.svn.sourceforge.net/skim-app/?rev=7107&view=rev
Author: hofman
Date: 2011-02-14 18:32:54 + (Mon, 14 Feb 2011)
Log Message:
---
remove empty .strings file from release product
Modified Paths:
--
trunk/Skim.xcodeproj/project.pbxproj
Modified: trunk/Skim.xcodeproj/project.pbxproj
===
--- trunk/Skim.xcodeproj/project.pbxproj2011-02-14 15:57:17 UTC (rev
7106)
+++ trunk/Skim.xcodeproj/project.pbxproj2011-02-14 18:32:54 UTC (rev
7107)
@@ -2371,7 +2371,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ];
then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks
***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file
-name \"*.h\" -delete\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"
\\( -type d -or -type l \\) -name Headers -delete\n\necho \"*** removing
.DS_Store files ***\"\nfind
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" -type file -name
\".DS_Store\" -delete\n\n#echo \"*** stripping IB files from NIBs ***\"\n#find
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" -type file \\(
-name \"classes.nib\" -or -name \"info.nib\" -or -name \"data.dependency\" \\)
-delete\n";
+ shellScript = "if [ ${BUILD_STYLE} = \"Debug\" ];
then\nexit 0\nfi\n\necho \"*** stripping header files from frameworks
***\"\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\" -type file
-name \"*.h\" -delete\nfind \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"
\\( -type d -or -type l \\) -name Headers -delete\n\necho \"*** removing
.DS_Store files ***\"\nfind
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" -type file -name
\".DS_Store\" -delete\n\necho \"*** removing empty .strings files ***\"\nfind
\"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"/*.lproj -type
file -name \"*.strings\" -empty -delete\n";
};
CE592C630B9239E300C113DF /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7108] trunk
Revision: 7108 http://skim-app.svn.sourceforge.net/skim-app/?rev=7108&view=rev Author: hofman Date: 2011-02-14 22:33:26 + (Mon, 14 Feb 2011) Log Message: --- remove duplicate localization strings in generated .strings files from NIBs Modified Paths: -- trunk/Dutch.lproj/DisplayPreferences.strings trunk/Dutch.lproj/GeneralPreferences.strings trunk/Dutch.lproj/LineInspector.strings trunk/Dutch.lproj/MainMenu.strings trunk/Dutch.lproj/NoteWindow.strings trunk/Dutch.lproj/NotesPreferences.strings trunk/English.lproj/DisplayPreferences.strings trunk/English.lproj/GeneralPreferences.strings trunk/English.lproj/LineInspector.strings trunk/English.lproj/MainMenu.strings trunk/English.lproj/NoteWindow.strings trunk/English.lproj/NotesPreferences.strings trunk/French.lproj/DisplayPreferences.strings trunk/French.lproj/GeneralPreferences.strings trunk/French.lproj/LineInspector.strings trunk/French.lproj/MainMenu.strings trunk/French.lproj/NoteWindow.strings trunk/French.lproj/NotesPreferences.strings trunk/German.lproj/DisplayPreferences.strings trunk/German.lproj/GeneralPreferences.strings trunk/German.lproj/LineInspector.strings trunk/German.lproj/MainMenu.strings trunk/German.lproj/NoteWindow.strings trunk/German.lproj/NotesPreferences.strings trunk/Italian.lproj/DisplayPreferences.strings trunk/Italian.lproj/GeneralPreferences.strings trunk/Italian.lproj/LineInspector.strings trunk/Italian.lproj/MainMenu.strings trunk/Italian.lproj/NoteWindow.strings trunk/Italian.lproj/NotesPreferences.strings trunk/Spanish.lproj/DisplayPreferences.strings trunk/Spanish.lproj/GeneralPreferences.strings trunk/Spanish.lproj/LineInspector.strings trunk/Spanish.lproj/MainMenu.strings trunk/Spanish.lproj/NoteWindow.strings trunk/Spanish.lproj/NotesPreferences.strings trunk/pl.lproj/DisplayPreferences.strings trunk/pl.lproj/GeneralPreferences.strings trunk/pl.lproj/LineInspector.strings trunk/pl.lproj/MainMenu.strings trunk/pl.lproj/NoteWindow.strings trunk/pl.lproj/NotesPreferences.strings trunk/postprocess-xib-strings.py trunk/ru.lproj/DisplayPreferences.strings trunk/ru.lproj/GeneralPreferences.strings trunk/ru.lproj/LineInspector.strings trunk/ru.lproj/MainMenu.strings trunk/ru.lproj/NoteWindow.strings trunk/ru.lproj/NotesPreferences.strings trunk/zh_TW.lproj/DisplayPreferences.strings trunk/zh_TW.lproj/GeneralPreferences.strings trunk/zh_TW.lproj/LineInspector.strings trunk/zh_TW.lproj/MainMenu.strings trunk/zh_TW.lproj/NoteWindow.strings trunk/zh_TW.lproj/NotesPreferences.strings Modified: trunk/Dutch.lproj/DisplayPreferences.strings === (Binary files differ) Modified: trunk/Dutch.lproj/GeneralPreferences.strings === (Binary files differ) Modified: trunk/Dutch.lproj/LineInspector.strings === (Binary files differ) Modified: trunk/Dutch.lproj/MainMenu.strings === (Binary files differ) Modified: trunk/Dutch.lproj/NoteWindow.strings === (Binary files differ) Modified: trunk/Dutch.lproj/NotesPreferences.strings === (Binary files differ) Modified: trunk/English.lproj/DisplayPreferences.strings === (Binary files differ) Modified: trunk/English.lproj/GeneralPreferences.strings === (Binary files differ) Modified: trunk/English.lproj/LineInspector.strings === (Binary files differ) Modified: trunk/English.lproj/MainMenu.strings === (Binary files differ) Modified: trunk/English.lproj/NoteWindow.strings === (Binary files differ) Modified: trunk/English.lproj/NotesPreferences.strings === (Binary files differ) Modified: trunk/French.lproj/DisplayPreferences.strings === (Binary files differ) Modified: trunk/French.lproj/GeneralPreferences.strings === (Binary files differ) Modified: trunk/French.lproj/LineInspector.strings === (Binary files differ) Modified: trunk/French.lproj/MainMenu.str
[Skim-app-commit] SF.net SVN: skim-app:[7109] trunk/SKPDFView.m
Revision: 7109
http://skim-app.svn.sourceforge.net/skim-app/?rev=7109&view=rev
Author: hofman
Date: 2011-02-15 10:27:50 + (Tue, 15 Feb 2011)
Log Message:
---
check correct annotation mode variable for adding new note
Modified Paths:
--
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===
--- trunk/SKPDFView.m 2011-02-14 22:33:26 UTC (rev 7108)
+++ trunk/SKPDFView.m 2011-02-15 10:27:50 UTC (rev 7109)
@@ -1752,7 +1752,7 @@
bounds = NSInsetRect(bounds, -5.0, -5.0);
else if (annotationType == SKAnchoredNote)
bounds.size = SKNPDFAnnotationNoteSize;
- } else if (ANNOTATION_MODE_IS_MARKUP == NO) {
+ } else if (annotationType != SKHighlightNote && annotationType !=
SKUnderlineNote && annotationType != SKStrikeOutNote) {
// First try the current mouse position
NSPoint center = [self convertPoint:point fromView:nil];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7110] trunk/SKBookmarkController.m
Revision: 7110
http://skim-app.svn.sourceforge.net/skim-app/?rev=7110&view=rev
Author: hofman
Date: 2011-02-16 13:24:58 + (Wed, 16 Feb 2011)
Log Message:
---
make bookmark controller a true singleton so we cannot create duplicates, we're
instantiating in MainMenu.nib
Modified Paths:
--
trunk/SKBookmarkController.m
Modified: trunk/SKBookmarkController.m
===
--- trunk/SKBookmarkController.m2011-02-15 10:27:50 UTC (rev 7109)
+++ trunk/SKBookmarkController.m2011-02-16 13:24:58 UTC (rev 7110)
@@ -90,6 +90,8 @@
@synthesize outlineView, statusBar, bookmarkRoot, recentDocuments, undoManager;
+static SKBookmarkController *sharedBookmarkController = nil;
+
static NSUInteger maxRecentDocumentsCount = 0;
+ (void)initialize {
@@ -101,50 +103,60 @@
}
+ (id)sharedBookmarkController {
-static SKBookmarkController *sharedBookmarkController = nil;
if (sharedBookmarkController == nil)
sharedBookmarkController = [[self alloc] init];
return sharedBookmarkController;
}
++ (id)allocWithZone:(NSZone *)zone {
+return [sharedBookmarkController retain] ?: [super allocWithZone:zone];
+}
+
- (id)init {
-if (self = [super initWithWindowNibName:@"BookmarksWindow"]) {
-recentDocuments = [[NSMutableArray alloc] init];
-
-NSMutableArray *bookmarks = [NSMutableArray array];
-NSData *data = [NSData dataWithContentsOfFile:[self
bookmarksFilePath]];
-if (data) {
-NSString *error = nil;
-NSPropertyListFormat format = NSPropertyListBinaryFormat_v1_0;
-id plist = [NSPropertyListSerialization propertyListFromData:data
-
mutabilityOption:NSPropertyListMutableContainers
-
format:&format
-
errorDescription:&error];
+if (sharedBookmarkController == nil) {
+if (self = [super initWithWindowNibName:@"BookmarksWindow"]) {
+recentDocuments = [[NSMutableArray alloc] init];
-if (error) {
-NSLog(@"Error deserializing: %@", error);
-[error release];
-} else if ([plist isKindOfClass:[NSDictionary class]]) {
-[recentDocuments addObjectsFromArray:[plist
objectForKey:RECENTDOCUMENTS_KEY]];
-for (NSDictionary *dict in [plist objectForKey:BOOKMARKS_KEY])
{
-SKBookmark *bookmark = [[SKBookmark alloc]
initWithProperties:dict];
-if (bookmark) {
-[bookmarks addObject:bookmark];
-[bookmark release];
-} else
-NSLog(@"Failed to read bookmark: %@", dict);
+NSMutableArray *bookmarks = [NSMutableArray array];
+NSData *data = [NSData dataWithContentsOfFile:[self
bookmarksFilePath]];
+if (data) {
+NSString *error = nil;
+NSPropertyListFormat format = NSPropertyListBinaryFormat_v1_0;
+id plist = [NSPropertyListSerialization
propertyListFromData:data
+
mutabilityOption:NSPropertyListMutableContainers
+
format:&format
+
errorDescription:&error];
+
+if (error) {
+NSLog(@"Error deserializing: %@", error);
+[error release];
+} else if ([plist isKindOfClass:[NSDictionary class]]) {
+[recentDocuments addObjectsFromArray:[plist
objectForKey:RECENTDOCUMENTS_KEY]];
+for (NSDictionary *dict in [plist
objectForKey:BOOKMARKS_KEY]) {
+SKBookmark *bookmark = [[SKBookmark alloc]
initWithProperties:dict];
+if (bookmark) {
+[bookmarks addObject:bookmark];
+[bookmark release];
+} else
+NSLog(@"Failed to read bookmark: %@", dict);
+}
}
+
}
+bookmarkRoot = [[SKBookmark alloc] initRootWithChildren:bookmarks];
+[self startObservingBookmarks:[NSArray
arrayWithObject:bookmarkRoot]];
+
+[[NSNotificationCenter defaultCenter] addObserver:self
+
selector:@selector(handleApplicationWillTerminateNotification:)
+
name:NSApplicationWillTermi
[Skim-app-commit] SF.net SVN: skim-app:[7111] trunk/SKBookmarkController.m
Revision: 7111
http://skim-app.svn.sourceforge.net/skim-app/?rev=7111&view=rev
Author: hofman
Date: 2011-02-16 13:33:26 + (Wed, 16 Feb 2011)
Log Message:
---
don't assign singleton instance twice
Modified Paths:
--
trunk/SKBookmarkController.m
Modified: trunk/SKBookmarkController.m
===
--- trunk/SKBookmarkController.m2011-02-16 13:24:58 UTC (rev 7110)
+++ trunk/SKBookmarkController.m2011-02-16 13:33:26 UTC (rev 7111)
@@ -104,7 +104,7 @@
+ (id)sharedBookmarkController {
if (sharedBookmarkController == nil)
-sharedBookmarkController = [[self alloc] init];
+[[[self alloc] init] release];
return sharedBookmarkController;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7112] trunk
Revision: 7112
http://skim-app.svn.sourceforge.net/skim-app/?rev=7112&view=rev
Author: hofman
Date: 2011-02-18 10:47:30 + (Fri, 18 Feb 2011)
Log Message:
---
log attempts to create multiple singleton instances
Modified Paths:
--
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKFindController.m
trunk/SKImageToolTipWindow.m
trunk/SKInfoWindowController.m
trunk/SKLineInspector.m
trunk/SKNotesPanelController.m
trunk/SKPreferenceController.m
trunk/SKReleaseNotesController.m
Modified: trunk/SKBookmarkController.m
===
--- trunk/SKBookmarkController.m2011-02-16 13:33:26 UTC (rev 7111)
+++ trunk/SKBookmarkController.m2011-02-18 10:47:30 UTC (rev 7112)
@@ -154,7 +154,7 @@
}
sharedBookmarkController = [self retain];
} else if (self != sharedBookmarkController) {
-NSLog(@"shouldn't be able to create multiple instances");
+NSLog(@"Attempt to allocate second instance of %@", [self class]);
[self release];
self = [sharedBookmarkController retain];
}
Modified: trunk/SKDownloadController.m
===
--- trunk/SKDownloadController.m2011-02-16 13:33:26 UTC (rev 7111)
+++ trunk/SKDownloadController.m2011-02-18 10:47:30 UTC (rev 7112)
@@ -72,13 +72,19 @@
@synthesize arrayController, tableView, clearButton, prefButton;
+static SKDownloadController *sharedDownloadController = nil;
+
+ (id)sharedDownloadController {
-static SKDownloadController *sharedDownloadController = nil;
if (sharedDownloadController == nil)
sharedDownloadController = [[self alloc] init];
return sharedDownloadController;
}
++ (id)allocWithZone:(NSZone *)zone {
+if (sharedDownloadController) NSLog(@"Attempt to allocate second instance
of %@", self);
+return [super allocWithZone:zone];
+}
+
- (id)init {
if (self = [super initWithWindowNibName:@"DownloadsWindow"]) {
downloads = [[NSMutableArray alloc] init];
Modified: trunk/SKFindController.m
===
--- trunk/SKFindController.m2011-02-16 13:33:26 UTC (rev 7111)
+++ trunk/SKFindController.m2011-02-18 10:47:30 UTC (rev 7112)
@@ -47,13 +47,19 @@
@synthesize findField, ignoreCaseCheckbox, ownerController, labelField,
buttons, findString, ignoreCase;
@dynamic findOptions, target, selectionSource;
+static SKFindController *sharedFindController = nil;
+
+ (id)sharedFindController {
-static SKFindController *sharedFindController = nil;
if (sharedFindController == nil)
sharedFindController = [[self alloc] init];
return sharedFindController;
}
++ (id)allocWithZone:(NSZone *)zone {
+if (sharedFindController) NSLog(@"Attempt to allocate second instance of
%@", self);
+return [super allocWithZone:zone];
+}
+
- (id)init {
if (self = [super initWithWindowNibName:@"FindPanel"]) {
ignoreCase = YES;
Modified: trunk/SKImageToolTipWindow.m
===
--- trunk/SKImageToolTipWindow.m2011-02-16 13:33:26 UTC (rev 7111)
+++ trunk/SKImageToolTipWindow.m2011-02-18 10:47:30 UTC (rev 7112)
@@ -52,13 +52,19 @@
@synthesize currentImageContext=context;
+static SKImageToolTipWindow *sharedToolTipWindow = nil;
+
+ (id)sharedToolTipWindow {
-static SKImageToolTipWindow *sharedToolTipWindow = nil;
if (sharedToolTipWindow == nil)
sharedToolTipWindow = [[self alloc] init];
return sharedToolTipWindow;
}
++ (id)allocWithZone:(NSZone *)zone {
+if (sharedToolTipWindow) NSLog(@"Attempt to allocate second instance of
%@", self);
+return [super allocWithZone:zone];
+}
+
- (id)init {
if (self = [super initWithContentRect:NSZeroRect]) {
[self setHidesOnDeactivate:NO];
Modified: trunk/SKInfoWindowController.m
===
--- trunk/SKInfoWindowController.m 2011-02-16 13:33:26 UTC (rev 7111)
+++ trunk/SKInfoWindowController.m 2011-02-18 10:47:30 UTC (rev 7112)
@@ -80,13 +80,19 @@
[transformer release];
}
+static SKInfoWindowController *sharedInstance = nil;
+
+ (id)sharedInstance {
-static SKInfoWindowController *sharedInstance = nil;
if (sharedInstance == nil)
sharedInstance = [[self alloc] init];
return sharedInstance;
}
++ (id)allocWithZone:(NSZone *)zone {
+if (sharedInstance) NSLog(@"Attempt to allocate second instance of %@",
self);
+return [super allocWithZone:zone];
+}
+
- (id)init {
if (self = [super initWithWindowNibName:@"InfoWindow"]){
info = nil;
Modified: trunk/SKLineInspector.m
=
[Skim-app-commit] SF.net SVN: skim-app:[7113] trunk
Revision: 7113
http://skim-app.svn.sourceforge.net/skim-app/?rev=7113&view=rev
Author: hofman
Date: 2011-02-18 11:09:24 + (Fri, 18 Feb 2011)
Log Message:
---
move warning for duplicate singletons, enforce singleton for preferences
because that's more critical
Modified Paths:
--
trunk/SKDownloadController.m
trunk/SKFindController.m
trunk/SKInfoWindowController.m
trunk/SKLineInspector.m
trunk/SKNotesPanelController.m
trunk/SKPreferenceController.m
trunk/SKReleaseNotesController.m
Modified: trunk/SKDownloadController.m
===
--- trunk/SKDownloadController.m2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKDownloadController.m2011-02-18 11:09:24 UTC (rev 7113)
@@ -80,12 +80,8 @@
return sharedDownloadController;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedDownloadController) NSLog(@"Attempt to allocate second instance
of %@", self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedDownloadController) NSLog(@"Attempt to allocate second instance
of %@", self);
if (self = [super initWithWindowNibName:@"DownloadsWindow"]) {
downloads = [[NSMutableArray alloc] init];
}
Modified: trunk/SKFindController.m
===
--- trunk/SKFindController.m2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKFindController.m2011-02-18 11:09:24 UTC (rev 7113)
@@ -55,12 +55,8 @@
return sharedFindController;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedFindController) NSLog(@"Attempt to allocate second instance of
%@", self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedFindController) NSLog(@"Attempt to allocate second instance of
%@", self);
if (self = [super initWithWindowNibName:@"FindPanel"]) {
ignoreCase = YES;
}
Modified: trunk/SKInfoWindowController.m
===
--- trunk/SKInfoWindowController.m 2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKInfoWindowController.m 2011-02-18 11:09:24 UTC (rev 7113)
@@ -88,12 +88,8 @@
return sharedInstance;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedInstance) NSLog(@"Attempt to allocate second instance of %@",
self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedInstance) NSLog(@"Attempt to allocate second instance of %@",
self);
if (self = [super initWithWindowNibName:@"InfoWindow"]){
info = nil;
summaryKeys = [[NSArray alloc] initWithObjects:
Modified: trunk/SKLineInspector.m
===
--- trunk/SKLineInspector.m 2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKLineInspector.m 2011-02-18 11:09:24 UTC (rev 7113)
@@ -70,12 +70,8 @@
return sharedLineInspector != nil;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedLineInspector) NSLog(@"Attempt to allocate second instance of
%@", self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedLineInspector) NSLog(@"Attempt to allocate second instance of
%@", self);
if (self = [super initWithWindowNibName:@"LineInspector"]) {
style = kPDFBorderStyleSolid;
lineWidth = 1.0;
Modified: trunk/SKNotesPanelController.m
===
--- trunk/SKNotesPanelController.m 2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKNotesPanelController.m 2011-02-18 11:09:24 UTC (rev 7113)
@@ -56,12 +56,8 @@
return sharedController != nil;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedController) NSLog(@"Attempt to allocate second instance of %@",
self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedController) NSLog(@"Attempt to allocate second instance of %@",
self);
return (self = [super initWithWindowNibName:@"NotesPanel"]);
}
Modified: trunk/SKPreferenceController.m
===
--- trunk/SKPreferenceController.m 2011-02-18 10:47:30 UTC (rev 7112)
+++ trunk/SKPreferenceController.m 2011-02-18 11:09:24 UTC (rev 7113)
@@ -64,22 +64,28 @@
+ (id)sharedPrefenceController {
if (sharedPrefenceController == nil)
-sharedPrefenceController = [[self alloc] init];
+[[[self alloc] init] autorelease];
return sharedPrefenceController;
}
+ (id)allocWithZone:(NSZone *)zone {
-if (sharedPrefenceController) NSLog(@"Attempt to allocate second instance
of %@", self);
-return [super allocWithZone:zone];
+return [sharedPrefenceController retain] ?: [super allocWithZone:zone];
}
- (id)init {
-
[Skim-app-commit] SF.net SVN: skim-app:[7114] trunk/SKImageToolTipWindow.m
Revision: 7114
http://skim-app.svn.sourceforge.net/skim-app/?rev=7114&view=rev
Author: hofman
Date: 2011-02-18 11:09:37 + (Fri, 18 Feb 2011)
Log Message:
---
move warning for duplicate singletons
Modified Paths:
--
trunk/SKImageToolTipWindow.m
Modified: trunk/SKImageToolTipWindow.m
===
--- trunk/SKImageToolTipWindow.m2011-02-18 11:09:24 UTC (rev 7113)
+++ trunk/SKImageToolTipWindow.m2011-02-18 11:09:37 UTC (rev 7114)
@@ -60,12 +60,8 @@
return sharedToolTipWindow;
}
-+ (id)allocWithZone:(NSZone *)zone {
-if (sharedToolTipWindow) NSLog(@"Attempt to allocate second instance of
%@", self);
-return [super allocWithZone:zone];
-}
-
- (id)init {
+if (sharedToolTipWindow) NSLog(@"Attempt to allocate second instance of
%@", self);
if (self = [super initWithContentRect:NSZeroRect]) {
[self setHidesOnDeactivate:NO];
[self setIgnoresMouseEvents:YES];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7116] trunk/Info.plist
Revision: 7116 http://skim-app.svn.sourceforge.net/skim-app/?rev=7116&view=rev Author: hofman Date: 2011-02-21 10:19:42 + (Mon, 21 Feb 2011) Log Message: --- update version numbers and release notes for release Modified Paths: -- trunk/Info.plist Modified: trunk/Info.plist === --- trunk/Info.plist2011-02-21 10:18:05 UTC (rev 7115) +++ trunk/Info.plist2011-02-21 10:19:42 UTC (rev 7116) @@ -535,7 +535,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.11 + 1.3.12 CFBundleSignature SKim CFBundleVersion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7117] tags/REL_1_3_12/
Revision: 7117 http://skim-app.svn.sourceforge.net/skim-app/?rev=7117&view=rev Author: hofman Date: 2011-02-21 10:41:27 + (Mon, 21 Feb 2011) Log Message: --- Tag for release Added Paths: --- tags/REL_1_3_12/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7118] trunk/SKMainWindowController_UI.m
Revision: 7118
http://skim-app.svn.sourceforge.net/skim-app/?rev=7118&view=rev
Author: hofman
Date: 2011-02-21 12:07:04 + (Mon, 21 Feb 2011)
Log Message:
---
check for file url before trying to open a link with Skim
Modified Paths:
--
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===
--- trunk/SKMainWindowController_UI.m 2011-02-21 10:41:27 UTC (rev 7117)
+++ trunk/SKMainWindowController_UI.m 2011-02-21 12:07:04 UTC (rev 7118)
@@ -1170,7 +1170,7 @@
NSError *error = nil;
SKDocumentController *sdc = [NSDocumentController
sharedDocumentController];
id document = nil;
-if ([sdc documentClassForContentsOfURL:url]) {
+if ([url isFileURL] && [sdc documentClassForContentsOfURL:url]) {
document = [sdc openDocumentWithContentsOfURL:url display:YES
error:&error];
if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7119] tags/REL_1_3_12/
Revision: 7119 http://skim-app.svn.sourceforge.net/skim-app/?rev=7119&view=rev Author: hofman Date: 2011-02-21 12:15:29 + (Mon, 21 Feb 2011) Log Message: --- remove tag Removed Paths: - tags/REL_1_3_12/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7120] trunk
Revision: 7120
http://skim-app.svn.sourceforge.net/skim-app/?rev=7120&view=rev
Author: hofman
Date: 2011-02-21 12:16:47 + (Mon, 21 Feb 2011)
Log Message:
---
bump version number and release notes for release
Modified Paths:
--
trunk/ReleaseNotes.rtf
trunk/Skim.xcodeproj/project.pbxproj
Modified: trunk/ReleaseNotes.rtf
===
--- trunk/ReleaseNotes.rtf 2011-02-21 12:15:29 UTC (rev 7119)
+++ trunk/ReleaseNotes.rtf 2011-02-21 12:16:47 UTC (rev 7120)
@@ -230,7 +230,9 @@
{\listtext \'95}Fix check in action to add new note.\
{\listtext \'95}Fix duplicate bookmarks manager.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls3\ilvl0\cf0 \
+\ls3\ilvl0\cf0 {\listtext \'95}Fix clicking remote links.\
+\pard\tx560\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f0\b\fs28 \cf0 Changes since 1.3.10\
Modified: trunk/Skim.xcodeproj/project.pbxproj
===
--- trunk/Skim.xcodeproj/project.pbxproj2011-02-21 12:15:29 UTC (rev
7119)
+++ trunk/Skim.xcodeproj/project.pbxproj2011-02-21 12:16:47 UTC (rev
7120)
@@ -3297,7 +3297,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE460E24ED7C00DE06EA
/* Skim-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 61;
+ CURRENT_PROJECT_VERSION = 62;
};
name = Debug;
};
@@ -3305,7 +3305,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CE17EE460E24ED7C00DE06EA
/* Skim-App.xcconfig */;
buildSettings = {
- CURRENT_PROJECT_VERSION = 61;
+ CURRENT_PROJECT_VERSION = 62;
};
name = Release;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7121] tags/REL_1_3_12/
Revision: 7121 http://skim-app.svn.sourceforge.net/skim-app/?rev=7121&view=rev Author: hofman Date: 2011-02-21 12:17:16 + (Mon, 21 Feb 2011) Log Message: --- Tag for release Added Paths: --- tags/REL_1_3_12/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7122] trunk/SKBookmark.m
Revision: 7122
http://skim-app.svn.sourceforge.net/skim-app/?rev=7122&view=rev
Author: hofman
Date: 2011-02-21 16:02:21 + (Mon, 21 Feb 2011)
Log Message:
---
fix scripting key for bookmark type
Modified Paths:
--
trunk/SKBookmark.m
Modified: trunk/SKBookmark.m
===
--- trunk/SKBookmark.m 2011-02-21 12:17:16 UTC (rev 7121)
+++ trunk/SKBookmark.m 2011-02-21 16:02:21 UTC (rev 7122)
@@ -616,7 +616,7 @@
NSURL *aURL = [properties objectForKey:@"scriptingFile"] ?:
contentsValue;
NSString *aPath = [aURL respondsToSelector:@selector(path)] ? [aURL
path] : nil;
NSString *aLabel = [properties objectForKey:@"label"];
-NSInteger type = [[properties objectForKey:@"scriptingBookmarkType"]
integerValue];
+NSInteger type = [[properties objectForKey:@"bookmarkType"]
integerValue];
if (type == 0) {
if (aURL == nil)
type = SKBookmarkTypeSession;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7123] trunk/SKMainDocument.m
Revision: 7123 http://skim-app.svn.sourceforge.net/skim-app/?rev=7123&view=rev Author: hofman Date: 2011-02-22 10:43:24 + (Tue, 22 Feb 2011) Log Message: --- only start checking file updates when the window is loaded, otherwise we may end up with a zombie document in the file checker Modified Paths: -- trunk/SKMainDocument.m Modified: trunk/SKMainDocument.m === --- trunk/SKMainDocument.m 2011-02-21 16:02:21 UTC (rev 7122) +++ trunk/SKMainDocument.m 2011-02-22 10:43:24 UTC (rev 7123) @@ -208,6 +208,9 @@ [[self undoManager] enableUndoRegistration]; +if ([self fileURL]) +[fileUpdateChecker checkFileUpdatesIfNeeded]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleWindowWillCloseNotification:) name:NSWindowWillCloseNotification object:[[self mainWindowController] window]]; } @@ -1314,7 +1317,7 @@ [super setFileURL:absoluteURL]; // if we're saving this will be called when saving has finished -if (isSaving == NO) +if (isSaving == NO && [mainWindowController isWindowLoaded]) [fileUpdateChecker checkFileUpdatesIfNeeded]; if ([absoluteURL isFileURL]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- 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. Free Software Download: http://p.sf.net/sfu/splunk-dev2dev ___ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7124] trunk/SKMainDocument.m
Revision: 7124
http://skim-app.svn.sourceforge.net/skim-app/?rev=7124&view=rev
Author: hofman
Date: 2011-02-22 10:46:37 + (Tue, 22 Feb 2011)
Log Message:
---
security stop fileupdate checking in dealloc
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-02-22 10:43:24 UTC (rev 7123)
+++ trunk/SKMainDocument.m 2011-02-22 10:46:37 UTC (rev 7124)
@@ -161,6 +161,9 @@
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
+// shouldn't need this here, but better be safe
+[fileUpdateChecker stopCheckingFileUpdates];
+SKDESTROY(fileUpdateChecker);
SKDESTROY(mainWindowController);
[synchronizer terminate];
[synchronizer setDelegate:nil];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
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.
Free Software Download: http://p.sf.net/sfu/splunk-dev2dev
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7125] trunk/SKDocumentController.m
Revision: 7125
http://skim-app.svn.sourceforge.net/skim-app/?rev=7125&view=rev
Author: hofman
Date: 2011-02-22 11:21:01 + (Tue, 22 Feb 2011)
Log Message:
---
check for existing file when opening setup
Modified Paths:
--
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.m
===
--- trunk/SKDocumentController.m2011-02-22 10:46:37 UTC (rev 7124)
+++ trunk/SKDocumentController.m2011-02-22 11:21:01 UTC (rev 7125)
@@ -310,7 +310,7 @@
NSURL *fileURL = [[BDAlias aliasWithData:[setup
objectForKey:SKDocumentSetupAliasKey]] fileURL];
if(fileURL == nil && [setup objectForKey:SKDocumentSetupFileNameKey])
fileURL = [NSURL fileURLWithPath:[setup
objectForKey:SKDocumentSetupFileNameKey]];
-if(fileURL && NO == [[NSFileManager defaultManager]
isTrashedFileAtURL:fileURL]) {
+if(fileURL && [[NSFileManager defaultManager] fileExistsAtPath:[fileURL
path]] && NO == [[NSFileManager defaultManager] isTrashedFileAtURL:fileURL]) {
if (document = [self documentForURL:fileURL]) {
// the document was already open, don't call makeWindowControllers
because that adds new empty windows
[document applySetup:setup];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
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.
Free Software Download: http://p.sf.net/sfu/splunk-dev2dev
___
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7126] trunk
Revision: 7126 http://skim-app.svn.sourceforge.net/skim-app/?rev=7126&view=rev Author: hofman Date: 2011-02-23 17:56:25 + (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 @@ 1040 - 10H574 + 10J567 823 1038.35 - 461.00 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin 823 @@ -314,6 +314,26 @@ + + + Move to Trash + CA + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + Save Archive… @@ -3646,6 +3666,14 @@ 1088 + + + moveToTrash: + + + + 1092 + @@ -3890,6 +39
[Skim-app-commit] SF.net SVN: skim-app:[7127] trunk/SKScriptMenu.m
Revision: 7127
http://skim-app.svn.sourceforge.net/skim-app/?rev=7127&view=rev
Author: hofman
Date: 2011-02-25 11:55:06 + (Fri, 25 Feb 2011)
Log Message:
---
run applescript from script menu through osascript task, because some commands
like close will behave differently when called from the same process.
Modified Paths:
--
trunk/SKScriptMenu.m
Modified: trunk/SKScriptMenu.m
===
--- trunk/SKScriptMenu.m2011-02-23 17:56:25 UTC (rev 7126)
+++ trunk/SKScriptMenu.m2011-02-25 11:55:06 UTC (rev 7127)
@@ -251,24 +251,9 @@
NSString *theUTI = [[NSWorkspace sharedWorkspace]
typeOfFile:[[scriptFilename stringByStandardizingPath]
stringByResolvingSymlinksInPath] error:NULL];
if (isAppleScriptUTI(theUTI)) {
-NSDictionary *errorDictionary;
-NSAppleScript *script = [[[NSAppleScript alloc]
initWithContentsOfURL:[NSURL fileURLWithPath:scriptFilename]
error:&errorDictionary] autorelease];
-if (script == nil) {
-NSLog(@"AppleScript file '%@' could not be opened: %@",
scriptFilename, errorDictionary);
-NSBeep();
-} else {
-NSAppleEventDescriptor *result = [script
executeAndReturnError:&errorDictionary];
-if (result == nil && [[errorDictionary
objectForKey:NSAppleScriptErrorNumber] integerValue] != -128) {
-NSLog(@"AppleScript file '%@' failed to execute: %@",
scriptFilename, errorDictionary);
-NSBeep();
-}
-}
+[NSTask launchedTaskWithLaunchPath:@"/usr/bin/osascript"
arguments:[NSArray arrayWithObjects:scriptFilename, nil]];
} else if (isApplicationUTI(theUTI)) {
-BOOL result = [[NSWorkspace sharedWorkspace]
launchApplication:scriptFilename];
-if (result == NO) {
-NSLog(@"Application '%@' could not be launched", scriptFilename);
-NSBeep();
-}
+[[NSWorkspace sharedWorkspace] launchApplication:scriptFilename];
} else if (isAutomatorWorkflowUTI(theUTI)) {
[NSTask launchedTaskWithLaunchPath:@"/usr/bin/automator"
arguments:[NSArray arrayWithObjects:scriptFilename, nil]];
} else if ([[NSFileManager defaultManager]
isExecutableFileAtPath:scriptFilename]) {
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7128] trunk
Revision: 7128
http://skim-app.svn.sourceforge.net/skim-app/?rev=7128&view=rev
Author: hofman
Date: 2011-02-25 12:24:30 + (Fri, 25 Feb 2011)
Log Message:
---
Implement moveToTrash action in download controller
Modified Paths:
--
trunk/SKDownloadController.h
trunk/SKDownloadController.m
Modified: trunk/SKDownloadController.h
===
--- trunk/SKDownloadController.h2011-02-25 11:55:06 UTC (rev 7127)
+++ trunk/SKDownloadController.h2011-02-25 12:24:30 UTC (rev 7128)
@@ -64,11 +64,10 @@
- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
+- (IBAction)showDownloadPreferences:(id)sender;
- (IBAction)clearDownloads:(id)sender;
-- (IBAction)removeDownload:(id)sender;
-- (IBAction)cancelDownload:(id)sender;
-- (IBAction)showDownloadPreferences:(id)sender;
+- (IBAction)moveToTrash:(id)sender;
- (NSArray *)downloads;
- (NSUInteger)countOfDownloads;
Modified: trunk/SKDownloadController.m
===
--- trunk/SKDownloadController.m2011-02-25 11:55:06 UTC (rev 7127)
+++ trunk/SKDownloadController.m2011-02-25 12:24:30 UTC (rev 7128)
@@ -212,6 +212,11 @@
#pragma mark Actions
+- (IBAction)showDownloadPreferences:(id)sender {
+SKDownloadPreferenceController *prefController =
[[[SKDownloadPreferenceController alloc] init] autorelease];
+[prefController beginSheetModalForWindow:[self window]];
+}
+
- (IBAction)clearDownloads:(id)sender {
NSInteger i = [self countOfDownloads];
@@ -222,7 +227,24 @@
}
}
-- (IBAction)cancelDownload:(id)sender {
+- (IBAction)moveToTrash:(id)sender {
+SKDownload *download = nil;
+NSInteger row = [tableView selectedRow];
+if (row != -1)
+download = [self objectInDownloadsAtIndex:row];
+if (download && [download status] == SKDownloadStatusFinished) {
+NSString *filePath = [download filePath];
+NSString *folderPath = [filePath stringByDeletingLastPathComponent];
+NSString *fileName = [filePath lastPathComponent];
+NSInteger tag = 0;
+
+[[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation source:folderPath
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag];
+} else {
+NSBeep();
+}
+}
+
+- (void)cancelDownload:(id)sender {
SKDownload *download = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
nil;
if (download == nil) {
@@ -234,7 +256,7 @@
[download cancel];
}
-- (IBAction)resumeDownload:(id)sender {
+- (void)resumeDownload:(id)sender {
SKDownload *download = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
nil;
if (download == nil) {
@@ -246,7 +268,7 @@
[download resume];
}
-- (IBAction)removeDownload:(id)sender {
+- (void)removeDownload:(id)sender {
SKDownload *download = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
nil;
if (download == nil) {
@@ -259,11 +281,6 @@
[[self mutableArrayValueForKey:DOWNLOADS_KEY] removeObject:download];
}
-- (IBAction)showDownloadPreferences:(id)sender {
-SKDownloadPreferenceController *prefController =
[[[SKDownloadPreferenceController alloc] init] autorelease];
-[prefController beginSheetModalForWindow:[self window]];
-}
-
- (void)openDownloadedFile:(id)sender {
SKDownload *download = [sender representedObject];
@@ -302,6 +319,16 @@
}
}
+#pragma mark Menu validation
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+if ([menuItem action] == @selector(moveToTrash:)) {
+NSInteger row = [tableView selectedRow];
+return (row != -1 && [[self objectInDownloadsAtIndex:row] status] ==
SKDownloadStatusFinished);
+}
+return YES;
+}
+
#pragma mark SKDownloadDelegate
- (void)downloadDidEnd:(SKDownload *)download {
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7129] trunk/SKDownloadController.m
Revision: 7129
http://skim-app.svn.sourceforge.net/skim-app/?rev=7129&view=rev
Author: hofman
Date: 2011-02-25 12:41:53 + (Fri, 25 Feb 2011)
Log Message:
---
delete trashed download in moveToTrash
Modified Paths:
--
trunk/SKDownloadController.m
Modified: trunk/SKDownloadController.m
===
--- trunk/SKDownloadController.m2011-02-25 12:24:30 UTC (rev 7128)
+++ trunk/SKDownloadController.m2011-02-25 12:41:53 UTC (rev 7129)
@@ -232,13 +232,16 @@
NSInteger row = [tableView selectedRow];
if (row != -1)
download = [self objectInDownloadsAtIndex:row];
-if (download && [download status] == SKDownloadStatusFinished) {
-NSString *filePath = [download filePath];
-NSString *folderPath = [filePath stringByDeletingLastPathComponent];
-NSString *fileName = [filePath lastPathComponent];
-NSInteger tag = 0;
-
-[[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation source:folderPath
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag];
+if ([download canRemove]) {
+if ([download status] == SKDownloadStatusFinished) {
+NSString *filePath = [download filePath];
+NSString *folderPath = [filePath
stringByDeletingLastPathComponent];
+NSString *fileName = [filePath lastPathComponent];
+NSInteger tag = 0;
+
+[[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation source:folderPath
destination:nil files:[NSArray arrayWithObjects:fileName, nil] tag:&tag];
+}
+[[self mutableArrayValueForKey:DOWNLOADS_KEY] removeObject:download];
} else {
NSBeep();
}
@@ -324,7 +327,7 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if ([menuItem action] == @selector(moveToTrash:)) {
NSInteger row = [tableView selectedRow];
-return (row != -1 && [[self objectInDownloadsAtIndex:row] status] ==
SKDownloadStatusFinished);
+return (row != -1 && [[self objectInDownloadsAtIndex:row] canRemove]);
}
return YES;
}
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7130] trunk/SKApplication.m
Revision: 7130
http://skim-app.svn.sourceforge.net/skim-app/?rev=7130&view=rev
Author: hofman
Date: 2011-02-26 12:04:07 + (Sat, 26 Feb 2011)
Log Message:
---
simplify interaction mode switching
Modified Paths:
--
trunk/SKApplication.m
Modified: trunk/SKApplication.m
===
--- trunk/SKApplication.m 2011-02-25 12:41:53 UTC (rev 7129)
+++ trunk/SKApplication.m 2011-02-26 12:04:07 UTC (rev 7130)
@@ -83,25 +83,14 @@
}
- (void)updatePresentationOptionsForWindow:(NSWindow *)aWindow {
-SystemUIMode currentMode, mode;
-SystemUIOptions currentOptions, options;
+const static SystemUIMode modes[3] = {kUIModeNormal, kUIModeAllHidden,
kUIModeAllHidden};
+const static SystemUIOptions options[3] = {0, kUIOptionAutoShowMenuBar,
kUIOptionDisableProcessSwitch};
+SystemUIMode currentMode;
+SystemUIOptions currentOptions;
GetSystemUIMode(¤tMode, ¤tOptions);
-switch ([[[aWindow windowController] document] systemInteractionMode]) {
-case SKPresentationMode:
-mode = kUIModeAllHidden;
-options = kUIOptionDisableProcessSwitch;
-break;
-case SKFullScreenMode:
-mode = kUIModeAllHidden;
-options = kUIOptionAutoShowMenuBar;
-break;
-default:
-mode = kUIModeNormal;
-options = 0;
-break;
-}
-if (mode != currentMode || options != currentOptions)
-SetSystemUIMode(mode, options);
+SKInteractionMode mode = [[[aWindow windowController] document]
systemInteractionMode];
+if (currentMode != modes[mode] || currentOptions != options[mode])
+SetSystemUIMode(modes[mode], options[mode]);
}
- (void)reorganizeWindowsItem:(NSWindow *)aWindow {
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7131] trunk/displayline
Revision: 7131 http://skim-app.svn.sourceforge.net/skim-app/?rev=7131&view=rev Author: hofman Date: 2011-02-27 11:18:37 + (Sun, 27 Feb 2011) Log Message: --- make sure the line argument in displayline script is passed as an integer Modified Paths: -- trunk/displayline Modified: trunk/displayline === --- trunk/displayline 2011-02-26 12:04:07 UTC (rev 7130) +++ trunk/displayline 2011-02-27 11:18:37 UTC (rev 7131) @@ -45,6 +45,7 @@ -e "set theFile to POSIX file theFile" \ -e "set theSource to POSIX file theSource" \ -e "set thePath to POSIX path of (theFile as alias)" \ + -e "set theLine to $line as integer" \ -e "tell application \"Skim\"" \ -e " if $activate then activate" \ -e " if $revert then" \ @@ -54,5 +55,5 @@ -e "end try" \ -e " end if" \ -e " open theFile" \ - -e " tell front document to go to TeX line $line from theSource showing reading bar $bar" \ + -e " tell front document to go to TeX line theLine from theSource showing reading bar $bar" \ -e "end tell" - 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 Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7132] trunk/displayline
Revision: 7132
http://skim-app.svn.sourceforge.net/skim-app/?rev=7132&view=rev
Author: hofman
Date: 2011-02-27 11:24:11 + (Sun, 27 Feb 2011)
Log Message:
---
make sure the line argument in displayline script is passed as an integer
Modified Paths:
--
trunk/displayline
Modified: trunk/displayline
===
--- trunk/displayline 2011-02-27 11:18:37 UTC (rev 7131)
+++ trunk/displayline 2011-02-27 11:24:11 UTC (rev 7132)
@@ -37,15 +37,15 @@
# pass file arguments as NULL-separated string to osascript
# pass through cat to get them as raw bytes to preserve non-ASCII characters
-echo -ne "${file}\x00${source}" | \
+echo -ne "${line}\x00${file}\x00${source}" | \
/usr/bin/osascript \
-e "set theArgv to do shell script \"/bin/cat\"" \
-e "set AppleScript's text item delimiters to ASCII character 0" \
- -e "set {theFile, theSource} to text items of theArgv" \
+ -e "set {theLine, theFile, theSource} to text items of theArgv" \
+ -e "set theLine to theLine as integer" \
-e "set theFile to POSIX file theFile" \
-e "set theSource to POSIX file theSource" \
-e "set thePath to POSIX path of (theFile as alias)" \
- -e "set theLine to $line as integer" \
-e "tell application \"Skim\"" \
-e " if $activate then activate" \
-e " if $revert then" \
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7133] trunk/SKMainDocument.m
Revision: 7133
http://skim-app.svn.sourceforge.net/skim-app/?rev=7133&view=rev
Author: hofman
Date: 2011-03-01 13:12:56 + (Tue, 01 Mar 2011)
Log Message:
---
default to print scaling down to fit
Modified Paths:
--
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-02-27 11:24:11 UTC (rev 7132)
+++ trunk/SKMainDocument.m 2011-03-01 13:12:56 UTC (rev 7133)
@@ -889,7 +889,7 @@
if (showPrintPanel == NO)
[infoDict setObject:[NSNumber numberWithBool:YES]
forKey:SKSuppressPrintPanel];
-[[self pdfView] printWithInfo:printInfo autoRotate:YES
pageScaling:kPDFPrintPageScaleNone];
+[[self pdfView] printWithInfo:printInfo autoRotate:YES
pageScaling:kPDFPrintPageScaleDownToFit];
if (callback) {
if (showPrintPanel && [printWindow attachedSheet]) {
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7135] trunk/SKPDFView.m
Revision: 7135
http://skim-app.svn.sourceforge.net/skim-app/?rev=7135&view=rev
Author: hofman
Date: 2011-03-02 18:15:15 + (Wed, 02 Mar 2011)
Log Message:
---
center synctex location in pdfview
Modified Paths:
--
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===
--- trunk/SKPDFView.m 2011-03-02 11:10:26 UTC (rev 7134)
+++ trunk/SKPDFView.m 2011-03-02 18:15:15 UTC (rev 7135)
@@ -2169,6 +2169,11 @@
[self setCurrentSelection:sel];
}
}
+if ([self displayMode] == kPDFDisplaySinglePageContinuous || [self
displayMode] == kPDFDisplayTwoUpContinuous) {
+NSRect visibleRect = [self convertRect:[[self documentView]
visibleRect] fromView:[self documentView]];
+visibleRect = [self convertRect:visibleRect toPage:[readingBar
page]];
+rect = NSInsetRect(rect, 0.0, - floor( ( NSHeight(visibleRect) -
NSHeight(rect) ) / 2.0 ) );
+}
[self goToRect:rect onPage:page];
}
}
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7134] trunk/SKPDFSynchronizerServer.m
Revision: 7134 http://skim-app.svn.sourceforge.net/skim-app/?rev=7134&view=rev Author: hofman Date: 2011-03-02 11:10:26 + (Wed, 02 Mar 2011) Log Message: --- log failures of pdf tex sync Modified Paths: -- trunk/SKPDFSynchronizerServer.m Modified: trunk/SKPDFSynchronizerServer.m === --- trunk/SKPDFSynchronizerServer.m 2011-03-01 13:12:56 UTC (rev 7133) +++ trunk/SKPDFSynchronizerServer.m 2011-03-02 11:10:26 UTC (rev 7134) @@ -399,7 +399,7 @@ [pages makeObjectsPerformSelector:@selector(sortUsingDescriptors:) withObject:[NSArray arrayWithObjects:ySortDescriptor, xSortDescriptor, nil]]; - rv = [self shouldKeepRunning]; +rv = [self shouldKeepRunning]; } } @@ -468,6 +468,8 @@ rv = YES; } } +if (rv == NO) +NSLog(@"PDFSync was unable to find file and line."); return rv; } @@ -517,6 +519,8 @@ rv = YES; } } +if (rv == NO) +NSLog(@"PDFSync was unable to find location and page."); return rv; } @@ -562,6 +566,8 @@ } } } +if (rv == NO) +NSLog(@"SyncTeX was unable to find file and line."); return rv; } @@ -577,6 +583,8 @@ rv = YES; } } +if (rv == NO) +NSLog(@"SyncTeX was unable to find location and page."); return rv; } @@ -608,6 +616,8 @@ } } } +if (rv == NO) +NSLog(@"Unable to find or load synctex or pdfsync file."); return rv; } 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 Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7136] trunk
Revision: 7136
http://skim-app.svn.sourceforge.net/skim-app/?rev=7136&view=rev
Author: hofman
Date: 2011-03-03 13:20:17 + (Thu, 03 Mar 2011)
Log Message:
---
set file update checker document to nil before getting rid of it, just to be
sure
Modified Paths:
--
trunk/SKFileUpdateChecker.h
trunk/SKFileUpdateChecker.m
trunk/SKMainDocument.m
Modified: trunk/SKFileUpdateChecker.h
===
--- trunk/SKFileUpdateChecker.h 2011-03-02 18:15:15 UTC (rev 7135)
+++ trunk/SKFileUpdateChecker.h 2011-03-03 13:20:17 UTC (rev 7136)
@@ -57,6 +57,8 @@
NSTimer *fileUpdateTimer;
}
+@property (nonatomic, assign) NSDocument *document;
+
- (id)initForDocument:(NSDocument *)aDocument;
- (BOOL)fileChangedOnDisk;
Modified: trunk/SKFileUpdateChecker.m
===
--- trunk/SKFileUpdateChecker.m 2011-03-02 18:15:15 UTC (rev 7135)
+++ trunk/SKFileUpdateChecker.m 2011-03-03 13:20:17 UTC (rev 7136)
@@ -62,6 +62,8 @@
@implementation SKFileUpdateChecker
+@synthesize document;
+
- (id)initForDocument:(NSDocument *)aDocument {
if (self = [super init]) {
document = aDocument;
Modified: trunk/SKMainDocument.m
===
--- trunk/SKMainDocument.m 2011-03-02 18:15:15 UTC (rev 7135)
+++ trunk/SKMainDocument.m 2011-03-03 13:20:17 UTC (rev 7136)
@@ -163,6 +163,7 @@
[[NSNotificationCenter defaultCenter] removeObserver:self];
// shouldn't need this here, but better be safe
[fileUpdateChecker stopCheckingFileUpdates];
+[fileUpdateChecker setDocument:nil];
SKDESTROY(fileUpdateChecker);
SKDESTROY(mainWindowController);
[synchronizer terminate];
@@ -1320,6 +1321,7 @@
// ignore when we're switching fullscreen/main windows
if ([window isEqual:[[window windowController] window]]) {
[fileUpdateChecker stopCheckingFileUpdates];
+[fileUpdateChecker setDocument:nil];
SKDESTROY(fileUpdateChecker);
[self saveRecentDocumentInfo];
}
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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
[Skim-app-commit] SF.net SVN: skim-app:[7137] trunk
Revision: 7137
http://skim-app.svn.sourceforge.net/skim-app/?rev=7137&view=rev
Author: hofman
Date: 2011-03-04 10:53:05 + (Fri, 04 Mar 2011)
Log Message:
---
Use hex string for name of applescript rich text format, as the name is
supposed to be case insensitive, also consistent with raw data representation
Modified Paths:
--
trunk/NSData_SKExtensions.h
trunk/NSData_SKExtensions.m
trunk/SKRichTextFormat.m
Modified: trunk/NSData_SKExtensions.h
===
--- trunk/NSData_SKExtensions.h 2011-03-03 13:20:17 UTC (rev 7136)
+++ trunk/NSData_SKExtensions.h 2011-03-04 10:53:05 UTC (rev 7137)
@@ -56,8 +56,8 @@
- (NSString *)md5String;
- (NSString *)xmlString;
-- (id)initWithBase64String:(NSString *)base64String;
-- (NSString *)base64String;
+- (id)initWithHexString:(NSString *)hexString;
+- (NSString *)hexString;
+ (NSData *)dataWithPointAsQDPoint:(NSPoint)point;
+ (NSData *)dataWithRectAsQDRect:(NSRect)rect;
Modified: trunk/NSData_SKExtensions.m
===
--- trunk/NSData_SKExtensions.m 2011-03-03 13:20:17 UTC (rev 7136)
+++ trunk/NSData_SKExtensions.m 2011-03-04 10:53:05 UTC (rev 7137)
@@ -108,94 +108,58 @@
return NSMakeRange(NSNotFound, 0);
}
-- (NSString *)md5String {
-CC_MD5_CTX md5context;
-NSUInteger signatureLength = CC_MD5_DIGEST_LENGTH;
-unsigned char signature[signatureLength];
-NSUInteger blockSize = 4096;
-char buffer[blockSize];
-NSUInteger length = [self length];
-NSRange range = NSMakeRange(0, MIN(blockSize, length));
-
-CC_MD5_Init(&md5context);
-while (range.length > 0) {
-[self getBytes:buffer range:range];
-CC_MD5_Update(&md5context, (const void *)buffer,
(CC_LONG)range.length);
-range.location = NSMaxRange(range);
-range.length = MIN(blockSize, length - range.location);
-}
-CC_MD5_Final(signature, &md5context);
-
-NSMutableString *md5String = [NSMutableString
stringWithCapacity:signatureLength];
-NSUInteger i;
-
-for (i = 0; i < signatureLength; i++)
-[md5String appendFormat:@"%02x", signature[i]];
-
-return md5String;
-}
-
-// The following code is taken and modified from Matt Gallagher's code at
http://cocoawithlove.com/2009/06/base64-encoding-options-on-mac-and.html
-
// Mapping from 6 bit pattern to ASCII character.
-static unsigned char base64EncodeTable[65] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static unsigned char hexEncodeTable[16] = "0123456789ABCDEF";
-// Definition for "masked-out" areas of the base64DecodeTable mapping
-#define xx 65
+// Definition for "masked-out" areas of the hexDecodeTable mapping
+#define xx 0xFF
-// Mapping from ASCII character to 6 bit pattern.
-static unsigned char base64DecodeTable[256] =
+// Mapping from ASCII character to 4 bit pattern.
+static unsigned char hexDecodeTable[256] =
{
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
-xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 62, xx, xx, xx, 63,
-52, 53, 54, 55, 56, 57, 58, 59, 60, 61, xx, xx, xx, xx, xx, xx,
-xx, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, xx, xx, xx, xx, xx,
-xx, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, xx, xx, xx, xx, xx, xx,
+xx, 10, 11, 12, 13, 14, 15, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
+xx, 10, 11, 12, 13, 14, 15, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
+xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
+xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
+xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx,
};
-// Fundamental sizes of the binary and base64 encode/decode units in bytes
-#define BINARY_UNIT_SIZE 3
-#define BASE64_UNIT_SIZE 4
-
-- (id)initWithBase64String:(NSString *)base64String {
-NSData *data = [base64String dataUsingEncoding:NSASCIIStringEncoding];
+- (id)initWithHexString:(NSString *)hexString {
+NSData *data = [hexStrin
