eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

set text style properly for Contribution Manager error message

Browse Source
This commit is contained in:
Ben Fry
2016-11-07 18:14:23 -05:00
parent e7b4d02c6a
commit b714e5d9de
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/processing/app/contrib/ContributionTab.java
View File

@@ -30,7 +30,6 @@ import java.util.*;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.text.*;
import processing.app.*;
import processing.app.ui.Editor;
@@ -200,21 +199,24 @@ public class ContributionTab extends JPanel {
layout.setAutoCreateGaps(true);
layout.setAutoCreateContainerGaps(true);
errorPanel.setLayout(layout);
// errorPanel.setBorder(BorderFactory.createMatteBorder(2, 0, 0, 0, Color.BLACK));
errorMessage = new JTextPane();
errorMessage.setEditable(false);
errorMessage.setContentType("text/html");
errorMessage.setText("<html><body>Could not connect to the Processing server.<br>"
errorMessage.setText("<html><body><center>Could not connect to the Processing server.<br>"
+ "Contributions cannot be installed or updated without an Internet connection.<br>"
+ "Please verify your network connection again, then try connecting again.</body></html>");
errorMessage.setFont(Toolkit.getSansFont(14, Font.PLAIN));
errorMessage.setMaximumSize(new Dimension(550, 50));
+ "Please verify your network connection again, then try connecting again.</center></body></html>");
DetailPanel.setTextStyle(errorMessage, "1em");
Dimension dim = new Dimension(550, 60);
errorMessage.setMaximumSize(dim);
errorMessage.setMinimumSize(dim);
errorMessage.setOpaque(false);
/*
StyledDocument doc = errorMessage.getStyledDocument();
SimpleAttributeSet center = new SimpleAttributeSet();
StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER);
doc.setParagraphAttributes(0, doc.getLength(), center, false);
*/
closeButton = Toolkit.createIconButton("manager/close");
closeButton.setContentAreaFilled(false);

6
app/src/processing/app/contrib/DetailPanel.java
View File

@@ -167,7 +167,7 @@ class DetailPanel extends JPanel {
margin.bottom = 0;
descriptionPane.setMargin(margin);
descriptionPane.setContentType("text/html");
setTextStyle(descriptionPane);
setTextStyle(descriptionPane, "0.95em");
descriptionPane.setOpaque(false);
if (UIManager.getLookAndFeel().getID().equals("Nimbus")) {
descriptionPane.setBackground(new Color(0, 0, 0, 0));
@@ -714,7 +714,7 @@ class DetailPanel extends JPanel {
}
static void setTextStyle(JTextPane textPane) {
static void setTextStyle(JTextPane textPane, String fontSize) {
Document doc = textPane.getDocument();
if (doc instanceof HTMLDocument) {
HTMLDocument html = (HTMLDocument) doc;
@@ -722,7 +722,7 @@ class DetailPanel extends JPanel {
stylesheet.addRule("body { " +
" margin: 0; padding: 0;" +
" font-family: " + Toolkit.getSansFontName() + ", Arial, Helvetica, sans-serif;" +
" font-size: 100%;" + "font-size: 0.95em; " +
" font-size: 100%;" + "font-size: " + fontSize + "; " +
"}");
}
}

2
todo.txt
View File

@@ -1,4 +1,6 @@
0256 (3.2.4 or 3.3)
X only require reference.zip (and internet connection) when building dist
X set text style properly for Contribution Manager error message
_ fix appbundler problems due to rollback