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

include module name in frame title under macs

Browse Source
This commit is contained in:
Alexey Pegov
2011-05-03 15:40:46 +04:00
parent 9f50036ba7
commit 0582001ac9
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/wm/IdeaFrameTitleBuilder.java
+1 -1
View File
@@ -26,6 +26,6 @@ import com.intellij.openapi.wm.impl.PlatformFrameTitleBuilder;
*/
public class IdeaFrameTitleBuilder extends PlatformFrameTitleBuilder {
public String getFileTitle(final Project project, final VirtualFile file) {
return SystemInfo.isMac ? file.getName() : ProjectUtil.calcRelativeToProjectPath(file, project);
return ProjectUtil.calcRelativeToProjectPath(file, project, !SystemInfo.isMac);
}
}
platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java
+9 -8
View File
@@ -20,9 +20,6 @@
package com.intellij.openapi.project;
import com.intellij.ide.highlighter.InternalFileType;
import com.intellij.ide.highlighter.ModuleFileType;
import com.intellij.ide.highlighter.ProjectFileType;
import com.intellij.ide.highlighter.WorkspaceFileType;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
@@ -71,18 +68,18 @@ public class ProjectUtil {
return _path;
}
public static String calcRelativeToProjectPath(final VirtualFile file, final Project project) {
public static String calcRelativeToProjectPath(final VirtualFile file, final Project project, final boolean includeFilePath) {
if (file instanceof VirtualFilePathWrapper) {
return ((VirtualFilePathWrapper)file).getPresentablePath();
return includeFilePath ? ((VirtualFilePathWrapper)file).getPresentablePath() : file.getName();
}
String url = file.getPresentableUrl();
String url = includeFilePath ? file.getPresentableUrl() : file.getName();
if (project == null) {
return url;
}
else {
final VirtualFile baseDir = project.getBaseDir();
if (baseDir != null) {
if (baseDir != null && includeFilePath) {
//noinspection ConstantConditions
final String projectHomeUrl = baseDir.getPresentableUrl();
if (url.startsWith(projectHomeUrl)) {
@@ -93,6 +90,10 @@ public class ProjectUtil {
if (module == null) return url;
return new StringBuffer().append("[").append(module.getName()).append("] - ").append(url).toString();
}
}
public static String calcRelativeToProjectPath(final VirtualFile file, final Project project) {
return calcRelativeToProjectPath(file, project, true);
}
@Nullable