make file type names more expressive; add menu separator under R Scri…

…pt doc type
rstudio · Mar 19, 2012 · d7c454a · d7c454a
1 parent 89200ba
commit d7c454a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java b/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
@@ -49,10 +49,10 @@ public GlobalToolbar(Commands commands,
       // add new source doc commands
       ToolbarPopupMenu newMenu = new ToolbarPopupMenu();
       newMenu.addItem(commands.newSourceDoc().createMenuItem(false));
+      newMenu.addSeparator();
       newMenu.addItem(commands.newSweaveDoc().createMenuItem(false));
 
       // dynamically add other commands
-      newMenu.addSeparator();
       ArrayList<FileTypeCommands.CommandWithId> fileNewCommands = 
                                        fileTypeCommands.commandsWithIds();
       for (FileTypeCommands.CommandWithId cmd : fileNewCommands)

diff --git a/src/gwt/src/org/rstudio/studio/client/common/filetypes/FileTypeCommands.java b/src/gwt/src/org/rstudio/studio/client/common/filetypes/FileTypeCommands.java
@@ -44,9 +44,9 @@ public FileTypeCommands(EventBus eventBus, Commands commands)
       eventBus_ = eventBus;
       commands_ = commands;
 
-      addType(FileTypeRegistry.TEXT);
-      addType(FileTypeRegistry.TEX);
-      addType(FileTypeRegistry.RD);
+      addType(FileTypeRegistry.TEXT, "_Text File");
+      addType(FileTypeRegistry.TEX, "Te_X Document");
+      addType(FileTypeRegistry.RD, "R _Documentation");
    }
 
 
@@ -55,10 +55,10 @@ public ArrayList<CommandWithId> commandsWithIds()
       return fileTypeCommands_;
    }
 
-   private void addType(final TextFileType fileType)
+   private void addType(final TextFileType fileType, String menuLabel)
    {
       AppCommand command = new AppCommand();
-      command.setMenuLabel(fileType.getLabel());
+      command.setMenuLabel(menuLabel);
       command.setImageResource(fileType.getDefaultIcon());
       command.addHandler(new CommandHandler()
       {

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
@@ -29,8 +29,8 @@ well as menu structures (for main menu and popup menus).
       <menu label="_File">
          <menu label="_New">
             <cmd refid="newSourceDoc"/>
-            <cmd refid="newSweaveDoc"/>
             <separator/>
+            <cmd refid="newSweaveDoc"/>
             <dynamic class="org.rstudio.studio.client.common.filetypes.NewFileMenu"/>
          </menu>
          <separator/>
@@ -382,7 +382,7 @@ well as menu structures (for main menu and popup menus).
         desc="Create a new R script"/>
 
    <cmd id="newSweaveDoc"
-        menuLabel="_Sweave"
+        menuLabel="_Sweave Document"
         desc="Create a new Sweave document"/>      
 
    <cmd id="openSourceDoc"