From cd9f3184c2ea5f18339477cfd476f549a18d0d2c Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Tue, 12 Aug 2014 16:03:31 +0000 Subject: [PATCH] --- DUREX Vendor Control/Base.lproj/Localizable.strings | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/Base.lproj/back_arrow.png | Bin 0 -> 5372 bytes DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 71672 -> 0 bytes DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib | 42 ++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m | 4 ++-- DUREX Vendor Control/InitialViewController.h | 2 ++ DUREX Vendor Control/InitialViewController.m | 1 + DUREX Vendor Control/MenuTableViewController.h | 6 +++--- DUREX Vendor Control/MenuTableViewController.m | 12 +++++------- DUREX tests/Base.lproj/Localizable.strings | 33 ++++++++++++++++++++++++++++++++- DUREX tests/Base.lproj/MainStoryboard.storyboard | 9 +++++---- DUREX tests/DUREX test.xcodeproj/project.pbxproj | 42 ++++++++++++++++++++++++++++++------------ DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 161331 -> 0 bytes DUREX tests/InitialViewController.h | 1 + DUREX tests/InitialViewController.m | 1 + DUREX tests/MenuTableViewController.h | 2 +- DUREX tests/MenuTableViewController.m | 8 ++++---- DUREX tests/es.lproj/Localizable.strings | 33 ++++++++++++++++++++++++++++++++- DUREX/.project | 36 ------------------------------------ DUREX/DUREX-Prog.c | 92 -------------------------------------------------------------------------------------------- DUREX/DUREX.ems | 16 ---------------- DUREX/Em/DUREX-STUBS.c | 46 ---------------------------------------------- DUREX/Em/DUREX.c | 540 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ DUREX/Em/DUREX.h | 68 -------------------------------------------------------------------- DUREX/Em/Em_Message.h | 182 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- DUREX/Em/Em_Types.h | 17 ----------------- DUREX/Em/durex.json | 247 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- DUREX/Output/DUREX-Prog.hex | 150 ------------------------------------------------------------------------------------------------------------------------------------------------------ DUREX/Output/DUREX-Prog.map | 821 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- DUREX/Output/DUREX-Prog.obj | Bin 10020 -> 0 bytes DUREX/Output/DUREX-Prog.out | Bin 29694 -> 0 bytes DUREX/Output/DUREX.obj | Bin 26660 -> 0 bytes DUREX/Output/Hal.obj | Bin 25228 -> 0 bytes DUREX/Schema-Imports/system@emmoco.com/System.ems | 72 ------------------------------------------------------------------------ DUREX/bundle.properties | 10 ---------- DUREX/makefile | 4 ---- 38 files changed, 457 insertions(+), 2355 deletions(-) create mode 100644 DUREX Vendor Control/Base.lproj/Localizable.strings create mode 100644 DUREX Vendor Control/Base.lproj/back_arrow.png create mode 100644 DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib create mode 100644 DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard delete mode 100644 DUREX/.project delete mode 100644 DUREX/DUREX-Prog.c delete mode 100644 DUREX/DUREX.ems delete mode 100644 DUREX/Em/DUREX-STUBS.c delete mode 100644 DUREX/Em/DUREX.c delete mode 100644 DUREX/Em/DUREX.h delete mode 100644 DUREX/Em/Em_Message.h delete mode 100644 DUREX/Em/Em_Types.h delete mode 100644 DUREX/Em/durex.json delete mode 100644 DUREX/Output/DUREX-Prog.hex delete mode 100644 DUREX/Output/DUREX-Prog.map delete mode 100644 DUREX/Output/DUREX-Prog.obj delete mode 100755 DUREX/Output/DUREX-Prog.out delete mode 100644 DUREX/Output/DUREX.obj delete mode 100644 DUREX/Output/Hal.obj delete mode 100644 DUREX/Schema-Imports/system@emmoco.com/System.ems delete mode 100644 DUREX/bundle.properties delete mode 100644 DUREX/makefile diff --git a/DUREX Vendor Control/Base.lproj/Localizable.strings b/DUREX Vendor Control/Base.lproj/Localizable.strings new file mode 100644 index 0000000..8c7bf12 --- /dev/null +++ b/DUREX Vendor Control/Base.lproj/Localizable.strings @@ -0,0 +1,48 @@ +/* + Localizable.strings + DUREX test + + Created by Imanol Barba on 8/11/14. + Copyright (c) 2014 Emmoco. All rights reserved. +*/ + +"PIECE OF CRAP 2000 PRO ULTRA" = "PIECE OF CRAP 2000 PRO ULTRA"; +"FUCKING ONLINE" = "FUCKING ONLINE"; +"Maintenance" = "Maintenance"; +"Basic Configuration" = "Basic Configuration"; +"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"; +"Sales log" = "Sales log"; +"Incident report" = "Incident report"; +"Send report" = "Send report"; +"Communication error" = "Communication error"; +"Error while trying to connect to the device" = "Error while trying to connect to the device"; +"Signal Strength: %0.0f" = "Signal Strength: %0.0f"; +"Searching for devices..." = "Searching for devices..."; +"Connection Failed" = "Connection Failed"; +"An error occurred while trying to connect to the selected device" = "An error occurred while trying to connect to the selected device"; +"Close" = "Close"; \ No newline at end of file diff --git a/DUREX Vendor Control/Base.lproj/back_arrow.png b/DUREX Vendor Control/Base.lproj/back_arrow.png new file mode 100644 index 0000000..02b7278 Binary files /dev/null and b/DUREX Vendor Control/Base.lproj/back_arrow.png differ diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj index 43ce32f..53e8b52 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj @@ -16,18 +16,18 @@ 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 */; }; - 34AAB884189804FF0019860D /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB878189804FF0019860D /* EMConnectingView.xib */; }; 34AAB885189804FF0019860D /* EMDevicePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */; }; 34AAB889189804FF0019860D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB880189804FF0019860D /* main.m */; }; - 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB881189804FF0019860D /* MainStoryboard.storyboard */; }; 34AAB88D189805300019860D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34AAB88C189805300019860D /* Images.xcassets */; }; - F9127C8B19951B3500040C52 /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F9127C8A19951B3500040C52 /* back_arrow.png */; }; + F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F961D806199A5F1000E9282C /* MainStoryboard.storyboard */; }; + F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = F961D80E199A5F2D00E9282C /* back_arrow.png */; }; + F961D816199A5FA000E9282C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F961D814199A5FA000E9282C /* Localizable.strings */; }; + F961D819199A711300E9282C /* EMConnectingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F961D81B199A711300E9282C /* EMConnectingView.xib */; }; F98356D6192E835F00EA6821 /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356D5192E835F00EA6821 /* InitialViewController.m */; }; F98356D8192E906600EA6821 /* bluetooth.png in Resources */ = {isa = PBXBuildFile; fileRef = F98356D7192E906600EA6821 /* bluetooth.png */; }; F98356DB192EAFD400EA6821 /* CommunicationProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */; }; F98356E1192EC84700EA6821 /* MenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356E0192EC84700EA6821 /* MenuTableViewController.m */; }; F9A8EF7C192FE201009E7532 /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A8EF7B192FE201009E7532 /* Stack.m */; }; - F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4C192CDE18002DBE8A /* InfoPlist.strings */; }; F9C77F50192CDE30002DBE8A /* durex.json in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4F192CDE30002DBE8A /* durex.json */; }; /* End PBXBuildFile section */ @@ -66,15 +66,24 @@ 347186AB18070FAB00FA0FB2 /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; }; 34AAB876189804FF0019860D /* DUREXAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DUREXAppDelegate.h; path = FirstAppExample/DUREXAppDelegate.h; sourceTree = SOURCE_ROOT; }; 34AAB877189804FF0019860D /* DUREXAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DUREXAppDelegate.m; path = FirstAppExample/DUREXAppDelegate.m; sourceTree = SOURCE_ROOT; }; - 34AAB878189804FF0019860D /* EMConnectingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = EMConnectingView.xib; path = FirstAppExample/EMConnectingView.xib; sourceTree = SOURCE_ROOT; }; 34AAB879189804FF0019860D /* EMDevicePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EMDevicePickerViewController.h; path = FirstAppExample/EMDevicePickerViewController.h; sourceTree = SOURCE_ROOT; }; 34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EMDevicePickerViewController.m; path = FirstAppExample/EMDevicePickerViewController.m; sourceTree = SOURCE_ROOT; }; 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "DUREX Vendor Control-Info.plist"; path = "FirstAppExample/DUREX Vendor Control-Info.plist"; sourceTree = SOURCE_ROOT; }; 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "DUREX Vendor Control-Prefix.pch"; path = "FirstAppExample/DUREX Vendor Control-Prefix.pch"; sourceTree = SOURCE_ROOT; }; 34AAB880189804FF0019860D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirstAppExample/main.m; sourceTree = SOURCE_ROOT; }; - 34AAB881189804FF0019860D /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = FirstAppExample/MainStoryboard.storyboard; sourceTree = SOURCE_ROOT; }; 34AAB88C189805300019860D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FirstAppExample/Images.xcassets; sourceTree = SOURCE_ROOT; }; - F9127C8A19951B3500040C52 /* back_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back_arrow.png; sourceTree = SOURCE_ROOT; }; + F961D807199A5F1800E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainStoryboard.storyboard; sourceTree = ""; }; + F961D809199A5F2200E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainStoryboard.strings; sourceTree = ""; }; + F961D80B199A5F2300E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainStoryboard.strings; sourceTree = ""; }; + F961D80D199A5F2D00E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Base; path = Base.lproj/back_arrow.png; sourceTree = ""; }; + F961D80F199A5F3100E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = en.lproj/back_arrow.png; sourceTree = ""; }; + F961D810199A5F3100E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = es; path = es.lproj/back_arrow.png; sourceTree = ""; }; + F961D815199A5FA000E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; + F961D817199A5FA300E9282C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; + F961D818199A5FA500E9282C /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; + F961D81A199A711300E9282C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView.xib; sourceTree = ""; }; + 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 = ""; }; F98356D4192E835F00EA6821 /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = SOURCE_ROOT; }; F98356D5192E835F00EA6821 /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = SOURCE_ROOT; }; F98356D7192E906600EA6821 /* bluetooth.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bluetooth.png; sourceTree = SOURCE_ROOT; }; @@ -84,7 +93,6 @@ F98356E0192EC84700EA6821 /* MenuTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuTableViewController.m; sourceTree = SOURCE_ROOT; }; 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; }; - F9C77F4D192CDE18002DBE8A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = FirstAppExample/en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; F9C77F4F192CDE30002DBE8A /* durex.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = durex.json; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -147,7 +155,8 @@ 3471866618070D9300FA0FB2 /* FirstApp */ = { isa = PBXGroup; children = ( - 34AAB881189804FF0019860D /* MainStoryboard.storyboard */, + F961D814199A5FA000E9282C /* Localizable.strings */, + F961D806199A5F1000E9282C /* MainStoryboard.storyboard */, 34AAB876189804FF0019860D /* DUREXAppDelegate.h */, 34AAB877189804FF0019860D /* DUREXAppDelegate.m */, F98356D4192E835F00EA6821 /* InitialViewController.h */, @@ -171,12 +180,11 @@ 3471866718070D9300FA0FB2 /* Supporting Files */ = { isa = PBXGroup; children = ( - F9127C8A19951B3500040C52 /* back_arrow.png */, + F961D80E199A5F2D00E9282C /* back_arrow.png */, F98356D7192E906600EA6821 /* bluetooth.png */, 34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */, 34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */, 34AAB880189804FF0019860D /* main.m */, - F9C77F4C192CDE18002DBE8A /* InfoPlist.strings */, ); name = "Supporting Files"; sourceTree = ""; @@ -215,7 +223,7 @@ 347186A718070F7F00FA0FB2 /* Device Picker */ = { isa = PBXGroup; children = ( - 34AAB878189804FF0019860D /* EMConnectingView.xib */, + F961D81B199A711300E9282C /* EMConnectingView.xib */, 34AAB879189804FF0019860D /* EMDevicePickerViewController.h */, 34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */, ); @@ -289,6 +297,8 @@ hasScannedForEncodings = 0; knownRegions = ( en, + es, + Base, ); mainGroup = 3471865418070D9300FA0FB2; productRefGroup = 3471865E18070D9300FA0FB2 /* Products */; @@ -307,12 +317,12 @@ buildActionMask = 2147483647; files = ( F98356D8192E906600EA6821 /* bluetooth.png in Resources */, - 34AAB884189804FF0019860D /* EMConnectingView.xib in Resources */, + F961D819199A711300E9282C /* EMConnectingView.xib in Resources */, F9C77F50192CDE30002DBE8A /* durex.json in Resources */, - F9C77F4E192CDE18002DBE8A /* InfoPlist.strings in Resources */, - F9127C8B19951B3500040C52 /* back_arrow.png in Resources */, + F961D80C199A5F2D00E9282C /* back_arrow.png in Resources */, + F961D816199A5FA000E9282C /* Localizable.strings in Resources */, 34AAB88D189805300019860D /* Images.xcassets in Resources */, - 34AAB88A189804FF0019860D /* MainStoryboard.storyboard in Resources */, + F961D804199A5F1000E9282C /* MainStoryboard.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -358,14 +368,48 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - F9C77F4C192CDE18002DBE8A /* InfoPlist.strings */ = { + F961D806199A5F1000E9282C /* MainStoryboard.storyboard */ = { isa = PBXVariantGroup; children = ( - F9C77F4D192CDE18002DBE8A /* en */, + F961D807199A5F1800E9282C /* Base */, + F961D809199A5F2200E9282C /* en */, + F961D80B199A5F2300E9282C /* es */, ); - name = InfoPlist.strings; + name = MainStoryboard.storyboard; + path = FirstAppExample; + sourceTree = SOURCE_ROOT; + }; + F961D80E199A5F2D00E9282C /* back_arrow.png */ = { + isa = PBXVariantGroup; + children = ( + F961D80D199A5F2D00E9282C /* Base */, + F961D80F199A5F3100E9282C /* en */, + F961D810199A5F3100E9282C /* es */, + ); + name = back_arrow.png; + sourceTree = SOURCE_ROOT; + }; + F961D814199A5FA000E9282C /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + F961D815199A5FA000E9282C /* Base */, + F961D817199A5FA300E9282C /* en */, + F961D818199A5FA500E9282C /* es */, + ); + name = Localizable.strings; sourceTree = ""; }; + F961D81B199A711300E9282C /* EMConnectingView.xib */ = { + isa = PBXVariantGroup; + children = ( + F961D81A199A711300E9282C /* Base */, + F961D81D199A711600E9282C /* en */, + F961D81F199A711700E9282C /* es */, + ); + name = EMConnectingView.xib; + path = FirstAppExample; + sourceTree = SOURCE_ROOT; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ 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 98b9a44..1b2b4a4 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/FirstAppExample/Base.lproj/EMConnectingView.xib b/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib new file mode 100644 index 0000000..7e84038 --- /dev/null +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/EMConnectingView.xib @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard new file mode 100644 index 0000000..dce227d --- /dev/null +++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m index 1a457e1..6606263 100644 --- a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m +++ b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m @@ -87,7 +87,7 @@ if (description) { [[deviceCell textLabel] setText:[description name]]; - [[deviceCell detailTextLabel] setText:[NSString stringWithFormat:@"Signal Strength: %0.0f", [description signalStrength]]]; + [[deviceCell detailTextLabel] setText:[NSString stringWithFormat:NSLocalizedString(@"Signal Strength: %0.0f",nil), [description signalStrength]]]; } else { @@ -100,7 +100,7 @@ -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if([[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:@"Searching for devices..."]) + if([[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:NSLocalizedString(@"Searching for devices...",nil)]) { return; } diff --git a/DUREX Vendor Control/InitialViewController.h b/DUREX Vendor Control/InitialViewController.h index 2078d07..20a1562 100644 --- a/DUREX Vendor Control/InitialViewController.h +++ b/DUREX Vendor Control/InitialViewController.h @@ -11,7 +11,9 @@ @interface InitialViewController : UIViewController @property (nonatomic,strong) IBOutlet UIButton *connectButton; +@property (nonatomic,strong) IBOutlet UILabel *label; - (IBAction) connectPressed:(UIButton*)button; + @end diff --git a/DUREX Vendor Control/InitialViewController.m b/DUREX Vendor Control/InitialViewController.m index eb24e0a..2fafbf9 100644 --- a/DUREX Vendor Control/InitialViewController.m +++ b/DUREX Vendor Control/InitialViewController.m @@ -27,6 +27,7 @@ { [super viewDidLoad]; // Do any additional setup after loading the view. + [[self label] sizeToFit]; } - (void)didReceiveMemoryWarning diff --git a/DUREX Vendor Control/MenuTableViewController.h b/DUREX Vendor Control/MenuTableViewController.h index 91acfdf..a2861b2 100644 --- a/DUREX Vendor Control/MenuTableViewController.h +++ b/DUREX Vendor Control/MenuTableViewController.h @@ -17,9 +17,9 @@ #define MENU_CELLS_PER_SECTION num(3) #define MENU_HEADERS nil -#define MAINTENANCE_ELEMENTS @"Time",@"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"CPP_TABLE",@"1€ Change",@"50c Change" -#define MAINTENANCE_CELLS_PER_SECTION num(10),num(0) -#define MAINTENANCE_HEADERS @"Status",@"Sensors" +#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_HEADERS NSLocalizedString(@"Sensors", nil),NSLocalizedString(@"Commands", nil) #define CELL_IDENTIFIERS @"MenuCell",@"MaintenanceCell",@"ConfigCell",@"ReportCell" diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m index 5c543b1..67b2453 100644 --- a/DUREX Vendor Control/MenuTableViewController.m +++ b/DUREX Vendor Control/MenuTableViewController.m @@ -89,6 +89,7 @@ } else if([self currentNavLevel] == MAINTENANCE) { + [[self navigationItem] setTitle:NSLocalizedString(@"Maintenance", nil)]; [self setCurrentElements:[self maintenanceElements]]; [self setCurrentStructure:[self maintenanceStructure]]; [self setCurrentHeaders:[self maintenanceHeaders]]; @@ -142,9 +143,7 @@ backButton.frame = CGRectMake(0, 0, backImage.size.width/2, backImage.size.height/2); [backButton setImage:backImage forState:UIControlStateNormal]; - [backButton setTitle:@"Back" forState:UIControlStateNormal]; [backButton addTarget:self action:@selector(backButtonPressed:) forControlEvents:UIControlEventTouchUpInside]; - UIBarButtonItem *backBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; self.navigationItem.hidesBackButton = YES; @@ -159,7 +158,7 @@ [_protocol setMessageAvailable:false]; if(![_protocol establishConnection]) { - UIAlertView* alert = [[UIAlertView alloc] initWithTitle:@"Communication error" message:@"Error while trying to connect to the device." delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; + UIAlertView* alert = [[UIAlertView alloc] initWithTitle:@"Communication error" message:@"Error while trying to connect to the device" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil]; [alert show]; UIViewController *previous = [[[self navigationController] viewControllers] objectAtIndex:[[[self navigationController] viewControllers] count]-2]; [[self navigationController] popToViewController:previous animated:YES]; @@ -236,7 +235,7 @@ NSLog(@"Section: %ld Row: %ld",(long)[indexPath section],(long)[indexPath row]); [tableView deselectRowAtIndexPath:indexPath animated:YES]; NSString *cellName = [[[[self tableView] cellForRowAtIndexPath:indexPath]textLabel]text]; - if([cellName isEqualToString:@"Maintenance"]) + if([cellName isEqualToString:NSLocalizedString(@"Maintenance", nil)]) { NSLog(@"[MenuTableViewController.m]: Changing to navLevel: MAINTENANCE"); @@ -281,13 +280,12 @@ offset += [[[self currentStructure] objectAtIndex:i] unsignedCharValue]; } } - [[cell textLabel] setText:[[self currentElements] objectAtIndex:[indexPath row]+offset]]; + [[cell textLabel] setText:NSLocalizedString([[self currentElements] objectAtIndex:[indexPath row]+offset],nil)]; if([self currentNavLevel] == MAINTENANCE) { - NSLog(@"[MenuTableViewController.m]: Customizing cell for navLevel MAINTENANCE"); [[cell detailTextLabel] setText:@"VALUE"]; [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_checkmark"]]]; - if( [[[cell textLabel] text] isEqualToString:@"5€ Notes"]) + if( [[[cell textLabel] text] isEqualToString:NSLocalizedString(@"CH4 presence",nil)]) { [cell setAccessoryView: [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_delete"]]]; } diff --git a/DUREX tests/Base.lproj/Localizable.strings b/DUREX tests/Base.lproj/Localizable.strings index 1ac4d3d..4c4f4cd 100644 --- a/DUREX tests/Base.lproj/Localizable.strings +++ b/DUREX tests/Base.lproj/Localizable.strings @@ -7,4 +7,35 @@ */ "PIECE OF CRAP 2000 PRO ULTRA" = "PIECE OF CRAP 2000 PRO ULTRA"; -"FUCKING ONLINE" = "FUCKING ONLINE"; \ No newline at end of file +"FUCKING ONLINE" = "FUCKING ONLINE"; +"Maintenance" = "Maintenance"; +"Basic Configuration" = "Basic Configuration"; +"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"; +"Sales log" = "Sales log"; +"Incident report" = "Incident report"; +"Send report" = "Send report"; \ No newline at end of file diff --git a/DUREX tests/Base.lproj/MainStoryboard.storyboard b/DUREX tests/Base.lproj/MainStoryboard.storyboard index f10e59c..3628b38 100644 --- a/DUREX tests/Base.lproj/MainStoryboard.storyboard +++ b/DUREX tests/Base.lproj/MainStoryboard.storyboard @@ -1,5 +1,5 @@ - + @@ -152,8 +152,8 @@ -