diff --git a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj index 1ffd513..4a0b8d8 100644 --- a/BT Vendor/BT Vendor.xcodeproj/project.pbxproj +++ b/BT Vendor/BT Vendor.xcodeproj/project.pbxproj @@ -93,31 +93,24 @@ 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; F9015D9119B73052006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController.xib; sourceTree = ""; }; - F9015D9419B73056006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController.strings; sourceTree = ""; }; F9015D9619B73057006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController.strings; sourceTree = ""; }; F9015D9819B7305E006C7882 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad.xib; sourceTree = ""; }; - F9015D9B19B73062006C7882 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = ""; }; F9015D9D19B73062006C7882 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad.strings; sourceTree = ""; }; F90416FD19CC776E00333AD8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController.xib; sourceTree = ""; }; - F904170019CC777200333AD8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController.strings; sourceTree = ""; }; F904170219CC777300333AD8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController.strings; sourceTree = ""; }; F915612619C3D16D00126FE2 /* DateRangePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateRangePickerViewController.h; sourceTree = SOURCE_ROOT; }; F915612719C3D16D00126FE2 /* DateRangePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateRangePickerViewController.m; sourceTree = SOURCE_ROOT; }; F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriceChangerViewController.h; sourceTree = SOURCE_ROOT; }; F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriceChangerViewController.m; sourceTree = SOURCE_ROOT; }; F92F567E19B7609C00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController.xib; sourceTree = ""; }; - F92F568119B760A100A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController.strings; sourceTree = ""; }; F92F568519B760A800A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_iPad.xib; sourceTree = ""; }; - F92F568819B760AA00A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad.strings; sourceTree = ""; }; F92F568A19B760AB00A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_iPad.strings; sourceTree = ""; }; F92F568C19B7616200A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController.strings; sourceTree = ""; }; F92F568D19B763FD00A1EACA /* NameChangerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NameChangerViewController.h; sourceTree = SOURCE_ROOT; }; F92F568E19B763FD00A1EACA /* NameChangerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NameChangerViewController.m; sourceTree = SOURCE_ROOT; }; F92F569319B7665F00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController.xib; sourceTree = ""; }; - F92F569619B7666300A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController.strings; sourceTree = ""; }; F92F569819B7666400A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController.strings; sourceTree = ""; }; F92F569C19B76A5D00A1EACA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_iPad.xib; sourceTree = ""; }; - F92F569F19B76A6300A1EACA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad.strings; sourceTree = ""; }; F92F56A119B76A6400A1EACA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad.strings; sourceTree = ""; }; F933F80119B6819400521B90 /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatePickerViewController.h; sourceTree = SOURCE_ROOT; }; F933F80219B6819400521B90 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DatePickerViewController.m; sourceTree = SOURCE_ROOT; }; @@ -136,7 +129,6 @@ F961D81D199A711600E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView.strings; sourceTree = ""; }; F961D81F199A711700E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView.strings; sourceTree = ""; }; F975ADAD19E8248000CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_iPad_Landscape.xib; sourceTree = ""; }; - F975ADB019E8248200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADB219E8248300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADBC19E827EC00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_Landscape.xib; sourceTree = ""; }; F975ADBF19E827F000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_Landscape.strings; sourceTree = ""; }; @@ -145,25 +137,18 @@ F975ADC619E827F900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = ""; }; F975ADC819E827F900CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_iPad_Landscape.strings; sourceTree = ""; }; F975ADD619E82B7D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickerViewController_Landscape.xib; sourceTree = ""; }; - F975ADD919E82B8000CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_Landscape.strings; sourceTree = ""; }; F975ADDB19E82B8100CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatePickerViewController_Landscape.strings; sourceTree = ""; }; F975ADDD19E82B9800CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_Landscape.xib; sourceTree = ""; }; - F975ADE419E82BE200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_Landscape.strings; sourceTree = ""; }; F975ADE619E82BE300CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_Landscape.strings; sourceTree = ""; }; F975ADE819E82C5D00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PriceChangerViewController_iPad_Landscape.xib; sourceTree = ""; }; - F975ADEB19E82C6200CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADED19E82C6200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADEF19E82D1400CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_Landscape.xib; sourceTree = ""; }; - F975ADF219E82D1600CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_Landscape.strings; sourceTree = ""; }; F975ADF419E82D1600CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_Landscape.strings; sourceTree = ""; }; F975ADF619E82D9F00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/NameChangerViewController_iPad_Landscape.xib; sourceTree = ""; }; - F975ADF919E82DA100CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADFB19E82DA200CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975ADFD19E8347700CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_Landscape.xib; sourceTree = ""; }; - F975AE0019E8347900CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = ""; }; F975AE0219E8347A00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = ""; }; F975AE0419E8359B00CA4442 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad_Landscape.xib; sourceTree = ""; }; - F975AE0719E8359D00CA4442 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F975AE0919E8359E00CA4442 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F97B90C919B859F500DDA9EF /* icon_checkmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_checkmark.png; sourceTree = SOURCE_ROOT; }; F97B90CA19B859F500DDA9EF /* icon_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_delete.png; sourceTree = SOURCE_ROOT; }; @@ -183,10 +168,25 @@ F989B60019BCE28C00657DD9 /* SalesLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesLog.h; sourceTree = SOURCE_ROOT; }; F989B60119BCE28C00657DD9 /* SalesLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SalesLog.m; sourceTree = SOURCE_ROOT; }; F996591319CC7F3D00667BEC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DateRangePickerViewController_iPad.xib; sourceTree = ""; }; - F996591619CC7F4400667BEC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad.strings; sourceTree = ""; }; F996591819CC7F4500667BEC /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DateRangePickerViewController_iPad.strings; sourceTree = ""; }; F9A8EF7A192FE201009E7532 /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; }; F9A8EF7B192FE201009E7532 /* Stack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Stack.m; sourceTree = SOURCE_ROOT; }; + F9A94AE61A165256005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F9A94AE81A16525E005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_iPad.strings; sourceTree = ""; }; + F9A94AEA1A165266005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController_Landscape.strings; sourceTree = ""; }; + F9A94AEC1A16526E005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickerViewController.strings; sourceTree = ""; }; + F9A94AEE1A16557F005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController.strings; sourceTree = ""; }; + F9A94AF01A165586005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_Landscape.strings; sourceTree = ""; }; + F9A94AF21A16558D005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad.strings; sourceTree = ""; }; + F9A94AF41A165595005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PriceChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F9A94AF61A1657B6005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController.strings; sourceTree = ""; }; + F9A94AF81A1657BC005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_Landscape.strings; sourceTree = ""; }; + F9A94AFA1A1657C3005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad.strings; sourceTree = ""; }; + F9A94AFC1A1657CA005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/NameChangerViewController_iPad_Landscape.strings; sourceTree = ""; }; + F9A94AFE1A1657D1005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController.strings; sourceTree = ""; }; + F9A94B001A1657D6005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_Landscape.strings; sourceTree = ""; }; + F9A94B021A1657DE005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad.strings; sourceTree = ""; }; + F9A94B041A1657E5005B5E0F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DateRangePickerViewController_iPad_Landscape.strings; sourceTree = ""; }; F9B9100719E59773006D4D06 /* IncidentLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IncidentLog.h; sourceTree = SOURCE_ROOT; }; F9B9100819E59773006D4D06 /* IncidentLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IncidentLog.m; sourceTree = SOURCE_ROOT; }; F9B9100A19E5A0A1006D4D06 /* Incident.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Incident.h; sourceTree = SOURCE_ROOT; }; @@ -534,8 +534,8 @@ isa = PBXVariantGroup; children = ( F9015D9119B73052006C7882 /* Base */, - F9015D9419B73056006C7882 /* en */, F9015D9619B73057006C7882 /* es */, + F9A94AEC1A16526E005B5E0F /* en */, ); name = DatePickerViewController.xib; sourceTree = SOURCE_ROOT; @@ -544,8 +544,8 @@ isa = PBXVariantGroup; children = ( F9015D9819B7305E006C7882 /* Base */, - F9015D9B19B73062006C7882 /* en */, F9015D9D19B73062006C7882 /* es */, + F9A94AE81A16525E005B5E0F /* en */, ); name = DatePickerViewController_iPad.xib; sourceTree = SOURCE_ROOT; @@ -554,8 +554,8 @@ isa = PBXVariantGroup; children = ( F90416FD19CC776E00333AD8 /* Base */, - F904170019CC777200333AD8 /* en */, F904170219CC777300333AD8 /* es */, + F9A94AFE1A1657D1005B5E0F /* en */, ); name = DateRangePickerViewController.xib; sourceTree = SOURCE_ROOT; @@ -564,8 +564,8 @@ isa = PBXVariantGroup; children = ( F92F567E19B7609C00A1EACA /* Base */, - F92F568119B760A100A1EACA /* en */, F92F568C19B7616200A1EACA /* es */, + F9A94AEE1A16557F005B5E0F /* en */, ); name = PriceChangerViewController.xib; sourceTree = SOURCE_ROOT; @@ -574,8 +574,8 @@ isa = PBXVariantGroup; children = ( F92F568519B760A800A1EACA /* Base */, - F92F568819B760AA00A1EACA /* en */, F92F568A19B760AB00A1EACA /* es */, + F9A94AF21A16558D005B5E0F /* en */, ); name = PriceChangerViewController_iPad.xib; sourceTree = SOURCE_ROOT; @@ -584,8 +584,8 @@ isa = PBXVariantGroup; children = ( F92F569319B7665F00A1EACA /* Base */, - F92F569619B7666300A1EACA /* en */, F92F569819B7666400A1EACA /* es */, + F9A94AF61A1657B6005B5E0F /* en */, ); name = NameChangerViewController.xib; sourceTree = SOURCE_ROOT; @@ -594,8 +594,8 @@ isa = PBXVariantGroup; children = ( F92F569C19B76A5D00A1EACA /* Base */, - F92F569F19B76A6300A1EACA /* en */, F92F56A119B76A6400A1EACA /* es */, + F9A94AFA1A1657C3005B5E0F /* en */, ); name = NameChangerViewController_iPad.xib; sourceTree = SOURCE_ROOT; @@ -646,8 +646,8 @@ isa = PBXVariantGroup; children = ( F975ADAD19E8248000CA4442 /* Base */, - F975ADB019E8248200CA4442 /* en */, F975ADB219E8248300CA4442 /* es */, + F9A94AE61A165256005B5E0F /* en */, ); name = DatePickerViewController_iPad_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -676,8 +676,8 @@ isa = PBXVariantGroup; children = ( F975ADD619E82B7D00CA4442 /* Base */, - F975ADD919E82B8000CA4442 /* en */, F975ADDB19E82B8100CA4442 /* es */, + F9A94AEA1A165266005B5E0F /* en */, ); name = DatePickerViewController_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -686,8 +686,8 @@ isa = PBXVariantGroup; children = ( F975ADDD19E82B9800CA4442 /* Base */, - F975ADE419E82BE200CA4442 /* en */, F975ADE619E82BE300CA4442 /* es */, + F9A94AF01A165586005B5E0F /* en */, ); name = PriceChangerViewController_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -696,8 +696,8 @@ isa = PBXVariantGroup; children = ( F975ADE819E82C5D00CA4442 /* Base */, - F975ADEB19E82C6200CA4442 /* en */, F975ADED19E82C6200CA4442 /* es */, + F9A94AF41A165595005B5E0F /* en */, ); name = PriceChangerViewController_iPad_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -706,8 +706,8 @@ isa = PBXVariantGroup; children = ( F975ADEF19E82D1400CA4442 /* Base */, - F975ADF219E82D1600CA4442 /* en */, F975ADF419E82D1600CA4442 /* es */, + F9A94AF81A1657BC005B5E0F /* en */, ); name = NameChangerViewController_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -716,8 +716,8 @@ isa = PBXVariantGroup; children = ( F975ADF619E82D9F00CA4442 /* Base */, - F975ADF919E82DA100CA4442 /* en */, F975ADFB19E82DA200CA4442 /* es */, + F9A94AFC1A1657CA005B5E0F /* en */, ); name = NameChangerViewController_iPad_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -726,8 +726,8 @@ isa = PBXVariantGroup; children = ( F975ADFD19E8347700CA4442 /* Base */, - F975AE0019E8347900CA4442 /* en */, F975AE0219E8347A00CA4442 /* es */, + F9A94B001A1657D6005B5E0F /* en */, ); name = DateRangePickerViewController_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -736,8 +736,8 @@ isa = PBXVariantGroup; children = ( F975AE0419E8359B00CA4442 /* Base */, - F975AE0719E8359D00CA4442 /* en */, F975AE0919E8359E00CA4442 /* es */, + F9A94B041A1657E5005B5E0F /* en */, ); name = DateRangePickerViewController_iPad_Landscape.xib; sourceTree = SOURCE_ROOT; @@ -746,8 +746,8 @@ isa = PBXVariantGroup; children = ( F996591319CC7F3D00667BEC /* Base */, - F996591619CC7F4400667BEC /* en */, F996591819CC7F4500667BEC /* es */, + F9A94B021A1657DE005B5E0F /* en */, ); name = DateRangePickerViewController_iPad.xib; sourceTree = SOURCE_ROOT; diff --git a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 52c06c6..588c9be 100644 --- a/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate +++ b/BT Vendor/BT Vendor.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 5a92c47..338a5d4 100644 --- a/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/BT Vendor/BT Vendor.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1068" - endingLineNumber = "1068" + startingLineNumber = "1082" + endingLineNumber = "1082" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "737" - endingLineNumber = "737" + startingLineNumber = "747" + endingLineNumber = "747" landmarkName = "-toggleDropList:" landmarkType = "5"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "CommunicationProtocol.m" - timestampString = "437062910.396222" + timestampString = "437306741.005643" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "329" - endingLineNumber = "329" + startingLineNumber = "335" + endingLineNumber = "335" landmarkName = "-readIncidentLog::" landmarkType = "5"> @@ -74,11 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "CommunicationProtocol.m" - timestampString = "437062910.396222" + timestampString = "437306741.005643" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "329" - endingLineNumber = "329" + startingLineNumber = "335" + endingLineNumber = "335" landmarkName = "-readIncidentLog::" landmarkType = "5"> @@ -90,11 +90,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "CommunicationProtocol.m" - timestampString = "437062910.396222" + timestampString = "437306741.005643" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "340" - endingLineNumber = "340" + startingLineNumber = "346" + endingLineNumber = "346" landmarkName = "-readIncidentLog::" landmarkType = "5"> @@ -154,11 +154,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SalesLog.m" - timestampString = "431872273.448636" + timestampString = "437305705.289537" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "61" - endingLineNumber = "61" + startingLineNumber = "55" + endingLineNumber = "55" landmarkName = "-parseResponse" landmarkType = "5"> @@ -170,11 +170,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1187" - endingLineNumber = "1187" + startingLineNumber = "1201" + endingLineNumber = "1201" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -186,11 +186,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "220" - endingLineNumber = "220" + startingLineNumber = "221" + endingLineNumber = "221" landmarkName = "-generateIncidentListNavLevel:" landmarkType = "5"> @@ -202,11 +202,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "863" - endingLineNumber = "863" + startingLineNumber = "873" + endingLineNumber = "873" landmarkName = "-tableView:numberOfRowsInSection:" landmarkType = "5"> @@ -218,11 +218,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1286" - endingLineNumber = "1286" + startingLineNumber = "1300" + endingLineNumber = "1300" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -234,11 +234,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1287" - endingLineNumber = "1287" + startingLineNumber = "1301" + endingLineNumber = "1301" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -250,11 +250,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SalesLog.m" - timestampString = "431870901.753946" + timestampString = "437305705.289537" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "51" - endingLineNumber = "51" + startingLineNumber = "48" + endingLineNumber = "48" landmarkName = "-parseResponse" landmarkType = "5"> @@ -266,11 +266,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1404" - endingLineNumber = "1404" + startingLineNumber = "1418" + endingLineNumber = "1418" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -282,11 +282,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "667" - endingLineNumber = "667" + startingLineNumber = "677" + endingLineNumber = "677" landmarkName = "-willRotateToInterfaceOrientation:duration:" landmarkType = "5"> @@ -298,11 +298,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1489" - endingLineNumber = "1489" + startingLineNumber = "1503" + endingLineNumber = "1503" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -314,11 +314,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1481" - endingLineNumber = "1481" + startingLineNumber = "1495" + endingLineNumber = "1495" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -330,11 +330,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1278" - endingLineNumber = "1278" + startingLineNumber = "1292" + endingLineNumber = "1292" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -346,11 +346,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1276" - endingLineNumber = "1276" + startingLineNumber = "1290" + endingLineNumber = "1290" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -426,11 +426,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1605" - endingLineNumber = "1605" + startingLineNumber = "1619" + endingLineNumber = "1619" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -442,11 +442,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1590" - endingLineNumber = "1590" + startingLineNumber = "1604" + endingLineNumber = "1604" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -504,11 +504,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "626" - endingLineNumber = "626" + startingLineNumber = "636" + endingLineNumber = "636" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -520,11 +520,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "143" - endingLineNumber = "143" + startingLineNumber = "144" + endingLineNumber = "144" landmarkName = "-generateSaleListNavLevel:" landmarkType = "5"> @@ -552,11 +552,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1264" - endingLineNumber = "1264" + startingLineNumber = "1278" + endingLineNumber = "1278" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -568,11 +568,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "893" - endingLineNumber = "893" + startingLineNumber = "907" + endingLineNumber = "907" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -584,11 +584,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "892" - endingLineNumber = "892" + startingLineNumber = "906" + endingLineNumber = "906" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -600,13 +600,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "882" - endingLineNumber = "882" - landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:" - landmarkType = "5"> + startingLineNumber = "892" + endingLineNumber = "892" + landmarkName = "@implementation MenuTableViewController" + landmarkType = "3"> @@ -696,11 +696,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "554" - endingLineNumber = "554" + startingLineNumber = "563" + endingLineNumber = "563" landmarkName = "-handleOpenURL:" landmarkType = "5"> @@ -712,11 +712,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "531" - endingLineNumber = "531" + startingLineNumber = "540" + endingLineNumber = "540" landmarkName = "-handleOpenURL:" landmarkType = "5"> @@ -728,11 +728,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437065369.601573" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "512" - endingLineNumber = "512" + startingLineNumber = "521" + endingLineNumber = "521" landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> @@ -744,11 +744,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1119" - endingLineNumber = "1119" + startingLineNumber = "1133" + endingLineNumber = "1133" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -760,11 +760,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1116" - endingLineNumber = "1116" + startingLineNumber = "1130" + endingLineNumber = "1130" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> @@ -776,11 +776,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "MenuTableViewController.m" - timestampString = "437250832.810266" + timestampString = "437672438.4449" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1115" - endingLineNumber = "1115" + startingLineNumber = "1129" + endingLineNumber = "1129" landmarkName = "-tableView:didSelectRowAtIndexPath:" landmarkType = "5"> diff --git a/BT Vendor/Base.lproj/DatePickerViewController.xib b/BT Vendor/Base.lproj/DatePickerViewController.xib index 18c0eef..d8730ef 100644 --- a/BT Vendor/Base.lproj/DatePickerViewController.xib +++ b/BT Vendor/Base.lproj/DatePickerViewController.xib @@ -20,16 +20,6 @@ - @@ -58,15 +48,38 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + - + + + + diff --git a/BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib b/BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib index 4ffc310..9942701 100644 --- a/BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib +++ b/BT Vendor/Base.lproj/DatePickerViewController_Landscape.xib @@ -20,16 +20,6 @@ - @@ -58,17 +48,39 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + + + - + diff --git a/BT Vendor/Base.lproj/DatePickerViewController_iPad.xib b/BT Vendor/Base.lproj/DatePickerViewController_iPad.xib index 8320152..efeb564 100644 --- a/BT Vendor/Base.lproj/DatePickerViewController_iPad.xib +++ b/BT Vendor/Base.lproj/DatePickerViewController_iPad.xib @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + - + + - + diff --git a/BT Vendor/Base.lproj/DatePickerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/DatePickerViewController_iPad_Landscape.xib index aab2a23..0d7b203 100644 --- a/BT Vendor/Base.lproj/DatePickerViewController_iPad_Landscape.xib +++ b/BT Vendor/Base.lproj/DatePickerViewController_iPad_Landscape.xib @@ -30,7 +30,7 @@ - + VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g @@ -48,11 +48,21 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + + + @@ -132,13 +142,15 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA - + + + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib index 4eaae1a..c4369bb 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_Landscape.xib @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + - + + + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib index 881eb94..275aaed 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad.xib @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + @@ -130,17 +140,19 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + - + diff --git a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib index 0d60d0d..fb5d47a 100644 --- a/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib +++ b/BT Vendor/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib @@ -114,7 +114,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA + + + + - diff --git a/BT Vendor/Base.lproj/NameChangerViewController.xib b/BT Vendor/Base.lproj/NameChangerViewController.xib index b0f47ba..d154120 100644 --- a/BT Vendor/Base.lproj/NameChangerViewController.xib +++ b/BT Vendor/Base.lproj/NameChangerViewController.xib @@ -69,7 +69,7 @@ + + + + @@ -94,7 +107,6 @@ - diff --git a/BT Vendor/Base.lproj/NameChangerViewController_Landscape.xib b/BT Vendor/Base.lproj/NameChangerViewController_Landscape.xib index ef8a3fa..b7af07e 100644 --- a/BT Vendor/Base.lproj/NameChangerViewController_Landscape.xib +++ b/BT Vendor/Base.lproj/NameChangerViewController_Landscape.xib @@ -69,7 +69,7 @@ + + @@ -88,13 +99,14 @@ + - + diff --git a/BT Vendor/Base.lproj/NameChangerViewController_iPad.xib b/BT Vendor/Base.lproj/NameChangerViewController_iPad.xib index e37d32d..2885470 100644 --- a/BT Vendor/Base.lproj/NameChangerViewController_iPad.xib +++ b/BT Vendor/Base.lproj/NameChangerViewController_iPad.xib @@ -59,8 +59,17 @@ + + + + + + + + + - - + @@ -88,12 +98,14 @@ + - + + diff --git a/BT Vendor/Base.lproj/NameChangerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/NameChangerViewController_iPad_Landscape.xib index 4180225..fd5c9d6 100644 --- a/BT Vendor/Base.lproj/NameChangerViewController_iPad_Landscape.xib +++ b/BT Vendor/Base.lproj/NameChangerViewController_iPad_Landscape.xib @@ -60,7 +60,7 @@ - @@ -94,8 +103,11 @@ + + + diff --git a/BT Vendor/Base.lproj/PriceChangerViewController.xib b/BT Vendor/Base.lproj/PriceChangerViewController.xib index 73ffab4..29d43c3 100644 --- a/BT Vendor/Base.lproj/PriceChangerViewController.xib +++ b/BT Vendor/Base.lproj/PriceChangerViewController.xib @@ -69,7 +69,7 @@ + - + @@ -91,6 +101,8 @@ + + diff --git a/BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib b/BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib index 4530b42..b8b71d4 100644 --- a/BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib +++ b/BT Vendor/Base.lproj/PriceChangerViewController_Landscape.xib @@ -69,7 +69,7 @@ + @@ -85,12 +95,14 @@ - + + + diff --git a/BT Vendor/Base.lproj/PriceChangerViewController_iPad.xib b/BT Vendor/Base.lproj/PriceChangerViewController_iPad.xib index 8465b16..fbb6742 100644 --- a/BT Vendor/Base.lproj/PriceChangerViewController_iPad.xib +++ b/BT Vendor/Base.lproj/PriceChangerViewController_iPad.xib @@ -69,7 +69,7 @@ + + + + - diff --git a/BT Vendor/Base.lproj/PriceChangerViewController_iPad_Landscape.xib b/BT Vendor/Base.lproj/PriceChangerViewController_iPad_Landscape.xib index 3f8d17e..37527c7 100644 --- a/BT Vendor/Base.lproj/PriceChangerViewController_iPad_Landscape.xib +++ b/BT Vendor/Base.lproj/PriceChangerViewController_iPad_Landscape.xib @@ -69,7 +69,7 @@ + @@ -85,6 +95,7 @@ + @@ -93,9 +104,10 @@ - + + diff --git a/BT Vendor/CommunicationProtocol.m b/BT Vendor/CommunicationProtocol.m index 2477045..5e3bfdc 100644 --- a/BT Vendor/CommunicationProtocol.m +++ b/BT Vendor/CommunicationProtocol.m @@ -49,6 +49,12 @@ NSLog(@"[CommunicationProtocol.m]: numBytes read: %d",numBytes); [[EMConnectionManager sharedManager] readResource:@"data" onSuccess:^(id readValue) { + /* + * BUG: If previously sent message is longer than the response, the excess bytes are appended to the response + * coming from the device. Trimming is applied to correct that. A possible cause may be a bug in the device's + * code, not the app + */ + //NSString *readData = readValue; NSString *readData = [readValue substringToIndex:numBytes]; if([readValue length] < numBytes) { diff --git a/BT Vendor/DatePickerViewController.h b/BT Vendor/DatePickerViewController.h index 1d7adb6..5bdefb2 100644 --- a/BT Vendor/DatePickerViewController.h +++ b/BT Vendor/DatePickerViewController.h @@ -26,5 +26,6 @@ - (void) showInView:(UIView *)aView animated:(BOOL)animated; - (IBAction) closePopup:(id)sender; +- (IBAction) cancel:(id)sender; @end diff --git a/BT Vendor/DatePickerViewController.m b/BT Vendor/DatePickerViewController.m index bd6cf8c..7c815d9 100644 --- a/BT Vendor/DatePickerViewController.m +++ b/BT Vendor/DatePickerViewController.m @@ -85,6 +85,12 @@ [self removeAnimate]; } +- (IBAction)cancel:(id)sender +{ + [self.childDelegate removeChildFromParentController:self]; + [self removeAnimate]; +} + - (void)showInView:(UIView *)aView animated:(BOOL)animated { [aView addSubview:self.view]; diff --git a/BT Vendor/DateRangePickerViewController.h b/BT Vendor/DateRangePickerViewController.h index de5cc09..0b54474 100644 --- a/BT Vendor/DateRangePickerViewController.h +++ b/BT Vendor/DateRangePickerViewController.h @@ -43,5 +43,6 @@ - (IBAction) toggleFromDate:(id)sender; - (IBAction) toggleToDate:(id)sender; - (IBAction) closePopup:(id)sender; +- (IBAction) cancel:(id)sender; @end diff --git a/BT Vendor/DateRangePickerViewController.m b/BT Vendor/DateRangePickerViewController.m index 3d8c0e6..ff74a5f 100644 --- a/BT Vendor/DateRangePickerViewController.m +++ b/BT Vendor/DateRangePickerViewController.m @@ -231,6 +231,12 @@ [self removeAnimate]; } +- (IBAction)cancel:(id)sender +{ + [self.childDelegate removeChildFromParentController:self]; + [self removeAnimate]; +} + - (void)showInView:(UIView *)aView animated:(BOOL)animated { [aView addSubview:self.view]; diff --git a/BT Vendor/FirstAppExample/Base.lproj/EMConnectingView.xib b/BT Vendor/FirstAppExample/Base.lproj/EMConnectingView.xib index c6ced56..77c1bbd 100644 --- a/BT Vendor/FirstAppExample/Base.lproj/EMConnectingView.xib +++ b/BT Vendor/FirstAppExample/Base.lproj/EMConnectingView.xib @@ -13,11 +13,11 @@ - + - + + - + + diff --git a/BT Vendor/FirstAppExample/EMDevicePickerViewController.m b/BT Vendor/FirstAppExample/EMDevicePickerViewController.m index a1c2052..ecb2433 100644 --- a/BT Vendor/FirstAppExample/EMDevicePickerViewController.m +++ b/BT Vendor/FirstAppExample/EMDevicePickerViewController.m @@ -63,8 +63,8 @@ } } [[[self popoverView] layer] setCornerRadius:10.0f]; - [[self view] addSubview:[self connectingView]]; [[self activityIndicator] startAnimating]; + [self.navigationController.view addSubview:self.connectingView]; } -(void)_hideConnectingView diff --git a/BT Vendor/IncidentLog.m b/BT Vendor/IncidentLog.m index f1c5bdc..6ef599e 100644 --- a/BT Vendor/IncidentLog.m +++ b/BT Vendor/IncidentLog.m @@ -40,15 +40,11 @@ [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; [incidentDate setMinute:[[[self response] substringWithRange:NSMakeRange(12 + currentIncident*INCIDENT_STRING_LENGTH, 2)] intValue]]; [incident setIncidentTime:[calendar dateFromComponents:incidentDate]]; - NSLog(@"date: %@",[calendar dateFromComponents:incidentDate]); [incident setErrorCode:[[self response] substringWithRange:NSMakeRange(14 + currentIncident*INCIDENT_STRING_LENGTH, 2)]]; - NSLog(@"errorCode: %@",[incident errorCode]); [incident setErrorValue:[[self response] substringWithRange:NSMakeRange(16 + currentIncident*INCIDENT_STRING_LENGTH, 4)]]; - NSLog(@"errorValue: %@",[incident errorValue]); [[self incidents] insertObject:incident atIndex:currentIncident]; currentIncident++; } - NSLog(@"%@",[self incidents]); } @end diff --git a/BT Vendor/MenuTableViewController.m b/BT Vendor/MenuTableViewController.m index 4cf5af8..2877219 100644 --- a/BT Vendor/MenuTableViewController.m +++ b/BT Vendor/MenuTableViewController.m @@ -68,6 +68,7 @@ @property (strong,nonatomic) Incident *currentIncident; @property uint8_t requestedLog; @property uint8_t sentCommand; +@property Boolean controlsDisabled; //CHILD VIEW CONTOLLERS @property (strong,nonatomic) DatePickerViewController *datePickerViewController; @@ -254,6 +255,7 @@ if([self currentNavLevel] == MENU) { [self setMachineMACAddr:[[[EMConnectionManager sharedManager] connectedDevice] name]]; + NSLog(@"[MenuTableViewController.m]: Device MAC address is %@", self.machineMACAddr); [[self navigationItem] setTitle:[self machineMACAddr]]; [self setCurrentElements:[self menuElements]]; [self setCurrentStructure:[self menuStructure]]; @@ -330,6 +332,10 @@ - (void) backButtonPressed: (id) sender { + if(self.controlsDisabled) + { + return; + } NSLog(@"[MenuTableViewController.m]: Navigation Stack has %ld remaining levels",(long)[[self parentLayout] count]); if([[self parentLayout] count] > 0) { @@ -384,6 +390,7 @@ { NSLog(@"[MenuTableViewController.m]: Answer received: %@",response); [self.timeoutTimer invalidate]; + self.controlsDisabled = FALSE; if(self.sentCommand == HELLO) { if([response isEqualToString:@"Hello"]) @@ -483,6 +490,7 @@ selector:@selector(commandDidTimeout:) userInfo:nil repeats:NO]; + self.controlsDisabled = TRUE; } - (void) commandDidTimeout:(NSTimer *) timer @@ -496,6 +504,7 @@ [self setSentCommand:NONE]; [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"]]; } + self.controlsDisabled = FALSE; } @@ -595,6 +604,7 @@ [super viewDidLoad]; [_activityIndicator setHidden:YES]; self.appDelegate = [[UIApplication sharedApplication] delegate]; + self.controlsDisabled = FALSE; //Set navigation bar UIImage *backImage = [UIImage imageNamed:@"back_arrow.png"]; @@ -882,6 +892,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + if(self.controlsDisabled) + { + return; + } [tableView deselectRowAtIndexPath:indexPath animated:YES]; UITableViewCell *cell = [[self tableView] cellForRowAtIndexPath:indexPath]; NSString *cellName = [[cell textLabel]text]; diff --git a/BT Vendor/NameChangerViewController.h b/BT Vendor/NameChangerViewController.h index 804408a..b4f1f37 100644 --- a/BT Vendor/NameChangerViewController.h +++ b/BT Vendor/NameChangerViewController.h @@ -29,6 +29,6 @@ - (void) showInView:(UIView *)aView animated:(BOOL)animated; - (IBAction) closePopup:(id)sender; - +- (IBAction) cancel:(id)sender; @end \ No newline at end of file diff --git a/BT Vendor/NameChangerViewController.m b/BT Vendor/NameChangerViewController.m index a1c14ee..1f115f4 100644 --- a/BT Vendor/NameChangerViewController.m +++ b/BT Vendor/NameChangerViewController.m @@ -102,6 +102,12 @@ [self removeAnimate]; } +- (IBAction)cancel:(id)sender +{ + [self.childDelegate removeChildFromParentController:self]; + [self removeAnimate]; +} + - (void)showInView:(UIView *)aView animated:(BOOL)animated { [aView addSubview:self.view]; diff --git a/BT Vendor/PriceChangerViewController.h b/BT Vendor/PriceChangerViewController.h index 6a16d83..e27ff10 100644 --- a/BT Vendor/PriceChangerViewController.h +++ b/BT Vendor/PriceChangerViewController.h @@ -29,6 +29,6 @@ - (void) showInView:(UIView *)aView animated:(BOOL)animated; - (IBAction) closePopup:(id)sender; - +- (IBAction) cancel:(id)sender; @end diff --git a/BT Vendor/PriceChangerViewController.m b/BT Vendor/PriceChangerViewController.m index 8314f67..998e04e 100644 --- a/BT Vendor/PriceChangerViewController.m +++ b/BT Vendor/PriceChangerViewController.m @@ -119,6 +119,12 @@ [self removeAnimate]; } +- (IBAction)cancel:(id)sender +{ + [self.childDelegate removeChildFromParentController:self]; + [self removeAnimate]; +} + - (void)showInView:(UIView *)aView animated:(BOOL)animated { [aView addSubview:self.view]; diff --git a/BT Vendor/SalesLog.m b/BT Vendor/SalesLog.m index 363dbbe..dd888e7 100644 --- a/BT Vendor/SalesLog.m +++ b/BT Vendor/SalesLog.m @@ -39,28 +39,21 @@ [saleDate setHour:[[[self response] substringWithRange:NSMakeRange(8 + currentSale*SALE_STRING_LENGTH, 2)] intValue]]; [saleDate setMinute:[[[self response] substringWithRange:NSMakeRange(10 + currentSale*SALE_STRING_LENGTH, 2)] intValue]]; [sale setSaleTime:[calendar dateFromComponents:saleDate]]; - NSLog(@"date: %@",[calendar dateFromComponents:saleDate]); [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(12 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:0]; [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(14 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:1]; [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(16 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:2]; [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(18 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:3]; [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(20 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:4]; [[sale moneyPaid] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(22 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:5]; - NSLog(@"moneyPaid: %@",[sale moneyPaid]); [sale setChannel:[[self response] substringWithRange:NSMakeRange(24 + currentSale*SALE_STRING_LENGTH, 1)]]; - NSLog(@"channel: %@",[sale channel]); [sale setProductCode:[[self response] substringWithRange:NSMakeRange(25 + currentSale*SALE_STRING_LENGTH, 1)]]; - NSLog(@"productCode: %@",[sale productCode]); [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]]]; - NSLog(@"normalPrice: %@",[sale normalPrice]); [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(30 + currentSale*SALE_STRING_LENGTH, 2)] intValue]] atIndex:0]; [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(32 + currentSale*SALE_STRING_LENGTH , 2)] intValue]] atIndex:1]; [[sale moneyReturned] insertObject:[NSNumber numberWithInt:[[[self response] substringWithRange:NSMakeRange(34 + currentSale*SALE_STRING_LENGTH , 2)] intValue]] atIndex:2]; - NSLog(@"moneyReturned: %@",[sale moneyReturned]); [[self sales] insertObject:sale atIndex:currentSale]; currentSale++; } - NSLog(@"%@",[self sales]); } @end diff --git a/BT Vendor/en.lproj/DatePickerViewController.strings b/BT Vendor/en.lproj/DatePickerViewController.strings index 1b5338e..c01870f 100644 --- a/BT Vendor/en.lproj/DatePickerViewController.strings +++ b/BT Vendor/en.lproj/DatePickerViewController.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "8vW-ig-tUA"; */ "8vW-ig-tUA.normalTitle" = "Done"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KYb-t5-e1m"; */ +"KYb-t5-e1m.normalTitle" = "Cancel"; diff --git a/BT Vendor/en.lproj/DatePickerViewController_Landscape.strings b/BT Vendor/en.lproj/DatePickerViewController_Landscape.strings index 1e1f995..450e321 100644 --- a/BT Vendor/en.lproj/DatePickerViewController_Landscape.strings +++ b/BT Vendor/en.lproj/DatePickerViewController_Landscape.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */ "SLt-EA-xM9.normalTitle" = "Done"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "ndr-CA-X1v"; */ +"ndr-CA-X1v.normalTitle" = "Cancel"; diff --git a/BT Vendor/en.lproj/DatePickerViewController_iPad.strings b/BT Vendor/en.lproj/DatePickerViewController_iPad.strings index 78dd0bc..11bedd0 100644 --- a/BT Vendor/en.lproj/DatePickerViewController_iPad.strings +++ b/BT Vendor/en.lproj/DatePickerViewController_iPad.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "RGE-Ye-qon"; */ "RGE-Ye-qon.normalTitle" = "Done"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "es5-oP-hLV"; */ +"es5-oP-hLV.normalTitle" = "Cancel"; diff --git a/BT Vendor/en.lproj/DatePickerViewController_iPad_Landscape.strings b/BT Vendor/en.lproj/DatePickerViewController_iPad_Landscape.strings index 6c603a3..558edd0 100644 --- a/BT Vendor/en.lproj/DatePickerViewController_iPad_Landscape.strings +++ b/BT Vendor/en.lproj/DatePickerViewController_iPad_Landscape.strings @@ -1,3 +1,6 @@ +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "7tf-fZ-y4u"; */ +"7tf-fZ-y4u.normalTitle" = "Cancel"; + /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */ "JbU-pO-d9E.normalTitle" = "Done"; diff --git a/BT Vendor/en.lproj/DateRangePickerViewController.strings b/BT Vendor/en.lproj/DateRangePickerViewController.strings index b5e4bf7..30466bf 100644 --- a/BT Vendor/en.lproj/DateRangePickerViewController.strings +++ b/BT Vendor/en.lproj/DateRangePickerViewController.strings @@ -5,5 +5,8 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "aYc-3W-Uqn"; */ "aYc-3W-Uqn.normalTitle" = "Done"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "l4A-Bb-3KM"; */ +"l4A-Bb-3KM.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */ "xIo-vd-lE7.text" = "From:"; diff --git a/BT Vendor/en.lproj/DateRangePickerViewController_Landscape.strings b/BT Vendor/en.lproj/DateRangePickerViewController_Landscape.strings index 1c9c171..bbca671 100644 --- a/BT Vendor/en.lproj/DateRangePickerViewController_Landscape.strings +++ b/BT Vendor/en.lproj/DateRangePickerViewController_Landscape.strings @@ -5,5 +5,8 @@ /* Class = "IBUILabel"; text = "To:"; ObjectID = "WCO-rz-s5y"; */ "WCO-rz-s5y.text" = "To:"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "WOi-cd-26B"; */ +"WOi-cd-26B.normalTitle" = "Cancel"; + /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */ "nfK-Us-pVk.normalTitle" = "Done"; diff --git a/BT Vendor/en.lproj/DateRangePickerViewController_iPad.strings b/BT Vendor/en.lproj/DateRangePickerViewController_iPad.strings index 80a19e8..2cf4a98 100644 --- a/BT Vendor/en.lproj/DateRangePickerViewController_iPad.strings +++ b/BT Vendor/en.lproj/DateRangePickerViewController_iPad.strings @@ -7,3 +7,6 @@ /* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */ "dRe-Qx-Lml.text" = "To:"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "wdk-T2-ctc"; */ +"wdk-T2-ctc.normalTitle" = "Cancel"; diff --git a/BT Vendor/en.lproj/DateRangePickerViewController_iPad_Landscape.strings b/BT Vendor/en.lproj/DateRangePickerViewController_iPad_Landscape.strings index 360c45f..03e8199 100644 --- a/BT Vendor/en.lproj/DateRangePickerViewController_iPad_Landscape.strings +++ b/BT Vendor/en.lproj/DateRangePickerViewController_iPad_Landscape.strings @@ -2,6 +2,9 @@ /* Class = "IBUILabel"; text = "From:"; ObjectID = "7sY-pS-rR6"; */ "7sY-pS-rR6.text" = "From:"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Z81-HA-twu"; */ +"Z81-HA-twu.normalTitle" = "Cancel"; + /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "hDh-hS-ruL"; */ "hDh-hS-ruL.normalTitle" = "Done"; diff --git a/BT Vendor/en.lproj/NameChangerViewController.strings b/BT Vendor/en.lproj/NameChangerViewController.strings index 1b12c50..a8c9f72 100644 --- a/BT Vendor/en.lproj/NameChangerViewController.strings +++ b/BT Vendor/en.lproj/NameChangerViewController.strings @@ -5,6 +5,9 @@ /* Class = "IBUILabel"; text = "New Name"; ObjectID = "Zfh-RB-roO"; */ "Zfh-RB-roO.text" = "New Name"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "dUe-ps-tHo"; */ +"dUe-ps-tHo.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "Channel"; ObjectID = "u0t-Gj-gKZ"; */ "u0t-Gj-gKZ.text" = "Channel"; diff --git a/BT Vendor/en.lproj/NameChangerViewController_Landscape.strings b/BT Vendor/en.lproj/NameChangerViewController_Landscape.strings index 5d33219..d7931fd 100644 --- a/BT Vendor/en.lproj/NameChangerViewController_Landscape.strings +++ b/BT Vendor/en.lproj/NameChangerViewController_Landscape.strings @@ -8,5 +8,8 @@ /* Class = "IBUILabel"; text = "New Name"; ObjectID = "gIa-c0-uyh"; */ "gIa-c0-uyh.text" = "New Name"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "n4D-b7-1V7"; */ +"n4D-b7-1V7.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */ "z9N-z7-JyV.text" = "Product Code"; diff --git a/BT Vendor/en.lproj/NameChangerViewController_iPad.strings b/BT Vendor/en.lproj/NameChangerViewController_iPad.strings index 58829f0..97ce1ab 100644 --- a/BT Vendor/en.lproj/NameChangerViewController_iPad.strings +++ b/BT Vendor/en.lproj/NameChangerViewController_iPad.strings @@ -2,6 +2,9 @@ /* Class = "IBUILabel"; text = "Channel"; ObjectID = "9PW-xp-3t9"; */ "9PW-xp-3t9.text" = "Channel"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "MRA-TQ-VxA"; */ +"MRA-TQ-VxA.normalTitle" = "Cancel"; + /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "Md5-1l-LqY"; */ "Md5-1l-LqY.normalTitle" = "Done"; diff --git a/BT Vendor/en.lproj/NameChangerViewController_iPad_Landscape.strings b/BT Vendor/en.lproj/NameChangerViewController_iPad_Landscape.strings index 41be93d..1bcd9d8 100644 --- a/BT Vendor/en.lproj/NameChangerViewController_iPad_Landscape.strings +++ b/BT Vendor/en.lproj/NameChangerViewController_iPad_Landscape.strings @@ -8,5 +8,8 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "q3O-jD-tjP"; */ "q3O-jD-tjP.normalTitle" = "Done"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "xW2-wT-np7"; */ +"xW2-wT-np7.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */ "zj0-M4-cAO.text" = "New Name"; diff --git a/BT Vendor/en.lproj/PriceChangerViewController.strings b/BT Vendor/en.lproj/PriceChangerViewController.strings index 58d4466..070acf1 100644 --- a/BT Vendor/en.lproj/PriceChangerViewController.strings +++ b/BT Vendor/en.lproj/PriceChangerViewController.strings @@ -5,6 +5,9 @@ /* Class = "IBUILabel"; text = "New Price"; ObjectID = "Cbx-ha-NZx"; */ "Cbx-ha-NZx.text" = "New Price"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KF4-zt-DGp"; */ +"KF4-zt-DGp.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "Channel"; ObjectID = "VCq-As-NrV"; */ "VCq-As-NrV.text" = "Channel"; diff --git a/BT Vendor/en.lproj/PriceChangerViewController_Landscape.strings b/BT Vendor/en.lproj/PriceChangerViewController_Landscape.strings index 874b6b8..c6f1fc6 100644 --- a/BT Vendor/en.lproj/PriceChangerViewController_Landscape.strings +++ b/BT Vendor/en.lproj/PriceChangerViewController_Landscape.strings @@ -5,6 +5,9 @@ /* Class = "IBUILabel"; text = "New Price"; ObjectID = "UrS-qz-jRa"; */ "UrS-qz-jRa.text" = "New Price"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Xdp-5C-5aA"; */ +"Xdp-5C-5aA.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "neg-KG-oQC"; */ "neg-KG-oQC.text" = "Product Code"; diff --git a/BT Vendor/en.lproj/PriceChangerViewController_iPad.strings b/BT Vendor/en.lproj/PriceChangerViewController_iPad.strings index 17d58f3..6b6fb11 100644 --- a/BT Vendor/en.lproj/PriceChangerViewController_iPad.strings +++ b/BT Vendor/en.lproj/PriceChangerViewController_iPad.strings @@ -2,6 +2,9 @@ /* Class = "IBUILabel"; text = "Channel"; ObjectID = "6M6-Rz-v0B"; */ "6M6-Rz-v0B.text" = "Channel"; +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "84E-sg-9fV"; */ +"84E-sg-9fV.normalTitle" = "Cancel"; + /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "BsH-aP-YXx"; */ "BsH-aP-YXx.normalTitle" = "Done"; diff --git a/BT Vendor/en.lproj/PriceChangerViewController_iPad_Landscape.strings b/BT Vendor/en.lproj/PriceChangerViewController_iPad_Landscape.strings index ab18f05..d20aa92 100644 --- a/BT Vendor/en.lproj/PriceChangerViewController_iPad_Landscape.strings +++ b/BT Vendor/en.lproj/PriceChangerViewController_iPad_Landscape.strings @@ -1,4 +1,7 @@ +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "8TX-z3-YGe"; */ +"8TX-z3-YGe.normalTitle" = "Cancel"; + /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "GCF-GY-CN1"; */ "GCF-GY-CN1.text" = "Product Code"; diff --git a/BT Vendor/es.lproj/DatePickerViewController.strings b/BT Vendor/es.lproj/DatePickerViewController.strings index 20456e3..7b1ec1a 100644 --- a/BT Vendor/es.lproj/DatePickerViewController.strings +++ b/BT Vendor/es.lproj/DatePickerViewController.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "8vW-ig-tUA"; */ "8vW-ig-tUA.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KYb-t5-e1m"; */ +"KYb-t5-e1m.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/DatePickerViewController_Landscape.strings b/BT Vendor/es.lproj/DatePickerViewController_Landscape.strings index f5cff71..95b8556 100644 --- a/BT Vendor/es.lproj/DatePickerViewController_Landscape.strings +++ b/BT Vendor/es.lproj/DatePickerViewController_Landscape.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "SLt-EA-xM9"; */ "SLt-EA-xM9.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "ndr-CA-X1v"; */ +"ndr-CA-X1v.normalTitle" = "Cancelar"; diff --git a/BT Vendor/es.lproj/DatePickerViewController_iPad.strings b/BT Vendor/es.lproj/DatePickerViewController_iPad.strings index ed4f79a..658dc0a 100644 --- a/BT Vendor/es.lproj/DatePickerViewController_iPad.strings +++ b/BT Vendor/es.lproj/DatePickerViewController_iPad.strings @@ -1,3 +1,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "RGE-Ye-qon"; */ "RGE-Ye-qon.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "es5-oP-hLV"; */ +"es5-oP-hLV.normalTitle" = "Cancelar"; diff --git a/BT Vendor/es.lproj/DatePickerViewController_iPad_Landscape.strings b/BT Vendor/es.lproj/DatePickerViewController_iPad_Landscape.strings index 4fda1e8..4cda6b0 100644 --- a/BT Vendor/es.lproj/DatePickerViewController_iPad_Landscape.strings +++ b/BT Vendor/es.lproj/DatePickerViewController_iPad_Landscape.strings @@ -1,3 +1,7 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "JbU-pO-d9E"; */ "JbU-pO-d9E.normalTitle" = "Aceptar"; + + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "7tf-fZ-y4u"; */ +"7tf-fZ-y4u.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/DateRangePickerViewController.strings b/BT Vendor/es.lproj/DateRangePickerViewController.strings index adca0a2..218624f 100644 --- a/BT Vendor/es.lproj/DateRangePickerViewController.strings +++ b/BT Vendor/es.lproj/DateRangePickerViewController.strings @@ -7,3 +7,6 @@ /* Class = "IBUILabel"; text = "From:"; ObjectID = "xIo-vd-lE7"; */ "xIo-vd-lE7.text" = "Hasta:"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "l4A-Bb-3KM"; */ +"l4A-Bb-3KM.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/DateRangePickerViewController_Landscape.strings b/BT Vendor/es.lproj/DateRangePickerViewController_Landscape.strings index c37077d..eb6dddc 100644 --- a/BT Vendor/es.lproj/DateRangePickerViewController_Landscape.strings +++ b/BT Vendor/es.lproj/DateRangePickerViewController_Landscape.strings @@ -7,3 +7,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "nfK-Us-pVk"; */ "nfK-Us-pVk.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "WOi-cd-26B"; */ +"WOi-cd-26B.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/DateRangePickerViewController_iPad.strings b/BT Vendor/es.lproj/DateRangePickerViewController_iPad.strings index b85b410..c20bf3c 100644 --- a/BT Vendor/es.lproj/DateRangePickerViewController_iPad.strings +++ b/BT Vendor/es.lproj/DateRangePickerViewController_iPad.strings @@ -7,3 +7,6 @@ /* Class = "IBUILabel"; text = "To:"; ObjectID = "dRe-Qx-Lml"; */ "dRe-Qx-Lml.text" = "Hasta:"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "wdk-T2-ctc"; */ +"wdk-T2-ctc.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/DateRangePickerViewController_iPad_Landscape.strings b/BT Vendor/es.lproj/DateRangePickerViewController_iPad_Landscape.strings index 6f7cbbd..fff121f 100644 --- a/BT Vendor/es.lproj/DateRangePickerViewController_iPad_Landscape.strings +++ b/BT Vendor/es.lproj/DateRangePickerViewController_iPad_Landscape.strings @@ -7,3 +7,6 @@ /* Class = "IBUILabel"; text = "To:"; ObjectID = "z8k-7k-O2i"; */ "z8k-7k-O2i.text" = "Hasta:"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Z81-HA-twu"; */ +"Z81-HA-twu.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/NameChangerViewController.strings b/BT Vendor/es.lproj/NameChangerViewController.strings index dd54c46..87b6bc5 100644 --- a/BT Vendor/es.lproj/NameChangerViewController.strings +++ b/BT Vendor/es.lproj/NameChangerViewController.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "zk3-Qc-MYf"; */ "zk3-Qc-MYf.text" = "Código del Producto"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "dUe-ps-tHo"; */ +"dUe-ps-tHo.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/NameChangerViewController_Landscape.strings b/BT Vendor/es.lproj/NameChangerViewController_Landscape.strings index 0ff7fea..5d01e83 100644 --- a/BT Vendor/es.lproj/NameChangerViewController_Landscape.strings +++ b/BT Vendor/es.lproj/NameChangerViewController_Landscape.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "z9N-z7-JyV"; */ "z9N-z7-JyV.text" = "Código del Producto"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "n4D-b7-1V7"; */ +"n4D-b7-1V7.normalTitle" = "Cancelar"; diff --git a/BT Vendor/es.lproj/NameChangerViewController_iPad.strings b/BT Vendor/es.lproj/NameChangerViewController_iPad.strings index 4c55a0e..f31794c 100644 --- a/BT Vendor/es.lproj/NameChangerViewController_iPad.strings +++ b/BT Vendor/es.lproj/NameChangerViewController_iPad.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "New Name"; ObjectID = "pLv-EG-y2m"; */ "pLv-EG-y2m.text" = "Nuevo Nombre"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "MRA-TQ-VxA"; */ +"MRA-TQ-VxA.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/NameChangerViewController_iPad_Landscape.strings b/BT Vendor/es.lproj/NameChangerViewController_iPad_Landscape.strings index 2745ff0..edda1ef 100644 --- a/BT Vendor/es.lproj/NameChangerViewController_iPad_Landscape.strings +++ b/BT Vendor/es.lproj/NameChangerViewController_iPad_Landscape.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "New Name"; ObjectID = "zj0-M4-cAO"; */ "zj0-M4-cAO.text" = "Nuevo Nombre"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "xW2-wT-np7"; */ +"xW2-wT-np7.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/PriceChangerViewController.strings b/BT Vendor/es.lproj/PriceChangerViewController.strings index a6d4a99..abab013 100644 --- a/BT Vendor/es.lproj/PriceChangerViewController.strings +++ b/BT Vendor/es.lproj/PriceChangerViewController.strings @@ -10,3 +10,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "slH-Zj-pps"; */ "slH-Zj-pps.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "KF4-zt-DGp"; */ +"KF4-zt-DGp.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/PriceChangerViewController_Landscape.strings b/BT Vendor/es.lproj/PriceChangerViewController_Landscape.strings index 39435bd..aea9e2f 100644 --- a/BT Vendor/es.lproj/PriceChangerViewController_Landscape.strings +++ b/BT Vendor/es.lproj/PriceChangerViewController_Landscape.strings @@ -10,3 +10,6 @@ /* Class = "IBUIButton"; normalTitle = "Done"; ObjectID = "ubO-fy-Tcd"; */ "ubO-fy-Tcd.normalTitle" = "Aceptar"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "Xdp-5C-5aA"; */ +"Xdp-5C-5aA.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/PriceChangerViewController_iPad.strings b/BT Vendor/es.lproj/PriceChangerViewController_iPad.strings index 4542d61..65495f5 100644 --- a/BT Vendor/es.lproj/PriceChangerViewController_iPad.strings +++ b/BT Vendor/es.lproj/PriceChangerViewController_iPad.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "Product Code"; ObjectID = "y0J-fk-3XQ"; */ "y0J-fk-3XQ.text" = "Código del Producto"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "84E-sg-9fV"; */ +"84E-sg-9fV.normalTitle" = "Cancelar"; \ No newline at end of file diff --git a/BT Vendor/es.lproj/PriceChangerViewController_iPad_Landscape.strings b/BT Vendor/es.lproj/PriceChangerViewController_iPad_Landscape.strings index ff00a19..ab67375 100644 --- a/BT Vendor/es.lproj/PriceChangerViewController_iPad_Landscape.strings +++ b/BT Vendor/es.lproj/PriceChangerViewController_iPad_Landscape.strings @@ -10,3 +10,6 @@ /* Class = "IBUILabel"; text = "Channel"; ObjectID = "z9V-5B-LtD"; */ "z9V-5B-LtD.text" = "Canal"; + +/* Class = "IBUIButton"; normalTitle = "Cancel"; ObjectID = "8TX-z3-YGe"; */ +"8TX-z3-YGe.normalTitle" = "Cancelar"; \ No newline at end of file