halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Style adjustments for MacOS

Browse Source
This commit is contained in:
Fabian Becker 2014-11-04 21:44:24 +01:00
parent efe1a1188b
commit cb89110e86
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/eva2/gui/PropertySheetPanel.java
View File

@ -7,6 +7,7 @@ import eva2.util.annotation.Hidden;
import eva2.util.annotation.Parameter; import eva2.util.annotation.Parameter;
import javax.swing.*; import javax.swing.*;
import javax.swing.plaf.InsetsUIResource;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
@ -514,7 +515,7 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
private JPanel makeInfoPanel(String infoText, Object targ, int rowHeight) { private JPanel makeInfoPanel(String infoText, Object targ, int rowHeight) {
className = targ.getClass().getName(); className = targ.getClass().getName();
helpButton = new JButton("Help"); helpButton = new JButton("?");
helpButton.setToolTipText("More information about " + className); helpButton.setToolTipText("More information about " + className);
helpButton.addActionListener(new ActionListener() { helpButton.addActionListener(new ActionListener() {
@ -523,6 +524,7 @@ public final class PropertySheetPanel extends JPanel implements PropertyChangeLi
openHelpFrame(); openHelpFrame();
} }
}); });
helpButton.putClientProperty("JButton.buttonType", "help");
JTextArea infoTextArea = new JTextArea(); JTextArea infoTextArea = new JTextArea();
infoTextArea.setText(infoText); infoTextArea.setText(infoText);
@ -999,10 +1001,19 @@ class PropertyCellRenderer implements TableCellRenderer {
JComponent component = new JPanel(); JComponent component = new JPanel();
component.setLayout(new BorderLayout()); component.setLayout(new BorderLayout());
component.add((PropertyPanel) value, BorderLayout.CENTER); component.add((PropertyPanel) value, BorderLayout.CENTER);
final JButton dialogButton = new JButton("..."); final JButton dialogButton = new JButton("...") {
dialogButton.setMargin(new Insets(0,0,0,0)); @Override
public void paint(Graphics g) {
Color old = g.getColor();
g.setColor(Color.WHITE);
g.fillRect(0,0,100,100);
g.setColor(old);
super.paint(g);
}
};
dialogButton.setMargin(new Insets(0, 0, 0, 0));
dialogButton.putClientProperty("JButton.buttonType", "bevel");
dialogButton.setBackground(Color.WHITE); dialogButton.setBackground(Color.WHITE);
component.add(dialogButton, BorderLayout.LINE_END); component.add(dialogButton, BorderLayout.LINE_END);
return component; return component;
} else if (value instanceof PropertyText) { } else if (value instanceof PropertyText) {
@ -1035,8 +1046,18 @@ class PropertyCellEditor extends AbstractCellEditor implements TableCellEditor {
component = new JPanel(); component = new JPanel();
component.setLayout(new BorderLayout()); component.setLayout(new BorderLayout());
component.add((PropertyPanel) value, BorderLayout.CENTER); component.add((PropertyPanel) value, BorderLayout.CENTER);
final JButton dialogButton = new JButton("..."); final JButton dialogButton = new JButton("...") {
dialogButton.setMargin(new Insets(0,0,0,0)); @Override
public void paint(Graphics g) {
Color old = g.getColor();
g.setColor(Color.WHITE);
g.fillRect(0,0,100,100);
g.setColor(old);
super.paint(g);
}
};
dialogButton.setMargin(new Insets(0, 0, 0, 0));
dialogButton.putClientProperty("JButton.buttonType", "bevel");
dialogButton.setBackground(Color.WHITE); dialogButton.setBackground(Color.WHITE);
dialogButton.addActionListener(new ActionListener() { dialogButton.addActionListener(new ActionListener() {
@Override @Override

2
src/eva2/optimization/statistics/AbstractStatistics.java
View File

@ -565,7 +565,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
// String header = getOutputHeader(lastInformerList, bestPop); // String header = getOutputHeader(lastInformerList, bestPop);
List<Object> vals = getOutputValues(lastInformerList, bestPop); List<Object> vals = getOutputValues(lastInformerList, bestPop);
StringBuilder sbuf = new StringBuilder("Overall best statistical data: "); StringBuilder sbuf = new StringBuilder("Overall best statistical data: \n");
sbuf.append(additionalFields); sbuf.append(additionalFields);
sbuf.append('\n'); sbuf.append('\n');
sbuf.append(StringTools.concatValues(vals, textFieldDelimiter)); sbuf.append(StringTools.concatValues(vals, textFieldDelimiter));