[ jEdit-CVS ] jEdit/org/gjt/sp/jedit/options AppearanceOptionPane.java,1.13,1.14 TextAreaOptionPane.java,1.22,1.23

[Alan E. <ez...@us...>]

Update of /cvsroot/jedit/jEdit/org/gjt/sp/jedit/options
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16239/org/gjt/sp/jedit/options

Modified Files:
	AppearanceOptionPane.java TextAreaOptionPane.java 
Log Message:
Now we really can see two antialiasing modes in 1.6,
and if you are using 1.5, you see the standard version when you set either.

Patched the AbstractOptionPane to extract any toolTipText() from the component
and set the label to have it too.

AboutDialog now reports currently used JDK version.



Index: TextAreaOptionPane.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/options/TextAreaOptionPane.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- TextAreaOptionPane.java	25 Feb 2006 04:33:59 -0000	1.22
+++ TextAreaOptionPane.java	25 Feb 2006 17:03:06 -0000	1.23
@@ -136,7 +136,7 @@
 		
 		antiAlias = new JComboBox(AntiAlias.comboChoices);
 		antiAlias.setToolTipText(jEdit.getProperty("options.textarea.antiAlias.tooltip"));
-		AntiAlias antiAliasValue = new AntiAlias();
+		AntiAlias antiAliasValue = AntiAlias.textArea();
 		font.setAntiAliasEnabled(antiAliasValue.val()>0);
 		antiAlias.addActionListener(new ActionListener()
 			{
@@ -199,8 +199,8 @@
 			wrapGuideColor.getSelectedColor());
 		jEdit.setIntegerProperty("view.electricBorders",electricBorders
 			.isSelected() ? 3 : 0);
-		AntiAlias nv = new AntiAlias(antiAlias.getSelectedIndex());
-		jEdit.setProperty("view.antiAlias", nv.toString());
+		AntiAlias nv = AntiAlias.textArea();
+		nv.set(antiAlias.getSelectedIndex());
 		jEdit.setBooleanProperty("view.fracFontMetrics",fracFontMetrics.isSelected());
 		jEdit.setBooleanProperty("stripTrailingEOL", stripTrailingEOL.isSelected());
 	} //}}}

Index: AppearanceOptionPane.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/options/AppearanceOptionPane.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- AppearanceOptionPane.java	1 Sep 2004 22:52:06 -0000	1.13
+++ AppearanceOptionPane.java	25 Feb 2006 17:03:06 -0000	1.14
@@ -28,6 +28,7 @@
 import java.awt.*;
 import java.io.*;
 import org.gjt.sp.jedit.gui.FontSelector;
+import org.gjt.sp.jedit.textarea.AntiAlias;
 import org.gjt.sp.jedit.*;
 import org.gjt.sp.util.Log;
 //}}}
@@ -82,6 +83,12 @@
 		addComponent(jEdit.getProperty("options.appearance.secondaryFont"),
 			secondaryFont);
 
+		/*
+		antiAliasExtras = new JComboBox(AntiAlias.comboChoices);
+		antiAliasExtras.setSelectedIndex(AntiAlias.appearance().val());
+		antiAliasExtras.setToolTipText(jEdit.getProperty("options.textarea.antiAlias.tooltip"));
+		addComponent(jEdit.getProperty("options.appearance.fonts.antialias"), antiAliasExtras);
+		*/
 		updateEnabled();
 
 		/* History count */
@@ -143,6 +150,14 @@
 		jEdit.setProperty("history",history.getText());
 		jEdit.setProperty("menu.spillover",menuSpillover.getText());
 		jEdit.setBooleanProperty("tip.show",showTips.isSelected());
+		
+		/* AntiAlias nv = AntiAlias.appearance();
+		 int idx = antiAliasExtras.getSelectedIndex();
+		nv.set(idx);
+		primaryFont.setAntiAliasEnabled(idx > 0);
+		secondaryFont.setAntiAliasEnabled(idx > 0);
+		primaryFont.repaint();
+		secondaryFont.repaint(); */
 
 		// this is handled a little differently from other jEdit settings
 		// as the splash screen flag needs to be known very early in the
@@ -198,6 +213,7 @@
 	private JCheckBox textColors;
 	private JCheckBox decorateFrames;
 	private JCheckBox decorateDialogs;
+	private JComboBox antiAliasExtras;
 	//}}}
 
 	//{{{ updateEnabled() method