nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-15 18:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do show info when no recent documents are present in Welcome Window (fixes #996)

Browse Source
This commit is contained in:
Michael Starke
2019-11-04 16:08:24 +01:00
parent b6a7240534
commit ff72632b3b
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MacPass/MPWelcomeViewController.m
View File

@@ -7,6 +7,7 @@
// //
#import "MPWelcomeViewController.h" #import "MPWelcomeViewController.h"
#import "MPConstants.h"
@interface MPWelcomeViewController () @interface MPWelcomeViewController ()
@@ -26,17 +27,32 @@
} }
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
return NSDocumentController.sharedDocumentController.recentDocumentURLs.count; return MAX(1, NSDocumentController.sharedDocumentController.recentDocumentURLs.count);
} }
- (nullable NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(nullable NSTableColumn *)tableColumn row:(NSInteger)row { - (nullable NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(nullable NSTableColumn *)tableColumn row:(NSInteger)row {
NSTableCellView *view = [tableView makeViewWithIdentifier:tableColumn.identifier owner:self]; NSTableCellView *view = [tableView makeViewWithIdentifier:tableColumn.identifier owner:self];
NSURL *url = NSDocumentController.sharedDocumentController.recentDocumentURLs[row]; NSArray<NSURL *> *recentURLS = NSDocumentController.sharedDocumentController.recentDocumentURLs;
view.textField.stringValue = url.lastPathComponent; if(row > -1 && row < recentURLS.count) {
view.imageView.image = [NSWorkspace.sharedWorkspace iconForFile:url.path]; NSURL *url = recentURLS[row];
view.textField.enabled = YES;
view.imageView.enabled = YES;
view.textField.stringValue = url.lastPathComponent;
view.imageView.image = [NSWorkspace.sharedWorkspace iconForFile:url.path];
}
else {
view.textField.enabled = NO;
view.imageView.enabled = NO;
view.textField.stringValue = NSLocalizedString(@"WELCOME_WINDOW_NO_RECENT_DOCUMENTS", "Text displayed when no recent documents can be displayed in");
view.imageView.image = [NSWorkspace.sharedWorkspace iconForFileType:MPKdbxDocumentUTI];
}
return view; return view;
} }
- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)row {
return (NSDocumentController.sharedDocumentController.recentDocumentURLs.count > 0);
}
- (IBAction)openRecentURL:(id)sender { - (IBAction)openRecentURL:(id)sender {
NSInteger clicked = self.tableView.clickedRow; NSInteger clicked = self.tableView.clickedRow;
NSArray <NSURL *> *recentURLS = NSDocumentController.sharedDocumentController.recentDocumentURLs; NSArray <NSURL *> *recentURLS = NSDocumentController.sharedDocumentController.recentDocumentURLs;