From c03d547ad8e78f3c07c103a2a4a112abcbc6c9ed Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sun, 2 Sep 2012 13:14:09 +0200
Subject: [PATCH] Font improvements and copy-login fix.

[FIXED]     Login name copies content instead of login name.
[IMPROVED]  Font of password and login name improved for better
            differentiation between capital and lower-case letters.
---
 MasterPassword/iOS/MPMainViewController.m           | 2 +-
 MasterPassword/iOS/MainStoryboard_iPhone.storyboard | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 8aee3b00..fac168f8 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -536,7 +536,7 @@
         return;
 
     inf(@"Copying user name for: %@", self.activeElement.name);
-    [UIPasteboard generalPasteboard].string = [self.activeElement.content description];
+    [UIPasteboard generalPasteboard].string = self.activeElement.loginName;
 
     [self showLoginNameTip:@"Copied!"];
 
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index 5ee5cdd2..dd38def2 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2549" systemVersion="12B19" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
     <dependencies>
-        <deployment defaultVersion="1296" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1498"/>
     </dependencies>
     <scenes>
@@ -475,8 +474,8 @@ Your passwords will be AES-encrypted with your master password.</string>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                 <accessibility key="accessibilityConfiguration" hint=""/>
                                                 <color key="textColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
-                                                <fontDescription key="fontDescription" name="Copperplate-Bold" family="Copperplate" pointSize="26"/>
-                                                <textInputTraits key="textInputTraits" autocorrectionType="no"/>
+                                                <fontDescription key="fontDescription" name="Futura-CondensedExtraBold" family="Futura" pointSize="26"/>
+                                                <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
                                                 <connections>
                                                     <outlet property="delegate" destination="PQa-Xl-A3x" id="qOM-gq-c6g"/>
                                                 </connections>
@@ -568,8 +567,8 @@ Your passwords will be AES-encrypted with your master password.</string>
                                                         <rect key="frame" x="0.0" y="0.0" width="280" height="31"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                        <fontDescription key="fontDescription" name="Copperplate" family="Copperplate" pointSize="14"/>
-                                                        <textInputTraits key="textInputTraits" keyboardType="emailAddress"/>
+                                                        <fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="14"/>
+                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="done"/>
                                                         <connections>
                                                             <outlet property="delegate" destination="PQa-Xl-A3x" id="xG4-np-2j5"/>
                                                         </connections>