From 4900f2e6e346df18b1b5a2ac89da5019644ac98a Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 9 Apr 2012 16:47:35 -0700
Subject: adding a history panel

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/data/panels-data.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'js/data')

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7a2d817a..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
             open: true,
             modulePath: "js/panels/presets/content.reel",
             moduleName: "content"
+        },
+        {
+            name: "History",
+            minHeight: 100,
+            height: 100,
+            maxHeight: null,
+            flexible: true,
+            collapsed: true,
+            scrollable: true,
+            open: true,
+            modulePath: "js/panels/history-panel/history.reel",
+            moduleName: "History"
         }
     ]
     }
-- 
cgit v1.2.3


From fe2ea22983e29b1e99dabe883e773c4949d3d6e2 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 13 Apr 2012 12:23:00 -0700
Subject: IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb
 shortcuts for PaintBucket, InkBottle and Eyedropper 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 faf3336f..4d009530 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -151,7 +151,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "fillProperties",
                 "spriteSheet":  true,
                 "action":       "FillTool",
-                "toolTip":      "Fill Tool",
+                "toolTip":      "Paint Bucket Tool (K)",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
                 "lastInGroup":  false,
                 "container":    false,
@@ -162,7 +162,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "inkbottleProperties",
                 "spriteSheet":  true,
                 "action":       "InkBottleTool",
-                "toolTip":      "Ink Bottle Tool",
+                "toolTip":      "Ink Bottle Tool (K)",
                 "cursor":       "url('images/tools/inkbottle_down.png'), default",
                 "lastInGroup":  true,
                 "container":    false,
@@ -173,7 +173,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "properties":   "eyedropperProperties",
                 "spriteSheet":  true,
                 "action":       "EyedropperTool",
-                "toolTip":      "Eyedropper Tool",
+                "toolTip":      "Eyedropper Tool (I)",
                 "cursor":       "url('images/tools/eyedropper_down.png') 6 20, default",
                 "lastInGroup":  false,
                 "container":    false,
-- 
cgit v1.2.3