// // PSBrowser.m // Perforce // // Created by Adam Czubernat on 18.06.2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "PSBrowser.h" @interface PSBrowser () { CGFloat detailViewWidth; } - (void)layoutDetailViewAnimated:(BOOL)animated; - (void)detailViewFrameChange:(NSNotification *)notification; - (void)lastColumnFrameChange:(NSNotification *)notification; - (NSTableView *)browserTableViewForColumn:(NSInteger)column; @end @implementation PSBrowser @synthesize detailViewController, columnBackgroundColor; // Dirty hack typedef struct __BrcvFlags { unsigned int isEmptyColumn:1; unsigned int hasMarkedWidth:1; unsigned int tileDisabled:1; unsigned int drawsColumnDividerLine:1; unsigned int reserved:28; } __BrcvFlags; - (BOOL)sendAction { // Remove details pane if ([self selectedRowInColumn:[self lastColumn]] == -1 || // When deselected row [self selectionIndexPaths].count > 1) // or multiple selection [self setDetailViewController:nil]; return [super sendAction]; } - (void)loadColumnZero { [super loadColumnZero]; [self setDetailViewController:nil]; } - (void)addColumn { [super addColumn]; // Hack to get column view NSTableView *tableView = [self browserTableViewForColumn:self.lastColumn]; NSClipView *clipView = (id)tableView.superview; NSView *columnView = clipView.superview; // Hack to disable divider line in _NSBrowserColumnView from private api __BrcvFlags *flags = PSRuntimeAddressOfInstanceVariable(columnView, "_brcvFlags"); flags->drawsColumnDividerLine = 0; // Set background color if (columnBackgroundColor) [tableView setBackgroundColor:columnBackgroundColor]; // Remove tableColumn with default indicators if ([tableView isKindOfClass:[NSTableView class]] && tableView.tableColumns.count) [tableView removeTableColumn:tableView.tableColumns.lastObject]; // Insert separator at the end of columnTableView static NSImage *image; if (!image) { image = [NSImage imageNamed:@"SeparatorVerticalDark.png"]; image = [image resizableImageWithTopCap:10.0f bottomCap:10.0f]; } CGRect frame = columnView.bounds; frame.origin.x = frame.size.width - image.size.width + 2.0f; frame.size.width = image.size.width; frame.origin.y = -200.0f; // Size it bigger than scroll frame.size.height += 400.0f; PSView *separator = [[PSView alloc] initWithFrame:frame]; [separator setAutoresizing:NSViewAutoresizingRightEdge | NSViewAutoresizingVertical]; [separator setImage:image]; [clipView addSubview:separator]; } - (NSRect)frameOfColumn:(NSInteger)column { CGRect frame = [super frameOfColumn:column]; if (column) frame.origin.x -= 1.0f; // Remove divider width return frame; } - (void)setFrame:(NSRect)frameRect { [super setFrame:frameRect]; [self layoutDetailViewAnimated:NO]; } - (BOOL)ignoreModifierKeysForDraggingSession:(NSDraggingSession *)session { return NO; } - (void)keyDown:(NSEvent *)event { unichar keyChar = [[event charactersIgnoringModifiers] characterAtIndex:0]; NSUInteger flags = [event modifierFlags] & NSDeviceIndependentModifierFlagsMask; if (keyChar == ' ' && flags == 0) { // Send space bar notification [self.nextResponder doCommandBySelector:@selector(toggleQuickLookPreviewPanel:)]; } else if (keyChar == NSUpArrowFunctionKey || keyChar == NSDownArrowFunctionKey) { // Relay Up and Down arrow keys from other views (QuickLook) NSView *tableView = [self browserTableViewForColumn:self.selectedColumn]; [tableView keyDown:event]; } else { [super keyDown:event]; } } - (BOOL)performKeyEquivalent:(NSEvent *)theEvent { unichar keyChar = [[theEvent charactersIgnoringModifiers] characterAtIndex:0]; if (keyChar == 27) { [self abortEditing]; [[self window] makeFirstResponder:self]; return YES; } return NO; } #pragma mark - Public - (void)setDetailViewController:(NSViewController *)aDetailViewController { if (detailViewController == aDetailViewController) return; [[NSNotificationCenter defaultCenter] removeObserver:self name:NSViewFrameDidChangeNotification object:nil]; [detailViewController.view removeFromSuperview]; detailViewController = aDetailViewController; detailViewWidth = detailViewController.view.frame.size.width; if (detailViewController) { NSArray *columns = [self valueForKey:@"_columns"]; NSView *lastColumn = [columns objectAtIndex:self.lastColumn]; NSView *view = detailViewController.view; [view setAutoresizing:NSViewAutoresizingLeftEdge | NSViewAutoresizingVertical]; [lastColumn.superview addSubview:view]; [self layoutDetailViewAnimated:YES]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(detailViewFrameChange:) name:NSViewFrameDidChangeNotification object:view]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(lastColumnFrameChange:) name:NSViewFrameDidChangeNotification object:lastColumn]; } } - (NSInteger)columnOfItem:(id)item { NSAssert(![self isLeafItem:item], @"Getting column for leaf item"); for (NSInteger column = 0; column <= [self lastColumn]; column++) if ([self parentForItemsInColumn:column] == item) return column; return -1; } #pragma mark - Private - (void)layoutDetailViewAnimated:(BOOL)animated { if (!detailViewController) return; NSView *detailView = detailViewController.view; NSArray *columns = [self valueForKey:@"_columns"]; NSView *lastColumn = [columns objectAtIndex:self.lastColumn]; NSView *columnContainer = [lastColumn superview]; NSScrollView *scrollView = self.subviews.firstObject; NSClipView *contentView = [scrollView contentView]; CGRect frame = lastColumn.frame; frame.origin.x += frame.size.width; frame.size.width = detailView.bounds.size.width; detailView.frame = frame; if ([self inLiveResize]) { frame = columnContainer.frame; frame.size.width = CGRectGetMaxX(detailView.frame); columnContainer.frame = frame; return; } frame = columnContainer.frame; CGFloat oldWidth = frame.size.width; CGFloat newWidth = CGRectGetMaxX(detailView.frame); if (oldWidth == newWidth) return; void (^animation)() = ^{ }; frame.size.width = newWidth; if (oldWidth < newWidth) { CGPoint boundsOrigin = contentView.bounds.origin; columnContainer.frame = frame; CGRect bounds = contentView.bounds; bounds.origin = boundsOrigin; [contentView setBounds:bounds]; CGPoint point = detailView.frame.origin; point.x -= self.bounds.size.width - detailView.bounds.size.width; point.x = fmax(point.x, 0.0f); animation = ^{ [(animated ? [contentView animator] : contentView) setBoundsOrigin:point]; [scrollView reflectScrolledClipView:contentView]; }; } if (animated) [NSView animateWithDuration:0.1f animations:animation]; else animation(); } - (void)detailViewFrameChange:(NSNotification *)notification { CGFloat newDetailViewWidth = detailViewController.view.frame.size.width; if (detailViewWidth != newDetailViewWidth) { [self layoutDetailViewAnimated:YES]; detailViewWidth = newDetailViewWidth; } } - (void)lastColumnFrameChange:(NSNotification *)notification { [self layoutDetailViewAnimated:NO]; [self performSelector:@selector(layoutDetailViewAnimated:) withObject:@(YES) afterDelay:0]; } - (NSTableView *)browserTableViewForColumn:(NSInteger)column { if (column < 0) return nil; // Hack to get column views NSArray *columns = [self valueForKey:@"_columns"]; NSView *columnView = [columns objectAtIndex:column]; // Retrieve NSBrowserTableView from subviews NSClipView *clipView = nil; NSTableView *tableView = nil; for (NSView *subview in columnView.subviews) { if ([subview isKindOfClass:[NSClipView class]]) clipView = (id)subview; } for (NSView *subview in clipView.subviews) { if ([subview isKindOfClass:NSClassFromString(@"NSBrowserTableView")]) tableView = (id)subview; } return tableView; } @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 18548 | Robert Cowham | Merge from Main. | ||
#1 | 16507 | perforce_software | Move to main branch. | ||
//guest/perforce_software/piper/mac/R2.0/Perforce/Classes/Views/PSBrowser.m | |||||
#1 | 12962 | alan_petersen |
Populate -o //guest/perforce_software/piper/mac/main/... //guest/perforce_software/piper/mac/R2.0/.... |
||
//guest/perforce_software/piper/mac/main/Perforce/Classes/Views/PSBrowser.m | |||||
#2 | 12961 | alan_petersen |
Piper 2.0 Mega Update New Features/Functionality - Added help menu redirecting to URL. - Added readonly property for creating new workspaces. - Added html hyperlinks for Copy link functionality. - Added functionality for managing Finder Favorite items in sidebar. - Redesigned the way mapping is stored in Piper. - First version of syncing finder sidebar items with workspace mapping. - Small sorting improvements. - Creating Projects directory inside users home folder. - Adding Projects folder to finder sidebar item. - Creating and removing symbolic links accordingly to mapped folders. - Preventing duplicate names in symbolic links. - Refreshing symbolic links on mapping change inside application. - Storing workspace and server details in p4 configuration for other applications to use. - Added contextual menu items for Finder integration. - Added services menu for Adobe Illustrator integration. - Keyboard shortcuts for Illustrator integration. - Code refactoring and fixes for mapping issues. - Added Finder functionality to edit all files in folder. - Added user friendly message when editing a file using Finder outside the workspace. - Implemented hidden automatic login when opening application using Finder integration. - Logging to file in ~/Library/Logs - Unified workspace and all files views to show both local and depot files and folders. - Removed my workspace view references and logic. - Editing unmapped files on server. - First version of adding file to unmapped folders. - Showing opened by and edit actions in column details for all depot files. - Improved mappings functionality. - Enabled same feature options for mapped and unmapped folders and files. - Redesigned from scratch mapping and unmapping procedures for adding and removing files. - Implemented cleaning workspace using new mapping functionality. Removed debug overlay coloring. - Automated workspace creation - Improvements in editing files already mapped to workspace. - Implemented deleting remote files. - Implemented first version of move operation for remote files. - Removing last workspace information when disconnecting from workspace using app menu. - Implemented editing and submitting using symbolic links in project folder. New finder menu service for symbolic links Show in Piper which acts like share link functionality. - New icons for files and folders not tracked in the filesystem. - Improvements in showing file using share link. - Switched to new way of retrieving files in order to show user changes. - Redesigned and implemented new functionality for chaining operations with mapping. - Improvements and redesign of Edit/add actions to use new chaining logic . Fixed issue with file edit. - Improvements in window showing when using services. - Simplified file loading so the local files appears only when remote are also loaded. - Improved deleting of untracked files to avoid mapping and marking for delete. - Enabling simple copy paste and moving of remote and local files. - Added abort for exception handling in order to force crashing application on critical failures - Added custom exception handling for catching runtime errors to log and crash instead of continuing in unstable state. - Changed file copying to use mark for add . - Simplified and fixed responding file representations to mapping changes. Bug Fixes - Fixed crash when synchronizing. - Fixed sync issue when downloading directory without file size information. - Fixed issue with unread list crashing when file is not existing on disk. - Fixed incorrect sync progress calculation. - Removed relative path issues. - Fixed many of case-sensitivity problems. - Fixed deprecated methods and related issues in OS X 10.10. - Fixed folder rename not updating in column view. Revised and fixed many potential problems from implicit casting. - Fixed missing sync button on fast sync completion. - Refreshing mapping on synchronization. Fixed symbolic links not appearing until app is restarted. - Fixed latest crashing of autosync. - Fixed loading indicator issues. - Fixed and redesigned submit dialog to work correctly with Submit All Files option in Finder. - Fixed multiple error messages on network outage. Redesigned showing errors in main window. - Fixed opening random locations when using Finder integration. - Fixed issue when panel was detached from parent window. - Fixed bug when creating new workspace wouldn't store default settings. - Fixed memory issues with network operations. - Fixes in relogging mappings and file listing. - Improvements in editing unmapped files. - Fixed crash when adding file outside workspace. - Fixed breadcrumbs control issue. - Fixed issue with double parent folders when opening unmapped files. - Fixed crashes on sync after mapping new files. - Fixed issue with editing file using Finder -- Merging code and additional fixes in add button functionality. - Fixed unsync not working - Fixed submit panel issue not selecting files with different name case. - Fixed missing revert and sync to workspace actions in some cases. - Fixed issue with Submit and Edit finder actions. Improvements in stability of finder integration. - Fixed issue with unsubmitted folders breaking status of files inside. - Fixed issue with added files not showing correct icon and status. - Fixed bug with file edit resulting in a new directory named exactly like a file. - Fixed issue with reloading of subpath resulting in untracked folders. - Fixed mapping issue when result was always view mapping not relative. - Fixed submit panel showing more than once. - Fixed illustrator services not working. - Fixed userdefaults preferences problem with workspace name being null. - Fixed userdefaults keypath problem of dot-containing workspace names. - Forcing recreating of browser to possibly prevent pre-10.10 errors with automatic workspace selection. - Fixed adding file to depot not presenting correct icon. - Fixed issues with reverting a file that was marked for add. - Presenting error when trying to submit untracked files. - Fixed issue when submit files service crashed when using unmapped files. - Fixed file representation disappearing when removing file. - Fixed issue with symlinks resolving working on 10.10 only. Issue related to workspace selection not showing. - Fixed error panel method calls unavailable in Mac OS versions before 10.10. Issue related to hanging error panels. - Fixed removing a local file resulting in action progress freezing. - Fixed open file not working after edit. - Fixing crash when mapping changed. Issue related to moving local file to unmapped folder and other similar cases. |
||
#1 | 11252 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/mac/Perforce/Classes/Views/PSBrowser.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/Views/PSBrowser.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |