From b495fb7a373389a4283c91c95de21402779844e0 Mon Sep 17 00:00:00 2001 From: Kevin Cunnane Date: Tue, 12 Mar 2019 21:23:43 -0700 Subject: [PATCH] Add notebook file icon support (#4419) - Added to both built-in themes. Long term would be good to contribute this back to Seti so it works without a carbon edit tag. - Issue #4418 tracks remaining problem where for new notebooks it's not set initially. This is blocked by Raj's work so will update once that lands. --- extensions/azurecore/package.json | 2 +- .../fileicons/images/notebook.svg | 1 + .../fileicons/images/notebook_inverse.svg | 1 + .../fileicons/vs_minimal-icon-theme.json | 10 ++++++++ extensions/theme-defaults/package.json | 9 +++++++- .../theme-seti/icons/images/notebook.svg | 1 + .../icons/images/notebook_inverse.svg | 1 + .../theme-seti/icons/vs-seti-icon-theme.json | 23 +++++++++++++++---- 8 files changed, 42 insertions(+), 6 deletions(-) create mode 100755 extensions/theme-defaults/fileicons/images/notebook.svg create mode 100755 extensions/theme-defaults/fileicons/images/notebook_inverse.svg create mode 100755 extensions/theme-seti/icons/images/notebook.svg create mode 100755 extensions/theme-seti/icons/images/notebook_inverse.svg diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index 0199174c11..9a7c71fbe2 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -1,7 +1,7 @@ { "name": "azurecore", "displayName": "%azure.displayName%", - "description": "%azure.description", + "description": "%azure.description%", "version": "0.1.0", "publisher": "Microsoft", "preview": true, diff --git a/extensions/theme-defaults/fileicons/images/notebook.svg b/extensions/theme-defaults/fileicons/images/notebook.svg new file mode 100755 index 0000000000..dae58b840e --- /dev/null +++ b/extensions/theme-defaults/fileicons/images/notebook.svg @@ -0,0 +1 @@ +notebook \ No newline at end of file diff --git a/extensions/theme-defaults/fileicons/images/notebook_inverse.svg b/extensions/theme-defaults/fileicons/images/notebook_inverse.svg new file mode 100755 index 0000000000..fb495dda69 --- /dev/null +++ b/extensions/theme-defaults/fileicons/images/notebook_inverse.svg @@ -0,0 +1 @@ +notebook_inverse \ No newline at end of file diff --git a/extensions/theme-defaults/fileicons/vs_minimal-icon-theme.json b/extensions/theme-defaults/fileicons/vs_minimal-icon-theme.json index 9c9f60b6ef..be2fa29324 100644 --- a/extensions/theme-defaults/fileicons/vs_minimal-icon-theme.json +++ b/extensions/theme-defaults/fileicons/vs_minimal-icon-theme.json @@ -29,6 +29,12 @@ }, "_file_light": { "iconPath": "./images/Document_16x.svg" + }, + "notebook": { + "iconPath": "./images/notebook.svg" + }, + "notebook_dark": { + "iconPath": "./images/notebook_inverse.svg" } }, @@ -39,12 +45,14 @@ "rootFolder": "_root_folder_dark", "fileExtensions": { // icons by file extension + "ipynb": "notebook_dark" }, "fileNames": { // icons by file name }, "languageIds": { // icons by language id + "notebook": "notebook_dark" }, "light": { "folderExpanded": "_folder_open_light", @@ -54,12 +62,14 @@ "file": "_file_light", "fileExtensions": { // icons by file extension + "ipynb": "notebook" }, "fileNames": { // icons by file name }, "languageIds": { // icons by language id + "notebook": "notebook" } }, "highContrast": { diff --git a/extensions/theme-defaults/package.json b/extensions/theme-defaults/package.json index dc52a4a972..fbfc50afa3 100644 --- a/extensions/theme-defaults/package.json +++ b/extensions/theme-defaults/package.json @@ -14,5 +14,12 @@ "path": "./themes/hc_black.json" } ] - } + }, + "iconThemes": [ + { + "id": "vs-minimal", + "label": "Minimal (Azure Data Studio)", + "path": "./fileicons/vs_minimal-icon-theme.json" + } + ] } \ No newline at end of file diff --git a/extensions/theme-seti/icons/images/notebook.svg b/extensions/theme-seti/icons/images/notebook.svg new file mode 100755 index 0000000000..dae58b840e --- /dev/null +++ b/extensions/theme-seti/icons/images/notebook.svg @@ -0,0 +1 @@ +notebook \ No newline at end of file diff --git a/extensions/theme-seti/icons/images/notebook_inverse.svg b/extensions/theme-seti/icons/images/notebook_inverse.svg new file mode 100755 index 0000000000..fb495dda69 --- /dev/null +++ b/extensions/theme-seti/icons/images/notebook_inverse.svg @@ -0,0 +1 @@ +notebook_inverse \ No newline at end of file diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json index 2fba19f5af..2152db7f65 100644 --- a/extensions/theme-seti/icons/vs-seti-icon-theme.json +++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json @@ -1240,6 +1240,13 @@ "_zip_1": { "fontCharacter": "\\E091", "fontColor": "#6d8086" + }, + // {{SQL CARBON EDIT}} + "notebook": { + "iconPath": "./images/notebook.svg" + }, + "notebook_dark": { + "iconPath": "./images/notebook_inverse.svg" } }, "file": "_default", @@ -1422,7 +1429,9 @@ "htaccess": "_config", "key": "_lock", "cert": "_lock", - "ds_store": "_ignored" + "ds_store": "_ignored", + // {{SQL CARBON EDIT}} + "ipynb": "notebook_dark" }, "fileNames": { "mix": "_hex", @@ -1531,7 +1540,9 @@ "haml": "_haml", "stylus": "_stylus", "vala": "_vala", - "todo": "_todo" + "todo": "_todo", + // {{SQL CARBON EDIT}} + "notebook": "notebook_dark" }, "light": { "file": "_default_light", @@ -1714,7 +1725,9 @@ "htaccess": "_config_light", "key": "_lock_light", "cert": "_lock_light", - "ds_store": "_ignored_light" + "ds_store": "_ignored_light", + // {{SQL CARBON EDIT}} + "ipynb": "notebook" }, "languageIds": { "bat": "_windows_light", @@ -1773,7 +1786,9 @@ "elixir": "_elixir_light", "haml": "_haml_light", "stylus": "_stylus_light", - "vala": "_vala_light" + "vala": "_vala_light", + // {{SQL CARBON EDIT}} + "notebook": "notebook" }, "fileNames": { "mix": "_hex_light",