From ec02db8605ea80717df1b8f16cfced94e6a9631a Mon Sep 17 00:00:00 2001 From: Jakub Suder Date: Wed, 26 Mar 2014 14:41:42 +0100 Subject: [PATCH] [#328] email field doesn't need to be an HITextField there's no reason for that since it's not editable here, and HITextField currently interacts with autolayout in a weird way on some systems; in future when HITextField is only used in autolayout-enabled xibs, we can simply remove the custom auto-resizing code that causes problems --- Hive/Controllers/HIContactInfoViewController.h | 3 +-- Hive/Controllers/HIContactInfoViewController.m | 2 +- Hive/Controllers/ar.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/cs.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/da.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/de.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/el.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/en.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/es.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/fi.lproj/HIContactInfoViewController.xib | 8 ++++---- .../Controllers/fil.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/fr.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/hi.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/hu.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/it.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/ja.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/ko.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/nl.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/pl.lproj/HIContactInfoViewController.xib | 8 ++++---- .../pt-BR.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/pt.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/ro.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/ru.lproj/HIContactInfoViewController.xib | 8 ++++---- .../sr-Latn.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/sr.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/sv.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/tr.lproj/HIContactInfoViewController.xib | 8 ++++---- Hive/Controllers/ur.lproj/HIContactInfoViewController.xib | 8 ++++---- .../zh-Hans.lproj/HIContactInfoViewController.xib | 8 ++++---- 29 files changed, 110 insertions(+), 111 deletions(-) diff --git a/Hive/Controllers/HIContactInfoViewController.h b/Hive/Controllers/HIContactInfoViewController.h index 6c97e770..76f64e87 100644 --- a/Hive/Controllers/HIContactInfoViewController.h +++ b/Hive/Controllers/HIContactInfoViewController.h @@ -9,7 +9,6 @@ #import @class HIBox; -@class HITextField; @class HIViewController; @protocol HIPerson; @class HIAddressesBox; @@ -21,7 +20,7 @@ @interface HIContactInfoViewController : NSViewController @property (weak) IBOutlet HIAddressesBox *addressBoxView; -@property (weak) IBOutlet HITextField *profileEmailField; +@property (weak) IBOutlet NSTextField *profileEmailField; @property (weak) IBOutlet NSScrollView *profileScrollView; @property (weak) IBOutlet NSView *profileScrollContent; @property (weak) IBOutlet NSButton *editButton; diff --git a/Hive/Controllers/HIContactInfoViewController.m b/Hive/Controllers/HIContactInfoViewController.m index 24b3c46a..66cb738a 100644 --- a/Hive/Controllers/HIContactInfoViewController.m +++ b/Hive/Controllers/HIContactInfoViewController.m @@ -57,7 +57,7 @@ - (void)configureViewForContact:(id)contact { [self configureScrollView]; - [self.profileEmailField setValueAndRecalc:((_contact.email.length > 0) ? _contact.email : @"")]; + self.profileEmailField.stringValue = _contact.email ?: @""; self.addressBoxView.addresses = _contact.addresses.allObjects; self.addressBoxView.observingWallet = [_contact isKindOfClass:[HIProfile class]]; diff --git a/Hive/Controllers/ar.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ar.lproj/HIContactInfoViewController.xib index 0bdd114c..a9adb68d 100644 --- a/Hive/Controllers/ar.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ar.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/cs.lproj/HIContactInfoViewController.xib b/Hive/Controllers/cs.lproj/HIContactInfoViewController.xib index 7b28a45e..eccada42 100644 --- a/Hive/Controllers/cs.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/cs.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/da.lproj/HIContactInfoViewController.xib b/Hive/Controllers/da.lproj/HIContactInfoViewController.xib index ebc7b594..059ae527 100644 --- a/Hive/Controllers/da.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/da.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/de.lproj/HIContactInfoViewController.xib b/Hive/Controllers/de.lproj/HIContactInfoViewController.xib index 96821489..b36d32a2 100644 --- a/Hive/Controllers/de.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/de.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/el.lproj/HIContactInfoViewController.xib b/Hive/Controllers/el.lproj/HIContactInfoViewController.xib index c32e30e3..8eda4b70 100644 --- a/Hive/Controllers/el.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/el.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/en.lproj/HIContactInfoViewController.xib b/Hive/Controllers/en.lproj/HIContactInfoViewController.xib index 07a10140..1cca96da 100644 --- a/Hive/Controllers/en.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/en.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/es.lproj/HIContactInfoViewController.xib b/Hive/Controllers/es.lproj/HIContactInfoViewController.xib index e9a2c17c..8df01ee3 100644 --- a/Hive/Controllers/es.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/es.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/fi.lproj/HIContactInfoViewController.xib b/Hive/Controllers/fi.lproj/HIContactInfoViewController.xib index edcb08a7..303ef606 100644 --- a/Hive/Controllers/fi.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/fi.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/fil.lproj/HIContactInfoViewController.xib b/Hive/Controllers/fil.lproj/HIContactInfoViewController.xib index 5c3ca5db..afa44784 100644 --- a/Hive/Controllers/fil.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/fil.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/fr.lproj/HIContactInfoViewController.xib b/Hive/Controllers/fr.lproj/HIContactInfoViewController.xib index e7ccc3ea..a4c1d982 100644 --- a/Hive/Controllers/fr.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/fr.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/hi.lproj/HIContactInfoViewController.xib b/Hive/Controllers/hi.lproj/HIContactInfoViewController.xib index d2ae528d..b8dd44c2 100644 --- a/Hive/Controllers/hi.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/hi.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/hu.lproj/HIContactInfoViewController.xib b/Hive/Controllers/hu.lproj/HIContactInfoViewController.xib index f3d0daa6..e9a5c683 100644 --- a/Hive/Controllers/hu.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/hu.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/it.lproj/HIContactInfoViewController.xib b/Hive/Controllers/it.lproj/HIContactInfoViewController.xib index 70d0d27d..696b43c6 100644 --- a/Hive/Controllers/it.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/it.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/ja.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ja.lproj/HIContactInfoViewController.xib index 9e3b43af..91428eb2 100644 --- a/Hive/Controllers/ja.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ja.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/ko.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ko.lproj/HIContactInfoViewController.xib index b97770cb..de51ed27 100644 --- a/Hive/Controllers/ko.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ko.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/nl.lproj/HIContactInfoViewController.xib b/Hive/Controllers/nl.lproj/HIContactInfoViewController.xib index 95a4503d..6beddd2f 100644 --- a/Hive/Controllers/nl.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/nl.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/pl.lproj/HIContactInfoViewController.xib b/Hive/Controllers/pl.lproj/HIContactInfoViewController.xib index 5221fff2..356343d4 100644 --- a/Hive/Controllers/pl.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/pl.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/pt-BR.lproj/HIContactInfoViewController.xib b/Hive/Controllers/pt-BR.lproj/HIContactInfoViewController.xib index 37f7173f..f8a47a47 100644 --- a/Hive/Controllers/pt-BR.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/pt-BR.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/pt.lproj/HIContactInfoViewController.xib b/Hive/Controllers/pt.lproj/HIContactInfoViewController.xib index 922c8caf..ca4d0cec 100644 --- a/Hive/Controllers/pt.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/pt.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/ro.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ro.lproj/HIContactInfoViewController.xib index f8ed117e..bd0b74ab 100644 --- a/Hive/Controllers/ro.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ro.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/ru.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ru.lproj/HIContactInfoViewController.xib index 06613525..9f356f73 100644 --- a/Hive/Controllers/ru.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ru.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/sr-Latn.lproj/HIContactInfoViewController.xib b/Hive/Controllers/sr-Latn.lproj/HIContactInfoViewController.xib index d131bd3a..ef17f74e 100644 --- a/Hive/Controllers/sr-Latn.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/sr-Latn.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/sr.lproj/HIContactInfoViewController.xib b/Hive/Controllers/sr.lproj/HIContactInfoViewController.xib index 0dece505..c5a8a9c3 100644 --- a/Hive/Controllers/sr.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/sr.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/sv.lproj/HIContactInfoViewController.xib b/Hive/Controllers/sv.lproj/HIContactInfoViewController.xib index ac277245..1c615d92 100644 --- a/Hive/Controllers/sv.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/sv.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/tr.lproj/HIContactInfoViewController.xib b/Hive/Controllers/tr.lproj/HIContactInfoViewController.xib index 114300b1..c7e5260a 100644 --- a/Hive/Controllers/tr.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/tr.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/ur.lproj/HIContactInfoViewController.xib b/Hive/Controllers/ur.lproj/HIContactInfoViewController.xib index d295fd7e..575c73e2 100644 --- a/Hive/Controllers/ur.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/ur.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file + diff --git a/Hive/Controllers/zh-Hans.lproj/HIContactInfoViewController.xib b/Hive/Controllers/zh-Hans.lproj/HIContactInfoViewController.xib index 8c661ff5..ad152345 100644 --- a/Hive/Controllers/zh-Hans.lproj/HIContactInfoViewController.xib +++ b/Hive/Controllers/zh-Hans.lproj/HIContactInfoViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -112,7 +112,7 @@ - + @@ -157,4 +157,4 @@ - \ No newline at end of file +