Commit 0ec318597243f20efd36f95d7d7288931a3b8ede

Authored by Imanol-Mikel Barba Sabariego
1 parent 39a1451c

FINAL CODE REVISION

Showing 65 changed files with 540 additions and 213 deletions
BT Vendor/BT Vendor.xcodeproj/project.pbxproj
... ... @@ -93,31 +93,24 @@
93 93 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; };
94 94 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; };
95 95 F9015D9119B73052006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController.xib; sourceTree = "<group>"; };
96   - F9015D9419B73056006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController.strings; sourceTree = "<group>"; };
97 96 F9015D9619B73057006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController.strings; sourceTree = "<group>"; };
98 97 F9015D9819B7305E006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad.xib; sourceTree = "<group>"; };
99   - F9015D9B19B73062006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; };
100 98 F9015D9D19B73062006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; };
101 99 F90416FD19CC776E00333AD8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController.xib; sourceTree = "<group>"; };
102   - F904170019CC777200333AD8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController.strings; sourceTree = "<group>"; };
103 100 F904170219CC777300333AD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController.strings; sourceTree = "<group>"; };
104 101 F915612619C3D16D00126FE2 /* DateRangePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateRangePickerViewController.h; sourceTree = SOURCE_ROOT; };
105 102 F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateRangePickerViewController.m; sourceTree = SOURCE_ROOT; };
106 103 F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriceChangerViewController.h; sourceTree = SOURCE_ROOT; };
107 104 F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriceChangerViewController.m; sourceTree = SOURCE_ROOT; };
108 105 F92F567E19B7609C00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController.xib; sourceTree = "<group>"; };
109   - F92F568119B760A100A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController.strings; sourceTree = "<group>"; };
110 106 F92F568519B760A800A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_iPad.xib; sourceTree = "<group>"; };
111   - F92F568819B760AA00A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad.strings; sourceTree = "<group>"; };
112 107 F92F568A19B760AB00A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_iPad.strings; sourceTree = "<group>"; };
113 108 F92F568C19B7616200A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController.strings; sourceTree = "<group>"; };
114 109 F92F568D19B763FD00A1EACA /* NameChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NameChangerViewController.h; sourceTree = SOURCE_ROOT; };
115 110 F92F568E19B763FD00A1EACA /* NameChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NameChangerViewController.m; sourceTree = SOURCE_ROOT; };
116 111 F92F569319B7665F00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController.xib; sourceTree = "<group>"; };
117   - F92F569619B7666300A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController.strings; sourceTree = "<group>"; };
118 112 F92F569819B7666400A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController.strings; sourceTree = "<group>"; };
119 113 F92F569C19B76A5D00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_iPad.xib; sourceTree = "<group>"; };
120   - F92F569F19B76A6300A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad.strings; sourceTree = "<group>"; };
121 114 F92F56A119B76A6400A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad.strings; sourceTree = "<group>"; };
122 115 F933F80119B6819400521B90 /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePickerViewController.h; sourceTree = SOURCE_ROOT; };
123 116 F933F80219B6819400521B90 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatePickerViewController.m; sourceTree = SOURCE_ROOT; };
... ... @@ -136,7 +129,6 @@
136 129 F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = "<group>"; };
137 130 F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = "<group>"; };
138 131 F975ADAD19E8248000CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad_Landscape.xib; sourceTree = "<group>"; };
139   - F975ADB019E8248200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
140 132 F975ADB219E8248300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
141 133 F975ADBC19E827EC00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_Landscape.xib; sourceTree = "<group>"; };
142 134 F975ADBF19E827F000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_Landscape.strings; sourceTree = "<group>"; };
... ... @@ -145,25 +137,18 @@
145 137 F975ADC619E827F900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = "<group>"; };
146 138 F975ADC819E827F900CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = "<group>"; };
147 139 F975ADD619E82B7D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_Landscape.xib; sourceTree = "<group>"; };
148   - F975ADD919E82B8000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_Landscape.strings; sourceTree = "<group>"; };
149 140 F975ADDB19E82B8100CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_Landscape.strings; sourceTree = "<group>"; };
150 141 F975ADDD19E82B9800CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_Landscape.xib; sourceTree = "<group>"; };
151   - F975ADE419E82BE200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_Landscape.strings; sourceTree = "<group>"; };
152 142 F975ADE619E82BE300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_Landscape.strings; sourceTree = "<group>"; };
153 143 F975ADE819E82C5D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_iPad_Landscape.xib; sourceTree = "<group>"; };
154   - F975ADEB19E82C6200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
155 144 F975ADED19E82C6200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
156 145 F975ADEF19E82D1400CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_Landscape.xib; sourceTree = "<group>"; };
157   - F975ADF219E82D1600CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_Landscape.strings; sourceTree = "<group>"; };
158 146 F975ADF419E82D1600CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_Landscape.strings; sourceTree = "<group>"; };
159 147 F975ADF619E82D9F00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_iPad_Landscape.xib; sourceTree = "<group>"; };
160   - F975ADF919E82DA100CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
161 148 F975ADFB19E82DA200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
162 149 F975ADFD19E8347700CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_Landscape.xib; sourceTree = "<group>"; };
163   - F975AE0019E8347900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = "<group>"; };
164 150 F975AE0219E8347A00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = "<group>"; };
165 151 F975AE0419E8359B00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad_Landscape.xib; sourceTree = "<group>"; };
166   - F975AE0719E8359D00CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
167 152 F975AE0919E8359E00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
168 153 F97B90C919B859F500DDA9EF /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; };
169 154 F97B90CA19B859F500DDA9EF /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; };
... ... @@ -183,10 +168,25 @@
183 168 F989B60019BCE28C00657DD9 /* SalesLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesLog.h; sourceTree = SOURCE_ROOT; };
184 169 F989B60119BCE28C00657DD9 /* SalesLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesLog.m; sourceTree = SOURCE_ROOT; };
185 170 F996591319CC7F3D00667BEC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad.xib; sourceTree = "<group>"; };
186   - F996591619CC7F4400667BEC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad.strings; sourceTree = "<group>"; };
187 171 F996591819CC7F4500667BEC /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad.strings; sourceTree = "<group>"; };
188 172 F9A8EF7A192FE201009E7532 /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; };
189 173 F9A8EF7B192FE201009E7532 /* Stack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Stack.m; sourceTree = SOURCE_ROOT; };
  174 + F9A94AE61A165256005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
  175 + F9A94AE81A16525E005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = "<group>"; };
  176 + F9A94AEA1A165266005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_Landscape.strings; sourceTree = "<group>"; };
  177 + F9A94AEC1A16526E005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController.strings; sourceTree = "<group>"; };
  178 + F9A94AEE1A16557F005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController.strings; sourceTree = "<group>"; };
  179 + F9A94AF01A165586005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_Landscape.strings; sourceTree = "<group>"; };
  180 + F9A94AF21A16558D005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad.strings; sourceTree = "<group>"; };
  181 + F9A94AF41A165595005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
  182 + F9A94AF61A1657B6005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController.strings; sourceTree = "<group>"; };
  183 + F9A94AF81A1657BC005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_Landscape.strings; sourceTree = "<group>"; };
  184 + F9A94AFA1A1657C3005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad.strings; sourceTree = "<group>"; };
  185 + F9A94AFC1A1657CA005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
  186 + F9A94AFE1A1657D1005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController.strings; sourceTree = "<group>"; };
  187 + F9A94B001A1657D6005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = "<group>"; };
  188 + F9A94B021A1657DE005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad.strings; sourceTree = "<group>"; };
  189 + F9A94B041A1657E5005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = "<group>"; };
190 190 F9B9100719E59773006D4D06 /* IncidentLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncidentLog.h; sourceTree = SOURCE_ROOT; };
191 191 F9B9100819E59773006D4D06 /* IncidentLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IncidentLog.m; sourceTree = SOURCE_ROOT; };
192 192 F9B9100A19E5A0A1006D4D06 /* Incident.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Incident.h; sourceTree = SOURCE_ROOT; };
... ... @@ -534,8 +534,8 @@
534 534 isa = PBXVariantGroup;
535 535 children = (
536 536 F9015D9119B73052006C7882 /* Base */,
537   - F9015D9419B73056006C7882 /* en */,
538 537 F9015D9619B73057006C7882 /* es */,
  538 + F9A94AEC1A16526E005B5E0F /* en */,
539 539 );
540 540 name = DatePickerViewController.xib;
541 541 sourceTree = SOURCE_ROOT;
... ... @@ -544,8 +544,8 @@
544 544 isa = PBXVariantGroup;
545 545 children = (
546 546 F9015D9819B7305E006C7882 /* Base */,
547   - F9015D9B19B73062006C7882 /* en */,
548 547 F9015D9D19B73062006C7882 /* es */,
  548 + F9A94AE81A16525E005B5E0F /* en */,
549 549 );
550 550 name = DatePickerViewController_iPad.xib;
551 551 sourceTree = SOURCE_ROOT;
... ... @@ -554,8 +554,8 @@
554 554 isa = PBXVariantGroup;
555 555 children = (
556 556 F90416FD19CC776E00333AD8 /* Base */,
557   - F904170019CC777200333AD8 /* en */,
558 557 F904170219CC777300333AD8 /* es */,
  558 + F9A94AFE1A1657D1005B5E0F /* en */,
559 559 );
560 560 name = DateRangePickerViewController.xib;
561 561 sourceTree = SOURCE_ROOT;
... ... @@ -564,8 +564,8 @@
564 564 isa = PBXVariantGroup;
565 565 children = (
566 566 F92F567E19B7609C00A1EACA /* Base */,
567   - F92F568119B760A100A1EACA /* en */,
568 567 F92F568C19B7616200A1EACA /* es */,
  568 + F9A94AEE1A16557F005B5E0F /* en */,
569 569 );
570 570 name = PriceChangerViewController.xib;
571 571 sourceTree = SOURCE_ROOT;
... ... @@ -574,8 +574,8 @@
574 574 isa = PBXVariantGroup;
575 575 children = (
576 576 F92F568519B760A800A1EACA /* Base */,
577   - F92F568819B760AA00A1EACA /* en */,
578 577 F92F568A19B760AB00A1EACA /* es */,
  578 + F9A94AF21A16558D005B5E0F /* en */,
579 579 );
580 580 name = PriceChangerViewController_iPad.xib;
581 581 sourceTree = SOURCE_ROOT;
... ... @@ -584,8 +584,8 @@
584 584 isa = PBXVariantGroup;
585 585 children = (
586 586 F92F569319B7665F00A1EACA /* Base */,
587   - F92F569619B7666300A1EACA /* en */,
588 587 F92F569819B7666400A1EACA /* es */,
  588 + F9A94AF61A1657B6005B5E0F /* en */,
589 589 );
590 590 name = NameChangerViewController.xib;
591 591 sourceTree = SOURCE_ROOT;
... ... @@ -594,8 +594,8 @@
594 594 isa = PBXVariantGroup;
595 595 children = (
596 596 F92F569C19B76A5D00A1EACA /* Base */,
597   - F92F569F19B76A6300A1EACA /* en */,
598 597 F92F56A119B76A6400A1EACA /* es */,
  598 + F9A94AFA1A1657C3005B5E0F /* en */,
599 599 );
600 600 name = NameChangerViewController_iPad.xib;
601 601 sourceTree = SOURCE_ROOT;
... ... @@ -646,8 +646,8 @@
646 646 isa = PBXVariantGroup;
647 647 children = (
648 648 F975ADAD19E8248000CA4442 /* Base */,
649   - F975ADB019E8248200CA4442 /* en */,
650 649 F975ADB219E8248300CA4442 /* es */,
  650 + F9A94AE61A165256005B5E0F /* en */,
651 651 );
652 652 name = DatePickerViewController_iPad_Landscape.xib;
653 653 sourceTree = SOURCE_ROOT;
... ... @@ -676,8 +676,8 @@
676 676 isa = PBXVariantGroup;
677 677 children = (
678 678 F975ADD619E82B7D00CA4442 /* Base */,
679   - F975ADD919E82B8000CA4442 /* en */,
680 679 F975ADDB19E82B8100CA4442 /* es */,
  680 + F9A94AEA1A165266005B5E0F /* en */,
681 681 );
682 682 name = DatePickerViewController_Landscape.xib;
683 683 sourceTree = SOURCE_ROOT;
... ... @@ -686,8 +686,8 @@
686 686 isa = PBXVariantGroup;
687 687 children = (
688 688 F975ADDD19E82B9800CA4442 /* Base */,
689   - F975ADE419E82BE200CA4442 /* en */,
690 689 F975ADE619E82BE300CA4442 /* es */,
  690 + F9A94AF01A165586005B5E0F /* en */,
691 691 );
692 692 name = PriceChangerViewController_Landscape.xib;
693 693 sourceTree = SOURCE_ROOT;
... ... @@ -696,8 +696,8 @@
696 696 isa = PBXVariantGroup;
697 697 children = (
698 698 F975ADE819E82C5D00CA4442 /* Base */,
699   - F975ADEB19E82C6200CA4442 /* en */,
700 699 F975ADED19E82C6200CA4442 /* es */,
  700 + F9A94AF41A165595005B5E0F /* en */,
701 701 );
702 702 name = PriceChangerViewController_iPad_Landscape.xib;
703 703 sourceTree = SOURCE_ROOT;
... ... @@ -706,8 +706,8 @@
706 706 isa = PBXVariantGroup;
707 707 children = (
708 708 F975ADEF19E82D1400CA4442 /* Base */,
709   - F975ADF219E82D1600CA4442 /* en */,
710 709 F975ADF419E82D1600CA4442 /* es */,
  710 + F9A94AF81A1657BC005B5E0F /* en */,
711 711 );
712 712 name = NameChangerViewController_Landscape.xib;
713 713 sourceTree = SOURCE_ROOT;
... ... @@ -716,8 +716,8 @@
716 716 isa = PBXVariantGroup;
717 717 children = (
718 718 F975ADF619E82D9F00CA4442 /* Base */,
719   - F975ADF919E82DA100CA4442 /* en */,
720 719 F975ADFB19E82DA200CA4442 /* es */,
  720 + F9A94AFC1A1657CA005B5E0F /* en */,
721 721 );
722 722 name = NameChangerViewController_iPad_Landscape.xib;
723 723 sourceTree = SOURCE_ROOT;
... ... @@ -726,8 +726,8 @@
726 726 isa = PBXVariantGroup;
727 727 children = (
728 728 F975ADFD19E8347700CA4442 /* Base */,
729   - F975AE0019E8347900CA4442 /* en */,
730 729 F975AE0219E8347A00CA4442 /* es */,
  730 + F9A94B001A1657D6005B5E0F /* en */,
731 731 );
732 732 name = DateRangePickerViewController_Landscape.xib;
733 733 sourceTree = SOURCE_ROOT;
... ... @@ -736,8 +736,8 @@
736 736 isa = PBXVariantGroup;
737 737 children = (
738 738 F975AE0419E8359B00CA4442 /* Base */,
739   - F975AE0719E8359D00CA4442 /* en */,
740 739 F975AE0919E8359E00CA4442 /* es */,
  740 + F9A94B041A1657E5005B5E0F /* en */,
741 741 );
742 742 name = DateRangePickerViewController_iPad_Landscape.xib;
743 743 sourceTree = SOURCE_ROOT;
... ... @@ -746,8 +746,8 @@
746 746 isa = PBXVariantGroup;
747 747 children = (
748 748 F996591319CC7F3D00667BEC /* Base */,
749   - F996591619CC7F4400667BEC /* en */,
750 749 F996591819CC7F4500667BEC /* es */,
  750 + F9A94B021A1657DE005B5E0F /* en */,
751 751 );
752 752 name = DateRangePickerViewController_iPad.xib;
753 753 sourceTree = SOURCE_ROOT;
... ...
BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
... ... @@ -26,11 +26,11 @@
26 26 ignoreCount = "0"
27 27 continueAfterRunningActions = "No"
28 28 filePath = "MenuTableViewController.m"
29   - timestampString = "437250832.810266"
  29 + timestampString = "437672438.4449"
30 30 startingColumnNumber = "9223372036854775807"
31 31 endingColumnNumber = "9223372036854775807"
32   - startingLineNumber = "1068"
33   - endingLineNumber = "1068"
  32 + startingLineNumber = "1082"
  33 + endingLineNumber = "1082"
34 34 landmarkName = "-tableView:didSelectRowAtIndexPath:"
35 35 landmarkType = "5">
36 36 </BreakpointContent>
... ... @@ -42,11 +42,11 @@
42 42 ignoreCount = "0"
43 43 continueAfterRunningActions = "No"
44 44 filePath = "MenuTableViewController.m"
45   - timestampString = "437250832.810266"
  45 + timestampString = "437672438.4449"
46 46 startingColumnNumber = "9223372036854775807"
47 47 endingColumnNumber = "9223372036854775807"
48   - startingLineNumber = "737"
49   - endingLineNumber = "737"
  48 + startingLineNumber = "747"
  49 + endingLineNumber = "747"
50 50 landmarkName = "-toggleDropList:"
51 51 landmarkType = "5">
52 52 </BreakpointContent>
... ... @@ -58,11 +58,11 @@
58 58 ignoreCount = "0"
59 59 continueAfterRunningActions = "No"
60 60 filePath = "CommunicationProtocol.m"
61   - timestampString = "437062910.396222"
  61 + timestampString = "437306741.005643"
62 62 startingColumnNumber = "9223372036854775807"
63 63 endingColumnNumber = "9223372036854775807"
64   - startingLineNumber = "329"
65   - endingLineNumber = "329"
  64 + startingLineNumber = "335"
  65 + endingLineNumber = "335"
66 66 landmarkName = "-readIncidentLog::"
67 67 landmarkType = "5">
68 68 </BreakpointContent>
... ... @@ -74,11 +74,11 @@
74 74 ignoreCount = "0"
75 75 continueAfterRunningActions = "No"
76 76 filePath = "CommunicationProtocol.m"
77   - timestampString = "437062910.396222"
  77 + timestampString = "437306741.005643"
78 78 startingColumnNumber = "9223372036854775807"
79 79 endingColumnNumber = "9223372036854775807"
80   - startingLineNumber = "329"
81   - endingLineNumber = "329"
  80 + startingLineNumber = "335"
  81 + endingLineNumber = "335"
82 82 landmarkName = "-readIncidentLog::"
83 83 landmarkType = "5">
84 84 </BreakpointContent>
... ... @@ -90,11 +90,11 @@
90 90 ignoreCount = "0"
91 91 continueAfterRunningActions = "No"
92 92 filePath = "CommunicationProtocol.m"
93   - timestampString = "437062910.396222"
  93 + timestampString = "437306741.005643"
94 94 startingColumnNumber = "9223372036854775807"
95 95 endingColumnNumber = "9223372036854775807"
96   - startingLineNumber = "340"
97   - endingLineNumber = "340"
  96 + startingLineNumber = "346"
  97 + endingLineNumber = "346"
98 98 landmarkName = "-readIncidentLog::"
99 99 landmarkType = "5">
100 100 </BreakpointContent>
... ... @@ -154,11 +154,11 @@
154 154 ignoreCount = "0"
155 155 continueAfterRunningActions = "No"
156 156 filePath = "SalesLog.m"
157   - timestampString = "431872273.448636"
  157 + timestampString = "437305705.289537"
158 158 startingColumnNumber = "9223372036854775807"
159 159 endingColumnNumber = "9223372036854775807"
160   - startingLineNumber = "61"
161   - endingLineNumber = "61"
  160 + startingLineNumber = "55"
  161 + endingLineNumber = "55"
162 162 landmarkName = "-parseResponse"
163 163 landmarkType = "5">
164 164 </BreakpointContent>
... ... @@ -170,11 +170,11 @@
170 170 ignoreCount = "0"
171 171 continueAfterRunningActions = "No"
172 172 filePath = "MenuTableViewController.m"
173   - timestampString = "437250832.810266"
  173 + timestampString = "437672438.4449"
174 174 startingColumnNumber = "9223372036854775807"
175 175 endingColumnNumber = "9223372036854775807"
176   - startingLineNumber = "1187"
177   - endingLineNumber = "1187"
  176 + startingLineNumber = "1201"
  177 + endingLineNumber = "1201"
178 178 landmarkName = "-tableView:didSelectRowAtIndexPath:"
179 179 landmarkType = "5">
180 180 </BreakpointContent>
... ... @@ -186,11 +186,11 @@
186 186 ignoreCount = "0"
187 187 continueAfterRunningActions = "No"
188 188 filePath = "MenuTableViewController.m"
189   - timestampString = "437065369.601573"
  189 + timestampString = "437672438.4449"
190 190 startingColumnNumber = "9223372036854775807"
191 191 endingColumnNumber = "9223372036854775807"
192   - startingLineNumber = "220"
193   - endingLineNumber = "220"
  192 + startingLineNumber = "221"
  193 + endingLineNumber = "221"
194 194 landmarkName = "-generateIncidentListNavLevel:"
195 195 landmarkType = "5">
196 196 </BreakpointContent>
... ... @@ -202,11 +202,11 @@
202 202 ignoreCount = "0"
203 203 continueAfterRunningActions = "No"
204 204 filePath = "MenuTableViewController.m"
205   - timestampString = "437250832.810266"
  205 + timestampString = "437672438.4449"
206 206 startingColumnNumber = "9223372036854775807"
207 207 endingColumnNumber = "9223372036854775807"
208   - startingLineNumber = "863"
209   - endingLineNumber = "863"
  208 + startingLineNumber = "873"
  209 + endingLineNumber = "873"
210 210 landmarkName = "-tableView:numberOfRowsInSection:"
211 211 landmarkType = "5">
212 212 </BreakpointContent>
... ... @@ -218,11 +218,11 @@
218 218 ignoreCount = "0"
219 219 continueAfterRunningActions = "No"
220 220 filePath = "MenuTableViewController.m"
221   - timestampString = "437250832.810266"
  221 + timestampString = "437672438.4449"
222 222 startingColumnNumber = "9223372036854775807"
223 223 endingColumnNumber = "9223372036854775807"
224   - startingLineNumber = "1286"
225   - endingLineNumber = "1286"
  224 + startingLineNumber = "1300"
  225 + endingLineNumber = "1300"
226 226 landmarkName = "-tableView:cellForRowAtIndexPath:"
227 227 landmarkType = "5">
228 228 </BreakpointContent>
... ... @@ -234,11 +234,11 @@
234 234 ignoreCount = "0"
235 235 continueAfterRunningActions = "No"
236 236 filePath = "MenuTableViewController.m"
237   - timestampString = "437250832.810266"
  237 + timestampString = "437672438.4449"
238 238 startingColumnNumber = "9223372036854775807"
239 239 endingColumnNumber = "9223372036854775807"
240   - startingLineNumber = "1287"
241   - endingLineNumber = "1287"
  240 + startingLineNumber = "1301"
  241 + endingLineNumber = "1301"
242 242 landmarkName = "-tableView:cellForRowAtIndexPath:"
243 243 landmarkType = "5">
244 244 </BreakpointContent>
... ... @@ -250,11 +250,11 @@
250 250 ignoreCount = "0"
251 251 continueAfterRunningActions = "No"
252 252 filePath = "SalesLog.m"
253   - timestampString = "431870901.753946"
  253 + timestampString = "437305705.289537"
254 254 startingColumnNumber = "9223372036854775807"
255 255 endingColumnNumber = "9223372036854775807"
256   - startingLineNumber = "51"
257   - endingLineNumber = "51"
  256 + startingLineNumber = "48"
  257 + endingLineNumber = "48"
258 258 landmarkName = "-parseResponse"
259 259 landmarkType = "5">
260 260 </BreakpointContent>
... ... @@ -266,11 +266,11 @@
266 266 ignoreCount = "0"
267 267 continueAfterRunningActions = "No"
268 268 filePath = "MenuTableViewController.m"
269   - timestampString = "437250832.810266"
  269 + timestampString = "437672438.4449"
270 270 startingColumnNumber = "9223372036854775807"
271 271 endingColumnNumber = "9223372036854775807"
272   - startingLineNumber = "1404"
273   - endingLineNumber = "1404"
  272 + startingLineNumber = "1418"
  273 + endingLineNumber = "1418"
274 274 landmarkName = "-tableView:cellForRowAtIndexPath:"
275 275 landmarkType = "5">
276 276 </BreakpointContent>
... ... @@ -282,11 +282,11 @@
282 282 ignoreCount = "0"
283 283 continueAfterRunningActions = "No"
284 284 filePath = "MenuTableViewController.m"
285   - timestampString = "437250832.810266"
  285 + timestampString = "437672438.4449"
286 286 startingColumnNumber = "9223372036854775807"
287 287 endingColumnNumber = "9223372036854775807"
288   - startingLineNumber = "667"
289   - endingLineNumber = "667"
  288 + startingLineNumber = "677"
  289 + endingLineNumber = "677"
290 290 landmarkName = "-willRotateToInterfaceOrientation:duration:"
291 291 landmarkType = "5">
292 292 </BreakpointContent>
... ... @@ -298,11 +298,11 @@
298 298 ignoreCount = "0"
299 299 continueAfterRunningActions = "No"
300 300 filePath = "MenuTableViewController.m"
301   - timestampString = "437250832.810266"
  301 + timestampString = "437672438.4449"
302 302 startingColumnNumber = "9223372036854775807"
303 303 endingColumnNumber = "9223372036854775807"
304   - startingLineNumber = "1489"
305   - endingLineNumber = "1489"
  304 + startingLineNumber = "1503"
  305 + endingLineNumber = "1503"
306 306 landmarkName = "-tableView:cellForRowAtIndexPath:"
307 307 landmarkType = "5">
308 308 </BreakpointContent>
... ... @@ -314,11 +314,11 @@
314 314 ignoreCount = "0"
315 315 continueAfterRunningActions = "No"
316 316 filePath = "MenuTableViewController.m"
317   - timestampString = "437250832.810266"
  317 + timestampString = "437672438.4449"
318 318 startingColumnNumber = "9223372036854775807"
319 319 endingColumnNumber = "9223372036854775807"
320   - startingLineNumber = "1481"
321   - endingLineNumber = "1481"
  320 + startingLineNumber = "1495"
  321 + endingLineNumber = "1495"
322 322 landmarkName = "-tableView:cellForRowAtIndexPath:"
323 323 landmarkType = "5">
324 324 </BreakpointContent>
... ... @@ -330,11 +330,11 @@
330 330 ignoreCount = "0"
331 331 continueAfterRunningActions = "No"
332 332 filePath = "MenuTableViewController.m"
333   - timestampString = "437250832.810266"
  333 + timestampString = "437672438.4449"
334 334 startingColumnNumber = "9223372036854775807"
335 335 endingColumnNumber = "9223372036854775807"
336   - startingLineNumber = "1278"
337   - endingLineNumber = "1278"
  336 + startingLineNumber = "1292"
  337 + endingLineNumber = "1292"
338 338 landmarkName = "-tableView:cellForRowAtIndexPath:"
339 339 landmarkType = "5">
340 340 </BreakpointContent>
... ... @@ -346,11 +346,11 @@
346 346 ignoreCount = "0"
347 347 continueAfterRunningActions = "No"
348 348 filePath = "MenuTableViewController.m"
349   - timestampString = "437250832.810266"
  349 + timestampString = "437672438.4449"
350 350 startingColumnNumber = "9223372036854775807"
351 351 endingColumnNumber = "9223372036854775807"
352   - startingLineNumber = "1276"
353   - endingLineNumber = "1276"
  352 + startingLineNumber = "1290"
  353 + endingLineNumber = "1290"
354 354 landmarkName = "-tableView:cellForRowAtIndexPath:"
355 355 landmarkType = "5">
356 356 </BreakpointContent>
... ... @@ -426,11 +426,11 @@
426 426 ignoreCount = "0"
427 427 continueAfterRunningActions = "No"
428 428 filePath = "MenuTableViewController.m"
429   - timestampString = "437250832.810266"
  429 + timestampString = "437672438.4449"
430 430 startingColumnNumber = "9223372036854775807"
431 431 endingColumnNumber = "9223372036854775807"
432   - startingLineNumber = "1605"
433   - endingLineNumber = "1605"
  432 + startingLineNumber = "1619"
  433 + endingLineNumber = "1619"
