From b4634abe5d66ccd6a78beeef7899acd01ba173a1 Mon Sep 17 00:00:00 2001 From: Andrew Salamon Date: Thu, 30 Apr 2015 14:31:00 -0700 Subject: [PATCH] Bug fixes. Vitality failed to run in some cases, possibly because there were two different .lproj folders for english. Fixed bugs related to switching characters when Market Orders or Contracts were active. --- src/Contracts/ContractsViewController.m | 8 +- src/Core/Controls/MTCountdown.h | 1 + src/Core/Controls/MTCountdown.m | 5 + src/Core/Controls/MTEveSkillCell.m | 3 +- src/Core/Controls/MTSkillButtonCell.m | 3 +- src/Core/Controls/MTTableView.m | 2 +- src/MarketOrders/MarketViewController.m | 2 + .../CharacterSheetController.m | 18 ++ src/Vitality.xcodeproj/project.pbxproj | 244 ++---------------- .../{ => English.lproj}/METMessageView.xib | 0 .../{en.lproj => English.lproj}/MailView.xib | 0 src/VitalityMail/METMail.m | 3 + src/VitalityMail/METMessageViewController.m | 4 +- src/VitalityMail/VitalityMail-Info.plist | 30 --- src/VitalityMail/VitalityMail-Prefix.pch | 7 - src/VitalityMail/en.lproj/InfoPlist.strings | 2 - src/vitality.plist | 4 +- 17 files changed, 71 insertions(+), 265 deletions(-) rename src/VitalityMail/{ => English.lproj}/METMessageView.xib (100%) rename src/VitalityMail/{en.lproj => English.lproj}/MailView.xib (100%) delete mode 100644 src/VitalityMail/VitalityMail-Info.plist delete mode 100644 src/VitalityMail/VitalityMail-Prefix.pch delete mode 100644 src/VitalityMail/en.lproj/InfoPlist.strings diff --git a/src/Contracts/ContractsViewController.m b/src/Contracts/ContractsViewController.m index 5b96b76..9431ff4 100644 --- a/src/Contracts/ContractsViewController.m +++ b/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; diff --git a/src/Core/Controls/MTCountdown.h b/src/Core/Controls/MTCountdown.h index 35334ce..f772c21 100644 --- a/src/Core/Controls/MTCountdown.h +++ b/src/Core/Controls/MTCountdown.h @@ -35,6 +35,7 @@ -(void) drawRect:(NSRect)rect; -(void) setInterval:(NSInteger)inter; +-(NSInteger)interval; -(void) setVisible:(BOOL)vis; diff --git a/src/Core/Controls/MTCountdown.m b/src/Core/Controls/MTCountdown.m index 05bc659..8d259a2 100644 --- a/src/Core/Controls/MTCountdown.m +++ b/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]; diff --git a/src/Core/Controls/MTEveSkillCell.m b/src/Core/Controls/MTEveSkillCell.m index dbc47ac..d5e01a1 100644 --- a/src/Core/Controls/MTEveSkillCell.m +++ b/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]; diff --git a/src/Core/Controls/MTSkillButtonCell.m b/src/Core/Controls/MTSkillButtonCell.m index 42fbfe1..a198393 100644 --- a/src/Core/Controls/MTSkillButtonCell.m +++ b/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]; diff --git a/src/Core/Controls/MTTableView.m b/src/Core/Controls/MTTableView.m index a138fc9..f980584 100644 --- a/src/Core/Controls/MTTableView.m +++ b/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 diff --git a/src/MarketOrders/MarketViewController.m b/src/MarketOrders/MarketViewController.m index 5f8d460..c3f3cb1 100644 --- a/src/MarketOrders/MarketViewController.m +++ b/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]; } } diff --git a/src/Views/Character Sheet/CharacterSheetController.m b/src/Views/Character Sheet/CharacterSheetController.m index 1c0fa49..be9b504 100644 --- a/src/Views/Character Sheet/CharacterSheetController.m +++ b/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 diff --git a/src/Vitality.xcodeproj/project.pbxproj b/src/Vitality.xcodeproj/project.pbxproj index b1b6c9d..f2cb9ab 100644 --- a/src/Vitality.xcodeproj/project.pbxproj +++ b/src/Vitality.xcodeproj/project.pbxproj @@ -70,19 +70,10 @@ 9EF3339611E79B1A002A3B7D /* NSTableViewCellExtended.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF3338911E79B19002A3B7D /* NSTableViewCellExtended.m */; }; 9EF335C811E87875002A3B7D /* databaseIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF335C711E87875002A3B7D /* databaseIcon.png */; }; A1093C97183D7546000D4063 /* CertGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = A1093C96183D7546000D4063 /* CertGroup.m */; }; - A10C369B19E5F70F00A0EB2B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A10C369A19E5F70F00A0EB2B /* Cocoa.framework */; }; - A10C36A119E5F71000A0EB2B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A10C369F19E5F71000A0EB2B /* InfoPlist.strings */; }; - A10C36A519E5F71000A0EB2B /* VitalityMail.m in Sources */ = {isa = PBXBuildFile; fileRef = A10C36A419E5F71000A0EB2B /* VitalityMail.m */; }; A112AD5E18E48D80001AF74B /* MetTableHeaderMenuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A112AD5D18E48D80001AF74B /* MetTableHeaderMenuManager.m */; }; A11DFF241A8181690047D5F5 /* METPair.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DFF231A8181690047D5F5 /* METPair.m */; }; - A11DFF271A82D77F0047D5F5 /* METMailHeaderCell.h in Headers */ = {isa = PBXBuildFile; fileRef = A11DFF251A82D77F0047D5F5 /* METMailHeaderCell.h */; }; A11DFF281A82D77F0047D5F5 /* METMailHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DFF261A82D77F0047D5F5 /* METMailHeaderCell.m */; }; - A11DFF291A82D77F0047D5F5 /* METMailHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DFF261A82D77F0047D5F5 /* METMailHeaderCell.m */; }; - A11DFF2C1A8D2F0F0047D5F5 /* METMessageViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = A11DFF2A1A8D2F0F0047D5F5 /* METMessageViewController.h */; }; A11DFF2D1A8D2F0F0047D5F5 /* METMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DFF2B1A8D2F0F0047D5F5 /* METMessageViewController.m */; }; - A11DFF2E1A8D2F0F0047D5F5 /* METMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A11DFF2B1A8D2F0F0047D5F5 /* METMessageViewController.m */; }; - A11DFF301A8D2F720047D5F5 /* METMessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11DFF2F1A8D2F720047D5F5 /* METMessageView.xib */; }; - A11DFF311A8D2F720047D5F5 /* METMessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11DFF2F1A8D2F720047D5F5 /* METMessageView.xib */; }; A11F72181AD6F84C002E1906 /* MarketView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11F72101AD6F84C002E1906 /* MarketView.xib */; }; A11F72191AD6F84C002E1906 /* MarketOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = A11F72131AD6F84C002E1906 /* MarketOrder.m */; }; A11F721A1AD6F84C002E1906 /* MarketOrders.m in Sources */ = {isa = PBXBuildFile; fileRef = A11F72151AD6F84C002E1906 /* MarketOrders.m */; }; @@ -95,6 +86,8 @@ A11F72331AEEE199002E1906 /* ContractDetails.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11F722A1AEEE198002E1906 /* ContractDetails.xib */; }; A11F72341AEEE199002E1906 /* ContractsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11F722C1AEEE198002E1906 /* ContractsView.xib */; }; A11F72371AEEE1B3002E1906 /* MTISKFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = A11F72361AEEE1B3002E1906 /* MTISKFormatter.m */; }; + A11F724A1AF2CAC1002E1906 /* MailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11F72461AF2CAC1002E1906 /* MailView.xib */; }; + A11F724B1AF2CAC1002E1906 /* METMessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A11F72481AF2CAC1002E1906 /* METMessageView.xib */; }; A12EE8D4197D98E000ED6478 /* METTrait.m in Sources */ = {isa = PBXBuildFile; fileRef = A12EE8D3197D98E000ED6478 /* METTrait.m */; }; A12FC60817EA31420053DC23 /* METConquerableStations.m in Sources */ = {isa = PBXBuildFile; fileRef = A12FC60717EA31420053DC23 /* METConquerableStations.m */; }; A147AB3A184D4C6B009D2A08 /* MTAPIKey.m in Sources */ = {isa = PBXBuildFile; fileRef = A147AB39184D4C6B009D2A08 /* MTAPIKey.m */; }; @@ -102,14 +95,8 @@ A1A2DAA918D0CFB40077CD55 /* PlanOverview.m in Sources */ = {isa = PBXBuildFile; fileRef = A1A2DAA818D0CFB40077CD55 /* PlanOverview.m */; }; A1C44C681A24EEC100443AE2 /* METURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C44C671A24EEC100443AE2 /* METURLRequest.m */; }; A1C44C6C1A36697200443AE2 /* VitalityMail.m in Sources */ = {isa = PBXBuildFile; fileRef = A10C36A419E5F71000A0EB2B /* VitalityMail.m */; }; - A1C44C711A366AC600443AE2 /* METMail.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C44C6D1A366AC600443AE2 /* METMail.h */; }; A1C44C721A366AC600443AE2 /* METMail.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C44C6E1A366AC600443AE2 /* METMail.m */; }; - A1C44C731A366AC600443AE2 /* METMail.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C44C6E1A366AC600443AE2 /* METMail.m */; }; - A1C44C741A366AC600443AE2 /* METMailMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C44C6F1A366AC600443AE2 /* METMailMessage.h */; }; A1C44C751A366AC600443AE2 /* METMailMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C44C701A366AC600443AE2 /* METMailMessage.m */; }; - A1C44C761A366AC600443AE2 /* METMailMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = A1C44C701A366AC600443AE2 /* METMailMessage.m */; }; - A1C44C791A3A5ABC00443AE2 /* MailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1C44C771A3A5ABC00443AE2 /* MailView.xib */; }; - A1C44C7A1A3A5ABC00443AE2 /* MailView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1C44C771A3A5ABC00443AE2 /* MailView.xib */; }; A1E4374A1A23C05200B19A34 /* CCPImplant.m in Sources */ = {isa = PBXBuildFile; fileRef = A1E437491A23C05200B19A34 /* CCPImplant.m */; }; A1FCD0561829881600A6655A /* METIDtoName.m in Sources */ = {isa = PBXBuildFile; fileRef = A1FCD0551829881600A6655A /* METIDtoName.m */; }; C911FED710782C50000D88E2 /* CharacterParseError.m in Sources */ = {isa = PBXBuildFile; fileRef = C911FED610782C50000D88E2 /* CharacterParseError.m */; }; @@ -284,11 +271,7 @@ 9EF335C711E87875002A3B7D /* databaseIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = databaseIcon.png; sourceTree = ""; }; A1093C95183D7545000D4063 /* CertGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CertGroup.h; sourceTree = ""; }; A1093C96183D7546000D4063 /* CertGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CertGroup.m; sourceTree = ""; }; - A10C369919E5F70F00A0EB2B /* VitalityMail.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = VitalityMail.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A10C369A19E5F70F00A0EB2B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - A10C369E19E5F71000A0EB2B /* VitalityMail-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "VitalityMail-Info.plist"; sourceTree = ""; }; - A10C36A019E5F71000A0EB2B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - A10C36A219E5F71000A0EB2B /* VitalityMail-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "VitalityMail-Prefix.pch"; sourceTree = ""; }; A10C36A319E5F71000A0EB2B /* VitalityMail.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VitalityMail.h; sourceTree = ""; }; A10C36A419E5F71000A0EB2B /* VitalityMail.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VitalityMail.m; sourceTree = ""; }; A112AD5B18E37F67001AF74B /* SkillView2Delegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkillView2Delegate.h; sourceTree = ""; }; @@ -300,7 +283,6 @@ A11DFF261A82D77F0047D5F5 /* METMailHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = METMailHeaderCell.m; sourceTree = ""; }; A11DFF2A1A8D2F0F0047D5F5 /* METMessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = METMessageViewController.h; sourceTree = ""; }; A11DFF2B1A8D2F0F0047D5F5 /* METMessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = METMessageViewController.m; sourceTree = ""; }; - A11DFF2F1A8D2F720047D5F5 /* METMessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = METMessageView.xib; sourceTree = ""; }; A11F72111AD6F84C002E1906 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MarketView.xib; sourceTree = ""; }; A11F72121AD6F84C002E1906 /* MarketOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MarketOrder.h; path = MarketOrders/MarketOrder.h; sourceTree = ""; }; A11F72131AD6F84C002E1906 /* MarketOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MarketOrder.m; path = MarketOrders/MarketOrder.m; sourceTree = ""; }; @@ -322,6 +304,8 @@ A11F722D1AEEE198002E1906 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ContractsView.xib; sourceTree = ""; }; A11F72351AEEE1B3002E1906 /* MTISKFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTISKFormatter.h; sourceTree = ""; }; A11F72361AEEE1B3002E1906 /* MTISKFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTISKFormatter.m; sourceTree = ""; }; + A11F72471AF2CAC1002E1906 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MailView.xib; sourceTree = ""; }; + A11F72491AF2CAC1002E1906 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/METMessageView.xib; sourceTree = ""; }; A12EE8D2197D98E000ED6478 /* METTrait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = METTrait.h; sourceTree = ""; }; A12EE8D3197D98E000ED6478 /* METTrait.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = METTrait.m; sourceTree = ""; }; A12FC60617EA31420053DC23 /* METConquerableStations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = METConquerableStations.h; sourceTree = ""; }; @@ -337,7 +321,6 @@ A1C44C6E1A366AC600443AE2 /* METMail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = METMail.m; sourceTree = ""; }; A1C44C6F1A366AC600443AE2 /* METMailMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = METMailMessage.h; sourceTree = ""; }; A1C44C701A366AC600443AE2 /* METMailMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = METMailMessage.m; sourceTree = ""; }; - A1C44C781A3A5ABC00443AE2 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MailView.xib; sourceTree = ""; }; A1E437481A23C05200B19A34 /* CCPImplant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPImplant.h; sourceTree = ""; }; A1E437491A23C05200B19A34 /* CCPImplant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPImplant.m; sourceTree = ""; }; A1FCD05118245DDC00A6655A /* MetLabelValueTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MetLabelValueTableCellView.h; path = Core/MetLabelValueTableCellView.h; sourceTree = SOURCE_ROOT; }; @@ -557,14 +540,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A10C369519E5F70F00A0EB2B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A10C369B19E5F70F00A0EB2B /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -603,7 +578,6 @@ isa = PBXGroup; children = ( 8D1107320486CEB800E47090 /* Vitality.app */, - A10C369919E5F70F00A0EB2B /* VitalityMail.framework */, ); name = Products; sourceTree = ""; @@ -693,23 +667,12 @@ A11DFF261A82D77F0047D5F5 /* METMailHeaderCell.m */, A11DFF2A1A8D2F0F0047D5F5 /* METMessageViewController.h */, A11DFF2B1A8D2F0F0047D5F5 /* METMessageViewController.m */, - A1C44C771A3A5ABC00443AE2 /* MailView.xib */, - A11DFF2F1A8D2F720047D5F5 /* METMessageView.xib */, - A10C369D19E5F71000A0EB2B /* Supporting Files */, + A11F72461AF2CAC1002E1906 /* MailView.xib */, + A11F72481AF2CAC1002E1906 /* METMessageView.xib */, ); path = VitalityMail; sourceTree = ""; }; - A10C369D19E5F71000A0EB2B /* Supporting Files */ = { - isa = PBXGroup; - children = ( - A10C369E19E5F71000A0EB2B /* VitalityMail-Info.plist */, - A10C369F19E5F71000A0EB2B /* InfoPlist.strings */, - A10C36A219E5F71000A0EB2B /* VitalityMail-Prefix.pch */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; A11F720E1AD6F5D9002E1906 /* MarketOrders */ = { isa = PBXGroup; children = ( @@ -1149,20 +1112,6 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - A10C369619E5F70F00A0EB2B /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - A11DFF271A82D77F0047D5F5 /* METMailHeaderCell.h in Headers */, - A1C44C741A366AC600443AE2 /* METMailMessage.h in Headers */, - A11DFF2C1A8D2F0F0047D5F5 /* METMessageViewController.h in Headers */, - A1C44C711A366AC600443AE2 /* METMail.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ 8D1107260486CEB800E47090 /* Vitality */ = { isa = PBXNativeTarget; @@ -1183,24 +1132,6 @@ productReference = 8D1107320486CEB800E47090 /* Vitality.app */; productType = "com.apple.product-type.application"; }; - A10C369819E5F70F00A0EB2B /* VitalityMail */ = { - isa = PBXNativeTarget; - buildConfigurationList = A10C36A919E5F71000A0EB2B /* Build configuration list for PBXNativeTarget "VitalityMail" */; - buildPhases = ( - A10C369419E5F70F00A0EB2B /* Sources */, - A10C369519E5F70F00A0EB2B /* Frameworks */, - A10C369619E5F70F00A0EB2B /* Headers */, - A10C369719E5F70F00A0EB2B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = VitalityMail; - productName = VitalityMail; - productReference = A10C369919E5F70F00A0EB2B /* VitalityMail.framework */; - productType = "com.apple.product-type.framework"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -1230,7 +1161,6 @@ C9F51595105682AB00654F6D /* Package */, C9AB3DEC1120E9840057523C /* Languages */, CD8ECF3818B98D2D006AA8EE /* Documentation */, - A10C369819E5F70F00A0EB2B /* VitalityMail */, ); }; /* End PBXProject section */ @@ -1244,12 +1174,12 @@ C9FF4566105508950044BBAC /* charsheet.png in Resources */, C9FF4567105508950044BBAC /* darkgray.tiff in Resources */, C9FF4568105508950044BBAC /* green.tiff in Resources */, - A11DFF301A8D2F720047D5F5 /* METMessageView.xib in Resources */, C9FF4569105508950044BBAC /* icon12_02.png in Resources */, C9FF456A105508950044BBAC /* icon22_41.png in Resources */, C9FF456B105508950044BBAC /* info.png in Resources */, C9FF456C105508950044BBAC /* lightgray.tiff in Resources */, C9FF456D105508950044BBAC /* red.tiff in Resources */, + A11F724B1AF2CAC1002E1906 /* METMessageView.xib in Resources */, C9FF456E105508950044BBAC /* skill.png in Resources */, C9FF456F105508950044BBAC /* skillv.png in Resources */, C9FF4570105508950044BBAC /* yellow.tiff in Resources */, @@ -1262,6 +1192,7 @@ C9D902D31121194A0047B2C2 /* CertDetails.xib in Resources */, C993CEC51123FA200084BFFD /* DatabaseUpdate.xib in Resources */, 9EF3339011E79B1A002A3B7D /* AccountPrefView.xib in Resources */, + A11F724A1AF2CAC1002E1906 /* MailView.xib in Resources */, A11F72331AEEE199002E1906 /* ContractDetails.xib in Resources */, 9EF3339111E79B1A002A3B7D /* DatabasePrefView.xib in Resources */, 9EF3339211E79B1A002A3B7D /* GeneralPrefView.xib in Resources */, @@ -1275,17 +1206,6 @@ 140AEBE21763A04B00308748 /* StatusItemView.xib in Resources */, 140AEBE41763CF3F00308748 /* open.png in Resources */, A154A64417A83E090076603D /* Localizable.strings in Resources */, - A1C44C791A3A5ABC00443AE2 /* MailView.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A10C369719E5F70F00A0EB2B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A11DFF311A8D2F720047D5F5 /* METMessageView.xib in Resources */, - A10C36A119E5F71000A0EB2B /* InfoPlist.strings in Resources */, - A1C44C7A1A3A5ABC00443AE2 /* MailView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1458,18 +1378,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - A10C369419E5F70F00A0EB2B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A11DFF291A82D77F0047D5F5 /* METMailHeaderCell.m in Sources */, - A10C36A519E5F71000A0EB2B /* VitalityMail.m in Sources */, - A1C44C731A366AC600443AE2 /* METMail.m in Sources */, - A11DFF2E1A8D2F0F0047D5F5 /* METMessageViewController.m in Sources */, - A1C44C761A366AC600443AE2 /* METMailMessage.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -1521,14 +1429,6 @@ name = GeneralPrefView.xib; sourceTree = ""; }; - A10C369F19E5F71000A0EB2B /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - A10C36A019E5F71000A0EB2B /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; A11F72101AD6F84C002E1906 /* MarketView.xib */ = { isa = PBXVariantGroup; children = ( @@ -1553,20 +1453,28 @@ name = ContractsView.xib; sourceTree = ""; }; - A154A64217A83E090076603D /* Localizable.strings */ = { + A11F72461AF2CAC1002E1906 /* MailView.xib */ = { isa = PBXVariantGroup; children = ( - A154A64317A83E090076603D /* English */, + A11F72471AF2CAC1002E1906 /* English */, ); - name = Localizable.strings; + name = MailView.xib; sourceTree = ""; }; - A1C44C771A3A5ABC00443AE2 /* MailView.xib */ = { + A11F72481AF2CAC1002E1906 /* METMessageView.xib */ = { isa = PBXVariantGroup; children = ( - A1C44C781A3A5ABC00443AE2 /* en */, + A11F72491AF2CAC1002E1906 /* English */, ); - name = MailView.xib; + name = METMessageView.xib; + sourceTree = ""; + }; + A154A64217A83E090076603D /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + A154A64317A83E090076603D /* English */, + ); + name = Localizable.strings; sourceTree = ""; }; C9721EE91121291D00035782 /* CharacterSheet.xib */ = { @@ -1628,98 +1536,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - A10C36A619E5F71000A0EB2B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "VitalityMail/VitalityMail-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "VitalityMail/VitalityMail-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = framework; - }; - name = Debug; - }; - A10C36A719E5F71000A0EB2B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "VitalityMail/VitalityMail-Prefix.pch"; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "VitalityMail/VitalityMail-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = framework; - }; - name = Release; - }; - A10C36A819E5F71000A0EB2B /* Test Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "VitalityMail/VitalityMail-Prefix.pch"; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - INFOPLIST_FILE = "VitalityMail/VitalityMail-Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = framework; - }; - name = "Test Release"; - }; C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1744,7 +1560,7 @@ PER_ARCH_CFLAGS_i386 = ""; PER_ARCH_CFLAGS_ppc = ""; PRODUCT_NAME = Vitality; - SDKROOT = macosx; + SDKROOT = macosx10.9; }; name = Debug; }; @@ -1769,7 +1585,7 @@ PER_ARCH_CFLAGS_i386 = ""; PER_ARCH_CFLAGS_ppc = ""; PRODUCT_NAME = Vitality; - SDKROOT = macosx; + SDKROOT = macosx10.9; }; name = Release; }; @@ -1882,7 +1698,7 @@ PER_ARCH_CFLAGS_i386 = ""; PER_ARCH_CFLAGS_ppc = ""; PRODUCT_NAME = Vitality; - SDKROOT = macosx; + SDKROOT = macosx10.9; }; name = "Test Release"; }; @@ -1973,16 +1789,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - A10C36A919E5F71000A0EB2B /* Build configuration list for PBXNativeTarget "VitalityMail" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A10C36A619E5F71000A0EB2B /* Debug */, - A10C36A719E5F71000A0EB2B /* Release */, - A10C36A819E5F71000A0EB2B /* Test Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Vitality" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/src/VitalityMail/METMessageView.xib b/src/VitalityMail/English.lproj/METMessageView.xib similarity index 100% rename from src/VitalityMail/METMessageView.xib rename to src/VitalityMail/English.lproj/METMessageView.xib diff --git a/src/VitalityMail/en.lproj/MailView.xib b/src/VitalityMail/English.lproj/MailView.xib similarity index 100% rename from src/VitalityMail/en.lproj/MailView.xib rename to src/VitalityMail/English.lproj/MailView.xib diff --git a/src/VitalityMail/METMail.m b/src/VitalityMail/METMail.m index 3ed1ddd..406e115 100644 --- a/src/VitalityMail/METMail.m +++ b/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:)]; } diff --git a/src/VitalityMail/METMessageViewController.m b/src/VitalityMail/METMessageViewController.m index f35c7e3..6a26013 100644 --- a/src/VitalityMail/METMessageViewController.m +++ b/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]; } diff --git a/src/VitalityMail/VitalityMail-Info.plist b/src/VitalityMail/VitalityMail-Info.plist deleted file mode 100644 index 637ae2f..0000000 --- a/src/VitalityMail/VitalityMail-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - vitality.org.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSHumanReadableCopyright - Copyright © 2014 Sebastian Kruemling. All rights reserved. - NSPrincipalClass - - - diff --git a/src/VitalityMail/VitalityMail-Prefix.pch b/src/VitalityMail/VitalityMail-Prefix.pch deleted file mode 100644 index 4c7a254..0000000 --- a/src/VitalityMail/VitalityMail-Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'VitalityMail' target in the 'VitalityMail' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/src/VitalityMail/en.lproj/InfoPlist.strings b/src/VitalityMail/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/src/VitalityMail/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/src/vitality.plist b/src/vitality.plist index ddde362..0cf84ca 100644 --- a/src/vitality.plist +++ b/src/vitality.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.3.4b + 0.3.5b CFBundleVersion - 0.3.4b + 0.3.5b LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSMainNibFile