aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-09-26 14:49:42 +0000
committerstuconnolly <stuart02@gmail.com>2010-09-26 14:49:42 +0000
commit25ef15930d0b8d4ce558ca89e721910aa2391dd8 (patch)
tree2eeb3e57f0758639d155d2f9e1976a594b23d9d9
parent8fbd6bbedd98e012b2b2a56e3c9a87672e55e179 (diff)
downloadsequelpro-25ef15930d0b8d4ce558ca89e721910aa2391dd8.tar.gz
sequelpro-25ef15930d0b8d4ce558ca89e721910aa2391dd8.tar.bz2
sequelpro-25ef15930d0b8d4ce558ca89e721910aa2391dd8.zip
- Correctly sort connection favourites upon startup for both the connection and preferences view. Fixes issue #807.
- Remove the default favourite indicator from the preferences view.
-rw-r--r--Interfaces/English.lproj/Preferences.xib135
-rw-r--r--Resources/Images/blue-tick.tiffbin16400 -> 0 bytes
-rw-r--r--Source/SPConnectionController.m30
-rw-r--r--Source/SPPreferenceController.m57
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj5
5 files changed, 81 insertions, 146 deletions
diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib
index d5f42095..6712a625 100644
--- a/Interfaces/English.lproj/Preferences.xib
+++ b/Interfaces/English.lproj/Preferences.xib
@@ -3,7 +3,7 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,28 +15,23 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>788</string>
+ <string>804</string>
<string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2041"/>
- <integer value="1174"/>
+ <integer value="409"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.brandonwalkin.BWToolkit</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -57,7 +52,7 @@
<string key="NSWindowTitle">Preferences</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{580, 50}</string>
<object class="NSView" key="NSWindowView" id="1006">
<nil key="NSNextResponder"/>
@@ -66,7 +61,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{580, 72}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomView" id="594324362">
<nil key="NSNextResponder"/>
@@ -479,7 +474,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="432854223">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="1035618107">
@@ -605,7 +600,7 @@
<reference key="NSNextResponder" ref="594324362"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{202.5, 176}, {360, 5}}</string>
- <string key="NSBounds">{{8, 0}, {344, 5}}</string>
+ <string key="NSBounds">{{8.5, 0}, {343, 5}}</string>
<reference key="NSSuperview" ref="594324362"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -617,7 +612,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="1714513">
+ <object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@@ -736,9 +731,11 @@
<nil key="NS.nil"/>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <object class="NSDictionary" key="NSAttributes" id="469277987">
+ <object class="NSDictionary" key="NSAttributes" id="938616923">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@@ -1304,7 +1301,7 @@
<nil key="NS.nil"/>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="469277987"/>
+ <reference key="NSAttributes" ref="938616923"/>
</object>
<real value="0.0" key="NS.min"/>
<real value="100000" key="NS.max"/>
@@ -1709,7 +1706,7 @@
<object class="NSTableView" id="279932544">
<reference key="NSNextResponder" ref="253139122"/>
<int key="NSvFlags">4370</int>
- <string key="NSFrameSize">{230, 358}</string>
+ <string key="NSFrameSize">{231, 358}</string>
<reference key="NSSuperview" ref="253139122"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -1721,7 +1718,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="22246087">
<string key="NSIdentifier">name</string>
- <double key="NSWidth">204</double>
+ <double key="NSWidth">228</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1758,35 +1755,6 @@
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="279932544"/>
</object>
- <object class="NSTableColumn" id="764023792">
- <string key="NSIdentifier">default</string>
- <double key="NSWidth">20</double>
- <double key="NSMinWidth">20</double>
- <double key="NSMaxWidth">20</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerColor</string>
- <reference key="NSColor" ref="1714513"/>
- </object>
- <reference key="NSTextColor" ref="263643234"/>
- </object>
- <object class="NSImageCell" key="NSDataCell" id="53403050">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">33685504</int>
- <reference key="NSSupport" ref="26"/>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
- </object>
- <reference key="NSTableView" ref="279932544"/>
- </object>
</object>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
@@ -1842,6 +1810,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {311, 15}}</string>
<reference key="NSSuperview" ref="533802223"/>
+ <bool key="NSEnabled">YES</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="533802223"/>
<string key="NSAction">_doScroller:</string>
@@ -1851,7 +1820,7 @@
<string key="NSFrame">{{-2, 22}, {232, 360}}</string>
<reference key="NSSuperview" ref="984943037"/>
<reference key="NSNextKeyView" ref="253139122"/>
- <int key="NSsFlags">530</int>
+ <int key="NSsFlags">658</int>
<reference key="NSVScroller" ref="940130901"/>
<reference key="NSHScroller" ref="2545381"/>
<reference key="NSContentView" ref="253139122"/>
@@ -2115,7 +2084,7 @@
<reference key="NSBackgroundColor" ref="1001357688"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes>
+ <bytes key="NSWhite">MC41MDQwMzIyNTQyAA</bytes>
</object>
</object>
</object>
@@ -2468,7 +2437,7 @@
<reference key="NSBackgroundColor" ref="1001357688"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes>
+ <bytes key="NSWhite">MC41MDQwMzIyNTQyAA</bytes>
</object>
</object>
</object>
@@ -2636,7 +2605,7 @@
<reference key="NSBackgroundColor" ref="1001357688"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41MDQwMzIyNTgxAA</bytes>
+ <bytes key="NSWhite">MC41MDQwMzIyNTQyAA</bytes>
</object>
</object>
</object>
@@ -3669,7 +3638,7 @@ AQAAAAA</bytes>
<nil key="NS.nil"/>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="469277987"/>
+ <reference key="NSAttributes" ref="938616923"/>
</object>
<real value="0.0" key="NS.min"/>
<real value="10000" key="NS.max"/>
@@ -4063,7 +4032,7 @@ AQAAAAA</bytes>
</object>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="469277987"/>
+ <reference key="NSAttributes" ref="938616923"/>
</object>
<real value="1" key="NS.min"/>
<real value="20" key="NS.max"/>
@@ -4377,7 +4346,7 @@ AQAAAAA</bytes>
<nil key="NS.nil"/>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="469277987"/>
+ <reference key="NSAttributes" ref="938616923"/>
</object>
<real value="0.5" key="NS.min"/>
<real value="20" key="NS.max"/>
@@ -4522,7 +4491,7 @@ AQAAAAA</bytes>
<nil key="NS.nil"/>
<object class="NSAttributedString" key="NS.nan">
<string key="NSString">NaN</string>
- <reference key="NSAttributes" ref="469277987"/>
+ <reference key="NSAttributes" ref="938616923"/>
</object>
<real value="0.10000000000000001" key="NS.min"/>
<real value="5" key="NS.max"/>
@@ -9517,7 +9486,6 @@ AQAAAAA</bytes>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="22246087"/>
- <reference ref="764023792"/>
</object>
<reference key="parent" ref="533802223"/>
</object>
@@ -11621,20 +11589,6 @@ AQAAAAA</bytes>
<reference key="parent" ref="369742224"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1636</int>
- <reference key="object" ref="764023792"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="53403050"/>
- </object>
- <reference key="parent" ref="279932544"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">1639</int>
- <reference key="object" ref="53403050"/>
- <reference key="parent" ref="764023792"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">1640</int>
<reference key="object" ref="512106570"/>
<reference key="parent" ref="982657201"/>
@@ -12673,8 +12627,6 @@ AQAAAAA</bytes>
<string>1616.IBPluginDependency</string>
<string>1618.IBPluginDependency</string>
<string>1620.IBPluginDependency</string>
- <string>1636.IBPluginDependency</string>
- <string>1639.IBPluginDependency</string>
<string>1640.IBPluginDependency</string>
<string>1669.IBAttributePlaceholdersKey</string>
<string>1669.IBPluginDependency</string>
@@ -13323,8 +13275,6 @@ AQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
@@ -13625,7 +13575,7 @@ AQAAAAA</bytes>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>{{55, 304}, {580, 381}}</string>
+ <string>{{244, 330}, {580, 381}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -14850,14 +14800,6 @@ AQAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSImageCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="693087342">
@@ -15158,6 +15100,27 @@ AQAAAAA</bytes>
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
diff --git a/Resources/Images/blue-tick.tiff b/Resources/Images/blue-tick.tiff
deleted file mode 100644
index c1264c64..00000000
--- a/Resources/Images/blue-tick.tiff
+++ /dev/null
Binary files differ
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index aefca1fd..6e760a9d 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -94,7 +94,7 @@
isConnecting = NO;
mySQLConnectionCancelled = NO;
favoritesPBoardType = @"FavoritesPBoardType";
-
+
// Load the connection nib, keeping references to the top-level objects for later release
nibObjectsToRelease = [[NSMutableArray alloc] init];
NSArray *connectionViewTopLevelObjects = nil;
@@ -106,17 +106,20 @@
// Hide the main view and position and display the connection view
[databaseConnectionView setHidden:YES];
[connectionView setFrame:[databaseConnectionView frame]];
- [databaseConnectionSuperview addSubview:connectionView];
+ [databaseConnectionSuperview addSubview:connectionView];
[connectionSplitView setPosition:[[tableDocument valueForKey:@"dbTablesTableView"] frame].size.width-6 ofDividerAtIndex:0];
[connectionSplitViewButtonBar setSplitViewDelegate:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollViewFrameChanged:) name:NSViewFrameDidChangeNotification object:nil];
-
+
// Set up a keychain instance and preferences reference, and create the initial favorites list
keychain = [[SPKeychain alloc] init];
prefs = [[NSUserDefaults standardUserDefaults] retain];
+
favorites = nil;
+
+ // Load favorites
[self updateFavorites];
-
+
// Register an observer for changes within the favorites
[prefs addObserver:self forKeyPath:SPFavorites options:NSKeyValueObservingOptionNew context:NULL];
@@ -131,7 +134,7 @@
[favoritesTable setDraggingSourceOperationMask:NSDragOperationMove forLocal:YES];
// Sort the favourites to match prefs and select the appropriate row
- if (currentSortItem > -1) [self _sortFavorites];
+ [self _sortFavorites];
NSInteger tableRow = ([prefs integerForKey:[prefs boolForKey:SPSelectLastFavoriteUsed] ? SPLastFavoriteIndex : SPDefaultFavorite] + 1);
@@ -140,11 +143,13 @@
[favoritesTable selectRowIndexes:[NSIndexSet indexSetWithIndex:tableRow] byExtendingSelection:NO];
[self resizeTabViewToConnectionType:[[[favorites objectAtIndex:tableRow] objectForKey:@"type"] integerValue] animating:NO];
[favoritesTable scrollRowToVisible:[favoritesTable selectedRow]];
- } else {
+ }
+ else {
previousType = SPTCPIPConnection;
[self resizeTabViewToConnectionType:SPTCPIPConnection animating:NO];
}
}
+
return self;
}
@@ -488,26 +493,27 @@
* interface, allowing the application to run as normal.
*/
- (void)addConnectionToDocument
-{
-
+{
// Hide the connection view and restore the main view
[connectionView removeFromSuperviewWithoutNeedingDisplay];
[databaseConnectionView setHidden:NO];
-
+
// Restore the toolbar icons
NSArray *toolbarItems = [[[tableDocument parentWindow] toolbar] items];
+
for (NSInteger i = 0; i < [toolbarItems count]; i++) [[toolbarItems objectAtIndex:i] setEnabled:YES];
// Set keychain id for saving SPF files
- if([self valueForKeyPath:@"selectedFavorite.id"])
+ if ([self valueForKeyPath:@"selectedFavorite.id"]) {
[tableDocument setKeychainID:[[self valueForKeyPath:@"selectedFavorite.id"] stringValue]];
- else
+ }
+ else {
[tableDocument setKeychainID:@""];
+ }
// Pass the connection to the table document, allowing it to set
// up the other classes and the rest of the interface.
[tableDocument setConnection:mySQLConnection];
-
}
#pragma mark -
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index f12cd54a..4441c75d 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -109,10 +109,8 @@
[prefs synchronize];
- if (currentSortItem > -1) {
- [self _sortFavorites];
- }
-
+ // Sort favorites
+ [self _sortFavorites];
NSTableColumn *column;
SPColorWellCell *colorCell;
@@ -903,9 +901,6 @@
#pragma mark -
#pragma mark TableView datasource methods
-// -------------------------------------------------------------------------------
-// numberOfRowsInTableView:
-// -------------------------------------------------------------------------------
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
if(aTableView == colorSettingTableView)
@@ -916,26 +911,18 @@
return [[favoritesController arrangedObjects] count];
}
-// -------------------------------------------------------------------------------
-// tableView:objectValueForTableColumn:row:
-// -------------------------------------------------------------------------------
- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
{
- if(tableView == colorSettingTableView) {
- if ([[tableColumn identifier] isEqualToString:@"name"])
- return [editorNameForColors objectAtIndex:rowIndex];
- else
- return [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:rowIndex]]];
- } else if(tableView == editThemeListTable) {
+ if (tableView == colorSettingTableView) {
+ return ([[tableColumn identifier] isEqualToString:@"name"]) ? [editorNameForColors objectAtIndex:rowIndex] : [NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:[editorColors objectAtIndex:rowIndex]]];
+ }
+ else if (tableView == editThemeListTable) {
return [editThemeListItems objectAtIndex:rowIndex];
- } else {
- if ([[tableColumn identifier] isEqualToString:@"default"] && (rowIndex == [prefs integerForKey:SPDefaultFavorite])) {
- return [NSImage imageNamed:@"blue-tick"];
- }
- else {
- return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]];
- }
+ }
+ else {
+ return [[[favoritesController arrangedObjects] objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]];
}
+
return nil;
}
@@ -988,9 +975,6 @@
#pragma mark -
#pragma mark TableView drag & drop delegate methods
-// -------------------------------------------------------------------------------
-// tableView:writeRowsWithIndexes:toPasteboard:
-// -------------------------------------------------------------------------------
- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rows toPasteboard:(NSPasteboard*)pboard
{
@@ -1007,9 +991,6 @@
}
}
-// -------------------------------------------------------------------------------
-// tableView:validateDrop:proposedRow:proposedDropOperation:
-// -------------------------------------------------------------------------------
- (NSDragOperation)tableView:(NSTableView *)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)operation
{
@@ -1031,9 +1012,6 @@
return NSDragOperationNone;
}
-// -------------------------------------------------------------------------------
-// tableView:acceptDrop:row:dropOperation:
-// -------------------------------------------------------------------------------
- (BOOL)tableView:(NSTableView *)tv acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
{
@@ -1068,8 +1046,9 @@
}
draggedRow = [NSMutableDictionary dictionaryWithDictionary:[[favoritesController arrangedObjects] objectAtIndex:originalRow]];
- //Before deleting this favorite, we need to save the current index.
- //because removeObjectAtArrangedObjectIndex will set prefs LastFavoriteIndex to 0
+
+ // Before deleting this favorite, we need to save the current index.
+ // because removeObjectAtArrangedObjectIndex will set prefs LastFavoriteIndex to 0
lastFavoriteIndexCached = [prefs integerForKey:SPLastFavoriteIndex];
[favoritesController removeObjectAtArrangedObjectIndex:originalRow];
@@ -1117,9 +1096,6 @@
return YES;
}
-// -------------------------------------------------------------------------------
-// tableView:willDisplayCell:forTableColumn:row:
-// -------------------------------------------------------------------------------
- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)index
{
@@ -1161,12 +1137,8 @@
}
}
-// -------------------------------------------------------------------------------
-// tableViewSelectionDidChange:
-// -------------------------------------------------------------------------------
- (void)tableViewSelectionDidChange:(NSNotification *)notification
{
-
if([notification object] == colorSettingTableView) return;
if ([[favoritesTableView selectedRowIndexes] count] > 0) {
@@ -1205,9 +1177,6 @@
#pragma mark -
#pragma mark Toolbar delegate methods
-// -------------------------------------------------------------------------------
-// toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:
-// -------------------------------------------------------------------------------
- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
{
if ([itemIdentifier isEqualToString:SPPreferenceToolbarGeneral]) {
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 14975672..a2cca3d9 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -89,7 +89,6 @@
17CC97F310B4ABE90034CD7A /* SPAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17CC97F210B4ABE90034CD7A /* SPAboutController.m */; };
17CC97F710B4AC6C0034CD7A /* AboutPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17CC97F510B4AC6C0034CD7A /* AboutPanel.xib */; };
17CC993B10B4C9C80034CD7A /* License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 17CC993A10B4C9C80034CD7A /* License.rtf */; };
- 17D3649811DFE61B00CC9413 /* blue-tick.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17D3649711DFE61B00CC9413 /* blue-tick.tiff */; };
17DCC5C7115C202700F89A00 /* MCPStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 17DCC5C5115C202700F89A00 /* MCPStringAdditions.h */; };
17DD52B7115071D0007D8950 /* sequel-pro-print-template.html in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52B6115071D0007D8950 /* sequel-pro-print-template.html */; };
17DD52C3115074B3007D8950 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52C1115074B3007D8950 /* InfoPlist.strings */; };
@@ -608,7 +607,6 @@
17CC97F210B4ABE90034CD7A /* SPAboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPAboutController.m; sourceTree = "<group>"; };
17CC97F610B4AC6C0034CD7A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Interfaces/English.lproj/AboutPanel.xib; sourceTree = "<group>"; };
17CC993A10B4C9C80034CD7A /* License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = License.rtf; sourceTree = "<group>"; };
- 17D3649711DFE61B00CC9413 /* blue-tick.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "blue-tick.tiff"; sourceTree = "<group>"; };
17DA04EA0FC1A7DA00D66140 /* Unit Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Unit Tests-Info.plist"; path = "Plists/Unit Tests-Info.plist"; sourceTree = "<group>"; };
17DCC5C5115C202700F89A00 /* MCPStringAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCPStringAdditions.h; sourceTree = "<group>"; };
17DD52B6115071D0007D8950 /* sequel-pro-print-template.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "sequel-pro-print-template.html"; path = "Templates/sequel-pro-print-template.html"; sourceTree = "<group>"; };
@@ -1729,7 +1727,6 @@
isa = PBXGroup;
children = (
17BFC80D10D3FF5200A3B112 /* Icons */,
- 17D3649711DFE61B00CC9413 /* blue-tick.tiff */,
BCCDED62115940CB00285E65 /* sync_arrows_01.tiff */,
BCCDED63115940CB00285E65 /* sync_arrows_02.tiff */,
BCCDED64115940CB00285E65 /* sync_arrows_03.tiff */,
@@ -2354,6 +2351,7 @@
isa = PBXProject;
buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "sequel-pro" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -2538,7 +2536,6 @@
BCCDED6D115940CB00285E65 /* sync_arrows_06.tiff in Resources */,
58A8A72711A0149100B95749 /* MainWindow.xib in Resources */,
17A7773811C52E61001E27B4 /* IndexesView.xib in Resources */,
- 17D3649811DFE61B00CC9413 /* blue-tick.tiff in Resources */,
58E205FC1234FE4F00A97059 /* KeyTemplate.pdf in Resources */,
58A137CD123ED5E6000B1B75 /* titlebarlock.png in Resources */,
);