434 434 landmarkName = "-tableView:cellForRowAtIndexPath:"
435 435 landmarkType = "5">
436 436 </BreakpointContent>
... ... @@ -442,11 +442,11 @@
442 442 ignoreCount = "0"
443 443 continueAfterRunningActions = "No"
444 444 filePath = "MenuTableViewController.m"
445   - timestampString = "437250832.810266"
  445 + timestampString = "437672438.4449"
446 446 startingColumnNumber = "9223372036854775807"
447 447 endingColumnNumber = "9223372036854775807"
448   - startingLineNumber = "1590"
449   - endingLineNumber = "1590"
  448 + startingLineNumber = "1604"
  449 + endingLineNumber = "1604"
450 450 landmarkName = "-tableView:cellForRowAtIndexPath:"
451 451 landmarkType = "5">
452 452 </BreakpointContent>
... ... @@ -504,11 +504,11 @@
504 504 ignoreCount = "0"
505 505 continueAfterRunningActions = "No"
506 506 filePath = "MenuTableViewController.m"
507   - timestampString = "437065369.601573"
  507 + timestampString = "437672438.4449"
508 508 startingColumnNumber = "9223372036854775807"
509 509 endingColumnNumber = "9223372036854775807"
510   - startingLineNumber = "626"
511   - endingLineNumber = "626"
  510 + startingLineNumber = "636"
  511 + endingLineNumber = "636"
512 512 landmarkName = "-viewDidLoad"
513 513 landmarkType = "5">
514 514 </BreakpointContent>
... ... @@ -520,11 +520,11 @@
520 520 ignoreCount = "0"
521 521 continueAfterRunningActions = "No"
522 522 filePath = "MenuTableViewController.m"
523   - timestampString = "437065369.601573"
  523 + timestampString = "437672438.4449"
524 524 startingColumnNumber = "9223372036854775807"
525 525 endingColumnNumber = "9223372036854775807"
526   - startingLineNumber = "143"
527   - endingLineNumber = "143"
  526 + startingLineNumber = "144"
  527 + endingLineNumber = "144"
528 528 landmarkName = "-generateSaleListNavLevel:"
529 529 landmarkType = "5">
530 530 </BreakpointContent>
... ... @@ -552,11 +552,11 @@
552 552 ignoreCount = "0"
553 553 continueAfterRunningActions = "No"
554 554 filePath = "MenuTableViewController.m"
555   - timestampString = "437250832.810266"
  555 + timestampString = "437672438.4449"
556 556 startingColumnNumber = "9223372036854775807"
557 557 endingColumnNumber = "9223372036854775807"
558   - startingLineNumber = "1264"
559   - endingLineNumber = "1264"
  558 + startingLineNumber = "1278"
  559 + endingLineNumber = "1278"
560 560 landmarkName = "-tableView:cellForRowAtIndexPath:"
561 561 landmarkType = "5">
562 562 </BreakpointContent>
... ... @@ -568,11 +568,11 @@
568 568 ignoreCount = "0"
569 569 continueAfterRunningActions = "No"
570 570 filePath = "MenuTableViewController.m"
571   - timestampString = "437250832.810266"
  571 + timestampString = "437672438.4449"
572 572 startingColumnNumber = "9223372036854775807"
573 573 endingColumnNumber = "9223372036854775807"
574   - startingLineNumber = "893"
575   - endingLineNumber = "893"
  574 + startingLineNumber = "907"
  575 + endingLineNumber = "907"
576 576 landmarkName = "-tableView:didSelectRowAtIndexPath:"
577 577 landmarkType = "5">
578 578 </BreakpointContent>
... ... @@ -584,11 +584,11 @@
584 584 ignoreCount = "0"
585 585 continueAfterRunningActions = "No"
586 586 filePath = "MenuTableViewController.m"
587   - timestampString = "437250832.810266"
  587 + timestampString = "437672438.4449"
588 588 startingColumnNumber = "9223372036854775807"
589 589 endingColumnNumber = "9223372036854775807"
590   - startingLineNumber = "892"
591   - endingLineNumber = "892"
  590 + startingLineNumber = "906"
  591 + endingLineNumber = "906"
592 592 landmarkName = "-tableView:didSelectRowAtIndexPath:"
593 593 landmarkType = "5">
594 594 </BreakpointContent>
... ... @@ -600,13 +600,13 @@
600 600 ignoreCount = "0"
601 601 continueAfterRunningActions = "No"
602 602 filePath = "MenuTableViewController.m"
603   - timestampString = "437250832.810266"
  603 + timestampString = "437672438.4449"
604 604 startingColumnNumber = "9223372036854775807"
605 605 endingColumnNumber = "9223372036854775807"
606   - startingLineNumber = "882"
607   - endingLineNumber = "882"
608   - landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:"
609   - landmarkType = "5">
  606 + startingLineNumber = "892"
  607 + endingLineNumber = "892"
  608 + landmarkName = "@implementation MenuTableViewController"
  609 + landmarkType = "3">
610 610 </BreakpointContent>
611 611 </BreakpointProxy>
612 612 <BreakpointProxy
... ... @@ -680,11 +680,11 @@
680 680 ignoreCount = "0"
681 681 continueAfterRunningActions = "No"
682 682 filePath = "MenuTableViewController.m"
683   - timestampString = "437065369.601573"
  683 + timestampString = "437672438.4449"
684 684 startingColumnNumber = "9223372036854775807"
685 685 endingColumnNumber = "9223372036854775807"
686   - startingLineNumber = "547"
687   - endingLineNumber = "547"
  686 + startingLineNumber = "556"
  687 + endingLineNumber = "556"
688 688 landmarkName = "-handleOpenURL:"
689 689 landmarkType = "5">
690 690 </BreakpointContent>
... ... @@ -696,11 +696,11 @@
696 696 ignoreCount = "0"
697 697 continueAfterRunningActions = "No"
698 698 filePath = "MenuTableViewController.m"
699   - timestampString = "437065369.601573"
  699 + timestampString = "437672438.4449"
700 700 startingColumnNumber = "9223372036854775807"
701 701 endingColumnNumber = "9223372036854775807"
702   - startingLineNumber = "554"
703   - endingLineNumber = "554"
  702 + startingLineNumber = "563"
  703 + endingLineNumber = "563"
704 704 landmarkName = "-handleOpenURL:"
705 705 landmarkType = "5">
706 706 </BreakpointContent>
... ... @@ -712,11 +712,11 @@
712 712 ignoreCount = "0"
713 713 continueAfterRunningActions = "No"
714 714 filePath = "MenuTableViewController.m"
715   - timestampString = "437065369.601573"
  715 + timestampString = "437672438.4449"
716 716 startingColumnNumber = "9223372036854775807"
717 717 endingColumnNumber = "9223372036854775807"
718   - startingLineNumber = "531"
719   - endingLineNumber = "531"
  718 + startingLineNumber = "540"
  719 + endingLineNumber = "540"
720 720 landmarkName = "-handleOpenURL:"
721 721 landmarkType = "5">
722 722 </BreakpointContent>
... ... @@ -728,11 +728,11 @@
728 728 ignoreCount = "0"
729 729 continueAfterRunningActions = "No"
730 730 filePath = "MenuTableViewController.m"
731   - timestampString = "437065369.601573"
  731 + timestampString = "437672438.4449"
732 732 startingColumnNumber = "9223372036854775807"
733 733 endingColumnNumber = "9223372036854775807"
734   - startingLineNumber = "512"
735   - endingLineNumber = "512"
  734 + startingLineNumber = "521"
  735 + endingLineNumber = "521"
736 736 landmarkName = "-alertView:clickedButtonAtIndex:"
737 737 landmarkType = "5">
738 738 </BreakpointContent>
... ... @@ -744,11 +744,11 @@
744 744 ignoreCount = "0"
745 745 continueAfterRunningActions = "No"
746 746 filePath = "MenuTableViewController.m"
747   - timestampString = "437250832.810266"
  747 + timestampString = "437672438.4449"
748 748 startingColumnNumber = "9223372036854775807"
749 749 endingColumnNumber = "9223372036854775807"
750   - startingLineNumber = "1119"
751   - endingLineNumber = "1119"
  750 + startingLineNumber = "1133"
  751 + endingLineNumber = "1133"
752 752 landmarkName = "-tableView:didSelectRowAtIndexPath:"
753 753 landmarkType = "5">
754 754 </BreakpointContent>
... ... @@ -760,11 +760,11 @@
760 760 ignoreCount = "0"
761 761 continueAfterRunningActions = "No"
762 762 filePath = "MenuTableViewController.m"
763   - timestampString = "437250832.810266"
  763 + timestampString = "437672438.4449"
764 764 startingColumnNumber = "9223372036854775807"
765 765 endingColumnNumber = "9223372036854775807"
766   - startingLineNumber = "1116"
767   - endingLineNumber = "1116"
  766 + startingLineNumber = "1130"
  767 + endingLineNumber = "1130"
768 768 landmarkName = "-tableView:didSelectRowAtIndexPath:"
769 769 landmarkType = "5">
770 770 </BreakpointContent>
... ... @@ -776,11 +776,11 @@
776 776 ignoreCount = "0"
777 777 continueAfterRunningActions = "No"
778 778 filePath = "MenuTableViewController.m"
779   - timestampString = "437250832.810266"
  779 + timestampString = "437672438.4449"
780 780 startingColumnNumber = "9223372036854775807"
781 781 endingColumnNumber = "9223372036854775807"
782   - startingLineNumber = "1115"
783   - endingLineNumber = "1115"
  782 + startingLineNumber = "1129"
  783 + endingLineNumber = "1129"
784 784 landmarkName = "-tableView:didSelectRowAtIndexPath:"
785 785 landmarkType = "5">
786 786 </BreakpointContent>
... ...
BT Vendor/Base.lproj/DatePickerViewController.xib
... ... @@ -20,16 +20,6 @@
20 20 <rect key="frame" x="6" y="136" width="308" height="296"/>
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23   - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
24   - <rect key="frame" x="136" y="190" width="37" height="30"/>
25   - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
26   - <state key="normal" title="Done">
27   - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
28   - </state>
29   - <connections>
30   - <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="bgh-B7-4fN"/>
31   - </connections>
32   - </button>
33 23 <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="SbL-OM-Pxu">
34 24 <rect key="frame" x="-6" y="20" width="320" height="162"/>
35 25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
... ... @@ -58,15 +48,38 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
58 48 </data>
59 49 </timeZone>
60 50 </datePicker>
  51 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
  52 + <rect key="frame" x="108" y="190" width="37" height="30"/>
  53 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  54 + <state key="normal" title="Done">
  55 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  56 + </state>
  57 + <connections>
  58 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="bgh-B7-4fN"/>
  59 + </connections>
  60 + </button>
  61 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KYb-t5-e1m">
  62 + <rect key="frame" x="153" y="190" width="48" height="30"/>
  63 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  64 + <state key="normal" title="Cancel">
  65 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  66 + </state>
  67 + <connections>
  68 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="HaS-RM-xE1"/>
  69 + </connections>
  70 + </button>
61 71 </subviews>
62 72 <color key="backgroundColor" white="1" alpha="0.95000000000000007" colorSpace="calibratedWhite"/>
63 73 <constraints>
64 74 <constraint firstAttribute="height" constant="296" id="6Mz-Uy-NbX"/>
65 75 <constraint firstItem="SbL-OM-Pxu" firstAttribute="top" secondItem="o92-Jq-3Xo" secondAttribute="top" constant="20" symbolic="YES" id="6cM-JX-mex"/>
66   - <constraint firstItem="SbL-OM-Pxu" firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" id="JRN-6a-zk0"/>
  76 + <constraint firstItem="8vW-ig-tUA" firstAttribute="leading" secondItem="o92-Jq-3Xo" secondAttribute="leading" constant="108" id="Kv6-uo-GLe"/>
  77 + <constraint firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" constant="27.5" id="T8Y-ld-HxG"/>
67 78 <constraint firstAttribute="width" constant="308" id="Zfo-v2-Opc"/>
68 79 <constraint firstItem="SbL-OM-Pxu" firstAttribute="centerX" secondItem="o92-Jq-3Xo" secondAttribute="centerX" id="aqD-2z-9t6"/>
  80 + <constraint firstItem="KYb-t5-e1m" firstAttribute="top" secondItem="SbL-OM-Pxu" secondAttribute="bottom" constant="8" id="cZ5-5K-4Ml"/>
69 81 <constraint firstItem="8vW-ig-tUA" firstAttribute="top" secondItem="SbL-OM-Pxu" secondAttribute="bottom" constant="8" id="l3e-xF-szd"/>
  82 + <constraint firstItem="KYb-t5-e1m" firstAttribute="leading" secondItem="8vW-ig-tUA" secondAttribute="trailing" constant="8" id="nWc-7K-1e6"/>
70 83 <constraint firstItem="SbL-OM-Pxu" firstAttribute="leading" secondItem="o92-Jq-3Xo" secondAttribute="leading" constant="-6" id="pd4-Mp-kxL"/>
71 84 <constraint firstAttribute="width" constant="308" id="rg4-Lw-oTQ"/>
72 85 </constraints>
... ...
BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib
... ... @@ -20,16 +20,6 @@
20 20 <rect key="frame" x="130" y="12" width="308" height="296"/>
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23   - <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SLt-EA-xM9">
24   - <rect key="frame" x="136" y="190" width="37" height="30"/>
25   - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
26   - <state key="normal" title="Done">
27   - <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
28   - </state>
29   - <connections>
30   - <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="Pc7-ef-6b3"/>
31   - </connections>
32   - </button>
33 23 <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="nV6-bl-8Mn">
34 24 <rect key="frame" x="-6" y="20" width="321" height="162"/>
35 25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
... ... @@ -58,17 +48,39 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
58 48 </data>
59 49 </timeZone>
60 50 </datePicker>
  51 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SLt-EA-xM9">
  52 + <rect key="frame" x="108" y="190" width="37" height="30"/>
  53 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  54 + <state key="normal" title="Done">
  55 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  56 + </state>
  57 + <connections>
  58 + <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="Pc7-ef-6b3"/>
  59 + </connections>
  60 + </button>
  61 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ndr-CA-X1v">
  62 + <rect key="frame" x="153" y="190" width="48" height="30"/>
  63 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  64 + <state key="normal" title="Cancel">
  65 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  66 + </state>
  67 + <connections>
  68 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="pes-oV-jXI"/>
  69 + </connections>
  70 + </button>
61 71 </subviews>
62 72 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
63 73 <constraints>
  74 + <constraint firstAttribute="centerX" secondItem="SLt-EA-xM9" secondAttribute="centerX" constant="27.5" id="2Wh-mF-g69"/>
64 75 <constraint firstAttribute="height" constant="296" id="5bu-FK-ohU"/>
65 76 <constraint firstItem="nV6-bl-8Mn" firstAttribute="leading" secondItem="kkY-m0-juR" secondAttribute="leading" constant="-6" id="Ah1-JX-cCs"/>
66 77 <constraint firstAttribute="width" constant="308" id="UWF-fZ-dh2"/>
  78 + <constraint firstItem="ndr-CA-X1v" firstAttribute="top" secondItem="nV6-bl-8Mn" secondAttribute="bottom" constant="8" id="WIO-Wr-G17"/>
67 79 <constraint firstItem="SLt-EA-xM9" firstAttribute="top" secondItem="nV6-bl-8Mn" secondAttribute="bottom" constant="8" id="WR7-EO-uLr"/>
68 80 <constraint firstAttribute="width" constant="308" id="beo-oZ-6zT"/>
69 81 <constraint firstItem="nV6-bl-8Mn" firstAttribute="centerX" secondItem="kkY-m0-juR" secondAttribute="centerX" id="j6k-87-V8H"/>
70 82 <constraint firstItem="nV6-bl-8Mn" firstAttribute="top" secondItem="kkY-m0-juR" secondAttribute="top" constant="20" symbolic="YES" id="jNe-Kd-nS7"/>
71   - <constraint firstItem="nV6-bl-8Mn" firstAttribute="centerX" secondItem="SLt-EA-xM9" secondAttribute="centerX" id="ykH-E1-Szr"/>
  83 + <constraint firstItem="ndr-CA-X1v" firstAttribute="leading" secondItem="SLt-EA-xM9" secondAttribute="trailing" constant="8" id="y5v-Ku-mpk"/>
72 84 </constraints>
73 85 </view>
74 86 </subviews>
... ...
BT Vendor/Base.lproj/DatePickerViewController_iPad.xib
... ... @@ -21,7 +21,7 @@
21 21 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
22 22 <subviews>
23 23 <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="3XX-v6-qTY">
24   - <rect key="frame" x="-192" y="47" width="768" height="216"/>
  24 + <rect key="frame" x="-164" y="47" width="768" height="216"/>
25 25 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
26 26 <constraints>
27 27 <constraint firstAttribute="width" constant="768" id="68V-V1-O6a"/>
... ... @@ -52,7 +52,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
52 52 </timeZone>
53 53 </datePicker>
54 54 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RGE-Ye-qon">
55   - <rect key="frame" x="174" y="271" width="37" height="30"/>
  55 + <rect key="frame" x="146" y="271" width="37" height="30"/>
56 56 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
57 57 <state key="normal" title="Done">
58 58 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -61,13 +61,25 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
61 61 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="dVu-yO-EPV"/>
62 62 </connections>
63 63 </button>
  64 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="es5-oP-hLV">
  65 + <rect key="frame" x="191" y="271" width="48" height="30"/>
  66 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  67 + <state key="normal" title="Cancel">
  68 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  69 + </state>
  70 + <connections>
  71 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="JKi-l9-FP9"/>
  72 + </connections>
  73 + </button>
64 74 </subviews>
65 75 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
66 76 <constraints>
  77 + <constraint firstItem="es5-oP-hLV" firstAttribute="leading" secondItem="RGE-Ye-qon" secondAttribute="trailing" constant="8" id="2LB-HC-wvi"/>
67 78 <constraint firstAttribute="width" constant="384" id="74N-1u-MlE"/>
68   - <constraint firstItem="3XX-v6-qTY" firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="OHn-lR-LZI"/>
  79 + <constraint firstAttribute="centerX" secondItem="3XX-v6-qTY" secondAttribute="centerX" constant="-28" id="E66-Hd-Inq"/>
  80 + <constraint firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" constant="27.5" id="EPA-No-e0b"/>
69 81 <constraint firstItem="RGE-Ye-qon" firstAttribute="top" secondItem="3XX-v6-qTY" secondAttribute="bottom" constant="8" symbolic="YES" id="fLk-TO-w5A"/>
70   - <constraint firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="oSf-yk-jJ4"/>
  82 + <constraint firstItem="es5-oP-hLV" firstAttribute="top" secondItem="3XX-v6-qTY" secondAttribute="bottom" constant="8" id="kO1-x3-1Qr"/>
71 83 <constraint firstItem="3XX-v6-qTY" firstAttribute="top" secondItem="YoS-Cq-kfN" secondAttribute="top" constant="47" id="tja-I4-GeB"/>
72 84 <constraint firstAttribute="height" constant="321" id="uhB-RO-pEr"/>
73 85 </constraints>
... ...
BT Vendor/Base.lproj/DatePickerViewController_iPad_Landscape.xib
... ... @@ -30,7 +30,7 @@
30 30 <!--2014-09-02 17:36:29 +0000-->
31 31 </date>
32 32 <timeZone key="timeZone" name="America/Los_Angeles">
33   - <mutableData key="data">
  33 + <data key="data">
34 34 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
35 35 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
36 36 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
... ... @@ -48,11 +48,21 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
48 48 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
49 49 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
50 50 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
51   -</mutableData>
  51 +</data>
52 52 </timeZone>
53 53 </datePicker>
  54 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7tf-fZ-y4u">
  55 + <rect key="frame" x="191" y="271" width="48" height="30"/>
  56 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  57 + <state key="normal" title="Cancel">
  58 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  59 + </state>
  60 + <connections>
  61 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="nx2-PO-ebC"/>
  62 + </connections>
  63 + </button>
54 64 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JbU-pO-d9E">
55   - <rect key="frame" x="174" y="271" width="37" height="30"/>
  65 + <rect key="frame" x="146" y="271" width="37" height="30"/>
56 66 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
57 67 <state key="normal" title="Done">
58 68 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -64,9 +74,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
64 74 </subviews>
65 75 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
66 76 <constraints>
67   - <constraint firstAttribute="centerX" secondItem="JbU-pO-d9E" secondAttribute="centerX" id="75D-AW-v5X"/>
68   - <constraint firstItem="bzN-RW-o4P" firstAttribute="centerX" secondItem="JbU-pO-d9E" secondAttribute="centerX" id="FsB-ZM-yvA"/>
  77 + <constraint firstAttribute="centerX" secondItem="JbU-pO-d9E" secondAttribute="centerX" constant="28" id="75D-AW-v5X"/>
  78 + <constraint firstItem="7tf-fZ-y4u" firstAttribute="top" secondItem="bzN-RW-o4P" secondAttribute="bottom" constant="8" id="Lfb-Or-9wc"/>
69 79 <constraint firstItem="bzN-RW-o4P" firstAttribute="top" secondItem="xHQ-Ji-H1n" secondAttribute="top" constant="47" id="QFV-PT-Cbq"/>
  80 + <constraint firstItem="7tf-fZ-y4u" firstAttribute="leading" secondItem="JbU-pO-d9E" secondAttribute="trailing" constant="8" id="cyi-nV-kwE"/>
  81 + <constraint firstAttribute="centerX" secondItem="bzN-RW-o4P" secondAttribute="centerX" id="fhN-ht-6yB"/>
70 82 <constraint firstAttribute="width" constant="384" id="gkG-2V-MPG"/>
71 83 <constraint firstItem="JbU-pO-d9E" firstAttribute="top" secondItem="bzN-RW-o4P" secondAttribute="bottom" constant="8" symbolic="YES" id="hSJ-r5-oVZ"/>
72 84 <constraint firstAttribute="height" constant="321" id="vFv-sv-ODr"/>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController.xib
... ... @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
114 114 </timeZone>
115 115 </datePicker>
116 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">
117   - <rect key="frame" x="122" y="105" width="37" height="30"/>
  117 + <rect key="frame" x="94" y="105" width="37" height="30"/>
118 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119 119 <state key="normal" title="Done">
120 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -123,6 +123,16 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
123 123 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="20s-GW-y67"/>
124 124 </connections>
125 125 </button>
  126 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l4A-Bb-3KM">
  127 + <rect key="frame" x="139" y="105" width="48" height="30"/>
  128 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  129 + <state key="normal" title="Cancel">
  130 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  131 + </state>
  132 + <connections>
  133 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="5Cu-Fb-iuB"/>
  134 + </connections>
  135 + </button>
126 136 </subviews>
127 137 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 138 <constraints>
... ... @@ -132,13 +142,15 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
132 142 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/>
133 143 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/>
134 144 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/>
135   - <constraint firstAttribute="centerX" secondItem="aYc-3W-Uqn" secondAttribute="centerX" constant="-0.5" id="Ply-4u-pHb"/>
136 145 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/>
137 146 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/>
138 147 <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" symbolic="YES" id="awF-Ys-Dzh"/>
139 148 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/>
  149 + <constraint firstItem="l4A-Bb-3KM" firstAttribute="leading" secondItem="aYc-3W-Uqn" secondAttribute="trailing" constant="8" id="ej7-PE-3Cj"/>
140 150 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/>
  151 + <constraint firstAttribute="centerX" secondItem="l4A-Bb-3KM" secondAttribute="centerX" constant="-23" id="nl7-SB-st7"/>
141 152 <constraint firstItem="aYc-3W-Uqn" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="15" id="r6B-Uv-9fW"/>
  153 + <constraint firstItem="l4A-Bb-3KM" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="15" id="sEw-Sl-Q2j"/>
142 154 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/>
143 155 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/>
144 156 </constraints>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib
... ... @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
114 114 </timeZone>
115 115 </datePicker>
116 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nfK-Us-pVk">
117   - <rect key="frame" x="246" y="98" width="37" height="30"/>
  117 + <rect key="frame" x="218" y="98" width="37" height="30"/>
118 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119 119 <state key="normal" title="Done">
120 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -123,26 +123,38 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
123 123 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="mab-Ys-jyc"/>
124 124 </connections>
125 125 </button>
  126 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WOi-cd-26B">
  127 + <rect key="frame" x="263" y="98" width="48" height="30"/>
  128 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  129 + <state key="normal" title="Cancel">
  130 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  131 + </state>
  132 + <connections>
  133 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="wFh-WP-VEL"/>
  134 + </connections>
  135 + </button>
126 136 </subviews>
127 137 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 138 <constraints>
129 139 <constraint firstItem="cTb-x4-h2w" firstAttribute="top" secondItem="YyP-Hs-KVd" secondAttribute="top" constant="20" id="71v-O2-Kw2"/>
130 140 <constraint firstItem="WCO-rz-s5y" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="18" id="A53-8Q-SjO"/>
131 141 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" id="BYM-Gd-Zd6"/>
132   - <constraint firstAttribute="centerX" secondItem="nfK-Us-pVk" secondAttribute="centerX" constant="-0.5" id="HZk-hK-PfS"/>
133 142 <constraint firstAttribute="centerX" secondItem="MAy-lw-s1B" secondAttribute="centerX" id="HuX-og-bub"/>
134 143 <constraint firstItem="Ses-ng-Dli" firstAttribute="top" secondItem="YyP-Hs-KVd" secondAttribute="top" constant="25" id="K9p-xC-gmM"/>
  144 + <constraint firstItem="WOi-cd-26B" firstAttribute="leading" secondItem="nfK-Us-pVk" secondAttribute="trailing" constant="8" id="NFF-gQ-ps0"/>
135 145 <constraint firstAttribute="centerX" secondItem="84e-nH-INk" secondAttribute="centerX" id="Rc3-MB-ZzZ"/>
136 146 <constraint firstItem="D6M-uD-fFw" firstAttribute="top" secondItem="cTb-x4-h2w" secondAttribute="bottom" constant="8" id="YR7-LE-DE0"/>
137 147 <constraint firstAttribute="height" constant="602" id="aC4-YZ-T3h"/>
138 148 <constraint firstItem="MAy-lw-s1B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" symbolic="YES" id="caz-mx-Bec"/>
139 149 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="cTb-x4-h2w" secondAttribute="bottom" constant="8" id="lj7-2h-Tuu"/>
  150 + <constraint firstAttribute="centerX" secondItem="nfK-Us-pVk" secondAttribute="centerX" constant="27.5" id="pFM-bZ-sJD"/>
140 151 <constraint firstItem="nfK-Us-pVk" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="pkJ-df-ypc"/>
141 152 <constraint firstItem="WCO-rz-s5y" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="qzS-Hb-i2n"/>
142 153 <constraint firstItem="Ses-ng-Dli" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="sOT-a5-RCf"/>
143 154 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="13" id="uuD-yP-qFl"/>
144 155 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="84e-nH-INk" secondAttribute="leading" id="v55-li-xEh"/>
145 156 <constraint firstItem="cTb-x4-h2w" firstAttribute="leading" secondItem="Ses-ng-Dli" secondAttribute="trailing" constant="8" id="vTL-Oe-xpz"/>
  157 + <constraint firstItem="WOi-cd-26B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="wEi-QA-hu3"/>
146 158 <constraint firstItem="D6M-uD-fFw" firstAttribute="leading" secondItem="WCO-rz-s5y" secondAttribute="trailing" constant="8" id="wcC-ev-DCg"/>
147 159 </constraints>
148 160 </view>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib
... ... @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
114 114 </connections>
115 115 </switch>
116 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JjT-6I-8h2">
117   - <rect key="frame" x="232" y="97" width="37" height="30"/>
  117 + <rect key="frame" x="204" y="97" width="37" height="30"/>
118 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119 119 <state key="normal" title="Done">
120 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -123,6 +123,16 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
123 123 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="CuT-zY-343"/>
124 124 </connections>
125 125 </button>
  126 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wdk-T2-ctc">
  127 + <rect key="frame" x="249" y="97" width="48" height="30"/>
  128 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  129 + <state key="normal" title="Cancel">
  130 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  131 + </state>
  132 + <connections>
  133 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="jjN-gs-xF3"/>
  134 + </connections>
  135 + </button>
126 136 </subviews>
127 137 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 138 <constraints>
... ... @@ -130,17 +140,19 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
130 140 <constraint firstItem="dRe-Qx-Lml" firstAttribute="top" secondItem="WiF-nR-ajG" secondAttribute="bottom" constant="18" id="Deo-Pd-y7q"/>
131 141 <constraint firstItem="yQT-o9-gle" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="2" id="H3F-eL-pvl"/>
132 142 <constraint firstItem="5jh-Em-ORd" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" symbolic="YES" id="HEo-mI-aaq"/>
  143 + <constraint firstItem="wdk-T2-ctc" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="HGl-Df-a9p"/>
133 144 <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/>
134 145 <constraint firstItem="5bA-94-boo" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" id="PPB-jm-7y8"/>
135 146 <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" id="TGZ-nc-u8T"/>
136 147 <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/>
  148 + <constraint firstAttribute="centerX" secondItem="JjT-6I-8h2" secondAttribute="centerX" constant="27.5" id="dUY-mK-ipf"/>
137 149 <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/>
138 150 <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="yQT-o9-gle" secondAttribute="leading" id="oPm-g7-h7W"/>
139 151 <constraint firstAttribute="centerX" secondItem="5jh-Em-ORd" secondAttribute="centerX" id="rxI-eD-QM0"/>
140 152 <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/>
141 153 <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/>
142 154 <constraint firstAttribute="height" constant="626" id="tS1-Rt-VK1"/>
143   - <constraint firstAttribute="centerX" secondItem="JjT-6I-8h2" secondAttribute="centerX" constant="-0.5" id="ubr-xC-I3x"/>
  155 + <constraint firstItem="wdk-T2-ctc" firstAttribute="leading" secondItem="JjT-6I-8h2" secondAttribute="trailing" constant="8" id="vJZ-bx-wtu"/>
144 156 <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/>
145 157 <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/>
146 158 <constraint firstItem="WiF-nR-ajG" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="25" id="zdK-ew-c5q"/>
... ...
BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
... ... @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
114 114 </connections>
115 115 </switch>
116 116 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hDh-hS-ruL">
117   - <rect key="frame" x="232" y="97" width="37" height="30"/>
  117 + <rect key="frame" x="204" y="97" width="37" height="30"/>
118 118 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119 119 <state key="normal" title="Done">
120 120 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -123,22 +123,34 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
123 123 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="YzP-7s-u5P"/>
124 124 </connections>
125 125 </button>
  126 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z81-HA-twu">
  127 + <rect key="frame" x="249" y="97" width="48" height="30"/>
  128 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  129 + <state key="normal" title="Cancel">
  130 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  131 + </state>
  132 + <connections>
  133 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="yAN-6o-F9T"/>
  134 + </connections>
  135 + </button>
126 136 </subviews>
127 137 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
128 138 <constraints>
129 139 <constraint firstAttribute="centerX" secondItem="Ke5-90-B8V" secondAttribute="centerX" id="28y-vd-Y2h"/>
  140 + <constraint firstItem="Z81-HA-twu" firstAttribute="leading" secondItem="hDh-hS-ruL" secondAttribute="trailing" constant="8" id="58o-Bc-61P"/>
130 141 <constraint firstItem="hDh-hS-ruL" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="GS8-uL-yin"/>
131 142 <constraint firstItem="z8k-7k-O2i" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="Gq5-cV-ofW"/>
132 143 <constraint firstItem="95w-9e-lc5" firstAttribute="leading" secondItem="z8k-7k-O2i" secondAttribute="trailing" constant="8" id="Lpl-at-M2a"/>
  144 + <constraint firstAttribute="centerX" secondItem="hDh-hS-ruL" secondAttribute="centerX" constant="27.5" id="Pqy-XN-tzb"/>
133 145 <constraint firstItem="z8k-7k-O2i" firstAttribute="top" secondItem="7sY-pS-rR6" secondAttribute="bottom" constant="18" id="R8m-a5-DiJ"/>
134 146 <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="Ke5-90-B8V" secondAttribute="leading" id="TVv-e0-1lR"/>
  147 + <constraint firstItem="Z81-HA-twu" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="ek2-Aq-WN9"/>
135 148 <constraint firstItem="7sY-pS-rR6" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="fAI-Eh-vtX"/>
136 149 <constraint firstAttribute="height" constant="626" id="gDv-dO-15e"/>
137 150 <constraint firstItem="95w-9e-lc5" firstAttribute="top" secondItem="ycu-em-WhN" secondAttribute="bottom" constant="8" id="hfw-25-EN7"/>
138 151 <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" id="k7J-l3-qIy"/>
139 152 <constraint firstItem="7sY-pS-rR6" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="25" id="oqv-Fr-c2u"/>
140 153 <constraint firstItem="Jbw-43-Qar" firstAttribute="top" secondItem="ycu-em-WhN" secondAttribute="bottom" constant="8" symbolic="YES" id="owB-Oe-jji"/>
141   - <constraint firstAttribute="centerX" secondItem="hDh-hS-ruL" secondAttribute="centerX" constant="-0.5" id="p2z-oA-1jg"/>
142 154 <constraint firstItem="ycu-em-WhN" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="20" id="tS4-38-qyM"/>
143 155 <constraint firstItem="Ke5-90-B8V" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="2" id="uZx-7C-faF"/>
144 156 <constraint firstAttribute="width" constant="500" id="vFe-sZ-zeI"/>
... ...
BT Vendor/Base.lproj/NameChangerViewController.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-BL-5ZB">
72   - <rect key="frame" x="135" y="131" width="37" height="30"/>
  72 + <rect key="frame" x="107" y="131" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,13 +78,26 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="fKa-uD-oOi"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dUe-ps-tHo">
  82 + <rect key="frame" x="152" y="131" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="3OL-J1-xRQ"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
83 93 <constraints>
84 94 <constraint firstItem="Zfh-RB-roO" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="4Xl-Uy-ots"/>
  95 + <constraint firstAttribute="centerX" secondItem="dUe-ps-tHo" secondAttribute="centerX" constant="-22.5" id="6me-Oq-crd"/>
85 96 <constraint firstItem="u0t-Gj-gKZ" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="24" id="Bck-MA-vkx"/>
86 97 <constraint firstItem="Zfh-RB-roO" firstAttribute="top" secondItem="zk3-Qc-MYf" secondAttribute="bottom" constant="17" id="DJs-b3-pqQ"/>
  98 + <constraint firstItem="dUe-ps-tHo" firstAttribute="leading" secondItem="Y9f-BL-5ZB" secondAttribute="trailing" constant="8" id="Dwq-Z6-LMb"/>
87 99 <constraint firstItem="u0t-Gj-gKZ" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="FDy-MQ-JZ8"/>
  100 + <constraint firstItem="dUe-ps-tHo" firstAttribute="top" secondItem="jP9-NI-B16" secondAttribute="bottom" constant="4" id="FeT-M4-cZq"/>
88 101 <constraint firstAttribute="width" constant="307" id="GQX-7o-a86"/>
89 102 <constraint firstItem="vbt-3v-Jzm" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="20" id="HP9-VA-6kz"/>
90 103 <constraint firstItem="UP5-iH-LdU" firstAttribute="top" secondItem="vbt-3v-Jzm" secondAttribute="bottom" constant="9" id="KeN-pj-WkA"/>
... ... @@ -94,7 +107,6 @@
94 107 <constraint firstAttribute="trailing" secondItem="vbt-3v-Jzm" secondAttribute="trailing" constant="20" id="Xe6-t2-6JD"/>
95 108 <constraint firstItem="zk3-Qc-MYf" firstAttribute="top" secondItem="u0t-Gj-gKZ" secondAttribute="bottom" constant="18" id="c79-yI-89e"/>
96 109 <constraint firstAttribute="height" constant="181" id="fv5-UY-KsO"/>
97   - <constraint firstAttribute="centerX" secondItem="Y9f-BL-5ZB" secondAttribute="centerX" constant="0.5" id="h5O-ib-n1S"/>
98 110 <constraint firstItem="zk3-Qc-MYf" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="hfD-fm-kDf"/>
99 111 <constraint firstAttribute="trailing" secondItem="UP5-iH-LdU" secondAttribute="trailing" constant="20" id="i9s-wf-CCF"/>
100 112 </constraints>
... ...
BT Vendor/Base.lproj/NameChangerViewController_Landscape.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZH7-mZ-Jfc">
72   - <rect key="frame" x="135" y="131" width="37" height="30"/>
  72 + <rect key="frame" x="107" y="131" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,9 +78,20 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="N1F-5e-UbJ"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n4D-b7-1V7">
  82 + <rect key="frame" x="152" y="131" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="18Q-RT-nvW"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
83 93 <constraints>
  94 + <constraint firstItem="n4D-b7-1V7" firstAttribute="top" secondItem="vek-8b-7NB" secondAttribute="bottom" constant="4" id="0Jd-ZM-Dcv"/>
84 95 <constraint firstItem="vek-8b-7NB" firstAttribute="top" secondItem="6k5-gE-2ZA" secondAttribute="bottom" constant="8" id="BaN-DG-Azp"/>
85 96 <constraint firstItem="ZzG-qH-dln" firstAttribute="leading" secondItem="ZqU-ad-232" secondAttribute="leading" constant="20" id="Bl4-Hv-tYW"/>
86 97 <constraint firstAttribute="height" constant="181" id="C3o-MA-P2E"/>
... ... @@ -88,13 +99,14 @@
88 99 <constraint firstItem="ZzG-qH-dln" firstAttribute="top" secondItem="ZqU-ad-232" secondAttribute="top" constant="24" id="JeJ-aL-Tlx"/>
89 100 <constraint firstItem="IhB-Y7-spo" firstAttribute="top" secondItem="ZqU-ad-232" secondAttribute="top" constant="20" id="P96-XN-Vy2"/>
90 101 <constraint firstItem="gIa-c0-uyh" firstAttribute="top" secondItem="z9N-z7-JyV" secondAttribute="bottom" constant="17" id="RoQ-mI-AWx"/>
  102 + <constraint firstItem="n4D-b7-1V7" firstAttribute="leading" secondItem="ZH7-mZ-Jfc" secondAttribute="trailing" constant="8" id="Rt6-Bc-jjI"/>
91 103 <constraint firstItem="z9N-z7-JyV" firstAttribute="leading" secondItem="ZqU-ad-232" secondAttribute="leading" constant="20" id="SSV-UB-pxS"/>
92 104 <constraint firstAttribute="trailing" secondItem="IhB-Y7-spo" secondAttribute="trailing" constant="20" id="Zoi-Ld-cOC"/>
93 105 <constraint firstItem="6k5-gE-2ZA" firstAttribute="top" secondItem="IhB-Y7-spo" secondAttribute="bottom" constant="9" id="aXD-qG-Yhd"/>
94 106 <constraint firstItem="gIa-c0-uyh" firstAttribute="leading" secondItem="ZqU-ad-232" secondAttribute="leading" constant="20" id="bpu-OQ-dSQ"/>
95 107 <constraint firstItem="z9N-z7-JyV" firstAttribute="top" secondItem="ZzG-qH-dln" secondAttribute="bottom" constant="18" id="eCg-UB-hth"/>
96   - <constraint firstAttribute="centerX" secondItem="ZH7-mZ-Jfc" secondAttribute="centerX" constant="0.5" id="kbs-9d-UUm"/>
97 108 <constraint firstAttribute="width" constant="307" id="m2m-ZR-AyA"/>
  109 + <constraint firstAttribute="centerX" secondItem="ZH7-mZ-Jfc" secondAttribute="centerX" constant="28" id="ttW-oS-ISq"/>
98 110 <constraint firstAttribute="trailing" secondItem="6k5-gE-2ZA" secondAttribute="trailing" constant="20" id="yNx-2B-Sll"/>
99 111 <constraint firstAttribute="bottom" secondItem="ZH7-mZ-Jfc" secondAttribute="bottom" constant="20" id="yVT-ae-Lnq"/>
100 112 </constraints>
... ...
BT Vendor/Base.lproj/NameChangerViewController_iPad.xib
... ... @@ -59,8 +59,17 @@
59 59 <fontDescription key="fontDescription" type="system" pointSize="17"/>
60 60 <nil key="highlightedColor"/>
61 61 </label>
  62 + <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
  63 + <rect key="frame" x="226" y="56" width="97" height="30"/>
  64 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  65 + <constraints>
  66 + <constraint firstAttribute="width" constant="97" id="mcc-YJ-98f"/>
  67 + </constraints>
  68 + <fontDescription key="fontDescription" type="system" pointSize="14"/>
  69 + <textInputTraits key="textInputTraits"/>
  70 + </textField>
62 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Md5-1l-LqY">
63   - <rect key="frame" x="153" y="127" width="37" height="30"/>
  72 + <rect key="frame" x="125" y="127" width="37" height="30"/>
64 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 74 <state key="normal" title="Done">
66 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -69,15 +78,16 @@
69 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="eeR-C7-bL8"/>
70 79 </connections>
71 80 </button>
72   - <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
73   - <rect key="frame" x="226" y="56" width="97" height="30"/>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MRA-TQ-VxA">
  82 + <rect key="frame" x="170" y="127" width="48" height="30"/>
74 83 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
75   - <constraints>
76   - <constraint firstAttribute="width" constant="97" id="mcc-YJ-98f"/>
77   - </constraints>
78   - <fontDescription key="fontDescription" type="system" pointSize="14"/>
79   - <textInputTraits key="textInputTraits"/>
80   - </textField>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="IuK-DI-RvB"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
83 93 <constraints>
... ... @@ -88,12 +98,14 @@
88 98 <constraint firstAttribute="trailing" secondItem="Emm-7B-NhE" secondAttribute="trailing" constant="20" id="Djn-mi-3Ed"/>
89 99 <constraint firstItem="0sU-V8-QVn" firstAttribute="top" secondItem="Emm-7B-NhE" secondAttribute="bottom" constant="9" id="ISV-fp-0tI"/>
90 100 <constraint firstItem="9PW-xp-3t9" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="21" id="Jur-BX-YJV"/>
  101 + <constraint firstItem="MRA-TQ-VxA" firstAttribute="leading" secondItem="Md5-1l-LqY" secondAttribute="trailing" constant="8" id="S2y-QM-Ukh"/>
91 102 <constraint firstItem="Mqg-fy-qfX" firstAttribute="top" secondItem="0sU-V8-QVn" secondAttribute="bottom" constant="8" id="Y4S-7h-1r0"/>
92   - <constraint firstAttribute="centerX" secondItem="Md5-1l-LqY" secondAttribute="centerX" constant="0.5" id="Z6u-Gn-LXz"/>
  103 + <constraint firstItem="MRA-TQ-VxA" firstAttribute="top" secondItem="Mqg-fy-qfX" secondAttribute="bottom" constant="3" id="ZqQ-hp-jFA"/>
