noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using [code] instead of [quote] for Copy for forum. Fixes #1675

This commit is contained in:
Federico Fissore 2013-11-14 17:45:23 +01:00
parent 9dcbfd47e1
commit fdb98f1213
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/processing/app/tools/DiscourseFormat.java
View File

@ -52,10 +52,10 @@ import processing.core.PApplet;
*/ */
public class DiscourseFormat { public class DiscourseFormat {
Editor editor; private Editor editor;
// JTextArea of the actual Editor // JTextArea of the actual Editor
JEditTextArea textarea; private JEditTextArea textarea;
boolean html; private boolean html;
/** /**
@ -75,7 +75,7 @@ public class DiscourseFormat {
*/ */
public void show() { public void show() {
// [code] tag cancels other tags, using [quote] // [code] tag cancels other tags, using [quote]
StringBuffer cf = new StringBuffer(html ? "<pre>\n" : "[quote]\n"); StringBuilder cf = new StringBuilder(html ? "<pre>\n" : "[code]\n");
int selStart = textarea.getSelectionStart(); int selStart = textarea.getSelectionStart();
int selStop = textarea.getSelectionStop(); int selStop = textarea.getSelectionStop();
@ -99,7 +99,7 @@ public class DiscourseFormat {
appendFormattedLine(cf, i); appendFormattedLine(cf, i);
} }
cf.append(html ? "\n</pre>" : "\n[/quote]"); cf.append(html ? "\n</pre>" : "\n[/code]");
StringSelection formatted = new StringSelection(cf.toString()); StringSelection formatted = new StringSelection(cf.toString());
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@ -111,17 +111,15 @@ public class DiscourseFormat {
Clipboard unixclipboard = Toolkit.getDefaultToolkit().getSystemSelection(); Clipboard unixclipboard = Toolkit.getDefaultToolkit().getSystemSelection();
if (unixclipboard != null) unixclipboard.setContents(formatted, null); if (unixclipboard != null) unixclipboard.setContents(formatted, null);
editor.statusNotice("Code formatted for " + editor.statusNotice("Code formatted for " + (html ? "HTML" : "the Arduino forum") + " has been copied to the clipboard.");
(html ? "HTML" : "the Arduino forum ") +
" has been copied to the clipboard.");
} }
/** /**
* Append a char to a stringbuffer while escaping for proper display in HTML. * Append a char to a StringBuilder while escaping for proper display in HTML.
* @param c input char to escape * @param c input char to escape
* @param buffer StringBuffer to append html-safe version of c to. * @param buffer StringBuilder to append html-safe version of c to.
*/ */
private void appendToHTML(char c, StringBuffer buffer) { private void appendToHTML(char c, StringBuilder buffer) {
if (!html) { if (!html) {
buffer.append(c); buffer.append(c);
} else if (c == '<') { } else if (c == '<') {
@ -138,7 +136,7 @@ public class DiscourseFormat {
} }
// A terrible headache... // A terrible headache...
public void appendFormattedLine(StringBuffer cf, int line) { public void appendFormattedLine(StringBuilder cf, int line) {
Segment segment = new Segment(); Segment segment = new Segment();
TextAreaPainter painter = textarea.getPainter(); TextAreaPainter painter = textarea.getPainter();
@ -203,12 +201,14 @@ public class DiscourseFormat {
// fm = painter.getFontMetrics(); // fm = painter.getFontMetrics();
} else { } else {
// Place open tags [] // Place open tags []
cf.append(html ? "<span style=\"color: #" : "[color=#"); if (html) {
cf.append(PApplet.hex(styles[id].getColor().getRGB() & 0xFFFFFF, 6)); cf.append("<span style=\"color: #");
cf.append(html ? ";\">" : "]"); cf.append(PApplet.hex(styles[id].getColor().getRGB() & 0xFFFFFF, 6));
cf.append(";\">");
}
if (styles[id].isBold()) if (html && styles[id].isBold())
cf.append(html ? "<b>" : "[b]"); cf.append("<b>");
// fm = styles[id].getFontMetrics(defaultFont); // fm = styles[id].getFontMetrics(defaultFont);
} }
@ -228,10 +228,10 @@ public class DiscourseFormat {
appendToHTML(c, cf); appendToHTML(c, cf);
} }
// Place close tags [/] // Place close tags [/]
if (j == (length - 1) && id != Token.NULL && styles[id].isBold()) if (html && j == (length - 1) && id != Token.NULL && styles[id].isBold())
cf.append(html ? "</b>" : "[/b]"); cf.append("</b>");
if (j == (length - 1) && id != Token.NULL) if (html && j == (length - 1) && id != Token.NULL)
cf.append(html ? "</span>" : "[/color]"); cf.append("</span>");
// int charWidth; // int charWidth;
// if (c == '\t') { // if (c == '\t') {
// charWidth = (int) painter // charWidth = (int) painter