From: <sh...@us...> - 2008-11-27 15:26:17
|
Revision: 13347 http://cdk.svn.sourceforge.net/cdk/?rev=13347&view=rev Author: shk3 Date: 2008-11-27 15:26:12 +0000 (Thu, 27 Nov 2008) Log Message: ----------- added choosing of background color (more a gimmick, ok) Modified Paths: -------------- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/editor/Renderer2DModelEditor.java Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2008-11-27 15:14:24 UTC (rev 13346) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/RenderPanel.java 2008-11-27 15:26:12 UTC (rev 13347) @@ -125,6 +125,7 @@ public void paint(Graphics g) { super.paint(g); + this.setBackground(renderer.getRenderer2DModel().getBackColor()); this.paintChemModel(g, this.getVisibleRect()); } Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/editor/Renderer2DModelEditor.java =================================================================== --- jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/editor/Renderer2DModelEditor.java 2008-11-27 15:14:24 UTC (rev 13346) +++ jchempaint/trunk/src/main/org/openscience/jchempaint/dialog/editor/Renderer2DModelEditor.java 2008-11-27 15:26:12 UTC (rev 13347) @@ -28,12 +28,14 @@ */ package org.openscience.jchempaint.dialog.editor; +import java.awt.Color; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JColorChooser; import javax.swing.JFrame; import javax.swing.JLabel; @@ -63,10 +65,15 @@ private JLabel fontName; private JButton chooseFontButton; private Font currentFont; + private JLabel color; + private JButton chooseColorButton; + private Color currentColor; private JFrame frame; private Renderer2DModel model; + + public Renderer2DModelEditor(JFrame frame) { super(); @@ -104,6 +111,12 @@ chooseFontButton.addActionListener(this); chooseFontButton.setActionCommand("chooseFont"); addField("", chooseFontButton); + color = new JLabel("BACKCOLOR"); + addField("Background color", color); + chooseColorButton = new JButton("Choose Color..."); + chooseColorButton.addActionListener(this); + chooseColorButton.setActionCommand("chooseColor"); + addField("", chooseColorButton); } public void setModel(Renderer2DModel model) { @@ -123,6 +136,10 @@ if (currentFont != null) { fontName.setText(currentFont.getFontName()); } + currentColor = model.getBackColor(); + if (currentColor != null) { + color.setForeground(currentColor); + } validate(); } @@ -139,6 +156,7 @@ model.setShowTooltip(showToolTip.isSelected()); model.setShowReactionBoxes(showReactionBoxes.isSelected()); model.setFont(currentFont); + model.setBackColor(currentColor); } /** @@ -152,6 +170,13 @@ fontName.setText(currentFont.getFontName()); } } + if ("chooseColor".equals(e.getActionCommand())) { + Color newColor = JColorChooser.showDialog(this, "Choose Background Color", model.getBackColor()); + if (newColor != null) { + currentColor = newColor; + color.setForeground(currentColor); + } + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |