1 files changed, 15 insertions, 15 deletions

diff --git a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
index 52d7164..dfb8400 100644
--- a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
+++ b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
@@ -1,4 +1,4 @@
-From 6c7733f8eca28ad8276c1e3d7236162bb0461d8f Mon Sep 17 00:00:00 2001
+From fdca633e307d4915fc99ba44c9bbc823b64c75a2 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 23:33:16 +0100
 Subject: [PATCH 5/7] Add version switcher widget to toolbar.
@@ -14,12 +14,12 @@ Subject: [PATCH 5/7] Add version switcher widget to toolbar.
  create mode 100644 src/gwt/src/org/rstudio/studio/client/application/ui/RVersionPopupMenu.java
 
 diff --git a/src/gwt/src/org/rstudio/core/client/ElementIds.java b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-index 4af0d49c82..8f3de94a97 100644
+index 531dfb43d8..36297de2a8 100644
 --- a/src/gwt/src/org/rstudio/core/client/ElementIds.java
 +++ b/src/gwt/src/org/rstudio/core/client/ElementIds.java
-@@ -384,6 +384,8 @@ public class ElementIds
-    public final static String PROJECT_MENUBUTTON_TOOLBAR_SUFFIX = "toolbar";
-    public final static String PROJECT_MENUBUTTON_MENUBAR_SUFFIX = "menubar";
+@@ -394,6 +394,8 @@ public class ElementIds
+    public final static String SIDEBAR_TOGGLE_BUTTON = "sidebar_toggle_button";
+    public final static String ASSISTANT_TOGGLE_BUTTON = "assistant_toggle_button";
  
 +   public final static String VERSION_MENUBUTTON = "version_menubutton";
 +
@@ -27,10 +27,10 @@ index 4af0d49c82..8f3de94a97 100644
     public final static String BUILD_MORE_MENUBUTTON = "build_more_menubutton";
     public final static String BUILD_BOOKDOWN_MENUBUTTON = "build_bookdown_menubutton";
 diff --git a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
-index 8d1a11014d..7422e2da56 100644
+index 91a398836b..5a082a0f03 100644
 --- a/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
 +++ b/src/gwt/src/org/rstudio/studio/client/RStudioGinjector.java
-@@ -37,6 +37,7 @@ import org.rstudio.studio.client.application.AriaLiveService;
+@@ -39,6 +39,7 @@ import org.rstudio.studio.client.application.LoggedOutDialog;
  import org.rstudio.studio.client.application.events.EventBus;
  import org.rstudio.studio.client.application.ui.AboutDialog;
  import org.rstudio.studio.client.application.ui.ProjectPopupMenu;
@@ -38,7 +38,7 @@ index 8d1a11014d..7422e2da56 100644
  import org.rstudio.studio.client.application.ui.addins.AddinsToolbarButton;
  import org.rstudio.studio.client.application.ui.impl.DesktopApplicationHeader;
  import org.rstudio.studio.client.application.ui.impl.WebApplicationHeader;
-@@ -235,6 +236,7 @@ public interface RStudioGinjector extends Ginjector
+@@ -242,6 +243,7 @@ public interface RStudioGinjector extends Ginjector
     void injectMembers(CodeFilesList codeFilesList);
     void injectMembers(ToolbarPopupMenu toolbarPopupMenu);
     void injectMembers(ProjectPopupMenu projectPopupMenu);
@@ -47,10 +47,10 @@ index 8d1a11014d..7422e2da56 100644
     void injectMembers(TextEditingTargetPresentationHelper presHelper);
     void injectMembers(TextEditingTargetRMarkdownHelper rmarkdownHelper);
 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
-index 65a2842c89..f22a1f0254 100644
+index 82e2de1941..94332f29db 100644
 --- a/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
 +++ b/src/gwt/src/org/rstudio/studio/client/application/ui/GlobalToolbar.java
-@@ -240,6 +240,10 @@ public class GlobalToolbar extends Toolbar
+@@ -349,6 +349,10 @@ public class GlobalToolbar extends Toolbar
           ProjectPopupMenu projectMenu = new ProjectPopupMenu(
                 sessionInfo, commands_, ElementIds.PROJECT_MENUBUTTON_TOOLBAR_SUFFIX);
           addRightWidget(projectMenu.getToolbarButton());
@@ -230,10 +230,10 @@ index 0000000000..eedc5996ae
 +   private EventBus events_;
 +}
 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 2a5b6e43af..785adfcb35 100644
+index 20322193cd..361864d129 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
-@@ -1368,6 +1368,17 @@ See `/src/gwt/tools/i18n-helpers/README.md`.
+@@ -1387,6 +1387,17 @@ See `/src/gwt/tools/i18n-helpers/README.md`.
          desc="Edit options for the current project"
          windowMode="main"/>
  
@@ -252,7 +252,7 @@ index 2a5b6e43af..785adfcb35 100644
          menuLabel=""
          buttonLabel=""
 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 ff6e358843..536994086f 100644
+index adc2c49d0e..627a0292ab 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
 @@ -2,6 +2,7 @@
@@ -281,7 +281,7 @@ index ff6e358843..536994086f 100644
 +
     // Console
     public abstract AppCommand consoleClear();
-    public abstract AppCommand interruptR();
+    public abstract AppCommand consoleFind();
 -- 
-2.52.0
+2.54.0