move settings from sidebar to arduino pref panel

Author: fstasi

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -222,6 +222,7 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                 webContents.setZoomLevel(event.newValue || 0);
             }
         });
+        app.shell.leftPanelHandler.removeMenu('settings-menu');
     }
 
     protected languageServerFqbn?: string;

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

@@ -30,6 +30,16 @@ export class Settings extends SketchContribution {
             },
             isEnabled: () => !this.settingsOpened
         });
+        registry.registerCommand(Settings.Commands.CLOSE, {
+            execute: async () => {
+                try {
+                    this.settingsDialog.close();
+                } finally {
+                    this.settingsOpened = false;
+                }
+            },
+            isEnabled: () => this.settingsOpened
+        });
     }
 
     registerMenus(registry: MenuModelRegistry): void {
@@ -56,5 +66,11 @@ export namespace Settings {
             label: 'Open Preferences...',
             category: 'Arduino'
         }
+
+        export const CLOSE: Command = {
+            id: 'arduino-settings-close',
+            label: 'Close Preferences...',
+            category: 'Arduino'
+        }
     }
 }

arduino-ide-extension/src/browser/settings.tsx

@@ -13,6 +13,8 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { CommandRegistry } from "@theia/core";
+import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
@@ -376,9 +378,18 @@ export class SettingsComponent extends React.Component<SettingsComponent.Props,
                     onChange={this.additionalUrlsDidChange} />
                 <i className='fa fa-window-restore theia-button shrink' onClick={this.editAdditionalUrlDidClick} />
             </div>
+
+            <div className='flex-line'>
+                <button className='theia-button shrink' onClick={this.openExtendedSettings}>Extended Settings</button>
+            </div>
         </div>;
     }
 
+    protected openExtendedSettings = (e: React.MouseEvent<HTMLElement>) => {
+      this.props.commands.executeCommand(CommonCommands.OPEN_PREFERENCES.id);
+      this.props.commands.executeCommand('arduino-settings-close');
+    } 
+
     protected renderNetwork(): React.ReactNode {
         return <div className='content noselect'>
             <form>
@@ -662,6 +673,7 @@ export namespace SettingsComponent {
         readonly fileService: FileService;
         readonly fileDialogService: FileDialogService;
         readonly windowService: WindowService;
+        readonly commands: CommandRegistry
     }
     export interface State extends Settings { }
 }
@@ -681,12 +693,17 @@ export class SettingsWidget extends ReactWidget {
     @inject(WindowService)
     protected readonly windowService: WindowService;
 
+    @inject(CommandRegistry)
+    protected readonly commands: CommandRegistry;
+
     protected render(): React.ReactNode {
         return <SettingsComponent
             settingsService={this.settingsService}
             fileService={this.fileService}
             fileDialogService={this.fileDialogService}
-            windowService={this.windowService} />;
+            windowService={this.windowService}
+            commands={this.commands}
+            />;
     }
 
 }