From 3f48c27e8b582e3d6cfa09e66662c9d1aae735eb Mon Sep 17 00:00:00 2001 From: Eddie Ehlin Date: Sun, 17 Mar 2013 10:03:04 +0100 Subject: Added "(recurring)" to threshold listing + updated threshold name label for iPad (longer). --- .../UserInterfaceState.xcuserstate | Bin 57592 -> 57073 bytes .../xcdebugger/Breakpoints.xcbkptlist | 13 +++++++++++++ iBean/iBean/ThresholdCell.m | 4 ++++ iBean/iBean/iPadStoryboard.storyboard | 4 ++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate index 5bd8248..a003ae8 100644 Binary files a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate and b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist index f1cbc3f..1b45798 100644 --- a/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ b/iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -146,5 +146,18 @@ landmarkName = "@implementation Configuration(Interface)" landmarkType = "3"> + + diff --git a/iBean/iBean/ThresholdCell.m b/iBean/iBean/ThresholdCell.m index e4d586a..8f932e6 100644 --- a/iBean/iBean/ThresholdCell.m +++ b/iBean/iBean/ThresholdCell.m @@ -38,6 +38,10 @@ { self.nameLabel.text = self.threshold.name; self.valueLabel.text = [self.threshold.value stringValue]; + if ([self.threshold.recurring boolValue] == YES) + { + self.valueLabel.text = [self.valueLabel.text stringByAppendingString:@" (recurring)"]; + } self.enabledSwitch.on = [self.threshold.enabled boolValue]; } diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard index d716bcf..26c6b5f 100644 --- a/iBean/iBean/iPadStoryboard.storyboard +++ b/iBean/iBean/iPadStoryboard.storyboard @@ -355,7 +355,7 @@