ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 01:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421 (#7404)

Browse Source 
* Merge from vscode e0762af258c0b20320ed03f3871a41967acc4421

* readd svgs
This commit is contained in:
Anthony Dresser
2019-09-27 11:13:19 -07:00
committed by GitHub
parent 6385443a4c
commit 07109617b5
348 changed files with 4219 additions and 4307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
View File

@@ -888,7 +888,7 @@ class ActionsColumn extends Column {
private createEditAction(keybindingItemEntry: IKeybindingItemEntry): IAction {
const keybinding = this.keybindingsService.lookupKeybinding(KEYBINDINGS_EDITOR_COMMAND_DEFINE);
return <IAction>{
class: 'edit',
class: 'codicon-edit',
enabled: true,
id: 'editKeybinding',
tooltip: keybinding ? localize('editKeybindingLabelWithKey', "Change Keybinding {0}", `(${keybinding.getLabel()})`) : localize('editKeybindingLabel', "Change Keybinding"),

8
src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as nls from 'vs/nls';
import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor } from 'vs/platform/statusbar/common/statusbar';
import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor } from 'vs/workbench/services/statusbar/common/statusbar';
import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
import { IKeymapService, areKeyboardLayoutsEqual, parseKeyboardLayoutDescription, getKeyboardLayoutId, IKeyboardLayoutInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -13,7 +13,7 @@ import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchCo
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
import { KEYBOARD_LAYOUT_OPEN_PICKER } from 'vs/workbench/contrib/preferences/common/preferences';
import { Action } from 'vs/base/common/actions';
import { isWeb, isMacintosh, isWindows } from 'vs/base/common/platform';
import { isMacintosh, isWindows } from 'vs/base/common/platform';
import { QuickPickInput, IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -99,9 +99,7 @@ export class KeyboardLayoutPickerAction extends Action {
@IEnvironmentService private readonly environmentService: IEnvironmentService,
@IEditorService private readonly editorService: IEditorService
) {
super(actionId, actionLabel);
this.enabled = isWeb;
super(actionId, actionLabel, undefined, true);
}
async run(): Promise<void> {

22
src/vs/workbench/contrib/preferences/browser/media/preferences.css
View File

@@ -203,25 +203,17 @@
outline: 1px dotted #f38518;
}
.monaco-editor .settings-group-title-widget .title-container .expand-collapse-icon {
background: url("tree-expanded-light.svg") 50% 50% no-repeat;
margin-right: 2px;
.monaco-editor .settings-group-title-widget .title-container .codicon {
margin: 0 2px;
width: 16px;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.monaco-editor.vs-dark .settings-group-title-widget .title-container .expand-collapse-icon,
.monaco-editor.hc-black .settings-group-title-widget .title-container .expand-collapse-icon {
background: url("tree-expanded-dark.svg") 50% 50% no-repeat;
}
.monaco-editor .settings-group-title-widget .title-container.collapsed .expand-collapse-icon {
background: url("tree-collapsed-light.svg") 50% 50% no-repeat;
}
.monaco-editor.vs-dark .settings-group-title-widget .title-container.collapsed .expand-collapse-icon,
.monaco-editor.hc-black .settings-group-title-widget .title-container.collapsed .expand-collapse-icon {
background: url("tree-collapsed-dark.svg") 50% 50% no-repeat;
.monaco-editor .settings-group-title-widget .title-container.collapsed .codicon::before {
transform: rotate(-90deg);
}
.monaco-editor .edit-preferences-widget {

3
src/vs/workbench/contrib/preferences/browser/media/tree-collapsed-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0719 8.00005L5.71461 12.3574L6.33333 12.9761L11 8.30941V7.69069L6.33333 3.02402L5.71461 3.64274L10.0719 8.00005Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 287 B

3
src/vs/workbench/contrib/preferences/browser/media/tree-collapsed-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0719 8.00005L5.71461 12.3574L6.33333 12.9761L11 8.30941V7.69069L6.33333 3.02402L5.71461 3.64274L10.0719 8.00005Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 287 B

3
src/vs/workbench/contrib/preferences/browser/media/tree-expanded-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97603 10.0719L12.3333 5.7146L12.9521 6.33332L8.28539 11L7.66667 11L3 6.33332L3.61872 5.7146L7.97603 10.0719Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

3
src/vs/workbench/contrib/preferences/browser/media/tree-expanded-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97603 10.0719L12.3333 5.7146L12.9521 6.33332L8.28539 11L7.66667 11L3 6.33332L3.61872 5.7146L7.97603 10.0719Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

6
src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
View File

@@ -53,7 +53,7 @@ import { IFilterResult, IPreferencesService, ISetting, ISettingsEditorModel, ISe
import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
import { DefaultSettingsEditorModel, SettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { IHostService } from 'vs/workbench/services/host/browser/host';
import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
export class PreferencesEditor extends BaseEditor {
@@ -985,9 +985,9 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
@ITextFileService textFileService: ITextFileService,
@IEditorGroupsService editorGroupService: IEditorGroupsService,
@IEditorService editorService: IEditorService,
@IWindowService windowService: IWindowService
@IHostService hostService: IHostService
) {
super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, windowService);
super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorService, editorGroupService, hostService);
}
private static _getContributions(): IEditorContributionCtor[] {

4
src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
View File

@@ -168,7 +168,7 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone {
this._register(focusTracker.onDidFocus(() => this.toggleFocus(true)));
this._register(focusTracker.onDidBlur(() => this.toggleFocus(false)));
this.icon = DOM.append(this.titleContainer, DOM.$('.expand-collapse-icon'));
this.icon = DOM.append(this.titleContainer, DOM.$('.codicon.codicon-chevron-down'));
this.title = DOM.append(this.titleContainer, DOM.$('.title'));
this.title.textContent = this.settingsGroup.title + ` (${this.settingsGroup.sections.reduce((count, section) => count + section.settings.length, 0)})`;
@@ -737,7 +737,7 @@ export class SearchWidget extends Widget {
export class EditPreferenceWidget<T> extends Disposable {
static readonly GLYPH_MARGIN_CLASS_NAME = 'edit-preferences-widget';
static readonly GLYPH_MARGIN_CLASS_NAME = 'codicon codicon-edit';
private _line: number = -1;
private _preferences: T[] = [];

6
src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
View File

@@ -197,9 +197,9 @@ export const tocData: ITOCEntry = {
settings: ['telemetry.*']
},
{
id: 'application/sync',
label: localize('sync', "Sync"),
settings: ['userConfiguration.*']
id: 'application/configurationSync',
label: localize('configuration sync', "Configuration Sync"),
settings: ['configurationSync.*']
}
]
}