- Fixed NSFontPanel issue. Now showing font collections in Font Panel

- Replaced some toolbar icons with new ones
- Edited some toolbar icons. 
- Added keyboard shortcut section to preferences (Disabled for now)

14 files changed, 58 insertions, 27 deletions

diff --git a/Resources/Images/toolbar-preferences-network.tiff b/Resources/Images/toolbar-preferences-network.tiff
new file mode 100644
index 00000000..49091b77
--- /dev/null
+++ b/Resources/Images/toolbar-preferences-network.tiff
diff --git a/Resources/Images/toolbar-preferences-queryeditor.tiff b/Resources/Images/toolbar-preferences-queryeditor.tiff
new file mode 100644
index 00000000..0cc2d2df
--- /dev/null
+++ b/Resources/Images/toolbar-preferences-queryeditor.tiff
diff --git a/Resources/Images/toolbar-preferences-shortcuts.png b/Resources/Images/toolbar-preferences-shortcuts.png
new file mode 100644
index 00000000..700dde81
--- /dev/null
+++ b/Resources/Images/toolbar-preferences-shortcuts.png
diff --git a/Resources/Images/toolbar-preferences-tables.tiff b/Resources/Images/toolbar-preferences-tables.tiff
index b3efdb75..20b05e36 100644
--- a/Resources/Images/toolbar-preferences-tables.tiff
+++ b/Resources/Images/toolbar-preferences-tables.tiff
diff --git a/Resources/Images/toolbar-switch-to-browse.png b/Resources/Images/toolbar-switch-to-browse.png
deleted file mode 100644
index 762659f8..00000000
--- a/Resources/Images/toolbar-switch-to-browse.png
+++ /dev/null
diff --git a/Resources/Images/toolbar-switch-to-browse.tiff b/Resources/Images/toolbar-switch-to-browse.tiff
new file mode 100644
index 00000000..207a8902
--- /dev/null
+++ b/Resources/Images/toolbar-switch-to-browse.tiff
diff --git a/Resources/Images/toolbar-switch-to-sql.png b/Resources/Images/toolbar-switch-to-sql.png
deleted file mode 100644
index 9c1a58a1..00000000
--- a/Resources/Images/toolbar-switch-to-sql.png
+++ /dev/null
diff --git a/Resources/Images/toolbar-switch-to-sql.tiff b/Resources/Images/toolbar-switch-to-sql.tiff
new file mode 100644
index 00000000..0cc2d2df
--- /dev/null
+++ b/Resources/Images/toolbar-switch-to-sql.tiff
diff --git a/Resources/Images/toolbar-switch-to-structure.png b/Resources/Images/toolbar-switch-to-structure.png
index 0e2c819a..e500b3d5 100644
--- a/Resources/Images/toolbar-switch-to-structure.png
+++ b/Resources/Images/toolbar-switch-to-structure.png
diff --git a/Resources/Images/toolbar-switch-to-table-info.png b/Resources/Images/toolbar-switch-to-table-info.png
index 3a72aecf..9aaaccf7 100644
--- a/Resources/Images/toolbar-switch-to-table-info.png
+++ b/Resources/Images/toolbar-switch-to-table-info.png
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index 3aa90ce0..da538fe2 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -220,6 +220,7 @@ closes the sheet
 	// "Editor font..." menu item to bring up the font panel
 	if (sender == editorFontMenuItem) {
 		[[NSFontPanel sharedFontPanel] setPanelFont:[textView font] isMultiple:NO];
+		[[NSFontPanel sharedFontPanel] setDelegate:self];
 		[[NSFontPanel sharedFontPanel] makeKeyAndOrderFront:self];
 	}
 
@@ -1393,6 +1394,12 @@ traps enter key and
 		[prefs setObject:[NSArchiver archivedDataWithRootObject:[textView font]] forKey:@"CustomQueryEditorFont"];
 }
 
+// set font panel's valid modes
+- (unsigned int)validModesForFontPanel:(NSFontPanel *)fontPanel
+{
+	return (NSFontPanelAllModesMask ^ NSFontPanelAllEffectsModeMask);
+}
+
 
 #pragma mark -
 #pragma mark MySQL Help
diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index 778be090..1147351e 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -64,6 +64,7 @@
 	NSToolbarItem *autoUpdateItem;
 	NSToolbarItem *networkItem;
 	NSToolbarItem *editorItem;
+	NSToolbarItem *shortcutItem;
 
 	NSUserDefaults *prefs;
 }
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 597024a3..1f10eede 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -38,6 +38,7 @@
 #define PREFERENCE_TOOLBAR_AUTOUPDATE		@"Preference Toolbar Auto Update"
 #define PREFERENCE_TOOLBAR_NETWORK			@"Preference Toolbar Network"
 #define PREFERENCE_TOOLBAR_EDITOR			@"Preference Toolbar Editor"
