Merge branch 'joe-develop'

Conflicts:
	.gitignore

Author: Chris Wilson

.gitignore

@@ -15,4 +15,6 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+
+# IDEA (IntelliJ/AppCode) settings
 .idea

CoreDataUtil/EntityDataTableView.m

@@ -7,9 +7,8 @@
 //
 
 #import "EntityDataTableView.h"
-#import "MFLButtonTableViewCell.h"
-#import "TransformableDataTableViewCell.h"
 #import "MFLMainWindowController.h"
+#import "MFLTextTableCellView.h"
 
 @implementation EntityDataTableView
 
@@ -23,6 +22,25 @@ - (NSInteger)getRightClickedRow
     return rightClickedRow;
 }
 
+- (void)rightMouseDown:(NSEvent *)theEvent {
+    NSPoint eventLocation = [theEvent locationInWindow];
+    eventLocation = [self convertPoint:eventLocation fromView:nil];
+    rightClickedRow = [self rowAtPoint:eventLocation];
+    rightClickedCol = [self columnAtPoint:eventLocation];
+
+    // get currently selected rows
+    NSIndexSet* indexSet = [self selectedRowIndexes];
+    //NSLog(@"Right clicked at row:%d, col:%d, point:%@, selected:%d", (int)rightClickedRow, (int)rightClickedCol, NSStringFromPoint(eventLocation), (int)indexSet.firstIndex);
+
+    // if user right-clicks on a non-selected row, select that row
+    if (![indexSet containsIndex:(NSUInteger)rightClickedRow]) {
+        [self selectRowIndexes:[NSIndexSet indexSetWithIndex:(NSUInteger)rightClickedRow] byExtendingSelection:NO];
+    }
+
+    // now, show menu for newly selected row
+    [super rightMouseDown:theEvent];
+}
+
 - (NSMenu *)menuForEvent:(NSEvent *)event
 {
     NSMenu *menu = nil;
@@ -38,8 +56,14 @@ - (NSMenu *)menuForEvent:(NSEvent *)event
         copyRowItem = [[NSMenuItem alloc] initWithTitle:@"Copy Formated" action:@selector(copyFormatted:) keyEquivalent:@"C"];
         [copyRowItem setKeyEquivalentModifierMask:0];
         [copyRowItem setKeyEquivalentModifierMask:NSCommandKeyMask];
-        [menu addItem:copyRowItem]; 
-        
+        [menu addItem:copyRowItem];
+
+        // if only 1 row selected, offer 'copy cell' option
+        if (indexSet.count == 1) {
+            copyRowItem = [[NSMenuItem alloc] initWithTitle:@"Copy Cell" action:@selector(copyCell:) keyEquivalent:@"C"];
+            [copyRowItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
+            [menu addItem:copyRowItem];
+        }
     }
 
     return menu;
@@ -138,4 +162,13 @@ - (IBAction) copyFormatted:(id)sender
     [self copySelectedRow:YES];
 }
 
+- (IBAction) copyCell:(id)sender {
+    MFLTextTableCellView *cell = [self viewAtColumn:rightClickedCol row:rightClickedRow makeIfNecessary:NO];
+    NSLog(@"copyCell: r:%d, c:%d, %@", (int)rightClickedRow, (int)rightClickedCol, cell.infoField.stringValue);
+
+    NSPasteboard *pb = [NSPasteboard generalPasteboard];
+    [pb declareTypes:@[NSStringPboardType] owner:nil];
+    [pb setString:cell.infoField.stringValue forType:NSStringPboardType];
+}
+
 @end

CoreDataUtil/MFLMainWindowController.m

@@ -62,6 +62,7 @@ @interface MFLMainWindowController ()
 @property (strong) NSArray* baseRowTemplates;
 @property (weak) IBOutlet NSPredicateEditor *predicateEditor;
 @property (strong) OutlineViewNode *rootNode;
+@property NSDateFormatter *dateFormatter;
 
 @end
 
