make shell feature conceptually part of vcs feature

rstudio · Dec 7, 2011 · c2fa2ad · c2fa2ad
1 parent 71ed991
commit c2fa2ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/Workbench.java b/src/gwt/src/org/rstudio/studio/client/workbench/Workbench.java
@@ -110,10 +110,7 @@ protected void performAction(boolean shouldSchedulePassive)
       };
 
       if (Desktop.isDesktop())
-      {
-         if (!BrowseCap.isWindows())
-            commands_.showShellDialog().setMenuLabel("Open Terminal");
-
+      {   
          if (BrowseCap.isWindows())
             commands_.showShellDialog().remove(); 
       }

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
@@ -222,11 +222,11 @@ well as menu structures (for main menu and popup menus).
             <separator/>
             <cmd refid="vcsCreateBranch"/>
             <separator/>
+            <cmd refid="showShellDialog"/>
+            <separator/>
             <cmd refid="versionControlProjectSetup"/>
          </menu>
          <separator/>
-         <cmd refid="showShellDialog"/>
-         <separator/>
          <cmd refid="showOptions"/>
       </menu>