// // VersionsViewController.m // Perforce // // Created by Adam Czubernat on 18/12/2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "VersionsViewController.h" #import "VersionsViewCell.h" #import "PSTableRowView.h" #import "PSCoverFlow.h" #import "P4Workspace.h" #import "P4Item.h" @interface VersionsViewController () <NSTableViewDataSource, NSTableViewDelegate, PSCoverFlowDelegate> { P4Item *item; __unsafe_unretained id <P4ItemActionDelegate> actionDelegate; NSMutableArray *versions; NSMutableDictionary *shelved; CGFloat *rowHeights; NSMutableArray *tableItems; // Outlets __weak IBOutlet NSTableView *tableView; __weak IBOutlet PSCoverFlow *coverFlow; } - (void)updateRows; - (void)loadVersions; - (void)loadDetails:(NSArray *)paths; - (void)loadShelved; - (void)versionAction:(NSButton *)sender; - (void)shelveAction:(NSButton *)sender; @end @implementation VersionsViewController - (id)initWithItem:(P4Item *)anItem actionDelegate:(id<P4ItemActionDelegate>)delegate { if (self = [self initWithNibName:NSStringFromClass([self class]) bundle:nil]) { item = anItem; actionDelegate = delegate; } return self; } - (void)dealloc { free(rowHeights); rowHeights = NULL; } - (void)loadView { [super loadView]; [self reload]; } #pragma mark - Public - (void)reload { versions = [NSMutableArray array]; tableItems = [NSMutableArray arrayWithObject:[NSNull null]]; free(rowHeights); rowHeights = NULL; [tableView reloadData]; [self loadVersions]; } #pragma mark - Private - (void)updateRows { [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(updateRows) object:nil]; [tableView updateRowsHeightFromIndex:0 toIndex:tableItems.count]; } - (void)loadVersions { NSString *path = item.path; NSString *action = item.status; BOOL skipFirstSection = YES; if (action) { if ([action isEqualToString:@"delete"] || [action isEqualToString:@"move/delete"]) { path = item.remotePath; skipFirstSection = NO; } else if ([action isEqualToString:@"move/add"]) { path = [item.metadata objectForKey:@"movedFile"]; skipFirstSection = NO; } } [[P4Workspace sharedInstance] listVersions:path response:^(P4Operation *operation, NSArray *response) { // Add shelved row if (item.isShelved) [tableItems addObject:shelved = [NSMutableDictionary dictionary]]; NSMutableArray *paths = [NSMutableArray array]; for (NSDictionary *version in response) { // Append versions NSArray *items = [version objectForKey:@"versions"]; [versions addObjectsFromArray:items]; // Get version path NSString *path = [version objectForKey:@"depotFile"]; if (paths.count || !skipFirstSection) // Don't show section for first path [tableItems addObject:path]; // Use as section in table // Store path with revision number (there could be new file at that path) NSNumber *rev = [[items objectAtIndex:0] objectForKey:@"rev"]; path = [path stringByAppendingFormat:@"#%@", rev]; [paths addObject:path]; // Append table Items [tableItems addObjectsFromArray:items]; } free(rowHeights); rowHeights = calloc(tableItems.count, sizeof(CGFloat)); // Add new rows if (tableItems.count > 1) [tableView insertRowsFromIndex:1 toIndex:tableItems.count-1 withAnimation:NSTableViewAnimationEffectFade]; // Load details [self loadDetails:paths]; // Load shelved details [self loadShelved]; }]; } - (void)loadDetails:(NSArray *)paths { if (!paths.count) { // Remove loading [tableItems removeObjectAtIndex:0]; [tableView removeRowsFromIndex:0 toIndex:0 withAnimation:NSTableViewAnimationSlideUp]; return; } [coverFlow reload]; [self.view.window makeFirstResponder:coverFlow]; [[P4Workspace sharedInstance] listVersionsDetails:paths response:^(P4Operation *operation, NSArray *response) { [response enumerateObjectsUsingBlock:^(NSDictionary *record, NSUInteger idx, BOOL *stop) { NSMutableDictionary *versionItem = [versions objectAtIndex:idx]; NSNumber *versionChange = [versionItem objectForKey:@"change"]; NSNumber *recordChange = [record objectForKey:@"headChange"]; #warning TODO // NSAssert([versionChange isEqual:recordChange], @"Version details " // "doesn't match %@, %@", versionItem, record); if (![versionChange isEqual:recordChange]) return; // Append new details [versionItem addEntriesFromDictionary:record]; }]; // Remove loading [tableItems removeObjectAtIndex:0]; [tableView removeRowsFromIndex:0 toIndex:0 withAnimation:NSTableViewAnimationSlideUp]; [tableView reloadDataForRowsFromIndex:0 toIndex:tableItems.count-1]; [tableView updateRowsHeightFromIndex:0 toIndex:tableItems.count-1]; [coverFlow reloadImagesInRange:(NSRange) { 0, tableItems.count }]; }]; }; - (void)loadShelved { if (!shelved) return; [[P4Workspace sharedInstance] listShelvedFiles:@[ item.path ] response:^(P4Operation *operation, NSArray *response) { if (operation.errors || !response.count) return; [shelved addEntriesFromDictionary:[response objectAtIndex:0]]; NSInteger idx = [tableItems indexOfObjectIdenticalTo:shelved]; [tableView reloadDataForRowsFromIndex:idx toIndex:idx]; }]; } #pragma mark Actions - (void)versionAction:(NSButton *)sender { NSInteger row = [tableView selectedRow]; NSDictionary *tableItem = [tableItems objectAtIndex:row]; NSString *path = [tableItem objectForKey:@"depotFile"]; NSNumber *rev = [tableItem objectForKey:@"headRev"]; NSString *versionPath = versionPath = [NSString stringWithFormat:@"%@#%@", path, rev]; if (!versionPath) return; if (sender.tag) [item performAction:@selector(revertToVersion:) object:versionPath delegate:actionDelegate]; else [item performAction:@selector(openVersion:) object:versionPath delegate:actionDelegate]; } - (void)shelveAction:(NSButton *)sender { if (sender.tag == 2) [item performAction:@selector(discardShelve) object:nil delegate:actionDelegate]; else if (sender.tag == 1) [item performAction:@selector(unshelve) object:nil delegate:actionDelegate]; else [item performAction:@selector(openShelve) object:nil delegate:actionDelegate]; } #pragma mark - NSTableView data source - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { return tableItems.count; } - (CGFloat)tableView:(NSTableView *)table heightOfRow:(NSInteger)row { id tableItem = [tableItems objectAtIndex:row]; if (![tableItem isKindOfClass:[NSDictionary class]]) return 32.0f; if (tableItem == shelved) return 74.0f; return rowHeights[row] ?: 114.0f; } - (NSTableRowView *)tableView:(NSTableView *)tableView rowViewForRow:(NSInteger)row { PSTableRowView *rowView = [[PSTableRowView alloc] init]; rowView.selectionColor = nil; return rowView; } - (NSView *)tableView:(NSTableView *)aTableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { id tableItem = [tableItems objectAtIndex:row]; if (tableItem == shelved) { VersionsViewCell *cell; cell = [tableView makeViewWithIdentifier:@"ShelveCell" owner:self]; [cell setShelveDictionary:tableItem]; [cell setShowsButtons:YES]; [cell setButtonsTarget:self]; [cell setButtonsAction:@selector(shelveAction:)]; rowHeights[row] = [cell rowHeight]; return cell; } else if ([tableItem isKindOfClass:[NSDictionary class]]) { VersionsViewCell *cell; cell = [tableView makeViewWithIdentifier:@"VersionCell" owner:self]; [cell setVersionDictionary:tableItem]; NSString *tags = [tableItem objectForKey:@"attr-tags"]; [cell setTags:[tags componentsSeparatedByString:@","]]; NSString *statusColorKey = kColorStatusAvailable; if ([versions indexOfObjectIdenticalTo:tableItem] == 0) { // Set status color for latest version if (item.status) statusColorKey = kColorStatusCheckedOut; else if (item.statusOwner) statusColorKey = kColorStatusCheckedOutSomeone; } [cell setStatusColor:[NSUserDefaults colorForKey:statusColorKey]]; NSString *action = [tableItem objectForKey:@"headAction"]; BOOL showButtons = action && ![action isEqual:@"delete"] && ![action isEqual:@"move/delete"]; [cell setShowsButtons:showButtons]; [cell setButtonsTarget:self]; [cell setButtonsAction:@selector(versionAction:)]; if (!rowHeights[row]) { [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(updateRows) object:nil]; [self performSelector:@selector(updateRows) withObject:nil afterDelay:0.01f]; } rowHeights[row] = [cell rowHeight]; return cell; } else if ([tableItem isKindOfClass:[NSNull class]]) { NSView *indicatorCell = [tableView makeViewWithIdentifier:@"LoadingCell" owner:self]; [[indicatorCell.subviews lastObject] startAnimation:nil]; return indicatorCell; } else { NSTableCellView *cell = [tableView makeViewWithIdentifier:@"HeaderCell" owner:self]; cell.textField.stringValue = tableItem; cell.toolTip = tableItem; return cell; } } - (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row { id tableItem = [tableItems objectAtIndex:row]; return [tableItem isKindOfClass:[NSDictionary class]]; } //- (NSIndexSet *)tableView:(NSTableView *)tableView selectionIndexesForProposedSelection:(NSIndexSet *)proposedSelectionIndexes { // NSInteger row = proposedSelectionIndexes.firstIndex; // id tableItem = row < 0 ? nil : [tableItems objectAtIndex:row]; // if ([versionItems containsObject:tableItem]) // return proposedSelectionIndexes; // return [NSIndexSet indexSetWithIndex:proposedSelectionIndexes.firstIndex+1]; //} - (void)tableViewSelectionDidChange:(NSNotification *)notification { if (tableView.selectedRow == -1) return; id tableItem = [tableItems objectAtIndex:tableView.selectedRow]; NSInteger index = [versions indexOfObjectIdenticalTo:tableItem]; [coverFlow setSelectedIndex:index]; } #pragma mark - PSCoverFlow delegate - (NSInteger)numberOfImagesInCoverFlow:(id)coverFlow { return versions.count; } - (NSImage *)coverFlow:(id)coverFlow imageForIndex:(NSInteger)index { NSDictionary *versionItem = [versions objectAtIndex:index]; NSData *data = [versionItem objectForKey:@"attr-thumb"]; return [[NSImage alloc] initWithData:data]; } - (void)coverFlow:(id)coverFlow didSelectIndex:(NSInteger)index { // Translate index id versionItem = [versions objectAtIndex:index]; NSInteger row = [tableItems indexOfObjectIdenticalTo:versionItem]; [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; NSRect rowRect = [tableView rectOfRow:row]; NSPoint scrollOrigin = rowRect.origin; [[[tableView.enclosingScrollView contentView] animator] setBoundsOrigin:scrollOrigin]; } @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 16817 | christoph_leithner | "Forking branch Main of perforce-software-piper to christoph_leithner-piper." | ||
//guest/perforce_software/piper/main/mac/R2.0/Perforce/Classes/ViewControllers/Versions/VersionsViewController.m | |||||
#1 | 16507 | perforce_software | Move to main branch. | ||
//guest/perforce_software/piper/mac/R2.0/Perforce/Classes/ViewControllers/Versions/VersionsViewController.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/ViewControllers/Versions/VersionsViewController.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/ViewControllers/Versions/VersionsViewController.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/ViewControllers/Versions/VersionsViewController.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |