Bug fixes. Vitality failed to run in some cases, possibly because the…

…re were two different .lproj folders for english. Fixed bugs related to switching characters when Market Orders or Contracts were active.

src/Contracts/ContractsViewController.m

@@ -132,11 +132,14 @@ - (void)setCharacter:(Character *)_character
         character = [_character retain];
         [self createContractTables];
         // if view is active we need to reload contracts
+        [self setDbContracts:nil];
         [contracts setCharacter:character];
         [contracts reload:self];
         [app setToolbarMessage:NSLocalizedString(@"Updating Contracts…",@"Updating Contracts status line")];
         [app startLoadingAnimation];
         [self setDbContracts:[self loadContracts]];
+        [contractsTable reloadData];
+        [contractsTable deselectAll:self];
     }
 }
 
@@ -225,7 +228,10 @@ - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColum
 {
     if( 0 == [[self dbContracts] count] )
         return nil;
-
+
+    if( row >= [[self dbContracts] count] )
+        return nil;
+
     Contract *contract = [[self dbContracts] objectAtIndex:row];
     NSString *colID = [tableColumn identifier];
     id value = nil;

src/Core/Controls/MTCountdown.h

@@ -35,6 +35,7 @@
 -(void) drawRect:(NSRect)rect;
 
 -(void) setInterval:(NSInteger)inter;
+-(NSInteger)interval;
 
 -(void) setVisible:(BOOL)vis;
 

src/Core/Controls/MTCountdown.m

@@ -47,6 +47,11 @@ -(void) setInterval:(NSInteger)inter
 	realInterval = MAX(inter,0);
 }
 
+-(NSInteger)interval
+{
+    return realInterval;
+}
+
 -(void) drawRect:(NSRect)rect
 {	
 	NSRect bounds = [self bounds];

src/Core/Controls/MTEveSkillCell.m

@@ -727,7 +727,8 @@ - (void)mouseExited:(NSEvent *)event {
     [(NSControl *)[self controlView] updateCell:self];
 }
 
-- (NSCellHitResult)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView {
+// In 10.10 and later the return type is NSCellHitResult
+- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView {
 
     NSPoint point = [controlView convertPoint:[event locationInWindow] fromView:nil];
 

src/Core/Controls/MTSkillButtonCell.m

@@ -216,7 +216,8 @@ -(BOOL) trackMouse:(NSEvent *)theEvent
 	return YES;
 }
 
-- (NSCellHitResult)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView {
+// In 10.10 and later the return type is NSCellHitResult
+- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView {
 
     NSPoint point = [controlView convertPoint:[event locationInWindow] fromView:nil];
 

src/Core/Controls/MTTableView.m

@@ -67,6 +67,6 @@ - (void) keyDown:(NSEvent *) event
 - (void)copy:(id)sender
 {
     if( [[self delegate] respondsToSelector:@selector(copy:)] )
-        [[self delegate] copy:self];
+        [[self delegate] performSelector:@selector(copy:) withObject:self];
 }
 @end

src/MarketOrders/MarketViewController.m

@@ -63,6 +63,8 @@ - (void)setCharacter:(Character *)_character
         [app setToolbarMessage:NSLocalizedString(@"Updating Market Orders…",@"Updating Market Orders")];
         [app startLoadingAnimation];
         [self setDbOrders:[self loadMarketOrders]];
+        [orderTable reloadData];
+        [orderTable deselectAll:self];
     }
 }
 

src/Views/Character Sheet/CharacterSheetController.m

@@ -455,6 +455,24 @@ -(void) timerTick:(NSTimer*)theTimer
 	[timeRemaining tick];
 	[skillQueueDatasource tick];
 	[skillQueueDisplay setNeedsDisplayInRect:[skillQueueDisplay frameOfCellAtColumn:0 row:0]];
+
+    // TODO: Figure out how to offer notifications on 10.8 and up without breaking 10.6 support
+//    Class testUserNotification = NSClassFromString(@"NSUserNotification");
+//
+//    if( testUserNotification && (0 == [timeRemaining interval]) )
+//    {
+//        SkillPlan *queue = [[self character] trainingQueue];
+//        if( [queue skillCount] > 0 )
+//        {
+//            SkillPair *pair =[queue skillAtIndex:0];
+//
+//            NSUserNotification *notification = [[[NSUserNotification alloc] init] autorelease];
+//            notification.title = @"Skill Training Complete!";
+//            notification.informativeText = [pair roman];
+//            notification.soundName = NSUserNotificationDefaultSoundName;
+//            [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+//        }
+//    }
 }
 
 -(void) deleteCurrentPortrait:(id)notUsed

src/VitalityMail/METMail.m

@@ -346,6 +346,9 @@ - (void)loadMessageBodies:(NSArray *)messageIDs
                                  }];
     messageIDs = [messageIDs objectsAtIndexes:missingBodies];
 
+    if( 0 == [messageIDs count] )
+        return;
+
     NSString *messageIDString = [NSString stringWithFormat:@"ids=%@", [messageIDs componentsJoinedByString:@","]];
     [self startMailDownloadToPath:@"/char/MailBodies.xml.aspx" args:messageIDString delegate:self callback:@selector(parseMailBodiesOperationDone:errors:)];
 }

src/VitalityMail/METMessageViewController.m

@@ -17,7 +17,9 @@ @interface METMessageViewController ()
 @implementation METMessageViewController
 
 - (void)viewDidLoad {
-    [super viewDidLoad];
+    // According to the documentation the default implementation of this does nothing, so no need to call it on the super class
+    //    if( [super respondsToSelector:@selector(viewDidLoad)] )
+    //        [super viewDidLoad];
     [self loadFields];
 }
 

src/vitality.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.4b</string>
+	<string>0.3.5b</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.4b</string>
+	<string>0.3.5b</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>