imagetools-commit Mailing List for Image Tools
Status: Beta
Brought to you by:
cmarcum
Menu
▾
▴
imagetools-commit — Version Control Commit Mailing List
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(41) |
May
(14) |
Jun
(15) |
Jul
(15) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <cm...@us...> - 2009-08-07 21:09:42
|
Revision: 86
http://imagetools.svn.sourceforge.net/imagetools/?rev=86&view=rev
Author: cmarcum
Date: 2009-08-07 21:09:32 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
tagged 1.4.0 release
Added Paths:
-----------
tags/1.4.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-30 23:34:08
|
Revision: 85
http://imagetools.svn.sourceforge.net/imagetools/?rev=85&view=rev
Author: cmarcum
Date: 2009-07-30 23:34:00 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
merge r82 through r84 from trunk to 1.4.x branch
Modified Paths:
--------------
branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
Modified: branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-07-30 20:39:11 UTC (rev 84)
+++ branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-07-30 23:34:00 UTC (rev 85)
@@ -6,7 +6,7 @@
<Properties>
<Property name="name" type="java.lang.String" value="mainPanel" noResource="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[425, 350]"/>
+ <Dimension value="[425, 300]"/>
</Property>
</Properties>
@@ -14,17 +14,16 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="20" 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="jLabel1" min="-2" pref="310" max="-2" attributes="0"/>
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
@@ -305,11 +304,11 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="statusPanelSeparator" alignment="0" pref="428" max="32767" attributes="0"/>
+ <Component id="statusPanelSeparator" alignment="0" pref="444" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="statusMessageLabel" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="187" max="32767" attributes="0"/>
+ <EmptySpace pref="203" max="32767" attributes="0"/>
<Component id="progressBar" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="statusAnimationLabel" min="-2" max="-2" attributes="0"/>
@@ -405,6 +404,18 @@
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
</Component>
+ <Component class="javax.swing.JButton" name="printButton">
+ <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="printButton.text"/>
+ <Property name="focusable" type="boolean" value="false"/>
+ <Property name="horizontalTextPosition" type="int" value="0"/>
+ <Property name="name" type="java.lang.String" value="printButton" noResource="true"/>
+ <Property name="verticalTextPosition" type="int" value="3"/>
+ </Properties>
+ </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator1">
<Properties>
<Property name="name" type="java.lang.String" value="jSeparator1" noResource="true"/>
@@ -552,6 +563,6 @@
<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,-94,0,0,1,-84"/>
+ <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,-117,0,0,1,-68"/>
</AuxValues>
</Form>
Modified: branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-30 20:39:11 UTC (rev 84)
+++ branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-30 23:34:00 UTC (rev 85)
@@ -262,6 +262,7 @@
openButton = new javax.swing.JButton();
saveButton = new javax.swing.JButton();
closeButton = new javax.swing.JButton();
+ printButton = new javax.swing.JButton();
jSeparator1 = new javax.swing.JToolBar.Separator();
undoButton = new javax.swing.JButton();
redoButton = new javax.swing.JButton();
@@ -277,7 +278,7 @@
fontButtonGroup = new javax.swing.ButtonGroup();
mainPanel.setName("mainPanel"); // NOI18N
- mainPanel.setPreferredSize(new java.awt.Dimension(425, 350));
+ mainPanel.setPreferredSize(new java.awt.Dimension(425, 300));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.codebuilders.desktop.imagetools.ImageToolsApp.class).getContext().getResourceMap(ImageToolsView.class);
@@ -290,15 +291,14 @@
mainPanelLayout.setHorizontalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
- .addContainerGap()
+ .addGap(20, 20, 20)
.addComponent(jLabel1)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(20, Short.MAX_VALUE))
);
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 310, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
@@ -450,11 +450,11 @@
statusPanel.setLayout(statusPanelLayout);
statusPanelLayout.setHorizontalGroup(
statusPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(statusPanelSeparator, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE)
+ .addComponent(statusPanelSeparator, javax.swing.GroupLayout.DEFAULT_SIZE, 444, Short.MAX_VALUE)
.addGroup(statusPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(statusMessageLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 187, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 203, 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)
@@ -499,6 +499,14 @@
closeButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
toolBar.add(closeButton);
+ printButton.setAction(actionMap.get("filePrint")); // NOI18N
+ printButton.setText(resourceMap.getString("printButton.text")); // NOI18N
+ printButton.setFocusable(false);
+ printButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ printButton.setName("printButton"); // NOI18N
+ printButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ toolBar.add(printButton);
+
jSeparator1.setName("jSeparator1"); // NOI18N
toolBar.add(jSeparator1);
@@ -648,6 +656,7 @@
this.setFileOpenEnabled(false);
this.setFileSaveEnabled(true);
this.setFileCloseEnabled(true);
+ this.setFilePrintEnabled(true);
this.setCaptureEnabled(false);
this.setCropEnabled(true);
this.setDrawLineEnabled(true);
@@ -1020,6 +1029,7 @@
this.setFileOpenEnabled(false);
this.setFileSaveEnabled(true);
this.setFileCloseEnabled(true);
+ this.setFilePrintEnabled(true);
this.setCaptureEnabled(false);
this.setCropEnabled(true);
this.setDrawLineEnabled(true);
@@ -1056,6 +1066,7 @@
this.setFileOpenEnabled(true);
this.setFileSaveEnabled(false);
this.setFileCloseEnabled(false);
+ this.setFilePrintEnabled(false);
this.setCaptureEnabled(true);
this.setCropEnabled(false);
this.setDrawLineEnabled(false);
@@ -1071,7 +1082,7 @@
}
- @Action
+ @Action(enabledProperty = "filePrintEnabled", selectedProperty = "filePrintSelected")
public void filePrint() throws PrinterException {
@@ -1466,6 +1477,28 @@
firePropertyChange("fontSansSerifSelected", old, isFontSansSerifSelected());
}
+ private boolean filePrintEnabled = false;
+ public boolean isFilePrintEnabled() {
+ return filePrintEnabled;
+ }
+
+ public void setFilePrintEnabled(boolean b) {
+ boolean old = isFilePrintEnabled();
+ this.filePrintEnabled = b;
+ firePropertyChange("filePrintEnabled", old, isFilePrintEnabled());
+ }
+
+ private boolean filePrintSelected = false;
+ public boolean isFilePrintSelected() {
+ return filePrintSelected;
+ }
+
+ public void setFilePrintSelected(boolean b) {
+ boolean old = isFilePrintSelected();
+ this.filePrintSelected = b;
+ firePropertyChange("filePrintSelected", old, isFilePrintSelected());
+ }
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton captureButton;
private javax.swing.JButton closeButton;
@@ -1501,6 +1534,7 @@
private javax.swing.JMenuBar menuBar;
private javax.swing.JButton openButton;
private javax.swing.JMenu optionsMenu;
+ private javax.swing.JButton printButton;
private javax.swing.JProgressBar progressBar;
private javax.swing.JToggleButton rectangleButton;
private javax.swing.JButton redoButton;
Modified: branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
===================================================================
--- branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-07-30 20:39:11 UTC (rev 84)
+++ branches/1.4.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-07-30 23:34:00 UTC (rev 85)
@@ -112,7 +112,6 @@
showUsingBox.Action.icon=/net/codebuilders/desktop/imagetools/resources/help16.png
showUsingBox.Action.largeIcon=/net/codebuilders/desktop/imagetools/resources/help24.png
showUsingBox.Action.smallIcon=/net/codebuilders/desktop/imagetools/resources/help16.png
-jButton1.text=jButton1
testAction.Action.shortDescription=
testAction.Action.text=
rectangleButton.text=
@@ -155,3 +154,5 @@
setFontSerif.Action.shortDescription=
setFontSansSerif.Action.shortDescription=
setFontSansSerif.Action.text=
+filePrint.Action.accelerator=ctrl pressed P
+printButton.text=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-30 20:39:17
|
Revision: 84
http://imagetools.svn.sourceforge.net/imagetools/?rev=84&view=rev
Author: cmarcum
Date: 2009-07-30 20:39:11 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
reduced prefered size of main panel to 300 in Y direction because it was starting off tob big
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-07-30 20:25:21 UTC (rev 83)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-07-30 20:39:11 UTC (rev 84)
@@ -6,7 +6,7 @@
<Properties>
<Property name="name" type="java.lang.String" value="mainPanel" noResource="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[425, 350]"/>
+ <Dimension value="[425, 300]"/>
</Property>
</Properties>
@@ -14,17 +14,16 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="28" max="32767" attributes="0"/>
+ <EmptySpace pref="20" 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="jLabel1" min="-2" pref="310" max="-2" attributes="0"/>
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
@@ -564,6 +563,6 @@
<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,-104,0,0,1,-68"/>
+ <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,-117,0,0,1,-68"/>
</AuxValues>
</Form>
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-30 20:25:21 UTC (rev 83)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-30 20:39:11 UTC (rev 84)
@@ -278,7 +278,7 @@
fontButtonGroup = new javax.swing.ButtonGroup();
mainPanel.setName("mainPanel"); // NOI18N
- mainPanel.setPreferredSize(new java.awt.Dimension(425, 350));
+ mainPanel.setPreferredSize(new java.awt.Dimension(425, 300));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.codebuilders.desktop.imagetools.ImageToolsApp.class).getContext().getResourceMap(ImageToolsView.class);
@@ -291,15 +291,14 @@
mainPanelLayout.setHorizontalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
- .addContainerGap()
+ .addGap(20, 20, 20)
.addComponent(jLabel1)
- .addContainerGap(28, Short.MAX_VALUE))
+ .addContainerGap(20, Short.MAX_VALUE))
);
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 310, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-30 20:25:38
|
Revision: 83
http://imagetools.svn.sourceforge.net/imagetools/?rev=83&view=rev
Author: cmarcum
Date: 2009-07-30 20:25:21 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
added print button to toolbar and enabled status to methods
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-07-29 02:34:18 UTC (rev 82)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-07-30 20:25:21 UTC (rev 83)
@@ -16,7 +16,7 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="32767" attributes="0"/>
+ <EmptySpace pref="28" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -305,11 +305,11 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="statusPanelSeparator" alignment="0" pref="428" max="32767" attributes="0"/>
+ <Component id="statusPanelSeparator" alignment="0" pref="444" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="statusMessageLabel" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="187" max="32767" attributes="0"/>
+ <EmptySpace pref="203" max="32767" attributes="0"/>
<Component id="progressBar" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="statusAnimationLabel" min="-2" max="-2" attributes="0"/>
@@ -405,6 +405,18 @@
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
</Component>
+ <Component class="javax.swing.JButton" name="printButton">
+ <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="printButton.text"/>
+ <Property name="focusable" type="boolean" value="false"/>
+ <Property name="horizontalTextPosition" type="int" value="0"/>
+ <Property name="name" type="java.lang.String" value="printButton" noResource="true"/>
+ <Property name="verticalTextPosition" type="int" value="3"/>
+ </Properties>
+ </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator1">
<Properties>
<Property name="name" type="java.lang.String" value="jSeparator1" noResource="true"/>
@@ -552,6 +564,6 @@
<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,-94,0,0,1,-84"/>
+ <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,-104,0,0,1,-68"/>
</AuxValues>
</Form>
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-29 02:34:18 UTC (rev 82)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-30 20:25:21 UTC (rev 83)
@@ -262,6 +262,7 @@
openButton = new javax.swing.JButton();
saveButton = new javax.swing.JButton();
closeButton = new javax.swing.JButton();
+ printButton = new javax.swing.JButton();
jSeparator1 = new javax.swing.JToolBar.Separator();
undoButton = new javax.swing.JButton();
redoButton = new javax.swing.JButton();
@@ -292,7 +293,7 @@
.addGroup(mainPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel1)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(28, Short.MAX_VALUE))
);
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -450,11 +451,11 @@
statusPanel.setLayout(statusPanelLayout);
statusPanelLayout.setHorizontalGroup(
statusPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(statusPanelSeparator, javax.swing.GroupLayout.DEFAULT_SIZE, 428, Short.MAX_VALUE)
+ .addComponent(statusPanelSeparator, javax.swing.GroupLayout.DEFAULT_SIZE, 444, Short.MAX_VALUE)
.addGroup(statusPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(statusMessageLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 187, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 203, 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)
@@ -499,6 +500,14 @@
closeButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
toolBar.add(closeButton);
+ printButton.setAction(actionMap.get("filePrint")); // NOI18N
+ printButton.setText(resourceMap.getString("printButton.text")); // NOI18N
+ printButton.setFocusable(false);
+ printButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ printButton.setName("printButton"); // NOI18N
+ printButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+ toolBar.add(printButton);
+
jSeparator1.setName("jSeparator1"); // NOI18N
toolBar.add(jSeparator1);
@@ -648,6 +657,7 @@
this.setFileOpenEnabled(false);
this.setFileSaveEnabled(true);
this.setFileCloseEnabled(true);
+ this.setFilePrintEnabled(true);
this.setCaptureEnabled(false);
this.setCropEnabled(true);
this.setDrawLineEnabled(true);
@@ -1020,6 +1030,7 @@
this.setFileOpenEnabled(false);
this.setFileSaveEnabled(true);
this.setFileCloseEnabled(true);
+ this.setFilePrintEnabled(true);
this.setCaptureEnabled(false);
this.setCropEnabled(true);
this.setDrawLineEnabled(true);
@@ -1056,6 +1067,7 @@
this.setFileOpenEnabled(true);
this.setFileSaveEnabled(false);
this.setFileCloseEnabled(false);
+ this.setFilePrintEnabled(false);
this.setCaptureEnabled(true);
this.setCropEnabled(false);
this.setDrawLineEnabled(false);
@@ -1071,7 +1083,7 @@
}
- @Action
+ @Action(enabledProperty = "filePrintEnabled", selectedProperty = "filePrintSelected")
public void filePrint() throws PrinterException {
@@ -1466,6 +1478,28 @@
firePropertyChange("fontSansSerifSelected", old, isFontSansSerifSelected());
}
+ private boolean filePrintEnabled = false;
+ public boolean isFilePrintEnabled() {
+ return filePrintEnabled;
+ }
+
+ public void setFilePrintEnabled(boolean b) {
+ boolean old = isFilePrintEnabled();
+ this.filePrintEnabled = b;
+ firePropertyChange("filePrintEnabled", old, isFilePrintEnabled());
+ }
+
+ private boolean filePrintSelected = false;
+ public boolean isFilePrintSelected() {
+ return filePrintSelected;
+ }
+
+ public void setFilePrintSelected(boolean b) {
+ boolean old = isFilePrintSelected();
+ this.filePrintSelected = b;
+ firePropertyChange("filePrintSelected", old, isFilePrintSelected());
+ }
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton captureButton;
private javax.swing.JButton closeButton;
@@ -1501,6 +1535,7 @@
private javax.swing.JMenuBar menuBar;
private javax.swing.JButton openButton;
private javax.swing.JMenu optionsMenu;
+ private javax.swing.JButton printButton;
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-07-29 02:34:18 UTC (rev 82)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-07-30 20:25:21 UTC (rev 83)
@@ -112,7 +112,6 @@
showUsingBox.Action.icon=/net/codebuilders/desktop/imagetools/resources/help16.png
showUsingBox.Action.largeIcon=/net/codebuilders/desktop/imagetools/resources/help24.png
showUsingBox.Action.smallIcon=/net/codebuilders/desktop/imagetools/resources/help16.png
-jButton1.text=jButton1
testAction.Action.shortDescription=
testAction.Action.text=
rectangleButton.text=
@@ -155,3 +154,5 @@
setFontSerif.Action.shortDescription=
setFontSansSerif.Action.shortDescription=
setFontSansSerif.Action.text=
+filePrint.Action.accelerator=ctrl pressed P
+printButton.text=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-29 02:34:27
|
Revision: 82
http://imagetools.svn.sourceforge.net/imagetools/?rev=82&view=rev
Author: cmarcum
Date: 2009-07-29 02:34:18 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
created 1.4.x release branch
Added Paths:
-----------
branches/1.4.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-29 02:14:16
|
Revision: 81
http://imagetools.svn.sourceforge.net/imagetools/?rev=81&view=rev
Author: cmarcum
Date: 2009-07-29 02:14:03 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
added release notes to README file
Modified Paths:
--------------
trunk/imagetools/dist_include/README
Modified: trunk/imagetools/dist_include/README
===================================================================
--- trunk/imagetools/dist_include/README 2009-07-29 02:12:42 UTC (rev 80)
+++ trunk/imagetools/dist_include/README 2009-07-29 02:14:03 UTC (rev 81)
@@ -1,5 +1,16 @@
+Image Tools is a desktop application to capture the display as an image or open an existing image file, crop and annotate it if necessary, and save the image. It features line and text annotation and undo/redo.
-To run the project from the command line, go to the folder and
-type the following:
+This is the final release of version 1.4.0.
+We have finalised this release and are continuing main development toward a 1.5 release.
+Main project wiki
+http://imagetools.sourceforge.net
+
+We are always looking for user feedback, feature requests, bug reports, and suggestions.
+
+Thank you for participating in the Image Tools project.
+
+To run the project from the command line, go to the folder and type the following:
+
java -jar "imagetools.jar"
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-29 02:12:54
|
Revision: 80
http://imagetools.svn.sourceforge.net/imagetools/?rev=80&view=rev
Author: cmarcum
Date: 2009-07-29 02:12:42 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
added 1.4.0 changes to CHANGES file
Modified Paths:
--------------
trunk/imagetools/dist_include/CHANGES
Modified: trunk/imagetools/dist_include/CHANGES
===================================================================
--- trunk/imagetools/dist_include/CHANGES 2009-07-28 22:51:08 UTC (rev 79)
+++ trunk/imagetools/dist_include/CHANGES 2009-07-29 02:12:42 UTC (rev 80)
@@ -1,3 +1,11 @@
+Version 1.4.0
+(28 July 2009, from /branches/1.4.x)
+https://imagetools.sourceforge.net/svnroot/imagetools/branches/1.4.x/
+
+New features, enhancements:
+ * added cross-platform printing (ticket:12)
+ * added white background behind text annotation (ticket:13)
+
Version 1.3.0
(15 June 2009, from /branches/1.3.x)
https://imagetools.sourceforge.net/svnroot/imagetools/branches/1.3.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-28 22:51:24
|
Revision: 79
http://imagetools.svn.sourceforge.net/imagetools/?rev=79&view=rev
Author: cmarcum
Date: 2009-07-28 22:51:08 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
modified header
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java 2009-07-28 22:45:06 UTC (rev 78)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java 2009-07-28 22:51:08 UTC (rev 79)
@@ -1,5 +1,7 @@
/*
- * Code from:
+ * ComponentPrintable.java
+ *
+ * originated from example code on:
* http://www.java2s.com/Code/Java/2D-Graphics-GUI/PrintSwingcomponents.htm
*/
@@ -14,7 +16,7 @@
/**
*
- * @author carl
+ * @author unknown
*/
class ComponentPrintable implements Printable {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-28 22:45:19
|
Revision: 78
http://imagetools.svn.sourceforge.net/imagetools/?rev=78&view=rev
Author: cmarcum
Date: 2009-07-28 22:45:06 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
updated Application.version property to 1.4.0
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-07-28 21:23:26 UTC (rev 77)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-07-28 22:45:06 UTC (rev 78)
@@ -2,7 +2,7 @@
Application.name = imagetools
Application.title = Image Tools
-Application.version = 1.3.0
+Application.version = 1.4.0
Application.vendor = CodeBuilders.net
Application.homepage = http://imagetools.sourceforge.net
Application.description = An application to capture an image of the display, \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-28 21:23:40
|
Revision: 77
http://imagetools.svn.sourceforge.net/imagetools/?rev=77&view=rev
Author: cmarcum
Date: 2009-07-28 21:23:26 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
deleted DOS txt versions of UNIX text files
Removed Paths:
-------------
trunk/imagetools/dist_include/COPYING.txt
trunk/imagetools/dist_include/README.TXT
trunk/imagetools/dist_include/THIRDPARTYLICENSE.txt
Deleted: trunk/imagetools/dist_include/COPYING.txt
===================================================================
--- trunk/imagetools/dist_include/COPYING.txt 2009-07-28 21:17:24 UTC (rev 76)
+++ trunk/imagetools/dist_include/COPYING.txt 2009-07-28 21:23:26 UTC (rev 77)
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Deleted: trunk/imagetools/dist_include/README.TXT
===================================================================
--- trunk/imagetools/dist_include/README.TXT 2009-07-28 21:17:24 UTC (rev 76)
+++ trunk/imagetools/dist_include/README.TXT 2009-07-28 21:23:26 UTC (rev 77)
@@ -1,5 +0,0 @@
-
-To run the project from the command line, go to the folder and
-type the following:
-
-java -jar "imagetools.jar"
Deleted: trunk/imagetools/dist_include/THIRDPARTYLICENSE.txt
===================================================================
--- trunk/imagetools/dist_include/THIRDPARTYLICENSE.txt 2009-07-28 21:17:24 UTC (rev 76)
+++ trunk/imagetools/dist_include/THIRDPARTYLICENSE.txt 2009-07-28 21:23:26 UTC (rev 77)
@@ -1,1067 +0,0 @@
-DO NOT TRANSLATE OR LOCALIZE
-
-*******************************************************************************
-
-CodeBuilders.net elects to use the GNU Lesser General Public License version 3
-(LGPL)/GNU General Public License version 3 (GPL) for any software where a
-choice of LGPL/GPL license versions are made available with the language
-indicating that LGPLv?/GPLv? or any later version may be used, or where a
-choice of which version of the LGPL/GPL is applied is unspecified.
-
-*******************************************************************************
-
-*******************************************************************************
-
-%% The following software may be included in this product:
-Crystal Project Icons
-
-Use of any of this software is governed by the terms of the license below:
-
-TITLE: Crystal Project Icons
-AUTHOR: Everaldo Coelho
-SITE: http://www.everaldo.com
-CONTACT: eve...@ev...
-
-Copyright (c) 2006-2007 Everaldo Coelho.
-
-*******************************************************************************
-
-%% The following software may be included in this product:
-appframework-1.0.3.jar
-
-Use of any of this software is governed by the terms of the license below:
-
-Copyright (c) 2005-2006 Sun Microsystems, Inc., 4150 Network Circle, Santa
-Clara, California 95054, U.S.A. All rights reserved. Use is subject
-to license terms below. Sun, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc. in the
-U.S. and other countries.
-
-Notice: This product is covered by U.S. export control laws and may be
-subject to the export or import laws in other countries. These laws may
-restrict the fields of use for this software and may require you to
-secure government authorization.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribut...
[truncated message content] |
|
From: <cm...@us...> - 2009-07-28 21:17:40
|
Revision: 76
http://imagetools.svn.sourceforge.net/imagetools/?rev=76&view=rev
Author: cmarcum
Date: 2009-07-28 21:17:24 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
added CHANGES file
Added Paths:
-----------
trunk/imagetools/dist_include/CHANGES
Added: trunk/imagetools/dist_include/CHANGES
===================================================================
--- trunk/imagetools/dist_include/CHANGES (rev 0)
+++ trunk/imagetools/dist_include/CHANGES 2009-07-28 21:17:24 UTC (rev 76)
@@ -0,0 +1,12 @@
+Version 1.3.0
+(15 June 2009, from /branches/1.3.x)
+https://imagetools.sourceforge.net/svnroot/imagetools/branches/1.3.x/
+
+New features, enhancements:
+ * added multi-line text placement (ticket:6)
+ * added Options menu
+ * added font style options for Serif and Sans Serif (ticket:11)
+ * added annotation color options for Blue and Red (ticket:8)
+ * added combo box for font style in text dialog box
+ * added combo box for font size in text dialog box (ticket:7)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-26 13:09:13
|
Revision: 75
http://imagetools.svn.sourceforge.net/imagetools/?rev=75&view=rev
Author: cmarcum
Date: 2009-07-26 13:09:04 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
ticket:12 - implemented printing
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
Added Paths:
-----------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java
Added: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java (rev 0)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ComponentPrintable.java 2009-07-26 13:09:04 UTC (rev 75)
@@ -0,0 +1,55 @@
+/*
+ * Code from:
+ * http://www.java2s.com/Code/Java/2D-Graphics-GUI/PrintSwingcomponents.htm
+ */
+
+package net.codebuilders.desktop.imagetools;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import javax.swing.JComponent;
+
+/**
+ *
+ * @author carl
+ */
+class ComponentPrintable implements Printable {
+
+ private Component mComponent;
+
+ public ComponentPrintable(Component c) {
+ mComponent = c;
+ }
+
+ @Override
+ public int print(Graphics g, PageFormat pageFormat, int pageIndex) {
+ if (pageIndex > 0) {
+ return NO_SUCH_PAGE;
+ }
+ Graphics2D g2 = (Graphics2D) g;
+ g2.translate(pageFormat.getImageableX(), pageFormat.getImageableY());
+ boolean wasBuffered = disableDoubleBuffering(mComponent);
+ mComponent.paint(g2);
+ restoreDoubleBuffering(mComponent, wasBuffered);
+ return PAGE_EXISTS;
+ }
+
+ private boolean disableDoubleBuffering(Component c) {
+ if (c instanceof JComponent == false) {
+ return false;
+ }
+ JComponent jc = (JComponent) c;
+ boolean wasBuffered = jc.isDoubleBuffered();
+ jc.setDoubleBuffered(false);
+ return wasBuffered;
+ }
+
+ private void restoreDoubleBuffering(Component c, boolean wasBuffered) {
+ if (c instanceof JComponent) {
+ ((JComponent) c).setDoubleBuffered(wasBuffered);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-25 14:21:26 UTC (rev 74)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-07-26 13:09:04 UTC (rev 75)
@@ -38,6 +38,9 @@
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
@@ -49,6 +52,7 @@
import javax.imageio.ImageWriter;
import javax.imageio.stream.FileImageInputStream;
import javax.imageio.stream.ImageOutputStream;
+import javax.print.attribute.HashPrintRequestAttributeSet;
import javax.swing.Timer;
import javax.swing.Icon;
import javax.swing.JDialog;
@@ -181,6 +185,7 @@
// listen for ImageTools Model to update - test 2009-03-20
itModel.pcs.addPropertyChangeListener("image", new PropertyChangeListener() {
+
@Override
public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
// DEBUG
@@ -1067,8 +1072,36 @@
}
@Action
- public void filePrint() {
- // TODO filePrint method
+ public void filePrint() throws PrinterException {
+
+
+
+ ComponentPrintable cp = new ComponentPrintable(imageArea);
+
+ // Graphics g = this.imageArea.getGraphics();
+ PageFormat pf = new PageFormat();
+
+ HashPrintRequestAttributeSet attributes = new HashPrintRequestAttributeSet();
+
+ PrinterJob job = PrinterJob.getPrinterJob();
+
+ // pf = job.pageDialog(pf);
+
+ boolean ok = job.printDialog(attributes);
+
+ pf = job.getPageFormat(attributes);
+
+ if (ok) {
+ try {
+ job.setPrintable(cp, pf);
+ job.print(attributes);
+ } catch (PrinterException ex) {
+ /* The job did not successfully complete */
+ Logger logger = Logger.getLogger(ImageToolsView.class.getName());
+ logger.log(Level.SEVERE, null, ex);
+ showError("The print job did not complete " + ex);
+ }
+ }
}
@Action(enabledProperty = "testActionEnabled", selectedProperty = "testActionSelected")
@@ -1317,17 +1350,18 @@
firePropertyChange("cropSelected", old, isCropSelected());
}
- @Action(enabledProperty = "colorRedEnabled", selectedProperty = "colorRedSelected")
+ @Action(enabledProperty = "colorRedEnabled", selectedProperty = "colorRedSelected")
public void setColorRed() {
- itModel.setColor(java.awt.Color.RED);
+ itModel.setColor(java.awt.Color.RED);
}
@Action(enabledProperty = "colorBlueEnabled", selectedProperty = "colorBlueSelected")
public void setColorBlue() {
- itModel.setColor(java.awt.Color.BLUE);
+ itModel.setColor(java.awt.Color.BLUE);
}
private boolean colorBlueEnabled = true;
+
public boolean isColorBlueEnabled() {
return colorBlueEnabled;
}
@@ -1339,6 +1373,7 @@
}
private boolean colorBlueSelected = false;
+
public boolean isColorBlueSelected() {
return colorBlueSelected;
}
@@ -1350,6 +1385,7 @@
}
private boolean colorRedEnabled = true;
+
public boolean isColorRedEnabled() {
return colorRedEnabled;
}
@@ -1361,6 +1397,7 @@
}
private boolean colorRedSelected = false;
+
public boolean isColorRedSelected() {
return colorRedSelected;
}
@@ -1371,12 +1408,13 @@
firePropertyChange("colorRedSelected", old, isColorRedSelected());
}
- @Action(enabledProperty = "fontSerifEnabled", selectedProperty = "fontSerifSelected")
+ @Action(enabledProperty = "fontSerifEnabled", selectedProperty = "fontSerifSelected")
public void setFontSerif() {
itModel.setFontName(java.awt.Font.SERIF);
}
private boolean fontSerifEnabled = true;
+
public boolean isFontSerifEnabled() {
return fontSerifEnabled;
}
@@ -1388,6 +1426,7 @@
}
private boolean fontSerifSelected = false;
+
public boolean isFontSerifSelected() {
return fontSerifSelected;
}
@@ -1398,12 +1437,13 @@
firePropertyChange("fontSerifSelected", old, isFontSerifSelected());
}
- @Action(enabledProperty = "fontSansSerifEnabled", selectedProperty = "fontSansSerifSelected")
+ @Action(enabledProperty = "fontSansSerifEnabled", selectedProperty = "fontSansSerifSelected")
public void setFontSansSerif() {
itModel.setFontName(java.awt.Font.SANS_SERIF);
}
private boolean fontSansSerifEnabled = true;
+
public boolean isFontSansSerifEnabled() {
return fontSansSerifEnabled;
}
@@ -1415,6 +1455,7 @@
}
private boolean fontSansSerifSelected = false;
+
public boolean isFontSansSerifSelected() {
return fontSansSerifSelected;
}
@@ -1424,7 +1465,7 @@
this.fontSansSerifSelected = b;
firePropertyChange("fontSansSerifSelected", old, isFontSansSerifSelected());
}
-
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton captureButton;
private javax.swing.JButton closeButton;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-25 14:21:34
|
Revision: 74
http://imagetools.svn.sourceforge.net/imagetools/?rev=74&view=rev
Author: cmarcum
Date: 2009-07-25 14:21:26 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
ticket:13 - added white rounded rectangle background behind text annotations.
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-07-24 21:58:37 UTC (rev 73)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-07-25 14:21:26 UTC (rev 74)
@@ -29,6 +29,7 @@
import java.awt.font.LineBreakMeasurer;
import java.awt.font.TextAttribute;
import java.awt.font.TextLayout;
+import java.awt.geom.RoundRectangle2D;
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import java.beans.PropertyChangeEvent;
@@ -86,7 +87,6 @@
* for drawing text
*/
private Point2D pointSelection;
-
/**
* Ready to crop, usually after rectangle selection
*/
@@ -103,6 +103,9 @@
MouseMotionListener mml;
// The LineBreakMeasurer used to line-break the paragraph.
private LineBreakMeasurer lineMeasurer;
+ // The LineBreakMeasurer used to get the size the paragraph
+ // for the background rectangle
+ private LineBreakMeasurer rectMeasurer;
private float breakWidth = (float) 200.0;
// index of the first character in the paragraph.
private int paragraphStart;
@@ -763,6 +766,13 @@
int width = image.getWidth(null);
int height = image.getHeight(null);
+ // variables for text background rectangle
+ double rectPosX = destx;
+ double rectPosY = desty;
+ double rectWidth = 0;
+ double rectHeight = 0;
+
+
BufferedImage biNew = new BufferedImage(width, height,
BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = biNew.createGraphics();
@@ -780,6 +790,78 @@
}
+ // begin text background rectangle
+
+ // color for background of text
+ g2d.setColor(Color.WHITE);
+
+ // Create a new LineBreakMeasurer from the paragraph.
+ // It will be cached and re-used.
+ if (rectMeasurer == null) {
+ AttributedCharacterIterator paragraph = attStr.getIterator();
+ paragraphStart = paragraph.getBeginIndex();
+ paragraphEnd = paragraph.getEndIndex();
+ FontRenderContext frc = g2d.getFontRenderContext();
+ rectMeasurer = new LineBreakMeasurer(paragraph, frc);
+ }
+
+ // Set break width to width of Component.
+ breakWidth = itModel.getTextBoxWidth();
+
+ // Set position to the index of the first character in the paragraph.
+ rectMeasurer.setPosition(paragraphStart);
+
+ // make a copy of measurer and loop through to get dimensions
+ // calculate the rectangle size ant set variables
+ LineBreakMeasurer lmCopy = rectMeasurer;
+ // Get lines until the entire paragraph has been displayed.
+ while (lmCopy.getPosition() < paragraphEnd) {
+
+ // Retrieve next layout. A cleverer program would also cache
+ // these layouts until the component is re-sized.
+ TextLayout layout = lmCopy.nextLayout(breakWidth);
+
+ // Compute pen x position. If the paragraph is right-to-left we
+ // will align the TextLayouts to the right edge of the panel.
+ // Note: this won't occur for the English text in this sample.
+ // Note: drawPosX is always where the LEFT of the text is placed.
+ // TODO adjust the RightToLeft case with destx also
+ // LeftToRight has been fixed
+ rectPosX = layout.isLeftToRight()
+ ? (0 + destx) : breakWidth - layout.getAdvance();
+ // Move y-coordinate by the ascent of the layout.
+ rectPosY += layout.getAscent();
+ // Draw the TextLayout at (drawPosX, drawPosY).
+ // layout.draw(g2d, drawPosX, drawPosY);
+ // Move y-coordinate in preparation for next layout.
+ rectPosY += layout.getDescent() + layout.getLeading();
+ // add the y move to rectangle height
+ System.out.println("rectHeight was " + rectHeight);
+ rectHeight += layout.getAscent() + layout.getDescent() +
+ layout.getLeading();
+ System.out.println("rectHeight is now " + rectHeight);
+ // if text line width is greater than rectWidth
+ // set rectWidth to line width
+ if (layout.getAdvance() > rectWidth) {
+ rectWidth = layout.getAdvance();
+ }
+ }
+
+ System.out.println("rectangle position and size= " +
+ rectPosX + ", " + desty + ", " +
+ rectWidth + ", " + rectHeight);
+ // draw a rectangle around text with padding
+ g2d.fill(new RoundRectangle2D.Double((destx - 4) , (desty - 4),
+ (rectWidth + 8),
+ (rectHeight + 8), 10, 10));
+
+ // finish
+ lmCopy = null;
+ rectMeasurer = null;
+
+ // end text rectangle
+
+ // color for text
g2d.setColor(itModel.getColor());
// Create a new LineBreakMeasurer from the paragraph.
@@ -798,10 +880,12 @@
// Set position to the index of the first character in the paragraph.
lineMeasurer.setPosition(paragraphStart);
+
+
// Get lines until the entire paragraph has been displayed.
while (lineMeasurer.getPosition() < paragraphEnd) {
- // Retrieve next layout. A clever program would also cache
+ // Retrieve next layout. A cleverer program would also cache
// these layouts until the component is re-sized.
TextLayout layout = lineMeasurer.nextLayout(breakWidth);
@@ -823,8 +907,12 @@
// Move y-coordinate in preparation for next layout.
drawPosY += layout.getDescent() + layout.getLeading();
+
+
}
+
+
setImage(biNew, true);
g2d.dispose();
lineMeasurer = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-24 21:58:49
|
Revision: 73
http://imagetools.svn.sourceforge.net/imagetools/?rev=73&view=rev
Author: cmarcum
Date: 2009-07-24 21:58:37 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
comment spelling correction
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-07-03 22:22:17 UTC (rev 72)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-07-24 21:58:37 UTC (rev 73)
@@ -801,7 +801,7 @@
// Get lines until the entire paragraph has been displayed.
while (lineMeasurer.getPosition() < paragraphEnd) {
- // Retrieve next layout. A cleverer program would also cache
+ // Retrieve next layout. A clever program would also cache
// these layouts until the component is re-sized.
TextLayout layout = lineMeasurer.nextLayout(breakWidth);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-03 22:22:23
|
Revision: 72
http://imagetools.svn.sourceforge.net/imagetools/?rev=72&view=rev
Author: cmarcum
Date: 2009-07-03 22:22:17 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
tagged 1.3.0 release
Added Paths:
-----------
tags/1.3.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-07-03 19:10:44
|
Revision: 71
http://imagetools.svn.sourceforge.net/imagetools/?rev=71&view=rev
Author: cmarcum
Date: 2009-07-03 19:10:43 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
set Application.version property to 1.3.0
Modified Paths:
--------------
branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
Modified: branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
===================================================================
--- branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-06-16 23:16:44 UTC (rev 70)
+++ branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-07-03 19:10:43 UTC (rev 71)
@@ -2,7 +2,7 @@
Application.name = imagetools
Application.title = Image Tools
-Application.version = 1.3.0-alpha1
+Application.version = 1.3.0
Application.vendor = CodeBuilders.net
Application.homepage = http://imagetools.sourceforge.net
Application.description = An application to capture an image of the display, \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-16 23:17:05
|
Revision: 70
http://imagetools.svn.sourceforge.net/imagetools/?rev=70&view=rev
Author: cmarcum
Date: 2009-06-16 23:16:44 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
tag 1.3.0-alpha1 release
Added Paths:
-----------
tags/1.3.0-alpha1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-16 01:22:27
|
Revision: 68
http://imagetools.svn.sourceforge.net/imagetools/?rev=68&view=rev
Author: cmarcum
Date: 2009-06-16 00:48:50 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
added CHANGES file for 1.3.x branch
Added Paths:
-----------
branches/1.3.x/imagetools/dist_include/CHANGES
Added: branches/1.3.x/imagetools/dist_include/CHANGES
===================================================================
--- branches/1.3.x/imagetools/dist_include/CHANGES (rev 0)
+++ branches/1.3.x/imagetools/dist_include/CHANGES 2009-06-16 00:48:50 UTC (rev 68)
@@ -0,0 +1,12 @@
+Version 1.3.0
+(15 June 2009, from /branches/1.3.x)
+https://imagetools.sourceforge.net/svnroot/imagetools/branches/1.3.x/
+
+New features, enhancements:
+ * added multi-line text placement (ticket:6)
+ * added Options menu
+ * added font style options for Serif and Sans Serif (ticket:11)
+ * added annotation color options for Blue and Red (ticket:8)
+ * added combo box for font style in text dialog box
+ * added combo box for font size in text dialog box (ticket:7)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-16 01:22:26
|
Revision: 69
http://imagetools.svn.sourceforge.net/imagetools/?rev=69&view=rev
Author: cmarcum
Date: 2009-06-16 00:54:17 +0000 (Tue, 16 Jun 2009)
Log Message:
-----------
removed print menu item for 1.3.x branch
Modified Paths:
--------------
branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
Modified: branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form
===================================================================
--- branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-06-16 00:48:50 UTC (rev 68)
+++ branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.form 2009-06-16 00:54:17 UTC (rev 69)
@@ -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.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-16 00:48:50 UTC (rev 68)
+++ branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-16 00:54:17 UTC (rev 69)
@@ -227,7 +227,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();
@@ -317,11 +316,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
@@ -1442,7 +1436,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.ButtonGroup fontButtonGroup;
private javax.swing.JRadioButtonMenuItem fontSansSerifItem;
Modified: branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties
===================================================================
--- branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-06-16 00:48:50 UTC (rev 68)
+++ branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsView.properties 2009-06-16 00:54:17 UTC (rev 69)
@@ -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-06-15 22:24:02
|
Revision: 67
http://imagetools.svn.sourceforge.net/imagetools/?rev=67&view=rev
Author: cmarcum
Date: 2009-06-15 22:24:01 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
set Application.version property to 1.3.0-alpha1
Modified Paths:
--------------
branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
Modified: branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
===================================================================
--- branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-06-13 15:01:03 UTC (rev 66)
+++ branches/1.3.x/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-06-15 22:24:01 UTC (rev 67)
@@ -2,7 +2,7 @@
Application.name = imagetools
Application.title = Image Tools
-Application.version = 1.3.0
+Application.version = 1.3.0-alpha1
Application.vendor = CodeBuilders.net
Application.homepage = http://imagetools.sourceforge.net
Application.description = An application to capture an image of the display, \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-13 15:01:05
|
Revision: 66
http://imagetools.svn.sourceforge.net/imagetools/?rev=66&view=rev
Author: cmarcum
Date: 2009-06-13 15:01:03 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
created 1.3.x release branch
Added Paths:
-----------
branches/1.3.x/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-13 14:53:44
|
Revision: 65
http://imagetools.svn.sourceforge.net/imagetools/?rev=65&view=rev
Author: cmarcum
Date: 2009-06-13 14:53:43 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
set Application.version property to 1.3.0
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-06-13 14:44:47 UTC (rev 64)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/ImageToolsApp.properties 2009-06-13 14:53:43 UTC (rev 65)
@@ -2,7 +2,7 @@
Application.name = imagetools
Application.title = Image Tools
-Application.version = 1.2.0
+Application.version = 1.3.0
Application.vendor = CodeBuilders.net
Application.homepage = http://imagetools.sourceforge.net
Application.description = An application to capture an image of the display, \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-13 14:44:50
|
Revision: 64
http://imagetools.svn.sourceforge.net/imagetools/?rev=64&view=rev
Author: cmarcum
Date: 2009-06-13 14:44:47 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
copied license files and readme file for UNIX and Linux so .txt versions can be formatted Windows
Added Paths:
-----------
trunk/imagetools/dist_include/COPYING
trunk/imagetools/dist_include/README
trunk/imagetools/dist_include/THIRDPARTYLICENSE
Added: trunk/imagetools/dist_include/COPYING
===================================================================
--- trunk/imagetools/dist_include/COPYING (rev 0)
+++ trunk/imagetools/dist_include/COPYING 2009-06-13 14:44:47 UTC (rev 64)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: trunk/imagetools/dist_include/README
===================================================================
--- trunk/imagetools/dist_include/README (rev 0)
+++ trunk/imagetools/dist_include/README 2009-06-13 14:44:47 UTC (rev 64)
@@ -0,0 +1,5 @@
+
+To run the project from the command line, go to the folder and
+type the following:
+
+java -jar "imagetools.jar"
Added: trunk/imagetools/dist_include/THIRDPARTYLICENSE
===================================================================
--- trunk/imagetools/dist_include/THIRDPARTYLICENSE (rev 0)
+++ trunk/imagetools/dist_include/THIRDPARTYLICENSE 2009-06-13 14:44:47 UTC (rev 64)
@@ -0,0 +1,1067 @@
+DO NOT TRANSLATE OR LOCALIZE
+
+*******************************************************************************
+
+CodeBuilders.net elects to use the GNU Lesser General Public License version 3
+(LGPL)/GNU General Public License version 3 (GPL) for any software where a
+choice of LGPL/GPL license versions are made available with the language
+indicating that LGPLv?/GPLv? or any later version may be used, or where a
+choice of which version of the LGPL/GPL is applied is unspecified.
+
+*******************************************************************************
+
+*******************************************************************************
+
+%% The following software may be included in this product:
+Crystal Project Icons
+
+Use of any of this software is governed by the terms of the license below:
+
+TITLE: Crystal Project Icons
+AUTHOR: Everaldo Coelho
+SITE: http://www.everaldo.com
+CONTACT: eve...@ev...
+
+Copyright (c) 2006-2007 Everaldo Coelho.
+
+*******************************************************************************
+
+%% The following software may be included in this product:
+appframework-1.0.3.jar
+
+Use of any of this software is governed by the terms of the license below:
+
+Copyright (c) 2005-2006 Sun Microsystems, Inc., 4150 Network Circle, Santa
+Clara, California 95054, U.S.A. All rights reserved. Use is subject
+to license terms below. Sun, Sun Microsystems and the Sun logo are
+trademarks or registered trademarks of Sun Microsystems, Inc. in the
+U.S. and other countries.
+
+Notice: This product is covered by U.S. export control laws and may be
+subject to the export or import laws in other countries. These laws may
+restrict the fields of use for this software and may require you to
+secure government authorization.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute softw...
[truncated message content] |
|
From: <cm...@us...> - 2009-06-13 14:25:42
|
Revision: 63
http://imagetools.svn.sourceforge.net/imagetools/?rev=63&view=rev
Author: cmarcum
Date: 2009-06-13 14:25:35 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
added png file for desktop icons on UNIX and Linux
Added Paths:
-----------
trunk/imagetools/dist_include/imagetools.png
Added: trunk/imagetools/dist_include/imagetools.png
===================================================================
(Binary files differ)
Property changes on: trunk/imagetools/dist_include/imagetools.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cm...@us...> - 2009-06-12 18:06:46
|
Revision: 62
http://imagetools.svn.sourceforge.net/imagetools/?rev=62&view=rev
Author: cmarcum
Date: 2009-06-12 18:06:40 +0000 (Fri, 12 Jun 2009)
Log Message:
-----------
ticket:7 - implemented font size changes in combo box in DrawTextBox
Modified Paths:
--------------
trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.form
trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.java
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java
trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/DrawTextBox.properties
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.form
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.form 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.form 2009-06-12 18:06:40 UTC (rev 62)
@@ -33,6 +33,11 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="closeButton" min="-2" max="-2" attributes="0"/>
</Group>
+ <Group type="102" alignment="1" attributes="0">
+ <Component id="fontStyleBox" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="fontSizeBox" min="-2" max="-2" attributes="0"/>
+ </Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@@ -42,9 +47,14 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Component id="scrollPane" pref="99" max="32767" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="scrollPane" pref="83" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
+ <Component id="fontSizeBox" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="fontStyleBox" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
<Component id="closeButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="okButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
@@ -68,12 +78,12 @@
<Component class="javax.swing.JTextArea" name="textArea">
<Properties>
<Property name="columns" type="int" value="20"/>
+ <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection code="new java.awt.Font(itModel.getFontName(), java.awt.Font.PLAIN, itModel.getFontSize())" type="code"/>
+ </Property>
<Property name="lineWrap" type="boolean" value="true"/>
<Property name="rows" type="int" value="5"/>
<Property name="name" type="java.lang.String" value="textArea" noResource="true"/>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[200, 75]"/>
- </Property>
</Properties>
</Component>
</SubComponents>
@@ -84,6 +94,7 @@
<action class="net.codebuilders.desktop.imagetools.DrawTextBox" id="setText" methodName="setText"/>
</Property>
<Property name="text" type="java.lang.String" resourceKey="okButton.text"/>
+ <Property name="toolTipText" type="java.lang.String" resourceKey="okButton.toolTipText"/>
<Property name="name" type="java.lang.String" value="okButton" noResource="true"/>
</Properties>
</Component>
@@ -93,8 +104,43 @@
<action class="net.codebuilders.desktop.imagetools.DrawTextBox" id="closeDrawTextBox" methodName="closeDrawTextBox"/>
</Property>
<Property name="text" type="java.lang.String" resourceKey="closeButton.text"/>
+ <Property name="toolTipText" type="java.lang.String" resourceKey="closeButton.toolTipText"/>
<Property name="name" type="java.lang.String" value="closeButton" noResource="true"/>
</Properties>
</Component>
+ <Component class="javax.swing.JComboBox" name="fontSizeBox">
+ <Properties>
+ <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+ <StringArray count="4">
+ <StringItem index="0" value="10"/>
+ <StringItem index="1" value="12"/>
+ <StringItem index="2" value="14"/>
+ <StringItem index="3" value="16"/>
+ </StringArray>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" resourceKey="fontSizeBox.toolTipText"/>
+ <Property name="name" type="java.lang.String" value="fontSizeBox" noResource="true"/>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="fontSizeBoxActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JComboBox" name="fontStyleBox">
+ <Properties>
+ <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+ <StringArray count="2">
+ <StringItem index="0" value="SansSerif"/>
+ <StringItem index="1" value="Serif"/>
+ </StringArray>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" resourceKey="fontStyleBox.toolTipText"/>
+ <Property name="name" type="java.lang.String" value="fontStyleBox" noResource="true"/>
+ </Properties>
+ <Events>
+ <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="fontStyleBoxItemStateChanged"/>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="fontStyleBoxActionPerformed"/>
+ <EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="fontStyleBoxPropertyChange"/>
+ </Events>
+ </Component>
</SubComponents>
</Form>
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.java 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/DrawTextBox.java 2009-06-12 18:06:40 UTC (rev 62)
@@ -24,27 +24,36 @@
*
* Created on Mar 2, 2009, 5:38:07 PM
*/
-
package net.codebuilders.desktop.imagetools;
-import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemListener;
+import java.beans.PropertyChangeListener;
import org.jdesktop.application.Action;
/**
*
* @author carl
*/
-public class DrawTextBox extends javax.swing.JDialog {
+public class DrawTextBox extends javax.swing.JDialog implements ItemListener, ActionListener, PropertyChangeListener {
/** Creates new form DrawTextBox */
public DrawTextBox(java.awt.Frame parent) {
super(parent);
+ itModel = ImageToolsApp.getApplication().getItModel();
initComponents();
getRootPane().setDefaultButton(closeButton);
+ // itModel = ImageToolsApp.getApplication().getItModel();
+ // set from model
+ this.fontStyleBox.setSelectedItem(itModel.getFontName());
+ // set from model
+ this.fontSizeBox.setSelectedItem(Integer.toString(itModel.getFontSize()));
}
- @Action public void closeDrawTextBox() {
+ @Action
+ public void closeDrawTextBox() {
dispose();
}
@@ -61,6 +70,8 @@
textArea = new javax.swing.JTextArea();
okButton = new javax.swing.JButton();
closeButton = new javax.swing.JButton();
+ fontSizeBox = new javax.swing.JComboBox();
+ fontStyleBox = new javax.swing.JComboBox();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(net.codebuilders.desktop.imagetools.ImageToolsApp.class).getContext().getResourceMap(DrawTextBox.class);
@@ -71,21 +82,35 @@
scrollPane.setName("scrollPane"); // NOI18N
textArea.setColumns(20);
+ textArea.setFont(new java.awt.Font(itModel.getFontName(), java.awt.Font.PLAIN, itModel.getFontSize()));
textArea.setLineWrap(true);
textArea.setRows(5);
textArea.setName("textArea"); // NOI18N
- textArea.setPreferredSize(new java.awt.Dimension(200, 75));
scrollPane.setViewportView(textArea);
javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(net.codebuilders.desktop.imagetools.ImageToolsApp.class).getContext().getActionMap(DrawTextBox.class, this);
okButton.setAction(actionMap.get("setText")); // NOI18N
okButton.setText(resourceMap.getString("okButton.text")); // NOI18N
+ okButton.setToolTipText(resourceMap.getString("okButton.toolTipText")); // NOI18N
okButton.setName("okButton"); // NOI18N
closeButton.setAction(actionMap.get("closeDrawTextBox")); // NOI18N
closeButton.setText(resourceMap.getString("closeButton.text")); // NOI18N
+ closeButton.setToolTipText(resourceMap.getString("closeButton.toolTipText")); // NOI18N
closeButton.setName("closeButton"); // NOI18N
+ fontSizeBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "10", "12", "14", "16" }));
+ fontSizeBox.setToolTipText(resourceMap.getString("fontSizeBox.toolTipText")); // NOI18N
+ fontSizeBox.setName("fontSizeBox"); // NOI18N
+ fontSizeBox.addActionListener(this);
+
+ fontStyleBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "SansSerif", "Serif" }));
+ fontStyleBox.setToolTipText(resourceMap.getString("fontStyleBox.toolTipText")); // NOI18N
+ fontStyleBox.setName("fontStyleBox"); // NOI18N
+ fontStyleBox.addItemListener(this);
+ fontStyleBox.addActionListener(this);
+ fontStyleBox.addPropertyChangeListener(this);
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@@ -97,45 +122,100 @@
.addGroup(layout.createSequentialGroup()
.addComponent(okButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(closeButton)))
+ .addComponent(closeButton))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(fontStyleBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(fontSizeBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .addComponent(scrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 99, Short.MAX_VALUE)
- .addGap(18, 18, 18)
+ .addComponent(scrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(fontSizeBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(fontStyleBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(closeButton)
.addComponent(okButton))
.addContainerGap())
);
pack();
+ }
+
+ // Code for dispatching events from components to event handlers.
+
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ if (evt.getSource() == fontSizeBox) {
+ DrawTextBox.this.fontSizeBoxActionPerformed(evt);
+ }
+ else if (evt.getSource() == fontStyleBox) {
+ DrawTextBox.this.fontStyleBoxActionPerformed(evt);
+ }
+ }
+
+ public void itemStateChanged(java.awt.event.ItemEvent evt) {
+ if (evt.getSource() == fontStyleBox) {
+ DrawTextBox.this.fontStyleBoxItemStateChanged(evt);
+ }
+ }
+
+ public void propertyChange(java.beans.PropertyChangeEvent evt) {
+ if (evt.getSource() == fontStyleBox) {
+ DrawTextBox.this.fontStyleBoxPropertyChange(evt);
+ }
}// </editor-fold>//GEN-END:initComponents
+ private void fontStyleBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_fontStyleBoxItemStateChanged
+ // TODO delete this method
+ }//GEN-LAST:event_fontStyleBoxItemStateChanged
+ private void fontStyleBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fontStyleBoxActionPerformed
+ javax.swing.JComboBox cb = (javax.swing.JComboBox) evt.getSource();
+ String style = (String)cb.getSelectedItem();
+ itModel.setFontName(style);
+ textArea.setFont(new Font(itModel.getFontName(), Font.PLAIN, itModel.getFontSize()));
+ }//GEN-LAST:event_fontStyleBoxActionPerformed
+
+ private void fontSizeBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fontSizeBoxActionPerformed
+
+ javax.swing.JComboBox cb = (javax.swing.JComboBox) evt.getSource();
+ String height = (String)cb.getSelectedItem();
+ itModel.setFontSize(Integer.parseInt(height));
+ textArea.setFont(new Font(itModel.getFontName(), Font.PLAIN, itModel.getFontSize()));
+ }//GEN-LAST:event_fontSizeBoxActionPerformed
+
+ private void fontStyleBoxPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_fontStyleBoxPropertyChange
+ // TODO delete this method
+ }//GEN-LAST:event_fontStyleBoxPropertyChange
+
@Action
public void setText() {
- ImageToolsModel itModel = ImageToolsApp.getApplication().getItModel();
+ itModel = ImageToolsApp.getApplication().getItModel();
// itModel.setText("text goes here");
itModel.setText(this.textArea.getText());
// set the current width to the model
- itModel.setTextBoxWidth((float)this.textArea.getWidth());
+ itModel.setTextBoxWidth((float) this.textArea.getWidth());
// dispose of box
closeDrawTextBox();
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton closeButton;
+ private javax.swing.JComboBox fontSizeBox;
+ private javax.swing.JComboBox fontStyleBox;
private javax.swing.JButton okButton;
private javax.swing.JScrollPane scrollPane;
private javax.swing.JTextArea textArea;
// End of variables declaration//GEN-END:variables
+
+ ImageToolsModel itModel;
- // ImageToolsModel itModel;
-
}
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageArea.java 2009-06-12 18:06:40 UTC (rev 62)
@@ -155,25 +155,37 @@
map = new Hashtable<TextAttribute, Object>();
// get textFont value from model
- map.put(TextAttribute.FAMILY, itModel.getFont());
+ map.put(TextAttribute.FAMILY, itModel.getFontName());
// get text height value from model
map.put(TextAttribute.SIZE, new Float(itModel.getFontSize()));
// make a new attributed string
attStr = new AttributedString(itModel.getText(), map);
- // listen for ImageTools Model to update textFont
- itModel.pcs.addPropertyChangeListener("font", new PropertyChangeListener() {
+ // listen for ImageTools Model to update fontName
+ itModel.pcs.addPropertyChangeListener("fontName", new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
// update map
- map.put(TextAttribute.FAMILY, itModel.getFont());
+ map.put(TextAttribute.FAMILY, itModel.getFontName());
// make a new attributed string
attStr = new AttributedString(itModel.getText(), map);
}
});
- // listen for ImageTools Model to update Text
+ // listen for ImageTools Model to update fontSize
+ itModel.pcs.addPropertyChangeListener("fontSize", new PropertyChangeListener() {
+
+ @Override
+ public void propertyChange(PropertyChangeEvent propertyChangeEvent) {
+ // update map
+ map.put(TextAttribute.SIZE, itModel.getFontSize());
+ // make a new attributed string
+ attStr = new AttributedString(itModel.getText(), map);
+ }
+ });
+
+ // listen for ImageTools Model to update text
itModel.pcs.addPropertyChangeListener("text", new PropertyChangeListener() {
@Override
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsModel.java 2009-06-12 18:06:40 UTC (rev 62)
@@ -44,8 +44,8 @@
private String fileExt = "";
private String text = "XXX";
- private String font = Font.SANS_SERIF;
- private int fontSize = 12;
+ private String fontName = Font.SANS_SERIF; // "SansSerif"
+ private int fontSize = 14;
private float textBoxWidth = (float)200.0;
private Color color = Color.RED;
Robot robot = null;
@@ -209,7 +209,9 @@
* @param fontSize the fontSize to set
*/
public void setFontSize(int fontSize) {
+ int oldSize = this.getFontSize();
this.fontSize = fontSize;
+ pcs.firePropertyChange("fontSize", oldSize, fontSize);
}
public void undo() {
@@ -273,18 +275,18 @@
}
/**
- * @return the font
+ * @return the fontName
*/
- public String getFont() {
- return font;
+ public String getFontName() {
+ return fontName;
}
/**
- * @param font the font to set
+ * @param fontName the fontName to set
*/
- public void setFont(String font) {
- String oldFont = this.getFont();
- this.font = font;
- pcs.firePropertyChange("font", oldFont, this.font);
+ public void setFontName(String fontName) {
+ String oldFontName = this.getFontName();
+ this.fontName = fontName;
+ pcs.firePropertyChange("fontName", oldFontName, this.fontName);
}
}
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/ImageToolsView.java 2009-06-12 18:06:40 UTC (rev 62)
@@ -1373,7 +1373,7 @@
@Action(enabledProperty = "fontSerifEnabled", selectedProperty = "fontSerifSelected")
public void setFontSerif() {
- itModel.setFont(java.awt.Font.SERIF);
+ itModel.setFontName(java.awt.Font.SERIF);
}
private boolean fontSerifEnabled = true;
@@ -1400,7 +1400,7 @@
@Action(enabledProperty = "fontSansSerifEnabled", selectedProperty = "fontSansSerifSelected")
public void setFontSansSerif() {
- itModel.setFont(java.awt.Font.SANS_SERIF);
+ itModel.setFontName(java.awt.Font.SANS_SERIF);
}
private boolean fontSansSerifEnabled = true;
Modified: trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/DrawTextBox.properties
===================================================================
--- trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/DrawTextBox.properties 2009-06-11 02:16:36 UTC (rev 61)
+++ trunk/imagetools/src/net/codebuilders/desktop/imagetools/resources/DrawTextBox.properties 2009-06-12 18:06:40 UTC (rev 62)
@@ -11,3 +11,7 @@
closeDrawTextBox.Action.icon=/net/codebuilders/desktop/imagetools/resources/button_cancel16.png
closeDrawTextBox.Action.shortDescription=
closeDrawTextBox.Action.text=
+fontStyleBox.toolTipText=Font style
+fontSizeBox.toolTipText=Font size
+okButton.toolTipText=Continue to place text
+closeButton.toolTipText=Cancel text
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
