aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPTableInfo.m
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
committerAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
commit57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch)
treedd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPTableInfo.m
parentb5e972f4504043dfb9c358e272e93fb59ae2127f (diff)
parent0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff)
downloadsequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPTableInfo.m')
-rw-r--r--Source/SPTableInfo.m15
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m
index 38d06b3e..e1ce3e4d 100644
--- a/Source/SPTableInfo.m
+++ b/Source/SPTableInfo.m
@@ -35,6 +35,7 @@
#import "SPTableData.h"
#import "SPActivityTextFieldCell.h"
#import "SPTableTextFieldCell.h"
+#import "SPAppController.h"
@interface SPTableInfo (PrivateAPI)
@@ -77,7 +78,7 @@
object:nil];
// Add activities header
- [activities addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"ACTIVITIES", @"header for activities pane"), @"name", nil]];
+ [activities addObject:@{@"name" : NSLocalizedString(@"ACTIVITIES", @"header for activities pane")}];
[activitiesTable reloadData];
// Add Information header
@@ -109,9 +110,9 @@
NSMutableArray *acts = [NSMutableArray array];
[acts removeAllObjects];
- [acts addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"ACTIVITIES", @"header for activities pane"), @"name", nil]];
+ [acts addObject:@{@"name" : NSLocalizedString(@"ACTIVITIES", @"header for activities pane")}];
[acts addObjectsFromArray:[tableDocumentInstance runningActivities]];
- [acts addObjectsFromArray:[[NSApp delegate] runningActivities]];
+ [acts addObjectsFromArray:[SPAppDelegate runningActivities]];
_activitiesWillBeUpdated = YES;
@@ -388,11 +389,11 @@
if (rowIndex > 0) return NO;
if (![tableInfoScrollView isHidden]) {
- [tableDocumentInstance setActivityPaneHidden:[NSNumber numberWithInteger:0]];
+ [tableDocumentInstance setActivityPaneHidden:@0];
[[NSApp mainWindow] makeFirstResponder:activitiesTable];
}
else {
- [tableDocumentInstance setActivityPaneHidden:[NSNumber numberWithInteger:1]];
+ [tableDocumentInstance setActivityPaneHidden:@1];
[[NSApp mainWindow] makeFirstResponder:infoTable];
}
@@ -469,8 +470,8 @@
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [info release];
- [activities release];
+ SPClear(info);
+ SPClear(activities);
[super dealloc];
}