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

localize "Preferences | Version Control | File Status Colors" configurable

Browse Source 
GitOrigin-RevId: 1d9f4b751508345d0e5bbdce350bed03ff322a6d
This commit is contained in:
Dmitry.Krasilschikov
2020-01-16 08:11:51 +00:00
committed by intellij-monorepo-bot
parent dc8b9bfa24
commit 3997821765
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/VcsBundle.properties
+4 -1
View File
@@ -697,4 +697,7 @@ radio.restore.workspace.on.branch.switching=Restore workspace on &branch switchi
settings.when.files.are.deleted=When files are deleted
checkbox.including.external.files=Including &external files
settings.border.when.files.are.created=When files are created
settings.border.when.empty.changelist.becomes.inactive=When empty changelist becomes inactive
settings.border.when.empty.changelist.becomes.inactive=When empty changelist becomes inactive
settings.file.status.color.modified.in.not.active.changelist=Modified in not active changelist
settings.file.status.color.added.in.not.active.changelist=Added in not active changelist
settings.file.status.color.changelist.conflict=Changelist conflict
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java
+7 -6
View File
@@ -5,6 +5,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.FileStatusFactory;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
import com.intellij.openapi.vcs.impl.FileStatusProvider;
import com.intellij.openapi.vfs.VirtualFile;
@@ -16,12 +17,12 @@ import org.jetbrains.annotations.Nullable;
* @author Dmitry Avdeev
*/
public final class ChangelistConflictFileStatusProvider implements FileStatusProvider {
public static final FileStatus MODIFIED_OUTSIDE =
FileStatusFactory.getInstance().createFileStatus("modifiedOutside", "Modified in not active changelist");
public static final FileStatus ADDED_OUTSIDE =
FileStatusFactory.getInstance().createFileStatus("addedOutside", "Added in not active changelist");
public static final FileStatus CHANGELIST_CONFLICT =
FileStatusFactory.getInstance().createFileStatus("changelistConflict", "Changelist conflict");
public static final FileStatus MODIFIED_OUTSIDE = FileStatusFactory.getInstance()
.createFileStatus("modifiedOutside", VcsBundle.message("settings.file.status.color.modified.in.not.active.changelist"));
public static final FileStatus ADDED_OUTSIDE = FileStatusFactory.getInstance()
.createFileStatus("addedOutside", VcsBundle.message("settings.file.status.color.added.in.not.active.changelist"));
public static final FileStatus CHANGELIST_CONFLICT = FileStatusFactory.getInstance()
.createFileStatus("changelistConflict", VcsBundle.message("settings.file.status.color.changelist.conflict"));
private final ChangeListManagerImpl myChangeListManager;