Menu
▾
▴
skim-app-commit — This tracks source code changes in Subversion.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(23) |
Apr
(254) |
May
(252) |
Jun
(209) |
Jul
(198) |
Aug
(192) |
Sep
(207) |
Oct
(120) |
Nov
(179) |
Dec
(52) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(48) |
Feb
(69) |
Mar
(129) |
Apr
(250) |
May
(113) |
Jun
(177) |
Jul
(228) |
Aug
(155) |
Sep
(218) |
Oct
(185) |
Nov
(109) |
Dec
(88) |
| 2009 |
Jan
(83) |
Feb
(39) |
Mar
(70) |
Apr
(47) |
May
(48) |
Jun
(67) |
Jul
(61) |
Aug
(97) |
Sep
(221) |
Oct
(141) |
Nov
(70) |
Dec
(61) |
| 2010 |
Jan
(45) |
Feb
(76) |
Mar
(178) |
Apr
(106) |
May
(57) |
Jun
(32) |
Jul
(64) |
Aug
(98) |
Sep
(96) |
Oct
(19) |
Nov
(34) |
Dec
(117) |
| 2011 |
Jan
(55) |
Feb
(48) |
Mar
(64) |
Apr
(21) |
May
(39) |
Jun
(53) |
Jul
(99) |
Aug
(56) |
Sep
(39) |
Oct
(26) |
Nov
(19) |
Dec
(69) |
| 2012 |
Jan
(17) |
Feb
(40) |
Mar
(17) |
Apr
|
May
(2) |
Jun
(8) |
Jul
(2) |
Aug
(10) |
Sep
(10) |
Oct
(38) |
Nov
(48) |
Dec
(70) |
| 2013 |
Jan
(43) |
Feb
(47) |
Mar
(39) |
Apr
(37) |
May
(25) |
Jun
(6) |
Jul
(20) |
Aug
(49) |
Sep
(33) |
Oct
(34) |
Nov
(75) |
Dec
(6) |
| 2014 |
Jan
(32) |
Feb
(10) |
Mar
(17) |
Apr
|
May
|
Jun
(26) |
Jul
(5) |
Aug
|
Sep
(4) |
Oct
(23) |
Nov
(80) |
Dec
(48) |
| 2015 |
Jan
(80) |
Feb
(50) |
Mar
(58) |
Apr
(20) |
May
(11) |
Jun
(16) |
Jul
(24) |
Aug
(27) |
Sep
(56) |
Oct
(30) |
Nov
(16) |
Dec
(6) |
| 2016 |
Jan
(31) |
Feb
(14) |
Mar
(23) |
Apr
(17) |
May
(40) |
Jun
(12) |
Jul
(17) |
Aug
(9) |
Sep
(32) |
Oct
(36) |
Nov
(23) |
Dec
(9) |
| 2017 |
Jan
(37) |
Feb
(23) |
Mar
(65) |
Apr
(22) |
May
(6) |
Jun
(3) |
Jul
|
Aug
|
Sep
(3) |
Oct
(22) |
Nov
(63) |
Dec
(71) |
| 2018 |
Jan
(83) |
Feb
(21) |
Mar
(35) |
Apr
(44) |
May
(14) |
Jun
(12) |
Jul
(8) |
Aug
(18) |
Sep
(10) |
Oct
(145) |
Nov
(144) |
Dec
(76) |
| 2019 |
Jan
(18) |
Feb
(28) |
Mar
(5) |
Apr
(208) |
May
(291) |
Jun
(158) |
Jul
(27) |
Aug
(8) |
Sep
(10) |
Oct
(83) |
Nov
(41) |
Dec
(31) |
| 2020 |
Jan
(16) |
Feb
(46) |
Mar
(100) |
Apr
(78) |
May
(69) |
Jun
(71) |
Jul
(28) |
Aug
(131) |
Sep
(176) |
Oct
(89) |
Nov
(147) |
Dec
(19) |
| 2021 |
Jan
(19) |
Feb
(25) |
Mar
(91) |
Apr
(98) |
May
(14) |
Jun
(44) |
Jul
(8) |
Aug
(3) |
Sep
(38) |
Oct
(57) |
Nov
(97) |
Dec
(74) |
| 2022 |
Jan
(89) |
Feb
(47) |
Mar
(15) |
Apr
(50) |
May
(54) |
Jun
(56) |
Jul
(80) |
Aug
(12) |
Sep
(11) |
Oct
(60) |
Nov
(48) |
Dec
(4) |
| 2023 |
Jan
(75) |
Feb
(49) |
Mar
(84) |
Apr
(24) |
May
(13) |
Jun
(74) |
Jul
(32) |
Aug
(66) |
Sep
(50) |
Oct
(38) |
Nov
(105) |
Dec
(181) |
| 2024 |
Jan
(21) |
Feb
(49) |
Mar
(77) |
Apr
(84) |
May
(20) |
Jun
(71) |
Jul
(53) |
Aug
(33) |
Sep
(54) |
Oct
(124) |
Nov
(151) |
Dec
(73) |
| 2025 |
Jan
(61) |
Feb
(17) |
Mar
(136) |
Apr
(72) |
May
(200) |
Jun
(238) |
Jul
(91) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ho...@us...> - 2007-08-30 16:59:19
|
Revision: 2785
http://skim-app.svn.sourceforge.net/skim-app/?rev=2785&view=rev
Author: hofman
Date: 2007-08-30 09:59:11 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Add a "Select None" menu item. Validate selectAll: and deselectAll: for tables.
Modified Paths:
--------------
trunk/Dutch.lproj/MainMenu.nib/classes.nib
trunk/Dutch.lproj/MainMenu.nib/info.nib
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainMenu.nib/classes.nib
trunk/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainMenu.nib/classes.nib
trunk/French.lproj/MainMenu.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainMenu.nib/classes.nib
trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKOutlineView.m
trunk/SKTableView.m
Modified: trunk/Dutch.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -15,6 +15,7 @@
createNewNote = id;
crop = id;
cropAll = id;
+ deselectAll = id;
displayCropBox = id;
displayFacingPages = id;
displayMediaBox = id;
Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -7,10 +7,14 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 542 44 0 0 1440 938 </string>
+ <string>140 614 635 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>29</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -31,8 +31,9 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>502</integer>
<integer>224</integer>
- <integer>502</integer>
+ <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/classes.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/English.lproj/MainMenu.nib/classes.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -15,6 +15,7 @@
createNewNote = id;
crop = id;
cropAll = id;
+ deselectAll = id;
displayCropBox = id;
displayFacingPages = id;
displayMediaBox = id;
Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -31,20 +31,20 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>585</integer>
- <integer>511</integer>
+ <integer>633</integer>
+ <integer>502</integer>
+ <integer>314</integer>
+ <integer>224</integer>
+ <integer>5</integer>
<integer>553</integer>
- <integer>168</integer>
<integer>694</integer>
- <integer>314</integer>
- <integer>5</integer>
- <integer>539</integer>
+ <integer>511</integer>
<integer>687</integer>
- <integer>633</integer>
<integer>208</integer>
+ <integer>585</integer>
+ <integer>168</integer>
+ <integer>539</integer>
<integer>256</integer>
- <integer>224</integer>
- <integer>502</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/French.lproj/MainMenu.nib/classes.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/French.lproj/MainMenu.nib/classes.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -15,6 +15,7 @@
createNewNote = id;
crop = id;
cropAll = id;
+ deselectAll = id;
displayCropBox = id;
displayFacingPages = id;
displayMediaBox = id;
Modified: trunk/French.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/MainMenu.nib/classes.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/Italian.lproj/MainMenu.nib/classes.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -15,6 +15,7 @@
createNewNote = id;
crop = id;
cropAll = id;
+ deselectAll = id;
displayCropBox = id;
displayFacingPages = id;
displayMediaBox = id;
Modified: trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 16:59:11 UTC (rev 2785)
@@ -31,18 +31,18 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>676</integer>
+ <integer>256</integer>
+ <integer>539</integer>
<integer>511</integer>
- <integer>314</integer>
+ <integer>208</integer>
<integer>224</integer>
- <integer>502</integer>
- <integer>539</integer>
- <integer>208</integer>
+ <integer>676</integer>
<integer>677</integer>
- <integer>628</integer>
<integer>5</integer>
- <integer>256</integer>
+ <integer>314</integer>
+ <integer>502</integer>
<integer>553</integer>
+ <integer>628</integer>
<integer>168</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/SKOutlineView.m 2007-08-30 16:59:11 UTC (rev 2785)
@@ -154,6 +154,10 @@
return [self canDelete];
else if ([menuItem action] == @selector(copy:))
return [self canCopy];
+ else if ([menuItem action] == @selector(selectAll:))
+ return [self allowsMultipleSelection];
+ else if ([menuItem action] == @selector(deselectAll:))
+ return [self allowsEmptySelection];
else if ([[SKOutlineView superclass] instancesRespondToSelector:@selector(validateMenuItem:)])
return [super validateMenuItem:menuItem];
return YES;
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2007-08-30 15:32:21 UTC (rev 2784)
+++ trunk/SKTableView.m 2007-08-30 16:59:11 UTC (rev 2785)
@@ -134,6 +134,10 @@
return [self canDelete];
else if ([menuItem action] == @selector(copy:))
return [self canCopy];
+ else if ([menuItem action] == @selector(selectAll:))
+ return [self allowsMultipleSelection];
+ else if ([menuItem action] == @selector(deselectAll:))
+ return [self allowsEmptySelection];
else if ([[SKTableView superclass] instancesRespondToSelector:@selector(validateMenuItem:)])
return [super validateMenuItem:menuItem];
return YES;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 15:32:22
|
Revision: 2784
http://skim-app.svn.sourceforge.net/skim-app/?rev=2784&view=rev
Author: hofman
Date: 2007-08-30 08:32:21 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Check for no modifiers for type-select.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-08-30 13:24:18 UTC (rev 2783)
+++ trunk/SKPDFView.m 2007-08-30 15:32:21 UTC (rev 2784)
@@ -943,9 +943,9 @@
[self setAnnotationMode:SKStrikeOutNote];
} else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'l') {
[self setAnnotationMode:SKLineNote];
- } else if ([typeSelectHelper isTypeSelectCharacter:eventChar]) {
+ } else if ([typeSelectHelper isTypeSelectCharacter:eventChar] && modifiers == 0) {
[typeSelectHelper processKeyDownCharacter:eventChar];
- } else if ([typeSelectHelper isRepeatCharacter:eventChar]) {
+ } else if ([typeSelectHelper isRepeatCharacter:eventChar] && modifiers == 0) {
[typeSelectHelper repeatSearch];
} else {
[super keyDown:theEvent];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 13:24:20
|
Revision: 2783
http://skim-app.svn.sourceforge.net/skim-app/?rev=2783&view=rev
Author: hofman
Date: 2007-08-30 06:24:18 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Implement double-click in outline table, so you can go back to a selected item after manually moving in the document.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 13:24:18 UTC (rev 2783)
@@ -32,6 +32,7 @@
<key>IBOpenObjects</key>
<array>
<integer>224</integer>
+ <integer>502</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 13:24:18 UTC (rev 2783)
@@ -31,20 +31,20 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>687</integer>
- <integer>256</integer>
- <integer>314</integer>
- <integer>208</integer>
+ <integer>585</integer>
+ <integer>511</integer>
<integer>553</integer>
- <integer>633</integer>
- <integer>585</integer>
- <integer>539</integer>
- <integer>502</integer>
<integer>168</integer>
+ <integer>694</integer>
+ <integer>314</integer>
<integer>5</integer>
- <integer>511</integer>
- <integer>694</integer>
+ <integer>539</integer>
+ <integer>687</integer>
+ <integer>633</integer>
+ <integer>208</integer>
+ <integer>256</integer>
<integer>224</integer>
+ <integer>502</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-08-30 13:24:18 UTC (rev 2783)
@@ -31,10 +31,10 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>224</integer>
+ <integer>314</integer>
<integer>256</integer>
<integer>502</integer>
- <integer>314</integer>
+ <integer>224</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 13:24:18 UTC (rev 2783)
@@ -31,19 +31,19 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>553</integer>
- <integer>208</integer>
+ <integer>676</integer>
+ <integer>511</integer>
<integer>314</integer>
- <integer>511</integer>
- <integer>5</integer>
- <integer>168</integer>
- <integer>676</integer>
<integer>224</integer>
+ <integer>502</integer>
+ <integer>539</integer>
+ <integer>208</integer>
+ <integer>677</integer>
<integer>628</integer>
+ <integer>5</integer>
<integer>256</integer>
- <integer>539</integer>
- <integer>502</integer>
- <integer>677</integer>
+ <integer>553</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-30 13:05:10 UTC (rev 2782)
+++ trunk/SKMainWindowController.m 2007-08-30 13:24:18 UTC (rev 2783)
@@ -148,6 +148,8 @@
- (void)exitPresentationMode;
- (void)activityTimerFired:(NSTimer *)timer;
+- (void)goToSelectedOutlineItem;
+
- (void)goToFindResults:(NSArray *)findResults;
- (void)updateNoteFilterPredicate;
@@ -1208,6 +1210,12 @@
[pdfView setHideNotes:wasHidden == NO];
}
+- (void)goToSelectedOutlineItem {
+ updatingOutlineSelection = YES;
+ [pdfView goToDestination: [[outlineView itemAtRow: [outlineView selectedRow]] destination]];
+ updatingOutlineSelection = NO;
+}
+
- (IBAction)takeSnapshot:(id)sender{
[pdfView takeSnapshot:sender];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 13:05:14
|
Revision: 2782
http://skim-app.svn.sourceforge.net/skim-app/?rev=2782&view=rev
Author: hofman
Date: 2007-08-30 06:05:10 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Implement double-click in find table, so you can go back to a selected item after manually moving in the document.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/data.dependency
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-30 13:05:10 UTC (rev 2782)
@@ -5,7 +5,6 @@
<key>IBPaletteDependency</key>
<array>
<string>PDFKit</string>
- <string>Controllers</string>
</array>
</dict>
</plist>
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
@@ -29,6 +29,10 @@
<array>
<integer>208</integer>
</array>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>224</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
@@ -31,20 +31,20 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>687</integer>
<integer>256</integer>
+ <integer>314</integer>
+ <integer>208</integer>
+ <integer>553</integer>
<integer>633</integer>
- <integer>5</integer>
- <integer>224</integer>
- <integer>553</integer>
- <integer>694</integer>
- <integer>687</integer>
+ <integer>585</integer>
+ <integer>539</integer>
<integer>502</integer>
<integer>168</integer>
- <integer>539</integer>
- <integer>208</integer>
+ <integer>5</integer>
<integer>511</integer>
- <integer>585</integer>
- <integer>314</integer>
+ <integer>694</integer>
+ <integer>224</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
@@ -31,9 +31,10 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>314</integer>
+ <integer>224</integer>
<integer>256</integer>
<integer>502</integer>
+ <integer>314</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-30 13:05:10 UTC (rev 2782)
@@ -31,19 +31,19 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>168</integer>
+ <integer>553</integer>
+ <integer>208</integer>
<integer>314</integer>
<integer>511</integer>
- <integer>677</integer>
<integer>5</integer>
+ <integer>168</integer>
+ <integer>676</integer>
+ <integer>224</integer>
+ <integer>628</integer>
+ <integer>256</integer>
<integer>539</integer>
<integer>502</integer>
- <integer>553</integer>
- <integer>628</integer>
- <integer>256</integer>
- <integer>224</integer>
- <integer>208</integer>
- <integer>676</integer>
+ <integer>677</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-30 12:25:13 UTC (rev 2781)
+++ trunk/SKMainWindowController.m 2007-08-30 13:05:10 UTC (rev 2782)
@@ -148,6 +148,8 @@
- (void)exitPresentationMode;
- (void)activityTimerFired:(NSTimer *)timer;
+- (void)goToFindResults:(NSArray *)findResults;
+
- (void)updateNoteFilterPredicate;
- (void)replaceSideView:(NSView *)oldView withView:(NSView *)newView animate:(BOOL)animate;
@@ -2500,6 +2502,32 @@
}
}
+- (void)goToFindResults:(NSArray *)findResults {
+ BOOL highlight = [[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
+
+ // union all selected objects
+ NSEnumerator *selE = [findResults objectEnumerator];
+ PDFSelection *sel;
+
+ // arm: PDFSelection is mutable, and using -addSelection on an object from selectedObjects will actually mutate the object in searchResults, which does bad things. MagicHat indicates that PDFSelection implements copyWithZone: even though it doesn't conform to <NSCopying>, so we'll use that since -init doesn't work (-initWithDocument: does, but it's not listed in the header either). I filed rdar://problem/4888251 and also noticed that PDFKitViewer sample code uses -[PDFSelection copy].
+ PDFSelection *currentSel = [[[selE nextObject] copy] autorelease];
+
+ [pdfView setCurrentSelection:currentSel];
+ [pdfView scrollSelectionToVisible:self];
+
+ [self removeTemporaryAnnotations];
+
+ // add an annotation so it's easier to see the search result
+ if (highlight)
+ [self addAnnotationsForSelection:currentSel];
+
+ while (sel = [selE nextObject]) {
+ [currentSel addSelection:sel];
+ if (highlight)
+ [self addAnnotationsForSelection:sel];
+ }
+}
+
- (IBAction)searchNotes:(id)sender {
if ([[sender stringValue] length] && rightSidePaneState != SKNoteSidePaneState)
[self setRightSidePaneState:SKNoteSidePaneState];
@@ -3416,34 +3444,10 @@
- (void)tableViewSelectionDidChange:(NSNotification *)aNotification {
if ([[aNotification object] isEqual:findTableView]) {
+ [self goToFindResults:[findArrayController selectedObjects]];
- BOOL highlight = [[NSUserDefaults standardUserDefaults] boolForKey:SKShouldHighlightSearchResultsKey];
-
- // union all selected objects
- NSEnumerator *selE = [[findArrayController selectedObjects] objectEnumerator];
- PDFSelection *sel;
-
- // arm: PDFSelection is mutable, and using -addSelection on an object from selectedObjects will actually mutate the object in searchResults, which does bad things. MagicHat indicates that PDFSelection implements copyWithZone: even though it doesn't conform to <NSCopying>, so we'll use that since -init doesn't work (-initWithDocument: does, but it's not listed in the header either). I filed rdar://problem/4888251 and also noticed that PDFKitViewer sample code uses -[PDFSelection copy].
- PDFSelection *currentSel = [[[selE nextObject] copy] autorelease];
-
- [pdfView setCurrentSelection:currentSel];
- [pdfView scrollSelectionToVisible:self];
-
- [self removeTemporaryAnnotations];
-
- // add an annotation so it's easier to see the search result
- if (highlight)
- [self addAnnotationsForSelection:currentSel];
-
- while (sel = [selE nextObject]) {
- [currentSel addSelection:sel];
- if (highlight)
- [self addAnnotationsForSelection:sel];
- }
-
if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
[self hideLeftSideWindow];
-
} else if ([[aNotification object] isEqual:thumbnailTableView]) {
if (updatingThumbnailSelection == NO) {
int row = [thumbnailTableView selectedRow];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 12:25:16
|
Revision: 2781
http://skim-app.svn.sourceforge.net/skim-app/?rev=2781&view=rev
Author: hofman
Date: 2007-08-30 05:25:13 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Catch right-click for previous page in presentation mode in the full screen window rather than at application level.
Modified Paths:
--------------
trunk/SKApplication.m
trunk/SKFullScreenWindow.m
Modified: trunk/SKApplication.m
===================================================================
--- trunk/SKApplication.m 2007-08-30 12:17:29 UTC (rev 2780)
+++ trunk/SKApplication.m 2007-08-30 12:25:13 UTC (rev 2781)
@@ -79,12 +79,6 @@
[target performSelector:@selector(magnifyWheel:) withObject:anEvent];
return;
}
- } else if ([anEvent type] == NSRightMouseDown || ([anEvent type] == NSLeftMouseDown && ([anEvent modifierFlags] & NSControlKeyMask))) {
- id controller = [[self mainWindow] windowController];
- if ([controller respondsToSelector:@selector(isPresentation)] && [controller isPresentation]) {
- [controller doGoToPreviousPage:self];
- return;
- }
}
[super sendEvent:anEvent];
}
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2007-08-30 12:17:29 UTC (rev 2780)
+++ trunk/SKFullScreenWindow.m 2007-08-30 12:25:13 UTC (rev 2781)
@@ -86,8 +86,15 @@
}
- (void)sendEvent:(NSEvent *)theEvent {
- if ([theEvent type] == NSLeftMouseDown || [theEvent type] == NSRightMouseDown)
+ if ([theEvent type] == NSLeftMouseDown || [theEvent type] == NSRightMouseDown) {
[[SKPDFHoverWindow sharedHoverWindow] orderOut:nil];
+
+ SKMainWindowController *wc = (SKMainWindowController *)[self windowController];
+ if ([wc isPresentation] && ([theEvent type] == NSRightMouseDown || ([theEvent modifierFlags] & NSControlKeyMask))) {
+ [wc doGoToPreviousPage:self];
+ return;
+ }
+ }
[super sendEvent:theEvent];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 12:23:35
|
Revision: 2778
http://skim-app.svn.sourceforge.net/skim-app/?rev=2778&view=rev
Author: hofman
Date: 2007-08-30 05:04:37 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Make sure the application support folder is created if needed. We might have asked for the path without creating it before.
Modified Paths:
--------------
trunk/SKApplicationController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-08-30 11:22:19 UTC (rev 2777)
+++ trunk/SKApplicationController.m 2007-08-30 12:04:37 UTC (rev 2778)
@@ -363,18 +363,18 @@
pathDict = CFDictionaryCreateMutable(NULL, 3, NULL, &kCFTypeDictionaryValueCallBacks);
NSString *path = (NSString *)CFDictionaryGetValue(pathDict, (void *)domain);
+ FSRef foundRef = NULL;
+ OSStatus err = noErr;
- if (path == nil) {
- FSRef foundRef;
- OSStatus err = noErr;
-
+ if (path == nil || (create && [[NSFileManager defaultManager] fileExistsAtPath:path] == NO)) {
err = FSFindFolder(domain, kApplicationSupportFolderType, create ? kCreateFolder : kDontCreateFolder, &foundRef);
if (err != noErr) {
if (create)
NSLog(@"Error %d: the system was unable to find your Application Support folder.", err);
return nil;
}
-
+ }
+ if (path == nil) {
CFURLRef url = CFURLCreateFromFSRef(kCFAllocatorDefault, &foundRef);
if (url != nil) {
@@ -390,19 +390,19 @@
path = [path stringByAppendingPathComponent:appName];
CFDictionarySetValue(pathDict, (void *)domain, (void *)path);
-
- // the call to FSFindFolder creates the parent hierarchy, but not the directory we're looking for
- if (create) {
- BOOL dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path];
- if (dirExists == NO) {
- BOOL pathIsDir;
- dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir];
- if (dirExists == NO || pathIsDir == NO)
- [[NSFileManager defaultManager] createDirectoryAtPath:path attributes:nil];
- // make sure it was created
- dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir];
- NSAssert1(dirExists && pathIsDir, @"Unable to create folder %@", path);
- }
+ }
+
+ // the call to FSFindFolder creates the parent hierarchy, but not the directory we're looking for
+ if (create) {
+ BOOL dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path];
+ if (dirExists == NO) {
+ BOOL pathIsDir;
+ dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir];
+ if (dirExists == NO || pathIsDir == NO)
+ [[NSFileManager defaultManager] createDirectoryAtPath:path attributes:nil];
+ // make sure it was created
+ dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir];
+ NSAssert1(dirExists && pathIsDir, @"Unable to create folder %@", path);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 12:17:41
|
Revision: 2780
http://skim-app.svn.sourceforge.net/skim-app/?rev=2780&view=rev
Author: hofman
Date: 2007-08-30 05:17:29 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Avoid possible warning from uninitialized FSRef.
Modified Paths:
--------------
trunk/SKApplicationController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-08-30 12:15:29 UTC (rev 2779)
+++ trunk/SKApplicationController.m 2007-08-30 12:17:29 UTC (rev 2780)
@@ -363,33 +363,35 @@
pathDict = CFDictionaryCreateMutable(NULL, 3, NULL, &kCFTypeDictionaryValueCallBacks);
NSString *path = (NSString *)CFDictionaryGetValue(pathDict, (void *)domain);
- FSRef foundRef;
- OSStatus err = noErr;
if (path == nil || (create && [[NSFileManager defaultManager] fileExistsAtPath:path] == NO)) {
+ FSRef foundRef;
+ OSStatus err = noErr;
+
err = FSFindFolder(domain, kApplicationSupportFolderType, create ? kCreateFolder : kDontCreateFolder, &foundRef);
if (err != noErr) {
if (create)
NSLog(@"Error %d: the system was unable to find your Application Support folder.", err);
return nil;
}
- }
- if (path == nil) {
- CFURLRef url = CFURLCreateFromFSRef(kCFAllocatorDefault, &foundRef);
- if (url != nil) {
- path = [(NSURL *)url path];
- CFRelease(url);
+ if (path == nil) {
+ CFURLRef url = CFURLCreateFromFSRef(kCFAllocatorDefault, &foundRef);
+
+ if (url != nil) {
+ path = [(NSURL *)url path];
+ CFRelease(url);
+ }
+
+ NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleExecutableKey];
+
+ if(appName == nil)
+ [NSException raise:NSObjectNotAvailableException format:NSLocalizedString(@"Unable to find CFBundleIdentifier for %@", @"Exception message"), [NSApp description]];
+
+ path = [path stringByAppendingPathComponent:appName];
+
+ CFDictionarySetValue(pathDict, (void *)domain, (void *)path);
}
-
- NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString *)kCFBundleExecutableKey];
-
- if(appName == nil)
- [NSException raise:NSObjectNotAvailableException format:NSLocalizedString(@"Unable to find CFBundleIdentifier for %@", @"Exception message"), [NSApp description]];
-
- path = [path stringByAppendingPathComponent:appName];
-
- CFDictionarySetValue(pathDict, (void *)domain, (void *)path);
}
// the call to FSFindFolder creates the parent hierarchy, but not the directory we're looking for
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 12:15:31
|
Revision: 2779
http://skim-app.svn.sourceforge.net/skim-app/?rev=2779&view=rev
Author: hofman
Date: 2007-08-30 05:15:29 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Can't initialize an fsref?
Modified Paths:
--------------
trunk/SKApplicationController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-08-30 12:04:37 UTC (rev 2778)
+++ trunk/SKApplicationController.m 2007-08-30 12:15:29 UTC (rev 2779)
@@ -363,7 +363,7 @@
pathDict = CFDictionaryCreateMutable(NULL, 3, NULL, &kCFTypeDictionaryValueCallBacks);
NSString *path = (NSString *)CFDictionaryGetValue(pathDict, (void *)domain);
- FSRef foundRef = NULL;
+ FSRef foundRef;
OSStatus err = noErr;
if (path == nil || (create && [[NSFileManager defaultManager] fileExistsAtPath:path] == NO)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 11:22:27
|
Revision: 2777
http://skim-app.svn.sourceforge.net/skim-app/?rev=2777&view=rev
Author: hofman
Date: 2007-08-30 04:22:19 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Use a type-select timeout based on the initial key repeat interval.
Modified Paths:
--------------
trunk/SKTypeSelectHelper.m
Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m 2007-08-30 09:59:17 UTC (rev 2776)
+++ trunk/SKTypeSelectHelper.m 2007-08-30 11:22:19 UTC (rev 2777)
@@ -38,7 +38,6 @@
#import "SKTypeSelectHelper.h"
-#define TIMEOUT 0.7
#define REPEAT_CHARACTER '/'
@interface NSString (BDSKTypeAheadHelperExtensions)
@@ -48,6 +47,7 @@
#pragma mark -
@interface SKTypeSelectHelper (SKPrivate)
+- (NSTimeInterval)timeoutInterval;
- (NSArray *)searchCache;
- (void)searchWithStickyMatch:(BOOL)allowUpdate;
- (void)stopTimer;
@@ -176,6 +176,15 @@
@implementation SKTypeSelectHelper (SKPrivate)
+// See http://www.mactech.com/articles/mactech/Vol.18/18.10/1810TableTechniques/index.html
+- (NSTimeInterval)timeoutInterval {
+ int keyThreshTicks = [[NSUserDefaults standardUserDefaults] integerForKey:@"InitialKeyRepeat"];
+ if (0 == keyThreshTicks)
+ keyThreshTicks = 35; // apparent default value, translates to 1.17 sec timeout.
+
+ return fmin(2.0 / 60.0 * keyThreshTicks, 2.0);
+}
+
- (NSArray *)searchCache {
if (searchCache == nil)
[self rebuildTypeSelectSearchCache];
@@ -190,7 +199,7 @@
- (void)startTimerForSelector:(SEL)selector {
[self stopTimer];
- timer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:TIMEOUT] interval:0 target:self selector:selector userInfo:NULL repeats:NO];
+ timer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:[self timeoutInterval]] interval:0 target:self selector:selector userInfo:NULL repeats:NO];
[[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-30 09:59:18
|
Revision: 2776
http://skim-app.svn.sourceforge.net/skim-app/?rev=2776&view=rev
Author: hofman
Date: 2007-08-30 02:59:17 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Add a hidden default to keep notes on top by default.
Modified Paths:
--------------
trunk/SKNoteWindowController.m
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2007-08-29 22:10:36 UTC (rev 2775)
+++ trunk/SKNoteWindowController.m 2007-08-30 09:59:17 UTC (rev 2776)
@@ -65,6 +65,9 @@
if (self = [super init]) {
note = [aNote retain];
editors = CFArrayCreateMutable(kCFAllocatorMallocZone, 0, NULL);
+
+ keepOnTop = [[NSUserDefaults standardUserDefaults] boolForKey:@"SKKeepNoteWindowsOnTop"];
+ forceOnTop = NO;
}
return self;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 22:10:38
|
Revision: 2775
http://skim-app.svn.sourceforge.net/skim-app/?rev=2775&view=rev
Author: hofman
Date: 2007-08-29 15:10:36 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Scale page for thumbnail proportionally, because PDFKit can freeze when drawing in a non-proportionally scaled context.
Modified Paths:
--------------
trunk/PDFPage_SKExtensions.m
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2007-08-29 20:40:12 UTC (rev 2774)
+++ trunk/PDFPage_SKExtensions.m 2007-08-29 22:10:36 UTC (rev 2775)
@@ -147,8 +147,9 @@
NSRect bounds = [self boundsForBox:box];
BOOL isScaled = size > 0.0;
BOOL hasShadow = shadowBlurRadius > 0.0;
- float scaleX, scaleY;
+ float scale = 1.0;
NSSize thumbnailSize;
+ NSRect pageRect = NSZeroRect;
NSImage *image;
if ([self rotation] % 180 == 90)
@@ -159,11 +160,9 @@
thumbnailSize = NSMakeSize(roundf((size - 2.0 * shadowBlurRadius) * NSWidth(bounds) / NSHeight(bounds) + 2.0 * shadowBlurRadius), size);
else
thumbnailSize = NSMakeSize(size, roundf((size - 2.0 * shadowBlurRadius) * NSHeight(bounds) / NSWidth(bounds) + 2.0 * shadowBlurRadius));
- scaleX = (thumbnailSize.width - 2.0 * shadowBlurRadius) / NSWidth(bounds);
- scaleY = (thumbnailSize.height - 2.0 * shadowBlurRadius) / NSHeight(bounds);
+ scale = fminf((thumbnailSize.width - 2.0 * shadowBlurRadius) / NSWidth(bounds), (thumbnailSize.height - 2.0 * shadowBlurRadius) / NSHeight(bounds));
} else {
thumbnailSize = NSMakeSize(NSWidth(bounds) + 2.0 * shadowBlurRadius, NSHeight(bounds) + 2.0 * shadowBlurRadius);
- scaleX = scaleY = 1.0;
}
readingBarRect.origin = SKSubstractPoints(readingBarRect.origin, bounds.origin);
@@ -172,13 +171,6 @@
[image lockFocus];
[NSGraphicsContext saveGraphicsState];
[[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
- if (isScaled || hasShadow) {
- NSAffineTransform *transform = [NSAffineTransform transform];
- if (isScaled)
- [transform scaleXBy:scaleX yBy:scaleY];
- [transform translateXBy:(shadowBlurRadius - shadowOffset.width) / scaleX yBy:(shadowBlurRadius - shadowOffset.height) / scaleY];
- [transform concat];
- }
[NSGraphicsContext saveGraphicsState];
[[NSColor whiteColor] set];
if (hasShadow) {
@@ -189,14 +181,25 @@
[shadow set];
[shadow release];
}
- bounds.origin = NSZeroPoint;
- NSRectFill(bounds);
+ pageRect.size = thumbnailSize;
+ pageRect = NSInsetRect(pageRect, shadowBlurRadius, shadowBlurRadius);
+ pageRect.origin.x -= shadowOffset.width;
+ pageRect.origin.y -= shadowOffset.height;
+ NSRectFill(pageRect);
[NSGraphicsContext restoreGraphicsState];
+ if (isScaled || hasShadow) {
+ NSAffineTransform *transform = [NSAffineTransform transform];
+ if (isScaled)
+ [transform scaleBy:scale];
+ [transform translateXBy:(shadowBlurRadius - shadowOffset.width) / scale yBy:(shadowBlurRadius - shadowOffset.height) / scale];
+ [transform concat];
+ }
[self drawWithBox:box];
if (NSIsEmptyRect(readingBarRect) == NO) {
[[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKReadingBarColorKey]] setFill];
if ([[NSUserDefaults standardUserDefaults] boolForKey:SKReadingBarInvertKey]) {
NSRect outRect, ignored;
+ bounds.origin = NSZeroPoint;
NSDivideRect(bounds, &outRect, &ignored, NSMaxY(bounds) - NSMaxY(readingBarRect), NSMaxYEdge);
[NSBezierPath fillRect:outRect];
NSDivideRect(bounds, &outRect, &ignored, NSMinY(readingBarRect) - NSMinY(bounds), NSMinYEdge);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 20:40:15
|
Revision: 2774
http://skim-app.svn.sourceforge.net/skim-app/?rev=2774&view=rev
Author: hofman
Date: 2007-08-29 13:40:12 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Don't write empty notes from command line tool. Write an error message to stderr when it fails.
Modified Paths:
--------------
trunk/skimnotes.m
Modified: trunk/skimnotes.m
===================================================================
--- trunk/skimnotes.m 2007-08-29 16:47:30 UTC (rev 2773)
+++ trunk/skimnotes.m 2007-08-29 20:40:12 UTC (rev 2774)
@@ -89,6 +89,7 @@
NSString *pdfPath = SKNNormalizedPath([args objectAtIndex:offset], currentDir);
NSString *notesPath = argc < offset + 2 ? nil : SKNNormalizedPath([args objectAtIndex:offset + 1], currentDir);
BOOL isDir = NO;
+ NSError *error = nil;
if (action != SKNActionRemove && notesPath == nil) {
notesPath = [[pdfPath stringByDeletingPathExtension] stringByAppendingPathExtension:format == SKNFormatText ? @"txt" : format == SKNFormatRTF ? @"rtf" : @"skim"];
@@ -99,8 +100,8 @@
pdfPath = [pdfPath stringByAppendingPathExtension:@"pdf"];
if ([fm fileExistsAtPath:pdfPath isDirectory:&isDir] == NO || isDir) {
+ error = [NSError errorWithDomain:NSPOSIXErrorDomain code:ENOENT userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"PDF file does not exist", @"Error description"), NSLocalizedDescriptionKey, nil]];
} else if (action == SKNActionGet) {
- NSError *error = nil;
NSData *data = nil;
if (format == SKNFormatAuto) {
NSString *extension = [notesPath pathExtension];
@@ -115,7 +116,7 @@
NSError *error = nil;
data = [fm extendedAttributeNamed:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
if (data == nil && [error code] == ENOATTR)
- data = [NSKeyedArchiver archivedDataWithRootObject:[NSArray array]];
+ data = [NSData data];
} else if (format == SKNFormatText) {
NSError *error = nil;
NSString *string = [fm propertyListFromExtendedAttributeNamed:SKIM_TEXT_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
@@ -133,10 +134,15 @@
[(NSFileHandle *)[NSFileHandle fileHandleWithStandardOutput] writeData:data];
success = YES;
} else {
- if ([data length] || ([fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO))
- success = [data writeToFile:notesPath atomically:YES];
- else
+ if ([data length]) {
+ success = [data writeToFile:notesPath options:NSAtomicWrite error:&error];
+ } else if ([fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO) {
+ success = [fm removeFileAtPath:notesPath handler:nil];
+ if (success = NO)
+ error = [NSError errorWithDomain:NSPOSIXErrorDomain code:EACCES userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to remove file", @"Error description"), NSLocalizedDescriptionKey, nil]];
+ } else {
success = YES;
+ }
}
}
} else if (action == SKNActionSet && notesPath && ([notesPath isEqualToString:@"-"] || ([fm fileExistsAtPath:notesPath isDirectory:&isDir] && isDir == NO))) {
@@ -147,9 +153,9 @@
else
data = [NSData dataWithContentsOfFile:notesPath];
if (data) {
- success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error];
- if ((success || [error code] == ENOATTR) && [data length])
- success = [fm setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data atPath:pdfPath options:0 error:NULL];
+ success = [fm removeExtendedAttribute:SKIM_NOTES_KEY atPath:pdfPath traverseLink:YES error:&error] || [error code] == ENOATTR;
+ if (success && [data length])
+ success = [fm setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data atPath:pdfPath options:0 error:&error];
}
} else if (action == SKNActionRemove) {
NSError *error = nil;
@@ -165,6 +171,9 @@
success = success1 && success2 && success3;
}
+ if (success == NO && error)
+ [(NSFileHandle *)[NSFileHandle fileHandleWithStandardError] writeData:[[error localizedDescription] dataUsingEncoding:NSUTF8StringEncoding]];
+
[pool release];
return success ? 0 : 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 18:10:17
|
Revision: 2741
http://skim-app.svn.sourceforge.net/skim-app/?rev=2741&view=rev
Author: hofman
Date: 2007-08-28 05:25:36 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Separate keydown events in code of SKPDFView for presentation and other modes.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-08-28 11:43:08 UTC (rev 2740)
+++ trunk/SKPDFView.m 2007-08-28 12:25:36 UTC (rev 2741)
@@ -888,62 +888,68 @@
NSString *characters = [theEvent charactersIgnoringModifiers];
unichar eventChar = [characters length] > 0 ? [characters characterAtIndex:0] : 0;
unsigned int modifiers = [theEvent modifierFlags] & (NSCommandKeyMask | NSAlternateKeyMask | NSShiftKeyMask | NSControlKeyMask);
- BOOL isPresentation = hasNavigation && autohidesCursor;
- if (isPresentation && (eventChar == NSRightArrowFunctionKey) && (modifiers == 0)) {
- [self goToNextPage:self];
- } else if (isPresentation && (eventChar == NSLeftArrowFunctionKey) && (modifiers == 0)) {
- [self goToPreviousPage:self];
- } else if (isPresentation && (eventChar == 'p') && (modifiers == 0)) {
- [(SKMainWindowController *)[[self window] windowController] toggleLeftSidePane:self];
- } else if (isPresentation && (eventChar == 'a') && (modifiers == 0)) {
- [(SKMainWindowController *)[[self window] windowController] toggleAutoActualSize:self];
- } else if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && (modifiers == 0)) {
- [self delete:self];
- } else if (isPresentation == NO && ([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (eventChar == NSEnterCharacter || eventChar == NSFormFeedCharacter || eventChar == NSNewlineCharacter || eventChar == NSCarriageReturnCharacter) && (modifiers == 0)) {
- if (activeAnnotation && activeAnnotation != editAnnotation)
+ if (hasNavigation && autohidesCursor) {
+ // Presentation mode
+ if (eventChar == NSRightArrowFunctionKey && modifiers == 0) {
+ [self goToNextPage:self];
+ } else if ((eventChar == NSLeftArrowFunctionKey) && (modifiers == 0)) {
+ [self goToPreviousPage:self];
+ } else if ((eventChar == 'p') && (modifiers == 0)) {
+ [(SKMainWindowController *)[[self window] windowController] toggleLeftSidePane:self];
+ } else if ((eventChar == 'a') && (modifiers == 0)) {
+ [(SKMainWindowController *)[[self window] windowController] toggleAutoActualSize:self];
+ } else {
+ [super keyDown:theEvent];
+ }
+ } else {
+ // Normal or fullscreen mode
+ if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && (modifiers == 0)) {
+ [self delete:self];
+ } else if (([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (eventChar == NSEnterCharacter || eventChar == NSFormFeedCharacter || eventChar == NSNewlineCharacter || eventChar == NSCarriageReturnCharacter) && (modifiers == 0) && activeAnnotation && activeAnnotation != editAnnotation) {
[self editActiveAnnotation:self];
- } else if (isPresentation == NO && ([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (eventChar == NSTabCharacter) && (modifiers == NSAlternateKeyMask)) {
- [self selectNextActiveAnnotation:self];
- // backtab is a bit inconsistent, it seems Shift+Tab gives a Shift-BackTab key event, I would have expected either Shift-Tab (as for the raw event) or BackTab (as for most shift-modified keys)
- } else if (isPresentation == NO && ([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (((eventChar == NSBackTabCharacter) && (modifiers == (NSAlternateKeyMask | NSShiftKeyMask))) || ((eventChar == NSBackTabCharacter) && (modifiers == NSAlternateKeyMask)) || ((eventChar == NSTabCharacter) && (modifiers == NSAlternateKeyMask)))) {
- [self selectPreviousActiveAnnotation:self];
- } else if (isPresentation == NO && [activeAnnotation isNoteAnnotation] && [activeAnnotation isMovable] && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == 0 || modifiers == NSShiftKeyMask)) {
- [self moveActiveAnnotationForKey:eventChar byAmount:(modifiers & NSShiftKeyMask) ? 10.0 : 1.0];
- } else if (isPresentation == NO && [activeAnnotation isNoteAnnotation] && [activeAnnotation isResizable] && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == NSControlKeyMask || modifiers == (NSControlKeyMask | NSShiftKeyMask))) {
- [self resizeActiveAnnotationForKey:eventChar byAmount:(modifiers & NSShiftKeyMask) ? 10.0 : 1.0];
- } else if (isPresentation == NO && (eventChar == NSRightArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
- [self setToolMode:(toolMode + 1) % 5];
- } else if (isPresentation == NO && (eventChar == NSLeftArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
- [self setToolMode:(toolMode + 4) % 5];
- } else if (isPresentation == NO && (eventChar == NSDownArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
- [self setAnnotationMode:(annotationMode + 1) % 8];
- } else if (isPresentation == NO && (eventChar == NSUpArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
- [self setAnnotationMode:(annotationMode + 7) % 8];
- } else if (readingBar && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == NSAlternateKeyMask)) {
- [self moveReadingBarForKey:eventChar];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 't') {
- [self setAnnotationMode:SKFreeTextNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'n') {
- [self setAnnotationMode:SKAnchoredNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'c') {
- [self setAnnotationMode:SKCircleNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'b') {
- [self setAnnotationMode:SKSquareNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'h') {
- [self setAnnotationMode:SKHighlightNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'u') {
- [self setAnnotationMode:SKUnderlineNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 's') {
- [self setAnnotationMode:SKStrikeOutNote];
- } else if (isPresentation == NO && [self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'l') {
- [self setAnnotationMode:SKLineNote];
- } else if (isPresentation == NO && typeSelectHelper && modifiers == 0 && [[NSCharacterSet alphanumericCharacterSet] characterIsMember:eventChar]) {
- [typeSelectHelper processKeyDownCharacter:eventChar];
- } else if (isPresentation == NO && [typeSelectHelper cyclesSimilarResults] && modifiers == 0 && eventChar == '/') {
- [typeSelectHelper repeatSearch];
- } else {
- [super keyDown:theEvent];
+ } else if (([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (eventChar == NSTabCharacter) && (modifiers == NSAlternateKeyMask)) {
+ [self selectNextActiveAnnotation:self];
+ // backtab is a bit inconsistent, it seems Shift+Tab gives a Shift-BackTab key event, I would have expected either Shift-Tab (as for the raw event) or BackTab (as for most shift-modified keys)
+ } else if (([self toolMode] == SKTextToolMode || [self toolMode] == SKNoteToolMode) && (((eventChar == NSBackTabCharacter) && (modifiers == (NSAlternateKeyMask | NSShiftKeyMask))) || ((eventChar == NSBackTabCharacter) && (modifiers == NSAlternateKeyMask)) || ((eventChar == NSTabCharacter) && (modifiers == NSAlternateKeyMask)))) {
+ [self selectPreviousActiveAnnotation:self];
+ } else if ([activeAnnotation isNoteAnnotation] && [activeAnnotation isMovable] && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == 0 || modifiers == NSShiftKeyMask)) {
+ [self moveActiveAnnotationForKey:eventChar byAmount:(modifiers & NSShiftKeyMask) ? 10.0 : 1.0];
+ } else if ([activeAnnotation isNoteAnnotation] && [activeAnnotation isResizable] && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == NSControlKeyMask || modifiers == (NSControlKeyMask | NSShiftKeyMask))) {
+ [self resizeActiveAnnotationForKey:eventChar byAmount:(modifiers & NSShiftKeyMask) ? 10.0 : 1.0];
+ } else if ((eventChar == NSRightArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
+ [self setToolMode:(toolMode + 1) % 5];
+ } else if ((eventChar == NSLeftArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
+ [self setToolMode:(toolMode + 4) % 5];
+ } else if ((eventChar == NSDownArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
+ [self setAnnotationMode:(annotationMode + 1) % 8];
+ } else if ((eventChar == NSUpArrowFunctionKey) && (modifiers == (NSCommandKeyMask | NSAlternateKeyMask))) {
+ [self setAnnotationMode:(annotationMode + 7) % 8];
+ } else if (readingBar && (eventChar == NSRightArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar == NSUpArrowFunctionKey || eventChar == NSDownArrowFunctionKey) && (modifiers == NSAlternateKeyMask)) {
+ [self moveReadingBarForKey:eventChar];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 't') {
+ [self setAnnotationMode:SKFreeTextNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'n') {
+ [self setAnnotationMode:SKAnchoredNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'c') {
+ [self setAnnotationMode:SKCircleNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'b') {
+ [self setAnnotationMode:SKSquareNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'h') {
+ [self setAnnotationMode:SKHighlightNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'u') {
+ [self setAnnotationMode:SKUnderlineNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 's') {
+ [self setAnnotationMode:SKStrikeOutNote];
+ } else if ([self toolMode] == SKNoteToolMode && modifiers == 0 && eventChar == 'l') {
+ [self setAnnotationMode:SKLineNote];
+ } else if ([typeSelectHelper isTypeSelectCharacter:eventChar]) {
+ [typeSelectHelper processKeyDownCharacter:eventChar];
+ } else if ([typeSelectHelper isRepeatCharacter:eventChar]) {
+ [typeSelectHelper repeatSearch];
+ } else {
+ [super keyDown:theEvent];
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 16:47:31
|
Revision: 2773
http://skim-app.svn.sourceforge.net/skim-app/?rev=2773&view=rev
Author: hofman
Date: 2007-08-29 09:47:30 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Set PDFDocument when reading from a bundle. Also make sure the PDFData, PDFDocument and notes dictionaries are set to nil before loading.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-29 16:23:04 UTC (rev 2772)
+++ trunk/SKDocument.m 2007-08-29 16:47:30 UTC (rev 2773)
@@ -452,6 +452,10 @@
PDFDocument *pdfDoc = nil;
NSError *error = nil;
+ [self setPDFData:nil];
+ [self setPDFDoc:nil];
+ [self setNoteDicts:nil];
+
if ([docType isEqualToString:SKPostScriptDocumentType]) {
SKPSProgressController *progressController = [[[SKPSProgressController alloc] init] autorelease];
data = [progressController PDFDataWithPostScriptData:data];
@@ -481,6 +485,10 @@
PDFDocument *pdfDoc = nil;
NSError *error = nil;
+ [self setPDFData:nil];
+ [self setPDFDoc:nil];
+ [self setNoteDicts:nil];
+
if ([docType isEqualToString:SKPDFDocumentType]) {
if ((data = [[NSData alloc] initWithContentsOfURL:absoluteURL options:NSUncachedRead error:&error]) &&
(pdfDoc = [[PDFDocument alloc] initWithURL:absoluteURL])) {
@@ -524,25 +532,31 @@
NSArray *noteArray = nil;
NSFileWrapper *fw;
- if ((fw = [fileWrappers objectForKey:WRAPPER_PDF_FILENAME]) && [fw isRegularFile])
+ if ((fw = [fileWrappers objectForKey:WRAPPER_PDF_FILENAME]) && [fw isRegularFile]) {
data = [[fw regularFileContents] retain];
- if ((fw = [fileWrappers objectForKey:WRAPPER_SKIM_FILENAME]) && [fw isRegularFile] &&
- (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]]))
- [self setNoteDicts:noteArray];
+ pdfDoc = [[PDFDocument alloc] initWithURL:[NSURL fileURLWithPath:[[absoluteURL path] stringByAppendingPathComponent:[fw filename]]]];
+ }
+ if ((fw = [fileWrappers objectForKey:WRAPPER_SKIM_FILENAME]) && [fw isRegularFile]) {
+ if (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]])
+ [self setNoteDicts:noteArray];
+ }
if (data == nil || noteArray == nil) {
NSArray *fws = [fileWrappers allValues];
NSArray *extensions = [fws valueForKeyPath:@"filename.pathExtension.lowercaseString"];
unsigned int index;
if (data == nil) {
index = [extensions indexOfObject:@"pdf"];
- if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile])
+ if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile]) {
data = [[fw regularFileContents] retain];
+ pdfDoc = [[PDFDocument alloc] initWithURL:[NSURL fileURLWithPath:[[absoluteURL path] stringByAppendingPathComponent:[fw filename]]]];
+ }
}
if (noteArray == nil) {
index = [extensions indexOfObject:@"skim"];
- if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile] &&
- (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]]))
- [self setNoteDicts:noteArray];
+ if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile]) {
+ if (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]])
+ [self setNoteDicts:noteArray];
+ }
}
}
[fileWrapper release];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 16:23:13
|
Revision: 2772
http://skim-app.svn.sourceforge.net/skim-app/?rev=2772&view=rev
Author: hofman
Date: 2007-08-29 09:23:04 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
First look at standard locations when reading a PDF bundle.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-29 15:27:36 UTC (rev 2771)
+++ trunk/SKDocument.m 2007-08-29 16:23:04 UTC (rev 2772)
@@ -521,24 +521,29 @@
} else if ([docType isEqualToString:SKPDFBundleDocumentType]) {
NSFileWrapper *fileWrapper = [[NSFileWrapper alloc] initWithPath:[absoluteURL path]];
NSDictionary *fileWrappers = [fileWrapper fileWrappers];
- NSData *notesData = nil;
- NSEnumerator *nameEnum = [fileWrappers keyEnumerator];
- NSString *name;
+ NSArray *noteArray = nil;
+ NSFileWrapper *fw;
- while (name = [nameEnum nextObject]) {
- NSFileWrapper *fw = [fileWrappers objectForKey:name];
- if ([fw isRegularFile] == NO)
- continue;
- NSString *extension = [[fw filename] pathExtension];
- if ([name caseInsensitiveCompare:WRAPPER_PDF_FILENAME] == NSOrderedSame || (data == nil && [extension caseInsensitiveCompare:@"pdf"] == NSOrderedSame)) {
- if (data = [[fw regularFileContents] retain])
- pdfDoc = [[PDFDocument alloc] initWithData:data];
- } else if ([name caseInsensitiveCompare:WRAPPER_SKIM_FILENAME] == NSOrderedSame || (notesData == nil && [extension caseInsensitiveCompare:@"skim"] == NSOrderedSame)) {
- notesData = [fw regularFileContents];
- NSArray *array = [NSKeyedUnarchiver unarchiveObjectWithData:notesData];
- if (array)
- [self setNoteDicts:array];
+ if ((fw = [fileWrappers objectForKey:WRAPPER_PDF_FILENAME]) && [fw isRegularFile])
+ data = [[fw regularFileContents] retain];
+ if ((fw = [fileWrappers objectForKey:WRAPPER_SKIM_FILENAME]) && [fw isRegularFile] &&
+ (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]]))
+ [self setNoteDicts:noteArray];
+ if (data == nil || noteArray == nil) {
+ NSArray *fws = [fileWrappers allValues];
+ NSArray *extensions = [fws valueForKeyPath:@"filename.pathExtension.lowercaseString"];
+ unsigned int index;
+ if (data == nil) {
+ index = [extensions indexOfObject:@"pdf"];
+ if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile])
+ data = [[fw regularFileContents] retain];
}
+ if (noteArray == nil) {
+ index = [extensions indexOfObject:@"skim"];
+ if ((index != NSNotFound) && (fw = [fws objectAtIndex:index]) && [fw isRegularFile] &&
+ (noteArray = [NSKeyedUnarchiver unarchiveObjectWithData:[fw regularFileContents]]))
+ [self setNoteDicts:noteArray];
+ }
}
[fileWrapper release];
} else if ([docType isEqualToString:SKPostScriptDocumentType]) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 15:27:43
|
Revision: 2771
http://skim-app.svn.sourceforge.net/skim-app/?rev=2771&view=rev
Author: hofman
Date: 2007-08-29 08:27:36 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Check enclosed PDF file for file changes of a PDF bundle.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-29 12:30:28 UTC (rev 2770)
+++ trunk/SKDocument.m 2007-08-29 15:27:36 UTC (rev 2771)
@@ -989,6 +989,25 @@
return;
}
+ NSString *extension = [fileName pathExtension];
+ if (extension) {
+ NSString *theUTI = [(id)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (CFStringRef)extension, NULL) autorelease];
+ if (theUTI && UTTypeConformsTo((CFStringRef)theUTI, CFSTR("application/x-dvi"))) {
+ return;
+ } if (theUTI && UTTypeConformsTo((CFStringRef)theUTI, CFSTR("net.sourceforge.skim-app.pdfd"))) {
+ NSString *pdfFile = [fileName stringByAppendingPathComponent:@"data.pdf"];
+ if ([[NSFileManager defaultManager] fileExistsAtPath:pdfFile]) {
+ fileName = pdfFile;
+ } else {
+ NSArray *subfiles = [[NSFileManager defaultManager] subpathsAtPath:fileName];
+ unsigned int index = [[subfiles valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:@"pdf"];
+ if (index == NSNotFound)
+ return;
+ fileName = [fileName stringByAppendingPathComponent:[subfiles objectAtIndex:index]];
+ }
+ }
+ }
+
NSFileHandle *fh = [NSFileHandle fileHandleForReadingAtPath:fileName];
// read the last 1024 bytes of the file (or entire file); Adobe's spec says they allow %%EOF anywhere in that range
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 12:30:44
|
Revision: 2770
http://skim-app.svn.sourceforge.net/skim-app/?rev=2770&view=rev
Author: hofman
Date: 2007-08-29 05:30:28 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Add new preferences for default anchored note font.
Update Dutch localization.
Modified Paths:
--------------
trunk/Dutch.lproj/BookmarksWindow.nib/info.nib
trunk/Dutch.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/Localizable.strings
trunk/Dutch.lproj/MainMenu.nib/info.nib
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/Dutch.lproj/MainWindow.nib/data.dependency
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/NoteWindow.nib/classes.nib
trunk/Dutch.lproj/NoteWindow.nib/info.nib
trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/NoteWindow.nib/classes.nib
trunk/English.lproj/NoteWindow.nib/info.nib
trunk/English.lproj/NoteWindow.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/French.lproj/NoteWindow.nib/classes.nib
trunk/French.lproj/NoteWindow.nib/info.nib
trunk/French.lproj/NoteWindow.nib/keyedobjects.nib
trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/InitialUserDefaults.plist
trunk/Italian.lproj/NoteWindow.nib/classes.nib
trunk/Italian.lproj/NoteWindow.nib/info.nib
trunk/Italian.lproj/NoteWindow.nib/keyedobjects.nib
trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/SKNoteWindowController.h
trunk/SKNoteWindowController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/Dutch.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/BookmarksWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/BookmarksWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -6,10 +6,6 @@
<string>69 58 356 240 0 0 1440 938 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -7,14 +7,10 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 635 44 0 0 1440 938 </string>
+ <string>140 614 542 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>29</integer>
- </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-29 12:30:28 UTC (rev 2770)
@@ -5,6 +5,7 @@
<key>IBPaletteDependency</key>
<array>
<string>PDFKit</string>
+ <string>Controllers</string>
</array>
</dict>
</plist>
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>168</key>
- <string>601 495 237 265 0 0 1440 938 </string>
+ <string>601 508 237 265 0 0 1440 938 </string>
<key>224</key>
<string>610 420 220 442 0 0 1440 938 </string>
<key>256</key>
@@ -29,12 +29,6 @@
<array>
<integer>208</integer>
</array>
- <key>IBOpenObjects</key>
- <array>
- <integer>314</integer>
- <integer>502</integer>
- <integer>224</integer>
- </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/NoteWindow.nib/classes.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/NoteWindow.nib/classes.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -13,7 +13,7 @@
{
CLASS = SKNoteWindowController;
LANGUAGE = ObjC;
- OUTLETS = {imageView = BDSKDragImageView; };
+ OUTLETS = {imageView = BDSKDragImageView; textView = NSTextView; };
SUPERCLASS = NSWindowController;
},
{
Modified: trunk/Dutch.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -7,15 +7,10 @@
<key>IBEditorPositions</key>
<dict>
<key>114</key>
- <string>69 303 79 87 0 0 1440 938 </string>
+ <string>69 303 79 106 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>114</integer>
- <integer>7</integer>
- </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -8,6 +8,10 @@
<string>446.1</string>
<key>IBLockedObjects</key>
<array/>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/NoteWindow.nib/classes.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/English.lproj/NoteWindow.nib/classes.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -13,7 +13,7 @@
{
CLASS = SKNoteWindowController;
LANGUAGE = ObjC;
- OUTLETS = {imageView = BDSKDragImageView; };
+ OUTLETS = {imageView = BDSKDragImageView; textView = NSTextView; };
SUPERCLASS = NSWindowController;
},
{
Modified: trunk/English.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/NoteWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/English.lproj/NoteWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -7,14 +7,14 @@
<key>IBEditorPositions</key>
<dict>
<key>114</key>
- <string>69 303 79 87 0 0 1440 938 </string>
+ <string>69 303 79 106 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>114</integer>
<integer>7</integer>
- <integer>114</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/NoteWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/French.lproj/NoteWindow.nib/classes.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/French.lproj/NoteWindow.nib/classes.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -13,7 +13,7 @@
{
CLASS = SKNoteWindowController;
LANGUAGE = ObjC;
- OUTLETS = {imageView = BDSKDragImageView; };
+ OUTLETS = {imageView = BDSKDragImageView; textView = NSTextView; };
SUPERCLASS = NSWindowController;
},
{
Modified: trunk/French.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/NoteWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/French.lproj/NoteWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>79 78 356 240 0 0 1600 1178 </string>
+ <string>69 58 356 240 0 0 1440 938 </string>
<key>IBEditorPositions</key>
<dict>
<key>114</key>
@@ -11,7 +11,11 @@
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>7</integer>
+ </array>
<key>IBSystem Version</key>
- <string>8R2218</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/French.lproj/NoteWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/InitialUserDefaults.plist 2007-08-29 12:30:28 UTC (rev 2770)
@@ -79,6 +79,10 @@
</data>
<key>SKReadingBarInvert</key>
<false/>
+ <key>SKAnchoredNoteFontName</key>
+ <string>Helvetica</string>
+ <key>SKAnchoredNoteFontSize</key>
+ <real>12.0</real>
<key>SKTextNoteFontName</key>
<string>LucidaGrande</string>
<key>SKTextNoteFontSize</key>
@@ -276,6 +280,8 @@
<string>SKSquareNoteInteriorColor</string>
<string>SKTextNoteFontName</string>
<string>SKTextNoteFontSize</string>
+ <string>SKAnchoredNoteFontName</string>
+ <string>SKAnchoredNoteFontSize</string>
<string>SKFreeTextNoteLineWidth</string>
<string>SKFreeTextNoteLineStyle</string>
<string>SKFreeTextNoteDashPattern</string>
Modified: trunk/Italian.lproj/NoteWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/NoteWindow.nib/classes.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Italian.lproj/NoteWindow.nib/classes.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -13,7 +13,7 @@
{
CLASS = SKNoteWindowController;
LANGUAGE = ObjC;
- OUTLETS = {imageView = BDSKDragImageView; };
+ OUTLETS = {imageView = BDSKDragImageView; textView = NSTextView; };
SUPERCLASS = NSWindowController;
},
{
Modified: trunk/Italian.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/NoteWindow.nib/info.nib 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/Italian.lproj/NoteWindow.nib/info.nib 2007-08-29 12:30:28 UTC (rev 2770)
@@ -7,14 +7,14 @@
<key>IBEditorPositions</key>
<dict>
<key>114</key>
- <string>70 300 79 106 0 0 1440 938 </string>
+ <string>70 300 85 106 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>114</integer>
<integer>7</integer>
- <integer>114</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/NoteWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/SKNoteWindowController.h 2007-08-29 12:30:28 UTC (rev 2770)
@@ -42,6 +42,7 @@
@class PDFAnnotation, BDSKDragImageView;
@interface SKNoteWindowController : NSWindowController {
+ IBOutlet NSTextView *textView;
IBOutlet BDSKDragImageView *imageView;
PDFAnnotation *note;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/SKNoteWindowController.m 2007-08-29 12:30:28 UTC (rev 2770)
@@ -42,6 +42,7 @@
#import "SKPDFAnnotationNote.h"
#import "SKDocument.h"
#import "NSWindowController_SKExtensions.h"
+#import "SKStringConstants.h"
static NSString *SKNoteWindowFrameAutosaveName = @"SKNoteWindow";
@@ -84,6 +85,12 @@
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : NSNormalWindowLevel];
[[self window] setHidesOnDeactivate:keepOnTop || forceOnTop];
+ if ([self isNoteType] && [[textView string] length] == 0) {
+ NSFont *font = [NSFont fontWithName:[[NSUserDefaults standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
+ size:[[NSUserDefaults standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
+ [textView setFont:font];
+ }
+
[self setWindowFrameAutosaveNameOrCascade:SKNoteWindowFrameAutosaveName];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleDocumentWillSaveNotification:)
@@ -220,6 +227,20 @@
return nil;
}
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+ if (object == [NSUserDefaultsController sharedUserDefaultsController]) {
+ if (NO == [keyPath hasPrefix:@"values."])
+ return;
+ NSString *key = [keyPath substringFromIndex:7];
+ if ([key isEqualToString:SKAnchoredNoteFontNameKey] || [key isEqualToString:SKAnchoredNoteFontSizeKey] && [self isNoteType] && [[textView string] length] == 0) {
+ NSFont *font = [NSFont fontWithName:[[NSUserDefaults standardUserDefaults] stringForKey:SKAnchoredNoteFontNameKey]
+ size:[[NSUserDefaults standardUserDefaults] floatForKey:SKAnchoredNoteFontSizeKey]];
+ [textView setFont:font];
+ }
+ } else {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
@end
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/SKStringConstants.h 2007-08-29 12:30:28 UTC (rev 2770)
@@ -64,6 +64,8 @@
extern NSString *SKReadingBarInvertKey;
extern NSString *SKTextNoteFontNameKey;
extern NSString *SKTextNoteFontSizeKey;
+extern NSString *SKAnchoredNoteFontNameKey;
+extern NSString *SKAnchoredNoteFontSizeKey;
extern NSString *SKFreeTextNoteColorKey;
extern NSString *SKAnchoredNoteColorKey;
extern NSString *SKCircleNoteColorKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-08-29 09:51:52 UTC (rev 2769)
+++ trunk/SKStringConstants.m 2007-08-29 12:30:28 UTC (rev 2770)
@@ -65,6 +65,8 @@
NSString *SKReadingBarInvertKey = @"SKReadingBarInvert";
NSString *SKTextNoteFontNameKey = @"SKTextNoteFontName";
NSString *SKTextNoteFontSizeKey = @"SKTextNoteFontSize";
+NSString *SKAnchoredNoteFontNameKey = @"SKAnchoredNoteFontName";
+NSString *SKAnchoredNoteFontSizeKey = @"SKAnchoredNoteFontSize";
NSString *SKFreeTextNoteColorKey = @"SKFreeTextNoteColor";
NSString *SKAnchoredNoteColorKey = @"SKAnchoredNoteColor";
NSString *SKCircleNoteColorKey = @"SKCircleNoteColor";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 09:51:59
|
Revision: 2769
http://skim-app.svn.sourceforge.net/skim-app/?rev=2769&view=rev
Author: hofman
Date: 2007-08-29 02:51:52 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Add document attributes to spotlight values for PDFD bundle.
Modified Paths:
--------------
trunk/SkimImporter/Dutch.lproj/schema.strings
trunk/SkimImporter/English.lproj/schema.strings
trunk/SkimImporter/French.lproj/schema.strings
trunk/SkimImporter/GetMetadataForFile.m
trunk/SkimImporter/Italian.lproj/schema.strings
trunk/SkimImporter/schema.xml
Modified: trunk/SkimImporter/Dutch.lproj/schema.strings
===================================================================
(Binary files differ)
Modified: trunk/SkimImporter/English.lproj/schema.strings
===================================================================
(Binary files differ)
Modified: trunk/SkimImporter/French.lproj/schema.strings
===================================================================
(Binary files differ)
Modified: trunk/SkimImporter/GetMetadataForFile.m
===================================================================
--- trunk/SkimImporter/GetMetadataForFile.m 2007-08-29 09:49:32 UTC (rev 2768)
+++ trunk/SkimImporter/GetMetadataForFile.m 2007-08-29 09:51:52 UTC (rev 2769)
@@ -62,9 +62,10 @@
}
if (notePath && [[NSFileManager defaultManager] fileExistsAtPath:notePath]) {
+ NSMutableString *textContent = [[NSMutableString alloc] init];
+
NSData *data = [[NSData alloc] initWithContentsOfFile:notePath options:NSUncachedRead error:NULL];
if (data) {
- NSMutableString *textContent = [[NSMutableString alloc] init];
NSArray *array = [NSKeyedUnarchiver unarchiveObjectWithData:data];
[data release];
@@ -88,22 +89,50 @@
}
}
[(NSMutableDictionary *)attributes setObject:notes forKey:@"net_sourceforge_skim_app_notes"];
- [textContent release];
[notes release];
}
-
- if (UTTypeEqual(contentTypeUTI, CFSTR("net.sourceforge.skim-app.pdfd"))) {
- NSString *textPath = [(NSString *)pathToFile stringByAppendingPathComponent:@"data.txt"];
- NSString *string = [NSString stringWithContentsOfFile:textPath];
- if ([string length]) {
- if ([textContent length])
- [textContent appendString:@"\n\n"];
- [textContent appendString:string];
+ }
+
+ if (UTTypeEqual(contentTypeUTI, CFSTR("net.sourceforge.skim-app.pdfd"))) {
+ NSString *textPath = [(NSString *)pathToFile stringByAppendingPathComponent:@"data.txt"];
+ NSString *string = [NSString stringWithContentsOfFile:textPath];
+ if ([string length]) {
+ if ([textContent length])
+ [textContent appendString:@"\n\n"];
+ [textContent appendString:string];
+ }
+
+ NSString *plistPath = [(NSString *)pathToFile stringByAppendingPathComponent:@"data.plist"];
+ NSData *plistData = [NSData dataWithContentsOfFile:plistPath];
+ NSDictionary *info = plistData ? [NSPropertyListSerialization propertyListFromData:plistData mutabilityOption:NSPropertyListImmutable format:NULL errorDescription:NULL] : nil;
+ if (info) {
+ id value;
+ id pageWidth = [info objectForKey:@"PageWidth"], pageHeight = [info objectForKey:@"PageHeight"];
+ if (value = [info objectForKey:@"Title"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemTitle];
+ if (value = [info objectForKey:@"Author"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemAuthors];
+ if (value = [info objectForKey:@"Keywords"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemKeywords];
+ if (value = [info objectForKey:@"Producer"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemEncodingApplications];
+ if (value = [info objectForKey:@"Version"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemVersion];
+ if (value = [info objectForKey:@"Encrypted"])
+ [(NSMutableDictionary *)attributes setObject:[value boolValue] ? @"Password Encrypted" : @"None" forKey:(NSString *)kMDItemSecurityMethod];
+ if (value = [info objectForKey:@"PageCount"])
+ [(NSMutableDictionary *)attributes setObject:value forKey:(NSString *)kMDItemNumberOfPages];
+ if (pageWidth && pageHeight) {
+ [(NSMutableDictionary *)attributes setObject:pageWidth forKey:(NSString *)kMDItemPageWidth];
+ [(NSMutableDictionary *)attributes setObject:pageHeight forKey:(NSString *)kMDItemPageHeight];
+ [(NSMutableDictionary *)attributes setObject:[NSString stringWithFormat:@"%@ x %@ points", pageWidth, pageHeight] forKey:@"net_sourceforge_skim_app_dimensions"];
}
}
- [(NSMutableDictionary *)attributes setObject:textContent forKey:(NSString *)kMDItemTextContent];
}
+ [(NSMutableDictionary *)attributes setObject:textContent forKey:(NSString *)kMDItemTextContent];
+ [textContent release];
+
[(NSMutableDictionary *)attributes setObject:@"Skim" forKey:(NSString *)kMDItemCreator];
if (sourcePath && [[NSFileManager defaultManager] fileExistsAtPath:sourcePath])
Modified: trunk/SkimImporter/Italian.lproj/schema.strings
===================================================================
(Binary files differ)
Modified: trunk/SkimImporter/schema.xml
===================================================================
--- trunk/SkimImporter/schema.xml 2007-08-29 09:49:32 UTC (rev 2768)
+++ trunk/SkimImporter/schema.xml 2007-08-29 09:51:52 UTC (rev 2769)
@@ -10,6 +10,7 @@
</note>
<attributes>
<attribute name="net_sourceforge_skim_app_notes" multivalued="true" type="CFString"/>
+ <attribute name="net_sourceforge_skim_app_dimensions" multivalued="false" type="CFString"/>
</attributes>
<types>
@@ -22,8 +23,6 @@
</allattrs>
<displayattrs>
kMDItemWhereFroms
- kMDItemContentModificationDate
- kMDItemContentCreationDate
net_sourceforge_skim_app_notes
</displayattrs>
</type>
@@ -33,10 +32,18 @@
</note>
<allattrs>
net_sourceforge_skim_app_notes
+ net_sourceforge_skim_app_dimensions
</allattrs>
<displayattrs>
- kMDItemContentModificationDate
- kMDItemContentCreationDate
+ kMDItemTitle
+ kMDItemAuthors
+ kMDItemCreator
+ kMDItemNumberOfPages
+ net_sourceforge_skim_app_dimensions
+ kMDItemVersion
+ kMDItemEncodingApplications
+ kMDItemSecurityMethod
+ kMDItemKeywords
net_sourceforge_skim_app_notes
</displayattrs>
</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 09:49:38
|
Revision: 2768
http://skim-app.svn.sourceforge.net/skim-app/?rev=2768&view=rev
Author: hofman
Date: 2007-08-29 02:49:32 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
Only failing to copy pdf or skim file is an error when creating a PDF bundle. Make sure there is always an error returned.
Add page width and height to document info.
Modified Paths:
--------------
trunk/SKDocument.m
trunk/SKInfoWindowController.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-29 00:06:07 UTC (rev 2767)
+++ trunk/SKDocument.m 2007-08-29 09:49:32 UTC (rev 2768)
@@ -266,9 +266,11 @@
if (success = [self writeToURL:tmpURL ofType:typeName error:outError]) {
- NSSet *ourExtensions = [NSSet setWithObjects:@"pdf", @"skim", @"txt", @"text", @"rtf", nil];
+ NSSet *ourExtensions = [NSSet setWithObjects:@"pdf", @"skim", @"txt", @"text", @"rtf", @"plist", nil];
+ NSSet *ourImportantExtensions = [NSSet setWithObjects:@"pdf", @"skim", nil];
NSEnumerator *fileEnum;
NSString *file;
+ BOOL didMove;
NSMutableDictionary *attributes = [[fm fileAttributesAtPath:path traverseLink:YES] mutableCopy];
unsigned long permissions = [[attributes objectForKey:NSFilePosixPermissions] unsignedLongValue];
@@ -285,8 +287,11 @@
}
fileEnum = [[fm directoryContentsAtPath:tmpPath] objectEnumerator];
- while (success && (file = [fileEnum nextObject]))
- success = [fm movePath:[tmpPath stringByAppendingPathComponent:file] toPath:[path stringByAppendingPathComponent:file] handler:nil];
+ while (success && (file = [fileEnum nextObject])) {
+ didMove = [fm movePath:[tmpPath stringByAppendingPathComponent:file] toPath:[path stringByAppendingPathComponent:file] handler:nil];
+ if (didMove == NO && [ourImportantExtensions containsObject:[[file pathExtension] lowercaseString]])
+ success = NO;
+ }
if (success)
[NSTask launchedTaskWithLaunchPath:@"/usr/bin/touch" arguments:[NSArray arrayWithObjects:@"-fm", path, nil]];
@@ -318,6 +323,9 @@
exportUsingPanel = NO;
+ if (success == NO && outError != NULL && *outError == nil)
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to write file", @"Error description"), NSLocalizedDescriptionKey, nil]];
+
return success;
}
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2007-08-29 00:06:07 UTC (rev 2767)
+++ trunk/SKInfoWindowController.m 2007-08-29 09:49:32 UTC (rev 2768)
@@ -170,8 +170,13 @@
[dictionary addEntriesFromDictionary:[pdfDoc documentAttributes]];
[dictionary setValue:[NSString stringWithFormat: @"%d.%d", [pdfDoc majorVersion], [pdfDoc minorVersion]] forKey:@"Version"];
[dictionary setValue:[NSNumber numberWithInt:[pdfDoc pageCount]] forKey:@"PageCount"];
- if ([pdfDoc pageCount])
- [dictionary setValue:SKSizeString([[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox].size, [[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox].size) forKey:@"PageSize"];
+ if ([pdfDoc pageCount]) {
+ NSSize cropSize = [[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox].size;
+ NSSize mediaSize = [[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox].size;
+ [dictionary setValue:SKSizeString(cropSize, mediaSize) forKey:@"PageSize"];
+ [dictionary setValue:[NSNumber numberWithFloat:cropSize.width] forKey:@"PageWidth"];
+ [dictionary setValue:[NSNumber numberWithFloat:cropSize.height] forKey:@"PageHeight"];
+ }
[dictionary setValue:[[dictionary valueForKey:@"Keywords"] componentsJoinedByString:@"\n"] forKey:@"KeywordsString"];
[dictionary setValue:[NSNumber numberWithBool:[pdfDoc isEncrypted]] forKey:@"Encrypted"];
[dictionary setValue:[NSNumber numberWithBool:[pdfDoc allowsPrinting]] forKey:@"AllowsPrinting"];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-29 00:06:16
|
Revision: 2767
http://skim-app.svn.sourceforge.net/skim-app/?rev=2767&view=rev
Author: hofman
Date: 2007-08-28 17:06:07 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Add document info and attributes to PDF bundle.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-28 23:59:36 UTC (rev 2766)
+++ trunk/SKDocument.m 2007-08-29 00:06:07 UTC (rev 2767)
@@ -66,6 +66,7 @@
#define WRAPPER_PDF_FILENAME @"data.pdf"
#define WRAPPER_TEXT_FILENAME @"data.txt"
+#define WRAPPER_PLIST_FILENAME @"data.plist"
#define WRAPPER_SKIM_FILENAME @"notes.skim"
#define WRAPPER_TXT_FILENAME @"notes.txt"
#define WRAPPER_RTF_FILENAME @"notes.rtf"
@@ -332,10 +333,14 @@
NSData *notesData = [[self notes] count] ? [NSKeyedArchiver archivedDataWithRootObject:[[self notes] valueForKey:@"dictionaryValue"]] : nil;
NSData *notesTextData = [[self notesString] dataUsingEncoding:NSUTF8StringEncoding];
NSData *notesRTFData = [self notesRTFData];
+ NSDictionary *info = [[SKInfoWindowController sharedInstance] infoForDocument:self];
+ NSData *infoData = [NSPropertyListSerialization dataFromPropertyList:info format:NSPropertyListXMLFormat_v1_0 errorDescription:NULL];
NSFileWrapper *fileWrapper = [[NSFileWrapper alloc] initDirectoryWithFileWrappers:[NSDictionary dictionary]];
[fileWrapper addRegularFileWithContents:pdfData preferredFilename:WRAPPER_PDF_FILENAME];
if (textData)
[fileWrapper addRegularFileWithContents:textData preferredFilename:WRAPPER_TEXT_FILENAME];
+ if (infoData)
+ [fileWrapper addRegularFileWithContents:infoData preferredFilename:WRAPPER_PLIST_FILENAME];
if (notesData)
[fileWrapper addRegularFileWithContents:notesData preferredFilename:WRAPPER_SKIM_FILENAME];
if (notesTextData)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-28 23:59:43
|
Revision: 2766
http://skim-app.svn.sourceforge.net/skim-app/?rev=2766&view=rev
Author: hofman
Date: 2007-08-28 16:59:36 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Change file names for skim notes in PDF bundle.
Modified Paths:
--------------
SkimNotesAgent/SkimNotesAgent.m
Modified: SkimNotesAgent/SkimNotesAgent.m
===================================================================
--- SkimNotesAgent/SkimNotesAgent.m 2007-08-28 23:59:10 UTC (rev 2765)
+++ SkimNotesAgent/SkimNotesAgent.m 2007-08-28 23:59:36 UTC (rev 2766)
@@ -90,7 +90,7 @@
NSString *extension = [[aFile pathExtension] lastPathComponent];
if ([extension caseInsensitiveCompare:@"pdfd"] == NSOrderedSame) {
- data = [NSData dataWithContentsOfFile:[aFile stringByAppendingPathComponent:@"data.skim"] options:0 error:&error];
+ data = [NSData dataWithContentsOfFile:[aFile stringByAppendingPathComponent:@"notes.skim"] options:0 error:&error];
if (nil == data)
fprintf(stderr, "SkimNotesAgent pid %d: error getting Skim notes\n", getpid(), [[error description] UTF8String]);
} else if ([extension caseInsensitiveCompare:@"skim"] == NSOrderedSame) {
@@ -112,7 +112,7 @@
NSString *extension = [[aFile pathExtension] lastPathComponent];
if ([extension caseInsensitiveCompare:@"pdfd"] == NSOrderedSame) {
- data = [NSData dataWithContentsOfFile:[aFile stringByAppendingPathComponent:@"data.rtf"] options:0 error:&error];
+ data = [NSData dataWithContentsOfFile:[aFile stringByAppendingPathComponent:@"notes.rtf"] options:0 error:&error];
if (nil == data)
fprintf(stderr, "SkimNotesAgent pid %d: error getting Skim notes\n", getpid(), [[error description] UTF8String]);
} else {
@@ -130,7 +130,7 @@
NSString *extension = [[aFile pathExtension] lastPathComponent];
if ([extension caseInsensitiveCompare:@"pdfd"] == NSOrderedSame) {
- string = [NSString stringWithContentsOfFile:[aFile stringByAppendingPathComponent:@"data.txt"] encoding:NSUTF8StringEncoding error:&error];
+ string = [NSString stringWithContentsOfFile:[aFile stringByAppendingPathComponent:@"notes.txt"] encoding:NSUTF8StringEncoding error:&error];
if (nil == string)
fprintf(stderr, "SkimNotesAgent pid %d: error getting Skim notes\n", getpid(), [[error description] UTF8String]);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-28 23:59:26
|
Revision: 2765
http://skim-app.svn.sourceforge.net/skim-app/?rev=2765&view=rev
Author: hofman
Date: 2007-08-28 16:59:10 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Add the text of the PDF to the text for indexing.
Modified Paths:
--------------
trunk/SkimImporter/GetMetadataForFile.m
Modified: trunk/SkimImporter/GetMetadataForFile.m
===================================================================
--- trunk/SkimImporter/GetMetadataForFile.m 2007-08-28 23:57:57 UTC (rev 2764)
+++ trunk/SkimImporter/GetMetadataForFile.m 2007-08-28 23:59:10 UTC (rev 2765)
@@ -58,19 +58,19 @@
notePath = (NSString *)pathToFile;
sourcePath = [[(NSString *)pathToFile stringByDeletingPathExtension] stringByAppendingPathExtension:@"pdf"];
} else if (UTTypeEqual(contentTypeUTI, CFSTR("net.sourceforge.skim-app.pdfd"))) {
- notePath = [(NSString *)pathToFile stringByAppendingPathComponent:@"data.skim"];
+ notePath = [(NSString *)pathToFile stringByAppendingPathComponent:@"notes.skim"];
}
if (notePath && [[NSFileManager defaultManager] fileExistsAtPath:notePath]) {
NSData *data = [[NSData alloc] initWithContentsOfFile:notePath options:NSUncachedRead error:NULL];
if (data) {
+ NSMutableString *textContent = [[NSMutableString alloc] init];
NSArray *array = [NSKeyedUnarchiver unarchiveObjectWithData:data];
[data release];
if (array) {
NSEnumerator *noteEnum = [array objectEnumerator];
NSDictionary *note;
- NSMutableString *textContent = [[NSMutableString alloc] init];
NSMutableArray *notes = [[NSMutableArray alloc] init];
while (note = [noteEnum nextObject]) {
NSString *contents = [note objectForKey:@"contents"];
@@ -87,11 +87,21 @@
[textContent appendString:text];
}
}
- [(NSMutableDictionary *)attributes setObject:textContent forKey:(NSString *)kMDItemTextContent];
[(NSMutableDictionary *)attributes setObject:notes forKey:@"net_sourceforge_skim_app_notes"];
[textContent release];
[notes release];
}
+
+ if (UTTypeEqual(contentTypeUTI, CFSTR("net.sourceforge.skim-app.pdfd"))) {
+ NSString *textPath = [(NSString *)pathToFile stringByAppendingPathComponent:@"data.txt"];
+ NSString *string = [NSString stringWithContentsOfFile:textPath];
+ if ([string length]) {
+ if ([textContent length])
+ [textContent appendString:@"\n\n"];
+ [textContent appendString:string];
+ }
+ }
+ [(NSMutableDictionary *)attributes setObject:textContent forKey:(NSString *)kMDItemTextContent];
}
[(NSMutableDictionary *)attributes setObject:@"Skim" forKey:(NSString *)kMDItemCreator];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-28 23:58:03
|
Revision: 2764
http://skim-app.svn.sourceforge.net/skim-app/?rev=2764&view=rev
Author: hofman
Date: 2007-08-28 16:57:57 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Save the text of the PDF in the PDF bundle. Will be used to index for Spotlight.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-08-28 23:02:12 UTC (rev 2763)
+++ trunk/SKDocument.m 2007-08-28 23:57:57 UTC (rev 2764)
@@ -65,9 +65,10 @@
#define MAX_XATTR_LENGTH 2048
#define WRAPPER_PDF_FILENAME @"data.pdf"
-#define WRAPPER_SKIM_FILENAME @"data.skim"
-#define WRAPPER_TXT_FILENAME @"data.txt"
-#define WRAPPER_RTF_FILENAME @"data.rtf"
+#define WRAPPER_TEXT_FILENAME @"data.txt"
+#define WRAPPER_SKIM_FILENAME @"notes.skim"
+#define WRAPPER_TXT_FILENAME @"notes.txt"
+#define WRAPPER_RTF_FILENAME @"notes.rtf"
NSString *SKDocumentErrorDomain = @"SKDocumentErrorDomain";
@@ -327,11 +328,14 @@
didWrite = [pdfData writeToURL:absoluteURL options:NSAtomicWrite error:outError] &&
[self saveNotesToExtendedAttributesAtURL:absoluteURL error:outError];
} else if ([typeName isEqualToString:SKPDFBundleDocumentType]) {
+ NSData *textData = [[[self pdfDocument] string] dataUsingEncoding:NSUTF8StringEncoding];
NSData *notesData = [[self notes] count] ? [NSKeyedArchiver archivedDataWithRootObject:[[self notes] valueForKey:@"dictionaryValue"]] : nil;
NSData *notesTextData = [[self notesString] dataUsingEncoding:NSUTF8StringEncoding];
NSData *notesRTFData = [self notesRTFData];
NSFileWrapper *fileWrapper = [[NSFileWrapper alloc] initDirectoryWithFileWrappers:[NSDictionary dictionary]];
[fileWrapper addRegularFileWithContents:pdfData preferredFilename:WRAPPER_PDF_FILENAME];
+ if (textData)
+ [fileWrapper addRegularFileWithContents:textData preferredFilename:WRAPPER_TEXT_FILENAME];
if (notesData)
[fileWrapper addRegularFileWithContents:notesData preferredFilename:WRAPPER_SKIM_FILENAME];
if (notesTextData)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-28 23:10:27
|
Revision: 2761
http://skim-app.svn.sourceforge.net/skim-app/?rev=2761&view=rev
Author: hofman
Date: 2007-08-28 14:52:01 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Stop temporary annotation timer when reloading PDF.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-28 21:34:36 UTC (rev 2760)
+++ trunk/SKMainWindowController.m 2007-08-28 21:52:01 UTC (rev 2761)
@@ -751,6 +751,9 @@
visibleRect = [pdfView convertRect:[pdfView convertRect:[[pdfView documentView] visibleRect] fromView:[pdfView documentView]] toPage:[pdfView currentPage]];
[[pdfView document] cancelFindString];
+ [temporaryAnnotationTimer invalidate];
+ [temporaryAnnotationTimer release];
+ temporaryAnnotationTimer = nil;
// make sure these will not be activated, or they can lead to a crash
[pdfView removeHoverRects];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-08-28 23:02:18
|
Revision: 2763
http://skim-app.svn.sourceforge.net/skim-app/?rev=2763&view=rev
Author: hofman
Date: 2007-08-28 16:02:12 -0700 (Tue, 28 Aug 2007)
Log Message:
-----------
Update French localization.
Modified Paths:
--------------
trunk/French.lproj/BookmarksWindow.nib/info.nib
trunk/French.lproj/BookmarksWindow.nib/keyedobjects.nib
trunk/French.lproj/DownloadsWindow.nib/info.nib
trunk/French.lproj/DownloadsWindow.nib/keyedobjects.nib
trunk/French.lproj/FindPanel.nib/info.nib
trunk/French.lproj/FindPanel.nib/keyedobjects.nib
trunk/French.lproj/LineInspector.nib/classes.nib
trunk/French.lproj/LineInspector.nib/info.nib
trunk/French.lproj/LineInspector.nib/keyedobjects.nib
trunk/French.lproj/Localizable.strings
trunk/French.lproj/MainMenu.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/NoteWindow.nib/info.nib
trunk/French.lproj/NoteWindow.nib/keyedobjects.nib
trunk/French.lproj/NotesDocument.nib/classes.nib
trunk/French.lproj/NotesDocument.nib/info.nib
trunk/French.lproj/NotesDocument.nib/keyedobjects.nib
trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/French.lproj/BookmarksWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/BookmarksWindow.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/BookmarksWindow.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,14 +3,10 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
+ <string>79 78 356 240 0 0 1600 1178 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/French.lproj/BookmarksWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/DownloadsWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/DownloadsWindow.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/DownloadsWindow.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,15 +3,10 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>100 77 356 240 0 0 1440 938 </string>
+ <string>115 103 356 240 0 0 1600 1178 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>30</integer>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/French.lproj/DownloadsWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/FindPanel.nib/info.nib
===================================================================
--- trunk/French.lproj/FindPanel.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/FindPanel.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,14 +3,10 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
+ <string>79 78 356 240 0 0 1600 1178 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/French.lproj/FindPanel.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/French.lproj/LineInspector.nib/classes.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/LineInspector.nib/classes.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -1,44 +1,56 @@
{
- IBClasses = (
- {
- ACTIONS = {"" = id; };
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {
- changeDashPattern = id;
- changeEndLineStyle = id;
- changeLineStyle = id;
- changeLineWidth = id;
- changeStartLineStyle = id;
- };
- CLASS = NSObject;
- LANGUAGE = ObjC;
- },
- {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
- {
- CLASS = SKLineInspector;
- LANGUAGE = ObjC;
- OUTLETS = {
- dashPatternField = NSTextField;
- endLineStyleButton = NSSegmentedControl;
- lineWell = SKLineWell;
- lineWidthField = NSTextField;
- lineWidthSlider = NSSlider;
- startLineStyleButton = NSSegmentedControl;
- styleButton = NSSegmentedControl;
- };
- SUPERCLASS = NSWindowController;
- },
- {
- CLASS = SKLineWell;
- LANGUAGE = ObjC;
- OUTLETS = {target = id; };
- SUPERCLASS = NSControl;
- },
- {CLASS = SKNumberArrayFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; }
- );
- IBVersion = 1;
+ IBClasses = (
+ {
+ ACTIONS = {
+ "" = id;
+ };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ changeDashPattern = id;
+ changeEndLineStyle = id;
+ changeLineStyle = id;
+ changeLineWidth = id;
+ changeStartLineStyle = id;
+ };
+ CLASS = NSObject;
+ LANGUAGE = ObjC;
+ },
+ {
+ CLASS = NSSegmentedControl;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSControl;
+ },
+ {
+ CLASS = SKLineInspector;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ dashPatternField = NSTextField;
+ endLineStyleButton = NSSegmentedControl;
+ lineWell = SKLineWell;
+ lineWidthField = NSTextField;
+ lineWidthSlider = NSSlider;
+ startLineStyleButton = NSSegmentedControl;
+ styleButton = NSSegmentedControl;
+ };
+ SUPERCLASS = NSWindowController;
+ },
+ {
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ target = id;
+ };
+ SUPERCLASS = NSControl;
+ },
+ {
+ CLASS = SKNumberArrayFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSFormatter;
+ }
+ );
+ IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/French.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/French.lproj/LineInspector.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/LineInspector.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
+ <string>79 78 356 240 0 0 1600 1178 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>9A466</string>
</dict>
</plist>
Modified: trunk/French.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>80 89 564 296 0 0 1440 938 </string>
+ <string>180 125 582 462 0 0 1440 938 </string>
<key>IBEditorPositions</key>
<dict>
<key>168</key>
- <string>601 507 237 267 0 0 1440 938 </string>
+ <string>681 670 237 265 0 0 1600 1178 </string>
<key>224</key>
<string>610 420 220 442 0 0 1440 938 </string>
<key>256</key>
@@ -17,11 +17,11 @@
<key>502</key>
<string>610 420 220 442 0 0 1440 938 </string>
<key>511</key>
+ <string>690 581 220 442 0 0 1600 1178 </string>
+ <key>687</key>
<string>610 420 220 442 0 0 1440 938 </string>
- <key>660</key>
+ <key>694</key>
<string>610 420 220 442 0 0 1440 938 </string>
- <key>661</key>
- <string>610 420 220 442 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -31,16 +31,9 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>511</integer>
- <integer>256</integer>
- <integer>633</integer>
<integer>314</integer>
- <integer>224</integer>
- <integer>660</integer>
- <integer>661</integer>
- <integer>168</integer>
+ <integer>256</integer>
<integer>502</integer>
- <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/NoteWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/NoteWindow.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/NoteWindow.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,20 +3,15 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
+ <string>79 78 356 240 0 0 1600 1178 </string>
<key>IBEditorPositions</key>
<dict>
<key>114</key>
- <string>69 303 79 106 0 0 1440 938 </string>
+ <string>77 390 106 106 0 0 1600 1178 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>7</integer>
- <integer>114</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/French.lproj/NoteWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/NotesDocument.nib/classes.nib
===================================================================
--- trunk/French.lproj/NotesDocument.nib/classes.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/NotesDocument.nib/classes.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -13,13 +13,30 @@
LANGUAGE = ObjC;
SUPERCLASS = NSImageCell;
},
- {CLASS = SKNoteOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; },
{
+ ACTIONS = {
+ dismissNoteTypeSheet = id;
+ displayAllNoteTypes = id;
+ selectNoteTypes = id;
+ toggleDisplayNoteType = id;
+ };
+ CLASS = SKNoteOutlineView;
+ LANGUAGE = ObjC;
+ OUTLETS = {noteTypeMatrix = NSMatrix; noteTypeSheet = NSWindow; };
+ SUPERCLASS = SKOutlineView;
+ },
+ {
ACTIONS = {openPDF = id; };
CLASS = SKNotesDocument;
LANGUAGE = ObjC;
OUTLETS = {arrayController = NSArrayController; outlineView = SKNoteOutlineView; };
SUPERCLASS = NSDocument;
+ },
+ {
+ ACTIONS = {scrollToBeginningOfDocument = id; scrollToEndOfDocument = id; };
+ CLASS = SKOutlineView;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSOutlineView;
}
);
IBVersion = 1;
Modified: trunk/French.lproj/NotesDocument.nib/info.nib
===================================================================
--- trunk/French.lproj/NotesDocument.nib/info.nib 2007-08-28 21:54:02 UTC (rev 2762)
+++ trunk/French.lproj/NotesDocument.nib/info.nib 2007-08-28 23:02:12 UTC (rev 2763)
@@ -3,14 +3,10 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 58 356 240 0 0 1440 938 </string>
+ <string>79 78 356 240 0 0 1600 1178 </string>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8R218</string>
+ <string>8R2218</string>
</dict>
</plist>
Modified: trunk/French.lproj/NotesDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