93 104 <constraint firstItem="RCD-6Z-45A" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="eZd-4s-kd1"/>
94 105 <constraint firstAttribute="height" constant="177" id="fXH-ZY-iCb"/>
95 106 <constraint firstAttribute="bottom" secondItem="Md5-1l-LqY" secondAttribute="bottom" constant="20" id="hb1-WU-uJX"/>
96 107 <constraint firstItem="RCD-6Z-45A" firstAttribute="top" secondItem="9PW-xp-3t9" secondAttribute="bottom" constant="18" id="oCQ-J2-GWR"/>
  108 + <constraint firstAttribute="centerX" secondItem="Md5-1l-LqY" secondAttribute="centerX" constant="28" id="vS1-5z-ieg"/>
97 109 <constraint firstItem="pLv-EG-y2m" firstAttribute="top" secondItem="RCD-6Z-45A" secondAttribute="bottom" constant="17" id="vnW-bp-wrA"/>
98 110 <constraint firstAttribute="trailing" secondItem="0sU-V8-QVn" secondAttribute="trailing" constant="20" id="xxe-g4-xO5"/>
99 111 <constraint firstItem="Emm-7B-NhE" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="17" id="zpe-cG-PUv"/>
... ...
BT Vendor/Base.lproj/NameChangerViewController_iPad_Landscape.xib
... ... @@ -60,7 +60,7 @@
60 60 <nil key="highlightedColor"/>
61 61 </label>
62 62 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3O-jD-tjP">
63   - <rect key="frame" x="153" y="127" width="37" height="30"/>
  63 + <rect key="frame" x="125" y="127" width="37" height="30"/>
64 64 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
65 65 <state key="normal" title="Done">
66 66 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,10 +78,19 @@
78 78 <fontDescription key="fontDescription" type="system" pointSize="14"/>
79 79 <textInputTraits key="textInputTraits"/>
80 80 </textField>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xW2-wT-np7">
  82 + <rect key="frame" x="170" y="127" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="HC9-Rh-I4D"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
83 93 <constraints>
84   - <constraint firstAttribute="centerX" secondItem="q3O-jD-tjP" secondAttribute="centerX" constant="0.5" id="5dJ-9X-CMr"/>
85 94 <constraint firstAttribute="trailing" secondItem="PWp-Bq-eF0" secondAttribute="trailing" constant="20" id="CqG-Mx-ZYf"/>
86 95 <constraint firstAttribute="bottom" secondItem="q3O-jD-tjP" secondAttribute="bottom" constant="20" id="HcQ-cf-gjs"/>
87 96 <constraint firstItem="zj0-M4-cAO" firstAttribute="leading" secondItem="TMs-mi-Jej" secondAttribute="leading" constant="20" id="I8x-fp-BvR"/>
... ... @@ -94,8 +103,11 @@
94 103 <constraint firstItem="MUO-8b-DhH" firstAttribute="leading" secondItem="TMs-mi-Jej" secondAttribute="leading" constant="20" id="gm1-SZ-Xzb"/>
95 104 <constraint firstItem="MUO-8b-DhH" firstAttribute="top" secondItem="TMs-mi-Jej" secondAttribute="top" constant="21" id="izr-xy-mKM"/>
96 105 <constraint firstItem="I8b-hG-JLX" firstAttribute="top" secondItem="TMs-mi-Jej" secondAttribute="top" constant="17" id="lqv-O6-rIa"/>
  106 + <constraint firstItem="xW2-wT-np7" firstAttribute="leading" secondItem="q3O-jD-tjP" secondAttribute="trailing" constant="8" id="mke-6B-YaQ"/>
97 107 <constraint firstAttribute="trailing" secondItem="0dM-lG-W6M" secondAttribute="trailing" constant="20" id="njp-Er-OYt"/>
  108 + <constraint firstAttribute="centerX" secondItem="xW2-wT-np7" secondAttribute="centerX" constant="-22.5" id="q6U-RN-Jle"/>
98 109 <constraint firstItem="PWp-Bq-eF0" firstAttribute="top" secondItem="0dM-lG-W6M" secondAttribute="bottom" constant="8" id="qgR-qe-JDu"/>
  110 + <constraint firstItem="xW2-wT-np7" firstAttribute="top" secondItem="PWp-Bq-eF0" secondAttribute="bottom" constant="3" id="vKp-SO-UsQ"/>
99 111 <constraint firstItem="0dM-lG-W6M" firstAttribute="top" secondItem="I8b-hG-JLX" secondAttribute="bottom" constant="9" id="vz5-mB-l2D"/>
100 112 </constraints>
101 113 </view>
... ...
BT Vendor/Base.lproj/PriceChangerViewController.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="slH-Zj-pps">
72   - <rect key="frame" x="135" y="131" width="37" height="30"/>
  72 + <rect key="frame" x="107" y="131" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,12 +78,22 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="16B-95-peJ"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KF4-zt-DGp">
  82 + <rect key="frame" x="152" y="131" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="jpg-W2-VQY"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
83 93 <constraints>
84 94 <constraint firstItem="VCq-As-NrV" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="24" id="7Ei-6v-DJy"/>
85 95 <constraint firstAttribute="trailing" secondItem="0ap-q1-lJS" secondAttribute="trailing" constant="20" id="7GE-ll-lvy"/>
86   - <constraint firstAttribute="centerX" secondItem="slH-Zj-pps" secondAttribute="centerX" constant="0.5" id="8wy-KG-YiS"/>
  96 + <constraint firstItem="KF4-zt-DGp" firstAttribute="leading" secondItem="slH-Zj-pps" secondAttribute="trailing" constant="8" id="8Lu-4l-328"/>
87 97 <constraint firstItem="0ap-q1-lJS" firstAttribute="top" secondItem="0IF-Ml-nmK" secondAttribute="bottom" constant="8" id="GEg-PI-O0h"/>
88 98 <constraint firstItem="Cbx-ha-NZx" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="KKA-RW-IHT"/>
89 99 <constraint firstItem="0IF-Ml-nmK" firstAttribute="top" secondItem="Yrc-dD-lC1" secondAttribute="bottom" constant="9" id="NSa-6w-ZoW"/>
... ... @@ -91,6 +101,8 @@
91 101 <constraint firstAttribute="trailing" secondItem="Yrc-dD-lC1" secondAttribute="trailing" constant="20" id="QHF-7B-Ic6"/>
92 102 <constraint firstItem="Yrc-dD-lC1" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="20" id="Um6-gq-dBm"/>
93 103 <constraint firstAttribute="trailing" secondItem="0IF-Ml-nmK" secondAttribute="trailing" constant="20" id="XV4-Tn-CS3"/>
  104 + <constraint firstItem="KF4-zt-DGp" firstAttribute="top" secondItem="0ap-q1-lJS" secondAttribute="bottom" constant="4" id="YOq-sB-SE6"/>
  105 + <constraint firstAttribute="centerX" secondItem="KF4-zt-DGp" secondAttribute="centerX" constant="-22.5" id="YaE-dX-Aig"/>
94 106 <constraint firstItem="2cF-of-r57" firstAttribute="top" secondItem="VCq-As-NrV" secondAttribute="bottom" constant="18" id="Zyz-on-i4t"/>
95 107 <constraint firstItem="2cF-of-r57" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="bxk-cG-hJO"/>
96 108 <constraint firstAttribute="bottom" secondItem="slH-Zj-pps" secondAttribute="bottom" constant="20" id="fiT-k5-kVx"/>
... ...
BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ubO-fy-Tcd">
72   - <rect key="frame" x="135" y="131" width="37" height="30"/>
  72 + <rect key="frame" x="107" y="131" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,6 +78,16 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="PfK-B8-MVQ"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xdp-5C-5aA">
  82 + <rect key="frame" x="152" y="131" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="XdX-Jp-CFP"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
83 93 <constraints>
... ... @@ -85,12 +95,14 @@
85 95 <constraint firstAttribute="trailing" secondItem="LUN-kl-1qk" secondAttribute="trailing" constant="20" id="4aD-TI-EQu"/>
86 96 <constraint firstAttribute="bottom" secondItem="ubO-fy-Tcd" secondAttribute="bottom" constant="20" id="6LV-E4-gEI"/>
87 97 <constraint firstItem="LUN-kl-1qk" firstAttribute="top" secondItem="DEB-yT-L0p" secondAttribute="bottom" constant="9" id="7RJ-sF-FtM"/>
88   - <constraint firstAttribute="centerX" secondItem="ubO-fy-Tcd" secondAttribute="centerX" constant="0.5" id="F9W-kf-J1g"/>
89 98 <constraint firstAttribute="height" constant="181" id="JTM-fM-PqR"/>
  99 + <constraint firstAttribute="centerX" secondItem="Xdp-5C-5aA" secondAttribute="centerX" constant="-22.5" id="Jc6-aE-DFC"/>
90 100 <constraint firstItem="DEB-yT-L0p" firstAttribute="top" secondItem="KpQ-d0-bwT" secondAttribute="top" constant="20" id="Jfn-Id-56L"/>
91 101 <constraint firstItem="UrS-qz-jRa" firstAttribute="top" secondItem="neg-KG-oQC" secondAttribute="bottom" constant="17" id="L11-sA-dkk"/>
92 102 <constraint firstAttribute="trailing" secondItem="4EB-J5-I3v" secondAttribute="trailing" constant="20" id="O1t-SE-YQq"/>
  103 + <constraint firstItem="Xdp-5C-5aA" firstAttribute="leading" secondItem="ubO-fy-Tcd" secondAttribute="trailing" constant="8" id="QPZ-mQ-FRW"/>
93 104 <constraint firstAttribute="trailing" secondItem="DEB-yT-L0p" secondAttribute="trailing" constant="20" id="X8E-R5-CH2"/>
  105 + <constraint firstItem="Xdp-5C-5aA" firstAttribute="top" secondItem="4EB-J5-I3v" secondAttribute="bottom" constant="4" id="doF-Fv-Hrm"/>
94 106 <constraint firstItem="neg-KG-oQC" firstAttribute="top" secondItem="0G8-sN-Hfg" secondAttribute="bottom" constant="18" id="hpd-js-5eJ"/>
95 107 <constraint firstAttribute="width" constant="307" id="lYh-V2-2xP"/>
96 108 <constraint firstItem="0G8-sN-Hfg" firstAttribute="leading" secondItem="KpQ-d0-bwT" secondAttribute="leading" constant="20" id="o5N-85-gis"/>
... ...
BT Vendor/Base.lproj/PriceChangerViewController_iPad.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BsH-aP-YXx">
72   - <rect key="frame" x="153" y="127" width="37" height="30"/>
  72 + <rect key="frame" x="125" y="127" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,22 +78,34 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="t74-LH-dPA"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="84E-sg-9fV">
  82 + <rect key="frame" x="170" y="127" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="htP-9s-4eM"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
83 93 <constraints>
84 94 <constraint firstItem="ERH-UB-KNz" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="17" id="1AX-c3-CDm"/>
85 95 <constraint firstItem="suL-QX-iE6" firstAttribute="top" secondItem="hmJ-zn-ogZ" secondAttribute="bottom" constant="8" id="JgS-D8-cIr"/>
86 96 <constraint firstItem="6M6-Rz-v0B" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="21" id="Jq8-3l-kYc"/>
  97 + <constraint firstItem="84E-sg-9fV" firstAttribute="leading" secondItem="BsH-aP-YXx" secondAttribute="trailing" constant="8" id="KsM-ot-RBK"/>
87 98 <constraint firstItem="y0J-fk-3XQ" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="LSk-KG-aOB"/>
88 99 <constraint firstItem="y0J-fk-3XQ" firstAttribute="top" secondItem="6M6-Rz-v0B" secondAttribute="bottom" constant="18" id="M4d-Ez-pHf"/>
89 100 <constraint firstItem="CRj-D6-8bV" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Oza-iy-MaH"/>
90 101 <constraint firstItem="6M6-Rz-v0B" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Sma-ZL-ALv"/>
91 102 <constraint firstAttribute="height" constant="177" id="bNq-pw-RTB"/>
92 103 <constraint firstItem="CRj-D6-8bV" firstAttribute="top" secondItem="y0J-fk-3XQ" secondAttribute="bottom" constant="17" id="duF-LR-Sda"/>
  104 + <constraint firstItem="84E-sg-9fV" firstAttribute="top" secondItem="suL-QX-iE6" secondAttribute="bottom" constant="3" id="hF5-9o-BBB"/>
  105 + <constraint firstAttribute="centerX" secondItem="BsH-aP-YXx" secondAttribute="centerX" constant="28" id="iJg-Pj-xMk"/>
93 106 <constraint firstAttribute="trailing" secondItem="suL-QX-iE6" secondAttribute="trailing" constant="20" id="jtP-QM-5L3"/>
94 107 <constraint firstItem="hmJ-zn-ogZ" firstAttribute="top" secondItem="ERH-UB-KNz" secondAttribute="bottom" constant="9" id="mYf-Tf-3yJ"/>
95 108 <constraint firstAttribute="width" constant="343" id="mon-Sh-DKk"/>
96   - <constraint firstAttribute="centerX" secondItem="BsH-aP-YXx" secondAttribute="centerX" constant="0.5" id="sN6-ce-scm"/>
97 109 <constraint firstAttribute="bottom" secondItem="BsH-aP-YXx" secondAttribute="bottom" constant="20" id="tse-ri-BEr"/>
98 110 <constraint firstAttribute="trailing" secondItem="ERH-UB-KNz" secondAttribute="trailing" constant="20" id="uN1-od-vVE"/>
99 111 <constraint firstAttribute="trailing" secondItem="hmJ-zn-ogZ" secondAttribute="trailing" constant="20" id="usS-ZK-EDY"/>
... ...
BT Vendor/Base.lproj/PriceChangerViewController_iPad_Landscape.xib
... ... @@ -69,7 +69,7 @@
69 69 <nil key="highlightedColor"/>
70 70 </label>
71 71 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hdn-qQ-8np">
72   - <rect key="frame" x="153" y="127" width="37" height="30"/>
  72 + <rect key="frame" x="125" y="127" width="37" height="30"/>
73 73 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74 74 <state key="normal" title="Done">
75 75 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
... ... @@ -78,6 +78,16 @@
78 78 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="6gC-ah-XK9"/>
79 79 </connections>
80 80 </button>
  81 + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8TX-z3-YGe">
  82 + <rect key="frame" x="170" y="127" width="48" height="30"/>
  83 + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
  84 + <state key="normal" title="Cancel">
  85 + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
  86 + </state>
  87 + <connections>
  88 + <action selector="cancel:" destination="-1" eventType="touchUpInside" id="kFB-bP-eYA"/>
  89 + </connections>
  90 + </button>
81 91 </subviews>
82 92 <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
83 93 <constraints>
... ... @@ -85,6 +95,7 @@
85 95 <constraint firstItem="eXX-xf-h6G" firstAttribute="top" secondItem="GCF-GY-CN1" secondAttribute="bottom" constant="17" id="3Ra-hn-ZlK"/>
86 96 <constraint firstItem="jj4-G4-f7r" firstAttribute="top" secondItem="JMZ-j1-djR" secondAttribute="bottom" constant="8" id="6c9-vC-hM2"/>
87 97 <constraint firstAttribute="bottom" secondItem="hdn-qQ-8np" secondAttribute="bottom" constant="20" id="AdU-40-Kll"/>
  98 + <constraint firstItem="8TX-z3-YGe" firstAttribute="leading" secondItem="hdn-qQ-8np" secondAttribute="trailing" constant="8" id="C0L-eO-LhI"/>
88 99 <constraint firstAttribute="height" constant="177" id="EBh-7t-XnZ"/>
89 100 <constraint firstItem="9Fx-tR-5f5" firstAttribute="top" secondItem="vRc-3Y-oz8" secondAttribute="top" constant="17" id="Hz7-b9-QPv"/>
90 101 <constraint firstItem="JMZ-j1-djR" firstAttribute="top" secondItem="9Fx-tR-5f5" secondAttribute="bottom" constant="9" id="I1n-fp-V5M"/>
... ... @@ -93,9 +104,10 @@
93 104 <constraint firstItem="eXX-xf-h6G" firstAttribute="leading" secondItem="vRc-3Y-oz8" secondAttribute="leading" constant="20" id="Ku7-lj-sbp"/>
94 105 <constraint firstAttribute="trailing" secondItem="JMZ-j1-djR" secondAttribute="trailing" constant="20" id="Ok7-Yp-wao"/>
95 106 <constraint firstItem="z9V-5B-LtD" firstAttribute="leading" secondItem="vRc-3Y-oz8" secondAttribute="leading" constant="20" id="Qph-St-ZhM"/>
96   - <constraint firstAttribute="centerX" secondItem="hdn-qQ-8np" secondAttribute="centerX" constant="0.5" id="cnc-0a-Hud"/>
97 107 <constraint firstAttribute="width" constant="343" id="mTQ-bv-jex"/>
  108 + <constraint firstAttribute="centerX" secondItem="8TX-z3-YGe" secondAttribute="centerX" constant="-22.5" id="qIc-iJ-jol"/>
98 109 <constraint firstItem="GCF-GY-CN1" firstAttribute="leading" secondItem="vRc-3Y-oz8" secondAttribute="leading" constant="20" id="sum-Uh-lk2"/>
  110 + <constraint firstItem="8TX-z3-YGe" firstAttribute="top" secondItem="jj4-G4-f7r" secondAttribute="bottom" constant="3" id="yij-Rt-Bi1"/>
99 111 <constraint firstItem="z9V-5B-LtD" firstAttribute="top" secondItem="vRc-3Y-oz8" secondAttribute="top" constant="21" id="zLp-RD-9d6"/>
100 112 </constraints>
101 113 </view>
... ...
BT Vendor/CommunicationProtocol.m
... ... @@ -49,6 +49,12 @@
49 49 NSLog(@"[CommunicationProtocol.m]: numBytes read: %d",numBytes);
50 50 [[EMConnectionManager sharedManager] readResource:@"data" onSuccess:^(id readValue)
51 51 {
  52 + /*
  53 + * BUG: If previously sent message is longer than the response, the excess bytes are appended to the response
  54 + * coming from the device. Trimming is applied to correct that. A possible cause may be a bug in the device's
  55 + * code, not the app
  56 + */
  57 + //NSString *readData = readValue;
52 58 NSString *readData = [readValue substringToIndex:numBytes];
53 59 if([readValue length] < numBytes)
54 60 {
... ...
BT Vendor/DatePickerViewController.h
... ... @@ -26,5 +26,6 @@
26 26  
27 27 - (void) showInView:(UIView *)aView animated:(BOOL)animated;
28 28 - (IBAction) closePopup:(id)sender;
  29 +- (IBAction) cancel:(id)sender;
29 30  
30 31 @end
... ...
BT Vendor/DatePickerViewController.m
... ... @@ -85,6 +85,12 @@
85 85 [self removeAnimate];
86 86 }
87 87  
  88 +- (IBAction)cancel:(id)sender
  89 +{
  90 + [self.childDelegate removeChildFromParentController:self];
  91 + [self removeAnimate];
  92 +}
  93 +
88 94 - (void)showInView:(UIView *)aView animated:(BOOL)animated
89 95 {
90 96 [aView addSubview:self.view];
... ...
BT Vendor/DateRangePickerViewController.h
... ... @@ -43,5 +43,6 @@
43 43 - (IBAction) toggleFromDate:(id)sender;
44 44 - (IBAction) toggleToDate:(id)sender;
45 45 - (IBAction) closePopup:(id)sender;
  46 +- (IBAction) cancel:(id)sender;
46 47  
47 48 @end
... ...
BT Vendor/DateRangePickerViewController.m
... ... @@ -231,6 +231,12 @@
231 231 [self removeAnimate];
232 232 }
233 233  
  234 +- (IBAction)cancel:(id)sender
  235 +{
  236 + [self.childDelegate removeChildFromParentController:self];
  237 + [self removeAnimate];
  238 +}
  239 +
234 240 - (void)showInView:(UIView *)aView animated:(BOOL)animated
235 241 {
236 242 [aView addSubview:self.view];
... ...
BT Vendor/FirstAppExample/Base.lproj/EMConnectingView.xib
... ... @@ -13,11 +13,11 @@
13 13 </placeholder>
14 14 <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
15 15 <view contentMode="scaleToFill" id="1">
16   - <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
  16 + <rect key="frame" x="0.0" y="64" width="320" height="504"/>
17 17 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 18 <subviews>
19 19 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6C5-kv-hwn">
20   - <rect key="frame" x="10" y="222" width="300" height="123"/>
  20 + <rect key="frame" x="10" y="190" width="300" height="123"/>
21 21 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
22 22 <subviews>
23 23 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Connecting to device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vOa-V6-aku">
... ... @@ -41,9 +41,11 @@
41 41 </subviews>
42 42 <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
43 43 <constraints>
  44 + <constraint firstAttribute="centerY" secondItem="6C5-kv-hwn" secondAttribute="centerY" constant="0.5" id="8hl-Bc-VyC"/>
44 45 <constraint firstAttribute="centerX" secondItem="6C5-kv-hwn" secondAttribute="centerX" id="PTE-Ex-mg4"/>
45   - <constraint firstAttribute="centerY" secondItem="6C5-kv-hwn" secondAttribute="centerY" constant="0.5" id="Qs9-io-s7S"/>
46 46 </constraints>
  47 + <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
  48 + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/>
47 49 <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
48 50 </view>
49 51 </objects>
... ...
BT Vendor/FirstAppExample/EMDevicePickerViewController.m
... ... @@ -63,8 +63,8 @@
63 63 }
64 64 }
65 65 [[[self popoverView] layer] setCornerRadius:10.0f];
66   - [[self view] addSubview:[self connectingView]];
67 66 [[self activityIndicator] startAnimating];
  67 + [self.navigationController.view addSubview:self.connectingView];
68 68 }
69 69  
70 70 -(void)_hideConnectingView
... ...
BT Vendor/IncidentLog.m
... ... @@ -40,15 +40,11 @@
40 40 [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]];
41 41 [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(12 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]];
42 42 [incident setIncidentTime:[calendar dateFromComponents:incidentDate]];
43   - NSLog(@"date: %@",[calendar dateFromComponents:incidentDate]);
44 43 [incident setErrorCode:[[self response] substringWithRange:NSMakeRange(14 + currentIncident*INCIDENT_STRING_LENGTH, 2)]];
45   - NSLog(@"errorCode: %@",[incident errorCode]);
46 44 [incident setErrorValue:[[self response] substringWithRange:NSMakeRange(16 + currentIncident*INCIDENT_STRING_LENGTH, 4)]];
47   - NSLog(@"errorValue: %@",[incident errorValue]);
48 45 [[self incidents] insertObject:incident atIndex:currentIncident];
49 46 currentIncident++;
50 47 }
51   - NSLog(@"%@",[self incidents]);
52 48 }
53 49  
54 50 @end
... ...
BT Vendor/MenuTableViewController.m
... ... @@ -68,6 +68,7 @@
68 68 @property (strong,nonatomic) Incident *currentIncident;
69 69 @property uint8_t requestedLog;
70 70 @property uint8_t sentCommand;
  71 +@property Boolean controlsDisabled;
71 72  
72 73 //CHILD VIEW CONTOLLERS
73 74 @property (strong,nonatomic) DatePickerViewController *datePickerViewController;
... ... @@ -254,6 +255,7 @@
254 255 if([self currentNavLevel] == MENU)
255 256 {
256 257 [self setMachineMACAddr:[[[EMConnectionManager sharedManager] connectedDevice] name]];
  258 + NSLog(@"[MenuTableViewController.m]: Device MAC address is %@", self.machineMACAddr);
257 259 [[self navigationItem] setTitle:[self machineMACAddr]];
258 260 [self setCurrentElements:[self menuElements]];
259 261 [self setCurrentStructure:[self menuStructure]];
... ... @@ -330,6 +332,10 @@
330 332  
331 333 - (void) backButtonPressed: (id) sender
332 334 {
  335 + if(self.controlsDisabled)
  336 + {
  337 + return;
  338 + }
333 339 NSLog(@"[MenuTableViewController.m]: Navigation Stack has %ld remaining levels",(long)[[self parentLayout] count]);
334 340 if([[self parentLayout] count] > 0)
335 341 {
... ... @@ -384,6 +390,7 @@
384 390 {
385 391 NSLog(@"[MenuTableViewController.m]: Answer received: %@",response);
386 392 [self.timeoutTimer invalidate];
  393 + self.controlsDisabled = FALSE;
387 394 if(self.sentCommand == HELLO)
388 395 {
389 396 if([response isEqualToString:@"Hello"])
... ... @@ -483,6 +490,7 @@
483 490 selector:@selector(commandDidTimeout:)
484 491 userInfo:nil
485 492 repeats:NO];
  493 + self.controlsDisabled = TRUE;
486 494 }
487 495  
488 496 - (void) commandDidTimeout:(NSTimer *) timer
... ... @@ -496,6 +504,7 @@
496 504 [self setSentCommand:NONE];
497 505 [self.view makeToast:NSLocalizedString(@"Device answer timeout occurred", nil) duration:3 position:[NSValue valueWithCGPoint:CGPointMake(self.view.frame.size.width/2,self.view.frame.size.height/2)] title:NSLocalizedString(@"Error", nil) image:[UIImage imageNamed:@"icon_delete"]];
498 506 }
  507 + self.controlsDisabled = FALSE;
499 508 }
500 509  
501 510  
... ... @@ -595,6 +604,7 @@
595 604 [super viewDidLoad];
596 605 [_activityIndicator setHidden:YES];
597 606 self.appDelegate = [[UIApplication sharedApplication] delegate];
  607 + self.controlsDisabled = FALSE;
598 608  
599 609 //Set navigation bar
600 610 UIImage *backImage = [UIImage imageNamed:@"back_arrow.png"];
... ... @@ -882,6 +892,10 @@
882 892  
883 893 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
884 894 {
  895 + if(self.controlsDisabled)
  896 + {
  897 + return;
  898 + }
885 899 [tableView deselectRowAtIndexPath:indexPath animated:YES];
886 900 UITableViewCell *cell = [[self tableView] cellForRowAtIndexPath:indexPath];
887 901 NSString *cellName = [[cell textLabel]text];
... ...
BT Vendor/NameChangerViewController.h
... ... @@ -29,6 +29,6 @@
29 29  
30 30 - (void) showInView:(UIView *)aView animated:(BOOL)animated;
31 31 - (IBAction) closePopup:(id)sender;
32   -
  32 +- (IBAction) cancel:(id)sender;
33 33  
34 34 @end
35 35 \ No newline at end of file
... ...
BT Vendor/NameChangerViewController.m
... ... @@ -102,6 +102,12 @@
102 102 [self removeAnimate];
103 103 }
104 104  
  105 +- (IBAction)cancel:(id)sender
  106 +{
  107 + [self.childDelegate removeChildFromParentController:self];
  108 + [self removeAnimate];
  109 +}
  110 +
105 111 - (void)showInView:(UIView *)aView animated:(BOOL)animated
106 112 {
107 113 [aView addSubview:self.view];
... ...
BT Vendor/PriceChangerViewController.h
... ... @@ -29,6 +29,6 @@
29 29  
30 30 - (void) showInView:(UIView *)aView animated:(BOOL)animated;
31 31 - (IBAction) closePopup:(id)sender;
32   -
  32 +- (IBAction) cancel:(id)sender;
33 33  
34 34 @end
... ...
BT Vendor/PriceChangerViewController.m
... ... @@ -119,6 +119,12 @@
119 119 [self removeAnimate];
120 120 }
121 121  
  122 +- (IBAction)cancel:(id)sender
  123 +{
  124 + [self.childDelegate removeChildFromParentController:self];
  125 + [self removeAnimate];
  126 +}
  127 +
122 128 - (void)showInView:(UIView *)aView animated:(BOOL)animated
123 129 {
124 130 [aView addSubview:self.view];
... ...
BT Vendor/SalesLog.m
... ... @@ -39,28 +39,21 @@
39 39 [saleDate setHour:[[[self response] substringWithRange:NSMakeRange(8 + currentSale*SALE_STRING_LENGTH, 2)] intValue]];
40 40 [saleDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentSale*SALE_STRING_LENGTH, 2)] intValue]];
41 41 [sale setSaleTime:[calendar dateFromComponents:saleDate]];
42   - NSLog(@"date: %@",[calendar dateFromComponents:saleDate]);
43 42 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(12 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:0];
44 43 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(14 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:1];
45 44 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(16 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:2];
46 45 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(18 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:3];
47 46 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(20 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:4];
48 47 [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(22 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:5];
49   - NSLog(@"moneyPaid: %@",[sale moneyPaid]);
50 48 [sale setChannel:[[self response] substringWithRange:NSMakeRange(24 + currentSale*SALE_STRING_LENGTH, 1)]];
51   - NSLog(@"channel: %@",[sale channel]);
52 49 [sale setProductCode:[[self response] substringWithRange:NSMakeRange(25 + currentSale*SALE_STRING_LENGTH, 1)]];
53   - NSLog(@"productCode: %@",[sale productCode]);
54 50 [sale setNormalPrice: [NSString stringWithFormat:@"%d,%02d €",[[[self response] substringWithRange:NSMakeRange(26 + currentSale*SALE_STRING_LENGTH, 2)] intValue],[[[self response] substringWithRange:NSMakeRange(28 + currentSale*SALE_STRING_LENGTH, 2)] intValue]]];
55   - NSLog(@"normalPrice: %@",[sale normalPrice]);
56 51 [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(30 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:0];
57 52 [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(32 + currentSale*SALE_STRING_LENGTH , 2)] intValue]] atIndex:1];
58 53 [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(34 + currentSale*SALE_STRING_LENGTH , 2)] intValue]] atIndex:2];
59   - NSLog(@"moneyReturned: %@",[sale moneyReturned]);
60 54 [[self sales] insertObject:sale atIndex:currentSale];
61 55 currentSale++;
62 56 }
63   - NSLog(@"%@",[self sales]);
64 57 }
65 58  
66 59 @end
... ...
BT Vendor/en.lproj/DatePickerViewController.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "8vW-ig-tUA"; */
3 3 "8vW-ig-tUA.normalTitle" = "Done";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KYb-t5-e1m"; */
  6 +"KYb-t5-e1m.normalTitle" = "Cancel";