@@ -411,22 +412,32 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         else if ([valueObj isKindOfClass:[NSString class]])
         {
             NSString* cellText = [NSString stringWithFormat:@"%@", valueObj];
-            MFLTextTableCellView* textCell = [MFLCellBuilder textCellWithString:tableView textToSet:cellText owner:self];
-            return textCell;
+            if ([cellText hasPrefix:@"http"]) {
+                MFLButtonTableViewCell* buttonCell = [tableView makeViewWithIdentifier:MFL_BUTTON_CELL owner:self];
+                [[buttonCell infoField] setTextColor:[NSColor blackColor]];
+                [[buttonCell infoField] setStringValue: cellText];
+                return buttonCell;
+            }
+            else {
+                MFLTextTableCellView* textCell = [MFLCellBuilder textCellWithString:tableView textToSet:cellText owner:self];
+                return textCell;
+            }
         }
         else if ([valueObj isKindOfClass:[NSURL class]])
         {
             NSURL* url = (NSURL*) valueObj;
             NSString* cellText = [NSString stringWithFormat:@"%@", [url absoluteString]];
-            MFLTextTableCellView* textCell = [MFLCellBuilder textCellWithString:tableView textToSet:cellText owner:self];
-            return textCell;
+            MFLButtonTableViewCell* buttonCell = [tableView makeViewWithIdentifier:MFL_BUTTON_CELL owner:self];
+            [[buttonCell infoField] setTextColor:[NSColor blackColor]];
+            [[buttonCell infoField] setStringValue: cellText];
+            return buttonCell;
+//            MFLTextTableCellView* textCell = [MFLCellBuilder textCellWithString:tableView textToSet:cellText owner:self];
+//            return textCell;
         }
         else if ([valueObj isKindOfClass:[NSDate class]])
         {
-            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-            [dateFormatter setDateStyle:self.dateStyle];
-            [dateFormatter setTimeStyle:self.dateStyle];
-            NSString *cellText = [dateFormatter stringFromDate:valueObj];
+            [self setupDateFormatter];
+            NSString *cellText = [self.dateFormatter stringFromDate:valueObj];
             MFLTextTableCellView* textCell = [MFLCellBuilder textCellWithString:tableView textToSet:cellText owner:self];
 
             return textCell;
@@ -439,7 +450,15 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
         }
         else if ([valueObj isKindOfClass:[NSNumber class]])
         {
-            NSString* cellText = [NSString stringWithFormat:@"%@", valueObj];
+            NSString* cellText;
+            NSNumber *number = valueObj;
+            // get 'type' of NSNumber to determine if this is a Boolean data type
+            if (strcmp(number.objCType, @encode(BOOL)) == 0) {
+                cellText = [NSString stringWithFormat:@"%@", number.boolValue ? @"YES" : @"NO"];
+            }
+            else {
+                cellText = [NSString stringWithFormat:@"%@", valueObj];
+            }
             MFLTextTableCellView* textCell = [MFLCellBuilder numberCellWithString:tableView textToSet:cellText owner:self];
             return textCell;
         }
@@ -558,6 +577,25 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn
     return nil;
 }
 
+- (void)setupDateFormatter {
+    if (self.dateFormatter == nil) {
+        self.dateFormatter = [[NSDateFormatter alloc] init];
+    }
+    switch (self.dateStyle) {
+        case NSDateFormatterShortStyle:
+            [self.dateFormatter setDateFormat:@"M/d/YY h:mm a"];
+            break;
+        case NSDateFormatterMediumStyle:
+            [self.dateFormatter setDateFormat:@"MM/dd/YY hh:mm a"];
+            break;
+        default:
+            // use original formatting
+            [self.dateFormatter setDateStyle:self.dateStyle];
+            [self.dateFormatter setTimeStyle:self.dateStyle];
+            break;
+    }
+}
+
 #pragma mark - Outline view
 
 - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
@@ -995,6 +1033,16 @@ - (IBAction)entityCellButtonClicked:(id)sender
             [self.coreDataIntrospection updateCoreDataHistory:[[[set firstObject] entity] name] predicate:predicate objectType:MFLObjectTypeEntity];
             [self enableDisableHistorySegmentedControls];
         }
+        else if ([valueObj isKindOfClass:[NSString class]]) {
+            NSString *string = valueObj;
+            if ([string hasPrefix:@"http"]) {
+                [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:string]];
+            }
+        }
+        else if ([valueObj isKindOfClass:[NSURL class]]) {
+            NSURL *url = valueObj;
+            [[NSWorkspace sharedWorkspace] openURL:url];
+        }
     }
 }