Bring fravorites outline view branch up to date with trunk (r3036:3058).

1 files changed, 7 insertions, 3 deletions

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index f919e880..c7ac921d 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -179,6 +179,8 @@ NSString *SPUniqueSchemaDelimiter                = @"￸"; // U+FFF8
 NSString *SPLastImportIntoNewTableEncoding       = @"LastImportIntoNewTableEncoding";
 NSString *SPLastImportIntoNewTableType           = @"LastImportIntoNewTableType";
 NSString *SPGlobalValueHistory                   = @"GlobalValueHistory";
+NSString *SPBundleDeletedDefaultBundlesKey       = @"deletedDefaultBundles";
+NSString *SPBundleUpdatedDefaultBundlesKey       = @"updatedDefaultBundles";
 
 // URLs
 NSString *SPDonationsURL                         = @"http://www.sequelpro.com/donate.html";
@@ -287,6 +289,8 @@ NSString *SPBundleFileUUIDKey                               = @"uuid";
 NSString *SPBundleFileDescriptionKey                        = @"description";
 NSString *SPBundleFileTriggerKey                            = @"trigger";
 NSString *SPBundleFileWithBlobKey                           = @"withblob";
+NSString *SPBundleFileIsDefaultBundleKey                    = @"isDefaultBundle";
+NSString *SPBundleFileDefaultBundleWasModifiedKey           = @"defaultBundleWasModified";
 NSString *SPBundleInternLabelKey                            = @"label";
 NSString *SPBundleInternPathToFileKey                       = @"path";
 NSString *SPBundleInternKeyEquivalentKey                    = @"keyEquivalent";
@@ -317,11 +321,11 @@ NSString *SPBundleShellVariableCurrentUser                  = @"SP_CURRENT_USER"
 NSString *SPBundleShellVariableCurrentWord                  = @"SP_CURRENT_WORD";
 NSString *SPBundleShellVariableDatabaseEncoding             = @"SP_DATABASE_ENCODING";
 NSString *SPBundleShellVariableDataTableSource              = @"SP_DATA_TABLE_SOURCE";
-NSString *SPBundleShellVariableExitInsertAsHTML             = @"SP_BUNDLE_EXIT_SHOW_AS_HTML";
-NSString *SPBundleShellVariableExitInsertAsHTMLTooltip      = @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP";
+NSString *SPBundleShellVariableExitShowAsHTML               = @"SP_BUNDLE_EXIT_SHOW_AS_HTML";
+NSString *SPBundleShellVariableExitShowAsHTMLTooltip        = @"SP_BUNDLE_EXIT_SHOW_AS_HTML_TOOLTIP";
 NSString *SPBundleShellVariableExitInsertAsSnippet          = @"SP_BUNDLE_EXIT_INSERT_AS_SNIPPET";
 NSString *SPBundleShellVariableExitInsertAsText             = @"SP_BUNDLE_EXIT_INSERT_AS_TEXT";
-NSString *SPBundleShellVariableExitInsertAsTextTooltip      = @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP";
+NSString *SPBundleShellVariableExitShowAsTextTooltip      = @"SP_BUNDLE_EXIT_SHOW_AS_TEXT_TOOLTIP";
 NSString *SPBundleShellVariableExitNone                     = @"SP_BUNDLE_EXIT_NONE";
 NSString *SPBundleShellVariableExitReplaceContent           = @"SP_BUNDLE_EXIT_REPLACE_CONTENT";
 NSString *SPBundleShellVariableExitReplaceSelection         = @"SP_BUNDLE_EXIT_REPLACE_SELECTION";