... ...
BT Vendor/en.lproj/DatePickerViewController_Landscape.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */
3 3 "SLt-EA-xM9.normalTitle" = "Done";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "ndr-CA-X1v"; */
  6 +"ndr-CA-X1v.normalTitle" = "Cancel";
... ...
BT Vendor/en.lproj/DatePickerViewController_iPad.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "RGE-Ye-qon"; */
3 3 "RGE-Ye-qon.normalTitle" = "Done";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "es5-oP-hLV"; */
  6 +"es5-oP-hLV.normalTitle" = "Cancel";
... ...
BT Vendor/en.lproj/DatePickerViewController_iPad_Landscape.strings
1 1  
  2 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "7tf-fZ-y4u"; */
  3 +"7tf-fZ-y4u.normalTitle" = "Cancel";
  4 +
2 5 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */
3 6 "JbU-pO-d9E.normalTitle" = "Done";
... ...
BT Vendor/en.lproj/DateRangePickerViewController.strings
... ... @@ -5,5 +5,8 @@
5 5 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "aYc-3W-Uqn"; */
6 6 "aYc-3W-Uqn.normalTitle" = "Done";
7 7  
  8 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "l4A-Bb-3KM"; */
  9 +"l4A-Bb-3KM.normalTitle" = "Cancel";
  10 +
8 11 /* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */
9 12 "xIo-vd-lE7.text" = "From:";
... ...
BT Vendor/en.lproj/DateRangePickerViewController_Landscape.strings
... ... @@ -5,5 +5,8 @@
5 5 /* Class = "IBUILabel"; text = "To:"; ObjectID = "WCO-rz-s5y"; */
6 6 "WCO-rz-s5y.text" = "To:";
7 7  
  8 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "WOi-cd-26B"; */
  9 +"WOi-cd-26B.normalTitle" = "Cancel";
  10 +
8 11 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */
9 12 "nfK-Us-pVk.normalTitle" = "Done";
... ...
BT Vendor/en.lproj/DateRangePickerViewController_iPad.strings
... ... @@ -7,3 +7,6 @@
7 7  
8 8 /* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */
9 9 "dRe-Qx-Lml.text" = "To:";
  10 +
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "wdk-T2-ctc"; */
  12 +"wdk-T2-ctc.normalTitle" = "Cancel";
... ...
BT Vendor/en.lproj/DateRangePickerViewController_iPad_Landscape.strings
... ... @@ -2,6 +2,9 @@
2 2 /* Class = "IBUILabel"; text = "From:"; ObjectID = "7sY-pS-rR6"; */
3 3 "7sY-pS-rR6.text" = "From:";
4 4  
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Z81-HA-twu"; */
  6 +"Z81-HA-twu.normalTitle" = "Cancel";
  7 +
5 8 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hDh-hS-ruL"; */
6 9 "hDh-hS-ruL.normalTitle" = "Done";
7 10  
... ...
BT Vendor/en.lproj/NameChangerViewController.strings
... ... @@ -5,6 +5,9 @@
5 5 /* Class = "IBUILabel"; text = "New Name"; ObjectID = "Zfh-RB-roO"; */
6 6 "Zfh-RB-roO.text" = "New Name";
7 7  
  8 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "dUe-ps-tHo"; */
  9 +"dUe-ps-tHo.normalTitle" = "Cancel";
  10 +
8 11 /* Class = "IBUILabel"; text = "Channel"; ObjectID = "u0t-Gj-gKZ"; */
9 12 "u0t-Gj-gKZ.text" = "Channel";
10 13  
... ...
BT Vendor/en.lproj/NameChangerViewController_Landscape.strings
... ... @@ -8,5 +8,8 @@
8 8 /* Class = "IBUILabel"; text = "New Name"; ObjectID = "gIa-c0-uyh"; */
9 9 "gIa-c0-uyh.text" = "New Name";
10 10  
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "n4D-b7-1V7"; */
  12 +"n4D-b7-1V7.normalTitle" = "Cancel";
  13 +
11 14 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */
12 15 "z9N-z7-JyV.text" = "Product Code";
... ...
BT Vendor/en.lproj/NameChangerViewController_iPad.strings
... ... @@ -2,6 +2,9 @@
2 2 /* Class = "IBUILabel"; text = "Channel"; ObjectID = "9PW-xp-3t9"; */
3 3 "9PW-xp-3t9.text" = "Channel";
4 4  
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "MRA-TQ-VxA"; */
  6 +"MRA-TQ-VxA.normalTitle" = "Cancel";
  7 +
5 8 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "Md5-1l-LqY"; */
6 9 "Md5-1l-LqY.normalTitle" = "Done";
7 10  
... ...
BT Vendor/en.lproj/NameChangerViewController_iPad_Landscape.strings
... ... @@ -8,5 +8,8 @@
8 8 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "q3O-jD-tjP"; */
9 9 "q3O-jD-tjP.normalTitle" = "Done";
10 10  
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "xW2-wT-np7"; */
  12 +"xW2-wT-np7.normalTitle" = "Cancel";
  13 +
11 14 /* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */
12 15 "zj0-M4-cAO.text" = "New Name";
... ...
BT Vendor/en.lproj/PriceChangerViewController.strings
... ... @@ -5,6 +5,9 @@
5 5 /* Class = "IBUILabel"; text = "New Price"; ObjectID = "Cbx-ha-NZx"; */
6 6 "Cbx-ha-NZx.text" = "New Price";
7 7  
  8 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KF4-zt-DGp"; */
  9 +"KF4-zt-DGp.normalTitle" = "Cancel";
  10 +
8 11 /* Class = "IBUILabel"; text = "Channel"; ObjectID = "VCq-As-NrV"; */
9 12 "VCq-As-NrV.text" = "Channel";
10 13  
... ...
BT Vendor/en.lproj/PriceChangerViewController_Landscape.strings
... ... @@ -5,6 +5,9 @@
5 5 /* Class = "IBUILabel"; text = "New Price"; ObjectID = "UrS-qz-jRa"; */
6 6 "UrS-qz-jRa.text" = "New Price";
7 7  
  8 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Xdp-5C-5aA"; */
  9 +"Xdp-5C-5aA.normalTitle" = "Cancel";
  10 +
8 11 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "neg-KG-oQC"; */
9 12 "neg-KG-oQC.text" = "Product Code";
10 13  
... ...
BT Vendor/en.lproj/PriceChangerViewController_iPad.strings
... ... @@ -2,6 +2,9 @@
2 2 /* Class = "IBUILabel"; text = "Channel"; ObjectID = "6M6-Rz-v0B"; */
3 3 "6M6-Rz-v0B.text" = "Channel";
4 4  
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "84E-sg-9fV"; */
  6 +"84E-sg-9fV.normalTitle" = "Cancel";
  7 +
5 8 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "BsH-aP-YXx"; */
6 9 "BsH-aP-YXx.normalTitle" = "Done";
7 10  
... ...
BT Vendor/en.lproj/PriceChangerViewController_iPad_Landscape.strings
1 1  
  2 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "8TX-z3-YGe"; */
  3 +"8TX-z3-YGe.normalTitle" = "Cancel";
  4 +
2 5 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "GCF-GY-CN1"; */
3 6 "GCF-GY-CN1.text" = "Product Code";
4 7  
... ...
BT Vendor/es.lproj/DatePickerViewController.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "8vW-ig-tUA"; */
3 3 "8vW-ig-tUA.normalTitle" = "Aceptar";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KYb-t5-e1m"; */
  6 +"KYb-t5-e1m.normalTitle" = "Cancelar";
4 7 \ No newline at end of file
... ...
BT Vendor/es.lproj/DatePickerViewController_Landscape.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */
3 3 "SLt-EA-xM9.normalTitle" = "Aceptar";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "ndr-CA-X1v"; */
  6 +"ndr-CA-X1v.normalTitle" = "Cancelar";
... ...
BT Vendor/es.lproj/DatePickerViewController_iPad.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "RGE-Ye-qon"; */
3 3 "RGE-Ye-qon.normalTitle" = "Aceptar";
  4 +
  5 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "es5-oP-hLV"; */
  6 +"es5-oP-hLV.normalTitle" = "Cancelar";
... ...
BT Vendor/es.lproj/DatePickerViewController_iPad_Landscape.strings
1 1  
2 2 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */
3 3 "JbU-pO-d9E.normalTitle" = "Aceptar";
  4 +
  5 +
  6 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "7tf-fZ-y4u"; */
  7 +"7tf-fZ-y4u.normalTitle" = "Cancelar";
4 8 \ No newline at end of file
... ...
BT Vendor/es.lproj/DateRangePickerViewController.strings
... ... @@ -7,3 +7,6 @@
7 7  
8 8 /* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */
9 9 "xIo-vd-lE7.text" = "Hasta:";
  10 +
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "l4A-Bb-3KM"; */
  12 +"l4A-Bb-3KM.normalTitle" = "Cancelar";
10 13 \ No newline at end of file
... ...
BT Vendor/es.lproj/DateRangePickerViewController_Landscape.strings
... ... @@ -7,3 +7,6 @@
7 7  
8 8 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */
9 9 "nfK-Us-pVk.normalTitle" = "Aceptar";
  10 +
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "WOi-cd-26B"; */
  12 +"WOi-cd-26B.normalTitle" = "Cancelar";
10 13 \ No newline at end of file
... ...
BT Vendor/es.lproj/DateRangePickerViewController_iPad.strings
... ... @@ -7,3 +7,6 @@
7 7  
8 8 /* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */
9 9 "dRe-Qx-Lml.text" = "Hasta:";
  10 +
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "wdk-T2-ctc"; */
  12 +"wdk-T2-ctc.normalTitle" = "Cancelar";
10 13 \ No newline at end of file
... ...
BT Vendor/es.lproj/DateRangePickerViewController_iPad_Landscape.strings
... ... @@ -7,3 +7,6 @@
7 7  
8 8 /* Class = "IBUILabel"; text = "To:"; ObjectID = "z8k-7k-O2i"; */
9 9 "z8k-7k-O2i.text" = "Hasta:";
  10 +
  11 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Z81-HA-twu"; */
  12 +"Z81-HA-twu.normalTitle" = "Cancelar";
10 13 \ No newline at end of file
... ...
BT Vendor/es.lproj/NameChangerViewController.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "zk3-Qc-MYf"; */
12 12 "zk3-Qc-MYf.text" = "Código del Producto";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "dUe-ps-tHo"; */
  15 +"dUe-ps-tHo.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/NameChangerViewController_Landscape.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */
12 12 "z9N-z7-JyV.text" = "Código del Producto";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "n4D-b7-1V7"; */
  15 +"n4D-b7-1V7.normalTitle" = "Cancelar";
... ...
BT Vendor/es.lproj/NameChangerViewController_iPad.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "New Name"; ObjectID = "pLv-EG-y2m"; */
12 12 "pLv-EG-y2m.text" = "Nuevo Nombre";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "MRA-TQ-VxA"; */
  15 +"MRA-TQ-VxA.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/NameChangerViewController_iPad_Landscape.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */
12 12 "zj0-M4-cAO.text" = "Nuevo Nombre";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "xW2-wT-np7"; */
  15 +"xW2-wT-np7.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/PriceChangerViewController.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "slH-Zj-pps"; */
12 12 "slH-Zj-pps.normalTitle" = "Aceptar";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KF4-zt-DGp"; */
  15 +"KF4-zt-DGp.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/PriceChangerViewController_Landscape.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ubO-fy-Tcd"; */
12 12 "ubO-fy-Tcd.normalTitle" = "Aceptar";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Xdp-5C-5aA"; */
  15 +"Xdp-5C-5aA.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/PriceChangerViewController_iPad.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "y0J-fk-3XQ"; */
12 12 "y0J-fk-3XQ.text" = "Código del Producto";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "84E-sg-9fV"; */
  15 +"84E-sg-9fV.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...
BT Vendor/es.lproj/PriceChangerViewController_iPad_Landscape.strings
... ... @@ -10,3 +10,6 @@
10 10  
11 11 /* Class = "IBUILabel"; text = "Channel"; ObjectID = "z9V-5B-LtD"; */
12 12 "z9V-5B-LtD.text" = "Canal";
  13 +
  14 +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "8TX-z3-YGe"; */
  15 +"8TX-z3-YGe.normalTitle" = "Cancelar";
13 16 \ No newline at end of file
... ...