From 60bf0aab6f882c64f9d81788b59f2593d1af0c56 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Fri, 5 Sep 2014 08:51:57 +0000 Subject: [PATCH] --- DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib | 2 +- DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/Localizable.strings | 64 +++++++++++++++++++++++++++++++++++++++++----------------------- DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj | 136 ++++++++++++++++------------------------------------------------------------------------------------------------------------------------ DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 371346 -> 0 bytes DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 16 ++++++++++++++++ DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard | 4 ++-- DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m | 19 ++++++++++++------- DUREX Vendor Control/MenuTableViewController.h | 4 ++-- DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings | 3 +++ DUREX Vendor Control/en.lproj/Localizable.strings | 64 +++++++++++++++++++++++++++++++++++++++++----------------------- DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings | 3 +++ DUREX Vendor Control/es.lproj/Localizable.strings | 64 +++++++++++++++++++++++++++++++++++++++++----------------------- DUREX tests/Base.lproj/PriceChangerViewController.xib | 46 +++++++++++++++++++++++++++++++--------------- DUREX tests/DUREX test.xcodeproj/project.pbxproj | 4 ++-- DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 333355 -> 0 bytes TODO | 8 +++++++- 17 files changed, 268 insertions(+), 219 deletions(-) create mode 100644 DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib create mode 100644 DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings create mode 100644 DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib index 1e9fc6b..cca877e 100644 --- a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib +++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib @@ -1,5 +1,5 @@ - + diff --git a/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib new file mode 100644 index 0000000..517d5b8 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/Base.lproj/Localizable.strings b/DUREX Vendor Control/Base.lproj/Localizable.strings index 00b7d08..86c82c5 100644 --- a/DUREX Vendor Control/Base.lproj/Localizable.strings +++ b/DUREX Vendor Control/Base.lproj/Localizable.strings @@ -13,29 +13,47 @@ "Sending a Report" = "Sending a Report"; "Sensors" = "Sensors"; "Commands" = "Commands"; -"CH1 presence" = "CH1 presence"; -"CH2 presence" = "CH2 presence"; -"CH3 presence" = "CH3 presence"; -"CH4 presence" = "CH4 presence"; -"CH5 presence" = "CH5 presence"; -"CH6 presence" = "CH6 presence"; -"CH7 presence" = "CH7 presence"; -"CH8 presence" = "CH8 presence"; -"CH1 spin" = "CH1 spin"; -"CH2 spin" = "CH2 spin"; -"CH3 spin" = "CH3 spin"; -"CH4 spin" = "CH4 spin"; -"CH5 spin" = "CH5 spin"; -"CH6 spin" = "CH6 spin"; -"CH7 spin" = "CH7 spin"; -"CH8 spin" = "CH8 spin"; -"Door sensor" = "Door sensor"; -"Wall sensor" = "Wall sensor"; -"Oscillator" = "Oscillator"; -"1€ Coin presence" = "1€ Coin presence"; -"50c Coin presence" = "50c Coin presence"; -"1€ Coin spin" = "1€ Coin spin"; -"50c Coin spin" = "50c Coin spin"; +"Channels Present" = "Channels Present"; +"Channel 1" = "Channel 1"; +"Channel 2" = "Channel 2"; +"Channel 3" = "Channel 3"; +"Channel 4" = "Channel 4"; +"Channel 5" = "Channel 5"; +"Channel 6" = "Channel 6"; +"Channel 7" = "Channel 7"; +"Channel 8" = "Channel 8"; +"Channel 9" = "Channel 9"; +"Channel 10" = "Channel 10"; +"Channel 11" = "Channel 11"; +"Channel 12" = "Channel 12"; +"Channel 13" = "Channel 13"; +"Channel 14" = "Channel 14"; +"Channel 15" = "Channel 15"; +"Channel 16" = "Channel 16"; +"Product Present in Channel" = "Product Present in Channel"; +"Channel Engine Status" = "Channel Engine Status"; +"Door Sensor" = "Door Sensor"; +"Coil Sensor" = "Coil Sensor"; +"Money Collected" = "Money Collected"; +"Money Given" = "Money Given"; +"Products Sold" = "Products Sold"; +"Product 1" = "Product 1"; +"Product 2" = "Product 2"; +"Product 3" = "Product 3"; +"Product 4" = "Product 4"; +"Product 5" = "Product 5"; +"Product 6" = "Product 6"; +"Product 7" = "Product 7"; +"Product 8" = "Product 8"; +"Product 9" = "Product 9"; +"Product 10" = "Product 10"; +"Product 11" = "Product 11"; +"Product 12" = "Product 12"; +"Product 13" = "Product 13"; +"Product 14" = "Product 14"; +"Product 15" = "Product 15"; +"Product 16" = "Product 16"; +"Change Available" = "Change Available"; "Sales log" = "Sales log"; "Incident report" = "Incident report"; "Send report" = "Send report"; diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj index 04201f9..526a00a 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj @@ -10,9 +10,6 @@ 3471866118070D9300FA0FB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866018070D9300FA0FB2 /* Foundation.framework */; }; 3471866318070D9300FA0FB2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866218070D9300FA0FB2 /* CoreGraphics.framework */; }; 3471866518070D9300FA0FB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866418070D9300FA0FB2 /* UIKit.framework */; }; - 3471867A18070D9300FA0FB2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471867918070D9300FA0FB2 /* XCTest.framework */; }; - 3471867B18070D9300FA0FB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866018070D9300FA0FB2 /* Foundation.framework */; }; - 3471867C18070D9300FA0FB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866418070D9300FA0FB2 /* UIKit.framework */; }; 347186A618070E7200FA0FB2 /* libEMFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 347186A518070E7200FA0FB2 /* libEMFramework.a */; }; 347186AC18070FAB00FA0FB2 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347186AB18070FAB00FA0FB2 /* CoreBluetooth.framework */; }; 34AAB883189804FF0019860D /* DUREXAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB877189804FF0019860D /* DUREXAppDelegate.m */; }; @@ -40,24 +37,14 @@ F98356E1192EC84700EA6821 /* MenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356E0192EC84700EA6821 /* MenuTableViewController.m */; }; F9A8EF7C192FE201009E7532 /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A8EF7B192FE201009E7532 /* Stack.m */; }; F9C77F50192CDE30002DBE8A /* system.json in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4F192CDE30002DBE8A /* system.json */; }; + F9E4D8FD19B8FD32009A7359 /* EMConnectingView_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 3471867D18070D9300FA0FB2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 3471865518070D9300FA0FB2 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3471865C18070D9300FA0FB2; - remoteInfo = TestAppExample; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DUREX Vendor Control.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 3471866018070D9300FA0FB2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 3471866218070D9300FA0FB2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 3471866418070D9300FA0FB2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "DUREX Vendor ControlTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 3471867918070D9300FA0FB2 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 3471869118070E6500FA0FB2 /* EMBluetoothLowEnergyConnectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMBluetoothLowEnergyConnectionType.h; sourceTree = ""; }; 3471869218070E6500FA0FB2 /* EMChecksum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMChecksum.h; sourceTree = ""; }; @@ -131,6 +118,9 @@ 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; }; F9C77F4F192CDE30002DBE8A /* system.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = system.json; sourceTree = SOURCE_ROOT; }; + F9E4D8FE19B8FD32009A7359 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_iPad.xib; sourceTree = ""; }; + F9E4D90119B8FD36009A7359 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_iPad.strings; sourceTree = ""; }; + F9E4D90319B8FD37009A7359 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_iPad.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -146,16 +136,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3471867518070D9300FA0FB2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3471867A18070D9300FA0FB2 /* XCTest.framework in Frameworks */, - 3471867C18070D9300FA0FB2 /* UIKit.framework in Frameworks */, - 3471867B18070D9300FA0FB2 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -172,7 +152,6 @@ isa = PBXGroup; children = ( 3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */, - 3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */, ); name = Products; sourceTree = ""; @@ -258,6 +237,7 @@ isa = PBXGroup; children = ( F961D81B199A711300E9282C /* EMConnectingView.xib */, + F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */, 34AAB879189804FF0019860D /* EMDevicePickerViewController.h */, 34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */, ); @@ -334,24 +314,6 @@ productReference = 3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */; productType = "com.apple.product-type.application"; }; - 3471867718070D9300FA0FB2 /* DUREX Vendor ControlTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3471868C18070D9300FA0FB2 /* Build configuration list for PBXNativeTarget "DUREX Vendor ControlTests" */; - buildPhases = ( - 3471867418070D9300FA0FB2 /* Sources */, - 3471867518070D9300FA0FB2 /* Frameworks */, - 3471867618070D9300FA0FB2 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 3471867E18070D9300FA0FB2 /* PBXTargetDependency */, - ); - name = "DUREX Vendor ControlTests"; - productName = TestAppExampleTests; - productReference = 3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -361,11 +323,6 @@ CLASSPREFIX = EM; LastUpgradeCheck = 0510; ORGANIZATIONNAME = Emmoco; - TargetAttributes = { - 3471867718070D9300FA0FB2 = { - TestTargetID = 3471865C18070D9300FA0FB2; - }; - }; }; buildConfigurationList = 3471865818070D9300FA0FB2 /* Build configuration list for PBXProject "DUREX Vendor Control" */; compatibilityVersion = "Xcode 3.2"; @@ -382,7 +339,6 @@ projectRoot = ""; targets = ( 3471865C18070D9300FA0FB2 /* DUREX Vendor Control */, - 3471867718070D9300FA0FB2 /* DUREX Vendor ControlTests */, ); }; /* End PBXProject section */ @@ -394,6 +350,7 @@ files = ( F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */, F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */, + F9E4D8FD19B8FD32009A7359 /* EMConnectingView_iPad.xib in Resources */, F98356D8192E906600EA6821 /* bluetooth.png in Resources */, F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */, F961D819199A711300E9282C /* EMConnectingView.xib in Resources */, @@ -410,13 +367,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3471867618070D9300FA0FB2 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -437,23 +387,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3471867418070D9300FA0FB2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 3471867E18070D9300FA0FB2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3471865C18070D9300FA0FB2 /* DUREX Vendor Control */; - targetProxy = 3471867D18070D9300FA0FB2 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ F9015D9219B73052006C7882 /* DatePickerViewController.xib */ = { isa = PBXVariantGroup; @@ -557,6 +492,16 @@ path = FirstAppExample; sourceTree = SOURCE_ROOT; }; + F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */ = { + isa = PBXVariantGroup; + children = ( + F9E4D8FE19B8FD32009A7359 /* Base */, + F9E4D90119B8FD36009A7359 /* en */, + F9E4D90319B8FD37009A7359 /* es */, + ); + name = EMConnectingView_iPad.xib; + sourceTree = SOURCE_ROOT; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -672,46 +617,6 @@ }; name = Release; }; - 3471868D18070D9300FA0FB2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestAppExample.app/TestAppExample"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TestAppExample/TestAppExample-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "TestAppExampleTests/FirstAppTests-Info.plist"; - PRODUCT_NAME = "DUREX Vendor ControlTests"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Debug; - }; - 3471868E18070D9300FA0FB2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestAppExample.app/TestAppExample"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "TestAppExample/TestAppExample-Prefix.pch"; - INFOPLIST_FILE = "TestAppExampleTests/FirstAppTests-Info.plist"; - PRODUCT_NAME = "DUREX Vendor ControlTests"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -733,15 +638,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3471868C18070D9300FA0FB2 /* Build configuration list for PBXNativeTarget "DUREX Vendor ControlTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3471868D18070D9300FA0FB2 /* Debug */, - 3471868E18070D9300FA0FB2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 3471865518070D9300FA0FB2 /* Project object */; diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 55262bd..ff10a1a 100644 Binary files a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 7fb0acc..82b8f96 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -67,5 +67,21 @@ landmarkType = "5"> + + + + diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard index 6353a0f..aa6cdb3 100644 --- a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard @@ -1,5 +1,5 @@ - + @@ -7,6 +7,7 @@ + @@ -48,7 +49,6 @@ - diff --git a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m index 53bdff0..4b0eec2 100644 --- a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m +++ b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m @@ -20,6 +20,7 @@ @implementation EMDevicePickerViewController + - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; @@ -33,24 +34,28 @@ - (void)viewDidLoad { [super viewDidLoad]; - [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil]; - [[[self popoverView] layer] setCornerRadius:10.0f]; - [[self connectingView] setHidden:YES]; - [[self connectingView] setFrame:[[self view] bounds]]; - [[self view] addSubview:[self connectingView]]; [[EMConnectionListManager sharedManager] addObserver:self forKeyPath:@"devices" options:0 context:NULL]; } -(void)_showConnectingView { + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_iPad" owner:self options:nil]; + } + else + { + [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil]; + } + [[[self popoverView] layer] setCornerRadius:10.0f]; + [[self view] addSubview:[self connectingView]]; [[self activityIndicator] startAnimating]; - [[self connectingView] setHidden:NO]; } -(void)_hideConnectingView { [[self activityIndicator] stopAnimating]; - [[self connectingView] setHidden:YES]; + [[self connectingView] removeFromSuperview]; } -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context diff --git a/DUREX Vendor Control/MenuTableViewController.h b/DUREX Vendor Control/MenuTableViewController.h index c2bd8fc..167525e 100644 --- a/DUREX Vendor Control/MenuTableViewController.h +++ b/DUREX Vendor Control/MenuTableViewController.h @@ -20,8 +20,8 @@ #define MENU_CELLS_PER_SECTION num(3) #define MENU_HEADERS nil -#define MAINTENANCE_ELEMENTS @"CH1 presence",@"CH2 presence",@"CH3 presence",@"CH4 presence",@"CH5 presence",@"CH6 presence",@"CH7 presence",@"CH8 presence",@"CH1 spin",@"CH2 spin",@"CH3 spin",@"CH4 spin",@"CH5 spin",@"CH6 spin",@"CH7 spin",@"CH8 spin",@"Door sensor",@"Wall sensor",@"Oscillator",@"1€ Coin presence",@"50c Coin presence",@"1€ Coin spin",@"50c Coin spin",@"Sales log",@"Incident report",@"Send report" -#define MAINTENANCE_CELLS_PER_SECTION num(23),num(3) +#define MAINTENANCE_ELEMENTS @"Channels Present",@"Product Present in Channel",@"Channel Engine Status",@"Door Sensor",@"Coil sensor",@"Money Collected",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Money given",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Products Sold",@"Change Available",@"1€ Coins",@"50c Coins",@"Sales log",@"Incident report",@"Send report" +#define MAINTENANCE_CELLS_PER_SECTION num(21),num(3) #define MAINTENANCE_HEADERS NSLocalizedString(@"Sensors", nil),NSLocalizedString(@"Commands", nil) #define SALES_ELEMENTS @"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change",@"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change",@"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change" diff --git a/DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings b/DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings new file mode 100644 index 0000000..e43e779 --- /dev/null +++ b/DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "ZWE-GZ-XAB"; */ +"ZWE-GZ-XAB.text" = "Connecting to device"; diff --git a/DUREX Vendor Control/en.lproj/Localizable.strings b/DUREX Vendor Control/en.lproj/Localizable.strings index 00b7d08..86c82c5 100644 --- a/DUREX Vendor Control/en.lproj/Localizable.strings +++ b/DUREX Vendor Control/en.lproj/Localizable.strings @@ -13,29 +13,47 @@ "Sending a Report" = "Sending a Report"; "Sensors" = "Sensors"; "Commands" = "Commands"; -"CH1 presence" = "CH1 presence"; -"CH2 presence" = "CH2 presence"; -"CH3 presence" = "CH3 presence"; -"CH4 presence" = "CH4 presence"; -"CH5 presence" = "CH5 presence"; -"CH6 presence" = "CH6 presence"; -"CH7 presence" = "CH7 presence"; -"CH8 presence" = "CH8 presence"; -"CH1 spin" = "CH1 spin"; -"CH2 spin" = "CH2 spin"; -"CH3 spin" = "CH3 spin"; -"CH4 spin" = "CH4 spin"; -"CH5 spin" = "CH5 spin"; -"CH6 spin" = "CH6 spin"; -"CH7 spin" = "CH7 spin"; -"CH8 spin" = "CH8 spin"; -"Door sensor" = "Door sensor"; -"Wall sensor" = "Wall sensor"; -"Oscillator" = "Oscillator"; -"1€ Coin presence" = "1€ Coin presence"; -"50c Coin presence" = "50c Coin presence"; -"1€ Coin spin" = "1€ Coin spin"; -"50c Coin spin" = "50c Coin spin"; +"Channels Present" = "Channels Present"; +"Channel 1" = "Channel 1"; +"Channel 2" = "Channel 2"; +"Channel 3" = "Channel 3"; +"Channel 4" = "Channel 4"; +"Channel 5" = "Channel 5"; +"Channel 6" = "Channel 6"; +"Channel 7" = "Channel 7"; +"Channel 8" = "Channel 8"; +"Channel 9" = "Channel 9"; +"Channel 10" = "Channel 10"; +"Channel 11" = "Channel 11"; +"Channel 12" = "Channel 12"; +"Channel 13" = "Channel 13"; +"Channel 14" = "Channel 14"; +"Channel 15" = "Channel 15"; +"Channel 16" = "Channel 16"; +"Product Present in Channel" = "Product Present in Channel"; +"Channel Engine Status" = "Channel Engine Status"; +"Door Sensor" = "Door Sensor"; +"Coil Sensor" = "Coil Sensor"; +"Money Collected" = "Money Collected"; +"Money Given" = "Money Given"; +"Products Sold" = "Products Sold"; +"Product 1" = "Product 1"; +"Product 2" = "Product 2"; +"Product 3" = "Product 3"; +"Product 4" = "Product 4"; +"Product 5" = "Product 5"; +"Product 6" = "Product 6"; +"Product 7" = "Product 7"; +"Product 8" = "Product 8"; +"Product 9" = "Product 9"; +"Product 10" = "Product 10"; +"Product 11" = "Product 11"; +"Product 12" = "Product 12"; +"Product 13" = "Product 13"; +"Product 14" = "Product 14"; +"Product 15" = "Product 15"; +"Product 16" = "Product 16"; +"Change Available" = "Change Available"; "Sales log" = "Sales log"; "Incident report" = "Incident report"; "Send report" = "Send report"; diff --git a/DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings b/DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings new file mode 100644 index 0000000..11926a4 --- /dev/null +++ b/DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings @@ -0,0 +1,3 @@ + +/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "ZWE-GZ-XAB"; */ +"ZWE-GZ-XAB.text" = "Realizando conexión"; diff --git a/DUREX Vendor Control/es.lproj/Localizable.strings b/DUREX Vendor Control/es.lproj/Localizable.strings index 18a3250..131174b 100644 --- a/DUREX Vendor Control/es.lproj/Localizable.strings +++ b/DUREX Vendor Control/es.lproj/Localizable.strings @@ -13,29 +13,47 @@ "Sending a Report" = "Mandar un Informe"; "Sensors" = "Sensores"; "Commands" = "Comandos"; -"CH1 presence" = "Presencia CH1"; -"CH2 presence" = "Presencia CH2"; -"CH3 presence" = "Presencia CH3"; -"CH4 presence" = "Presencia CH4"; -"CH5 presence" = "Presencia CH5"; -"CH6 presence" = "Presencia CH6"; -"CH7 presence" = "Presencia CH7"; -"CH8 presence" = "Presencia CH8"; -"CH1 spin" = "Giro CH1"; -"CH2 spin" = "Giro CH2"; -"CH3 spin" = "Giro CH3"; -"CH4 spin" = "Giro CH4"; -"CH5 spin" = "Giro CH5"; -"CH6 spin" = "Giro CH6"; -"CH7 spin" = "Giro CH7"; -"CH8 spin" = "Giro CH8"; -"Door sensor" = "Sensor de puerta"; -"Wall sensor" = "Sensor de pared"; -"Oscillator" = "Oscilador"; -"1€ Coin presence" = "Presencia 1€"; -"50c Coin presence" = "Presencia 50c"; -"1€ Coin spin" = "Giro 1€"; -"50c Coin spin" = "Giro 50c"; +"Channels Present" = "Canales presentes"; +"Channel 1" = "Canal 1"; +"Channel 2" = "Canal 2"; +"Channel 3" = "Canal 3"; +"Channel 4" = "Canal 4"; +"Channel 5" = "Canal 5"; +"Channel 6" = "Canal 6"; +"Channel 7" = "Canal 7"; +"Channel 8" = "Canal 8"; +"Channel 9" = "Canal 9"; +"Channel 10" = "Canal 10"; +"Channel 11" = "Canal 11"; +"Channel 12" = "Canal 12"; +"Channel 13" = "Canal 13"; +"Channel 14" = "Canal 14"; +"Channel 15" = "Canal 15"; +"Channel 16" = "Canal 16"; +"Product Present in Channel" = "Producto presente en el canal"; +"Channel Engine Status" = "Estado de los motores"; +"Door Sensor" = "Sensor de puerta"; +"Coil Sensor" = "Sensor de bobina"; +"Money Collected" = "Recaudación efectuada"; +"Money Given" = "Efectivo devuelto"; +"Products Sold" = "Productos vendidos"; +"Product 1" = "Producto 1"; +"Product 2" = "Producto 2"; +"Product 3" = "Producto 3"; +"Product 4" = "Producto 4"; +"Product 5" = "Producto 5"; +"Product 6" = "Producto 6"; +"Product 7" = "Producto 7"; +"Product 8" = "Producto 8"; +"Product 9" = "Producto 9"; +"Product 10" = "Producto 10"; +"Product 11" = "Producto 11"; +"Product 12" = "Producto 12"; +"Product 13" = "Producto 13"; +"Product 14" = "Producto 14"; +"Product 15" = "Producto 15"; +"Product 16" = "Producto 16"; +"Change Available" = "Cambio disponible"; "Sales log" = "Registro de ventas"; "Incident report" = "Registro de incidencias"; "Send report" = "Mandar informe"; diff --git a/DUREX tests/Base.lproj/PriceChangerViewController.xib b/DUREX tests/Base.lproj/PriceChangerViewController.xib index fbb1779..0473e5f 100644 --- a/DUREX tests/Base.lproj/PriceChangerViewController.xib +++ b/DUREX tests/Base.lproj/PriceChangerViewController.xib @@ -1,5 +1,5 @@ - + @@ -18,49 +18,58 @@ - - + + - + + + + - + + + + - + + + + -