Fixed several defaults in the L&Fs
2006-01-04 Lillian Angel <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Removed unneeded default.
* javax/swing/plaf/metal/MetalLookAndFeel.java
(initComponentDefaults): Added and fixed several defaults.
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.80
diff -u -r1.80 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java 3 Jan 2006 19:50:28 -0000 1.80
+++ javax/swing/plaf/basic/BasicLookAndFeel.java 4 Jan 2006 14:54:57 -0000
@@ -785,7 +785,6 @@
"MenuItem.background", new ColorUIResource(light),
"MenuItem.border", new BasicBorders.MarginBorder(),
"MenuItem.borderPainted", Boolean.FALSE,
- "MenuItem.checkIcon", BasicIconFactory.getMenuItemCheckIcon(),
"MenuItem.font", new FontUIResource("Dialog", Font.PLAIN, 12),
"MenuItem.foreground", new ColorUIResource(darkShadow),
"MenuItem.margin", new InsetsUIResource(2, 2, 2, 2),
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.75
diff -u -r1.75 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java 3 Jan 2006 22:49:31 -0000 1.75
+++ javax/swing/plaf/metal/MetalLookAndFeel.java 4 Jan 2006 14:54:57 -0000
@@ -936,7 +936,7 @@
"EditorPane.background", getWindowBackground(),
"EditorPane.caretForeground", getUserTextColor(),
- "EditorPane.font", new FontUIResource("Dialog", Font.PLAIN, 12),
+ "EditorPane.font", new FontUIResource("Dialog", Font.BOLD, 12),
"EditorPane.foreground", getUserTextColor(),
"EditorPane.inactiveForeground", getInactiveSystemTextColor(),
"EditorPane.selectionBackground", getTextHighlightColor(),
@@ -963,7 +963,9 @@
MetalIconFactory.getFileChooserHomeFolderIcon(),
"FileChooser.detailsViewIcon",
MetalIconFactory.getFileChooserDetailViewIcon(),
-
+ "FileChooser.fileNameLabelMnemonic", new Integer(78),
+ "FileChooser.filesOfTypeLabelMnemonic",new Integer(84),
+ "FileChooser.lookInLabelMnemonic", new Integer(73),
"FileView.computerIcon", MetalIconFactory.getTreeComputerIcon(),
"FileView.directoryIcon", MetalIconFactory.getTreeFolderIcon(),
"FileView.fileIcon", MetalIconFactory.getTreeLeafIcon(),
@@ -981,15 +983,20 @@
"InternalFrame.icon", MetalIconFactory.getInternalFrameDefaultMenuIcon(),
"InternalFrame.closeIcon",
MetalIconFactory.getInternalFrameCloseIcon(16),
+ "InternalFrame.closeSound", "sounds/FrameClose.wav",
"InternalFrame.inactiveTitleBackground", getWindowTitleInactiveBackground(),
"InternalFrame.inactiveTitleForeground", getWindowTitleInactiveForeground(),
"InternalFrame.maximizeIcon",
MetalIconFactory.getInternalFrameMaximizeIcon(16),
+ "InternalFrame.maximizeSound", "sounds/FrameMaximize.wav",
"InternalFrame.iconifyIcon",
MetalIconFactory.getInternalFrameMinimizeIcon(16),
+ "InternalFrame.minimizeSound", "sounds/FrameMinimize.wav",
"InternalFrame.paletteBorder", new MetalBorders.PaletteBorder(),
"InternalFrame.paletteCloseIcon", new MetalIconFactory.PaletteCloseIcon(),
"InternalFrame.paletteTitleHeight", new Integer(11),
+ "InternalFrame.restoreDownSound", "sounds/FrameRestoreDown.wav",
+ "InternalFrame.restoreUpSound", "sounds/FrameRestoreUp.wav",
"Label.background", getControl(),
"Label.disabledForeground", getInactiveSystemTextColor(),
@@ -1012,12 +1019,14 @@
"Menu.background", getMenuBackground(),
"Menu.border", new MetalBorders.MenuItemBorder(),
"Menu.borderPainted", Boolean.TRUE,
- "Menu.checkIcon", MetalIconFactory.getMenuItemCheckIcon(),
+ "MenuItem.commandSound", "sounds/MenuItemCommand.wav",
"Menu.disabledForeground", getMenuDisabledForeground(),
"Menu.font", getControlTextFont(),
"Menu.foreground", getMenuForeground(),
"Menu.selectionBackground", getMenuSelectedBackground(),
"Menu.selectionForeground", getMenuSelectedForeground(),
+ "Menu.submenuPopupOffsetX", new Integer(-4),
+ "Menu.submenuPopupOffsetY", new Integer(-3),
"MenuBar.background", getMenuBackground(),
"MenuBar.border", new MetalBorders.MenuBarBorder(),
@@ -1026,12 +1035,14 @@
"MenuBar.highlight", getControlHighlight(),
"MenuBar.shadow", getControlShadow(),
+ "MenuItem.acceleratorDelimiter", "-",
"MenuItem.acceleratorFont", new FontUIResource("Dialog", Font.PLAIN, 10),
"MenuItem.acceleratorForeground", getAcceleratorForeground(),
"MenuItem.acceleratorSelectionForeground", getAcceleratorSelectedForeground(),
"MenuItem.arrowIcon", MetalIconFactory.getMenuItemArrowIcon(),
"MenuItem.background", getMenuBackground(),
"MenuItem.border", new MetalBorders.MenuItemBorder(),
+ "MenuItem.borderPainted", Boolean.TRUE,
"MenuItem.disabledForeground", getMenuDisabledForeground(),
"MenuItem.font", getControlTextFont(),
"MenuItem.foreground", getMenuForeground(),
@@ -1039,6 +1050,10 @@
"MenuItem.selectionForeground", getMenuSelectedForeground(),
"OptionPane.background", getControl(),
+ "OptionPane.errorSound", "sounds/OptionPaneError.wav",
+ "OptionPane.informationSound", "sounds/OptionPaneInformation.wav",
+ "OptionPane.questionSound", "sounds/OptionPaneQuestion.wav",
+ "OptionPane.warningSound", "sounds/OptionPaneWarning.wav",
"OptionPane.errorDialog.border.background", new ColorUIResource(153, 51, 51),
"OptionPane.errorDialog.titlePane.background", new ColorUIResource(255, 153, 153),
"OptionPane.errorDialog.titlePane.foreground", new ColorUIResource(51, 0, 0),
@@ -1062,6 +1077,7 @@
new BorderUIResource(MetalBorders.getTextFieldBorder()),
"PasswordField.caretForeground", getUserTextColor(),
"PasswordField.foreground", getUserTextColor(),
+ "PasswordField.font", new FontUIResource("Dialog", Font.PLAIN, 12),
"PasswordField.inactiveBackground", getControl(),
"PasswordField.inactiveForeground", getInactiveSystemTextColor(),
"PasswordField.selectionBackground", getTextHighlightColor(),
@@ -1071,6 +1087,7 @@
"PopupMenu.border", new MetalBorders.PopupMenuBorder(),
"PopupMenu.font", new FontUIResource("Dialog", Font.BOLD, 12),
"PopupMenu.foreground", getMenuForeground(),
+ "PopupMenu.popupSound", "sounds/PopupMenuPopup.wav",
"ProgressBar.background", getControl(),
"ProgressBar.border", new BorderUIResource.LineBorderUIResource(getControlDarkShadow(), 1),
@@ -1106,6 +1123,7 @@
"RadioButtonMenuItem.borderPainted", Boolean.TRUE,
"RadioButtonMenuItem.checkIcon",
MetalIconFactory.getRadioButtonMenuItemIcon(),
+ "RadioButtonMenuItem.commandSound", "sounds/MenuItemCommand.wav",
"RadioButtonMenuItem.disabledForeground", getMenuDisabledForeground(),
"RadioButtonMenuItem.font", MetalLookAndFeel.getControlTextFont(),
"RadioButtonMenuItem.foreground", getMenuForeground(),
@@ -1115,6 +1133,7 @@
"RadioButtonMenuItem.selectionForeground",
MetalLookAndFeel.getMenuSelectedForeground(),
+ "ScrollBar.allowsAbsolutePositioning", Boolean.TRUE,
"ScrollBar.background", getControl(),
"ScrollBar.darkShadow", getControlDarkShadow(),
"ScrollBar.foreground", getControl(),
@@ -1150,6 +1169,7 @@
"Slider.verticalThumbIcon",
MetalIconFactory.getVerticalSliderThumbIcon(),
+ "Spinner.arrowButtonInsets", new InsetsUIResource(0, 0, 0, 0),
"Spinner.background", getControl(),
"Spinner.font", new FontUIResource("Dialog", Font.BOLD, 12),
"Spinner.foreground", getControl(),
@@ -1157,6 +1177,7 @@
"SplitPane.background", getControl(),
"SplitPane.darkShadow", getControlDarkShadow(),
"SplitPane.dividerFocusColor", getPrimaryControl(),
+ "SplitPane.dividerSize", new Integer(10),
"SplitPane.highlight", getControlHighlight(),
"SplitPane.shadow", getControlShadow(),
@@ -1259,6 +1280,7 @@
"ToolTip.font", new FontUIResource("Dialog", Font.PLAIN, 12),
"ToolTip.foreground", getPrimaryControlInfo(),
"ToolTip.foregroundInactive", getControlDarkShadow(),
+ "ToolTip.hideAccelerator", Boolean.FALSE,
"Tree.background", getWindowBackground(),
"Tree.closedIcon", MetalIconFactory.getTreeFolderIcon(),
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
