Revision: 7520
http://skim-app.svn.sourceforge.net/skim-app/?rev=7520&view=rev
Author: hofman
Date: 2011-10-20 09:36:32 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
move some methods to a separate file
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.h
trunk/NSGeometry_SKExtensions.m
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKConversionProgressController.m
trunk/SKDisplayPreferences.m
trunk/SKDownloadPreferenceController.m
trunk/SKFindController.m
trunk/SKGeneralPreferences.m
trunk/SKLineInspector.m
trunk/SKNoteTypeSheetController.m
trunk/SKNoteWindowController.m
trunk/SKNotesPreferences.m
trunk/SKPDFView.m
trunk/SKPreferenceController.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKSyncPreferences.m
trunk/SKTextFieldSheetController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/NSGraphics_SKExtensions.h
trunk/NSGraphics_SKExtensions.m
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/NSGeometry_SKExtensions.h 2011-10-20 09:36:32 UTC (rev 7520)
@@ -180,14 +180,3 @@
nsPoint.y = (CGFloat)qdPoint.v;
return nsPoint;
}
-
-#pragma mark -
-
-extern void SKDrawGrabHandle(NSPoint point, CGFloat radius, BOOL active);
-extern void SKDrawGrabHandles(NSRect rect, CGFloat radius, NSInteger mask);
-
-#pragma mark -
-
-extern void SKShiftAndResizeViews(NSArray *views, CGFloat dx, CGFloat dw);
-extern void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign);
-extern CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls,
BOOL resizeControls);
Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/NSGeometry_SKExtensions.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -109,91 +109,3 @@
return extProduct * extProduct < lineDelta * lineDelta * ( relPoint.x *
relPoint.x + relPoint.y * relPoint.y );
}
-
-#pragma mark -
-
-void SKDrawGrabHandle(NSPoint point, CGFloat radius, BOOL active)
-{
- NSBezierPath *path = [NSBezierPath
bezierPathWithOvalInRect:NSMakeRect(point.x - 0.875 * radius, point.y - 0.875 *
radius, 1.75 * radius, 1.75 * radius)];
- [path setLineWidth:0.25 * radius];
- [[NSColor colorWithCalibratedRed:0.737118 green:0.837339 blue:0.983108
alpha:active ? 1.0 : 0.8] setFill];
- [[NSColor colorWithCalibratedRed:0.278477 green:0.467857 blue:0.810941
alpha:active ? 1.0 : 0.8] setStroke];
- [path fill];
- [path stroke];
-}
-
-void SKDrawGrabHandles(NSRect rect, CGFloat radius, NSInteger mask)
-{
- SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, mask ==
SKMinXEdgeMask);
- SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, mask ==
SKMaxXEdgeMask);
- SKDrawGrabHandle(NSMakePoint(NSMidX(rect), NSMaxY(rect)), radius, mask ==
SKMaxYEdgeMask);
- SKDrawGrabHandle(NSMakePoint(NSMidX(rect), NSMinY(rect)), radius, mask ==
SKMinYEdgeMask);
- SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMaxY(rect)), radius, mask ==
(SKMinXEdgeMask | SKMaxYEdgeMask));
- SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMinY(rect)), radius, mask ==
(SKMinXEdgeMask | SKMinYEdgeMask));
- SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMaxY(rect)), radius, mask ==
(SKMaxXEdgeMask | SKMaxYEdgeMask));
- SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMinY(rect)), radius, mask ==
(SKMaxXEdgeMask | SKMinYEdgeMask));
-}
-
-#pragma mark -
-
-#define MIN_BUTTON_WIDTH 82.0
-#define MAX_BUTTON_WIDTH 100.0
-#define EXTRA_BUTTON_WIDTH 12.0
-
-void SKShiftAndResizeViews(NSArray *views, CGFloat dx, CGFloat dw) {
- for (NSView *view in views) {
- NSRect frame = [view frame];
- frame.origin.x += dx;
- frame.size.width += dw;
- [view setFrame:frame];
- }
-}
-
-void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign) {
- if ([buttons count] == 0)
- return;
- NSButton *button = [buttons objectAtIndex:0];
- CGFloat x = rightAlign ? NSMaxX([button frame]) : NSMinX([button frame]);
- CGFloat width = 0.0;
- for (button in buttons) {
- [button sizeToFit];
- width = fmax(width, NSWidth([button frame]) + EXTRA_BUTTON_WIDTH);
- }
- width = fmin(MAX_BUTTON_WIDTH, fmax(MIN_BUTTON_WIDTH, width));
- for (button in buttons) {
- NSRect frame = [button frame];
- frame.size.width = fmax(width, NSWidth(frame) + EXTRA_BUTTON_WIDTH);
- if (rightAlign) {
- x -= NSWidth(frame);
- frame.origin.x = x;
- } else {
- frame.origin.x = x;
- x += NSWidth(frame);
- }
- [button setFrame:frame];
- }
-}
-
-CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls, BOOL
resizeControls) {
- if ([labelFields count] == 0)
- return 0.0;
- NSControl *control;
- NSRect frame;
- CGFloat left = CGFLOAT_MAX, width = 0.0, right, dw = -NSMaxX([[labelFields
lastObject] frame]);
- for (control in labelFields) {
- [control sizeToFit];
- frame = [control frame];
- left = fmin(left, NSMinX(frame));
- width = fmax(width, NSWidth(frame));
- }
- right = left + width;
- for (control in labelFields) {
- frame = [control frame];
- frame.origin.x = right - NSWidth(frame);
- [control setFrame:frame];
- }
- dw += right;
- SKShiftAndResizeViews(controls, dw, resizeControls ? -dw : 0.0);
- return dw;
-}
-
Added: trunk/NSGraphics_SKExtensions.h
===================================================================
--- trunk/NSGraphics_SKExtensions.h (rev 0)
+++ trunk/NSGraphics_SKExtensions.h 2011-10-20 09:36:32 UTC (rev 7520)
@@ -0,0 +1,49 @@
+//
+// NSGraphics_SKExtensions.h
+// Skim
+//
+// Created by Christiaan Hofman on 10/20/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+
+extern void SKDrawGrabHandle(NSPoint point, CGFloat radius, BOOL active);
+extern void SKDrawGrabHandles(NSRect rect, CGFloat radius, NSInteger mask);
+
+#pragma mark -
+
+extern void SKShiftAndResizeViews(NSArray *views, CGFloat dx, CGFloat dw);
+extern void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign);
+extern CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls,
BOOL resizeControls);
Added: trunk/NSGraphics_SKExtensions.m
===================================================================
--- trunk/NSGraphics_SKExtensions.m (rev 0)
+++ trunk/NSGraphics_SKExtensions.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -0,0 +1,127 @@
+//
+// NSGraphics_SKExtensions.m
+// Skim
+//
+// Created by Christiaan Hofman on 10/20/11.
+/*
+ This software is Copyright (c) 2011
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "NSGraphics_SKExtensions.h"
+#import "NSGeometry_SKExtensions.h"
+
+
+void SKDrawGrabHandle(NSPoint point, CGFloat radius, BOOL active)
+{
+ NSBezierPath *path = [NSBezierPath
bezierPathWithOvalInRect:NSMakeRect(point.x - 0.875 * radius, point.y - 0.875 *
radius, 1.75 * radius, 1.75 * radius)];
+ [path setLineWidth:0.25 * radius];
+ [[NSColor colorWithCalibratedRed:0.737118 green:0.837339 blue:0.983108
alpha:active ? 1.0 : 0.8] setFill];
+ [[NSColor colorWithCalibratedRed:0.278477 green:0.467857 blue:0.810941
alpha:active ? 1.0 : 0.8] setStroke];
+ [path fill];
+ [path stroke];
+}
+
+void SKDrawGrabHandles(NSRect rect, CGFloat radius, NSInteger mask)
+{
+ SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMidY(rect)), radius, mask ==
SKMinXEdgeMask);
+ SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMidY(rect)), radius, mask ==
SKMaxXEdgeMask);
+ SKDrawGrabHandle(NSMakePoint(NSMidX(rect), NSMaxY(rect)), radius, mask ==
SKMaxYEdgeMask);
+ SKDrawGrabHandle(NSMakePoint(NSMidX(rect), NSMinY(rect)), radius, mask ==
SKMinYEdgeMask);
+ SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMaxY(rect)), radius, mask ==
(SKMinXEdgeMask | SKMaxYEdgeMask));
+ SKDrawGrabHandle(NSMakePoint(NSMinX(rect), NSMinY(rect)), radius, mask ==
(SKMinXEdgeMask | SKMinYEdgeMask));
+ SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMaxY(rect)), radius, mask ==
(SKMaxXEdgeMask | SKMaxYEdgeMask));
+ SKDrawGrabHandle(NSMakePoint(NSMaxX(rect), NSMinY(rect)), radius, mask ==
(SKMaxXEdgeMask | SKMinYEdgeMask));
+}
+
+#pragma mark -
+
+#define MIN_BUTTON_WIDTH 82.0
+#define MAX_BUTTON_WIDTH 100.0
+#define EXTRA_BUTTON_WIDTH 12.0
+
+void SKShiftAndResizeViews(NSArray *views, CGFloat dx, CGFloat dw) {
+ for (NSView *view in views) {
+ NSRect frame = [view frame];
+ frame.origin.x += dx;
+ frame.size.width += dw;
+ [view setFrame:frame];
+ }
+}
+
+void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign) {
+ if ([buttons count] == 0)
+ return;
+ NSButton *button = [buttons objectAtIndex:0];
+ CGFloat x = rightAlign ? NSMaxX([button frame]) : NSMinX([button frame]);
+ CGFloat width = 0.0;
+ for (button in buttons) {
+ [button sizeToFit];
+ width = fmax(width, NSWidth([button frame]) + EXTRA_BUTTON_WIDTH);
+ }
+ width = fmin(MAX_BUTTON_WIDTH, fmax(MIN_BUTTON_WIDTH, width));
+ for (button in buttons) {
+ NSRect frame = [button frame];
+ frame.size.width = fmax(width, NSWidth(frame) + EXTRA_BUTTON_WIDTH);
+ if (rightAlign) {
+ x -= NSWidth(frame);
+ frame.origin.x = x;
+ } else {
+ frame.origin.x = x;
+ x += NSWidth(frame);
+ }
+ [button setFrame:frame];
+ }
+}
+
+CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls, BOOL
resizeControls) {
+ if ([labelFields count] == 0)
+ return 0.0;
+ NSControl *control;
+ NSRect frame;
+ CGFloat left = CGFLOAT_MAX, width = 0.0, right, dw = -NSMaxX([[labelFields
lastObject] frame]);
+ for (control in labelFields) {
+ [control sizeToFit];
+ frame = [control frame];
+ left = fmin(left, NSMinX(frame));
+ width = fmax(width, NSWidth(frame));
+ }
+ right = left + width;
+ for (control in labelFields) {
+ frame = [control frame];
+ frame.origin.x = right - NSWidth(frame);
+ [control setFrame:frame];
+ }
+ dw += right;
+ SKShiftAndResizeViews(controls, dw, resizeControls ? -dw : 0.0);
+ return dw;
+}
+
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2011-10-20 09:21:06 UTC (rev
7519)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2011-10-20 09:36:32 UTC (rev
7520)
@@ -44,6 +44,7 @@
#import "SKFDFParser.h"
#import "NSUserDefaults_SKExtensions.h"
#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSData_SKExtensions.h"
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/PDFAnnotation_SKExtensions.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -52,6 +52,7 @@
#import "PDFSelection_SKExtensions.h"
#import "SKPDFView.h"
#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSData_SKExtensions.h"
#import "NSString_SKExtensions.h"
#import "NSBezierPath_SKExtensions.h"
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2011-10-20 09:21:06 UTC (rev
7519)
+++ trunk/SKConversionProgressController.m 2011-10-20 09:36:32 UTC (rev
7520)
@@ -44,7 +44,7 @@
#import "NSInvocation_SKExtensions.h"
#import "SKDocumentController.h"
#import <libkern/OSAtomic.h>
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSDocument_SKExtensions.h"
#import "NSError_SKExtensions.h"
Modified: trunk/SKDisplayPreferences.m
===================================================================
--- trunk/SKDisplayPreferences.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKDisplayPreferences.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -39,7 +39,7 @@
#import "SKDisplayPreferences.h"
#import "SKPreferenceController.h"
#import "SKStringConstants.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
static CGFloat SKDefaultFontSizes[] = {8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0,
16.0, 18.0, 20.0, 24.0, 28.0, 32.0, 48.0, 64.0};
Modified: trunk/SKDownloadPreferenceController.m
===================================================================
--- trunk/SKDownloadPreferenceController.m 2011-10-20 09:21:06 UTC (rev
7519)
+++ trunk/SKDownloadPreferenceController.m 2011-10-20 09:36:32 UTC (rev
7520)
@@ -37,7 +37,7 @@
*/
#import "SKDownloadPreferenceController.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import "SKStringConstants.h"
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKFindController.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -41,6 +41,7 @@
#import "SKStringConstants.h"
#import "SKGradientView.h"
#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSSegmentedControl_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
Modified: trunk/SKGeneralPreferences.m
===================================================================
--- trunk/SKGeneralPreferences.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKGeneralPreferences.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -41,7 +41,7 @@
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
#import <Sparkle/Sparkle.h>
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#define UPDATEINTERVAL_KEY @"updateInterval"
#define AUTOMATICALLYCHECKSFORUPDATES_KEY @"automaticallyChecksForUpdates"
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKLineInspector.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -41,7 +41,7 @@
#import <SkimNotes/SkimNotes.h>
#import "NSSegmentedControl_SKExtensions.h"
#import "SKNumberArrayFormatter.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
NSString *SKLineInspectorLineAttributeDidChangeNotification =
@"SKLineInspectorLineAttributeDidChangeNotification";
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKNoteTypeSheetController.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -38,7 +38,7 @@
#import "SKNoteTypeSheetController.h"
#import "NSWindowController_SKExtensions.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "NSString_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import <SKimNotes/SkimNotes.h>
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKNoteWindowController.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -52,6 +52,7 @@
#import "NSString_SKExtensions.h"
#import "SKGradientView.h"
#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#import "SKNoteTextView.h"
#define EM_DASH_CHARACTER 0x2014
Modified: trunk/SKNotesPreferences.m
===================================================================
--- trunk/SKNotesPreferences.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKNotesPreferences.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -41,7 +41,7 @@
#import "SKStringConstants.h"
#import "SKLineWell.h"
#import "SKFontWell.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#define VALUES_KEY_PATH(key) [@"values." stringByAppendingString:key]
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKPDFView.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -70,6 +70,7 @@
#import "PDFView_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#define ANNOTATION_MODE_COUNT 9
#define TOOL_MODE_COUNT 5
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKPreferenceController.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -46,7 +46,7 @@
#import "SKFontWell.h"
#import "SKStringConstants.h"
#import "NSView_SKExtensions.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#define SKPreferencesToolbarIdentifier @"SKPreferencesToolbarIdentifier"
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2011-10-20 09:21:06 UTC
(rev 7519)
+++ trunk/SKPresentationOptionsSheetController.m 2011-10-20 09:36:32 UTC
(rev 7520)
@@ -49,7 +49,7 @@
#import "SKImageToolTipWindow.h"
#import "NSWindowController_SKExtensions.h"
#import "NSDocument_SKExtensions.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
#define RIGHTARROW_CHARACTER 0x2192
Modified: trunk/SKSyncPreferences.m
===================================================================
--- trunk/SKSyncPreferences.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKSyncPreferences.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -39,7 +39,7 @@
#import "SKSyncPreferences.h"
#import "SKPreferenceController.h"
#import "SKStringConstants.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
static SKTeXEditor SKTeXEditors[] = {{@"TextMate", @"mate", @"-l
%line \"%file\""},
{@"BBEdit", @"bbedit",
@"+%line \"%file\""},
Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m 2011-10-20 09:21:06 UTC (rev 7519)
+++ trunk/SKTextFieldSheetController.m 2011-10-20 09:36:32 UTC (rev 7520)
@@ -41,7 +41,7 @@
#import "SKBookmark.h"
#import "NSWindowController_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
-#import "NSGeometry_SKExtensions.h"
+#import "NSGraphics_SKExtensions.h"
@implementation SKTextFieldSheetController
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2011-10-20 09:21:06 UTC (rev
7519)
+++ trunk/Skim.xcodeproj/project.pbxproj 2011-10-20 09:36:32 UTC (rev
7520)
@@ -77,6 +77,7 @@
CE121BFB11529D15001D92ED /* SKIBArray.m in Sources */ = {isa =
PBXBuildFile; fileRef = CE121BFA11529D15001D92ED /* SKIBArray.m */; };
CE1248C513FEDCF200FFAE20 /* SKTemplateManager.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE1248C413FEDCF200FFAE20 /* SKTemplateManager.m
*/; };
CE12A73E134F215F003AED67 /* SKSelectCommand.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE12A73D134F215F003AED67 /* SKSelectCommand.m
*/; };
+ CE139A171450207500E9C069 /* NSGraphics_SKExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE139A161450207500E9C069 /*
NSGraphics_SKExtensions.m */; };
CE171E3512C3AC1600291179 /* SKFileUpdateChecker.m in Sources */
= {isa = PBXBuildFile; fileRef = CE171E3412C3AC1600291179 /*
SKFileUpdateChecker.m */; };
CE17F47E0F1A17E200E741DD /* SKPDFSynchronizerServer.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE17F47D0F1A17E200E741DD /*
SKPDFSynchronizerServer.m */; };
CE19446310627483007E8770 /* BookmarksWindow.xib in Resources */
= {isa = PBXBuildFile; fileRef = CE19445C10627483007E8770 /*
BookmarksWindow.xib */; };
@@ -595,6 +596,8 @@
CE1248C413FEDCF200FFAE20 /* SKTemplateManager.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKTemplateManager.m; sourceTree = "<group>"; };
CE12A73C134F215F003AED67 /* SKSelectCommand.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKSelectCommand.h; sourceTree = "<group>"; };
CE12A73D134F215F003AED67 /* SKSelectCommand.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKSelectCommand.m; sourceTree = "<group>"; };
+ CE139A151450207500E9C069 /* NSGraphics_SKExtensions.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= NSGraphics_SKExtensions.h; sourceTree = "<group>"; };
+ CE139A161450207500E9C069 /* NSGraphics_SKExtensions.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = NSGraphics_SKExtensions.m; sourceTree = "<group>"; };
CE157ED212D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings;
name = Japanese; path = Japanese.lproj/BookmarkSheet.strings; sourceTree =
"<group>"; };
CE157ED312D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings;
name = Japanese; path = Japanese.lproj/BookmarksWindow.strings; sourceTree =
"<group>"; };
CE157ED512D4EBC000515B85 /* Japanese */ = {isa =
PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings;
name = Japanese; path = Japanese.lproj/DisplayPreferences.strings; sourceTree =
"<group>"; };
@@ -1904,6 +1907,8 @@
CE34FFA70DFF58FB00A7FFE6 /*
NSEvent_SKExtensions.m */,
CE24875A112C9651006B4FA5 /*
NSFont_SKExtensions.h */,
CE24875B112C9651006B4FA5 /*
NSFont_SKExtensions.m */,
+ CE139A151450207500E9C069 /*
NSGraphics_SKExtensions.h */,
+ CE139A161450207500E9C069 /*
NSGraphics_SKExtensions.m */,
CECDC4FC0C5966A80026AAEC /*
NSImage_SKExtensions.h */,
CECDC4FD0C5966A80026AAEC /*
NSImage_SKExtensions.m */,
CE3400AA0E0034DF00A7FFE6 /*
NSMenu_SKExtensions.h */,
@@ -2546,6 +2551,7 @@
CE030C6113C07A57007A47E9 /*
PDFView_SKExtensions.m in Sources */,
CEB402C313EDAD6100851D1B /* SKTemporaryData.m
in Sources */,
CE1248C513FEDCF200FFAE20 /* SKTemplateManager.m
in Sources */,
+ CE139A171450207500E9C069 /*
NSGraphics_SKExtensions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
