From c3cc54e1f46d6cf7ef09010f18463f05dce5f212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Sat, 23 Sep 2017 15:54:13 +0200 Subject: [PATCH] show version of Mini vMac core in settings --- Mini vMac/SettingsViewController.m | 11 ++++++----- Mini vMac/about.plist | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Mini vMac/SettingsViewController.m b/Mini vMac/SettingsViewController.m index a1fb0cc..7919162 100644 --- a/Mini vMac/SettingsViewController.m +++ b/Mini vMac/SettingsViewController.m @@ -73,11 +73,12 @@ typedef enum : NSInteger { aboutTitle = aboutData[@"title"]; aboutItems = aboutData[@"items"]; footerView = [[UITextView alloc] initWithFrame:CGRectZero]; - NSAttributedString *str = [[NSMutableAttributedString alloc] initWithData:[aboutData[@"footer.html"] dataUsingEncoding:NSUTF8StringEncoding] - options:@{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType, - NSCharacterEncodingDocumentAttribute: @(NSUTF8StringEncoding)} - documentAttributes:nil - error:NULL]; + NSString *footerHTML = [aboutData[@"footer.html"] stringByReplacingOccurrencesOfString:@"$mnvmversion" withString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"MNVMVersion"]]; + NSAttributedString *str = [[NSAttributedString alloc] initWithData:[footerHTML dataUsingEncoding:NSUTF8StringEncoding] + options:@{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType, + NSCharacterEncodingDocumentAttribute: @(NSUTF8StringEncoding)} + documentAttributes:nil + error:NULL]; footerView.attributedText = str; [footerView sizeToFit]; footerView.editable = NO; diff --git a/Mini vMac/about.plist b/Mini vMac/about.plist index e05d15f..e516814 100644 --- a/Mini vMac/about.plist +++ b/Mini vMac/about.plist @@ -42,7 +42,7 @@ ©2008-2017 Jesús A. Álvarez<br/> <a href="https://namedfork.net/minivmac">namedfork.net/minivmac</a><br/> <hr/> -based on Mini vMac<br/> +based on Mini vMac $mnvmversion<br/> ©2001-2017 Paul C. Pratt<br/> <a href="http://gryphel.com/c/minivmac">gryphel.com/c/minivmac</a>