Thread: [Imagetools-commit] SF.net SVN: imagetools:[51] branches/1.2.x/imagetools/src/net/codebuilders/ des
Status: Beta
Brought to you by:
cmarcum
From: <cm...@us...> - 2009-05-28 01:08:30
|
Revision: 51 http://imagetools.svn.sourceforge.net/imagetools/?rev=51&view=rev Author: cmarcum Date: 2009-05-28 00:22:33 +0000 (Thu, 28 May 2009) Log Message: ----------- removed print from menu for 1.2.x branch Modified Paths: -------------- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties Modified: branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form =================================================================== --- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-05-28 00:17:04 UTC (rev 50) +++ branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-05-28 00:22:33 UTC (rev 51) @@ -86,15 +86,6 @@ <Property name="name" type="java.lang.String" value="fileSaveItem" noResource="true"/> </Properties> </MenuItem> - <MenuItem class="javax.swing.JMenuItem" name="filePrintItem"> - <Properties> - <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor"> - <action class="net.codebuilders.desktop.imagetools.ImageToolsView" id="filePrint" methodName="filePrint"/> - </Property> - <Property name="text" type="java.lang.String" resourceKey="Print.text"/> - <Property name="name" type="java.lang.String" value="Print" noResource="true"/> - </Properties> - </MenuItem> <MenuItem class="javax.swing.JMenuItem" name="exitMenuItem"> <Properties> <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor"> Modified: branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java =================================================================== --- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-05-28 00:17:04 UTC (rev 50) +++ branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-05-28 00:22:33 UTC (rev 51) @@ -225,7 +225,6 @@ fileOpenItem = new javax.swing.JMenuItem(); fileCloseItem = new javax.swing.JMenuItem(); fileSaveItem = new javax.swing.JMenuItem(); - filePrintItem = new javax.swing.JMenuItem(); javax.swing.JMenuItem exitMenuItem = new javax.swing.JMenuItem(); editMenu = new javax.swing.JMenu(); editUndoItem = new javax.swing.JMenuItem(); @@ -307,11 +306,6 @@ fileSaveItem.setName("fileSaveItem"); // NOI18N fileMenu.add(fileSaveItem); - filePrintItem.setAction(actionMap.get("filePrint")); // NOI18N - filePrintItem.setText(resourceMap.getString("Print.text")); // NOI18N - filePrintItem.setName("Print"); // NOI18N - fileMenu.add(filePrintItem); - exitMenuItem.setAction(actionMap.get("quit")); // NOI18N exitMenuItem.setIcon(resourceMap.getIcon("exitMenuItem.icon")); // NOI18N exitMenuItem.setName("exitMenuItem"); // NOI18N @@ -403,7 +397,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) @@ -1285,7 +1279,6 @@ private javax.swing.JMenuItem editUndoItem; private javax.swing.JMenuItem fileCloseItem; private javax.swing.JMenuItem fileOpenItem; - private javax.swing.JMenuItem filePrintItem; private javax.swing.JMenuItem fileSaveItem; private javax.swing.JMenuItem imageCaptureItem; private javax.swing.JMenuItem imageCropItem; Modified: branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties =================================================================== --- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-05-28 00:17:04 UTC (rev 50) +++ branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-05-28 00:22:33 UTC (rev 51) @@ -104,7 +104,6 @@ filePrint.Action.smallIcon=/net/codebuilders/desktop/imagetools/resources/fileprint16.png filePrint.Action.icon=/net/codebuilders/desktop/imagetools/resources/fileprint16.png filePrint.Action.shortDescription=Print Image -Print.text=Print editMenu.text=Edit drawMenu.text=Annotate editUndoItem.text=Undo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cm...@us...> - 2009-05-30 15:01:17
|
Revision: 55 http://imagetools.svn.sourceforge.net/imagetools/?rev=55&view=rev Author: cmarcum Date: 2009-05-30 13:59:11 +0000 (Sat, 30 May 2009) Log Message: ----------- merge r54 from trunk Modified Paths: -------------- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.form branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.java Modified: branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.form =================================================================== --- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.form 2009-05-30 13:22:36 UTC (rev 54) +++ branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.form 2009-05-30 13:59:11 UTC (rev 55) @@ -20,11 +20,38 @@ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="2"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> - <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-18,0,0,1,-3"/> </AuxValues> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout"> - <Property name="useNullLayout" type="boolean" value="true"/> + <Layout> + <DimensionLayout dim="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" attributes="0"> + <EmptySpace min="10" pref="10" max="10" attributes="0"/> + <Component id="jLabel1" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" attributes="0"> + <EmptySpace min="390" pref="390" max="390" attributes="0"/> + <Component id="closeButton" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> + <Component id="jScrollPane1" pref="458" max="32767" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + </Group> + </Group> + </DimensionLayout> + <DimensionLayout dim="1"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" attributes="0"> + <EmptySpace min="10" pref="10" max="10" attributes="0"/> + <Component id="jLabel1" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="2" max="-2" attributes="0"/> + <Component id="jScrollPane1" min="-2" pref="370" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="20" max="-2" attributes="0"/> + <Component id="closeButton" min="-2" max="-2" attributes="0"/> + </Group> + </Group> + </DimensionLayout> </Layout> <SubComponents> <Component class="javax.swing.JLabel" name="jLabel1"> @@ -34,11 +61,6 @@ <Property name="text" type="java.lang.String" resourceKey="jLabel1.text"/> <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="10" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JButton" name="closeButton"> <Properties> @@ -47,11 +69,6 @@ </Property> <Property name="name" type="java.lang.String" value="closeButton" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="390" y="440" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Container class="javax.swing.JScrollPane" name="jScrollPane1"> <Properties> @@ -60,24 +77,151 @@ <Dimension value="[440, 800]"/> </Property> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="20" y="50" width="470" height="370"/> - </Constraint> - </Constraints> <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> <SubComponents> <Container class="javax.swing.JPanel" name="jPanel1"> <Properties> <Property name="name" type="java.lang.String" value="jPanel1" noResource="true"/> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[440, 800]"/> - </Property> </Properties> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout"> - <Property name="useNullLayout" type="boolean" value="true"/> + <Layout> + <DimensionLayout dim="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" attributes="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileOpenHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileOpenText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileSaveHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileSaveText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileExitHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileExitText" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCaptureHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCropHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCropText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawLineHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawLineText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawRectangleHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawRectangleText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawTextHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawTextText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="editUndoHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="editUndoText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="editRedoHeading" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="editRedoText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCaptureText" min="-2" pref="400" max="-2" attributes="0"/> + </Group> + </Group> + <EmptySpace pref="38" max="32767" attributes="0"/> + </Group> + </Group> + </DimensionLayout> + <DimensionLayout dim="1"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileOpenHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileOpenText" min="-2" pref="78" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileSaveHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileSaveText" min="-2" pref="65" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="fileExitHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="fileExitText" max="32767" attributes="0"/> + <EmptySpace type="unrelated" max="-2" attributes="0"/> + <Component id="imageCaptureHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCaptureText" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="18" max="-2" attributes="0"/> + <Component id="imageCropHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="imageCropText" min="-2" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="drawLineHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawLineText" min="-2" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="drawRectangleHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawRectangleText" min="-2" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="drawTextHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="drawTextText" min="-2" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="editUndoHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="editUndoText" min="-2" max="-2" attributes="0"/> + <EmptySpace type="separate" max="-2" attributes="0"/> + <Component id="editRedoHeading" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="editRedoText" min="-2" max="-2" attributes="0"/> + <EmptySpace min="-2" pref="462" max="-2" attributes="0"/> + </Group> + </Group> + </DimensionLayout> </Layout> <SubComponents> <Component class="javax.swing.JLabel" name="fileSaveHeading"> @@ -86,11 +230,6 @@ <Property name="text" type="java.lang.String" resourceKey="fileSaveHeading.text"/> <Property name="name" type="java.lang.String" value="fileSaveHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="20" y="80" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="fileSaveText"> <Properties> @@ -104,11 +243,6 @@ <Dimension value="[350, 15]"/> </Property> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="100" width="400" height="40"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="fileExitHeading"> <Properties> @@ -116,11 +250,6 @@ <Property name="text" type="java.lang.String" resourceKey="fileExitHeading.text"/> <Property name="name" type="java.lang.String" value="fileExitHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="140" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="fileExitText"> <Properties> @@ -128,11 +257,6 @@ <Property name="text" type="java.lang.String" resourceKey="fileExitText.text"/> <Property name="name" type="java.lang.String" value="fileExitText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="170" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="imageCaptureHeading"> <Properties> @@ -140,11 +264,6 @@ <Property name="text" type="java.lang.String" resourceKey="imageCaptureHeading.text"/> <Property name="name" type="java.lang.String" value="imageCaptureHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="190" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="imageCaptureText"> <Properties> @@ -152,11 +271,6 @@ <Property name="text" type="java.lang.String" resourceKey="imageCaptureText.text"/> <Property name="name" type="java.lang.String" value="imageCaptureText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="220" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="imageCropHeading"> <Properties> @@ -164,11 +278,6 @@ <Property name="text" type="java.lang.String" resourceKey="imageCropHeading.text"/> <Property name="name" type="java.lang.String" value="imageCropHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="270" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="imageCropText"> <Properties> @@ -176,11 +285,6 @@ <Property name="text" type="java.lang.String" resourceKey="imageCropText.text"/> <Property name="name" type="java.lang.String" value="imageCropText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="300" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="fileOpenHeading"> <Properties> @@ -188,11 +292,6 @@ <Property name="text" type="java.lang.String" resourceKey="fileOpenHeading.text"/> <Property name="name" type="java.lang.String" value="fileOpenHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="10" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="fileOpenText"> <Properties> @@ -200,11 +299,6 @@ <Property name="text" type="java.lang.String" resourceKey="fileOpenText.text"/> <Property name="name" type="java.lang.String" value="fileOpenText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="30" width="400" height="40"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawLineHeading"> <Properties> @@ -212,11 +306,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawLineHeading.text"/> <Property name="name" type="java.lang.String" value="drawLineHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="370" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawLineText"> <Properties> @@ -224,11 +313,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawLineText.text"/> <Property name="name" type="java.lang.String" value="drawLineText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="400" width="400" height="40"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawRectangleHeading"> <Properties> @@ -236,11 +320,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawRectangleHeading.text"/> <Property name="name" type="java.lang.String" value="drawRectangleHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="440" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawRectangleText"> <Properties> @@ -248,11 +327,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawRectangleText.text"/> <Property name="name" type="java.lang.String" value="drawRectangleText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="470" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawTextHeading"> <Properties> @@ -260,11 +334,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawTextHeading.text"/> <Property name="name" type="java.lang.String" value="drawTextHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="510" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="drawTextText"> <Properties> @@ -272,11 +341,6 @@ <Property name="text" type="java.lang.String" resourceKey="drawTextText.text"/> <Property name="name" type="java.lang.String" value="drawTextText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="540" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="editUndoHeading"> <Properties> @@ -284,11 +348,6 @@ <Property name="text" type="java.lang.String" resourceKey="editUndoHeading.text"/> <Property name="name" type="java.lang.String" value="editUndoHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="580" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="editRedoHeading"> <Properties> @@ -296,11 +355,6 @@ <Property name="text" type="java.lang.String" resourceKey="editRedoHeading.text"/> <Property name="name" type="java.lang.String" value="editRedoHeading" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="10" y="680" width="-1" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="editUndoText"> <Properties> @@ -308,11 +362,6 @@ <Property name="text" type="java.lang.String" resourceKey="editUndoText.text"/> <Property name="name" type="java.lang.String" value="editUndoText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="610" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> <Component class="javax.swing.JLabel" name="editRedoText"> <Properties> @@ -320,11 +369,6 @@ <Property name="text" type="java.lang.String" resourceKey="editRedoText.text"/> <Property name="name" type="java.lang.String" value="editRedoText" noResource="true"/> </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription"> - <AbsoluteConstraints x="30" y="710" width="400" height="-1"/> - </Constraint> - </Constraints> </Component> </SubComponents> </Container> Modified: branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.java =================================================================== --- branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.java 2009-05-30 13:22:36 UTC (rev 54) +++ branches/1.2.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsUsingBox.java 2009-05-30 13:59:11 UTC (rev 55) @@ -78,154 +78,244 @@ setTitle(resourceMap.getString("Form.title")); // NOI18N setName("Form"); // NOI18N setResizable(false); - getContentPane().setLayout(null); jLabel1.setFont(resourceMap.getFont("jLabel1.font")); // NOI18N jLabel1.setForeground(resourceMap.getColor("jLabel1.foreground")); // NOI18N jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N jLabel1.setName("jLabel1"); // NOI18N - getContentPane().add(jLabel1); - jLabel1.setBounds(10, 10, 153, 20); javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(net.codebuilders.desktop.imagetools.ImageToolsApp.class).getContext().getActionMap(ImageToolsUsingBox.class, this); closeButton.setAction(actionMap.get("closeUsingBox")); // NOI18N closeButton.setName("closeButton"); // NOI18N - getContentPane().add(closeButton); - closeButton.setBounds(390, 440, 97, 34); jScrollPane1.setName("jScrollPane1"); // NOI18N jScrollPane1.setPreferredSize(new java.awt.Dimension(440, 800)); jPanel1.setName("jPanel1"); // NOI18N - jPanel1.setPreferredSize(new java.awt.Dimension(440, 800)); - jPanel1.setLayout(null); fileSaveHeading.setIcon(resourceMap.getIcon("fileSaveHeading.icon")); // NOI18N fileSaveHeading.setText(resourceMap.getString("fileSaveHeading.text")); // NOI18N fileSaveHeading.setName("fileSaveHeading"); // NOI18N - jPanel1.add(fileSaveHeading); - fileSaveHeading.setBounds(20, 80, 96, 24); fileSaveText.setFont(resourceMap.getFont("fileSaveText.font")); // NOI18N fileSaveText.setText(resourceMap.getString("fileSaveText.text")); // NOI18N fileSaveText.setMaximumSize(new java.awt.Dimension(350, 50)); fileSaveText.setName("fileSaveText"); // NOI18N fileSaveText.setPreferredSize(new java.awt.Dimension(350, 15)); - jPanel1.add(fileSaveText); - fileSaveText.setBounds(30, 100, 400, 40); fileExitHeading.setIcon(resourceMap.getIcon("fileExitHeading.icon")); // NOI18N fileExitHeading.setText(resourceMap.getString("fileExitHeading.text")); // NOI18N fileExitHeading.setName("fileExitHeading"); // NOI18N - jPanel1.add(fileExitHeading); - fileExitHeading.setBounds(10, 140, 91, 24); fileExitText.setFont(resourceMap.getFont("fileExitText.font")); // NOI18N fileExitText.setText(resourceMap.getString("fileExitText.text")); // NOI18N fileExitText.setName("fileExitText"); // NOI18N - jPanel1.add(fileExitText); - fileExitText.setBounds(30, 170, 346, 15); imageCaptureHeading.setIcon(resourceMap.getIcon("imageCaptureHeading.icon")); // NOI18N imageCaptureHeading.setText(resourceMap.getString("imageCaptureHeading.text")); // NOI18N imageCaptureHeading.setName("imageCaptureHeading"); // NOI18N - jPanel1.add(imageCaptureHeading); - imageCaptureHeading.setBounds(10, 190, 133, 24); imageCaptureText.setFont(resourceMap.getFont("imageCaptureText.font")); // NOI18N imageCaptureText.setText(resourceMap.getString("imageCaptureText.text")); // NOI18N imageCaptureText.setName("imageCaptureText"); // NOI18N - jPanel1.add(imageCaptureText); - imageCaptureText.setBounds(30, 220, 400, 15); imageCropHeading.setIcon(resourceMap.getIcon("imageCropHeading.icon")); // NOI18N imageCropHeading.setText(resourceMap.getString("imageCropHeading.text")); // NOI18N imageCropHeading.setName("imageCropHeading"); // NOI18N - jPanel1.add(imageCropHeading); - imageCropHeading.setBounds(10, 270, 114, 24); imageCropText.setFont(resourceMap.getFont("imageCropText.font")); // NOI18N imageCropText.setText(resourceMap.getString("imageCropText.text")); // NOI18N imageCropText.setName("imageCropText"); // NOI18N - jPanel1.add(imageCropText); - imageCropText.setBounds(30, 300, 400, 15); fileOpenHeading.setIcon(resourceMap.getIcon("fileOpenHeading.icon")); // NOI18N fileOpenHeading.setText(resourceMap.getString("fileOpenHeading.text")); // NOI18N fileOpenHeading.setName("fileOpenHeading"); // NOI18N - jPanel1.add(fileOpenHeading); - fileOpenHeading.setBounds(10, 10, 101, 24); fileOpenText.setFont(resourceMap.getFont("fileOpenText.font")); // NOI18N fileOpenText.setText(resourceMap.getString("fileOpenText.text")); // NOI18N fileOpenText.setName("fileOpenText"); // NOI18N - jPanel1.add(fileOpenText); - fileOpenText.setBounds(30, 30, 400, 40); drawLineHeading.setIcon(resourceMap.getIcon("drawLineHeading.icon")); // NOI18N drawLineHeading.setText(resourceMap.getString("drawLineHeading.text")); // NOI18N drawLineHeading.setName("drawLineHeading"); // NOI18N - jPanel1.add(drawLineHeading); - drawLineHeading.setBounds(10, 370, 129, 24); drawLineText.setFont(resourceMap.getFont("drawLineText.font")); // NOI18N drawLineText.setText(resourceMap.getString("drawLineText.text")); // NOI18N drawLineText.setName("drawLineText"); // NOI18N - jPanel1.add(drawLineText); - drawLineText.setBounds(30, 400, 400, 40); drawRectangleHeading.setIcon(resourceMap.getIcon("drawRectangleHeading.icon")); // NOI18N drawRectangleHeading.setText(resourceMap.getString("drawRectangleHeading.text")); // NOI18N drawRectangleHeading.setName("drawRectangleHeading"); // NOI18N - jPanel1.add(drawRectangleHeading); - drawRectangleHeading.setBounds(10, 440, 163, 24); drawRectangleText.setFont(resourceMap.getFont("drawRectangleText.font")); // NOI18N drawRectangleText.setText(resourceMap.getString("drawRectangleText.text")); // NOI18N drawRectangleText.setName("drawRectangleText"); // NOI18N - jPanel1.add(drawRectangleText); - drawRectangleText.setBounds(30, 470, 400, 15); drawTextHeading.setIcon(resourceMap.getIcon("drawTextHeading.icon")); // NOI18N drawTextHeading.setText(resourceMap.getString("drawTextHeading.text")); // NOI18N drawTextHeading.setName("drawTextHeading"); // NOI18N - jPanel1.add(drawTextHeading); - drawTextHeading.setBounds(10, 510, 130, 24); drawTextText.setFont(resourceMap.getFont("drawTextText.font")); // NOI18N drawTextText.setText(resourceMap.getString("drawTextText.text")); // NOI18N drawTextText.setName("drawTextText"); // NOI18N - jPanel1.add(drawTextText); - drawTextText.setBounds(30, 540, 400, 15); editUndoHeading.setIcon(resourceMap.getIcon("editUndoHeading.icon")); // NOI18N editUndoHeading.setText(resourceMap.getString("editUndoHeading.text")); // NOI18N editUndoHeading.setName("editUndoHeading"); // NOI18N - jPanel1.add(editUndoHeading); - editUndoHeading.setBounds(10, 580, 103, 24); editRedoHeading.setIcon(resourceMap.getIcon("editRedoHeading.icon")); // NOI18N editRedoHeading.setText(resourceMap.getString("editRedoHeading.text")); // NOI18N editRedoHeading.setName("editRedoHeading"); // NOI18N - jPanel1.add(editRedoHeading); - editRedoHeading.setBounds(10, 680, 101, 24); editUndoText.setFont(resourceMap.getFont("editUndoText.font")); // NOI18N editUndoText.setText(resourceMap.getString("editUndoText.text")); // NOI18N editUndoText.setName("editUndoText"); // NOI18N - jPanel1.add(editUndoText); - editUndoText.setBounds(30, 610, 400, 15); editRedoText.setFont(resourceMap.getFont("editRedoText.font")); // NOI18N editRedoText.setText(resourceMap.getString("editRedoText.text")); // NOI18N editRedoText.setName("editRedoText"); // NOI18N - jPanel1.add(editRedoText); - editRedoText.setBounds(30, 710, 400, 15); + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileOpenHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileOpenText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileSaveHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileSaveText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileExitHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileExitText)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(imageCaptureHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(imageCropHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(imageCropText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawLineHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawLineText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawRectangleHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawRectangleText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawTextHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(drawTextText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(editUndoHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(editUndoText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(editRedoHeading)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(editRedoText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(imageCaptureText, javax.swing.GroupLayout.PREFERRED_SIZE, 400, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addContainerGap(38, Short.MAX_VALUE)) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addComponent(fileOpenHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fileOpenText, javax.swing.GroupLayout.PREFERRED_SIZE, 78, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fileSaveHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fileSaveText, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(fileExitHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fileExitText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(imageCaptureHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(imageCaptureText) + .addGap(18, 18, 18) + .addComponent(imageCropHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(imageCropText) + .addGap(18, 18, 18) + .addComponent(drawLineHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(drawLineText) + .addGap(18, 18, 18) + .addComponent(drawRectangleHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(drawRectangleText) + .addGap(18, 18, 18) + .addComponent(drawTextHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(drawTextText) + .addGap(18, 18, 18) + .addComponent(editUndoHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(editUndoText) + .addGap(18, 18, 18) + .addComponent(editRedoHeading) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(editRedoText) + .addGap(462, 462, 462)) + ); + jScrollPane1.setViewportView(jPanel1); - getContentPane().add(jScrollPane1); - jScrollPane1.setBounds(20, 50, 470, 370); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(jLabel1)) + .addGroup(layout.createSequentialGroup() + .addGap(390, 390, 390) + .addComponent(closeButton)) + .addGroup(layout.createSequentialGroup() + .addGap(20, 20, 20) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 458, Short.MAX_VALUE) + .addContainerGap()) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(jLabel1) + .addGap(2, 2, 2) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 370, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(20, 20, 20) + .addComponent(closeButton)) + ); pack(); }// </editor-fold>//GEN-END:initComponents This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |