From 0d4c296991ac8a25a3c661495aa3698d112f8f97 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Mon, 4 Feb 2019 21:20:09 +0300 Subject: [PATCH] [vcs-log] rename color keys IDEA-203470 --- .../src/themes/HighContrast.theme.json | 2 +- .../IntelliJPlatform.themeMetadata.json | 84 +++++++++---------- .../vcs/changes/ui/CurrentBranchComponent.kt | 6 +- .../completion/UiDefaultsHardcodedKeys.java | 32 +++---- .../src/git4idea/log/GitRefManager.java | 10 +-- .../org/zmlx/hg4idea/log/HgRefManager.java | 16 ++-- 6 files changed, 75 insertions(+), 75 deletions(-) diff --git a/platform/platform-resources/src/themes/HighContrast.theme.json b/platform/platform-resources/src/themes/HighContrast.theme.json index 3fd4d2c84fdb..2c7141b91fda 100644 --- a/platform/platform-resources/src/themes/HighContrast.theme.json +++ b/platform/platform-resources/src/themes/HighContrast.theme.json @@ -373,7 +373,7 @@ "currentBranchBackground": "#0D0D40", "unmatchedForeground": "#E0861F" }, - "Ref": { + "RefLabel": { "backgroundBase": "#3333FF", "backgroundBrightness": 0.7 }, diff --git a/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json b/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json index 096ec8292daa..7d3109ddbc25 100644 --- a/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json +++ b/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json @@ -149,21 +149,6 @@ { "key": "FlameGraph.parentSearchNotMatchedBackground" }, - { - "key": "Git.Log.Ref.Head" - }, - { - "key": "Git.Log.Ref.LocalBranch" - }, - { - "key": "Git.Log.Ref.Other" - }, - { - "key": "Git.Log.Ref.RemoteBranch" - }, - { - "key": "Git.Log.Ref.Tag" - }, { "key": "Group.disabledSeparatorColor" }, @@ -194,30 +179,6 @@ { "key": "HelpTooltip.shortcutForeground" }, - { - "key": "Hg.Log.Ref.Bookmark" - }, - { - "key": "Hg.Log.Ref.Branch" - }, - { - "key": "Hg.Log.Ref.ClosedBranch" - }, - { - "key": "Hg.Log.Ref.Head" - }, - { - "key": "Hg.Log.Ref.LocalTag" - }, - { - "key": "Hg.Log.Ref.MqTag" - }, - { - "key": "Hg.Log.Ref.Tag" - }, - { - "key": "Hg.Log.Ref.Tip" - }, { "key": "InformationHint.borderColor" }, @@ -557,6 +518,45 @@ { "key": "VersionControl.FileHistory.Commit.selectedBranchBackground" }, + { + "key": "VersionControl.GitLog.headIconColor" + }, + { + "key": "VersionControl.GitLog.localBranchIconColor" + }, + { + "key": "VersionControl.GitLog.otherIconColor" + }, + { + "key": "VersionControl.GitLog.remoteBranchIconColor" + }, + { + "key": "VersionControl.GitLog.tagIconColor" + }, + { + "key": "VersionControl.HgLog.bookmarkIconColor" + }, + { + "key": "VersionControl.HgLog.branchIconColor" + }, + { + "key": "VersionControl.HgLog.closedBranchIconColor" + }, + { + "key": "VersionControl.HgLog.headIconColor" + }, + { + "key": "VersionControl.HgLog.localTagIconColor" + }, + { + "key": "VersionControl.HgLog.mqTagIconColor" + }, + { + "key": "VersionControl.HgLog.tagIconColor" + }, + { + "key": "VersionControl.HgLog.tipIconColor" + }, { "key": "VersionControl.Log.Commit.currentBranchBackground" }, @@ -564,13 +564,13 @@ "key": "VersionControl.Log.Commit.unmatchedForeground" }, { - "key": "VersionControl.Ref.backgroundBase" + "key": "VersionControl.RefLabel.backgroundBase" }, { - "key": "VersionControl.Ref.backgroundBrightness" + "key": "VersionControl.RefLabel.backgroundBrightness" }, { - "key": "VersionControl.Ref.foreground" + "key": "VersionControl.RefLabel.foreground" }, { "key": "WelcomeScreen.background" diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CurrentBranchComponent.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CurrentBranchComponent.kt index 772fc374f984..88db87832638 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CurrentBranchComponent.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CurrentBranchComponent.kt @@ -88,11 +88,11 @@ class CurrentBranchComponent(val project: Project, val browser: CommitDialogChan companion object { private val BACKGROUND_BALANCE - get() = namedDouble("VersionControl.Ref.backgroundBrightness", 0.08) + get() = namedDouble("VersionControl.RefLabel.backgroundBrightness", 0.08) - private val BACKGROUND_BASE_COLOR = namedColor("VersionControl.Ref.backgroundBase", JBColor(Color.BLACK, Color.WHITE)) + private val BACKGROUND_BASE_COLOR = namedColor("VersionControl.RefLabel.backgroundBase", JBColor(Color.BLACK, Color.WHITE)) @JvmField - val TEXT_COLOR: JBColor = namedColor("VersionControl.Ref.foreground", JBColor(Color(0x7a7a7a), Color(0x909090))) + val TEXT_COLOR: JBColor = namedColor("VersionControl.RefLabel.foreground", JBColor(Color(0x7a7a7a), Color(0x909090))) @Suppress("SameParameterValue") private fun namedDouble(name: String, default: Double): Double { diff --git a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java index 41a73ada5c84..d91033c50012 100644 --- a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java +++ b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java @@ -1332,11 +1332,6 @@ public final class UiDefaultsHardcodedKeys { "FlameGraph.parentSearchNotMatchedBackground", "FlameGraph.parentFrameForeground", "FlameGraph.parentFocusedFrameForeground", - "Git.Log.Ref.Head", - "Git.Log.Ref.LocalBranch", - "Git.Log.Ref.Other", - "Git.Log.Ref.RemoteBranch", - "Git.Log.Ref.Tag", "Group.separatorColor", "Group.disabledSeparatorColor", "GutterTooltip.infoForeground", @@ -1346,14 +1341,6 @@ public final class UiDefaultsHardcodedKeys { "HelpTooltip.borderColor", "HelpTooltip.foreground", "HelpTooltip.shortcutForeground", - "Hg.Log.Ref.Bookmark", - "Hg.Log.Ref.Branch", - "Hg.Log.Ref.ClosedBranch", - "Hg.Log.Ref.Head", - "Hg.Log.Ref.LocalTag", - "Hg.Log.Ref.MqTag", - "Hg.Log.Ref.Tag", - "Hg.Log.Ref.Tip", "InformationHint.borderColor", "Label.disabledForeground", "Label.disabledText", @@ -1480,11 +1467,24 @@ public final class UiDefaultsHardcodedKeys { "ValidationTooltip.warningBackground", "ValidationTooltip.warningBorderColor", "VersionControl.FileHistory.Commit.selectedBranchBackground", + "VersionControl.GitLog.headIconColor", + "VersionControl.GitLog.localBranchIconColor", + "VersionControl.GitLog.otherIconColor", + "VersionControl.GitLog.remoteBranchIconColor", + "VersionControl.GitLog.tagIconColor", + "VersionControl.HgLog.bookmarkIconColor", + "VersionControl.HgLog.branchIconColor", + "VersionControl.HgLog.closedBranchIconColor", + "VersionControl.HgLog.headIconColor", + "VersionControl.HgLog.localTagIconColor", + "VersionControl.HgLog.mqTagIconColor", + "VersionControl.HgLog.tagIconColor", + "VersionControl.HgLog.tipIconColor", "VersionControl.Log.Commit.currentBranchBackground", "VersionControl.Log.Commit.unmatchedForeground", - "VersionControl.Ref.backgroundBase", - "VersionControl.Ref.backgroundBrightness", - "VersionControl.Ref.foreground", + "VersionControl.RefLabel.backgroundBase", + "VersionControl.RefLabel.backgroundBrightness", + "VersionControl.RefLabel.foreground", "WelcomeScreen.Projects.background", "WelcomeScreen.Projects.selectionBackground", "WelcomeScreen.Projects.selectionInactiveBackground", diff --git a/plugins/git4idea/src/git4idea/log/GitRefManager.java b/plugins/git4idea/src/git4idea/log/GitRefManager.java index 551acba17e41..66e9a3c0be4f 100644 --- a/plugins/git4idea/src/git4idea/log/GitRefManager.java +++ b/plugins/git4idea/src/git4idea/log/GitRefManager.java @@ -40,11 +40,11 @@ import static com.intellij.ui.JBColor.namedColor; * @author Kirill Likhodedov */ public class GitRefManager implements VcsLogRefManager { - private static final JBColor HEAD_COLOR = namedColor("Git.Log.Ref.Head", VcsLogStandardColors.Refs.TIP); - private static final JBColor LOCAL_BRANCH_COLOR = namedColor("Git.Log.Ref.LocalBranch", VcsLogStandardColors.Refs.BRANCH); - private static final JBColor REMOTE_BRANCH_COLOR = namedColor("Git.Log.Ref.RemoteBranch", VcsLogStandardColors.Refs.BRANCH_REF); - private static final JBColor TAG_COLOR = namedColor("Git.Log.Ref.Tag", VcsLogStandardColors.Refs.TAG); - private static final JBColor OTHER_COLOR = namedColor("Git.Log.Ref.Other", VcsLogStandardColors.Refs.TAG); + private static final JBColor HEAD_COLOR = namedColor("VersionControl.GitLog.headIconColor", VcsLogStandardColors.Refs.TIP); + private static final JBColor LOCAL_BRANCH_COLOR = namedColor("VersionControl.GitLog.localBranchIconColor", VcsLogStandardColors.Refs.BRANCH); + private static final JBColor REMOTE_BRANCH_COLOR = namedColor("VersionControl.GitLog.remoteBranchIconColor", VcsLogStandardColors.Refs.BRANCH_REF); + private static final JBColor TAG_COLOR = namedColor("VersionControl.GitLog.tagIconColor", VcsLogStandardColors.Refs.TAG); + private static final JBColor OTHER_COLOR = namedColor("VersionControl.GitLog.otherIconColor", VcsLogStandardColors.Refs.TAG); public static final VcsRefType HEAD = new SimpleRefType("HEAD", true, HEAD_COLOR); public static final VcsRefType LOCAL_BRANCH = new SimpleRefType("LOCAL_BRANCH", true, LOCAL_BRANCH_COLOR); diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgRefManager.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgRefManager.java index a9392e7835a7..8ae89ea0d237 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgRefManager.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgRefManager.java @@ -43,16 +43,16 @@ import static com.intellij.ui.JBColor.namedColor; import static com.intellij.util.containers.ContainerUtil.getFirstItem; public class HgRefManager implements VcsLogRefManager { - private static final JBColor TIP_COLOR = namedColor("Hg.Log.Ref.Tip", VcsLogStandardColors.Refs.TIP); - private static final JBColor HEAD_COLOR = namedColor("Hg.Log.Ref.Head", VcsLogStandardColors.Refs.LEAF); - private static final JBColor BRANCH_COLOR = namedColor("Hg.Log.Ref.Branch", VcsLogStandardColors.Refs.BRANCH); - private static final JBColor CLOSED_BRANCH_COLOR = namedColor("Hg.Log.Ref.ClosedBranch", + private static final JBColor TIP_COLOR = namedColor("VersionControl.HgLog.tipIconColor", VcsLogStandardColors.Refs.TIP); + private static final JBColor HEAD_COLOR = namedColor("VersionControl.HgLog.headIconColor", VcsLogStandardColors.Refs.LEAF); + private static final JBColor BRANCH_COLOR = namedColor("VersionControl.HgLog.branchIconColor", VcsLogStandardColors.Refs.BRANCH); + private static final JBColor CLOSED_BRANCH_COLOR = namedColor("VersionControl.HgLog.closedBranchIconColor", new JBColor(new Color(0x823139), new Color(0xff5f6f))); - private static final JBColor BOOKMARK_COLOR = namedColor("Hg.Log.Ref.Bookmark", VcsLogStandardColors.Refs.BRANCH_REF); - private static final JBColor TAG_COLOR = namedColor("Hg.Log.Ref.Tag", VcsLogStandardColors.Refs.TAG); - private static final JBColor LOCAL_TAG_COLOR = namedColor("Hg.Log.Ref.LocalTag", + private static final JBColor BOOKMARK_COLOR = namedColor("VersionControl.HgLog.bookmarkIconColor", VcsLogStandardColors.Refs.BRANCH_REF); + private static final JBColor TAG_COLOR = namedColor("VersionControl.HgLog.tagIconColor", VcsLogStandardColors.Refs.TAG); + private static final JBColor LOCAL_TAG_COLOR = namedColor("VersionControl.HgLog.localTagIconColor", new JBColor(new Color(0x009090), new Color(0x00f3f3))); - private static final JBColor MQ_TAG_COLOR = namedColor("Hg.Log.Ref.MqTag", + private static final JBColor MQ_TAG_COLOR = namedColor("VersionControl.HgLog.mqTagIconColor", new JBColor(new Color(0x002f90), new Color(0x0055ff))); public static final VcsRefType TIP = new SimpleRefType("TIP", true, TIP_COLOR);