From 543579f809f18f75b0567a39ed4a806a8c1acf8e Mon Sep 17 00:00:00 2001
From: JJ Allaire <jj@rstudio.org>
Date: Wed, 30 Jan 2013 11:00:39 -0500
Subject: [PATCH] learning full-screen command

---
 src/cpp/session/resources/learning/slides.js      |   9 ---------
 .../client/workbench/commands/Commands.cmd.xml    |   3 ++-
 .../client/workbench/commands/Commands.java       |   1 +
 .../workbench/commands/learningFullscreen.png     | Bin 0 -> 895 bytes
 .../workbench/views/learning/LearningPane.java    |  14 ++++++++++++++
 .../views/learning/LearningPresenter.java         |   7 +++++++
 6 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 src/gwt/src/org/rstudio/studio/client/workbench/commands/learningFullscreen.png

diff --git a/src/cpp/session/resources/learning/slides.js b/src/cpp/session/resources/learning/slides.js
index b6b3af0cdd5..3a9efd9c4f8 100644
--- a/src/cpp/session/resources/learning/slides.js
+++ b/src/cpp/session/resources/learning/slides.js
@@ -82,12 +82,3 @@ function revealEnterFullscreen() {
    }
 }
 
-// alt-click to zoom
-(function(){
-document.querySelector('.reveal').addEventListener('click', 
-                                                   function( event ) {
-   if (event.altKey) {
-	   event.preventDefault();
-	   revealEnterFullscreen();
-   }
-});
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
index e5ed8e7c01c..82b9e568912 100644
--- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
+++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.cmd.xml
@@ -907,7 +907,8 @@ well as menu structures (for main menu and popup menus).
    <!-- Learning -->
    <cmd id="refreshLearning"
         desc="Refresh the presentation"/>
-        
+   <cmd id="learningFullscreen"
+        desc="Show slides in full screen mode"/>     
      
    <cmd id="historySendToSource"
         menuLabel="Insert into _Source"
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
index a024d444f24..93fd66909f1 100644
--- a/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
+++ b/src/gwt/src/org/rstudio/studio/client/workbench/commands/Commands.java
@@ -159,6 +159,7 @@
    
    // Learning
    public abstract AppCommand refreshLearning();
+   public abstract AppCommand learningFullscreen();
    
    // View
    public abstract AppCommand showToolbar();
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/learningFullscreen.png b/src/gwt/src/org/rstudio/studio/client/workbench/commands/learningFullscreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..b45f9ec2f9707eba6e7c45d4c859717fa8ad28d9
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq000yK000sQ1^@s6ThRUx00009a7bBm000XU
z000XU0RWnu7ytkRF-b&0R5%fhlub+%K@`Vlce^bCS`KQYv10gCr~;<NP>eAlLLwww
zI2k<%Tue;7c;MziJs4=B9#o=u@C)@~IFO)?NC+RLRT2S7ly4AdYg?dn3+&g7GfTH=
z8>_xcXWqW|oBw<BrW8U5P!t9JVW|R8d>&zG;vLEB&ud|mYh<)F=nqr});CQ&FGRHI
zX_Fkc)Aj!Klb7DPDTs3tpj0Y_Zco@W{Ar+bC&F2e7Z-7bg?W)(8Gxyo`3#q9Eadb0
z-a6iNwrzSAv3CzjSah-~b?+V?ZQbTLYeUVMz`4ruQ1REUl9Q8NC00v$=zK%HPH)iH
zS*jcAaXewfT9OJ#tp@_trRE|o&t&9vbhIk0fWfH;joJK(iVDau%-JX`229yQe{jQ;
zpP##u-q%qIFi0_cd4)rGkFDp}g>gX9Wq7H=$S+Ez5b(Sh;gK3k5Q)Z%!d%otf?|Ow
z6_VTh_GA9&^yw=TG!8FtJ~flpyDM6zczg|xo}M6t@^a!adkszYDSO#mRqOt~aAbDb
zlNOS&OA;6WMP?VTXJ=-=j5}Qh1mOVwLi!Qy36}b&v9UK--Lu&&_0Chb3Z@4?g5sR)
zp+d7+&kMrbxXTs%>KrvhIBs~b`^94+vO&g%%p+7-$-uUz%BxjX6_=NnR;?b77hE@7
z0yTk|`xFgI5u&gXGy!FKV6gjnuMpW(VT#IRAl2Sfd8g85xwy2rddTbZ0k1DOVDFi(
zi<T7sD%3JnpHgxH(B5oo$I7lPEdJDb*1W*?YyHE+{*^|pRts5{CFLN!UXOU5N2{j8
z2)IV^IZCMtjBMh8l)c3UjmB(1U|wHftk-{_QKMlYqtQUEP6vUOCY^^Y4<wnQMW_+Q
zOhJ(PMzUnE^NuJ@1PX%y-h5CdZH2{omzdW9aK9*q#;;-TnJE8A2nl$$!}!}ekR(4u
zls|*c+;BJz+aUBvCJJM7c)S0`zMR_J{dYT`aawj)L(w#1X%<4nAcof931L7Q17!#V
z2}!KDgLG0B%#a)zTQUf}QWO%E>e#509{+OG#>aX@68>iK3P}=y#!kZP{|3b$@*6%I
VsK4g?b147-002ovPDHLkV1l2vnMwcv

literal 0
HcmV?d00001

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java
index 757b768a964..db10b699a39 100644
--- a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java
+++ b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPane.java
@@ -52,6 +52,8 @@ protected Toolbar createMainToolbar()
       titleLabel_ = new ToolbarLabel();
       toolbar.addLeftWidget(titleLabel_);
       
+      toolbar.addRightWidget(commands_.learningFullscreen().createToolbarButton());
+      toolbar.addRightSeparator();
       toolbar.addRightWidget(commands_.refreshLearning().createToolbarButton());
         
       return toolbar;
@@ -110,12 +112,24 @@ public boolean hasSlides()
       return !"about:blank".equals(href);
    }
    
+  
+   
    @Override
    public void refresh(boolean resetAnchor)
    {
       frame_.reload(resetAnchor);
    }
    
+   @Override
+   public void fullScreen()
+   {
+      enterFullscreen(frame_.getWindow());
+   }
+   
+   public static final native void enterFullscreen(WindowEx window) /*-{
+      return window.revealEnterFullscreen();
+   }-*/;
+   
    @Override
    public void next()
    {
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java
index 604db32da46..182bc5e6ca0 100644
--- a/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java
+++ b/src/gwt/src/org/rstudio/studio/client/workbench/views/learning/LearningPresenter.java
@@ -66,6 +66,7 @@ public interface Display extends WorkbenchView
       boolean hasSlides();
       void next();
       void prev();
+      void fullScreen();
       void refresh(boolean resetAnchor);
    }
    
@@ -142,6 +143,12 @@ public void onShowLearningPane(ShowLearningPaneEvent event)
       }
    }
    
+   @Handler
+   void onLearningFullscreen()
+   {
+      view_.fullScreen();
+   }
+   
    @Handler
    void onRefreshLearning()
    {