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

Changes for UI spec at IDEA-175743 (draft)

Browse Source 
- Show "default" colum
This commit is contained in:
Rustam Vishnyakov
2017-09-26 18:16:13 +03:00
parent c1cfe34535
commit 197db1aae9
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/colors/fileStatus/FileStatusColorsTable.java
+23 -1
View File
@@ -55,6 +55,7 @@ public class FileStatusColorsTable extends JBTable {
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
setDefaultRenderer(Color.class, new MyColorCellRenderer());
setDefaultRenderer(String.class, new MyStatusCellRenderer());
setDefaultRenderer(Boolean.class, new MyDefaultStatusRenderer());
setTableHeader(null);
registerKeyboardAction(new ActionListener() {
@Override
@@ -76,9 +77,9 @@ public class FileStatusColorsTable extends JBTable {
private void initPopup() {
mySetColorMenu = new JBPopupMenu();
mySetColorMenu.add(new JBMenuItem(new DropColorAction()));
mySetColorMenu.add(new JBMenuItem(new ChooseColorAction()));
myResetItem = new JBMenuItem(new ResetToDefaultAction());
mySetColorMenu.add(myResetItem);
mySetColorMenu.add(new JBMenuItem(new ChooseColorAction()));
}
private class ChooseColorAction extends AbstractAction {
@@ -254,6 +255,27 @@ public class FileStatusColorsTable extends JBTable {
}
}
private static class MyDefaultStatusRenderer extends DefaultTableCellRenderer {
private final JLabel myLabel = new JLabel();
private final Color myLabelColor;
public MyDefaultStatusRenderer() {
myLabel.setOpaque(true);
myLabelColor = ColorUtil.withAlpha(myLabel.getForeground(), 0.5);
}
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
if (value instanceof Boolean) {
myLabel.setForeground(isSelected ? UIUtil.getTableSelectionForeground() : myLabelColor);
myLabel.setBackground(UIUtil.getTableBackground(isSelected));
myLabel.setText((Boolean)value ? "(default)" : "");
return myLabel;
}
return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
}
}
private static class MyColorIcon extends EmptyIcon {
public static final int COLOR_HEIGHT = 14;
platform/lang-impl/src/com/intellij/application/options/colors/fileStatus/FileStatusColorsTableModel.java
+4 -1
View File
@@ -40,7 +40,10 @@ public class FileStatusColorsTableModel extends AbstractTableModel {
new ColumnInfo(
String.class, ApplicationBundle.message("file.status.colors.header.status"), descriptor -> descriptor.getStatus().getText()),
new ColumnInfo(
Color.class, ApplicationBundle.message("file.status.colors.header.color"), descriptor -> descriptor.getColor())
Color.class, ApplicationBundle.message("file.status.colors.header.color"), descriptor -> descriptor.getColor()),
new ColumnInfo(
Boolean.class, "", descriptor -> descriptor.isDefault()
)
};
private static class ColumnInfo {
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+1 -1
View File
@@ -585,7 +585,7 @@ file.status.colors.header.color=Color
file.status.color.none=UI Font Color
file.status.color.menu.choose.color=Custom...
file.status.color.menu.normal.text=UI Font Color
file.status.color.menu.reset.to.default=Restore Default
file.status.color.menu.reset.to.default=Default
title.scope.based=By Scope
title.colors.and.fonts=Color Scheme
progress.analysing.font=Analysing font: {0}