aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionControllerDelegate.m
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-05-11 02:04:06 +0200
committerMax <post@wickenrode.com>2015-05-11 02:04:06 +0200
commit11b8718ddfd44dc5786ac745f90fa390aaf57a06 (patch)
tree95689086e2ba13016034a0cab3382e5fc7e52084 /Source/SPConnectionControllerDelegate.m
parent0f11cb74639d17a2fe512ed81d67ccf33601b605 (diff)
downloadsequelpro-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/SPConnectionControllerDelegate.m')
-rw-r--r--Source/SPConnectionControllerDelegate.m12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m
index f2a57e53..99af9e35 100644
--- a/Source/SPConnectionControllerDelegate.m
+++ b/Source/SPConnectionControllerDelegate.m
@@ -617,8 +617,6 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
SPTreeNode *node = [self selectedFavoriteNode];
NSInteger selectedRows = [favoritesOutlineView numberOfSelectedRows];
-
- if (node == quickConnectItem) return NO;
if ((action == @selector(sortFavorites:)) || (action == @selector(reverseSortFavorites:))) {
@@ -634,7 +632,14 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
if (action == @selector(reverseSortFavorites:)) {
[menuItem setState:reverseFavoritesSort];
}
+
+ return YES;
}
+
+ // import does not depend on a selection
+ if(action == @selector(importFavorites:)) return YES;
+
+ if (node == quickConnectItem) return NO;
// Remove/rename the selected node
if (action == @selector(removeNode:) || action == @selector(renameNode:)) {
@@ -659,9 +664,6 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
if ([[favoritesRoot allChildLeafs] count] == 0 || selectedRows == 0) {
return NO;
}
- else if (selectedRows == 1) {
- return (![[self selectedFavoriteNode] isGroup]);
- }
else if (selectedRows > 1) {
[menuItem setTitle:NSLocalizedString(@"Export Selected...", @"export selected favorites menu item")];
}