+#define PREFERENCE_TOOLBAR_SHORTCUTS		@"Preference Toolbar Shortcuts"
 
 #pragma mark -
 
@@ -588,6 +589,9 @@
 	else if ([itemIdentifier isEqualToString:PREFERENCE_TOOLBAR_EDITOR]) {
 		return editorItem;
 	}
+	else if ([itemIdentifier isEqualToString:PREFERENCE_TOOLBAR_SHORTCUTS]) {
+		return shortcutItem;
+	}
 	
     return [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
 }
@@ -597,7 +601,7 @@
 // -------------------------------------------------------------------------------
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
 {
-    return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, PREFERENCE_TOOLBAR_EDITOR, nil];
+    return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_EDITOR, PREFERENCE_TOOLBAR_SHORTCUTS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, nil];
 }
 
 // -------------------------------------------------------------------------------
@@ -605,7 +609,7 @@
 // -------------------------------------------------------------------------------
 - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
 {
-    return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, PREFERENCE_TOOLBAR_EDITOR, nil];
+    return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_EDITOR, PREFERENCE_TOOLBAR_SHORTCUTS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, nil];
 }
 
 // -------------------------------------------------------------------------------
@@ -613,7 +617,7 @@
 // -------------------------------------------------------------------------------
 - (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
 {
-	return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, PREFERENCE_TOOLBAR_EDITOR, nil];
+	return [NSArray arrayWithObjects:PREFERENCE_TOOLBAR_GENERAL, PREFERENCE_TOOLBAR_TABLES, PREFERENCE_TOOLBAR_FAVORITES, PREFERENCE_TOOLBAR_NOTIFICATIONS, PREFERENCE_TOOLBAR_EDITOR, PREFERENCE_TOOLBAR_SHORTCUTS, PREFERENCE_TOOLBAR_AUTOUPDATE, PREFERENCE_TOOLBAR_NETWORK, nil];
 }
 
 #pragma mark -
@@ -799,7 +803,7 @@
 // set font panel's valid modes
 - (unsigned int)validModesForFontPanel:(NSFontPanel *)fontPanel
 {
-   return (NSFontPanelFaceModeMask | NSFontPanelSizeModeMask);
+   return (NSFontPanelAllModesMask ^ NSFontPanelAllEffectsModeMask);
 }
 // Action receiver for a font change in the font panel
 - (void)changeFont:(id)sender
@@ -861,11 +865,27 @@
 	// Notification preferences
 	notificationsItem = [[NSToolbarItem alloc] initWithItemIdentifier:PREFERENCE_TOOLBAR_NOTIFICATIONS];
 
-	[notificationsItem setLabel:NSLocalizedString(@"Notifications", @"")];
+	[notificationsItem setLabel:NSLocalizedString(@"Alerts", @"")];
 	[notificationsItem setImage:[NSImage imageNamed:@"toolbar-preferences-notifications"]];
 	[notificationsItem setTarget:self];
 	[notificationsItem setAction:@selector(displayNotificationPreferences:)];
 
+	// Editor preferences
+	editorItem = [[NSToolbarItem alloc] initWithItemIdentifier:PREFERENCE_TOOLBAR_EDITOR];
+	
+	[editorItem setLabel:NSLocalizedString(@"Query Editor", @"")];
+	[editorItem setImage:[NSImage imageNamed:@"toolbar-preferences-queryeditor"]];
+	[editorItem setTarget:self];
+	[editorItem setAction:@selector(displayEditorPreferences:)];
+	
+	// Shortcut preferences
+	shortcutItem = [[NSToolbarItem alloc] initWithItemIdentifier:PREFERENCE_TOOLBAR_SHORTCUTS];
+	
+	[shortcutItem setLabel:NSLocalizedString(@"Shortcuts", @"")];
+	[shortcutItem setImage:[NSImage imageNamed:@"toolbar-preferences-shortcuts"]];
+	[shortcutItem setTarget:self];
+	[shortcutItem setAction:@selector(NSBeep)];
+	
 	// AutoUpdate preferences
 	autoUpdateItem = [[NSToolbarItem alloc] initWithItemIdentifier:PREFERENCE_TOOLBAR_AUTOUPDATE];
 
@@ -882,15 +902,6 @@
 	[networkItem setTarget:self];
 	[networkItem setAction:@selector(displayNetworkPreferences:)];
 
