ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add connecting title to spinner for Connection dialog (#9623)

Browse Source
This commit is contained in:
Charles Gagnon
2020-03-16 08:26:35 -07:00
committed by GitHub
parent d6d33165f1
commit 64eb406fdc
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/browser/modal/modal.ts
View File

@@ -27,6 +27,7 @@ import { find, firstIndex } from 'vs/base/common/arrays';
import { IThemable } from 'vs/base/common/styler'; import { IThemable } from 'vs/base/common/styler';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
import { alert } from 'vs/base/browser/ui/aria/aria';
export enum MessageLevel { export enum MessageLevel {
Error = 0, Error = 0,
@@ -63,6 +64,7 @@ export interface IModalOptions {
hasTitleIcon?: boolean; hasTitleIcon?: boolean;
hasErrors?: boolean; hasErrors?: boolean;
hasSpinner?: boolean; hasSpinner?: boolean;
spinnerTitle?: string;
} }
const defaultOptions: IModalOptions = { const defaultOptions: IModalOptions = {
@@ -245,6 +247,7 @@ export abstract class Modal extends Disposable implements IThemable {
this._modalFooterSection = DOM.append(this._modalContent, DOM.$('.modal-footer')); this._modalFooterSection = DOM.append(this._modalContent, DOM.$('.modal-footer'));
if (this._modalOptions.hasSpinner) { if (this._modalOptions.hasSpinner) {
this._spinnerElement = DOM.append(this._modalFooterSection, DOM.$('.codicon.in-progress')); this._spinnerElement = DOM.append(this._modalFooterSection, DOM.$('.codicon.in-progress'));
this._spinnerElement.setAttribute('title', this._modalOptions.spinnerTitle);
DOM.hide(this._spinnerElement); DOM.hide(this._spinnerElement);
} }
this._leftFooter = DOM.append(this._modalFooterSection, DOM.$('.left-footer')); this._leftFooter = DOM.append(this._modalFooterSection, DOM.$('.left-footer'));
@@ -511,6 +514,9 @@ export abstract class Modal extends Disposable implements IThemable {
if (this._modalOptions.hasSpinner) { if (this._modalOptions.hasSpinner) {
if (show) { if (show) {
DOM.show(this._spinnerElement); DOM.show(this._spinnerElement);
if (this._modalOptions.spinnerTitle) {
alert(this._modalOptions.spinnerTitle);
}
} else { } else {
DOM.hide(this._spinnerElement); DOM.hide(this._spinnerElement);
} }

12
src/sql/workbench/services/connection/browser/connectionDialogWidget.ts
View File

@@ -103,7 +103,17 @@ export class ConnectionDialogWidget extends Modal {
@ILogService logService: ILogService, @ILogService logService: ILogService,
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService @ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService
) { ) {
super(localize('connection', "Connection"), TelemetryKeys.Connection, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { hasSpinner: true, hasErrors: true }); super(
localize('connection', "Connection"),
TelemetryKeys.Connection,
telemetryService,
layoutService,
clipboardService,
themeService,
logService,
textResourcePropertiesService,
contextKeyService,
{ hasSpinner: true, spinnerTitle: localize('connecting', "Connecting"), hasErrors: true });
} }
/** /**