diff options
author | Max <post@wickenrode.com> | 2015-05-11 02:04:06 +0200 |
---|---|---|
committer | Max <post@wickenrode.com> | 2015-05-11 02:04:06 +0200 |
commit | 11b8718ddfd44dc5786ac745f90fa390aaf57a06 (patch) | |
tree | 95689086e2ba13016034a0cab3382e5fc7e52084 /Source/SPConnectionController.m | |
parent | 0f11cb74639d17a2fe512ed81d67ccf33601b605 (diff) | |
download | sequelpro-11b8718ddfd44dc5786ac745f90fa390aaf57a06.tar.gz sequelpro-11b8718ddfd44dc5786ac745f90fa390aaf57a06.tar.bz2 sequelpro-11b8718ddfd44dc5786ac745f90fa390aaf57a06.zip |
* Fully enable export of favorite groups
* Favorites can now be imported, sorted even if "Quick Connect" is selected
* Favorite files containing groups will now be imported correctly
* If a favorite and the group containing said favorite are exported, the favorite will no longer be included twice
Diffstat (limited to 'Source/SPConnectionController.m')
-rw-r--r-- | Source/SPConnectionController.m | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 25049d44..d7fce6fb 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -51,6 +51,7 @@ #import "SPFavoritesImporter.h" #import "SPThreadAdditions.h" #import "SPFavoriteColorSupport.h" +#import "SPNamedNode.h" #import <SPMySQL/SPMySQL.h> @@ -738,7 +739,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, { SPTreeNode *node = [self selectedFavoriteNode]; - return (![node isGroup]) ? [[node representedObject] nodeFavorite] : nil; + return (![node isGroup]) ? [(SPFavoriteNode *)[node representedObject] nodeFavorite] : nil; } /** @@ -1045,7 +1046,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, NSSavePanel *savePanel = [NSSavePanel savePanel]; // suggest the name of the favorite or a default name for multiple selection - NSString *fileName = ([[self selectedFavoriteNodes] count] == 1)? [[[self selectedFavorite] objectForKey:SPFavoriteNameKey] stringByAppendingPathExtension:@"plist"] : nil; + NSString *fileName = ([[self selectedFavoriteNodes] count] == 1)? [[(id<SPNamedNode>)[[self selectedFavoriteNode] representedObject] nodeName] stringByAppendingPathExtension:@"plist"] : nil; // This if() is so we can also catch nil due to favorite corruption (NSSavePanel will @throw if nil is passed in) if(!fileName) fileName = SPExportFavoritesFilename; |