[Imagetools-commit] SF.net SVN: imagetools:[59] trunk/imagetools/src/net/codebuilders/desktop/ imag
Status: Beta
Brought to you by:
cmarcum
Menu
▾
▴
[Imagetools-commit] SF.net SVN: imagetools:[59] trunk/imagetools/src/net/codebuilders/desktop/ imagetools
|
From: <cm...@us...> - 2009-06-07 13:13:04
|
Revision: 59
http://imagetools.svn.sourceforge.net/imagetools/?rev=59&view=rev
Author: cmarcum
Date: 2009-06-07 12:13:35 +0000 (Sun, 07 Jun 2009)
Log Message:
-----------
ticket:8 and ticket:11 - added Options menu with radio buttons for annotation color and font styles. No actions yet.
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-06-05 13:24:19 UTC (rev 58)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-06-07 12:13:35 UTC (rev 59)
@@ -196,6 +196,59 @@
</MenuItem>
</SubComponents>
</Menu>
+ <Menu class="javax.swing.JMenu" name="optionsMenu">
+ <Properties>
+ <Property name="text" type="java.lang.String" resourceKey="optionsMenu.text"/>
+ <Property name="name" type="java.lang.String" value="optionsMenu" noResource="true"/>
+ </Properties>
+ <SubComponents>
+ <MenuItem class="javax.swing.JRadioButtonMenuItem" name="colorRedItem">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="colorButtonGroup"/>
+ </Property>
+ <Property name="selected" type="boolean" value="true"/>
+ <Property name="text" type="java.lang.String" resourceKey="colorRedItem.text"/>
+ <Property name="name" type="java.lang.String" value="colorRedItem" noResource="true"/>
+ </Properties>
+ </MenuItem>
+ <MenuItem class="javax.swing.JRadioButtonMenuItem" name="colorBlueItem">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="colorButtonGroup"/>
+ </Property>
+ <Property name="text" type="java.lang.String" resourceKey="colorBlueItem.text"/>
+ <Property name="name" type="java.lang.String" value="colorBlueItem" noResource="true"/>
+ </Properties>
+ </MenuItem>
+ <MenuItem class="javax.swing.JSeparator" name="jSeparator4">
+ <Properties>
+ <Property name="name" type="java.lang.String" value="jSeparator4" noResource="true"/>
+ </Properties>
+ </MenuItem>
+ <MenuItem class="javax.swing.JRadioButtonMenuItem" name="fontSerifItem">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="fontButtonGroup"/>
+ </Property>
+ <Property name="font" type="java.awt.Font" resourceKey="fontSerifItem.font"/>
+ <Property name="selected" type="boolean" value="true"/>
+ <Property name="text" type="java.lang.String" resourceKey="fontSerifItem.text"/>
+ <Property name="name" type="java.lang.String" value="fontSerifItem" noResource="true"/>
+ </Properties>
+ </MenuItem>
+ <MenuItem class="javax.swing.JRadioButtonMenuItem" name="fontSansSerifItem">
+ <Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="fontButtonGroup"/>
+ </Property>
+ <Property name="font" type="java.awt.Font" resourceKey="fontSansSerifItem.font"/>
+ <Property name="text" type="java.lang.String" resourceKey="fontSansSerifItem.text"/>
+ <Property name="name" type="java.lang.String" value="fontSansSerifItem" noResource="true"/>
+ </Properties>
+ </MenuItem>
+ </SubComponents>
+ </Menu>
<Menu class="javax.swing.JMenu" name="helpMenu">
<Properties>
<Property name="text" type="java.lang.String" resourceKey="helpMenu.text"/>
@@ -458,6 +511,10 @@
</Container>
<Component class="javax.swing.ButtonGroup" name="drawButtonGroup">
</Component>
+ <Component class="javax.swing.ButtonGroup" name="colorButtonGroup">
+ </Component>
+ <Component class="javax.swing.ButtonGroup" name="fontButtonGroup">
+ </Component>
</NonVisualComponents>
<Properties>
<Property name="component" type="javax.swing.JComponent" editor="org.netbeans.modules.form.ComponentChooserEditor">
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-05 13:24:19 UTC (rev 58)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-07 12:13:35 UTC (rev 59)
@@ -237,6 +237,12 @@
drawLineItem = new javax.swing.JMenuItem();
drawRectangleItem = new javax.swing.JMenuItem();
drawTextItem = new javax.swing.JMenuItem();
+ optionsMenu = new javax.swing.JMenu();
+ colorRedItem = new javax.swing.JRadioButtonMenuItem();
+ colorBlueItem = new javax.swing.JRadioButtonMenuItem();
+ jSeparator4 = new javax.swing.JSeparator();
+ fontSerifItem = new javax.swing.JRadioButtonMenuItem();
+ fontSansSerifItem = new javax.swing.JRadioButtonMenuItem();
javax.swing.JMenu helpMenu = new javax.swing.JMenu();
usingMenuItem = new javax.swing.JMenuItem();
javax.swing.JMenuItem aboutMenuItem = new javax.swing.JMenuItem();
@@ -260,6 +266,8 @@
rectangleButton = new javax.swing.JToggleButton();
textButton = new javax.swing.JToggleButton();
drawButtonGroup = new javax.swing.ButtonGroup();
+ colorButtonGroup = new javax.swing.ButtonGroup();
+ fontButtonGroup = new javax.swing.ButtonGroup();
mainPanel.setName("mainPanel"); // NOI18N
mainPanel.setPreferredSize(new java.awt.Dimension(425, 350));
@@ -368,6 +376,38 @@
menuBar.add(drawMenu);
+ optionsMenu.setText(resourceMap.getString("optionsMenu.text")); // NOI18N
+ optionsMenu.setName("optionsMenu"); // NOI18N
+
+ colorButtonGroup.add(colorRedItem);
+ colorRedItem.setSelected(true);
+ colorRedItem.setText(resourceMap.getString("colorRedItem.text")); // NOI18N
+ colorRedItem.setName("colorRedItem"); // NOI18N
+ optionsMenu.add(colorRedItem);
+
+ colorButtonGroup.add(colorBlueItem);
+ colorBlueItem.setText(resourceMap.getString("colorBlueItem.text")); // NOI18N
+ colorBlueItem.setName("colorBlueItem"); // NOI18N
+ optionsMenu.add(colorBlueItem);
+
+ jSeparator4.setName("jSeparator4"); // NOI18N
+ optionsMenu.add(jSeparator4);
+
+ fontButtonGroup.add(fontSerifItem);
+ fontSerifItem.setFont(resourceMap.getFont("fontSerifItem.font")); // NOI18N
+ fontSerifItem.setSelected(true);
+ fontSerifItem.setText(resourceMap.getString("fontSerifItem.text")); // NOI18N
+ fontSerifItem.setName("fontSerifItem"); // NOI18N
+ optionsMenu.add(fontSerifItem);
+
+ fontButtonGroup.add(fontSansSerifItem);
+ fontSansSerifItem.setFont(resourceMap.getFont("fontSansSerifItem.font")); // NOI18N
+ fontSansSerifItem.setText(resourceMap.getString("fontSansSerifItem.text")); // NOI18N
+ fontSansSerifItem.setName("fontSansSerifItem"); // NOI18N
+ optionsMenu.add(fontSansSerifItem);
+
+ menuBar.add(optionsMenu);
+
helpMenu.setText(resourceMap.getString("helpMenu.text")); // NOI18N
helpMenu.setName("helpMenu"); // NOI18N
@@ -403,7 +443,7 @@
.addGroup(statusPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(statusMessageLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 194, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 187, Short.MAX_VALUE)
.addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(statusAnimationLabel)
@@ -1274,6 +1314,9 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton captureButton;
private javax.swing.JButton closeButton;
+ private javax.swing.JRadioButtonMenuItem colorBlueItem;
+ private javax.swing.ButtonGroup colorButtonGroup;
+ private javax.swing.JRadioButtonMenuItem colorRedItem;
private javax.swing.JButton cropButton;
private javax.swing.ButtonGroup drawButtonGroup;
private javax.swing.JMenuItem drawLineItem;
@@ -1287,6 +1330,9 @@
private javax.swing.JMenuItem fileOpenItem;
private javax.swing.JMenuItem filePrintItem;
private javax.swing.JMenuItem fileSaveItem;
+ private javax.swing.ButtonGroup fontButtonGroup;
+ private javax.swing.JRadioButtonMenuItem fontSansSerifItem;
+ private javax.swing.JRadioButtonMenuItem fontSerifItem;
private javax.swing.JMenuItem imageCaptureItem;
private javax.swing.JMenuItem imageCropItem;
private javax.swing.JMenu imageMenu;
@@ -1294,10 +1340,12 @@
private javax.swing.JToolBar.Separator jSeparator1;
private javax.swing.JToolBar.Separator jSeparator2;
private javax.swing.JToolBar.Separator jSeparator3;
+ private javax.swing.JSeparator jSeparator4;
private javax.swing.JToggleButton lineButton;
private javax.swing.JPanel mainPanel;
private javax.swing.JMenuBar menuBar;
private javax.swing.JButton openButton;
+ private javax.swing.JMenu optionsMenu;
private javax.swing.JProgressBar progressBar;
private javax.swing.JToggleButton rectangleButton;
private javax.swing.JButton redoButton;
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-06-05 13:24:19 UTC (rev 58)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-06-07 12:13:35 UTC (rev 59)
@@ -130,3 +130,12 @@
message.info.icon=/net/codebuilders/desktop/imagetools/resources/messagebox_info24.png
#error icon for showWarning
message.warning.icon=/net/codebuilders/desktop/imagetools/resources/messagebox_warning24.png
+optionsMenu.text=Options
+colorRedItem.text=Red
+colorBlueItem.text=Blue
+fontSerifItem.text=Serif
+fontSansSerifItem.text=Sans Serif
+#NOI18N
+fontSerifItem.font=DejaVu Serif-Plain-13
+#NOI18N
+fontSansSerifItem.font=DejaVu Sans-Plain-13
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
