From 9f5c7db05e8a999df38b200d93031b1475adf5dc Mon Sep 17 00:00:00 2001
From: Bibiko <bibiko@eva.mpg.de>
Date: Tue, 23 Nov 2010 12:45:07 +0000
Subject: =?UTF-8?q?=E2=80=A2=20Bundle=20Editor=20-=20bailed=20out=20from?=
 =?UTF-8?q?=20approach=20to=20assign=20more=20than=20one=20scope=20to=20Bu?=
 =?UTF-8?q?ndle=20commands;=20now=20there're=20three=20scopes=20available:?=
 =?UTF-8?q?=20Input=20Field=20(incl.=20Query=20Editor=20since=20it=20only?=
 =?UTF-8?q?=20differs=20in=20current=5Fquery=20and=20insert=5Fas=5Fsnippet?=
 =?UTF-8?q?=20which=20falls=20back=20to=20current=5Fline=20and=20tooltip?=
 =?UTF-8?q?=20message),=20Data=20Table,=20and=20General=20(which=20means?=
 =?UTF-8?q?=20that=20these=20commands=20are=20available=20app-wide)=20-=20?=
 =?UTF-8?q?moved=20"Disable=20Command"=20to=20scope=20popup=20menu=20since?=
 =?UTF-8?q?=20it's=20related=20-=20Input=20Field=20and=20Data=20Table=20co?=
 =?UTF-8?q?mmands=20will=20be=20shown=20as=20submenus=20in=20the=20Bundles?=
 =?UTF-8?q?=20main=20menu;=20all=20General=20commands=20will=20be=20added?=
 =?UTF-8?q?=20without=20creating=20a=20special=20submenu=20(only=20Categor?=
 =?UTF-8?q?y=20submenus=20will=20be=20generated)=20-=20fixed=20and=20simpl?=
 =?UTF-8?q?ified=20several=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/SPBundleEditorController.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Source/SPBundleEditorController.h')

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;
-- 
cgit v1.2.3