• Bundle Editor

- bailed out from approach to assign more than one scope to Bundle commands; now there're three scopes available: Input Field (incl. Query Editor since it only differs in current_query and insert_as_snippet which falls back to current_line and tooltip message), Data Table, and General (which means that these commands are available app-wide)
- moved "Disable Command" to scope popup menu since it's related
- Input Field and Data Table commands will be shown as submenus in the Bundles main menu; all General commands will be added without creating a special submenu (only Category submenus will be generated)
- fixed and simplified several issues

1 files changed, 5 insertions, 10 deletions

diff --git a/Source/SPBundleEditorController.h b/Source/SPBundleEditorController.h
index eca5659f..e07589e1 100644
--- a/Source/SPBundleEditorController.h
+++ b/Source/SPBundleEditorController.h
@@ -39,10 +39,7 @@
 	IBOutlet NSPopUpButton* inputPopupButton;
 	IBOutlet NSPopUpButton* inputFallbackPopupButton;
 	IBOutlet NSPopUpButton* outputPopupButton;
-	IBOutlet NSButton *editorScopeButton;
-	IBOutlet NSButton *inputFieldScopeButton;
-	IBOutlet NSButton *dataTableScopeButton;
-	IBOutlet NSButton *disableCheckBox;
+	IBOutlet NSPopUpButton* scopePopupButton;
 	IBOutlet NSButton *removeButton;
 	IBOutlet NSMenuItem *duplicateMenuItem;
 	IBOutlet NSMenuItem *revealInFinderMenuItem;
@@ -56,23 +53,21 @@
 	NSString *oldBundleName;
 	BOOL isTableCellEditing;
 
-	NSMenu *inputEditorScopePopUpMenu;
+	NSMenu *inputGeneralScopePopUpMenu;
 	NSMenu *inputInputFieldScopePopUpMenu;
 	NSMenu *inputDataTableScopePopUpMenu;
 	NSMenu *inputNonePopUpMenu;
-	NSMenu *outputEditorScopePopUpMenu;
+	NSMenu *outputGeneralScopePopUpMenu;
 	NSMenu *outputInputFieldScopePopUpMenu;
 	NSMenu *outputDataTableScopePopUpMenu;
-	NSMenu *inputFallbackEditorScopePopUpMenu;
 	NSMenu *inputFallbackInputFieldScopePopUpMenu;
 
-	NSArray *inputEditorScopeArray;
+	NSArray *inputGeneralScopeArray;
 	NSArray *inputInputFieldScopeArray;
 	NSArray *inputDataTableScopeArray;
-	NSArray *outputEditorScopeArray;
+	NSArray *outputGeneralScopeArray;
 	NSArray *outputInputFieldScopeArray;
 	NSArray *outputDataTableScopeArray;
-	NSArray *inputFallbackEditorScopeArray;
 	NSArray *inputFallbackInputFieldScopeArray;
 
 	BOOL doGroupDueToChars;