You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by hi...@apache.org on 2001/03/27 15:36:22 UTC
cvs commit: xml-batik/sources/org/apache/batik/util/gui UserStyleDialog.java
hillion 01/03/27 05:36:22
Modified: sources/org/apache/batik/apps/svgbrowser
JSVGViewerFrame.java
sources/org/apache/batik/css/value FontWeightResolver.java
sources/org/apache/batik/util/gui UserStyleDialog.java
Log:
- when a new window is open, it is now initialized with the current options,
- fixed a bug with font-weight property having an identifier value.
Revision Changes Path
1.12 +62 -17 xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JSVGViewerFrame.java 2001/03/26 16:13:23 1.11
+++ JSVGViewerFrame.java 2001/03/27 13:36:22 1.12
@@ -125,7 +125,7 @@
* This class represents a SVG viewer swing frame.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: JSVGViewerFrame.java,v 1.11 2001/03/26 16:13:23 tkormann Exp $
+ * @version $Id: JSVGViewerFrame.java,v 1.12 2001/03/27 13:36:22 hillion Exp $
*/
public class JSVGViewerFrame
extends JFrame
@@ -586,7 +586,33 @@
public class NewWindowAction extends AbstractAction {
public NewWindowAction() {}
public void actionPerformed(ActionEvent e) {
- application.createAndShowJSVGViewerFrame();
+ JSVGViewerFrame vf = application.createAndShowJSVGViewerFrame();
+
+ // Copy the current settings to the new window.
+ vf.autoAdjust = autoAdjust;
+ AutoAdjustAction aaa;
+ aaa = (AutoAdjustAction)vf.listeners.get(AUTO_ADJUST_ACTION);
+ aaa.menuItem.setSelected(autoAdjust);
+
+ vf.debug = debug;
+ ShowDebugAction sda;
+ sda = (ShowDebugAction)vf.listeners.get(SHOW_DEBUG_ACTION);
+ sda.menuItem.setSelected(debug);
+
+ vf.svgCanvas.setProgressivePaint(svgCanvas.getProgressivePaint());
+ ShowRenderingAction sra;
+ sra = (ShowRenderingAction)vf.listeners.get(SHOW_RENDERING_ACTION);
+ sra.menuItem.setSelected(svgCanvas.getProgressivePaint());
+
+ vf.svgCanvas.setDoubleBufferedRendering
+ (svgCanvas.getDoubleBufferedRendering());
+ vf.showRenderingAction.update(!svgCanvas.getDoubleBufferedRendering());
+ DoubleBufferAction dba;
+ dba = (DoubleBufferAction)vf.listeners.get(DOUBLE_BUFFER_ACTION);
+ dba.menuItem.setSelected(svgCanvas.getDoubleBufferedRendering());
+
+ vf.userLanguages = userLanguages;
+ vf.userStyleSheetURI = userStyleSheetURI;
}
}
@@ -966,34 +992,55 @@
/**
* To enable the double buffering.
*/
- public class DoubleBufferAction extends AbstractAction {
+ public class DoubleBufferAction
+ extends AbstractAction
+ implements JComponentModifier {
+ public JCheckBoxMenuItem menuItem;
public DoubleBufferAction() {}
public void actionPerformed(ActionEvent e) {
- boolean b = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+ boolean b = menuItem.isSelected();
showRenderingAction.update(!b);
svgCanvas.setDoubleBufferedRendering(b);
}
+
+ public void addJComponent(JComponent c) {
+ menuItem = (JCheckBoxMenuItem)c;
+ }
}
/**
* To adjust the window size on load.
*/
- public class AutoAdjustAction extends AbstractAction {
+ public class AutoAdjustAction
+ extends AbstractAction
+ implements JComponentModifier {
+ public JCheckBoxMenuItem menuItem;
public AutoAdjustAction() {}
public void actionPerformed(ActionEvent e) {
- autoAdjust = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+ autoAdjust = menuItem.isSelected();
+ }
+
+ public void addJComponent(JComponent c) {
+ menuItem = (JCheckBoxMenuItem)c;
}
}
/**
* To enable the debug traces.
*/
- public class ShowDebugAction extends AbstractAction {
+ public class ShowDebugAction
+ extends AbstractAction
+ implements JComponentModifier {
+ public JCheckBoxMenuItem menuItem;
public ShowDebugAction() {}
public void actionPerformed(ActionEvent e) {
- debug = ((JCheckBoxMenuItem)e.getSource()).isSelected();
+ debug = menuItem.isSelected();
time = System.currentTimeMillis();
}
+
+ public void addJComponent(JComponent c) {
+ menuItem = (JCheckBoxMenuItem)c;
+ }
}
/**
@@ -1002,23 +1049,18 @@
public class ShowRenderingAction
extends AbstractAction
implements JComponentModifier {
- java.util.List components = new LinkedList();
+ public JCheckBoxMenuItem menuItem;
public ShowRenderingAction() {}
public void actionPerformed(ActionEvent e) {
- svgCanvas.setProgressivePaint
- (((JCheckBoxMenuItem)e.getSource()).isSelected());
+ svgCanvas.setProgressivePaint(menuItem.isSelected());
}
public void addJComponent(JComponent c) {
- components.add(c);
- c.setEnabled(true);
+ menuItem = (JCheckBoxMenuItem)c;
}
public void update(boolean enabled) {
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(enabled);
- }
+ menuItem.setEnabled(enabled);
}
}
@@ -1056,6 +1098,9 @@
Dimension sd = styleSheetDialog.getSize();
styleSheetDialog.setLocation(fr.x + (fr.width - sd.width) / 2,
fr.y + (fr.height - sd.height) / 2);
+ if (userStyleSheetURI != null) {
+ styleSheetDialog.setPath(userStyleSheetURI);
+ }
}
if (styleSheetDialog.showDialog() == UserStyleDialog.OK_OPTION) {
userStyleSheetURI = styleSheetDialog.getPath();
1.6 +10 -6 xml-batik/sources/org/apache/batik/css/value/FontWeightResolver.java
Index: FontWeightResolver.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/value/FontWeightResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FontWeightResolver.java 2001/03/13 16:28:43 1.5
+++ FontWeightResolver.java 2001/03/27 13:36:22 1.6
@@ -23,7 +23,7 @@
* property.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: FontWeightResolver.java,v 1.5 2001/03/13 16:28:43 hillion Exp $
+ * @version $Id: FontWeightResolver.java,v 1.6 2001/03/27 13:36:22 hillion Exp $
*/
public class FontWeightResolver implements RelativeValueResolver {
@@ -96,11 +96,15 @@
CSSOMReadOnlyValue prop;
prop = (CSSOMReadOnlyValue)sd.getPropertyCSSValue(getPropertyName());
im = prop.getImmutableValue();
- float f = im.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
- val = new CSSOMReadOnlyValue
- ((b)
- ? createFontWeight(context.getBolderFontWeight(f))
- : createFontWeight(context.getLighterFontWeight(f)));
+ if (im.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) {
+ val = new CSSOMReadOnlyValue(im);
+ } else {
+ float f = im.getFloatValue(CSSPrimitiveValue.CSS_NUMBER);
+ val = new CSSOMReadOnlyValue
+ ((b)
+ ? createFontWeight(context.getBolderFontWeight(f))
+ : createFontWeight(context.getLighterFontWeight(f)));
+ }
}
styleDeclaration.setPropertyCSSValue(getPropertyName(),
val,
1.3 +10 -1 xml-batik/sources/org/apache/batik/util/gui/UserStyleDialog.java
Index: UserStyleDialog.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/gui/UserStyleDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserStyleDialog.java 2001/03/18 16:29:23 1.2
+++ UserStyleDialog.java 2001/03/27 13:36:22 1.3
@@ -48,7 +48,7 @@
* This class represents a dialog to select the user style sheet.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: UserStyleDialog.java,v 1.2 2001/03/18 16:29:23 hillion Exp $
+ * @version $Id: UserStyleDialog.java,v 1.3 2001/03/27 13:36:22 hillion Exp $
*/
public class UserStyleDialog extends JDialog implements ActionMap {
@@ -129,6 +129,15 @@
*/
public String getPath() {
return chosenPath;
+ }
+
+ /**
+ * Sets the current dialog path.
+ */
+ public void setPath(String s) {
+ chosenPath = s;
+ panel.fileTextField.setText(s);
+ panel.fileCheckBox.setSelected(true);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org