-	// Editor preferences
-	editorItem = [[NSToolbarItem alloc] initWithItemIdentifier:PREFERENCE_TOOLBAR_EDITOR];
-
-	[editorItem setLabel:NSLocalizedString(@"Query Editor", @"")];
-	[editorItem setImage:[NSImage imageNamed:@"toolbar-switch-to-sql"]];
-	[editorItem setTarget:self];
-	[editorItem setAction:@selector(displayEditorPreferences:)];
-
-
 	[toolbar setDelegate:self];
 	[toolbar setSelectedItemIdentifier:PREFERENCE_TOOLBAR_GENERAL];
 	[toolbar setAllowsUserCustomization:NO];
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 26541ea8..774c674f 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -44,8 +44,8 @@
 		17E641E60EF02036001BC333 /* showvariables.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E641B20EF02036001BC333 /* showvariables.tiff */; };
 		17E641E70EF02036001BC333 /* spyglass.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E641B30EF02036001BC333 /* spyglass.tiff */; };
 		17E641E80EF02036001BC333 /* table-small.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E641B40EF02036001BC333 /* table-small.tiff */; };
-		17E641F00EF02036001BC333 /* toolbar-switch-to-browse.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.png */; };
-		17E641F10EF02036001BC333 /* toolbar-switch-to-sql.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.png */; };
+		17E641F00EF02036001BC333 /* toolbar-switch-to-browse.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.tiff */; };
+		17E641F10EF02036001BC333 /* toolbar-switch-to-sql.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.tiff */; };
 		17E641F20EF02036001BC333 /* toolbar-switch-to-structure.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BE0EF02036001BC333 /* toolbar-switch-to-structure.png */; };
 		17E641F30EF02036001BC333 /* toolbar-switch-to-table-info.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E641BF0EF02036001BC333 /* toolbar-switch-to-table-info.png */; };
 		17E641F90EF02088001BC333 /* askForPass.sh in Resources */ = {isa = PBXBuildFile; fileRef = 17E641F40EF02088001BC333 /* askForPass.sh */; };
@@ -117,6 +117,9 @@
 		B5A601870F749C1600EE5FBA /* dimple.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B5A601860F749C1600EE5FBA /* dimple.tiff */; };
 		B5A601970F74C1CE00EE5FBA /* button_refresh.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B5A601960F74C1CE00EE5FBA /* button_refresh.tiff */; };
 		B5A601E30F74DE7F00EE5FBA /* button_edit_mode.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B5A601E20F74DE7F00EE5FBA /* button_edit_mode.tiff */; };
+		B5D93ABB0FC5121300710017 /* toolbar-preferences-network.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B5D93AB80FC5121300710017 /* toolbar-preferences-network.tiff */; };
+		B5D93ABC0FC5121300710017 /* toolbar-preferences-queryeditor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B5D93AB90FC5121300710017 /* toolbar-preferences-queryeditor.tiff */; };
+		B5D93ABD0FC5121300710017 /* toolbar-preferences-shortcuts.png in Resources */ = {isa = PBXBuildFile; fileRef = B5D93ABA0FC5121300710017 /* toolbar-preferences-shortcuts.png */; };
 		B5E2C5FA0F2353B5007446E0 /* table-property.png in Resources */ = {isa = PBXBuildFile; fileRef = B5E2C5F90F2353B5007446E0 /* table-property.png */; };
 		B5E92F190F75B2D100012500 /* ExportDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E92F170F75B2D100012500 /* ExportDialog.xib */; };
 		B5E92F1C0F75B2E800012500 /* SPExportController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5E92F1B0F75B2E800012500 /* SPExportController.m */; };
@@ -244,8 +247,8 @@
 		17E641B20EF02036001BC333 /* showvariables.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = showvariables.tiff; sourceTree = "<group>"; };
 		17E641B30EF02036001BC333 /* spyglass.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = spyglass.tiff; sourceTree = "<group>"; };
 		17E641B40EF02036001BC333 /* table-small.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-small.tiff"; sourceTree = "<group>"; };
-		17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-switch-to-browse.png"; sourceTree = "<group>"; };
-		17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-switch-to-sql.png"; sourceTree = "<group>"; };
+		17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "toolbar-switch-to-browse.tiff"; sourceTree = "<group>"; };
+		17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "toolbar-switch-to-sql.tiff"; sourceTree = "<group>"; };
 		17E641BE0EF02036001BC333 /* toolbar-switch-to-structure.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-switch-to-structure.png"; sourceTree = "<group>"; };
 		17E641BF0EF02036001BC333 /* toolbar-switch-to-table-info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-switch-to-table-info.png"; sourceTree = "<group>"; };
 		17E641F40EF02088001BC333 /* askForPass.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = askForPass.sh; sourceTree = "<group>"; };
@@ -340,6 +343,9 @@
 		B5A601860F749C1600EE5FBA /* dimple.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = dimple.tiff; sourceTree = "<group>"; };
 		B5A601960F74C1CE00EE5FBA /* button_refresh.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_refresh.tiff; sourceTree = "<group>"; };
 		B5A601E20F74DE7F00EE5FBA /* button_edit_mode.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = button_edit_mode.tiff; sourceTree = "<group>"; };
+		B5D93AB80FC5121300710017 /* toolbar-preferences-network.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "toolbar-preferences-network.tiff"; sourceTree = "<group>"; };
+		B5D93AB90FC5121300710017 /* toolbar-preferences-queryeditor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "toolbar-preferences-queryeditor.tiff"; sourceTree = "<group>"; };
+		B5D93ABA0FC5121300710017 /* toolbar-preferences-shortcuts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toolbar-preferences-shortcuts.png"; sourceTree = "<group>"; };
 		B5E2C5F90F2353B5007446E0 /* table-property.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "table-property.png"; sourceTree = "<group>"; };
 		B5E92F180F75B2D100012500 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ExportDialog.xib; sourceTree = "<group>"; };
 		B5E92F1A0F75B2E800012500 /* SPExportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPExportController.h; sourceTree = "<group>"; };
@@ -665,17 +671,20 @@
 				B5E2C5F90F2353B5007446E0 /* table-property.png */,
 				17E641B40EF02036001BC333 /* table-small.tiff */,
 				584F5F8E0F50ACD800036517 /* table-view-small.tiff */,
