Revision: 4294
http://skim-app.svn.sourceforge.net/skim-app/?rev=4294&view=rev
Author: hofman
Date: 2008-07-24 17:20:34 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
#define some numbers
Modified Paths:
--------------
trunk/NSEvent_SKExtensions.h
trunk/NSNumber_SKExtensions.m
trunk/NSString_SKExtensions.m
trunk/PDFSelection_SKExtensions.m
trunk/SKAnimatedBorderlessWindow.m
trunk/SKFullScreenWindow.m
trunk/SKMainWindowController.m
trunk/SKPDFHoverWindow.m
trunk/SKPDFView.m
trunk/SKRemoteStateWindow.m
trunk/SKSideWindow.m
trunk/SKSnapshotWindowController.m
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/NSEvent_SKExtensions.h 2008-07-24 17:20:34 UTC (rev 4294)
@@ -38,6 +38,9 @@
#import <Cocoa/Cocoa.h>
+enum {
+ SKEscapeCharacter = 0x001b
+};
@interface NSEvent (SKExtensions)
- (NSUInteger)deviceIndependentModifierFlags;
Modified: trunk/NSNumber_SKExtensions.m
===================================================================
--- trunk/NSNumber_SKExtensions.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/NSNumber_SKExtensions.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -38,6 +38,7 @@
#import "NSNumber_SKExtensions.h"
+#define ALPHA_CHARACTER 0x03b1
@implementation NSNumber (SKExtensions)
@@ -98,7 +99,7 @@
while (number > 0) {
letter = number % 24;
number /= 24;
- [string insertString:[NSString stringWithFormat:@"%C", 0x03b1 + letter
- 1] atIndex:0];
+ [string insertString:[NSString stringWithFormat:@"%C", ALPHA_CHARACTER
+ letter - 1] atIndex:0];
}
return string;
}
Modified: trunk/NSString_SKExtensions.m
===================================================================
--- trunk/NSString_SKExtensions.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/NSString_SKExtensions.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -44,6 +44,7 @@
#import <SkimNotes/PDFAnnotation_SKNExtensions.h>
#import <Carbon/Carbon.h>
+#define ELLIPSIS_CHARACTER 0x2026
#pragma mark CFString extensions
@@ -142,7 +143,7 @@
- (NSString *)stringByAppendingEllipsis;
{
- return [self stringByAppendingFormat:@"%C", 0x2026];
+ return [self stringByAppendingFormat:@"%C", ELLIPSIS_CHARACTER];
}
- (NSString *)stringByReplacingPathExtension:(NSString *)ext;
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/PDFSelection_SKExtensions.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -42,6 +42,7 @@
#import "PDFPage_SKExtensions.h"
#import "SKStringConstants.h"
+#define ELLIPSIS_CHARACTER 0x2026
@interface PDFSelection (PDFSelectionPrivateDeclarations)
- (int)numberOfRangesOnPage:(PDFPage *)page;
@@ -63,7 +64,7 @@
NSString *searchString = [[self string]
stringByCollapsingWhitespaceAndNewlinesAndRemovingSurroundingWhitespaceAndNewlines];
NSString *sample;
NSMutableString *attributedString;
- NSString *ellipse = [NSString stringWithFormat:@"%C", 0x2026];
+ NSString *ellipse = [NSString stringWithFormat:@"%C",
ELLIPSIS_CHARACTER];
NSRange foundRange;
NSDictionary *attributes;
NSNumber *fontSizeNumber = [[NSUserDefaults standardUserDefaults]
objectForKey:SKTableFontSizeKey];
Modified: trunk/SKAnimatedBorderlessWindow.m
===================================================================
--- trunk/SKAnimatedBorderlessWindow.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKAnimatedBorderlessWindow.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -38,7 +38,12 @@
#import "SKAnimatedBorderlessWindow.h"
+#define ALPHA_VALUE 1.0
+#define FADE_IN_DURATION 0.3
+#define FADE_OUT_DURATION 1.0
+#define AUTO_HIDE_TIME_INTERVAL 0.0
+
@implementation SKAnimatedBorderlessWindow
- (id)initWithContentRect:(NSRect)contentRect screen:(NSScreen *)screen {
@@ -68,13 +73,13 @@
- (void)willClose {}
-- (float)defaultAlphaValue { return 1.0; }
+- (float)defaultAlphaValue { return ALPHA_VALUE; }
-- (NSTimeInterval)fadeInDuration { return 0.3; }
+- (NSTimeInterval)fadeInDuration { return FADE_IN_DURATION; }
-- (NSTimeInterval)fadeOutDuration { return 1.0; }
+- (NSTimeInterval)fadeOutDuration { return FADE_OUT_DURATION; }
-- (NSTimeInterval)autoHideTimeInterval { return 0.0; }
+- (NSTimeInterval)autoHideTimeInterval { return AUTO_HIDE_TIME_INTERVAL; }
- (void)stopAnimation {
[self cancelDelayedAnimations];
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKFullScreenWindow.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -76,7 +76,7 @@
if (modifierFlags == 0) {
SKMainWindowController *wc = (SKMainWindowController *)[self
windowController];
- if (ch == 0x1B) {
+ if (ch == SKEscapeCharacter) {
[wc exitFullScreen:self];
} else {
[super keyDown:theEvent];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKMainWindowController.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -95,6 +95,8 @@
#import "NSImage_SKExtensions.h"
#import "SKGroupedSearchResult.h"
+#define MULTIPLICATION_SIGN_CHARACTER 0x00d7
+
NSString *SKMainWindowPageLabelsKey = @"pageLabels";
NSString *SKMainWindowSearchResultsKey = @"searchResults";
NSString *SKMainWindowGroupedSearchResultsKey = @"groupedSearchResults";
@@ -661,7 +663,7 @@
if (NSEqualRects(selRect, NSZeroRect)) {
float magnification = [pdfView currentMagnification];
if (magnification > 0.0001)
- message = [NSString stringWithFormat:@"%.2f %C", magnification,
0xD7];
+ message = [NSString stringWithFormat:@"%.2f %C", magnification,
MULTIPLICATION_SIGN_CHARACTER];
else
message = @"";
} else {
@@ -669,9 +671,9 @@
BOOL useMetric = [[[NSLocale currentLocale]
objectForKey:NSLocaleUsesMetricSystem] boolValue];
NSString *units = useMetric ? @"cm" : @"in";
float factor = useMetric ? 0.035277778 : 0.013888889;
- message = [NSString stringWithFormat:@"%.2f %C %.2f @ (%.2f, %.2f)
%@", NSWidth(selRect) * factor, 0xD7, NSHeight(selRect) * factor,
NSMinX(selRect) * factor, NSMinY(selRect) * factor, units];
+ message = [NSString stringWithFormat:@"%.2f %C %.2f @ (%.2f, %.2f)
%@", NSWidth(selRect) * factor, MULTIPLICATION_SIGN_CHARACTER,
NSHeight(selRect) * factor, NSMinX(selRect) * factor, NSMinY(selRect) * factor,
units];
} else {
- message = [NSString stringWithFormat:@"%i %C %i @ (%i, %i) pt",
(int)NSWidth(selRect), 0xD7, (int)NSHeight(selRect), (int)NSMinX(selRect),
(int)NSMinY(selRect)];
+ message = [NSString stringWithFormat:@"%i %C %i @ (%i, %i) pt",
(int)NSWidth(selRect), MULTIPLICATION_SIGN_CHARACTER, (int)NSHeight(selRect),
(int)NSMinX(selRect), (int)NSMinY(selRect)];
}
}
[statusBar setRightStringValue:message];
Modified: trunk/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKPDFHoverWindow.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -45,11 +45,16 @@
#import "NSGeometry_SKExtensions.h"
#import "NSAffineTransform_SKExtensions.h"
-#define WINDOW_OFFSET 20.0
-#define TEXT_MARGIN_X 2.0
-#define TEXT_MARGIN_Y 2.0
-#define ALPHA_VALUE 0.95
+#define WINDOW_OFFSET 20.0
+#define TEXT_MARGIN_X 2.0
+#define TEXT_MARGIN_Y 2.0
+#define ALPHA_VALUE 0.95
+#define CRITICAL_ALPHA_VALUE 0.9
+#define AUTO_HIDE_TIME_INTERVAL 7.0
+#define DEFAULT_SHOW_DELAY 1.0
+#define ALT_SHOW_DELAY 0.1
+
NSString *SKToolTipWidthKey = @"SKToolTipWidth";
NSString *SKToolTipHeightKey = @"SKToolTipHeight";
@@ -163,9 +168,9 @@
[self orderOut:self];
}
-- (float)defaultAlphaValue { return 0.95; }
+- (float)defaultAlphaValue { return ALPHA_VALUE; }
-- (NSTimeInterval)autoHideTimeInterval { return 7.0; }
+- (NSTimeInterval)autoHideTimeInterval { return AUTO_HIDE_TIME_INTERVAL; }
- (void)willClose {
[annotation release];
@@ -338,7 +343,7 @@
[[imageView enclosingScrollView] setBackgroundColor:color];
[self stopAnimation];
- if ([self isVisible] && [self alphaValue] > 0.9)
+ if ([self isVisible] && [self alphaValue] > CRITICAL_ALPHA_VALUE)
[self orderFront:self];
else
[self fadeIn];
@@ -364,7 +369,7 @@
[annotation release];
annotation = [note retain];
- [self performSelector:@selector(showDelayed) withObject:nil
afterDelay:[self isVisible] ? 0.1 : 1.0];
+ [self performSelector:@selector(showDelayed) withObject:nil
afterDelay:[self isVisible] ? ALT_SHOW_DELAY : DEFAULT_SHOW_DELAY];
}
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKPDFView.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -1023,7 +1023,7 @@
(eventChar == NSTabCharacter) && (modifiers ==
NSAlternateKeyMask)) {
[self selectNextActiveAnnotation:self];
} else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) &&
- (eventChar == 0x1B) && (modifiers == NSAlternateKeyMask)) {
+ (eventChar == SKEscapeCharacter) && (modifiers ==
NSAlternateKeyMask)) {
[self setActiveAnnotation:nil];
// backtab is a bit inconsistent, it seems Shift+Tab gives a
Shift-BackTab key event, I would have expected either Shift-Tab (as for the raw
event) or BackTab (as for most shift-modified keys)
} else if (([self toolMode] == SKTextToolMode || [self toolMode] ==
SKNoteToolMode) &&
Modified: trunk/SKRemoteStateWindow.m
===================================================================
--- trunk/SKRemoteStateWindow.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKRemoteStateWindow.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -41,6 +41,8 @@
#import "NSBezierPath_BDSKExtensions.h"
#import "SKStringConstants.h"
+#define ALPHA_VALUE 0.95
+#define WINDOW_SIZE 60.0
@interface SKRemoteStateView : NSView {
int remoteState;
@@ -64,7 +66,7 @@
- (id)init {
if (sharedRemoteStateWindow == nil) {
- NSRect contentRect = SKRectFromCenterAndSize(NSZeroPoint,
SKMakeSquareSize(60.0));
+ NSRect contentRect = SKRectFromCenterAndSize(NSZeroPoint,
SKMakeSquareSize(WINDOW_SIZE));
if (self = [super initWithContentRect:contentRect]) {
sharedRemoteStateWindow = self;
[self setIgnoresMouseEvents:YES];
@@ -84,7 +86,7 @@
- (unsigned)retainCount { return UINT_MAX; }
-- (float)defaultAlphaValue { return 0.95; }
+- (float)defaultAlphaValue { return ALPHA_VALUE; }
- (NSTimeInterval)autoHideTimeInterval {
return [[NSUserDefaults standardUserDefaults]
floatForKey:SKAppleRemoteSwitchIndicationTimeoutKey];
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKSideWindow.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -175,7 +175,7 @@
unichar ch = [theEvent firstCharacter];
unsigned modifierFlags = [theEvent deviceIndependentModifierFlags];
- if (ch == 0x1B && modifierFlags == 0) {
+ if (ch == SKEscapeCharacter && modifierFlags == 0) {
if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
[controller closeSideWindow:self];
else
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2008-07-24 16:46:50 UTC (rev 4293)
+++ trunk/SKSnapshotWindowController.m 2008-07-24 17:20:34 UTC (rev 4294)
@@ -52,6 +52,8 @@
#import "SKSnapshotPageCell.h"
#import "NSObject_SKExtensions.h"
+#define EM_DASH_CHARACTER 0x2014
+
NSString *SKSnapshotCurrentSetupKey = @"currentSetup";
static NSString *SKSnapshotPageKey = @"page";
@@ -105,7 +107,7 @@
}
- (NSString *)windowTitleForDocumentDisplayName:(NSString *)displayName {
- return [NSString stringWithFormat:NSLocalizedString(@"%@ %C Page %@",
@"Window title format: [filename] - Page [number]"), displayName, 0x2014,
[[pdfView currentPage] displayLabel]];
+ return [NSString stringWithFormat:NSLocalizedString(@"%@ %C Page %@",
@"Window title format: [filename] - Page [number]"), displayName,
EM_DASH_CHARACTER, [[pdfView currentPage] displayLabel]];
}
- (void)setNeedsDisplayInRect:(NSRect)rect ofPage:(PDFPage *)page {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
