// // SubmitPanelController.m // Perforce // // Created by Adam Czubernat on 10.07.2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "SubmitPanelController.h" #import "P4Workspace.h" #import "P4ChangelistItem.h" static NSString *lastMessage; @interface SubmitPanelController () <NSTableViewDataSource, NSTableViewDelegate, NSTextViewDelegate, P4ItemDelegate> { P4Item *root; NSMutableArray *items; NSMutableSet *selectedItems; NSMutableArray *selectedPaths; __weak IBOutlet NSView *submitView; __weak IBOutlet NSView *progressView; __weak IBOutlet NSTableView *tableView; __weak IBOutlet NSProgressIndicator *tableIndicator; __unsafe_unretained NSTextView *descriptionTextView; __weak IBOutlet NSTextField *fileCountLabel; __weak IBOutlet NSButton *submitButton; __weak IBOutlet NSProgressIndicator *progressIndicator; __weak IBOutlet NSTextField *progressLabel; __weak IBOutlet NSImageView *successImageView; } - (void)reload; - (void)updateCount; - (void)validateSubmit; - (void)setItem:(P4ChangelistItem *)item selected:(BOOL)selected; - (IBAction)checkmarkPressed:(id)sender; - (IBAction)checkmarkHeaderPressed:(id)sender; - (IBAction)cancelPressed:(id)sender; - (IBAction)submitPressed:(id)sender; @end @implementation SubmitPanelController - (void)windowDidLoad { [super windowDidLoad]; [submitButton setEnabled:NO]; fileCountLabel.stringValue = @""; descriptionTextView.string = lastMessage ? : @""; [tableView setSortDescriptors:@[ [NSSortDescriptor sortDescriptorWithKey: @"remotePath.stringByDeletingLastPathComponent" ascending:YES] ]]; [self setPresentedView:submitView]; [self reload]; [P4ChangelistItem addObserver:self]; } - (void)dealloc { [P4ChangelistItem removeObserver:self]; } #pragma mark - Private - (void)reload { root = nil; items = nil; selectedItems = nil; [tableView reloadData]; [tableIndicator startAnimation:nil]; root = [[P4ChangelistItem alloc] init]; [root children]; // Load children } - (void)updateCount { fileCountLabel.stringValue = [NSString stringWithFormat:@"Selected %ld / %ld", selectedItems.count, items.count]; } - (void)validateSubmit { BOOL enable = descriptionTextView.string.length && selectedItems.count; [submitButton setEnabled:enable]; } - (void)setItem:(P4ChangelistItem *)item selected:(BOOL)selected { if (selected) { [selectedPaths addObject:item.remotePath]; [selectedItems addObject:item]; } else { [selectedPaths removeObject:item.remotePath]; [selectedItems removeObject:item]; } NSInteger row = [items indexOfObjectIdenticalTo:item]; [tableView reloadDataForRowsFromIndex:row toIndex:row]; } #pragma mark - Public - (void)selectPaths:(NSArray *)paths { NSAssert(!paths || [[paths lastObject] hasPrefix:@"//"], @"Selecting local paths to submit"); selectedPaths = [paths mutableCopy]; if (items) [self reload]; } #pragma mark - P4Item delegate - (void)itemDidLoad:(id)item { if (item != root) return; NSInteger visibleRow = 0; selectedItems = [NSMutableSet set]; items = [root.children mutableCopy]; [items sortUsingDescriptors:[tableView sortDescriptors]]; if (selectedPaths) { // Select items from paths NSArray *selected = [items filteredArrayUsingPredicate: [NSPredicate predicateWithFormat: @"remotePath IN %@" " OR metadata.movedFile IN %@", // Check moved files selectedPaths, selectedPaths]]; [selectedItems addObjectsFromArray:selected]; // Get first selected row if (selected.count) visibleRow = [items indexOfObjectIdenticalTo:[selected objectAtIndex:0]]; } else { // Select all selectedItems = [NSMutableSet setWithArray:items]; } [self updateCount]; [self validateSubmit]; [tableView reloadData]; [tableIndicator stopAnimation:nil]; [tableView scrollRowToVisible:visibleRow]; } - (void)itemDidInvalidate:(id)item { } - (void)item:(id)item didFailWithError:(NSError *)error { } #pragma mark - TableView data source - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { return items.count; } - (NSView *)tableView:(NSTableView *)table viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { NSString *identifier = tableColumn.identifier; P4ChangelistItem *item = [items objectAtIndex:row]; NSTableCellView *cell = [tableView makeViewWithIdentifier:identifier owner:self]; if ([identifier isEqualToString:@"checkmark"]) { NSButton *checkmark = [cell viewWithTag:1]; NSAssert(checkmark, @"Submit panel cell should have checkmark with tag=1"); checkmark.state = [selectedItems containsObject:item]; } else if ([identifier isEqualToString:@"filename"]) { cell.textField.stringValue = [item name]; cell.imageView.image = item.icon; } else if ([identifier isEqualToString:@"path"]) { NSString *path = [item remotePath]; cell.textField.stringValue = [path stringByDeletingLastPathComponent]; } else if ([identifier isEqualToString:@"action"]) { NSString *action = item.status; cell.textField.stringValue = action; } return cell; } - (void)tableView:(NSTableView *)aTableView sortDescriptorsDidChange:(NSArray *)oldDescriptors { [items sortUsingDescriptors:[tableView sortDescriptors]]; [tableView reloadData]; } #pragma mark - TextView delegate - (void)textDidChange:(NSNotification *)notification { lastMessage = descriptionTextView.string; [self validateSubmit]; } #pragma mark - Actions - (IBAction)checkmarkPressed:(NSButton *)sender { BOOL selected = sender.state; NSInteger row = [tableView rowForView:sender]; P4ChangelistItem *child = [items objectAtIndex:row]; // Add or remove from selected list [self setItem:child selected:selected]; // Select moved counterpart if ([child.status hasPrefix:@"move/"]) { P4ChangelistItem *moved = [[items filteredArrayUsingPredicate: [NSPredicate predicateWithFormat: @"metadata.movedFile == %@", child.remotePath]] lastObject]; [self setItem:moved selected:selected]; } [self updateCount]; [self validateSubmit]; } - (IBAction)checkmarkHeaderPressed:(NSButton *)sender { if (sender.state) [selectedItems addObjectsFromArray:items]; else [selectedItems removeAllObjects]; [tableView reloadData]; [self updateCount]; [self validateSubmit]; } - (IBAction)cancelPressed:(id)sender { [self dismiss]; } - (IBAction)submitPressed:(id)sender { NSString *description = descriptionTextView.string; [self setPresentedView:progressView animated:YES]; [progressIndicator startAnimation:nil]; [[P4Workspace sharedInstance] submitFiles:[[selectedItems allObjects] valueForKey:@"remotePath"] message:description receive:^(P4Operation *operation) { PSLogm(@"%.2f, %@", operation.progress, operation.progressDescription); } response:^(P4Operation *operation, NSArray *response) { [progressIndicator stopAnimation:nil]; if (operation.errors) { if (![operation errorsWithCode:P4ErrorSessionExpired]) [[NSAlert alertWithError:operation.error] beginSheetModalForWindow:self.window.parentWindow modalDelegate:nil didEndSelector:nil contextInfo:NULL]; [self dismiss]; } else { lastMessage = nil; [successImageView setHidden:NO]; progressLabel.stringValue = @"Success!"; PSLog(@"%@", response); [self dismissAfter:2.0f]; } }]; } @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#3 | 16507 | perforce_software | Move to main branch. | ||
#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/WindowControllers/SubmitPanelController.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/WindowControllers/SubmitPanelController.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |