Revision: 5271
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5271&view=rev
Author:   hofman
Date:     2009-03-25 16:00:36 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
#define local strings rather than using a static NSString*

Modified Paths:
--------------
    trunk/PDFPage_SKExtensions.m
    trunk/SKApplicationController.m
    trunk/SKBookmark.m
    trunk/SKBookmarkController.m
    trunk/SKColorSwatch.m
    trunk/SKConversionProgressController.m
    trunk/SKDocumentController.m
    trunk/SKDownloadController.m
    trunk/SKFindController.m
    trunk/SKFontWell.h
    trunk/SKFontWell.m
    trunk/SKInfoWindowController.m
    trunk/SKLineInspector.m
    trunk/SKLineWell.m
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_Toolbar.m
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteWindowController.m
    trunk/SKNotesDocument.m
    trunk/SKNotesPanelController.m
    trunk/SKPDFDocument.m
    trunk/SKPDFSynchronizerServer.m
    trunk/SKPDFView.m
    trunk/SKPreferenceController.m
    trunk/SKSnapshotWindowController.m
    trunk/SKThumbnailTableView.m
    trunk/SKTypeSelectHelper.m

Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m        2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/PDFPage_SKExtensions.m        2009-03-25 16:00:36 UTC (rev 5271)
@@ -60,8 +60,8 @@
 NSString *SKPDFPageActionCrop = @"crop";
 NSString *SKPDFPageActionRotate = @"rotate";
 
-static NSString *SKAutoCropBoxMarginWidthKey = @"SKAutoCropBoxMarginWidth";
-static NSString *SKAutoCropBoxMarginHeightKey = @"SKAutoCropBoxMarginHeight";
+#define SKAutoCropBoxMarginWidthKey @"SKAutoCropBoxMarginWidth"
+#define SKAutoCropBoxMarginHeightKey @"SKAutoCropBoxMarginHeight"
 
 @implementation PDFPage (SKExtensions) 
 

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKApplicationController.m     2009-03-25 16:00:36 UTC (rev 5271)
@@ -84,11 +84,11 @@
 #define VIEW_MENU_INDEX 4
 #define BOOKMARKS_MENU_INDEX 8
 
-static NSString *SKCurrentDocumentSetupKey = @"currentDocumentSetup";
+#define SKCurrentDocumentSetupKey @"currentDocumentSetup"
 
-static NSString *SKSpotlightVersionInfoKey = @"SKSpotlightVersionInfo";
-static NSString *SKSpotlightLastImporterVersionKey = @"lastImporterVersion";
-static NSString *SKSpotlightLastSysVersionKey = @"lastSysVersion";
+#define SKSpotlightVersionInfoKey @"SKSpotlightVersionInfo"
+#define SKSpotlightLastImporterVersionKey @"lastImporterVersion"
+#define SKSpotlightLastSysVersionKey @"lastSysVersion"
 
 
 @implementation SKApplicationController

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKBookmark.m  2009-03-25 16:00:36 UTC (rev 5271)
@@ -41,18 +41,18 @@
 #import "NSImage_SKExtensions.h"
 #import "SKRuntime.h"
 
-static NSString *SKBookmarkTypeBookmarkString = @"bookmark";
-static NSString *SKBookmarkTypeSessionString = @"session";
-static NSString *SKBookmarkTypeFolderString = @"folder";
-static NSString *SKBookmarkTypeSeparatorString = @"separator";
+#define SKBookmarkTypeBookmarkString @"bookmark"
+#define SKBookmarkTypeSessionString @"session"
+#define SKBookmarkTypeFolderString @"folder"
+#define SKBookmarkTypeSeparatorString @"separator"
 
-static NSString *SKBookmarkPropertiesKey = @"properties";
+#define SKBookmarkPropertiesKey @"properties"
 
-static NSString *SKBookmarkChildrenKey = @"children";
-static NSString *SKBookmarkLabelKey = @"label";
-static NSString *SKBookmarkPageIndexKey = @"pageIndex";
-static NSString *SKBookmarkAliasDataKey = @"_BDAlias";
-static NSString *SKBookmarkTypeKey = @"type";
+#define SKBookmarkChildrenKey @"children"
+#define SKBookmarkLabelKey @"label"
+#define SKBookmarkPageIndexKey @"pageIndex"
+#define SKBookmarkAliasDataKey @"_BDAlias"
+#define SKBookmarkTypeKey @"type"
 
 @interface SKPlaceholderBookmark : SKBookmark
 @end

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKBookmarkController.m        2009-03-25 16:00:36 UTC (rev 5271)
@@ -53,31 +53,31 @@
 #import "SKRuntime.h"
 #import "SKDocumentController.h"
 
-static NSString *SKBookmarkRowsPboardType = @"SKBookmarkRowsPboardType";
+#define SKBookmarkRowsPboardType @"SKBookmarkRowsPboardType"
 
-static NSString *SKBookmarksToolbarIdentifier = 
@"SKBookmarksToolbarIdentifier";
-static NSString *SKBookmarksNewFolderToolbarItemIdentifier = 
@"SKBookmarksNewFolderToolbarItemIdentifier";
-static NSString *SKBookmarksNewSeparatorToolbarItemIdentifier = 
@"SKBookmarksNewSeparatorToolbarItemIdentifier";
-static NSString *SKBookmarksDeleteToolbarItemIdentifier = 
@"SKBookmarksDeleteToolbarItemIdentifier";
+#define SKBookmarksToolbarIdentifier @"SKBookmarksToolbarIdentifier"
+#define SKBookmarksNewFolderToolbarItemIdentifier 
@"SKBookmarksNewFolderToolbarItemIdentifier"
+#define SKBookmarksNewSeparatorToolbarItemIdentifier 
@"SKBookmarksNewSeparatorToolbarItemIdentifier"
+#define SKBookmarksDeleteToolbarItemIdentifier 
@"SKBookmarksDeleteToolbarItemIdentifier"
 
-static NSString *SKBookmarksWindowFrameAutosaveName = @"SKBookmarksWindow";
+#define SKBookmarksWindowFrameAutosaveName @"SKBookmarksWindow"
 
-static NSString *SKBookmarksWindowLabelColumnIdentifer = @"label";
-static NSString *SKBookmarksWindowFileColumnIdentifer = @"file";
-static NSString *SKBookmarksWindowPageColumnIdentifer = @"page";
+#define SKBookmarksWindowLabelColumnIdentifer @"label"
+#define SKBookmarksWindowFileColumnIdentifer @"file"
+#define SKBookmarksWindowPageColumnIdentifer @"page"
 
-static NSString *SKMaximumDocumentPageHistoryCountKey = 
@"SKMaximumDocumentPageHistoryCount";
+#define SKMaximumDocumentPageHistoryCountKey 
@"SKMaximumDocumentPageHistoryCount"
 
-static NSString *SKBookmarkControllerBookmarksKey = @"bookmarks";
-static NSString *SKBookmarkControllerRecentDocumentsKey = @"recentDocuments";
+#define SKBookmarkControllerBookmarksKey @"bookmarks"
+#define SKBookmarkControllerRecentDocumentsKey @"recentDocuments"
 
