• Bundle support

- outsourced code to SPAppController to centralise Bundle support and make it available for different scopes (query editor, input text fields, data tables etc.)
- store bundle info scope-based
- added input text field support
- made usage of constants

1 files changed, 19 insertions, 16 deletions

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index 22653a67..f0277c72 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -244,22 +244,22 @@ NSString *SPFavoriteSSLCACertFileLocationKey             = @"sslCACertFileLocati
 
 // Bundle Files and Bundle Editor
 NSString *SPBundleScopeQueryEditor              = @"editor";
-NSString *SPBundleScopeDataTable                = @"dataTable";
-NSString *SPBundleScopeInputField               = @"inputField";
+NSString *SPBundleScopeDataTable                = @"datatable";
+NSString *SPBundleScopeInputField               = @"inputfield";
 NSString *SPBundleScopeGeneral                  = @"general";
-NSString *SPBundleInputSourceSelectedText       = @"selectedText";
-NSString *SPBundleInputSourceEntireContent      = @"entireContent";
-NSString *SPBundleInputSourceCurrentWord        = @"currentWord";
-NSString *SPBundleInputSourceCurrentQuery       = @"currentQuery";
-NSString *SPBundleInputSourceCurrentLine        = @"currentLine";
-NSString *SPBundleInputSourceNone               = @"None";
-NSString *SPBundleOutputActionNone              = @"None";
-NSString *SPBundleOutputActionInsertAsText      = @"insertAsText";
-NSString *SPBundleOutputActionInsertAsSnippet   = @"insertAsSnippet";
-NSString *SPBundleOutputActionReplaceSelection  = @"replaceSelection";
-NSString *SPBundleOutputActionReplaceContent    = @"replaceContent";
-NSString *SPBundleOutputActionShowAsTextTooltip = @"showAsTextTooltip";
-NSString *SPBundleOutputActionShowAsHTMLTooltip = @"showAsHTMLTooltip";
+NSString *SPBundleInputSourceSelectedText       = @"selectedtext";
+NSString *SPBundleInputSourceEntireContent      = @"entirecontent";
+NSString *SPBundleInputSourceCurrentWord        = @"currentword";
+NSString *SPBundleInputSourceCurrentQuery       = @"currentquery";
+NSString *SPBundleInputSourceCurrentLine        = @"currentline";
+NSString *SPBundleInputSourceNone               = @"none";
+NSString *SPBundleOutputActionNone              = @"none";
+NSString *SPBundleOutputActionInsertAsText      = @"insertastext";
+NSString *SPBundleOutputActionInsertAsSnippet   = @"insertassnippet";
+NSString *SPBundleOutputActionReplaceSelection  = @"replaceselection";
+NSString *SPBundleOutputActionReplaceContent    = @"replacecontent";
+NSString *SPBundleOutputActionShowAsTextTooltip = @"showastexttooltip";
+NSString *SPBundleOutputActionShowAsHTMLTooltip = @"showashtmltooltip";
 NSString *SPBundleFileCommandKey                = @"command";
 NSString *SPBundleFileScopeKey                  = @"scope";
 NSString *SPBundleFileNameKey                   = @"name";
@@ -269,11 +269,14 @@ NSString *SPBundleFileInputSourceFallBackKey    = @"input_fallback";
 NSString *SPBundleFileOutputActionKey           = @"output";
 NSString *SPBundleFileKeyEquivalentKey          = @"keyEquivalent";
 NSString *SPBundleFileTooltipKey                = @"tooltip";
+NSString *SPBundleInternLabelKey                = @"label";
+NSString *SPBundleInternPathToFileKey           = @"path";
+NSString *SPBundleInternKeyEquivalentKey        = @"keyEquivalent";
 NSString *SPBundleFileName                      = @"info.plist";
 NSString *SPBundleTaskInputFilePath             = @"/tmp/SP_BUNDLE_TASK_INPUT";
 
 // sequel URL scheme
 NSString *SPURLSchemeQueryInputPathHeader          = @"/tmp/SP_QUERY_";
 NSString *SPURLSchemeQueryResultPathHeader         = @"/tmp/SP_QUERY_RESULT_";
-NSString *SPURLSchemeQueryResultStatusPathHeader   = @"/tmp/SP_QUERY_STATUS_";
+NSString *SPURLSchemeQueryResultStatusPathHeader   = @"/tmp/SP_QUERY_RESULT_STATUS_";
 NSString *SPURLSchemeQueryResultMetaPathHeader     = @"/tmp/SP_QUERY_META_";