diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-12-11 21:52:44 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-12-11 21:52:44 +0000 |
| commit | 1ddca4732c3aa46698b8fad25ce1294db3cd32fb (patch) | |
| tree | 177ce5977ef37ea98ceae04bbce2f9ba73a0da4d /Source/SPBundleEditorController.m | |
| parent | 66f0041a06b8710cd3ed3b5ff2c8cbb54004efba (diff) | |
| parent | cb2baf9cb4ce1e33e6756969b1f71eb0e011f2c8 (diff) | |
| download | sequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.tar.gz sequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.tar.bz2 sequelpro-1ddca4732c3aa46698b8fad25ce1294db3cd32fb.zip | |
Bring outlineview branch up to date with trunk (r2989:3005).
Diffstat (limited to 'Source/SPBundleEditorController.m')
| -rw-r--r-- | Source/SPBundleEditorController.m | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m index 4091e606..272221d4 100644 --- a/Source/SPBundleEditorController.m +++ b/Source/SPBundleEditorController.m @@ -297,11 +297,6 @@ [anItem setTag:kDataTableScopeArrayIndex]; [inputGeneralScopePopUpMenu addItem:anItem]; [anItem release]; - // [inputGeneralScopePopUpMenu addItem:[NSMenuItem separatorItem]]; - // anItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Disable Command", @"disable command menu label") action:@selector(scopeButtonChanged:) keyEquivalent:@""]; - // [anItem setTag:kDisabledScopeTag]; - // [inputGeneralScopePopUpMenu addItem:anItem]; - // [anItem release]; [scopePopupButton setMenu:inputGeneralScopePopUpMenu]; [keyEquivalentField setCanCaptureGlobalHotKeys:YES]; @@ -327,12 +322,15 @@ @"SP_BUNDLE_INPUT_TABLE_METADATA", @"SP_BUNDLE_PATH", @"SP_BUNDLE_SCOPE", + @"SP_CURRENT_EDITED_COLUMN_NAME", + @"SP_CURRENT_EDITED_TABLE", @"SP_CURRENT_HOST", @"SP_CURRENT_LINE", @"SP_CURRENT_PORT", @"SP_CURRENT_QUERY", @"SP_CURRENT_USER", @"SP_CURRENT_WORD", + @"SP_DATA_TABLE_SOURCE", @"SP_DATABASE_ENCODING", @"SP_ICON_FILE", @"SP_PROCESS_ID", @@ -1038,13 +1036,6 @@ - (void)windowWillClose:(NSNotification *)notification { - // Clear some stuff if window will close to save memory - // [touchedBundleArray removeAllObjects]; - // [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:0] setObject:[NSMutableArray array] forKey:kChildrenKey]; - // [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:1] setObject:[NSMutableArray array] forKey:kChildrenKey]; - // [[[commandBundleTree objectForKey:kChildrenKey] objectAtIndex:2] setObject:[NSMutableArray array] forKey:kChildrenKey]; - // [commandsOutlineView reloadData]; - // Remove temporary drag file if any if(draggedFilePath) { [[NSFileManager defaultManager] removeItemAtPath:draggedFilePath error:nil]; @@ -1095,7 +1086,8 @@ } if(newKeyCombo.flags & NSCommandKeyMask) [keyEq appendString:@"@"]; - [keyEq appendString:theChar]; + if(theChar) + [keyEq appendString:theChar]; } [[self _currentSelectedObject] setObject:keyEq forKey:SPBundleFileKeyEquivalentKey]; |