-static NSString *SKRecentDocumentPageIndexKey = @"pageIndex";
-static NSString *SKRecentDocumentAliasKey = @"alias";
-static NSString *SKRecentDocumentAliasDataKey = @"_BDAlias";
-static NSString *SKRecentDocumentSnapshotsKey = @"snapshots";
+#define SKRecentDocumentPageIndexKey @"pageIndex"
+#define SKRecentDocumentAliasKey @"alias"
+#define SKRecentDocumentAliasDataKey @"_BDAlias"
+#define SKRecentDocumentSnapshotsKey @"snapshots"
 
-static NSString *SKBookmarkChildrenKey = @"children";
-static NSString *SKBookmarkLabelKey = @"label";
+#define SKBookmarkChildrenKey @"children"
+#define SKBookmarkLabelKey @"label"
 
 static char SKBookmarkPropertiesObservationContext;
 

Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m       2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKColorSwatch.m       2009-03-25 16:00:36 UTC (rev 5271)
@@ -44,11 +44,11 @@
 
 NSString *SKColorSwatchColorsChangedNotification = 
@"SKColorSwatchColorsChangedNotification";
 
-NSString *SKColorSwatchColorsKey = @"colors";
+#define SKColorSwatchColorsKey @"colors"
 
-static NSString *SKColorSwatchTargetKey = @"target";
-static NSString *SKColorSwatchActionKey = @"action";
-static NSString *SKColorSwatchAutoresizesKey = @"autoResizes";
+#define SKColorSwatchTargetKey @"target"
+#define SKColorSwatchActionKey @"action"
+#define SKColorSwatchAutoresizesKey @"autoResizes"
 
 
 @interface SKAccessibilityColorSwatchElement : 
SKAccessibilityIndexedFauxUIElement

Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m      2009-03-24 17:51:09 UTC (rev 
5270)
+++ trunk/SKConversionProgressController.m      2009-03-25 16:00:36 UTC (rev 
5271)
@@ -43,13 +43,13 @@
 #import "NSInvocation_SKExtensions.h"
 #import <libkern/OSAtomic.h>
 
-static NSString *SKConversionProgressProviderKey = @"provider";
-static NSString *SKConversionProgressConsumerKey = @"consumer";
-static NSString *SKConversionProgressDviFileKey = @"dviFile";
-static NSString *SKConversionProgressPdfDataKey = @"pdfData";
-static NSString *SKConversionProgressDviToolPathKey = @"dviToolPath";
+#define SKConversionProgressProviderKey @"provider"
+#define SKConversionProgressConsumerKey @"consumer"
+#define SKConversionProgressDviFileKey @"dviFile"
+#define SKConversionProgressPdfDataKey @"pdfData"
+#define SKConversionProgressDviToolPathKey @"dviToolPath"
 
-static NSString *SKDviConversionCommandKey = @"SKDviConversionCommand";
+#define SKDviConversionCommandKey @"SKDviConversionCommand"
 
 enum {
     SKConversionSucceeded = 0,

Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m        2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKDocumentController.m        2009-03-25 16:00:36 UTC (rev 5271)
@@ -49,33 +49,35 @@
 #import "BDAlias.h"
 #import "SKMainWindowController.h"
 
-static NSString *SKAutosaveIntervalKey = @"SKAutosaveInterval";
+#define SKAutosaveIntervalKey @"SKAutosaveInterval"
 
 
 // See CFBundleTypeName in Info.plist
-static NSString *SKPDFDocumentTypeName = nil; /* set to NSPDFPboardType, not 
@"NSPDFPboardType" */
-static NSString *SKPDFBundleDocumentTypeName = @"PDF Bundle";
-static NSString *SKEmbeddedPDFDocumentTypeName = @"PDF With Embedded Notes";
-static NSString *SKBarePDFDocumentTypeName = @"PDF Without Notes";
-static NSString *SKNotesDocumentTypeName = @"Skim Notes";
-static NSString *SKNotesTextDocumentTypeName = @"Notes as Text";
-static NSString *SKNotesRTFDocumentTypeName = @"Notes as RTF";
-static NSString *SKNotesRTFDDocumentTypeName = @"Notes as RTFD";
-static NSString *SKNotesFDFDocumentTypeName = @"Notes as FDF";
-static NSString *SKPostScriptDocumentTypeName = @"PostScript document";
-static NSString *SKDVIDocumentTypeName = @"DVI document";
+#define SKPDFDocumentTypeName NSPDFPboardType
+#define SKPDFBundleDocumentTypeName @"PDF Bundle"
+#define SKEmbeddedPDFDocumentTypeName @"PDF With Embedded Notes"
+#define SKBarePDFDocumentTypeName @"PDF Without Notes"
+#define SKNotesDocumentTypeName @"Skim Notes"
+#define SKNotesTextDocumentTypeName @"Notes as Text"
+#define SKNotesRTFDocumentTypeName @"Notes as RTF"
+#define SKNotesRTFDDocumentTypeName @"Notes as RTFD"
+#define SKNotesFDFDocumentTypeName @"Notes as FDF"
+#define SKPostScriptDocumentTypeName @"PostScript document"
+#define SKDVIDocumentTypeName @"DVI document"
 
-static NSString *SKPDFDocumentTypeUTI = @"com.adobe.pdf";
-static NSString *SKPDFBundleDocumentTypeUTI = @"net.sourceforge.skim-app.pdfd";
-static NSString *SKEmbeddedPDFDocumentTypeUTI = 
@"net.sourceforge.skim-app.embedded.pdf";
-static NSString *SKBarePDFDocumentTypeUTI = 
@"net.sourceforge.skim-app.bare.pdf";
-static NSString *SKNotesDocumentTypeUTI = 
@"net.sourceforge.skim-app.skimnotes";
-static NSString *SKNotesTextDocumentTypeUTI = @"public.plain-text";
-static NSString *SKNotesRTFDocumentTypeUTI = @"public.rtf";
-static NSString *SKNotesRTFDDocumentTypeUTI = @"com.apple.rtfd";
-static NSString *SKNotesFDFDocumentTypeUTI = @"com.adobe.fdf"; // I don't know 
the UTI for fdf, is there one?
-static NSString *SKPostScriptDocumentTypeUTI = @"com.adobe.postscript";
-static NSString *SKDVIDocumentTypeUTI = @"net.sourceforge.skim-app.dvi"; // I 
don't know the UTI for dvi, is there one?
+#define SKPDFDocumentTypeUTI @"com.adobe.pdf"
+#define SKPDFBundleDocumentTypeUTI @"net.sourceforge.skim-app.pdfd"
+#define SKEmbeddedPDFDocumentTypeUTI @"net.sourceforge.skim-app.embedded.pdf"
+#define SKBarePDFDocumentTypeUTI @"net.sourceforge.skim-app.bare.pdf"
+#define SKNotesDocumentTypeUTI @"net.sourceforge.skim-app.skimnotes"
+#define SKNotesTextDocumentTypeUTI @"public.plain-text"
+#define SKNotesRTFDocumentTypeUTI @"public.rtf"
+#define SKNotesRTFDDocumentTypeUTI @"com.apple.rtfd"
+// I don't know the UTI for fdf, is there one?
+#define SKNotesFDFDocumentTypeUTI @"com.adobe.fdf"
+#define SKPostScriptDocumentTypeUTI @"com.adobe.postscript"
+// I don't know the UTI for dvi, is there one?
+#define SKDVIDocumentTypeUTI @"net.sourceforge.skim-app.dvi"
 
 NSString *SKPDFDocumentType = nil;
 NSString *SKPDFBundleDocumentType = nil;
@@ -139,7 +141,6 @@
 + (void)initialize {
     SKINITIALIZE;
     
-    SKPDFDocumentTypeName = NSPDFPboardType;
     DEFINE_DOCUMENT_TYPE(PDF);
     DEFINE_DOCUMENT_TYPE(PDFBundle);
     DEFINE_DOCUMENT_TYPE(EmbeddedPDF);

Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m        2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKDownloadController.m        2009-03-25 16:00:36 UTC (rev 5271)
@@ -50,14 +50,14 @@
 #define RESUME_COLUMN   2
 #define CANCEL_COLUMN   3
 
-static NSString *SKDownloadsWindowFrameAutosaveName = @"SKDownloadsWindow";
+#define SKDownloadsWindowFrameAutosaveName @"SKDownloadsWindow"
 
 static char SKDownloadPropertiesObservationContext;
 
-static NSString *SKDownloadControllerDownloadsKey = @"downloads";
+#define SKDownloadControllerDownloadsKey @"downloads"
 
-static NSString *SKDownloadsWindowCancelColumnIdentifier = @"cancel";
-static NSString *SKDownloadsWindowResumeColumnIdentifier = @"resume";
+#define SKDownloadsWindowCancelColumnIdentifier @"cancel"
+#define SKDownloadsWindowResumeColumnIdentifier @"resume"
 
 @interface SKDownloadController (SKPrivate)
 - (void)startObservingDownloads:(NSArray *)newDownloads;

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m    2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKFindController.m    2009-03-25 16:00:36 UTC (rev 5271)
@@ -41,7 +41,7 @@
 #import "SKPDFDocument.h"
 #import <Quartz/Quartz.h>
 
-static NSString *SKFindPanelFrameAutosaveName = @"SKFindPanel";
+#define SKFindPanelFrameAutosaveName @"SKFindPanel"
 
 @implementation SKFindController
 

Modified: trunk/SKFontWell.h
===================================================================
--- trunk/SKFontWell.h  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKFontWell.h  2009-03-25 16:00:36 UTC (rev 5271)
@@ -38,15 +38,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-extern NSString *SKFontWellFontNameKey;
-extern NSString *SKFontWellFontSizeKey;
-extern NSString *SKFontWellTextColorKey;
-extern NSString *SKFontWellHasTextColorKey;
-
-extern NSString *SKFontWellFontKey;
-extern NSString *SKFontWellActionKey;
-extern NSString *SKFontWellTargetKey;
-
 @interface SKFontWell : NSButton {
     id target;
     SEL action;

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKFontWell.m  2009-03-25 16:00:36 UTC (rev 5271)
@@ -39,20 +39,20 @@
 #import "SKFontWell.h"
 #import "SKRuntime.h"
 
-static NSString *SKNSFontPanelDescriptorsPboardType = 
@"NSFontPanelDescriptorsPboardType";
-static NSString *SKNSFontPanelFamiliesPboardType = 
@"NSFontPanelFamiliesPboardType";
-static NSString *SKNSFontCollectionFontDescriptors = 
@"NSFontCollectionFontDescriptors";
+#define SKNSFontPanelDescriptorsPboardType @"NSFontPanelDescriptorsPboardType"
+#define SKNSFontPanelFamiliesPboardType @"NSFontPanelFamiliesPboardType"
+#define SKNSFontCollectionFontDescriptors @"NSFontCollectionFontDescriptors"
 
-static NSString *SKFontWellWillBecomeActiveNotification = 
@"SKFontWellWillBecomeActiveNotification";
+#define SKFontWellWillBecomeActiveNotification 
@"SKFontWellWillBecomeActiveNotification"
 
-NSString *SKFontWellFontNameKey = @"fontName";
-NSString *SKFontWellFontSizeKey = @"fontSize";
-NSString *SKFontWellTextColorKey = @"textColor";
-NSString *SKFontWellHasTextColorKey = @"hasTextColor";
+#define SKFontWellFontNameKey @"fontName"
+#define SKFontWellFontSizeKey @"fontSize"
+#define SKFontWellTextColorKey @"textColor"
+#define SKFontWellHasTextColorKey @"hasTextColor"
 
-NSString *SKFontWellFontKey = @"font";
-NSString *SKFontWellActionKey = @"action";
-NSString *SKFontWellTargetKey = @"target";
+#define SKFontWellFontKey @"font"
+#define SKFontWellActionKey @"action"
+#define SKFontWellTargetKey @"target"
 
 static char SKFontWellFontNameObservationContext;
 static char SKFontWellFontSizeObservationContext;

Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKInfoWindowController.m      2009-03-25 16:00:36 UTC (rev 5271)
@@ -41,23 +41,23 @@
 #import <Quartz/Quartz.h>
 #import "SKRuntime.h"
 
-static NSString *SKInfoWindowFrameAutosaveName = @"SKInfoWindow";
+#define SKInfoWindowFrameAutosaveName @"SKInfoWindow"
 
-static NSString *SKInfoVersionKey = @"Version";
-static NSString *SKInfoPageCountKey = @"PageCount";
-static NSString *SKInfoPageSizeKey = @"PageSize";
-static NSString *SKInfoPageWidthKey = @"PageWidth";
-static NSString *SKInfoPageHeightKey = @"PageHeight";
-static NSString *SKInfoKeywordsStringKey = @"KeywordsString";
-static NSString *SKInfoEncryptedKey = @"Encrypted";
-static NSString *SKInfoAllowsPrintingKey = @"AllowsPrinting";
-static NSString *SKInfoAllowsCopyingKey = @"AllowsCopying";
-static NSString *SKInfoFileNameKey = @"FileName";
-static NSString *SKInfoFileSizeKey = @"FileSize";
-static NSString *SKInfoPhysicalSizeKey = @"PhysicalSize";
-static NSString *SKInfoLogicalSizeKey = @"LogicalSize";
-static NSString *SKInfoTagsKey = @"Tags";
-static NSString *SKInfoRatingKey = @"Rating";
+#define SKInfoVersionKey @"Version"
+#define SKInfoPageCountKey @"PageCount"
+#define SKInfoPageSizeKey @"PageSize"
+#define SKInfoPageWidthKey @"PageWidth"
+#define SKInfoPageHeightKey @"PageHeight"
+#define SKInfoKeywordsStringKey @"KeywordsString"
+#define SKInfoEncryptedKey @"Encrypted"
+#define SKInfoAllowsPrintingKey @"AllowsPrinting"
+#define SKInfoAllowsCopyingKey @"AllowsCopying"
+#define SKInfoFileNameKey @"FileName"
+#define SKInfoFileSizeKey @"FileSize"
+#define SKInfoPhysicalSizeKey @"PhysicalSize"
+#define SKInfoLogicalSizeKey @"LogicalSize"
+#define SKInfoTagsKey @"Tags"
+#define SKInfoRatingKey @"Rating"
 
 @implementation SKInfoWindowController
 

Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m     2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKLineInspector.m     2009-03-25 16:00:36 UTC (rev 5271)
@@ -48,13 +48,13 @@
 NSString *SKLineInspectorStartLineStyleDidChangeNotification = 
@"SKLineInspectorStartLineStyleDidChangeNotification";
 NSString *SKLineInspectorEndLineStyleDidChangeNotification = 
@"SKLineInspectorEndLineStyleDidChangeNotification";
 
-static NSString *SKLineInspectorLineWidthKey = @"lineWidth";
-static NSString *SKLineInspectorStyleKey = @"style";
-static NSString *SKLineInspectorDashPatternKey = @"dashPattern";
-static NSString *SKLineInspectorStartLineStyleKey = @"startLineStyle";
-static NSString *SKLineInspectorEndLineStyleKey = @"endLineStyle";
+#define SKLineInspectorLineWidthKey @"lineWidth"
+#define SKLineInspectorStyleKey @"style"
+#define SKLineInspectorDashPatternKey @"dashPattern"
+#define SKLineInspectorStartLineStyleKey @"startLineStyle"
+#define SKLineInspectorEndLineStyleKey @"endLineStyle"
 
-static NSString *SKLineInspectorFrameAutosaveName = @"SKLineInspector";
+#define SKLineInspectorFrameAutosaveName @"SKLineInspector"
 
 @implementation SKLineInspector
 

Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKLineWell.m  2009-03-25 16:00:36 UTC (rev 5271)
@@ -48,13 +48,13 @@
 NSString *SKLineWellStartLineStyleKey = @"startLineStyle";
 NSString *SKLineWellEndLineStyleKey = @"endLineStyle";
 
-static NSString *SKLineWellDisplayStyleKey = @"displayStyle";
-static NSString *SKLineWellActiveKey = @"active";
-static NSString *SKLineWellActionKey = @"action";
-static NSString *SKLineWellTargetKey = @"target";
+#define SKLineWellDisplayStyleKey @"displayStyle"
+#define SKLineWellActiveKey @"active"
+#define SKLineWellActionKey @"action"
+#define SKLineWellTargetKey @"target"
 
-static NSString *SKLineWellWillBecomeActiveNotification = 
@"SKLineWellWillBecomeActiveNotification";
-static NSString *SKLineWellExclusiveKey = @"exclusive";
+#define SKLineWellWillBecomeActiveNotification 
@"SKLineWellWillBecomeActiveNotification"
+#define SKLineWellExclusiveKey @"exclusive"
 
 @implementation SKLineWell
 

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKMainWindowController.h      2009-03-25 16:00:36 UTC (rev 5271)
@@ -71,18 +71,6 @@
        BOOL autoHidesScrollers;
 } SKPDFViewState;
 
-extern NSString *SKMainWindowPageLabelsKey;
-extern NSString *SKMainWindowSearchResultsKey;
-extern NSString *SKMainWindowGroupedSearchResultsKey;
-extern NSString *SKMainWindowNotesKey;
-extern NSString *SKMainWindowThumbnailsKey;
-extern NSString *SKMainWindowSnapshotsKey;
-
-extern NSString *SKLeftSidePaneWidthKey;
-extern NSString *SKRightSidePaneWidthKey;
-
-extern NSString *SKMainWindowPageColumnIdentifier;
-
 extern NSString *SKUnarchiveFromDataArrayTransformerName;
 
 @class PDFAnnotation, SKPDFOutline, PDFSelection, SKThumbnail, 
SKGroupedSearchResult;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKMainWindowController.m      2009-03-25 16:00:36 UTC (rev 5271)
@@ -106,47 +106,47 @@
 
 #define PRESENTATION_SIDE_WINDOW_ALPHA 0.95
 
-NSString *SKMainWindowPageLabelsKey = @"pageLabels";
-NSString *SKMainWindowSearchResultsKey = @"searchResults";
-NSString *SKMainWindowGroupedSearchResultsKey = @"groupedSearchResults";
-NSString *SKMainWindowNotesKey = @"notes";
-NSString *SKMainWindowThumbnailsKey = @"thumbnails";
-NSString *SKMainWindowSnapshotsKey = @"snapshots";
+#define SKMainWindowPageLabelsKey @"pageLabels"
+#define SKMainWindowSearchResultsKey @"searchResults"
+#define SKMainWindowGroupedSearchResultsKey @"groupedSearchResults"
+#define SKMainWindowNotesKey @"notes"
+#define SKMainWindowThumbnailsKey @"thumbnails"
+#define SKMainWindowSnapshotsKey @"snapshots"
 
-NSString *SKMainWindowPageColumnIdentifier = @"page";
-static NSString *SKMainWindowNoteColumnIdentifer = @"note";
+#define SKMainWindowPageColumnIdentifier @"page"
+#define SKMainWindowNoteColumnIdentifer @"note"
 
-static NSString *SKMainWindowRelevanceColumnIdentifer = @"relevance";
-static NSString *SKMainWindowResultsColumnIdentifer = @"results";
+#define SKMainWindowRelevanceColumnIdentifer @"relevance"
+#define SKMainWindowResultsColumnIdentifer @"results"
 
-static NSString *SKMainWindowPageNumberKey = @"pageNumber";
-static NSString *SKMainWindowPageLabelKey = @"pageLabel";
+#define SKMainWindowPageNumberKey @"pageNumber"
+#define SKMainWindowPageLabelKey @"pageLabel"
 
-static NSString *SKMainWindowFrameKey = @"windowFrame";
-static NSString *SKMainWindowLeftSidePaneWidthKey = @"leftSidePaneWidth";
-static NSString *SKMainWindowRightSidePaneWidthKey = @"rightSidePaneWidth";
-static NSString *SKMainWindowScaleFactorKey = @"scaleFactor";
-static NSString *SKMainWindowAutoScalesKey = @"autoScales";
-static NSString *SKMainWindowDisplayPageBreaksKey = @"displaysPageBreaks";
-static NSString *SKMainWindowDisplayAsBookKey = @"displaysAsBook"; 
-static NSString *SKMainWindowDisplayModeKey = @"displayMode";
-static NSString *SKMainWindowDisplayBoxKey = @"displayBox" ;
-static NSString *SKMainWindowHasHorizontalScrollerKey = 
@"hasHorizontalScroller";
-static NSString *SKMainWindowHasVerticalScrollerKey = @"hasVerticalScroller";
-static NSString *SKMainWindowAutoHidesScrollersKey = @"autoHidesScrollers";
-static NSString *SKMainWindowPageIndexKey = @"pageIndex";
+#define SKMainWindowFrameKey @"windowFrame"
+#define SKMainWindowLeftSidePaneWidthKey @"leftSidePaneWidth"
+#define SKMainWindowRightSidePaneWidthKey @"rightSidePaneWidth"
+#define SKMainWindowScaleFactorKey @"scaleFactor"
+#define SKMainWindowAutoScalesKey @"autoScales"
+#define SKMainWindowDisplayPageBreaksKey @"displaysPageBreaks"
+#define SKMainWindowDisplayAsBookKey @"displaysAsBook" 
+#define SKMainWindowDisplayModeKey @"displayMode"
+#define SKMainWindowDisplayBoxKey @"displayBox"
+#define SKMainWindowHasHorizontalScrollerKey @"hasHorizontalScroller"
+#define SKMainWindowHasVerticalScrollerKey @"hasVerticalScroller"
+#define SKMainWindowAutoHidesScrollersKey @"autoHidesScrollers"
+#define SKMainWindowPageIndexKey @"pageIndex"
 
-static NSString *SKMainWindowFrameAutosaveName = @"SKMainWindow";
+#define SKMainWindowFrameAutosaveName @"SKMainWindow"
 
 static char SKNPDFAnnotationPropertiesObservationContext;
 
 static char SKMainWindowDefaultsObservationContext;
 
-NSString *SKLeftSidePaneWidthKey = @"SKLeftSidePaneWidth";
-NSString *SKRightSidePaneWidthKey = @"SKRightSidePaneWidth";
+#define SKLeftSidePaneWidthKey @"SKLeftSidePaneWidth"
+#define SKRightSidePaneWidthKey @"SKRightSidePaneWidth"
 
-static NSString *SKUsesDrawersKey = @"SKUsesDrawers";
-static NSString *SKDisableAnimatedSearchHighlightKey = 
@"SKDisableAnimatedSearchHighlight";
+#define SKUsesDrawersKey @"SKUsesDrawers"
+#define SKDisableAnimatedSearchHighlightKey @"SKDisableAnimatedSearchHighlight"
 
 NSString *SKUnarchiveFromDataArrayTransformerName = 
@"SKUnarchiveFromDataArrayTransformer";
 
@@ -259,7 +259,7 @@
 - (void)dealloc {
     [self stopObservingNotes:[self notes]];
     [undoGroupOldPropertiesPerNote release];
-    @try { [colorSwatch unbind:SKColorSwatchColorsKey]; }
+    @try { [colorSwatch unbind:@"colors"]; }
     @catch (id e) {}
        [[NSNotificationCenter defaultCenter] removeObserver: self];
     [self unregisterAsObserver];

Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m      2009-03-24 17:51:09 UTC (rev 
5270)
+++ trunk/SKMainWindowController_Toolbar.m      2009-03-25 16:00:36 UTC (rev 
5271)
@@ -47,45 +47,45 @@
 #import "NSImage_SKExtensions.h"
 #import "NSMenu_SKExtensions.h"
 
-static NSString *SKDocumentToolbarIdentifier = @"SKDocumentToolbar";
+#define SKDocumentToolbarIdentifier @"SKDocumentToolbar"
 
-static NSString *SKDocumentToolbarPreviousItemIdentifier = 
@"SKDocumentToolbarPreviousItemIdentifier";
-static NSString *SKDocumentToolbarNextItemIdentifier = 
@"SKDocumentToolbarNextItemIdentifier";
-static NSString *SKDocumentToolbarPreviousNextItemIdentifier = 
@"SKDocumentToolbarPreviousNextItemIdentifier";
-static NSString *SKDocumentToolbarPreviousNextFirstLastItemIdentifier = 
@"SKDocumentToolbarPreviousNextFirstLastItemIdentifier";
-static NSString *SKDocumentToolbarBackForwardItemIdentifier = 
@"SKDocumentToolbarBackForwardItemIdentifier";
-static NSString *SKDocumentToolbarPageNumberItemIdentifier = 
@"SKDocumentToolbarPageNumberItemIdentifier";
-static NSString *SKDocumentToolbarScaleItemIdentifier = 
@"SKDocumentToolbarScaleItemIdentifier";
-static NSString *SKDocumentToolbarZoomActualItemIdentifier = 
@"SKDocumentToolbarZoomActualItemIdentifier";
-static NSString *SKDocumentToolbarZoomToSelectionItemIdentifier = 
@"SKDocumentToolbarZoomToSelectionItemIdentifier";
-static NSString *SKDocumentToolbarZoomToFitItemIdentifier = 
@"SKDocumentToolbarZoomToFitItemIdentifier";
-static NSString *SKDocumentToolbarZoomInOutItemIdentifier = 
@"SKDocumentToolbarZoomInOutItemIdentifier";
-static NSString *SKDocumentToolbarZoomInActualOutItemIdentifier = 
@"SKDocumentToolbarZoomInActualOutItemIdentifier";
-static NSString *SKDocumentToolbarRotateRightItemIdentifier = 
@"SKDocumentToolbarRotateRightItemIdentifier";
-static NSString *SKDocumentToolbarRotateLeftItemIdentifier = 
@"SKDocumentToolbarRotateLeftItemIdentifier";
-static NSString *SKDocumentToolbarRotateLeftRightItemIdentifier = 
@"SKDocumentToolbarRotateLeftRightItemIdentifier";
-static NSString *SKDocumentToolbarCropItemIdentifier = 
@"SKDocumentToolbarCropItemIdentifier";
-static NSString *SKDocumentToolbarFullScreenItemIdentifier = 
@"SKDocumentToolbarFullScreenItemIdentifier";
-static NSString *SKDocumentToolbarPresentationItemIdentifier = 
@"SKDocumentToolbarPresentationItemIdentifier";
-static NSString *SKDocumentToolbarNewTextNoteItemIdentifier = 
@"SKDocumentToolbarNewTextNoteItemIdentifier";
-static NSString *SKDocumentToolbarNewCircleNoteItemIdentifier = 
@"SKDocumentToolbarNewCircleNoteItemIdentifier";
-static NSString *SKDocumentToolbarNewMarkupItemIdentifier = 
@"SKDocumentToolbarNewMarkupItemIdentifier";
-static NSString *SKDocumentToolbarNewLineItemIdentifier = 
@"SKDocumentToolbarNewLineItemIdentifier";
-static NSString *SKDocumentToolbarNewNoteItemIdentifier = 
@"SKDocumentToolbarNewNoteItemIdentifier";
-static NSString *SKDocumentToolbarInfoItemIdentifier = 
@"SKDocumentToolbarInfoItemIdentifier";
-static NSString *SKDocumentToolbarToolModeItemIdentifier = 
@"SKDocumentToolbarToolModeItemIdentifier";
-static NSString *SKDocumentToolbarSingleTwoUpItemIdentifier = 
@"SKDocumentToolbarSingleTwoUpItemIdentifier";
-static NSString *SKDocumentToolbarContinuousItemIdentifier = 
@"SKDocumentToolbarContinuousItemIdentifier";
-static NSString *SKDocumentToolbarDisplayModeItemIdentifier = 
@"SKDocumentToolbarDisplayModeItemIdentifier";
-static NSString *SKDocumentToolbarDisplayBoxItemIdentifier = 
@"SKDocumentToolbarDisplayBoxItemIdentifier";
-static NSString *SKDocumentToolbarColorSwatchItemIdentifier = 
@"SKDocumentToolbarColorSwatchItemIdentifier";
-static NSString *SKDocumentToolbarColorsItemIdentifier = 
@"SKDocumentToolbarColorsItemIdentifier";
-static NSString *SKDocumentToolbarFontsItemIdentifier = 
@"SKDocumentToolbarFontsItemIdentifier";
-static NSString *SKDocumentToolbarLinesItemIdentifier = 
@"SKDocumentToolbarLinesItemIdentifier";
-static NSString *SKDocumentToolbarContentsPaneItemIdentifier = 
@"SKDocumentToolbarContentsPaneItemIdentifier";
-static NSString *SKDocumentToolbarNotesPaneItemIdentifier = 
@"SKDocumentToolbarNotesPaneItemIdentifier";
-static NSString *SKDocumentToolbarPrintItemIdentifier = 
@"SKDocumentToolbarPrintItemIdentifier";
-static NSString *SKDocumentToolbarCustomizeItemIdentifier = 
@"SKDocumentToolbarCustomizeItemIdentifier";
+#define SKDocumentToolbarPreviousItemIdentifier 
@"SKDocumentToolbarPreviousItemIdentifier"
+#define SKDocumentToolbarNextItemIdentifier 
@"SKDocumentToolbarNextItemIdentifier"
+#define SKDocumentToolbarPreviousNextItemIdentifier 
@"SKDocumentToolbarPreviousNextItemIdentifier"
+#define SKDocumentToolbarPreviousNextFirstLastItemIdentifier 
@"SKDocumentToolbarPreviousNextFirstLastItemIdentifier"
+#define SKDocumentToolbarBackForwardItemIdentifier 
@"SKDocumentToolbarBackForwardItemIdentifier"
+#define SKDocumentToolbarPageNumberItemIdentifier 
@"SKDocumentToolbarPageNumberItemIdentifier"
+#define SKDocumentToolbarScaleItemIdentifier 
@"SKDocumentToolbarScaleItemIdentifier"
+#define SKDocumentToolbarZoomActualItemIdentifier 
@"SKDocumentToolbarZoomActualItemIdentifier"
+#define SKDocumentToolbarZoomToSelectionItemIdentifier 
@"SKDocumentToolbarZoomToSelectionItemIdentifier"
+#define SKDocumentToolbarZoomToFitItemIdentifier 
@"SKDocumentToolbarZoomToFitItemIdentifier"
+#define SKDocumentToolbarZoomInOutItemIdentifier 
@"SKDocumentToolbarZoomInOutItemIdentifier"
+#define SKDocumentToolbarZoomInActualOutItemIdentifier 
@"SKDocumentToolbarZoomInActualOutItemIdentifier"
+#define SKDocumentToolbarRotateRightItemIdentifier 
@"SKDocumentToolbarRotateRightItemIdentifier"
+#define SKDocumentToolbarRotateLeftItemIdentifier 
@"SKDocumentToolbarRotateLeftItemIdentifier"
+#define SKDocumentToolbarRotateLeftRightItemIdentifier 
@"SKDocumentToolbarRotateLeftRightItemIdentifier"
+#define SKDocumentToolbarCropItemIdentifier 
@"SKDocumentToolbarCropItemIdentifier"
+#define SKDocumentToolbarFullScreenItemIdentifier 
@"SKDocumentToolbarFullScreenItemIdentifier"
+#define SKDocumentToolbarPresentationItemIdentifier 
@"SKDocumentToolbarPresentationItemIdentifier"
+#define SKDocumentToolbarNewTextNoteItemIdentifier 
@"SKDocumentToolbarNewTextNoteItemIdentifier"
+#define SKDocumentToolbarNewCircleNoteItemIdentifier 
@"SKDocumentToolbarNewCircleNoteItemIdentifier"
+#define SKDocumentToolbarNewMarkupItemIdentifier 
@"SKDocumentToolbarNewMarkupItemIdentifier"
+#define SKDocumentToolbarNewLineItemIdentifier 
@"SKDocumentToolbarNewLineItemIdentifier"
+#define SKDocumentToolbarNewNoteItemIdentifier 
@"SKDocumentToolbarNewNoteItemIdentifier"
+#define SKDocumentToolbarInfoItemIdentifier 
@"SKDocumentToolbarInfoItemIdentifier"
+#define SKDocumentToolbarToolModeItemIdentifier 
@"SKDocumentToolbarToolModeItemIdentifier"
+#define SKDocumentToolbarSingleTwoUpItemIdentifier 
@"SKDocumentToolbarSingleTwoUpItemIdentifier"
+#define SKDocumentToolbarContinuousItemIdentifier 
@"SKDocumentToolbarContinuousItemIdentifier"
+#define SKDocumentToolbarDisplayModeItemIdentifier 
@"SKDocumentToolbarDisplayModeItemIdentifier"
+#define SKDocumentToolbarDisplayBoxItemIdentifier 
@"SKDocumentToolbarDisplayBoxItemIdentifier"
+#define SKDocumentToolbarColorSwatchItemIdentifier 
@"SKDocumentToolbarColorSwatchItemIdentifier"
+#define SKDocumentToolbarColorsItemIdentifier 
@"SKDocumentToolbarColorsItemIdentifier"
+#define SKDocumentToolbarFontsItemIdentifier 
@"SKDocumentToolbarFontsItemIdentifier"
+#define SKDocumentToolbarLinesItemIdentifier 
@"SKDocumentToolbarLinesItemIdentifier"
+#define SKDocumentToolbarContentsPaneItemIdentifier 
@"SKDocumentToolbarContentsPaneItemIdentifier"
+#define SKDocumentToolbarNotesPaneItemIdentifier 
@"SKDocumentToolbarNotesPaneItemIdentifier"
+#define SKDocumentToolbarPrintItemIdentifier 
@"SKDocumentToolbarPrintItemIdentifier"
+#define SKDocumentToolbarCustomizeItemIdentifier 
@"SKDocumentToolbarCustomizeItemIdentifier"
 
 
 @interface SKMainWindowController (TSKoolbarPrivate)
@@ -516,7 +516,7 @@
         } else if ([identifier 
isEqualToString:SKDocumentToolbarColorSwatchItemIdentifier]) {
             
             NSDictionary *options = [NSDictionary 
dictionaryWithObject:SKUnarchiveFromDataArrayTransformerName 
forKey:NSValueTransformerNameBindingOption];
-            [colorSwatch bind:SKColorSwatchColorsKey 
toObject:[NSUserDefaultsController sharedUserDefaultsController] 
withKeyPath:[NSString stringWithFormat:@"values.%@", SKSwatchColorsKey] 
options:options];
+            [colorSwatch bind:@"colors" toObject:[NSUserDefaultsController 
sharedUserDefaultsController] withKeyPath:[NSString 
stringWithFormat:@"values.%@", SKSwatchColorsKey] options:options];
             [colorSwatch sizeToFit];
             [[NSNotificationCenter defaultCenter] addObserver:self 
selector:@selector(handleColorSwatchColorsChangedNotification:) 
                                                          
name:SKColorSwatchColorsChangedNotification object:colorSwatch];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKMainWindowController_UI.m   2009-03-25 16:00:36 UTC (rev 5271)
@@ -66,14 +66,21 @@
 #import "SKLineInspector.h"
 #import "SKPDFOutline.h"
 
-static NSString *SKMainWindowLabelColumnIdentifier = @"label";
-static NSString *SKMainWindowNoteColumnIdentifier = @"note";
-static NSString *SKMainWindowTypeColumnIdentifier = @"type";
-static NSString *SKMainWindowImageColumnIdentifier = @"image";
+#define SKMainWindowNotesKey @"notes"
+#define SKMainWindowSnapshotsKey @"snapshots"
 
+#define SKMainWindowPageColumnIdentifier @"page"
+#define SKMainWindowLabelColumnIdentifier @"label"
+#define SKMainWindowNoteColumnIdentifier @"note"
+#define SKMainWindowTypeColumnIdentifier @"type"
+#define SKMainWindowImageColumnIdentifier @"image"
+
+#define SKLeftSidePaneWidthKey @"SKLeftSidePaneWidth"
+#define SKRightSidePaneWidthKey @"SKRightSidePaneWidth"
+
 static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu", 
@"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu", 
@"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu", 
@"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
 
-static NSString *SKDisableTableToolTipsKey = @"SKDisableTableToolTips";
+#define SKDisableTableToolTipsKey @"SKDisableTableToolTips"
 
 @interface SKMainWindowController (SKPrivateMain)
 

Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKNoteWindowController.m      2009-03-25 16:00:36 UTC (rev 5271)
@@ -55,10 +55,10 @@
 #define SIZE_OFFSET 32.0
 #define EM_DASH_CHARACTER 0x2014
 
-static NSString *SKNoteWindowFrameAutosaveName = @"SKNoteWindow";
-static NSString *SKGenericNoteWindowFrameAutosaveName = @"SKGenericNoteWindow";
+#define SKNoteWindowFrameAutosaveName @"SKNoteWindow"
+#define SKGenericNoteWindowFrameAutosaveName @"SKGenericNoteWindow"
 
-static NSString *SKKeepNoteWindowsOnTopKey = @"SKKeepNoteWindowsOnTop";
+#define SKKeepNoteWindowsOnTopKey @"SKKeepNoteWindowsOnTop"
 
 static char SKNoteWindowPageObservationContext;
 static char SKNoteWindowBoundsObservationContext;

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKNotesDocument.m     2009-03-25 16:00:36 UTC (rev 5271)
@@ -62,19 +62,19 @@
 #import "SKPrintableView.h"
 #import "SKPDFView.h"
 
-static NSString *SKNotesDocumentWindowFrameAutosaveName = 
@"SKNotesDocumentWindow";
+#define SKNotesDocumentWindowFrameAutosaveName @"SKNotesDocumentWindow"
 
-static NSString *SKNotesDocumentToolbarIdentifier = 
@"SKNotesDocumentToolbarIdentifier";
-static NSString *SKNotesDocumentSearchToolbarItemIdentifier = 
@"SKNotesDocumentSearchToolbarItemIdentifier";
-static NSString *SKNotesDocumentOpenPDFToolbarItemIdentifier = 
@"SKNotesDocumentOpenPDFToolbarItemIdentifier";
+#define SKNotesDocumentToolbarIdentifier @"SKNotesDocumentToolbarIdentifier"
+#define SKNotesDocumentSearchToolbarItemIdentifier 
@"SKNotesDocumentSearchToolbarItemIdentifier"
+#define SKNotesDocumentOpenPDFToolbarItemIdentifier 
@"SKNotesDocumentOpenPDFToolbarItemIdentifier"
 
-static NSString *SKLastExportedNotesTypeKey = @"SKLastExportedNotesType";
+#define SKLastExportedNotesTypeKey @"SKLastExportedNotesType"
 
-static NSString *SKNotesDocumentNotesKey = @"notes";
+#define SKNotesDocumentNotesKey @"notes"
 
-static NSString *SKNotesDocumentNoteColumnIdentifier = @"note";
-static NSString *SKNotesDocumentTypeColumnIdentifier = @"type";
-static NSString *SKNotesDocumentPageColumnIdentifier = @"page";
+#define SKNotesDocumentNoteColumnIdentifier @"note"
+#define SKNotesDocumentTypeColumnIdentifier @"type"
+#define SKNotesDocumentPageColumnIdentifier @"page"
 
 @implementation SKNotesDocument
 

Modified: trunk/SKNotesPanelController.m
===================================================================
--- trunk/SKNotesPanelController.m      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKNotesPanelController.m      2009-03-25 16:00:36 UTC (rev 5271)
@@ -39,7 +39,7 @@
 #import "SKNotesPanelController.h"
 #import "SKMainWindowController.h"
 
-static NSString *SKNotesPanelFrameAutosaveName = @"SKNotesPanel";
+#define SKNotesPanelFrameAutosaveName @"SKNotesPanel"
 
 @implementation SKNotesPanelController
 

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKPDFDocument.m       2009-03-25 16:00:36 UTC (rev 5271)
@@ -84,10 +84,10 @@
 NSString *SKPDFDocumentWillSaveNotification = 
@"SKPDFDocumentWillSaveNotification";
 NSString *SKSkimFileDidSaveNotification = @"SKSkimFileDidSaveNotification";
 
-static NSString *SKLastExportedTypeKey = @"SKLastExportedType";
-static NSString *SKAutoReloadFileUpdateKey = @"SKAutoReloadFileUpdate";
-static NSString *SKAutoRotatePrintedPagesKey = @"SKAutoRotatePrintedPages";
-static NSString *SKDisableReloadAlertKey = @"SKDisableReloadAlert";
+#define SKLastExportedTypeKey @"SKLastExportedType"
+#define SKAutoReloadFileUpdateKey @"SKAutoReloadFileUpdate"
+#define SKAutoRotatePrintedPagesKey @"SKAutoRotatePrintedPages"
+#define SKDisableReloadAlertKey @"SKDisableReloadAlert"
 
 static char SKPDFDocumentDefaultsObservationContext;
 

Modified: trunk/SKPDFSynchronizerServer.m
===================================================================
--- trunk/SKPDFSynchronizerServer.m     2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKPDFSynchronizerServer.m     2009-03-25 16:00:36 UTC (rev 5271)
@@ -53,7 +53,7 @@
 // Offset of coordinates in PDFKit and what pdfsync tells us. Don't know what 
they are; is this implementation dependent?
 static NSPoint pdfOffset = {0.0, 0.0};
 
-static NSString *SKPDFSynchronizerPdfsyncExtension = @"pdfsync";
+#define SKPDFSynchronizerPdfsyncExtension @"pdfsync"
 static NSArray *SKPDFSynchronizerTexExtensions = nil;
 
 struct SKServerFlags {

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKPDFView.m   2009-03-25 16:00:36 UTC (rev 5271)
@@ -94,18 +94,18 @@
 
 NSString *SKSkimNotePboardType = @"SKSkimNotePboardType";
 
-static NSString *SKSmallMagnificationWidthKey = @"SKSmallMagnificationWidth";
-static NSString *SKSmallMagnificationHeightKey = @"SKSmallMagnificationHeight";
-static NSString *SKLargeMagnificationWidthKey = @"SKLargeMagnificationWidth";
-static NSString *SKLargeMagnificationHeightKey = @"SKLargeMagnificationHeight";
-static NSString *SKMoveReadingBarModifiersKey = @"SKMoveReadingBarModifiers";
-static NSString *SKResizeReadingBarModifiersKey = 
@"SKResizeReadingBarModifiers";
-static NSString *SKDisableUpdateContentsFromEnclosedTextKey = 
@"SKDisableUpdateContentsFromEnclosedText";
+#define SKSmallMagnificationWidthKey @"SKSmallMagnificationWidth"
+#define SKSmallMagnificationHeightKey @"SKSmallMagnificationHeight"
+#define SKLargeMagnificationWidthKey @"SKLargeMagnificationWidth"
+#define SKLargeMagnificationHeightKey @"SKLargeMagnificationHeight"
+#define SKMoveReadingBarModifiersKey @"SKMoveReadingBarModifiers"
+#define SKResizeReadingBarModifiersKey @"SKResizeReadingBarModifiers"
+#define SKDisableUpdateContentsFromEnclosedTextKey 
@"SKDisableUpdateContentsFromEnclosedText"
 
-static NSString *SKDefaultFreeTextNoteContentsKey = 
@"SKDefaultFreeTextNoteContents";
-static NSString *SKDefaultAnchoredNoteContentsKey = 
@"SKDefaultAnchoredNoteContents";
+#define SKDefaultFreeTextNoteContentsKey @"SKDefaultFreeTextNoteContents"
+#define SKDefaultAnchoredNoteContentsKey @"SKDefaultAnchoredNoteContents"
 
-static NSString *SKReadingBarNumberOfLinesKey = @"SKReadingBarNumberOfLines";
+#define SKReadingBarNumberOfLinesKey @"SKReadingBarNumberOfLines"
 
 static char SKPDFViewDefaultsObservationContext;
 

Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m      2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKPreferenceController.m      2009-03-25 16:00:36 UTC (rev 5271)
@@ -45,15 +45,15 @@
 #import "NSView_SKExtensions.h"
 #import <Sparkle/Sparkle.h>
 
-static NSString *SKPreferenceInitialUserDefaultsFileName = 
@"InitialUserDefaults";
-static NSString *SKPreferenceResettableKeysKey = @"ResettableKeys";
+#define SKPreferenceInitialUserDefaultsFileName @"InitialUserDefaults"
+#define SKPreferenceResettableKeysKey @"ResettableKeys"
 
 static float 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};
 static NSString *SKTeXEditors[] = {@"TextMate", @"BBEdit", @"TextWrangler", 
@"Emacs", @"Aquamacs Emacs", @"LyX", @"TeXMaker", @"AlphaX"};
 static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", 
@"emacsclient", @"emacsclient", @"lyxeditor", @"texmaker", @"alphac"};
 static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line 
\"%file\"", @"+%line \"%file\"", @"--no-wait +%line \"%file\"", @"--no-wait 
+%line \"%file\"", @"\"%file\" %line", @"\"%file\" -line %line", @"+%line 
\"%file\""};
 
-static NSString *SKPreferenceWindowFrameAutosaveName = @"SKPreferenceWindow";
+#define SKPreferenceWindowFrameAutosaveName @"SKPreferenceWindow"
 
 static char SKPreferenceWindowDefaultsObservationContext;
 static char SKPreferenceWindowUpdaterObservationContext;
@@ -162,7 +162,7 @@
     if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
         NSDictionary *options = [NSDictionary 
dictionaryWithObjectsAndKeys:NSUnarchiveFromDataTransformerName, 
NSValueTransformerNameBindingOption, nil];
         [textNoteFontWell setHasTextColor:YES];
-        [textNoteFontWell bind:SKFontWellTextColorKey toObject:sudc 
withKeyPath:VALUES_KEY_PATH(SKFreeTextNoteFontColorKey) options:options];
+        [textNoteFontWell bind:@"textColor" toObject:sudc 
withKeyPath:VALUES_KEY_PATH(SKFreeTextNoteFontColorKey) options:options];
     }
 }
 

Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKSnapshotWindowController.m  2009-03-25 16:00:36 UTC (rev 5271)
@@ -57,19 +57,19 @@
 
 NSString *SKSnapshotCurrentSetupKey = @"currentSetup";
 
-static NSString *SKSnapshotPageKey = @"page";
-static NSString *SKSnapshotRectKey = @"rect";
-static NSString *SKSnapshotScaleFactorKey = @"scaleFactor";
-static NSString *SKSnapshotAutoFitsKey = @"autoFits";
-static NSString *SKSnapshotHasWindowKey = @"hasWindow";
-static NSString *SKSnapshotWindowFrameKey = @"windowFrame";
+#define SKSnapshotPageKey @"page"
+#define SKSnapshotRectKey @"rect"
+#define SKSnapshotScaleFactorKey @"scaleFactor"
+#define SKSnapshotAutoFitsKey @"autoFits"
+#define SKSnapshotHasWindowKey @"hasWindow"
+#define SKSnapshotWindowFrameKey @"windowFrame"
 
-static NSString *SKSnapshotWindowPageLabelKey = @"pageLabel";
-static NSString *SKSnapshotWindowHasWindowKey = @"hasWindow";
-static NSString *SKSnapshotWindowPageAndWindowKey = @"pageAndWindow";
+#define SKSnapshotWindowPageLabelKey @"pageLabel"
+#define SKSnapshotWindowHasWindowKey @"hasWindow"
+#define SKSnapshotWindowPageAndWindowKey @"pageAndWindow"
 
