From 0a598052918dfb3c5407c1f4f4fdec43310cd076 Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Fri, 20 Apr 2018 22:18:31 +0200 Subject: [PATCH] chore: test --- extensions/commands/theme-icons/index.ts | 10 ----- extensions/defaults.json | 2 +- .../interfaces/itheme-custom-properties.ts | 1 - extensions/material.theme.config.ts | 11 +++--- package.json | 37 ++++++++++++++++--- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/extensions/commands/theme-icons/index.ts b/extensions/commands/theme-icons/index.ts index 9beb82c..057dafe 100644 --- a/extensions/commands/theme-icons/index.ts +++ b/extensions/commands/theme-icons/index.ts @@ -53,8 +53,6 @@ export const THEME_ICONS = () => { } }) - // theme.iconDefinitions._folder_open.iconPath = defaults.icons.theme.iconDefinitions._folder_open.iconPath.replace('.svg', `.accent.${ _accentName }.svg`); - // theme.iconDefinitions._folder_open_build.iconPath = defaults.icons.theme.iconDefinitions._folder_open_build.iconPath.replace('.svg', `.accent.${ _accentName }.svg`); } else { getAccentableIcons().forEach(iconname => { @@ -63,8 +61,6 @@ export const THEME_ICONS = () => { distIcon.iconPath = outIcon.iconPath; }); - // theme.iconDefinitions._folder_open.iconPath = defaults.icons.theme.iconDefinitions._folder_open.iconPath; - // theme.iconDefinitions._folder_open_build.iconPath = defaults.icons.theme.iconDefinitions._folder_open_build.iconPath; } getVariantIcons().forEach(iconname => { @@ -76,12 +72,6 @@ export const THEME_ICONS = () => { } }) - // theme.iconDefinitions._folder_dark.iconPath = defaults.icons.theme.iconDefinitions._folder_dark.iconPath.replace('.svg', `${ variantName }.svg`); - // theme.iconDefinitions._folder_dark_build.iconPath = defaults.icons.theme.iconDefinitions._folder_dark_build.iconPath.replace('.svg', `${ variantName }.svg`); - - // theme.iconDefinitions._folder_light.iconPath = defaults.icons.theme.iconDefinitions._folder_light.iconPath.replace('.svg', `${ variantName }.svg`); - // theme.iconDefinitions["_folder_light_build"].iconPath = defaults.icons.theme.iconDefinitions["_folder_light_build"].iconPath.replace('.svg', `${ variantName }.svg`); - fs.writeFile(themepath, JSON.stringify(theme), { encoding: CHARSET }, (error) => { if (error) { deferred.reject(error); diff --git a/extensions/defaults.json b/extensions/defaults.json index 99e91e8..61d465b 100644 --- a/extensions/defaults.json +++ b/extensions/defaults.json @@ -35,7 +35,7 @@ "_folder_ci_open" ], "changelog": { - "lastversion": "1.5.1" + "lastversion": "1.6.0" }, "icons": { "theme": { diff --git a/extensions/interfaces/itheme-custom-properties.ts b/extensions/interfaces/itheme-custom-properties.ts index e801dc8..bb084c4 100644 --- a/extensions/interfaces/itheme-custom-properties.ts +++ b/extensions/interfaces/itheme-custom-properties.ts @@ -2,5 +2,4 @@ export interface IThemeCustomProperties { accent?: string; accentPrevious?: string; themeColours?: string; - themeIcons?: string; } \ No newline at end of file diff --git a/extensions/material.theme.config.ts b/extensions/material.theme.config.ts index a4a17ff..cbe28ac 100644 --- a/extensions/material.theme.config.ts +++ b/extensions/material.theme.config.ts @@ -2,18 +2,19 @@ import * as vscode from 'vscode'; import { IGenericObject } from "./interfaces/igeneric-object"; import { THEME_ACCENTS_SETTER } from "./commands/accents-setter/index"; -import { THEME_VARIANT } from "./commands/theme-variant/index"; +import { THEME_ICONS } from "./commands/theme-icons/index"; import { shouldShowChangelog, showChangelog } from './helpers/changelog'; +import { reloadWindow } from "./helpers/vscode"; enum Commands { ACCENTS, CHANGELOG, - COLOUR_VARIANT + THEME_ICONS } const OPTIONS: IGenericObject = { '🖍 Change accent color': Commands.ACCENTS, - '🎨 Change color variant': Commands.COLOUR_VARIANT, + '🎨 Adapt icons': Commands.THEME_ICONS, '🚧 Show changelog': Commands.CHANGELOG } @@ -38,8 +39,8 @@ export function activate(context: vscode.ExtensionContext) { case Commands.CHANGELOG: showChangelog(); break; - case Commands.COLOUR_VARIANT: - THEME_VARIANT(); + case Commands.THEME_ICONS: + THEME_ICONS().then(() => reloadWindow()).catch(error => console.trace(error)); break; } }); diff --git a/package.json b/package.json index 51f19b7..922fd78 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,6 @@ ], "configuration": { "properties": { - "materialTheme.cache.workbench.accent": { - "type": "string", - "title": "[DEPRECATED] This is an old property.", - "description": "This property is intended only for migrating old settings system to a new one. It will be removed in new versions. Don't use it, use \"materialTheme.cache.workbench.settings\" instead." - }, "materialTheme.cache.workbench.settings": { "default": {}, "type": "object", @@ -74,13 +69,43 @@ "themes": [ { "label": "Material Theme", - "path": "./themes/Material-Theme-Palenight.json", + "path": "./themes/Material-Theme-Default.json", + "uiTheme": "vs-dark" + }, + { + "label": "Material Theme High Contrast", + "path": "./themes/Material-Theme-Default-High-Contrast.json", "uiTheme": "vs-dark" }, { "label": "Material Theme Darker", "path": "./themes/Material-Theme-Darker.json", "uiTheme": "vs-dark" + }, + { + "label": "Material Theme Darker High Contrast", + "path": "./themes/Material-Theme-Darker-High-Contrast.json", + "uiTheme": "vs-dark" + }, + { + "label": "Material Theme Palenight", + "path": "./themes/Material-Theme-Palenight.json", + "uiTheme": "vs-dark" + }, + { + "label": "Material Theme Palenight High Contrast", + "path": "./themes/Material-Theme-Palenight-High-Contrast.json", + "uiTheme": "vs-dark" + }, + { + "label": "Material Theme Lighter", + "path": "./themes/Material-Theme-Lighter.json", + "uiTheme": "vs" + }, + { + "label": "Material Theme Lighter High Contrast", + "path": "./themes/Material-Theme-Lighter-High-Contrast.json", + "uiTheme": "vs" } ], "iconThemes": [