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
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ho...@us...> - 2007-05-08 13:30:45
|
Revision: 2000
http://skim-app.svn.sourceforge.net/skim-app/?rev=2000&view=rev
Author: hofman
Date: 2007-05-08 06:30:30 -0700 (Tue, 08 May 2007)
Log Message:
-----------
Hidden pref for line width of circle and square note line widths.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKPDFAnnotationNote.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-05-08 13:25:06 UTC (rev 1999)
+++ trunk/InitialUserDefaults.plist 2007-05-08 13:30:30 UTC (rev 2000)
@@ -119,6 +119,10 @@
BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
ZmZmAAABAYY=
</data>
+ <key>SKCircleNoteLineWidth</key>
+ <real>2.0</real>
+ <key>SKSquareNoteLineWidth</key>
+ <real>2.0</real>
<key>SKAutoCheckFileUpdate</key>
<false/>
<key>SKTeXEditorPreset</key>
@@ -175,6 +179,8 @@
<string>SKArrowNoteColor</string>
<string>SKTextNoteFontName</string>
<string>SKTextNoteFontSize</string>
+ <string>SKCircleNoteLineWidth</string>
+ <string>SKSquareNoteLineWidth</string>
</array>
<key>sync</key>
<array>
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-05-08 13:25:06 UTC (rev 1999)
+++ trunk/SKPDFAnnotationNote.m 2007-05-08 13:30:30 UTC (rev 2000)
@@ -347,7 +347,7 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKCircleNoteColorKey]]];
- [[self border] setLineWidth:2.0];
+ [[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineWidthKey]];
}
return self;
}
@@ -369,7 +369,7 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKSquareNoteColorKey]]];
- [[self border] setLineWidth:2.0];
+ [[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineWidthKey]];
}
return self;
}
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-05-08 13:25:06 UTC (rev 1999)
+++ trunk/SKStringConstants.h 2007-05-08 13:30:30 UTC (rev 2000)
@@ -71,5 +71,7 @@
extern NSString *SKUnderlineNoteColorKey;
extern NSString *SKStrikeOutNoteColorKey;
extern NSString *SKArrowNoteColorKey;
+extern NSString *SKCircleNoteLineWidthKey;
+extern NSString *SKSquareNoteLineWidthKey;
extern NSString *SKDefaultPDFDisplaySettingsKey;
extern NSString *SKDefaultFullScreenPDFDisplaySettingsKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-05-08 13:25:06 UTC (rev 1999)
+++ trunk/SKStringConstants.m 2007-05-08 13:30:30 UTC (rev 2000)
@@ -72,5 +72,7 @@
NSString *SKUnderlineNoteColorKey = @"SKUnderlineNoteColor";
NSString *SKStrikeOutNoteColorKey = @"SKStrikeOutNoteColor";
NSString *SKArrowNoteColorKey = @"SKArrowNoteColor";
+NSString *SKCircleNoteLineWidthKey = @"SKCircleNoteLineWidth";
+NSString *SKSquareNoteLineWidthKey = @"SKSquareNoteLineWidth";
NSString *SKDefaultPDFDisplaySettingsKey = @"SKDefaultPDFDisplaySettings";
NSString *SKDefaultFullScreenPDFDisplaySettingsKey = @"SKDefaultFullScreenPDFDisplaySettings";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-08 13:25:15
|
Revision: 1999
http://skim-app.svn.sourceforge.net/skim-app/?rev=1999&view=rev
Author: hofman
Date: 2007-05-08 06:25:06 -0700 (Tue, 08 May 2007)
Log Message:
-----------
Don't change circle/square contents when the user didn't drag.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-05-08 09:32:14 UTC (rev 1998)
+++ trunk/SKPDFView.m 2007-05-08 13:25:06 UTC (rev 1999)
@@ -614,19 +614,17 @@
[wasSelection release];
wasSelection = nil;
}
- if (draggingAnnotation) {
- draggingAnnotation = NO;
+ if (draggingAnnotation && didDrag) {
if ([[activeAnnotation type] isEqualToString:@"Circle"] || [[activeAnnotation type] isEqualToString:@"Square"]) {
NSString *selString = [[[[activeAnnotation page] selectionForRect:[activeAnnotation bounds]] string] stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines];
[activeAnnotation setContents:selString];
}
- if (didDrag) {
- [[self undoManager] endUndoGrouping];
- // due to an Appkit bug, endUndoGrouping registers an extra change count, which is not reverted when the group is undone
- [[[[self window] windowController] document] updateChangeCount:NSChangeUndone];
- }
+ [[self undoManager] endUndoGrouping];
+ // due to an Appkit bug, endUndoGrouping registers an extra change count, which is not reverted when the group is undone
+ [[[[self window] windowController] document] updateChangeCount:NSChangeUndone];
} else
[super mouseUp:theEvent];
+ draggingAnnotation = NO;
break;
case SKMoveToolMode:
// shouldn't reach this
@@ -635,16 +633,15 @@
[super mouseUp:theEvent];
break;
}
+ didDrag = NO;
}
- (void)mouseDragged:(NSEvent *)theEvent {
switch (toolMode) {
case SKTextToolMode:
if (draggingAnnotation) {
- if (didDrag == NO) {
- didDrag = YES;
+ if (didDrag == NO)
[[self undoManager] beginUndoGrouping];
- }
[self dragAnnotationWithEvent:theEvent];
} else if (nil == activeAnnotation) {
if (mouseDownInAnnotation)
@@ -661,6 +658,7 @@
[super mouseDragged:theEvent];
break;
}
+ didDrag = YES;
}
- (void)mouseMoved:(NSEvent *)theEvent {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-08 09:32:16
|
Revision: 1998
http://skim-app.svn.sourceforge.net/skim-app/?rev=1998&view=rev
Author: hofman
Date: 2007-05-08 02:32:14 -0700 (Tue, 08 May 2007)
Log Message:
-----------
Update release notes
Modified Paths:
--------------
trunk/Dutch.lproj/ReleaseNotes.rtf
trunk/English.lproj/ReleaseNotes.rtf
trunk/Italian.lproj/ReleaseNotes.rtf
Modified: trunk/Dutch.lproj/ReleaseNotes.rtf
===================================================================
--- trunk/Dutch.lproj/ReleaseNotes.rtf 2007-05-08 09:25:36 UTC (rev 1997)
+++ trunk/Dutch.lproj/ReleaseNotes.rtf 2007-05-08 09:32:14 UTC (rev 1998)
@@ -49,16 +49,17 @@
{\list\listtemplateid44\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid44}
{\list\listtemplateid45\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid45}
{\list\listtemplateid46\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid46}
-{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}}
+{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}
+{\list\listtemplateid48\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid48}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}{\listoverride\listid48\listoverridecount0\ls48}}
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f0\fs60 \cf0 Skim Release Notes\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\fs22 \cf0 \
-Last update: 29 April 2007 (rev
-\f2\fs20 1933
+Last update: 8 May 2007 (rev
+\f2\fs20 1997
\f1\fs22 )\
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
@@ -106,9 +107,7 @@
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls17\ilvl0\cf0 {\listtext \'a5 }Skim can now also view separate Skim notes (.skim) files.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks
-\f0\fs24 Andy Matuschak!)
-\f1\fs22 \
+\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks Andy Matuschak!)\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls19\ilvl0\cf0 {\listtext \'a5 }Display the number of pages in the title bar.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
@@ -135,6 +134,7 @@
\ls30\ilvl0\cf0 {\listtext \'a5 }Add a Look Up in Dictionary item to the contextual menu.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls31\ilvl0\cf0 {\listtext \'a5 }You can now undo edits of notes and highlights.\
+{\listtext \'a5 }Add a hidden preference (SKActivateFullScreenNavigationAtBottom) to show the navigation buttons in full screen mode only when moving the mouse at the bottom of the screen. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -174,6 +174,8 @@
\ls46\ilvl0\cf0 {\listtext \'a5 }Fix back-tabbing through notes and links.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls47\ilvl0\cf0 {\listtext \'a5 }Zooming using the scroll-wheel now only affects the current window.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls48\ilvl0\cf0 {\listtext \'a5 }Lazy updating of page thumbnails to avoid slowdown when opening a file.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\b\fs28 \cf0 \
Modified: trunk/English.lproj/ReleaseNotes.rtf
===================================================================
--- trunk/English.lproj/ReleaseNotes.rtf 2007-05-08 09:25:36 UTC (rev 1997)
+++ trunk/English.lproj/ReleaseNotes.rtf 2007-05-08 09:32:14 UTC (rev 1998)
@@ -49,16 +49,17 @@
{\list\listtemplateid44\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid44}
{\list\listtemplateid45\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid45}
{\list\listtemplateid46\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid46}
-{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}}
+{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}
+{\list\listtemplateid48\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid48}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}{\listoverride\listid48\listoverridecount0\ls48}}
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f0\fs60 \cf0 Skim Release Notes\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\fs22 \cf0 \
-Last update: 29 April 2007 (rev
-\f2\fs20 1933
+Last update: 8 May 2007 (rev
+\f2\fs20 1997
\f1\fs22 )\
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
@@ -106,9 +107,7 @@
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls17\ilvl0\cf0 {\listtext \'a5 }Skim can now also view separate Skim notes (.skim) files.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks
-\f0\fs24 Andy Matuschak!)
-\f1\fs22 \
+\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks Andy Matuschak!)\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls19\ilvl0\cf0 {\listtext \'a5 }Display the number of pages in the title bar.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
@@ -135,6 +134,7 @@
\ls30\ilvl0\cf0 {\listtext \'a5 }Add a Look Up in Dictionary item to the contextual menu.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls31\ilvl0\cf0 {\listtext \'a5 }You can now undo edits of notes and highlights.\
+{\listtext \'a5 }Add a hidden preference (SKActivateFullScreenNavigationAtBottom) to show the navigation buttons in full screen mode only when moving the mouse at the bottom of the screen. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -174,6 +174,8 @@
\ls46\ilvl0\cf0 {\listtext \'a5 }Fix back-tabbing through notes and links.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls47\ilvl0\cf0 {\listtext \'a5 }Zooming using the scroll-wheel now only affects the current window.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls48\ilvl0\cf0 {\listtext \'a5 }Lazy updating of page thumbnails to avoid slowdown when opening a file.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\b\fs28 \cf0 \
Modified: trunk/Italian.lproj/ReleaseNotes.rtf
===================================================================
--- trunk/Italian.lproj/ReleaseNotes.rtf 2007-05-08 09:25:36 UTC (rev 1997)
+++ trunk/Italian.lproj/ReleaseNotes.rtf 2007-05-08 09:32:14 UTC (rev 1998)
@@ -49,16 +49,17 @@
{\list\listtemplateid44\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid44}
{\list\listtemplateid45\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid45}
{\list\listtemplateid46\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid46}
-{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}}
+{\list\listtemplateid47\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid47}
+{\list\listtemplateid48\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid48}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}{\listoverride\listid48\listoverridecount0\ls48}}
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f0\fs60 \cf0 Skim Release Notes\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\fs22 \cf0 \
-Last update: 29 April 2007 (rev
-\f2\fs20 1933
+Last update: 8 May 2007 (rev
+\f2\fs20 1997
\f1\fs22 )\
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
@@ -106,9 +107,7 @@
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls17\ilvl0\cf0 {\listtext \'a5 }Skim can now also view separate Skim notes (.skim) files.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks
-\f0\fs24 Andy Matuschak!)
-\f1\fs22 \
+\ls18\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks Andy Matuschak!)\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls19\ilvl0\cf0 {\listtext \'a5 }Display the number of pages in the title bar.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
@@ -135,6 +134,7 @@
\ls30\ilvl0\cf0 {\listtext \'a5 }Add a Look Up in Dictionary item to the contextual menu.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls31\ilvl0\cf0 {\listtext \'a5 }You can now undo edits of notes and highlights.\
+{\listtext \'a5 }Add a hidden preference (SKActivateFullScreenNavigationAtBottom) to show the navigation buttons in full screen mode only when moving the mouse at the bottom of the screen. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -174,6 +174,8 @@
\ls46\ilvl0\cf0 {\listtext \'a5 }Fix back-tabbing through notes and links.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\ls47\ilvl0\cf0 {\listtext \'a5 }Zooming using the scroll-wheel now only affects the current window.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls48\ilvl0\cf0 {\listtext \'a5 }Lazy updating of page thumbnails to avoid slowdown when opening a file.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\b\fs28 \cf0 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-08 09:25:37
|
Revision: 1997
http://skim-app.svn.sourceforge.net/skim-app/?rev=1997&view=rev
Author: hofman
Date: 2007-05-08 02:25:36 -0700 (Tue, 08 May 2007)
Log Message:
-----------
The windowcontroller is already removed when the windowWillClose notification is send.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-05-08 09:05:43 UTC (rev 1996)
+++ trunk/SKDocument.m 2007-05-08 09:25:36 UTC (rev 1997)
@@ -607,7 +607,9 @@
}
- (void)handleWindowWillCloseNotification:(NSNotification *)notification {
- if ([[notification object] isEqual:[[self mainWindowController] window]]) {
+ NSWindow *window = [notification object];
+ // ignore when we're switching fullscreen/main windows
+ if ([window isEqual:[[window windowController] window]]) {
[fileUpdateTimer invalidate];
[fileUpdateTimer release];
fileUpdateTimer = nil;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-08 09:05:45
|
Revision: 1996
http://skim-app.svn.sourceforge.net/skim-app/?rev=1996&view=rev
Author: hofman
Date: 2007-05-08 02:05:43 -0700 (Tue, 08 May 2007)
Log Message:
-----------
Load pdf document later, to speed up window loading.
The document should only note closing of the current window.
Modified Paths:
--------------
trunk/SKDocument.m
trunk/SKMainWindowController.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-05-07 20:50:03 UTC (rev 1995)
+++ trunk/SKDocument.m 2007-05-08 09:05:43 UTC (rev 1996)
@@ -104,20 +104,16 @@
- (void)makeWindowControllers{
SKMainWindowController *mainWindowController = [[[SKMainWindowController alloc] initWithWindowNibName:@"MainWindow"] autorelease];
+ [mainWindowController setShouldCloseDocument:YES];
[self addWindowController:mainWindowController];
}
- (void)windowControllerDidLoadNib:(NSWindowController *)aController{
-
SKMainWindowController *mainController = (SKMainWindowController *)aController;
- [mainController setShouldCloseDocument:YES];
-
[mainController setPdfDocument:pdfDocument];
+ [self setPDFDoc:nil];
- [pdfDocument autorelease];
- pdfDocument = nil;
-
[mainController setAnnotationsFromDictionaries:noteDicts];
[self setNoteDicts:nil];
@@ -589,6 +585,8 @@
[self checkFileUpdatesIfNeededAfterDelay:delay];
}
+#pragma mark Notification observation
+
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
if (object == [NSUserDefaultsController sharedUserDefaultsController]) {
if (NO == [keyPath hasPrefix:@"values."])
@@ -609,13 +607,12 @@
}
- (void)handleWindowWillCloseNotification:(NSNotification *)notification {
- [fileUpdateTimer invalidate];
- [fileUpdateTimer release];
- fileUpdateTimer = nil;
+ if ([[notification object] isEqual:[[self mainWindowController] window]]) {
+ [fileUpdateTimer invalidate];
+ [fileUpdateTimer release];
+ fileUpdateTimer = nil;
+ }
}
-- (void)removeWindowController:(id)controller {
- [super removeWindowController:controller];
-}
#pragma mark Pdfsync support
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-07 20:50:03 UTC (rev 1995)
+++ trunk/SKMainWindowController.m 2007-05-08 09:05:43 UTC (rev 1996)
@@ -160,23 +160,6 @@
}
- (void)windowDidLoad{
-
- // this needs to be done before loading the PDFDocument
- {
- [self resetThumbnailSizeIfNeeded];
- [self resetSnapshotSizeIfNeeded];
-
- NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
- NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"bounds" ascending:YES selector:@selector(boundsCompare:)] autorelease];
- [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil]];
- [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
- [ownerController setContent:self];
- }
-
- // NB: the next line will load the PDF document and annotations, so necessary setup must be finished first!
- // windowControllerDidLoadNib: is not called automatically because the document overrides makeWindowControllers
- [[self document] windowControllerDidLoadNib:self];
-
[leftSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
[leftSideCollapsibleView setMinSize:NSMakeSize(100.0, 42.0)];
@@ -223,6 +206,7 @@
[pdfView setShouldAntiAlias:[[NSUserDefaults standardUserDefaults] boolForKey:SKShouldAntiAliasKey]];
[pdfView setGreekingThreshold:[[NSUserDefaults standardUserDefaults] floatForKey:SKGreekingThresholdKey]];
+ [pdfView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKBackgroundColorKey]]];
if ([[NSUserDefaults standardUserDefaults] objectForKey:@"SKLeftSidePaneWidth"]) {
float width = [[NSUserDefaults standardUserDefaults] floatForKey:@"SKLeftSidePaneWidth"];
@@ -244,6 +228,21 @@
[pdfContentBox setFrame:frame];
}
+ // this needs to be done before loading the PDFDocument
+ [self resetThumbnailSizeIfNeeded];
+ [self resetSnapshotSizeIfNeeded];
+
+ // this needs to be done before loading the PDFDocument
+ NSSortDescriptor *pageIndexSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"pageIndex" ascending:YES] autorelease];
+ NSSortDescriptor *boundsSortDescriptor = [[[NSSortDescriptor alloc] initWithKey:@"bounds" ascending:YES selector:@selector(boundsCompare:)] autorelease];
+ [noteArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, boundsSortDescriptor, nil]];
+ [snapshotArrayController setSortDescriptors:[NSArray arrayWithObjects:pageIndexSortDescriptor, nil]];
+ [ownerController setContent:self];
+
+ // NB: the next line will load the PDF document and annotations, so necessary setup must be finished first!
+ // windowControllerDidLoadNib: is not called automatically because the document overrides makeWindowControllers
+ [[self document] windowControllerDidLoadNib:self];
+
if (pdfOutline == nil) {
if ([[NSUserDefaults standardUserDefaults] boolForKey:SKOpenContentsPaneOnlyForTOCKey] &&
NSWidth([leftSideContentBox frame]) > 0.0)
@@ -255,8 +254,6 @@
[self toggleLeftSidePane:self];
}
- [pdfView setBackgroundColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKBackgroundColorKey]]];
-
if ([[NSUserDefaults standardUserDefaults] boolForKey:SKRememberLastPageViewedKey]) {
unsigned int pageIndex = [[SKBookmarkController sharedBookmarkController] pageIndexForRecentDocumentAtPath:[[[self document] fileURL] path]];
if (pageIndex != NSNotFound)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 20:50:05
|
Revision: 1995
http://skim-app.svn.sourceforge.net/skim-app/?rev=1995&view=rev
Author: hofman
Date: 2007-05-07 13:50:03 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Return to current page rather than current destination after a revert, the destination is rather arbitrary.
Shorter check time for file change when the file has changed and we wait for it to stabilize.
Modified Paths:
--------------
trunk/SKDocument.m
trunk/SKMainWindowController.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-05-07 19:51:46 UTC (rev 1994)
+++ trunk/SKDocument.m 2007-05-07 20:50:03 UTC (rev 1995)
@@ -503,7 +503,7 @@
// For now this just uses a timer checking the modification date of the file. We may want to use kqueue (UKKqueue) at some point.
-- (void)checkFileUpdatesIfNeeded {
+- (void)checkFileUpdatesIfNeededAfterDelay:(NSTimeInterval)delay {
BOOL autoUpdatePref = [[NSUserDefaults standardUserDefaults] boolForKey:SKAutoCheckFileUpdateKey];
if (autoUpdatePref == NO && fileUpdateTimer) {
@@ -512,10 +512,15 @@
fileUpdateTimer = nil;
autoUpdate = NO;
} else if (autoUpdatePref && fileUpdateTimer == nil) {
- fileUpdateTimer = [[NSTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(checkFileUpdateStatus:) userInfo:nil repeats:NO] retain];
+ fileUpdateTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:delay] interval:0.0 target:self selector:@selector(checkFileUpdateStatus:) userInfo:NULL repeats:NO];
+ [[NSRunLoop currentRunLoop] addTimer:fileUpdateTimer forMode:NSDefaultRunLoopMode];
}
}
+- (void)checkFileUpdatesIfNeeded {
+ [self checkFileUpdatesIfNeededAfterDelay:2.0];
+}
+
- (void)fileUpdateAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo {
NSDate *changeDate = (NSDate *)contextInfo;
@@ -542,6 +547,7 @@
fileUpdateTimer = nil;
NSFileManager *fm = [NSFileManager defaultManager];
+ NSTimeInterval delay = 2.0;
if ([[NSUserDefaults standardUserDefaults] boolForKey:SKAutoCheckFileUpdateKey] &&
[fm fileExistsAtPath:[self fileName]]) {
@@ -575,11 +581,12 @@
} else {
[previousCheckedDate release];
previousCheckedDate = [fileChangedDate retain];
+ delay = 0.5;
}
}
}
- [self checkFileUpdatesIfNeeded];
+ [self checkFileUpdatesIfNeededAfterDelay:delay];
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-07 19:51:46 UTC (rev 1994)
+++ trunk/SKMainWindowController.m 2007-05-07 20:50:03 UTC (rev 1995)
@@ -463,12 +463,10 @@
PDFDestination *dest;
unsigned pageIndex = NSNotFound;
- NSPoint point = NSZeroPoint;
if ([pdfView document]) {
dest = [pdfView currentDestination];
- pageIndex = [[pdfView document] indexForPage:[dest page]];
- point = [dest point];
+ pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
}
// these will be invalid. If needed, the document will restore them
@@ -506,8 +504,7 @@
if (pageIndex != NSNotFound && [document pageCount]) {
PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount])];
- dest = [[[PDFDestination alloc] initWithPage:page atPoint:point] autorelease];
- [pdfView performSelector:@selector(goToDestination:) withObject:dest afterDelay:0.0];
+ [pdfView performSelector:@selector(goToPage:) withObject:page afterDelay:0.0];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 19:52:25
|
Revision: 1994
http://skim-app.svn.sourceforge.net/skim-app/?rev=1994&view=rev
Author: hofman
Date: 2007-05-07 12:51:46 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Remove all thumbnails when reloading the document, to avoid an exception.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-07 19:50:59 UTC (rev 1993)
+++ trunk/SKMainWindowController.m 2007-05-07 19:51:46 UTC (rev 1994)
@@ -473,6 +473,7 @@
// these will be invalid. If needed, the document will restore them
[[self mutableArrayValueForKey:@"notes"] removeAllObjects];
+ [[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
[lastViewedPages removeAllObjects];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 19:51:29
|
Revision: 1993
http://skim-app.svn.sourceforge.net/skim-app/?rev=1993&view=rev
Author: hofman
Date: 2007-05-07 12:50:59 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Reconnect binding for file change check.
Modified Paths:
--------------
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.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.
|
|
From: <ho...@us...> - 2007-05-07 18:13:40
|
Revision: 1992
http://skim-app.svn.sourceforge.net/skim-app/?rev=1992&view=rev
Author: hofman
Date: 2007-05-07 11:13:36 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Use dedicated method to convert UTCDateTime. The docs warn against interpreting the struct as a UInt64.
Modified Paths:
--------------
trunk/SKPDFSynchronizer.m
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2007-05-07 12:57:58 UTC (rev 1991)
+++ trunk/SKPDFSynchronizer.m 2007-05-07 18:13:36 UTC (rev 1992)
@@ -53,29 +53,20 @@
}
static NSDate *SKFileModificationDateAtPath(NSString *path) {
- static NSDate* jan1904 = nil;
- if (jan1904 == nil)
- jan1904 = [[NSDate dateWithString:@"1904-01-01 00:00:00 +0000"] retain];
-
+ CFAbsoluteTime absoluteTime;
FSCatalogInfo info;
FSRef fileRef;
if (NO == CFURLGetFSRef((CFURLRef)[NSURL fileURLWithPath:path], &fileRef))
return nil;
- if (noErr != FSGetCatalogInfo( &fileRef, kFSCatInfoContentMod, &info, NULL,NULL, NULL ))
+ if (noErr != FSGetCatalogInfo(&fileRef, kFSCatInfoContentMod, &info, NULL, NULL, NULL))
return nil;
- union {
- UTCDateTime local;
- UInt64 shifted;
- } time;
-
- time.local = info.contentModDate;
- if (time.shifted)
- return [[[NSDate alloc] initWithTimeInterval:time.shifted / 65536 sinceDate:jan1904] autorelease];
- else
+ if (noErr != UCConvertUTCDateTimeToCFAbsoluteTime(&info.contentModDate, &absoluteTime))
return nil;
+
+ return [NSDate dateWithTimeIntervalSinceReferenceDate:(NSTimeInterval)absoluteTime];
}
static NSString *SKTeXSourceFile(NSString *file, NSString *base) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 12:58:04
|
Revision: 1991
http://skim-app.svn.sourceforge.net/skim-app/?rev=1991&view=rev
Author: hofman
Date: 2007-05-07 05:57:58 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Fix saving of last viewed page. The document is set to nil before windowWillClose is called. Also fix check of alias data for path.
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKMainWindowController.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2007-05-07 12:06:56 UTC (rev 1990)
+++ trunk/SKBookmarkController.m 2007-05-07 12:57:58 UTC (rev 1991)
@@ -127,36 +127,42 @@
return recentDocuments;
}
+- (unsigned int)indexOfRecentDocumentAtPath:(NSString *)path {
+ unsigned int index = [[recentDocuments valueForKey:@"path"] indexOfObject:path];
+ if (index == NSNotFound) {
+ unsigned int i, iMax = [recentDocuments count];
+ for (i = 0; i < iMax; i++) {
+ NSData *aliasData = [[recentDocuments objectAtIndex:i] valueForKey:@"_BDAlias"];
+ if ([[[BDAlias aliasWithData:aliasData] fullPathNoUI] isEqualToString:path]) {
+ index = i;
+ break;
+ }
+ }
+ }
+ return index;
+}
+
- (void)addRecentDocumentForPath:(NSString *)path pageIndex:(unsigned)pageIndex {
if (path == nil)
return;
- NSArray *paths = [recentDocuments valueForKey:@"path"];
- unsigned int index = [paths indexOfObject:path];
- if (index == NSNotFound) {
- paths = [recentDocuments valueForKeyPath:@"fullPathNoUI"];
- index = [paths indexOfObject:path];
- }
+ unsigned int index = [self indexOfRecentDocumentAtPath:path];
if (index != NSNotFound)
[recentDocuments removeObjectAtIndex:index];
+
NSData *data = [[BDAlias aliasWithPath:path] aliasData];
NSMutableDictionary *bm = [NSMutableDictionary dictionaryWithObjectsAndKeys:path, @"path", [NSNumber numberWithUnsignedInt:pageIndex], @"pageIndex", data, @"_BDAlias", nil];
[recentDocuments insertObject:bm atIndex:0];
if ([recentDocuments count] > MAX_RECENT_DOCUMENTS_COUNT)
[recentDocuments removeLastObject];
+
[self saveBookmarks];
}
- (unsigned int)pageIndexForRecentDocumentAtPath:(NSString *)path {
if (path == nil)
return NSNotFound;
- NSArray *paths = [recentDocuments valueForKey:@"path"];
- unsigned int index = [paths indexOfObject:path];
-
- if (index == NSNotFound) {
- paths = [recentDocuments valueForKeyPath:@"fullPathNoUI"];
- index = [paths indexOfObject:path];
- }
+ unsigned int index = [self indexOfRecentDocumentAtPath:path];
return index == NSNotFound ? NSNotFound : [[[recentDocuments objectAtIndex:index] objectForKey:@"pageIndex"] unsignedIntValue];
}
@@ -239,7 +245,7 @@
}
- (id)transformedValue:(id)dictionary {
- NSString *path = [[BDAlias aliasWithData:[dictionary valueForKey:@"_BDAlias"]] fullPath];
+ NSString *path = [[BDAlias aliasWithData:[dictionary valueForKey:@"_BDAlias"]] fullPathNoUI];
if (path == nil)
path = [dictionary valueForKey:@"path"];
return path;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-07 12:06:56 UTC (rev 1990)
+++ trunk/SKMainWindowController.m 2007-05-07 12:57:58 UTC (rev 1991)
@@ -425,11 +425,6 @@
- (void)windowWillClose:(NSNotification *)notification {
if ([[notification object] isEqual:[self window]]) {
- unsigned int pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
- NSString *path = [[[self document] fileURL] path];
- if (pageIndex != NSNotFound && path)
- [[SKBookmarkController sharedBookmarkController] addRecentDocumentForPath:path pageIndex:pageIndex];
-
// timers retain their target, so invalidate them now or they may keep firing after the PDF is gone
if (snapshotTimer) {
[snapshotTimer invalidate];
@@ -446,6 +441,16 @@
}
}
+- (void)setDocument:(NSDocument *)document {
+ if ([self document] && document == nil) {
+ unsigned int pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
+ NSString *path = [[[self document] fileURL] path];
+ if (pageIndex != NSNotFound && path)
+ [[SKBookmarkController sharedBookmarkController] addRecentDocumentForPath:path pageIndex:pageIndex];
+ }
+ [super setDocument:document];
+}
+
#pragma mark Accessors
- (PDFDocument *)pdfDocument{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 12:06:57
|
Revision: 1990
http://skim-app.svn.sourceforge.net/skim-app/?rev=1990&view=rev
Author: hofman
Date: 2007-05-07 05:06:56 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Improve file size display for very large files.
Modified Paths:
--------------
trunk/SKInfoWindowController.m
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2007-05-07 11:44:13 UTC (rev 1989)
+++ trunk/SKInfoWindowController.m 2007-05-07 12:06:56 UTC (rev 1990)
@@ -95,8 +95,7 @@
logicalSize = size = [[fileAttrs objectForKey:NSFileSize] unsignedLongLongValue];
}
- unsigned long bigSize = size >> 32;
- if (bigSize == 0) {
+ if (size >> 40 == 0) {
if (size == 0) {
[string appendString:@"zero bytes"];
} else if (size < 1024) {
@@ -115,19 +114,17 @@
}
}
}
- } else if (bigSize < 256) {
- [string appendFormat:@"%.1f GB", (size >> 20) / 1024.0f];
} else {
- UInt32 adjSize = bigSize >> 8;
+ UInt32 adjSize = size >> 40; size >>= 30;
if (adjSize < 1024) {
- [string appendFormat:@"%.1f TB", bigSize / 265.0f];
+ [string appendFormat:@"%.1f TB", size / 1024.0f];
} else {
- adjSize >>= 10; bigSize >>= 8;
+ adjSize >>= 10; size >>= 10;
if (adjSize < 1024) {
- [string appendFormat:@"%.1f PB", bigSize / 1024.0f];
+ [string appendFormat:@"%.1f PB", size / 1024.0f];
} else {
- adjSize >>= 10; bigSize >>= 10;
- [string appendFormat:@"%.1f EB", bigSize / 1024.0f];
+ adjSize >>= 10; size >>= 10;
+ [string appendFormat:@"%.1f EB", size / 1024.0f];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-07 11:44:18
|
Revision: 1989
http://skim-app.svn.sourceforge.net/skim-app/?rev=1989&view=rev
Author: hofman
Date: 2007-05-07 04:44:13 -0700 (Mon, 07 May 2007)
Log Message:
-----------
Improve file size display for very large files.
Modified Paths:
--------------
trunk/SKInfoWindowController.m
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2007-05-06 21:22:25 UTC (rev 1988)
+++ trunk/SKInfoWindowController.m 2007-05-07 11:44:13 UTC (rev 1989)
@@ -72,30 +72,26 @@
}
static inline
-NSString *fileSizeOfFileAtPath(NSString *path) {
- if (path == nil)
+NSString *SKFileSizeStringForFileURL(NSURL *fileURL) {
+ if (fileURL == nil)
return @"";
- CFURLRef fileURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef)path, kCFURLPOSIXPathStyle, false);
FSRef fileRef;
FSCatalogInfo catalogInfo;
unsigned long long size, logicalSize;
BOOL gotSize = NO;
NSMutableString *string = [NSMutableString string];
- if (fileURL != NULL) {
- Boolean gotRef = CFURLGetFSRef(fileURL, &fileRef);
- CFRelease(fileURL);
- if (gotRef && noErr == FSGetCatalogInfo(&fileRef, kFSCatInfoDataSizes | kFSCatInfoRsrcSizes, &catalogInfo, NULL, NULL, NULL)) {
- size = catalogInfo.dataPhysicalSize + catalogInfo.rsrcPhysicalSize;
- logicalSize = catalogInfo.dataLogicalSize + catalogInfo.rsrcLogicalSize;
- gotSize = YES;
- }
+ Boolean gotRef = CFURLGetFSRef((CFURLRef)fileURL, &fileRef);
+ if (gotRef && noErr == FSGetCatalogInfo(&fileRef, kFSCatInfoDataSizes | kFSCatInfoRsrcSizes, &catalogInfo, NULL, NULL, NULL)) {
+ size = catalogInfo.dataPhysicalSize + catalogInfo.rsrcPhysicalSize;
+ logicalSize = catalogInfo.dataLogicalSize + catalogInfo.rsrcLogicalSize;
+ gotSize = YES;
}
if (gotSize == NO) {
// this seems to give the logical size
- NSDictionary *fileAttrs = [[NSFileManager defaultManager] fileAttributesAtPath:path traverseLink:NO];
+ NSDictionary *fileAttrs = [[NSFileManager defaultManager] fileAttributesAtPath:[fileURL path] traverseLink:NO];
logicalSize = size = [[fileAttrs objectForKey:NSFileSize] unsignedLongLongValue];
}
@@ -120,10 +116,20 @@
}
}
} else if (bigSize < 256) {
- [string appendFormat:@"%u GB", bigSize, logicalSize];
+ [string appendFormat:@"%.1f GB", (size >> 20) / 1024.0f];
} else {
- bigSize >>= 2;
- [string appendFormat:@"%u TB", bigSize, logicalSize];
+ UInt32 adjSize = bigSize >> 8;
+ if (adjSize < 1024) {
+ [string appendFormat:@"%.1f TB", bigSize / 265.0f];
+ } else {
+ adjSize >>= 10; bigSize >>= 8;
+ if (adjSize < 1024) {
+ [string appendFormat:@"%.1f PB", bigSize / 1024.0f];
+ } else {
+ adjSize >>= 10; bigSize >>= 10;
+ [string appendFormat:@"%.1f EB", bigSize / 1024.0f];
+ }
+ }
}
NSNumberFormatter *formatter = [[[NSNumberFormatter alloc] init] autorelease];
@@ -142,7 +148,7 @@
[info setValue:[[doc fileName] lastPathComponent] forKey:@"FileName"];
[info setValue:[NSString stringWithFormat: @"%d.%d", [pdfDoc majorVersion], [pdfDoc minorVersion]] forKey:@"Version"];
[info setValue:[NSNumber numberWithInt:[pdfDoc pageCount]] forKey:@"PageCount"];
- [info setValue:fileSizeOfFileAtPath([doc fileName]) forKey:@"FileSize"];
+ [info setValue:SKFileSizeStringForFileURL([doc fileURL]) forKey:@"FileSize"];
[info setValue:[[info valueForKey:@"KeyWords"] componentsJoinedByString:@" "] forKey:@"KeywordsString"];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 21:22:26
|
Revision: 1988
http://skim-app.svn.sourceforge.net/skim-app/?rev=1988&view=rev
Author: hofman
Date: 2007-05-06 14:22:25 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Validate revert menu item.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-05-06 21:12:49 UTC (rev 1987)
+++ trunk/SKDocument.m 2007-05-06 21:22:25 UTC (rev 1988)
@@ -697,6 +697,8 @@
- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
if ([anItem action] == @selector(performFindPanelAction:))
return [[SKFindController sharedFindController] validateUserInterfaceItem:anItem];
+ else if ([anItem action] == @selector(revertDocumentToSaved:))
+ return [self isDocumentEdited];
else
return [super validateUserInterfaceItem:anItem];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 21:12:52
|
Revision: 1987
http://skim-app.svn.sourceforge.net/skim-app/?rev=1987&view=rev
Author: hofman
Date: 2007-05-06 14:12:49 -0700 (Sun, 06 May 2007)
Log Message:
-----------
fix method name
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-05-06 21:10:10 UTC (rev 1986)
+++ trunk/SKPDFView.m 2007-05-06 21:12:49 UTC (rev 1987)
@@ -1363,7 +1363,7 @@
[navWindow orderOut:self];
}
-- (void)setHasNavigation:(BOOL)hasNav activateNavigationAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor {
+- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor {
hasNavigation = hasNav;
autohidesCursor = hideCursor;
activateNavigationAtBottom = atBottom;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 21:10:12
|
Revision: 1986
http://skim-app.svn.sourceforge.net/skim-app/?rev=1986&view=rev
Author: hofman
Date: 2007-05-06 14:10:10 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Add (hidden) pref to activate the navigation buttons only at the bottom of the screen on Full Screen mode.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-06 18:00:52 UTC (rev 1985)
+++ trunk/SKMainWindowController.m 2007-05-06 21:10:10 UTC (rev 1986)
@@ -1323,7 +1323,7 @@
if ([fullScreenSetup count])
[self applyPDFSettings:fullScreenSetup];
- [pdfView setHasNavigation:YES autohidesCursor:NO];
+ [pdfView setHasNavigation:YES activateAtBottom:[[NSUserDefaults standardUserDefaults] boolForKey:@"SKActivateFullScreenNavigationAtBottom"] autohidesCursor:NO];
[self showSideWindows];
}
@@ -1346,7 +1346,7 @@
else
[self goFullScreen];
- [pdfView setHasNavigation:YES autohidesCursor:YES];
+ [pdfView setHasNavigation:YES activateAtBottom:YES autohidesCursor:YES];
}
- (IBAction)exitFullScreen:(id)sender {
@@ -1358,7 +1358,7 @@
if ([[fullScreenWindow firstResponder] isDescendantOf:pdfView])
[fullScreenWindow makeFirstResponder:nil];
- [pdfView setHasNavigation:NO autohidesCursor:NO];
+ [pdfView setHasNavigation:NO activateAtBottom:NO autohidesCursor:NO];
[pdfView setFrame:[[pdfContentBox contentView] bounds]];
[pdfContentBox addSubview:pdfView]; // this should be done before exitPresentationMode to get a smooth transition
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2007-05-06 18:00:52 UTC (rev 1985)
+++ trunk/SKPDFView.h 2007-05-06 21:10:10 UTC (rev 1986)
@@ -73,6 +73,7 @@
BOOL autohidesCursor;
BOOL hasNavigation;
+ BOOL activateNavigationAtBottom;
NSTimer *autohideTimer;
SKNavigationWindow *navWindow;
@@ -130,7 +131,7 @@
- (void)takeSnapshot:(id)sender;
-- (void)setHasNavigation:(BOOL)hasNav autohidesCursor:(BOOL)hideCursor;
+- (void)setHasNavigation:(BOOL)hasNav activateAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor;
- (void)setNeedsDisplayInRect:(NSRect)rect ofPage:(PDFPage *)page;
- (void)setNeedsDisplayForAnnotation:(PDFAnnotation *)annotation;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-05-06 18:00:52 UTC (rev 1985)
+++ trunk/SKPDFView.m 2007-05-06 21:10:10 UTC (rev 1986)
@@ -677,8 +677,8 @@
}
// in presentation mode only show the navigation window only by moving the mouse to the bottom edge
- BOOL shouldShowNavWindow = hasNavigation && (autohidesCursor == NO || [theEvent locationInWindow].y < 5.0);
- if (autohidesCursor || shouldShowNavWindow) {
+ BOOL shouldShowNavWindow = hasNavigation && (activateNavigationAtBottom == NO || [theEvent locationInWindow].y < 5.0);
+ if (activateNavigationAtBottom || shouldShowNavWindow) {
if (shouldShowNavWindow && [navWindow isVisible] == NO) {
[[self window] addChildWindow:navWindow ordered:NSWindowAbove];
[navWindow orderFront:self];
@@ -1363,9 +1363,10 @@
[navWindow orderOut:self];
}
-- (void)setHasNavigation:(BOOL)hasNav autohidesCursor:(BOOL)hideCursor {
+- (void)setHasNavigation:(BOOL)hasNav activateNavigationAtBottom:(BOOL)atBottom autohidesCursor:(BOOL)hideCursor {
hasNavigation = hasNav;
autohidesCursor = hideCursor;
+ activateNavigationAtBottom = atBottom;
if (hasNavigation) {
// always recreate the navWindow, since moving between screens of different resolution can mess up the location (in spite of moveToScreen:)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 18:00:56
|
Revision: 1985
http://skim-app.svn.sourceforge.net/skim-app/?rev=1985&view=rev
Author: hofman
Date: 2007-05-06 11:00:52 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Update find table in batches of 50, as redrawing is considerably slower than finding.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-06 17:10:10 UTC (rev 1984)
+++ trunk/SKMainWindowController.m 2007-05-06 18:00:52 UTC (rev 1985)
@@ -1560,8 +1560,11 @@
}
- (void)documentDidEndDocumentFind:(NSNotification *)note {
- if (findPanelFind == NO)
+ if (findPanelFind == NO) {
[spinner stopAnimation:nil];
+ [self willChangeValueForKey:@"searchResults"];
+ [self didChangeValueForKey:@"searchResults"];
+ }
}
- (void)documentDidEndPageFind:(NSNotification *)note {
@@ -1572,8 +1575,13 @@
}
- (void)didMatchString:(PDFSelection *)instance {
- if (findPanelFind == NO)
- [findArrayController addObject:instance];
+ if (findPanelFind == NO) {
+ [searchResults addObject:instance];
+ if ([searchResults count] % 50 == 0) {
+ [self willChangeValueForKey:@"searchResults"];
+ [self didChangeValueForKey:@"searchResults"];
+ }
+ }
}
- (void)addAnnotationsForSelection:(PDFSelection *)sel {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 17:10:11
|
Revision: 1984
http://skim-app.svn.sourceforge.net/skim-app/?rev=1984&view=rev
Author: hofman
Date: 2007-05-06 10:10:10 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Remove unused methods.
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-05-06 12:43:41 UTC (rev 1983)
+++ trunk/SKMainWindowController.h 2007-05-06 17:10:10 UTC (rev 1984)
@@ -274,9 +274,7 @@
- (void)displaySearchView;
- (void)fadeInSearchView;
- (void)displayNoteView;
-- (void)fadeInNoteView;
- (void)displaySnapshotView;
-- (void)fadeInSnapshotView;
- (void)removeTemporaryAnnotations;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-06 12:43:41 UTC (rev 1983)
+++ trunk/SKMainWindowController.m 2007-05-06 17:10:10 UTC (rev 1984)
@@ -1544,23 +1544,12 @@
currentRightSideView = noteView;
}
-- (void)fadeInNoteView {
- [self replaceSideView:currentRightSideView withView:noteView animate:YES];
- currentRightSideView = noteView;
-}
-
- (void)displaySnapshotView {
[self replaceSideView:currentRightSideView withView:snapshotView animate:NO];
currentRightSideView = snapshotView;
[self updateSnapshotsIfNeeded];
}
-- (void)fadeInSnapshotView {
- [self replaceSideView:currentRightSideView withView:snapshotTableView animate:YES];
- currentRightSideView = snapshotTableView;
- [self updateSnapshotsIfNeeded];
-}
-
#pragma mark Searching
- (void)documentDidBeginDocumentFind:(NSNotification *)note {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 12:43:47
|
Revision: 1983
http://skim-app.svn.sourceforge.net/skim-app/?rev=1983&view=rev
Author: hofman
Date: 2007-05-06 05:43:41 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Fix typo
Modified Paths:
--------------
trunk/NSParagraphStyle_SKExtensions.m
Modified: trunk/NSParagraphStyle_SKExtensions.m
===================================================================
--- trunk/NSParagraphStyle_SKExtensions.m 2007-05-06 12:20:27 UTC (rev 1982)
+++ trunk/NSParagraphStyle_SKExtensions.m 2007-05-06 12:43:41 UTC (rev 1983)
@@ -43,7 +43,7 @@
+ (NSParagraphStyle *)defaultClippingParagraphStyle {
static NSParagraphStyle *defaultClippingParagraphStyle = nil;
- if (defaultClippingParagraphStyle = nil) {
+ if (defaultClippingParagraphStyle == nil) {
NSMutableParagraphStyle *tmpParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[tmpParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
defaultClippingParagraphStyle = [tmpParagraphStyle copy];
@@ -54,7 +54,7 @@
+ (NSParagraphStyle *)defaultTruncatingTailParagraphStyle {
static NSParagraphStyle *defaultTruncatingTailParagraphStyle = nil;
- if (defaultTruncatingTailParagraphStyle = nil) {
+ if (defaultTruncatingTailParagraphStyle == nil) {
NSMutableParagraphStyle *tmpParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
[tmpParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
defaultTruncatingTailParagraphStyle = [tmpParagraphStyle copy];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 12:20:29
|
Revision: 1982
http://skim-app.svn.sourceforge.net/skim-app/?rev=1982&view=rev
Author: hofman
Date: 2007-05-06 05:20:27 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Use standard settings for thumbnail shadow.
Modified Paths:
--------------
trunk/PDFPage_SKExtensions.h
trunk/PDFPage_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2007-05-06 12:19:24 UTC (rev 1981)
+++ trunk/PDFPage_SKExtensions.h 2007-05-06 12:20:27 UTC (rev 1982)
@@ -44,6 +44,7 @@
@interface PDFPage (SKExtensions)
- (NSImage *)image;
+- (NSImage *)thumbnailWithSize:(float)size;
- (NSImage *)thumbnailWithSize:(float)size shadowBlurRadius:(float)shadowBlurRadius shadowOffset:(NSSize)shadowOffset;
- (NSArray *)lineBounds;
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2007-05-06 12:19:24 UTC (rev 1981)
+++ trunk/PDFPage_SKExtensions.m 2007-05-06 12:20:27 UTC (rev 1982)
@@ -78,6 +78,12 @@
return [image autorelease];
}
+- (NSImage *)thumbnailWithSize:(float)size {
+ float shadowBlurRadius = roundf(size / 32.0);
+ float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
+ return [self thumbnailWithSize:size shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+}
+
- (NSImage *)thumbnailWithSize:(float)size shadowBlurRadius:(float)shadowBlurRadius shadowOffset:(NSSize)shadowOffset {
NSRect bounds = [self boundsForBox:kPDFDisplayBoxCropBox];
BOOL isScaled = size > 0.0;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-06 12:19:24 UTC (rev 1981)
+++ trunk/SKMainWindowController.m 2007-05-06 12:20:27 UTC (rev 1982)
@@ -658,12 +658,10 @@
if ([thumbnail isDirty] && NO == isAnimating && NO == [thumbnailTableView isScrolling]) {
- float shadowBlurRadius = roundf(thumbnailCacheSize / 32.0);
- float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
NSSize newSize, oldSize = [[thumbnail image] size];
PDFDocument *pdfDoc = [pdfView document];
PDFPage *page = [pdfDoc pageAtIndex:theIndex];
- NSImage *image = [page thumbnailWithSize:thumbnailCacheSize shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+ NSImage *image = [page thumbnailWithSize:thumbnailCacheSize];
// setImage: sends a KVO notification that results in calling objectInThumbnailsAtIndex: endlessly, so set dirty to NO first
@@ -1718,9 +1716,7 @@
}
- (void)snapshotControllerDidFinishSetup:(SKSnapshotWindowController *)controller {
- float shadowBlurRadius = roundf(snapshotCacheSize / 32.0);
- float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
- NSImage *image = [controller thumbnailWithSize:snapshotCacheSize shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+ NSImage *image = [controller thumbnailWithSize:snapshotCacheSize];
[controller setThumbnail:image];
[[self mutableArrayValueForKey:@"snapshots"] addObject:controller];
@@ -2426,15 +2422,12 @@
unsigned i, count = [pdfDoc pageCount];
[self willChange:NSKeyValueChangeRemoval valuesAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [thumbnails count])] forKey:@"thumbnails"];
if (count) {
- float shadowBlurRadius = roundf(thumbnailCacheSize / 32.0);
- float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
-
PDFPage *emptyPage = [[[PDFPage alloc] init] autorelease];
NSRect bounds = [[[pdfView document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox];
[emptyPage setBounds:bounds forBox:kPDFDisplayBoxCropBox];
// thumbnail code only uses the crop box, but media box is required for PDF
[emptyPage setBounds:bounds forBox:kPDFDisplayBoxMediaBox];
- NSImage *image = [emptyPage thumbnailWithSize:thumbnailCacheSize shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+ NSImage *image = [emptyPage thumbnailWithSize:thumbnailCacheSize];
[image lockFocus];
NSRect imgRect = NSZeroRect;
imgRect.size = [image size];
@@ -2558,10 +2551,8 @@
- (void)updateSnapshot:(NSTimer *)timer {
if ([dirtySnapshots count]) {
SKSnapshotWindowController *controller = [dirtySnapshots objectAtIndex:0];
- float shadowBlurRadius = roundf(snapshotCacheSize / 32.0);
- float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
NSSize newSize, oldSize = [[controller thumbnail] size];
- NSImage *image = [controller thumbnailWithSize:snapshotCacheSize shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+ NSImage *image = [controller thumbnailWithSize:snapshotCacheSize];
[controller setThumbnail:image];
[dirtySnapshots removeObject:controller];
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2007-05-06 12:19:24 UTC (rev 1981)
+++ trunk/SKSnapshotWindowController.h 2007-05-06 12:20:27 UTC (rev 1982)
@@ -48,22 +48,34 @@
BOOL miniaturizing;
BOOL forceOnTop;
}
+
- (void)setPdfDocument:(PDFDocument *)pdfDocument scaleFactor:(float)factor goToPageNumber:(int)pageNum rect:(NSRect)rect;
+
- (BOOL)isPageVisible:(PDFPage *)page;
+
- (void)redisplay;
+
- (id)delegate;
- (void)setDelegate:(id)newDelegate;
+
- (PDFView *)pdfView;
- (NSImage *)thumbnail;
- (void)setThumbnail:(NSImage *)newThumbnail;
+
- (NSString *)pageLabel;
- (unsigned int)pageIndex;
+
- (NSDictionary *)pageAndWindow;
+
- (BOOL)forceOnTop;
- (void)setForceOnTop:(BOOL)flag;
+
+- (NSImage *)thumbnailWithSize:(float)size;
- (NSImage *)thumbnailWithSize:(float)size shadowBlurRadius:(float)shadowBlurRadius shadowOffset:(NSSize)shadowOffset;
+
- (void)miniaturize;
- (void)deminiaturize;
+
- (void)handlePageChangedNotification:(NSNotification *)notification;
- (void)handlePDFViewFrameChangedNotification:(NSNotification *)notification;
- (void)handleViewChangedNotification:(NSNotification *)notification;
@@ -71,6 +83,7 @@
- (void)handleAnnotationDidChangeNotification:(NSNotification *)notification;
- (void)handleDidAddRemoveAnnotationNotification:(NSNotification *)notification;
- (void)handleDidMoveAnnotationNotification:(NSNotification *)notification;
+
@end
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2007-05-06 12:19:24 UTC (rev 1981)
+++ trunk/SKSnapshotWindowController.m 2007-05-06 12:20:27 UTC (rev 1982)
@@ -293,6 +293,12 @@
#pragma mark Thumbnails
+- (NSImage *)thumbnailWithSize:(float)size {
+ float shadowBlurRadius = roundf(size / 32.0);
+ float shadowOffset = - ceilf(shadowBlurRadius * 0.75);
+ return [self thumbnailWithSize:size shadowBlurRadius:shadowBlurRadius shadowOffset:NSMakeSize(0.0, shadowOffset)];
+}
+
- (NSImage *)thumbnailWithSize:(float)size shadowBlurRadius:(float)shadowBlurRadius shadowOffset:(NSSize)shadowOffset {
NSView *clipView = [[[pdfView documentView] enclosingScrollView] contentView];
NSRect bounds = [pdfView convertRect:[clipView bounds] fromView:clipView];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-06 12:19:26
|
Revision: 1981
http://skim-app.svn.sourceforge.net/skim-app/?rev=1981&view=rev
Author: hofman
Date: 2007-05-06 05:19:24 -0700 (Sun, 06 May 2007)
Log Message:
-----------
Add categories for getting some standard paragraph styles.
Modified Paths:
--------------
trunk/PDFSelection_SKExtensions.m
trunk/SKNavigationWindow.m
trunk/SKPDFHoverWindow.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/NSParagraphStyle_SKExtensions.h
trunk/NSParagraphStyle_SKExtensions.m
Added: trunk/NSParagraphStyle_SKExtensions.h
===================================================================
--- trunk/NSParagraphStyle_SKExtensions.h (rev 0)
+++ trunk/NSParagraphStyle_SKExtensions.h 2007-05-06 12:19:24 UTC (rev 1981)
@@ -0,0 +1,45 @@
+//
+// NSParagraphStyle_SKExtensions.h
+// Skim
+//
+// Created by Christiaan Hofman on 5/6/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface NSParagraphStyle (SKExtensions)
++ (NSParagraphStyle *)defaultClippingParagraphStyle;
++ (NSParagraphStyle *)defaultTruncatingTailParagraphStyle;
+@end
Added: trunk/NSParagraphStyle_SKExtensions.m
===================================================================
--- trunk/NSParagraphStyle_SKExtensions.m (rev 0)
+++ trunk/NSParagraphStyle_SKExtensions.m 2007-05-06 12:19:24 UTC (rev 1981)
@@ -0,0 +1,66 @@
+//
+// NSParagraphStyle_SKExtensions.m
+// Skim
+//
+// Created by Christiaan Hofman on 5/6/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "NSParagraphStyle_SKExtensions.h"
+
+
+@implementation NSParagraphStyle (SKExtensions)
+
++ (NSParagraphStyle *)defaultClippingParagraphStyle {
+ static NSParagraphStyle *defaultClippingParagraphStyle = nil;
+ if (defaultClippingParagraphStyle = nil) {
+ NSMutableParagraphStyle *tmpParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+ [tmpParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
+ defaultClippingParagraphStyle = [tmpParagraphStyle copy];
+ [tmpParagraphStyle release];
+ }
+ return defaultClippingParagraphStyle;
+}
+
++ (NSParagraphStyle *)defaultTruncatingTailParagraphStyle {
+ static NSParagraphStyle *defaultTruncatingTailParagraphStyle = nil;
+ if (defaultTruncatingTailParagraphStyle = nil) {
+ NSMutableParagraphStyle *tmpParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+ [tmpParagraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
+ defaultTruncatingTailParagraphStyle = [tmpParagraphStyle copy];
+ [tmpParagraphStyle release];
+ }
+ return defaultTruncatingTailParagraphStyle;
+}
+
+@end
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2007-05-05 18:27:25 UTC (rev 1980)
+++ trunk/PDFSelection_SKExtensions.m 2007-05-06 12:19:24 UTC (rev 1981)
@@ -38,6 +38,7 @@
#import "PDFSelection_SKExtensions.h"
#import "NSString_SKExtensions.h"
+#import "NSParagraphStyle_SKExtensions.h"
@interface PDFSelection (PDFSelectionPrivateDeclarations)
@@ -65,11 +66,10 @@
NSString *ellipse = [NSString stringWithFormat:@"%C", 0x2026];
NSRange foundRange;
NSDictionary *attributes;
- NSMutableParagraphStyle *paragraphStyle = nil;
// Extend selection.
[extendedSelection extendSelectionAtStart:10];
- [extendedSelection extendSelectionAtEnd:20];
+ [extendedSelection extendSelectionAtEnd:30];
// get the cleaned string
sample = [[extendedSelection string] stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines];
@@ -89,15 +89,11 @@
[attributes release];
}
- // Create paragraph style that indicates truncation style.
- paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
- [paragraphStyle setLineBreakMode:NSLineBreakByTruncatingTail];
- attributes = [[NSDictionary alloc] initWithObjectsAndKeys:paragraphStyle, NSParagraphStyleAttributeName, nil];
+ attributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSParagraphStyle defaultTruncatingTailParagraphStyle], NSParagraphStyleAttributeName, nil];
// Add paragraph style.
[attributedSample addAttributes:attributes range:NSMakeRange(0, [attributedSample length])];
// Clean.
[attributes release];
- [paragraphStyle release];
[extendedSelection release];
return [attributedSample autorelease];
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2007-05-05 18:27:25 UTC (rev 1980)
+++ trunk/SKNavigationWindow.m 2007-05-06 12:19:24 UTC (rev 1981)
@@ -40,6 +40,7 @@
#import <Quartz/Quartz.h>
#import "NSBezierPath_BDSKExtensions.h"
#import "SKMainWindowController.h"
+#import "NSParagraphStyle_SKExtensions.h"
#define BUTTON_WIDTH 50.0
#define SEP_WIDTH 21.0
@@ -267,8 +268,6 @@
- (NSAttributedString *)attributedStringValue {
if (stringValue == nil)
return nil;
- NSMutableParagraphStyle *parStyle = [[NSMutableParagraphStyle alloc] init];
- [parStyle setLineBreakMode:NSLineBreakByClipping];
NSShadow *shadow = [[NSShadow alloc] init];
[shadow setShadowColor:[NSColor blackColor]];
[shadow setShadowBlurRadius:3.0];
@@ -276,10 +275,9 @@
NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
[NSFont boldSystemFontOfSize:15.0], NSFontAttributeName,
[NSColor whiteColor], NSForegroundColorAttributeName,
- parStyle, NSParagraphStyleAttributeName,
+ [NSParagraphStyle defaultClippingParagraphStyle], NSParagraphStyleAttributeName,
shadow, NSShadowAttributeName, nil];
[shadow release];
- [parStyle release];
return [[[NSAttributedString alloc] initWithString:stringValue attributes:attrs] autorelease];
}
Modified: trunk/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2007-05-05 18:27:25 UTC (rev 1980)
+++ trunk/SKPDFHoverWindow.m 2007-05-06 12:19:24 UTC (rev 1981)
@@ -40,6 +40,7 @@
#import "PDFPage_SKExtensions.h"
#import "SKPDFAnnotationNote.h"
#import "NSBezierPath_BDSKExtensions.h"
+#import "NSParagraphStyle_SKExtensions.h"
#define WINDOW_WIDTH 400.0
#define WINDOW_HEIGHT 80.0
@@ -50,13 +51,6 @@
@implementation SKPDFHoverWindow
-static NSMutableParagraphStyle *SKPDFHoverWindowTextParagraphStyle = nil;
-
-+ (void)initialize {
- SKPDFHoverWindowTextParagraphStyle = [[NSMutableParagraphStyle alloc] init];
- [SKPDFHoverWindowTextParagraphStyle setLineBreakMode:NSLineBreakByClipping];
-}
-
+ (id)sharedHoverWindow {
static SKPDFHoverWindow *sharedHoverWindow = nil;
if (sharedHoverWindow == nil)
@@ -234,7 +228,7 @@
sourceRect = SKRectFittingRectInRect(sourceRect, pageImageRect);
- NSDictionary *attrs = [[NSDictionary alloc] initWithObjectsAndKeys:labelFont, NSFontAttributeName, color, NSForegroundColorAttributeName, SKPDFHoverWindowTextParagraphStyle, NSParagraphStyleAttributeName, nil];
+ NSDictionary *attrs = [[NSDictionary alloc] initWithObjectsAndKeys:labelFont, NSFontAttributeName, color, NSForegroundColorAttributeName, [NSParagraphStyle defaultClippingParagraphStyle], NSParagraphStyleAttributeName, nil];
NSAttributedString *labelString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:NSLocalizedString(@"Page %@", @"Tool tip label format"), [page label]] attributes:attrs];
NSRect labelRect = [labelString boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin];
@@ -281,7 +275,7 @@
}
if (string) {
- NSDictionary *attrs = [[NSDictionary alloc] initWithObjectsAndKeys:font, NSFontAttributeName, SKPDFHoverWindowTextParagraphStyle, NSParagraphStyleAttributeName, nil];
+ NSDictionary *attrs = [[NSDictionary alloc] initWithObjectsAndKeys:font, NSFontAttributeName, [NSParagraphStyle defaultClippingParagraphStyle], NSParagraphStyleAttributeName, nil];
text = [[NSAttributedString alloc] initWithString:string attributes:attrs];
[attrs release];
}
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-05-05 18:27:25 UTC (rev 1980)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-05-06 12:19:24 UTC (rev 1981)
@@ -136,6 +136,8 @@
CE54898F0B35D50E00F8AFB6 /* SKInfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE54898E0B35D50E00F8AFB6 /* SKInfoWindowController.m */; };
CE54AA8F0BBC037400008750 /* ReleaseNotes.rtf in Resources */ = {isa = PBXBuildFile; fileRef = CE54AA8D0BBC037400008750 /* ReleaseNotes.rtf */; };
CE67BB260BC44AC9007B6929 /* ZoomValues.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE67BB240BC44AC9007B6929 /* ZoomValues.strings */; };
+ CE6C03F00BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE6C03EE0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h */; };
+ CE6C03F10BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6C03EF0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m */; };
CE74686F0B7F3B1C00CBF969 /* ToolbarInfo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7467330B7F2ED700CBF969 /* ToolbarInfo.tiff */; };
CE7468810B7F3C0000CBF969 /* zoomInCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7467540B7F321100CBF969 /* zoomInCursor.tiff */; };
CE7468820B7F3C0000CBF969 /* zoomOutCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff */; };
@@ -225,6 +227,7 @@
dstSubfolderSpec = 10;
files = (
CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */,
+ CE6C03F00BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -421,6 +424,8 @@
CE67BB250BC44AC9007B6929 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/ZoomValues.strings; sourceTree = "<group>"; };
CE67BB290BC44AD5007B6929 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Dutch; path = Dutch.lproj/ZoomValues.strings; sourceTree = "<group>"; };
CE67BD380BC44E79007B6929 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Dutch; path = Dutch.lproj/ReleaseNotes.rtf; sourceTree = "<group>"; };
+ CE6C03EE0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSParagraphStyle_SKExtensions.h; sourceTree = "<group>"; };
+ CE6C03EF0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSParagraphStyle_SKExtensions.m; sourceTree = "<group>"; };
CE7467330B7F2ED700CBF969 /* ToolbarInfo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarInfo.tiff; path = Images/ToolbarInfo.tiff; sourceTree = "<group>"; };
CE7467540B7F321100CBF969 /* zoomInCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomInCursor.tiff; path = Images/zoomInCursor.tiff; sourceTree = "<group>"; };
CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = zoomOutCursor.tiff; path = Images/zoomOutCursor.tiff; sourceTree = "<group>"; };
@@ -643,6 +648,8 @@
CE2DE50C0B85DC4000D0DA12 /* PDFPage_SKExtensions.m */,
CE49726A0BDE8A7400D7F1D2 /* PDFSelection_SKExtensions.h */,
CE49726B0BDE8A7400D7F1D2 /* PDFSelection_SKExtensions.m */,
+ CE6C03EE0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h */,
+ CE6C03EF0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m */,
);
name = Categories;
sourceTree = "<group>";
@@ -1155,6 +1162,7 @@
CE4972510BDE898F00D7F1D2 /* SKMainWindow.m in Sources */,
CE49726D0BDE8A7400D7F1D2 /* PDFSelection_SKExtensions.m in Sources */,
CE49728B0BDE8B2900D7F1D2 /* SKToolbarItem.m in Sources */,
+ CE6C03F10BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-05 18:27:26
|
Revision: 1980
http://skim-app.svn.sourceforge.net/skim-app/?rev=1980&view=rev
Author: hofman
Date: 2007-05-05 11:27:25 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Delay rowheight change note when image is redrawn, otherwise it will be ignored.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-05-05 17:24:48 UTC (rev 1979)
+++ trunk/SKMainWindowController.m 2007-05-05 18:27:25 UTC (rev 1980)
@@ -672,7 +672,7 @@
newSize = [image size];
if (fabs(newSize.width - oldSize.width) > 1.0 || fabs(newSize.height - oldSize.height) > 1.0) {
- [thumbnailTableView noteHeightOfRowsWithIndexesChanged:[NSIndexSet indexSetWithIndex:theIndex]];
+ [thumbnailTableView performSelector:@selector(noteHeightOfRowsWithIndexesChanged:) withObject:[NSIndexSet indexSetWithIndex:theIndex] afterDelay:0.0];
}
}
return thumbnail;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-05 17:24:51
|
Revision: 1979
http://skim-app.svn.sourceforge.net/skim-app/?rev=1979&view=rev
Author: hofman
Date: 2007-05-05 10:24:48 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Fix translation
Modified Paths:
--------------
trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-05-05 17:11:09 UTC (rev 1978)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-05-05 17:24:48 UTC (rev 1979)
@@ -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>8P135</string>
</dict>
Modified: trunk/Dutch.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.
|
|
From: <ho...@us...> - 2007-05-05 17:11:24
|
Revision: 1978
http://skim-app.svn.sourceforge.net/skim-app/?rev=1978&view=rev
Author: hofman
Date: 2007-05-05 10:11:09 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Fix translation
Modified Paths:
--------------
trunk/Dutch.lproj/ReadNotesAccessoryView.nib/info.nib
trunk/Dutch.lproj/ReadNotesAccessoryView.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/ReadNotesAccessoryView.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/ReadNotesAccessoryView.nib/info.nib 2007-05-05 11:22:52 UTC (rev 1977)
+++ trunk/Dutch.lproj/ReadNotesAccessoryView.nib/info.nib 2007-05-05 17:11:09 UTC (rev 1978)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>5</key>
- <string>532 603 376 76 0 0 1440 938 </string>
+ <string>560 603 320 76 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
Modified: trunk/Dutch.lproj/ReadNotesAccessoryView.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-05-05 11:22:54
|
Revision: 1977
http://skim-app.svn.sourceforge.net/skim-app/?rev=1977&view=rev
Author: hofman
Date: 2007-05-05 04:22:52 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Fix Dutch localization.
Modified Paths:
--------------
trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-05-05 10:56:43 UTC (rev 1976)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-05-05 11:22:52 UTC (rev 1977)
@@ -8,10 +8,6 @@
<string>446.1</string>
<key>IBLockedObjects</key>
<array/>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
<string>8P135</string>
</dict>
Modified: trunk/Dutch.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.
|
|
From: <ho...@us...> - 2007-05-05 10:56:45
|
Revision: 1976
http://skim-app.svn.sourceforge.net/skim-app/?rev=1976&view=rev
Author: hofman
Date: 2007-05-05 03:56:43 -0700 (Sat, 05 May 2007)
Log Message:
-----------
Add a tool-tip
Modified Paths:
--------------
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.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.
