Permalink
Browse files

Gold SDK and 720x720 screen size support

  • Loading branch information...
1 parent 1d8b1ea commit e320d858bff5c0efb5d95e608ecfa334ac089294 John Murray committed Feb 13, 2013
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -62,6 +62,11 @@
</dictionary>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.rim.tad.tools.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
@@ -1,25 +1,33 @@
eclipse.preferences.version=1
-environment/project/com.qnx.qcc.toolChain.1563233201/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1563233201/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1563233201/CPULIST/value=arm
-environment/project/com.qnx.qcc.toolChain.1563233201/VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1563233201/VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1563233201/VARIANTLIST/value=g
-environment/project/com.qnx.qcc.toolChain.1563233201/append=true
-environment/project/com.qnx.qcc.toolChain.1563233201/appendContributed=true
-environment/project/com.qnx.qcc.toolChain.1638397366/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1638397366/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1638397366/CPULIST/value=arm
-environment/project/com.qnx.qcc.toolChain.1638397366/EXCLUDE_VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.1638397366/EXCLUDE_VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.1638397366/EXCLUDE_VARIANTLIST/value=r
-environment/project/com.qnx.qcc.toolChain.1638397366/append=true
-environment/project/com.qnx.qcc.toolChain.1638397366/appendContributed=true
-environment/project/com.qnx.qcc.toolChain.917296279/CPULIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.917296279/CPULIST/operation=append
-environment/project/com.qnx.qcc.toolChain.917296279/CPULIST/value=x86
-environment/project/com.qnx.qcc.toolChain.917296279/VARIANTLIST/delimiter=,
-environment/project/com.qnx.qcc.toolChain.917296279/VARIANTLIST/operation=append
-environment/project/com.qnx.qcc.toolChain.917296279/VARIANTLIST/value=g
-environment/project/com.qnx.qcc.toolChain.917296279/append=true
-environment/project/com.qnx.qcc.toolChain.917296279/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.1351978988/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1351978988/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1351978988/CPULIST/value=x86
+environment/project/com.qnx.qcc.toolChain.1351978988/VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.1351978988/VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.1351978988/VARIANTLIST/value=g
+environment/project/com.qnx.qcc.toolChain.1351978988/append=true
+environment/project/com.qnx.qcc.toolChain.1351978988/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.774607819/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.774607819/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.774607819/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.774607819/EXCLUDE_VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.774607819/EXCLUDE_VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.774607819/EXCLUDE_VARIANTLIST/value=p
+environment/project/com.qnx.qcc.toolChain.774607819/append=true
+environment/project/com.qnx.qcc.toolChain.774607819/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.8764416/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.8764416/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.8764416/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.8764416/EXCLUDE_VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.8764416/EXCLUDE_VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.8764416/EXCLUDE_VARIANTLIST/value=r
+environment/project/com.qnx.qcc.toolChain.8764416/append=true
+environment/project/com.qnx.qcc.toolChain.8764416/appendContributed=true
+environment/project/com.qnx.qcc.toolChain.974394387/CPULIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.974394387/CPULIST/operation=append
+environment/project/com.qnx.qcc.toolChain.974394387/CPULIST/value=arm
+environment/project/com.qnx.qcc.toolChain.974394387/VARIANTLIST/delimiter=,
+environment/project/com.qnx.qcc.toolChain.974394387/VARIANTLIST/operation=append
+environment/project/com.qnx.qcc.toolChain.974394387/VARIANTLIST/value=g
+environment/project/com.qnx.qcc.toolChain.974394387/append=true
+environment/project/com.qnx.qcc.toolChain.974394387/appendContributed=true
View
@@ -1,35 +1,6 @@
QMAKE_TARGET = NfcToolLite
-QMAKE = $(QNX_HOST)/usr/bin/qmake
-TARGET = $(QMAKE_TARGET)
+PROJECT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
+I18N_DIR := $(PROJECT_DIR)/translations
+include mk/cs-base.mk
-all: Makefile $(QMAKE_TARGET)
-
-clean:
- $(MAKE) -C ./arm -f Makefile sureclean
- $(MAKE) -C ./x86 -f Makefile sureclean
-
-
-Makefile: FORCE
- $(QMAKE) -spec unsupported/blackberry-armv7le-qcc -o arm/Makefile $(QMAKE_TARGET).pro CONFIG+=device
- $(QMAKE) -spec unsupported/blackberry-x86-qcc -o x86/Makefile $(QMAKE_TARGET).pro CONFIG+=simulator
- $(MAKE) -C ./translations -f Makefile update release
-
-FORCE:
-
-$(QMAKE_TARGET): device simulator
-
-device:
- $(MAKE) -C ./arm -f Makefile all
-
-Device-Debug: Makefile
- $(MAKE) -C ./arm -f Makefile debug
-
-Device-Release: Makefile
- $(MAKE) -C ./arm -f Makefile release
-
-simulator:
- $(MAKE) -C ./x86 -f Makefile all
-
-Simulator-Debug: Makefile
- $(MAKE) -C ./x86 -f Makefile debug
@@ -1,51 +1,6 @@
-TEMPLATE = app
-TARGET = NfcToolLite
+APP_NAME = NfcToolLite
-CONFIG += qt warn_on debug_and_release cascades
-
-INCLUDEPATH += ../src
-SOURCES += ../src/*.cpp
-HEADERS += ../src/*.hpp ../src/*.h
+CONFIG += qt warn_on cascades10
LIBS += -lbps -lnfc -lnfc_bps -lQtNfcSubset -lbbsystem
-lupdate_inclusion {
- SOURCES += ../assets/*.qml
-}
-
-device {
- CONFIG(release, debug|release) {
- DESTDIR = o.le-v7
- }
- CONFIG(debug, debug|release) {
- DESTDIR = o.le-v7-g
- }
-}
-
-simulator {
- CONFIG(release, debug|release) {
- DESTDIR = o
- }
- CONFIG(debug, debug|release) {
- DESTDIR = o-g
- }
-}
-
-OBJECTS_DIR = $${DESTDIR}/.obj
-MOC_DIR = $${DESTDIR}/.moc
-RCC_DIR = $${DESTDIR}/.rcc
-UI_DIR = $${DESTDIR}/.ui
-
-suredelete.target = sureclean
-suredelete.commands = $(DEL_FILE) $${MOC_DIR}/*; $(DEL_FILE) $${RCC_DIR}/*; $(DEL_FILE) $${UI_DIR}/*
-suredelete.depends = distclean
-
-QMAKE_EXTRA_TARGETS += suredelete
-
-TRANSLATIONS = \
- $${TARGET}_en_GB.ts \
- $${TARGET}_fr.ts \
- $${TARGET}_it.ts \
- $${TARGET}_de.ts \
- $${TARGET}_es.ts \
- $${TARGET}.ts
-
+include(config.pri)
View
@@ -20,6 +20,7 @@ the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
**Release History**
+* **V1.1.0** - Changes for 720x720 screen format and latest Gold SDK
* **V1.0.1** - Addressed potential memory leak on dynamic and creation deletion of pages.
* **V1.0.0** - Inital version with functionality that covers many of the capabilities found in the original **NFC Tool** sample application.
@@ -29,8 +30,8 @@ None.
**Dependencies**
-1. BlackBerry Dev Alpha Beta 3 Device Software **10.0.9**
-1. BlackBerry 10 Native SDK **10.0.9**
+1. BlackBerry 10 Device Software **10.0.9**
+1. BlackBerry 10 Native SDK **10.0.9** (Gold)
**How to Build NfcToolLite**
@@ -42,8 +43,7 @@ If you don't want to build this sample application yourself we've included a
pre-build and signed BAR files for each version. You can find them in the
folder **"/installable-bar-files"** as follows:
-* **NfcToolLite-1\_0\_0\_7.bar** -- Signed BAR file for Version 1.0 (V1.0) of the application ( requires BlackBerry Dev Alpha Device Beta 3 Software 10.0.9 )
-* **NfcToolLite-1\_0\_1\_12.bar** -- Signed BAR file for Version 1.0.1 (V1.0.1) of the application ( requires BlackBerry Dev Alpha Device Beta 3 Software 10.0.9 )
+* **NfcToolLite-1\_1\_0\_68.bar** -- Signed BAR file for Version 1.1 (V1.1) of the application ( requires BlackBerry 10 Software 10.0.9 )
**To contribute code to this repository you must be [signed up as an
official contributor](http://blackberry.github.com/howToContribute.html).**
@@ -0,0 +1,152 @@
+/* Copyright (c) 2012 Research In Motion Limited.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+import bb.cascades 1.0
+import "common"
+
+Page {
+
+ content: MenuContainer {
+ onCreationCompleted: {
+ animation.play ();
+ }
+ Container {
+ preferredWidth: 720
+ preferredHeight: 720
+
+ layout: DockLayout {
+ }
+
+ Container {
+ layout: StackLayout {
+ }
+ topPadding: 5
+ leftPadding: 20
+ horizontalAlignment: HorizontalAlignment.Left
+ verticalAlignment: VerticalAlignment.Top
+
+ Label {
+ text: " Welcome to NFC Tool Lite V" + _propertyMap.AppVersion
+ textStyle {
+ base: SystemDefaults.TextStyles.TitleText
+ fontWeight: FontWeight.W100
+ color: Color.White
+ }
+ }
+
+ TextArea {
+ text: "Demonstrates the BlackBerry 10 NFC APIs"
+ enabled: false
+ editable: false
+ preferredWidth: 650
+ inputMode: TextAreaInputMode.Text
+ input.flags: TextInputFlag.SpellCheckOff
+ content.flags: TextContentFlag.ActiveTextOff | TextContentFlag.EmoticonsOff
+ textStyle {
+ base: SystemDefaults.TextStyles.BodyText
+ fontWeight: FontWeight.W100
+ fontStyle: FontStyle.Italic
+ color: Color.White
+ lineHeight: 1.1
+ }
+ }
+
+ ImageView {
+ layoutProperties: StackLayoutProperties {
+ }
+ imageSource: "asset:///images/generic_tag.png"
+ onTouch: {
+ if (event.isDown ()) {
+ animation.play ()
+ }
+ }
+ attachedObjects: [
+ SequentialAnimation {
+ id: animation
+ animations: [
+ FadeTransition {
+ duration: 1000
+ fromOpacity: 0.0
+ toOpacity: 1.0
+ },
+ RotateTransition {
+ toAngleZ: -10
+ duration: 125
+ },
+ RotateTransition {
+ toAngleZ: 10
+ duration: 250
+ },
+ RotateTransition {
+ toAngleZ: -10
+ duration: 250
+ },
+ RotateTransition {
+ toAngleZ: 10
+ duration: 250
+ },
+ RotateTransition {
+ toAngleZ: 0
+ duration: 125
+ }
+ ]
+ }
+ ]
+ }
+
+ TextArea {
+ text: "Written by:\nJohn Murray (@jcmrim)\nMartin Woolley (@mdwrim)"
+ enabled: false
+ editable: false
+ preferredWidth: 650
+ inputMode: TextAreaInputMode.Text
+ input.flags: TextInputFlag.SpellCheckOff
+ content.flags: TextContentFlag.ActiveTextOff | TextContentFlag.EmoticonsOff
+ textStyle {
+ base: SystemDefaults.TextStyles.BodyText
+ fontWeight: FontWeight.W100
+ fontStyle: FontStyle.Italic
+ color: Color.White
+ lineHeight: 1.1
+ }
+ }
+ }
+
+ Container {
+ layout: DockLayout {
+ }
+ leftPadding: 20
+ bottomPadding: 5
+ verticalAlignment: VerticalAlignment.Bottom
+ horizontalAlignment: HorizontalAlignment.Left
+
+ TextArea {
+ text: "NFC Tool Lite V" + _propertyMap.AppVersion + "\n© 2012 Research In Motion Limited."
+ enabled: false
+ editable: false
+ preferredWidth: 650
+ inputMode: TextAreaInputMode.Text
+ input.flags: TextInputFlag.SpellCheckOff
+ content.flags: TextContentFlag.ActiveTextOff | TextContentFlag.EmoticonsOff
+ textStyle {
+ base: SystemDefaults.TextStyles.SmallText
+ fontWeight: FontWeight.W100
+ fontStyle: FontStyle.Default
+ color: Color.White
+ }
+ }
+ }
+ }
+ }
+}
Oops, something went wrong.

0 comments on commit e320d85

Please sign in to comment.