From 35251d63ced6f104cc486bdb7b28da86436f5f7e Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Mon, 14 Jun 2021 00:04:07 -0400 Subject: [PATCH] Changes more icons to codicons --- images/dark/icon-compare-ref-remote.svg | 4 -- images/dark/icon-compare-ref-working.svg | 2 +- images/dark/icon-copy-link.svg | 5 -- images/dark/icon-copy-message.svg | 4 -- images/dark/icon-copy.svg | 4 -- images/dark/icon-person-add.svg | 4 -- images/dark/icon-remote.svg | 3 - images/dark/icon-swap.svg | 3 - images/light/icon-compare-ref-remote.svg | 5 -- images/light/icon-compare-ref-working.svg | 2 +- images/light/icon-copy-link.svg | 5 -- images/light/icon-copy-message.svg | 4 -- images/light/icon-copy.svg | 4 -- images/light/icon-person-add.svg | 4 -- images/light/icon-remote.svg | 3 - images/light/icon-swap.svg | 3 - package.json | 93 +++++++------------------------ src/views/nodes/remoteNode.ts | 11 ++-- 18 files changed, 28 insertions(+), 135 deletions(-) delete mode 100644 images/dark/icon-compare-ref-remote.svg delete mode 100644 images/dark/icon-copy-link.svg delete mode 100644 images/dark/icon-copy-message.svg delete mode 100644 images/dark/icon-copy.svg delete mode 100644 images/dark/icon-person-add.svg delete mode 100644 images/dark/icon-remote.svg delete mode 100644 images/dark/icon-swap.svg delete mode 100644 images/light/icon-compare-ref-remote.svg delete mode 100644 images/light/icon-copy-link.svg delete mode 100644 images/light/icon-copy-message.svg delete mode 100644 images/light/icon-copy.svg delete mode 100644 images/light/icon-person-add.svg delete mode 100644 images/light/icon-remote.svg delete mode 100644 images/light/icon-swap.svg diff --git a/images/dark/icon-compare-ref-remote.svg b/images/dark/icon-compare-ref-remote.svg deleted file mode 100644 index 21213f4..0000000 --- a/images/dark/icon-compare-ref-remote.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-compare-ref-working.svg b/images/dark/icon-compare-ref-working.svg index b78daa1..75dd7fb 100644 --- a/images/dark/icon-compare-ref-working.svg +++ b/images/dark/icon-compare-ref-working.svg @@ -1,3 +1,3 @@ - + diff --git a/images/dark/icon-copy-link.svg b/images/dark/icon-copy-link.svg deleted file mode 100644 index 6f0ea15..0000000 --- a/images/dark/icon-copy-link.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/images/dark/icon-copy-message.svg b/images/dark/icon-copy-message.svg deleted file mode 100644 index 29a31ba..0000000 --- a/images/dark/icon-copy-message.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-copy.svg b/images/dark/icon-copy.svg deleted file mode 100644 index c8dad9c..0000000 --- a/images/dark/icon-copy.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/dark/icon-person-add.svg b/images/dark/icon-person-add.svg deleted file mode 100644 index 13a6963..0000000 --- a/images/dark/icon-person-add.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/images/dark/icon-remote.svg b/images/dark/icon-remote.svg deleted file mode 100644 index 6d1e3d2..0000000 --- a/images/dark/icon-remote.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/dark/icon-swap.svg b/images/dark/icon-swap.svg deleted file mode 100644 index f6e9380..0000000 --- a/images/dark/icon-swap.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-compare-ref-remote.svg b/images/light/icon-compare-ref-remote.svg deleted file mode 100644 index 49b0fc7..0000000 --- a/images/light/icon-compare-ref-remote.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/images/light/icon-compare-ref-working.svg b/images/light/icon-compare-ref-working.svg index e97aaff..df2b5b7 100644 --- a/images/light/icon-compare-ref-working.svg +++ b/images/light/icon-compare-ref-working.svg @@ -1,3 +1,3 @@ - + diff --git a/images/light/icon-copy-link.svg b/images/light/icon-copy-link.svg deleted file mode 100644 index 86927ac..0000000 --- a/images/light/icon-copy-link.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/images/light/icon-copy-message.svg b/images/light/icon-copy-message.svg deleted file mode 100644 index c8e04c1..0000000 --- a/images/light/icon-copy-message.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-copy.svg b/images/light/icon-copy.svg deleted file mode 100644 index 9f97e49..0000000 --- a/images/light/icon-copy.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/images/light/icon-person-add.svg b/images/light/icon-person-add.svg deleted file mode 100644 index 175e1f5..0000000 --- a/images/light/icon-person-add.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/images/light/icon-remote.svg b/images/light/icon-remote.svg deleted file mode 100644 index c10e0c6..0000000 --- a/images/light/icon-remote.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/images/light/icon-swap.svg b/images/light/icon-swap.svg deleted file mode 100644 index 20f6a2d..0000000 --- a/images/light/icon-swap.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/package.json b/package.json index 0b0bdba..d777c9b 100644 --- a/package.json +++ b/package.json @@ -3572,10 +3572,7 @@ "command": "gitlens.addAuthors", "title": "Add Co-authors", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-person-add.svg", - "light": "images/light/icon-person-add.svg" - } + "icon": "$(person-add)" }, { "command": "gitlens.connectRemoteProvider", @@ -3596,28 +3593,19 @@ "command": "gitlens.copyCurrentBranch", "title": "Copy Current Branch Name", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy.svg", - "light": "images/light/icon-copy.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.copyMessageToClipboard", "title": "Copy Message", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-message.svg", - "light": "images/light/icon-copy-message.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.copyShaToClipboard", "title": "Copy SHA", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy.svg", - "light": "images/light/icon-copy.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.closeUnchangedFiles", @@ -3639,10 +3627,7 @@ "command": "gitlens.copyRemoteBranchesUrl", "title": "Copy Remote Branches Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openBranchOnRemote", @@ -3654,10 +3639,7 @@ "command": "gitlens.copyRemoteBranchUrl", "title": "Copy Remote Branch Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openCommitOnRemote", @@ -3669,10 +3651,7 @@ "command": "gitlens.copyRemoteCommitUrl", "title": "Copy Remote Commit Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openComparisonOnRemote", @@ -3684,10 +3663,7 @@ "command": "gitlens.copyRemoteComparisonUrl", "title": "Copy Remote Comparison Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openFileFromRemote", @@ -3704,19 +3680,13 @@ "command": "gitlens.copyRemoteFileUrlToClipboard", "title": "Copy Remote File Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.copyRemoteFileUrlWithoutRange", "title": "Copy Remote File Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openFileOnRemoteFrom", @@ -3728,10 +3698,7 @@ "command": "gitlens.copyRemoteFileUrlFrom", "title": "Copy Remote File Url From...", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openBlamePriorToChange", @@ -3767,10 +3734,7 @@ "command": "gitlens.copyRemotePullRequestUrl", "title": "Copy Pull Request Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openAssociatedPullRequestOnRemote", @@ -3788,10 +3752,7 @@ "command": "gitlens.copyRemoteRepositoryUrl", "title": "Copy Remote Repository Url", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy-link.svg", - "light": "images/light/icon-copy-link.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.openRevisionFile", @@ -4035,10 +3996,7 @@ "command": "gitlens.views.copy", "title": "Copy", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-copy.svg", - "light": "images/light/icon-copy.svg" - } + "icon": "$(copy)" }, { "command": "gitlens.views.pruneRemote", @@ -4219,11 +4177,7 @@ { "command": "gitlens.views.compareWithUpstream", "title": "Compare with Upstream", - "category": "GitLens", - "icon": { - "dark": "images/dark/icon-compare-ref-remote.svg", - "light": "images/light/icon-compare-ref-remote.svg" - } + "category": "GitLens" }, { "command": "gitlens.views.compareWithSelected", @@ -4258,19 +4212,13 @@ "command": "gitlens.views.addAuthors", "title": "Add Co-authors", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-person-add.svg", - "light": "images/light/icon-person-add.svg" - } + "icon": "$(person-add)" }, { "command": "gitlens.views.addAuthor", "title": "Add as Co-author", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-person-add.svg", - "light": "images/light/icon-person-add.svg" - } + "icon": "$(person-add)" }, { "command": "gitlens.views.cherryPick", @@ -4549,7 +4497,7 @@ "command": "gitlens.views.commits.setMyCommitsOnlyOff", "title": "Toggle Filter: Only My Commits", "category": "GitLens", - "icon": "$(filter)" + "icon": "$(filter-filled)" }, { "command": "gitlens.views.commits.setShowAvatarsOn", @@ -5068,10 +5016,7 @@ "command": "gitlens.views.searchAndCompare.swapComparison", "title": "Swap Comparison", "category": "GitLens", - "icon": { - "dark": "images/dark/icon-swap.svg", - "light": "images/light/icon-swap.svg" - } + "icon": "$(arrow-swap)" }, { "command": "gitlens.views.searchAndCompare.setFilesFilterOnLeft", diff --git a/src/views/nodes/remoteNode.ts b/src/views/nodes/remoteNode.ts index e8f5b25..2bc172e 100644 --- a/src/views/nodes/remoteNode.ts +++ b/src/views/nodes/remoteNode.ts @@ -113,10 +113,13 @@ export class RemoteNode extends ViewNode { const { provider } = this.remote; item.description = `${arrows}${GlyphChars.Space} ${provider.name} ${GlyphChars.Space}${GlyphChars.Dot}${GlyphChars.Space} ${provider.displayPath}`; - item.iconPath = { - dark: Container.context.asAbsolutePath(`images/dark/icon-${provider.icon}.svg`), - light: Container.context.asAbsolutePath(`images/light/icon-${provider.icon}.svg`), - }; + item.iconPath = + provider.icon === 'remote' + ? new ThemeIcon('cloud') + : { + dark: Container.context.asAbsolutePath(`images/dark/icon-${provider.icon}.svg`), + light: Container.context.asAbsolutePath(`images/light/icon-${provider.icon}.svg`), + }; if (provider.hasApi()) { const connected = provider.maybeConnected ?? (await provider.isConnected());