unregister old toolbar icons

Author: francescospissu

arduino-ide-extension/src/browser/contributions/debug.ts

@@ -1,5 +1,5 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { Event, Emitter } from '@theia/core/lib/common/event';
+import { Emitter } from '@theia/core/lib/common/event';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { NotificationCenter } from '../notification-center';
@@ -10,11 +10,9 @@ import {
   Command,
   CommandRegistry,
   SketchContribution,
-  TabBarToolbarRegistry,
 } from './contribution';
-import { MaybePromise, MenuModelRegistry, nls } from '@theia/core/lib/common';
+import { MaybePromise, nls } from '@theia/core/lib/common';
 import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
-import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   PreferenceScope,
   PreferenceService,
@@ -59,35 +57,7 @@ export class Debug extends SketchContribution {
     this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
   }
 
-  private readonly debugToolbarItem = {
-    id: Debug.Commands.START_DEBUGGING.id,
-    command: Debug.Commands.START_DEBUGGING.id,
-    tooltip: `${
-      this.disabledMessage
-        ? nls.localize(
-            'arduino/debug/debugWithMessage',
-            'Debug - {0}',
-            this.disabledMessage
-          )
-        : Debug.Commands.START_DEBUGGING.label
-    }`,
-    priority: 3,
-    onDidChange: this.onDisabledMessageDidChange as Event<void>,
-  };
-
   override onStart(): void {
-    this.onDisabledMessageDidChange(
-      () =>
-        (this.debugToolbarItem.tooltip = `${
-          this.disabledMessage
-            ? nls.localize(
-                'arduino/debug/debugWithMessage',
-                'Debug - {0}',
-                this.disabledMessage
-              )
-            : Debug.Commands.START_DEBUGGING.label
-        }`)
-    );
     this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) =>
       this.refreshState(selectedBoard)
     );
@@ -112,18 +82,6 @@ export class Debug extends SketchContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem(this.debugToolbarItem);
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: Debug.Commands.OPTIMIZE_FOR_DEBUG.id,
-      label: Debug.Commands.OPTIMIZE_FOR_DEBUG.label,
-      order: '5',
-    });
-  }
-
   private async refreshState(
     board: Board | undefined = this.boardsServiceProvider.boardsConfig
       .selectedBoard

arduino-ide-extension/src/browser/contributions/new-sketch.ts

@@ -9,7 +9,6 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
-  TabBarToolbarRegistry,
 } from './contribution';
 
 @injectable()
@@ -40,15 +39,6 @@ export class NewSketch extends SketchContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem({
-      id: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
-      command: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
-      tooltip: nls.localize('arduino/sketch/new', 'New'),
-      priority: 3,
-    });
-  }
-
   async newSketch(): Promise<void> {
     try {
       const sketch = await this.sketchService.createNewSketch();

arduino-ide-extension/src/browser/contributions/open-sketch.ts

@@ -16,7 +16,6 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
-  TabBarToolbarRegistry,
 } from './contribution';
 import { ExamplesService } from '../../common/protocol/examples-service';
 import { BuiltInExamples } from './examples';
@@ -131,15 +130,6 @@ export class OpenSketch extends SketchContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem({
-      id: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
-      command: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
-      tooltip: nls.localize('vscode/dialogMainService/open', 'Open'),
-      priority: 4,
-    });
-  }
-
   async openSketch(
     toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()
   ): Promise<void> {

arduino-ide-extension/src/browser/contributions/save-sketch.ts

@@ -9,7 +9,6 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
-  TabBarToolbarRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
 import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
@@ -43,15 +42,6 @@ export class SaveSketch extends SketchContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem({
-      id: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
-      command: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
-      tooltip: nls.localize('vscode/fileCommands/save', 'Save'),
-      priority: 5,
-    });
-  }
-
   async saveSketch(): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {