resolve: insert separator and update icon

rstudio · Jan 2, 2012 · bf3bd9f · bf3bd9f
1 parent 8a2bc3b
commit bf3bd9f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/commands/vcsResolve.png b/src/gwt/src/org/rstudio/studio/client/workbench/commands/vcsResolve.png
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/SVNPane.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/SVNPane.java
@@ -70,6 +70,7 @@ protected Toolbar createMainToolbar()
 
       moreMenu.addItem(commands_.vcsRevert().createMenuItem(false));
       moreMenu.addItem(commands_.vcsIgnore().createMenuItem(false));
+      moreMenu.addSeparator();
       moreMenu.addItem(commands_.vcsResolve().createMenuItem(false));
       moreMenu.addSeparator();
       moreMenu.addItem(commands_.vcsPull().createMenuItem(false));

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/dialog/SVNReviewPanel.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/svn/dialog/SVNReviewPanel.java
@@ -225,6 +225,7 @@ public SVNReviewPanel(SVNChangelistTablePresenter changelist,
       topToolbar_.addLeftSeparator();
       topToolbar_.addLeftWidget(commands.vcsRevert().createToolbarButton());
       topToolbar_.addLeftWidget(commands.vcsIgnore().createToolbarButton());
+      topToolbar_.addLeftSeparator();
       topToolbar_.addLeftWidget(commands.vcsResolve().createToolbarButton());
       topToolbar_.addLeftSeparator();
       topToolbar_.addLeftWidget(commands.vcsCommit().createToolbarButton());
@@ -418,6 +419,7 @@ public void showContextMenu(final int clientX,
       menu.addSeparator();
       menu.addItem(commands_.vcsRevert().createMenuItem(false));
       menu.addItem(commands_.vcsIgnore().createMenuItem(false));
+      menu.addSeparator();
       menu.addItem(commands_.vcsResolve().createMenuItem(false));
       menu.addSeparator();
       menu.addItem(commands_.vcsOpen().createMenuItem(false));