-				B57748370F7A8B57003B34F9 /* toolbar-preferences-advanced.tiff */,
-				B58730EA0F8381A600087794 /* toolbar-preferences-autoupdate.tiff */,
-				B577483B0F7A8B57003B34F9 /* toolbar-preferences-favorites.png */,
 				B57748380F7A8B57003B34F9 /* toolbar-preferences-general.tiff */,
-				B577483C0F7A8B57003B34F9 /* toolbar-preferences-network.png */,
+				B577483E0F7A8B57003B34F9 /* toolbar-preferences-tables.tiff */,
+				B577483B0F7A8B57003B34F9 /* toolbar-preferences-favorites.png */,
 				B57748390F7A8B57003B34F9 /* toolbar-preferences-notifications.tiff */,
+				B5D93AB90FC5121300710017 /* toolbar-preferences-queryeditor.tiff */,
+				B5D93ABA0FC5121300710017 /* toolbar-preferences-shortcuts.png */,
+				B58730EA0F8381A600087794 /* toolbar-preferences-autoupdate.tiff */,
+				B577483C0F7A8B57003B34F9 /* toolbar-preferences-network.png */,
+				B5D93AB80FC5121300710017 /* toolbar-preferences-network.tiff */,
+				B57748370F7A8B57003B34F9 /* toolbar-preferences-advanced.tiff */,
 				B577483D0F7A8B57003B34F9 /* toolbar-preferences-security.tiff */,
-				B577483E0F7A8B57003B34F9 /* toolbar-preferences-tables.tiff */,
-				17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.png */,
+				17E641BC0EF02036001BC333 /* toolbar-switch-to-browse.tiff */,
 				B5F4F7800F7BCF990059AE84 /* toolbar-switch-to-procedures.tiff */,
-				17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.png */,
+				17E641BD0EF02036001BC333 /* toolbar-switch-to-sql.tiff */,
 				17E641BE0EF02036001BC333 /* toolbar-switch-to-structure.png */,
 				17E641BF0EF02036001BC333 /* toolbar-switch-to-table-info.png */,
 				B5E92F350F75B32100012500 /* toolbar-export-csv.tiff */,
@@ -880,8 +889,8 @@
 				17E641E60EF02036001BC333 /* showvariables.tiff in Resources */,
 				17E641E70EF02036001BC333 /* spyglass.tiff in Resources */,
 				17E641E80EF02036001BC333 /* table-small.tiff in Resources */,
-				17E641F00EF02036001BC333 /* toolbar-switch-to-browse.png in Resources */,
-				17E641F10EF02036001BC333 /* toolbar-switch-to-sql.png in Resources */,
+				17E641F00EF02036001BC333 /* toolbar-switch-to-browse.tiff in Resources */,
+				17E641F10EF02036001BC333 /* toolbar-switch-to-sql.tiff in Resources */,
 				17E641F20EF02036001BC333 /* toolbar-switch-to-structure.png in Resources */,
 				17E641F30EF02036001BC333 /* toolbar-switch-to-table-info.png in Resources */,
 				17E6420A0EF020CB001BC333 /* DBView.xib in Resources */,
@@ -935,6 +944,9 @@
 				384582BE0FB95C9100DDACB6 /* Localizable.strings in Resources */,
 				384582C40FB95FF800DDACB6 /* func-small.png in Resources */,
 				384582C70FB9603600DDACB6 /* proc-small.png in Resources */,
+				B5D93ABB0FC5121300710017 /* toolbar-preferences-network.tiff in Resources */,
+				B5D93ABC0FC5121300710017 /* toolbar-preferences-queryeditor.tiff in Resources */,
+				B5D93ABD0FC5121300710017 /* toolbar-preferences-shortcuts.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};