BB10.1 refresh

qingmai · Mar 25, 2013 · 4ed63df · 4ed63df
1 parent 6339c52
commit 4ed63df
Show file tree

Hide file tree

Showing 247 changed files with 2,544 additions and 1,452 deletions.
diff --git a/SensorDemo/assets/collisiondetector.qml b/SensorDemo/assets/collisiondetector.qml
@@ -18,6 +18,8 @@ import bb.multimedia 1.0
 import QtMobility.sensors 1.2
 
 Container {
+    bottomPadding: 20
+
     //! [0]
     attachedObjects: [
         SystemSound {
@@ -74,8 +76,7 @@ Container {
         text: qsTr("Reflectance: %1%").arg((irProximity.reflectance * 100).toPrecision(4))
         textStyle {
             base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            color: Color.White
         }
     }
 
@@ -89,7 +90,7 @@ Container {
         text: proximity.close ? qsTr("!! Mayday, Mayday !!") : qsTr("Cruising")
         textStyle {
             base: SystemDefaults.TextStyles.BigText
-            color: Color.Red
+            color: proximity.close ? Color.Red : Color.White
         }
 
         animations: [

diff --git a/SensorDemo/assets/compass.qml b/SensorDemo/assets/compass.qml
@@ -85,8 +85,7 @@ Container {
             text: qsTr("%1\u00B0").arg(compass.azimuth.toFixed())
             textStyle {
                 base: SystemDefaults.TextStyles.BodyText
-                color: Color.Yellow
-                fontWeight: FontWeight.Bold
+                color: Color.White
             }
         }
         //! [1]

diff --git a/SensorDemo/assets/flashlight.qml b/SensorDemo/assets/flashlight.qml
@@ -18,6 +18,10 @@ import QtMobility.sensors 1.2
 import Flashlight 1.0
 
 Container {
+    topPadding: 20
+    leftPadding: 20
+    rightPadding: 20
+
     //! [0]
     attachedObjects: [
         Flashlight {
@@ -148,9 +152,9 @@ Container {
         }
     }
 
-    Divider {}
-
     Label {
+        topMargin: 50
+
         text: qsTr("Gyro Threshold: %1").arg(gyroSlider.value.toFixed())
     }
 
@@ -167,9 +171,8 @@ Container {
 
         text: qsTr("Luminosity: %1 lux").arg(Math.round(light.val))
         textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            base: SystemDefaults.TextStyles.TitleText
+            color: Color.White
             lineHeight: 2
         }
     }

diff --git a/SensorDemo/assets/metalfinder.qml b/SensorDemo/assets/metalfinder.qml
@@ -18,6 +18,10 @@ import QtMobility.sensors 1.2
 import bb.vibrationController 1.0
 
 Container {
+    leftPadding: 20
+    rightPadding: 20
+    bottomPadding: 20
+
     //! [0]
     attachedObjects: [
         Magnetometer {
@@ -73,42 +77,51 @@ Container {
     }
     //! [1]
 
-    //! [2]
-    Label {
-        horizontalAlignment: HorizontalAlignment.Left
+    Container {
+        horizontalAlignment: HorizontalAlignment.Fill
         verticalAlignment: VerticalAlignment.Bottom
 
-        text: qsTr("X: %1").arg((metalfinder.x * 1000000).toPrecision(5))
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+        layout: StackLayout {
+            orientation: LayoutOrientation.LeftToRight
         }
-    }
-    //! [2]
 
-    Label {
-        horizontalAlignment: HorizontalAlignment.Center
-        verticalAlignment: VerticalAlignment.Bottom
+        //! [2]
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
 
-        text: qsTr("Y: %1").arg((metalfinder.y * 1000000).toPrecision(5))
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            text: qsTr("X: %1").arg((metalfinder.x * 1000000).toPrecision(5))
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
         }
-    }
+        //! [2]
 
-    Label {
-        horizontalAlignment: HorizontalAlignment.Right
-        verticalAlignment: VerticalAlignment.Bottom
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
 
-        text: qsTr("Z: %1").arg((metalfinder.z * 1000000).toPrecision(5))
+            text: qsTr("Y: %1").arg((metalfinder.y * 1000000).toPrecision(5))
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
+        }
 
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
+
+            text: qsTr("Z: %1").arg((metalfinder.z * 1000000).toPrecision(5))
+
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
         }
     }
 }
diff --git a/SensorDemo/assets/motionalarm.qml b/SensorDemo/assets/motionalarm.qml
@@ -18,6 +18,10 @@ import bb.multimedia 1.0
 import QtMobility.sensors 1.2
 
 Container {
+    leftPadding: 20
+    rightPadding: 20
+    bottomPadding: 20
+
     //! [0]
     attachedObjects: [
         SystemSound {
@@ -71,50 +75,59 @@ Container {
 
         text: alarm.movement ? qsTr("ALARM: Movement Detected!") : qsTr("No Movement Detected")
         textStyle {
-            base: SystemDefaults.TextStyles.BigText
-            color: alarm.movement ? Color.Red : Color.Green
+            base: SystemDefaults.TextStyles.TitleText
+            color: alarm.movement ? Color.Red : Color.White
         }
     }
     //! [1]
 
-    //! [2]
-    Label {
-        horizontalAlignment: HorizontalAlignment.Left
+    Container {
+        horizontalAlignment: HorizontalAlignment.Fill
         verticalAlignment: VerticalAlignment.Bottom
 
-        text: qsTr("X: %1").arg((alarm.x).toPrecision(5))
+        layout: StackLayout {
+            orientation: LayoutOrientation.LeftToRight
+        }
+
+        //! [2]
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
 
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            text: qsTr("X: %1").arg((alarm.x).toPrecision(5))
+
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
         }
-    }
-    //! [2]
+        //! [2]
 
-    Label {
-        horizontalAlignment: HorizontalAlignment.Center
-        verticalAlignment: VerticalAlignment.Bottom
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
 
-        text: qsTr("Y: %1").arg((alarm.y).toPrecision(5))
+            text: qsTr("Y: %1").arg((alarm.y).toPrecision(5))
 
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
         }
-    }
 
-    Label {
-        horizontalAlignment: HorizontalAlignment.Right
-        verticalAlignment: VerticalAlignment.Bottom
+        Label {
+            layoutProperties: StackLayoutProperties {
+                spaceQuota: 1
+            }
 
-        text: qsTr("Z: %1").arg((alarm.z).toPrecision(5))
+            text: qsTr("Z: %1").arg((alarm.z).toPrecision(5))
 
-        textStyle {
-            base: SystemDefaults.TextStyles.BodyText
-            color: Color.Yellow
-            fontWeight: FontWeight.Bold
+            textStyle {
+                base: SystemDefaults.TextStyles.BodyText
+                color: Color.White
+            }
         }
     }
 }
diff --git a/SensorDemo/assets/rotation3D.qml b/SensorDemo/assets/rotation3D.qml
@@ -68,8 +68,7 @@ Container {
             text: qsTr("%1\u00B0").arg(rotation.x.toPrecision(4))
             textStyle {
                 base: SystemDefaults.TextStyles.BodyText
-                color: Color.Yellow
-                fontWeight: FontWeight.Bold
+                color: Color.White
             }
         }
         //! [1]
@@ -83,8 +82,7 @@ Container {
             text: qsTr("%1\u00B0").arg(rotation.y.toPrecision(4))
             textStyle {
                 base: SystemDefaults.TextStyles.BodyText
-                color: Color.Yellow
-                fontWeight: FontWeight.Bold
+                color: Color.White
             }
         }
 
@@ -97,8 +95,7 @@ Container {
             text: qsTr("%1\u00B0").arg(rotation.z.toPrecision(4))
             textStyle {
                 base: SystemDefaults.TextStyles.BodyText
-                color: Color.Yellow
-                fontWeight: FontWeight.Bold
+                color: Color.White
             }
         }
     }

diff --git a/accelgame/assets/main.qml b/accelgame/assets/main.qml
@@ -47,7 +47,7 @@ Page {
                 preferredWidth: 600
 
                 layoutProperties: StackLayoutProperties {
-                    spaceQuota: 2
+                    spaceQuota: 7
                 }
 
                 layout: DockLayout {}

diff --git a/accelgame/icon.png b/accelgame/icon.png
diff --git a/accounts/assets/720x720/BackgroundImage.qml b/accounts/assets/720x720/BackgroundImage.qml
@@ -0,0 +1,20 @@
+/* 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
+
+ImageView {
+    imageSource: "asset:///images/background.amd"
+}
diff --git a/accounts/assets/720x720/images/background.amd b/accounts/assets/720x720/images/background.amd
@@ -0,0 +1,3 @@
+#RimCascadesAssetMetaData version=1.0
+source: "background.png"
+sliceMargins: 0 0 0 700
diff --git a/accounts/assets/720x720/images/background.png b/accounts/assets/720x720/images/background.png
diff --git a/accounts/assets/AccountEditor.qml b/accounts/assets/AccountEditor.qml
@@ -53,11 +53,9 @@ Page {
         layout: DockLayout {}
 
         // The background image
-        ImageView {
+        BackgroundImage {
             horizontalAlignment: HorizontalAlignment.Fill
             verticalAlignment: VerticalAlignment.Fill
-
-            imageSource: "asset:///images/background.png"
         }
 
         Container {

diff --git a/accounts/assets/AccountViewer.qml b/accounts/assets/AccountViewer.qml
@@ -26,11 +26,9 @@ Page {
         layout: DockLayout {}
 
         // The background image
-        ImageView {
+        BackgroundImage {
             horizontalAlignment: HorizontalAlignment.Fill
             verticalAlignment: VerticalAlignment.Fill
-
-            imageSource: "asset:///images/background.png"
         }
 
         //! [0]

diff --git a/accounts/assets/BackgroundImage.qml b/accounts/assets/BackgroundImage.qml
@@ -0,0 +1,20 @@
+/* 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
+
+ImageView {
+    imageSource: "asset:///images/background.png"
+}
diff --git a/accounts/assets/images/action_addaccount.png b/accounts/assets/images/action_addaccount.png
diff --git a/accounts/assets/images/action_editaccount.png b/accounts/assets/images/action_editaccount.png
diff --git a/accounts/assets/images/background.png b/accounts/assets/images/background.png
diff --git a/accounts/assets/main.qml b/accounts/assets/main.qml
@@ -26,11 +26,9 @@ NavigationPane {
             layout: DockLayout {}
 
             // The background image
-            ImageView {
+            BackgroundImage {
                 horizontalAlignment: HorizontalAlignment.Fill
                 verticalAlignment: VerticalAlignment.Fill
-
-                imageSource: "asset:///images/background.png"
             }
 
             Container {

diff --git a/accounts/bar-descriptor.xml b/accounts/bar-descriptor.xml
@@ -57,6 +57,7 @@
     <!--  Unique author ID assigned by signing authority. Required if using debug tokens. -->
     <!-- <authorId>ABC1234YjsnUk235h</authorId> -->
 
+    <cascadesTheme>bright</cascadesTheme>
     <initialWindow>
         <systemChrome>none</systemChrome>
         <transparent>false</transparent>

diff --git a/accounts/icon.png b/accounts/icon.png