MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-209149 File Status colors COPIED and RENAMED always appear in editor color scheme

Browse Source
This commit is contained in:
Konstantin Bulenkov
2019-03-18 12:53:38 +01:00
parent 8d2d708d6c
commit 30a530da98
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/DefaultColorSchemesManager.xml
+4
View File
@@ -35,6 +35,7 @@
<option name="DIFF_SEPARATORS_BACKGROUND" value="D9D9D9"/>
<option name="FILESTATUS_ADDED" value="0a7700"/>
<option name="FILESTATUS_COPIED" value="0a7700"/>
<option name="FILESTATUS_DELETED" value="616161"/>
<option name="FILESTATUS_IDEA_FILESTATUS_DELETED_FROM_FILE_SYSTEM" value="773895"/>
<option name="FILESTATUS_IDEA_FILESTATUS_IGNORED" value="727238"/>
@@ -43,6 +44,7 @@
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="ff0000"/>
<option name="FILESTATUS_MERGED" value="7503dc"/>
<option name="FILESTATUS_MODIFIED" value="0032a0"/>
<option name="FILESTATUS_RENAMED" value="007c7c"/>
<option name="FILESTATUS_NOT_CHANGED" value=""/>
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="3264b4"/>
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="8aa4c8"/>
@@ -1183,6 +1185,7 @@
<option name="CARET_ROW_COLOR" value="323232" />
<option name="CONSOLE_BACKGROUND_KEY" value="2B2B2B" />
<option name="FILESTATUS_ADDED" value="629755" />
<option name="FILESTATUS_COPIED" value="629755"/>
<option name="FILESTATUS_DELETED" value="6c6c6c" />
<option name="FILESTATUS_IDEA_FILESTATUS_DELETED_FROM_FILE_SYSTEM" value="6c6c6c" />
<option name="FILESTATUS_IDEA_FILESTATUS_IGNORED" value="848504" />
@@ -1191,6 +1194,7 @@
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_MERGED" value="9876aa" deuteranopia="828eba" protanopia="828eba"/>
<option name="FILESTATUS_MODIFIED" value="6897bb" />
<option name="FILESTATUS_RENAMED" value="3a8484"/>
<option name="FILESTATUS_NOT_CHANGED" value="" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="6897bb" />
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="6897bb" />
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
+2 -7
View File
@@ -19,7 +19,6 @@ import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.changes.*;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.JBColor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.NotNull;
@@ -32,20 +31,16 @@ import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
import org.zmlx.hg4idea.repo.HgRepository;
import org.zmlx.hg4idea.util.HgUtil;
import java.awt.*;
import java.io.File;
import java.util.*;
import java.util.List;
public class HgChangeProvider implements ChangeProvider {
private final Project myProject;
private final VcsKey myVcsKey;
public static final FileStatus COPIED = FileStatusFactory.getInstance().createFileStatus("COPIED", "Copied", FileStatus.ADDED.getColor());
public static final FileStatus RENAMED = FileStatusFactory.getInstance().createFileStatus("RENAMED", "Renamed",
new JBColor(JBColor.CYAN.darker().darker(),
new Color(0x3a8484)));
public static final FileStatus COPIED = FileStatusFactory.getInstance().createFileStatus("COPIED", "Copied");
public static final FileStatus RENAMED = FileStatusFactory.getInstance().createFileStatus("RENAMED", "Renamed");
private static final EnumMap<HgFileStatusEnum, HgChangeProcessor> PROCESSORS =
new EnumMap<>(HgFileStatusEnum.class);