From 830b011d94d728882286d72e129f7405134957c7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 1 Feb 2012 17:05:07 -0800
Subject: Updated color code in the PI to go through element mediator.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/data/pi/pi-data.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'js/data')

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index f162e919..748f19bb 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -23,13 +23,13 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             id : "colorStroke",
-                            prop: "border-color",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
-                            prop: "background-color",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             id : "colorStroke",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, {
                         {
                             type : "color",
                             id : "colorStroke",
-                            prop: "border-color",
+                            prop: "border",
                             label : "Stroke"
                         },
                         {
                             type : "color",
                             id : "colorFill",
-                            prop: "background-color",
+                            prop: "background",
                             divider : true
                         }
                     ],
@@ -279,10 +281,12 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
                             divider : true
                         }
@@ -387,11 +391,13 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
                             id : "fill",
+                            prop: "background",
                             visible : false,
                             divider : true
                         }
@@ -438,10 +444,12 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type : "color",
+                            prop: "border",
                             id : "stroke"
                         },
                         {
                             type : "color",
+                            prop: "background",
                             id : "fill",
                             divider : true
                         }
-- 
cgit v1.2.3


From 737169d194fc29c82ee784b561065f287e259f88 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 2 Feb 2012 15:35:27 -0800
Subject: Fixing keyboard shortcut and tooltip for hand and 3d tools.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/data/tools-data.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/data')

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 8ea84574..de965dbc 100644
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "rotate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Rotate3DTool",
-                "toolTip":      "3D Rotate Object Tool",
+                "toolTip":      "3D Rotate Object Tool (W)",
                 "cursor":       "auto",
                 "lastInGroup":  false,
                 "container":    false,
@@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "translate3DProperties",
                 "spriteSheet":  true,
                 "action":       "Translate3DTool",
-                "toolTip":      "3D Translate Object Tool",
+                "toolTip":      "3D Translate Object Tool (G)",
                 "cursor":       "auto",
                 "lastInGroup":  true,
                 "container":    false,
@@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "panProperties",
                 "spriteSheet":  true,
                 "action":       "PanTool",
-                "toolTip":      "Pan Tool",
+                "toolTip":      "Hand Tool (H)",
                 "cursor":       "url('images/tools/hand_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,
-- 
cgit v1.2.3