[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5625] trunk/sql12

[<ger...@us...>]

Revision: 5625
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5625&view=rev
Author:   gerdwagner
Date:     2010-05-20 20:44:48 +0000 (Thu, 20 May 2010)

Log Message:
-----------
Fonts in RSyntax

Modified Paths:
--------------
    trunk/sql12/doc/changes.txt
    trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
    trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java

Modified: trunk/sql12/doc/changes.txt
===================================================================
--- trunk/sql12/doc/changes.txt	2010-05-10 18:17:46 UTC (rev 5624)
+++ trunk/sql12/doc/changes.txt	2010-05-20 20:44:48 UTC (rev 5625)
@@ -6,6 +6,7 @@
 
 Bug-fixes:
 
+2991971: RSyntax text editor ignores font settings
 2992443: Cannot use RSyntax or Netbeans editors
 
 Parser could be triggered far to often which resulted in high CPU and memory load.

Modified: trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
===================================================================
--- trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java	2010-05-10 18:17:46 UTC (rev 5624)
+++ trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java	2010-05-20 20:44:48 UTC (rev 5625)
@@ -14,6 +14,7 @@
 import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search.SquirrelRSyntaxSearchEngine;
 import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
 import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
 import org.fife.ui.rtextarea.RTextAreaUI;
 
@@ -22,6 +23,7 @@
 import javax.swing.event.ChangeListener;
 import javax.swing.text.Document;
 import javax.swing.text.DefaultCaret;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.ActionEvent;
 
@@ -122,7 +124,10 @@
 
    public void updateFromPreferences()
    {
-      _squirrelSyntaxScheme.initSytles(_prefs);
+      setFont(_session.getProperties().getFontInfo().createFont());
+      _squirrelSyntaxScheme.initSytles(_prefs, _session.getProperties().getFontInfo());
+      new RSyntaxTextAreaEditorKit.IncreaseFontSizeAction().actionPerformedImpl(new ActionEvent(this, 1, "foo"), this);
+      new RSyntaxTextAreaEditorKit.DecreaseFontSizeAction().actionPerformedImpl(new ActionEvent(this, 1, "bar"), this);
       repaint();
    }
 

Modified: trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java
===================================================================
--- trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java	2010-05-10 18:17:46 UTC (rev 5624)
+++ trunk/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java	2010-05-20 20:44:48 UTC (rev 5625)
@@ -1,5 +1,7 @@
 package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax;
 
+import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+import net.sourceforge.squirrel_sql.fw.gui.FontInfo;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.Style;
 import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
@@ -22,19 +24,19 @@
       super(true);
    }
 
-   public void initSytles(SyntaxPreferences prefs)
+   public void initSytles(SyntaxPreferences prefs, FontInfo fontInfo)
    {
       super.restoreDefaults();
       Style[] stylesBuf = new Style[SquirrelTokenMarker.getNumTokenTypes()];
       System.arraycopy(styles, 0, stylesBuf, 0, styles.length);
 
-      Font temp = RSyntaxTextArea.getDefaultFont();
       StyleContext sc = StyleContext.getDefaultStyleContext();
-      Font boldFont = sc.getFont(temp.getFamily(), Font.BOLD,
-                     temp.getSize());
-      Font italicFont = sc.getFont(temp.getFamily(), Font.ITALIC,
-                     temp.getSize());
 
+
+      Font boldFont = sc.getFont(fontInfo.getFamily(), Font.BOLD, fontInfo.getSize());
+      Font italicFont = sc.getFont(fontInfo.getFamily(), Font.ITALIC, fontInfo.getSize());
+
+
 //      stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_TABLE] = new Style(Color.green, null);
 //      stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_DATA_TYPE] = new Style(new Color(178,178,0), null, boldFont);
 //      stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_COLUMN] = new Style(new Color(102,102,0), null, boldFont);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.