aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Ehlin <eddiex@eddiex.se>2013-03-17 10:03:04 +0100
committerEddie Ehlin <eddiex@eddiex.se>2013-03-17 10:03:04 +0100
commit3f48c27e8b582e3d6cfa09e66662c9d1aae735eb (patch)
tree727985a727e74a2cb489eccb183ad4db2cceac19
parentf0cffa4fc9f7d29d8f4dabb5559bcc1048eca25d (diff)
downloadiBean-3f48c27e8b582e3d6cfa09e66662c9d1aae735eb.tar.gz
iBean-3f48c27e8b582e3d6cfa09e66662c9d1aae735eb.zip
Added "(recurring)" to threshold listing + updated threshold name label for iPad (longer).
-rw-r--r--iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstatebin57592 -> 57073 bytes
-rw-r--r--iBean/iBean.xcodeproj/xcuserdata/eddiex.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist13
-rw-r--r--iBean/iBean/ThresholdCell.m4
-rw-r--r--iBean/iBean/iPadStoryboard.storyboard4
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
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
Binary files 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">
</FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "iBean/ThresholdCell.m"
+ timestampString = "385202512.751217"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "43"
+ endingLineNumber = "43"
+ landmarkName = "-initWithThresholdEntity:"
+ landmarkType = "5">
+ </FileBreakpoint>
</FileBreakpoints>
</Bucket>
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 @@
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Threshold name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2oU-VN-Fe6">
<constraints>
- <constraint firstAttribute="width" constant="179" id="JRM-MK-pac"/>
+ <constraint firstAttribute="width" constant="623" id="JWo-0X-eCj"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -378,7 +378,7 @@
<constraints>
<constraint firstItem="Jmn-Ri-b8h" firstAttribute="leading" secondItem="R8I-Ud-aeq" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="72d-o6-lF6"/>
<constraint firstItem="2oU-VN-Fe6" firstAttribute="top" secondItem="G0c-xP-kZp" secondAttribute="top" constant="2" id="BfW-k1-zKA"/>
- <constraint firstItem="2oU-VN-Fe6" firstAttribute="trailing" secondItem="Jmn-Ri-b8h" secondAttribute="trailing" type="default" id="PF0-Lu-g9Q"/>
+ <constraint firstItem="Jmn-Ri-b8h" firstAttribute="trailing" secondItem="2oU-VN-Fe6" secondAttribute="trailing" type="default" id="N2b-jm-oQ4"/>
<constraint firstItem="Jmn-Ri-b8h" firstAttribute="top" secondItem="G0c-xP-kZp" secondAttribute="top" constant="20" type="default" id="Sde-4X-NiH"/>
<constraint firstItem="R8I-Ud-aeq" firstAttribute="top" secondItem="G0c-xP-kZp" secondAttribute="top" constant="8" id="TGL-Ab-PBN"/>
<constraint firstItem="2oU-VN-Fe6" firstAttribute="leading" secondItem="R8I-Ud-aeq" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="aRs-0g-K1i"/>