-static NSString *SKSnapshotWindowFrameAutosaveName = @"SKSnapshotWindow";
-static NSString *SKSnapshotViewChangedNotification = 
@"SKSnapshotViewChangedNotification";
+#define SKSnapshotWindowFrameAutosaveName @"SKSnapshotWindow"
+#define SKSnapshotViewChangedNotification @"SKSnapshotViewChangedNotification"
 
 static char SKSnaphotWindowDefaultsObservationContext;
 

Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m        2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKThumbnailTableView.m        2009-03-25 16:00:36 UTC (rev 5271)
@@ -41,8 +41,8 @@
 #import "SKTypeSelectHelper.h"
 #import "NSColor_SKExtensions.h"
 
-static NSString *SKScrollerWillScrollNotification = 
@"SKScrollerWillScrollNotification";
-static NSString *SKScrollerDidScrollNotification = 
@"SKScrollerDidScrollNotification";
+#define SKScrollerWillScrollNotification @"SKScrollerWillScrollNotification"
+#define SKScrollerDidScrollNotification @"SKScrollerDidScrollNotification"
 
 @interface NSScroller (SKExtensions)
 @end

Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m  2009-03-24 17:51:09 UTC (rev 5270)
+++ trunk/SKTypeSelectHelper.m  2009-03-25 16:00:36 UTC (rev 5271)
@@ -39,7 +39,7 @@
 #import "SKTypeSelectHelper.h"
 #import "SKRuntime.h"
 
-static NSString *SKWindowDidChangeFirstResponderNotification = 
@"SKWindowDidChangeFirstResponderNotification";
+#define SKWindowDidChangeFirstResponderNotification 
@"SKWindowDidChangeFirstResponderNotification"
 
 #define REPEAT_CHARACTER 0x2F
 #define CANCEL_CHARACTER 0x1B


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to