From 96ab2dd781848710096a420b32c408d492d9429d Mon Sep 17 00:00:00 2001
From: jdescottes <julian.descottes@gmail.com>
Date: Sun, 13 Sep 2015 23:07:22 +0200
Subject: [PATCH] Issue #305 : Add keyboard shortcut for native preview
 resolution

---
 src/css/style.css                            |  4 ++++
 src/css/toolbox-animated-preview.css         | 10 +++++++---
 src/css/tools.css                            |  4 ----
 src/js/service/keyboard/CheatsheetService.js |  1 +
 src/templates/drawing-tools.html             |  2 +-
 src/templates/preview.html                   |  2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/css/style.css b/src/css/style.css
index 2a0a53d1..d855d70f 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -55,3 +55,7 @@ body {
   vertical-align: -2px;
   margin-left: 0;
 }
+
+.tooltip-shortcut {
+  color:gold;
+}
\ No newline at end of file
diff --git a/src/css/toolbox-animated-preview.css b/src/css/toolbox-animated-preview.css
index 8ae14ff0..e8f3b0f3 100644
--- a/src/css/toolbox-animated-preview.css
+++ b/src/css/toolbox-animated-preview.css
@@ -104,18 +104,24 @@
 
   border: 2px solid white;
   background: rgba(0, 0, 0, 0.3);
-  color: #FFF;
+  color: white;
 
   font-size: 10px;
   font-weight: bold;
   font-family: Tahoma;
 }
 
+.real-size-preview-button:hover,
 .real-size-preview-button-enabled {
   color: gold;
   border-color: gold;
 }
 
+.real-size-preview-button-enabled:hover {
+  color: white;
+  border-color: white;
+}
+
 .preview-contextual-action {
   float: left;
 }
@@ -127,10 +133,8 @@
   border : 2px solid white;
   background-image: url(../img/popup-preview-arrow-white.png);
   background-color : rgba(0,0,0,0.3);
-
 }
 
-
 .open-popup-preview-button:hover {
   border-color: gold;
   background-image: url(../img/popup-preview-arrow-gold.png);
diff --git a/src/css/tools.css b/src/css/tools.css
index 7c262f12..c2a7be7c 100644
--- a/src/css/tools.css
+++ b/src/css/tools.css
@@ -251,10 +251,6 @@
   padding-bottom: 5px;
 }
 
-.tools-tooltip-shortcut {
-  color:gold;
-}
-
 .tools-tooltip-descriptor {
   color:#999;
 }
diff --git a/src/js/service/keyboard/CheatsheetService.js b/src/js/service/keyboard/CheatsheetService.js
index 396e9af6..86b6f2e9 100644
--- a/src/js/service/keyboard/CheatsheetService.js
+++ b/src/js/service/keyboard/CheatsheetService.js
@@ -77,6 +77,7 @@
     var descriptors = [
       this.toDescriptor_('0', 'Reset zoom level'),
       this.toDescriptor_('+/-', 'Zoom in/Zoom out'),
+      this.toDescriptor_('ctrl + 1', 'Toggle 1X preview size'),
       this.toDescriptor_('ctrl + Z', 'Undo'),
       this.toDescriptor_('ctrl + Y', 'Redo'),
       this.toDescriptor_('&#65514;', 'Select previous frame'), /* ASCII for up-arrow */
diff --git a/src/templates/drawing-tools.html b/src/templates/drawing-tools.html
index 20fb8290..08f4bbac 100644
--- a/src/templates/drawing-tools.html
+++ b/src/templates/drawing-tools.html
@@ -41,7 +41,7 @@
   <!-- Drawing tool tooltip container -->
   <script type="text/template" id="drawingTool-tooltipContainer-template">
     <div class='tools-tooltip-container'>
-      <div>{{helptext}} <span class='tools-tooltip-shortcut'>{{shortcut}}</span></div>
+      <div>{{helptext}} <span class='tooltip-shortcut'>{{shortcut}}</span></div>
       {{descriptors}}
     </div>
   </script>
diff --git a/src/templates/preview.html b/src/templates/preview.html
index 2ae967f8..a893c2ac 100644
--- a/src/templates/preview.html
+++ b/src/templates/preview.html
@@ -1,7 +1,7 @@
 <div id="animated-preview-container" class="preview-container">
   <div class="canvas-container-wrapper minimap-container">
     <div class="preview-contextual-actions">
-      <div class="preview-contextual-action  real-size-preview-button" title="Display preview in real size (1x)" rel="tooltip" data-placement="bottom">1x</div>
+      <div class="preview-contextual-action  real-size-preview-button" title="Toggle native (1x) resolution <span class='tooltip-shortcut'>(ctrl+1)</span>" rel="tooltip" data-placement="bottom">1x</div>
       <div class="preview-contextual-action  open-popup-preview-button" title="Open preview in popup" rel="tooltip" data-placement="bottom"></div>
     </div>