You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/10/28 04:07:26 UTC
svn commit: r329038 - in /forrest/trunk: site-author/
site-author/content/xdocs/tools/ tools/xxe/ tools/xxe/css/
Author: crossley
Date: Thu Oct 27 19:07:15 2005
New Revision: 329038
URL: http://svn.apache.org/viewcvs?rev=329038&view=rev
Log:
due-to="Sjur N. Moshagen"
fix-for="FOR-581,FOR-720"
Toolbar icons not found if tool is installed in user config dir.
Now compatible with XXE 3.0
Modified:
forrest/trunk/site-author/content/xdocs/tools/xxe.xml
forrest/trunk/site-author/status.xml
forrest/trunk/tools/xxe/README.txt
forrest/trunk/tools/xxe/build.xml
forrest/trunk/tools/xxe/common_config.xml
forrest/trunk/tools/xxe/css/document1x.css
forrest/trunk/tools/xxe/css/document2x.css
forrest/trunk/tools/xxe/document-v20.xxe
forrest/trunk/tools/xxe/toolBar.xml
Modified: forrest/trunk/site-author/content/xdocs/tools/xxe.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/tools/xxe.xml?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/tools/xxe.xml (original)
+++ forrest/trunk/site-author/content/xdocs/tools/xxe.xml Thu Oct 27 19:07:15 2005
@@ -38,7 +38,12 @@
<ol>
<li>Delete the <code>forrest</code> directory from the XXE application
config directory. (e.g. <code>D:\Program
- Files\XMLmind_XML_Editor\config</code>)</li>
+ Files\XMLmind_XML_Editor\config</code>)
+ <ul>
+ <li>if you have installed the config in your XXE user directory (see
+ below), this step is not necessary</li>
+ </ul>
+ </li>
<li>Install normally</li>
</ol>
@@ -49,7 +54,12 @@
<ol>
<li>Extract into the XXE application config directory (e.g.
- <code>D:\Program Files\XMLmind_XML_Editor\config</code>)</li>
+ <code>D:\Program Files\XMLmind_XML_Editor\config</code>)<br/>
+ <strong>OR</strong></li>
+ <li>Extract into your XXE user directory (e.g.
+ <code>~/.xxe/addon/config</code>) (only in version 1.3+ of this config).
+ From version 1.3, this is the recommended installation location, as it
+ permits upgrading XXE without having to reinstall this config</li>
</ol>
</section>
@@ -75,5 +85,26 @@
href="http://www.xmlmind.com/xmleditor/_distrib/docs/configure/index.html">XXE
Custom Configuration Info</link></p>
</section>
+
+ <section>
+ <title>History</title>
+ <section>
+ <title>1.3</title>
+ <ul>
+ <li>Fixed a bug that prevented this config to work with XXE 3.x
+ (FOR-720)</li>
+ <li>Fixed a bug that prevented correct loading of the common css
+ stylesheet (FOR-581)</li>
+ <li>Changed icon references to be installation independent
+ (FOR-581)</li>
+ <li>Added a Forrest menu, with more robust table manipulation, and for
+ v2 docs some link traversals (both taken from the XXE XHTML config)</li>
+ <li>Added more entries to the Table button (menu) in the Forrest
+ toolbar, replicating the entries in the Forrest menu</li>
+ <li>Added a History section to the README and documentation</li>
+ </ul>
+ </section>
+ </section>
+
</body>
</document>
Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Thu Oct 27 19:07:15 2005
@@ -130,6 +130,11 @@
Added document to facilitate
<link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
</action>
+
+ <action context="code" type="update" dev="DC" due-to="Sjur N. Moshagen"
+ fix-for="FOR-581,FOR-720">
+ Fixed and enhanced the Forrest plugin for the XMLmind XML Editor at tools/xxe
+ </action>
<action context="code" type="update" dev="DC" due-to="Addison Berry"
fix-for="FOR-180,FOR-716">
Modified: forrest/trunk/tools/xxe/README.txt
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/README.txt?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/README.txt (original)
+++ forrest/trunk/tools/xxe/README.txt Thu Oct 27 19:07:15 2005
@@ -26,6 +26,7 @@
Upgrading
=========
* Delete the 'forrest' directory from the XXE application config directory. (e.g. D:\Program Files\XMLmind_XML_Editor\config)
+ * if you have installed the config in your XXE user directory (see below), this step is not necessary
* Install normally
@@ -33,6 +34,9 @@
==========
* For XXEv2.5p3+
* Extract into the XXE application config directory (e.g. D:\Program Files\XMLmind_XML_Editor\config)
+ OR
+ * Extract into your XXE user directory (e.g. ~/.xxe/addon/config) (only in version 1.3+ of this config)
+ From version 1.3, this is the recommended installation location, as it permits upgrading XXE without having to reinstall this config
* For XXEv2.5p2 or prior you also need to do
* Open XXE
* select Options > Options > Schema > Add File
@@ -44,6 +48,17 @@
To build the configuration:
* set the FORREST_HOME environment variable
* run 'ant' in this directory
+
+History
+=======
+1.3:
+----
+- Fixed a bug that prevented this config to work with XXE 3.x (FOR-720)
+- Fixed a bug that prevented correct loading of the common css stylesheet (FOR-581)
+- Changed icon references to be installation independent (FOR-581)
+- Added a Forrest menu, with more robust table manipulation, and for v2 docs some link traversals (both taken from the XXE XHTML config)
+- Added more entries to the Table button (menu) in the Forrest toolbar, replicating the entries in the Forrest menu
+- Added a History section to the README and documentation
References
==========
Modified: forrest/trunk/tools/xxe/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/build.xml?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/build.xml (original)
+++ forrest/trunk/tools/xxe/build.xml Thu Oct 27 19:07:15 2005
@@ -20,7 +20,7 @@
<target name="-init">
<property environment="env"/>
- <property name="version" value="1.2"/>
+ <property name="version" value="1.3"/>
<property name="dist.dir" location="dist"/>
<property name="dist.name" value="XXE_forrest_config"/>
</target>
Modified: forrest/trunk/tools/xxe/common_config.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/common_config.xml?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/common_config.xml (original)
+++ forrest/trunk/tools/xxe/common_config.xml Thu Oct 27 19:07:15 2005
@@ -135,4 +135,57 @@
</macro>
</command>
+ <command name="forrest.tableColumn">
+ <class>com.xmlmind.xmleditapp.xhtml.TableColumn</class>
+ </command>
+ <command name="forrest.tableRow">
+ <class>com.xmlmind.xmleditapp.xhtml.TableRow</class>
+ </command>
+
+ <!-- Menu =========================================================== -->
+ <!-- modified from xhtml config files ============================= -->
+
+ <menu label="Forrest" mnemonic="F">
+
+ <item label="Insert Table With heading row"
+ command="add"
+ parameter="after[implicitElement] #template(table,tableHeaded)" />
+ <item label="Insert Table Without heading row"
+ command="add"
+ parameter="after[implicitElement] #template(table,tableUnheaded)" />
+ <separator />
+ <item label="Insert Column Before"
+ mnemonic="B"
+ icon="xxe-config:common/icons/ColumnInsertBefore16.gif"
+ command="forrest.tableColumn"
+ parameter="insertBefore"/>
+ <item label="Insert Column After"
+ mnemonic="A"
+ icon="xxe-config:common/icons/ColumnInsertAfter16.gif"
+ command="forrest.tableColumn"
+ parameter="insertAfter"/>
+ <item label="Delete Column"
+ mnemonic="D"
+ icon="xxe-config:common/icons/ColumnDelete16.gif"
+ command="forrest.tableColumn"
+ parameter="delete"/>
+ <separator />
+ <item label="Insert Row Before"
+ mnemonic="I"
+ icon="xxe-config:common/icons/RowInsertBefore16.gif"
+ command="forrest.tableRow"
+ parameter="insertBefore"/>
+ <item label="Insert Row After"
+ mnemonic="n"
+ icon="xxe-config:common/icons/RowInsertAfter16.gif"
+ command="forrest.tableRow"
+ parameter="insertAfter"/>
+ <item label="Delete Row"
+ mnemonic="e"
+ icon="xxe-config:common/icons/RowDelete16.gif"
+ command="forrest.tableRow"
+ parameter="delete"/>
+
+ </menu>
+
</configuration>
Modified: forrest/trunk/tools/xxe/css/document1x.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/css/document1x.css?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/css/document1x.css (original)
+++ forrest/trunk/tools/xxe/css/document1x.css Thu Oct 27 19:07:15 2005
@@ -15,7 +15,7 @@
limitations under the License.
*/
-@import url(xxe-config:forrest/css/common.css);
+@import url(common.css);
/*====================================================
Hypertextual Links
Modified: forrest/trunk/tools/xxe/css/document2x.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/css/document2x.css?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/css/document2x.css (original)
+++ forrest/trunk/tools/xxe/css/document2x.css Thu Oct 27 19:07:15 2005
@@ -15,7 +15,7 @@
limitations under the License.
*/
-@import url(xxe-config:forrest/css/common.css);
+@import url(common.css);
a {
color: #0086b2;
Modified: forrest/trunk/tools/xxe/document-v20.xxe
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/document-v20.xxe?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/document-v20.xxe (original)
+++ forrest/trunk/tools/xxe/document-v20.xxe Thu Oct 27 19:07:15 2005
@@ -50,4 +50,24 @@
</macro>
</command>
+ <command name="forrest.crossReference">
+ <class>com.xmlmind.xmleditapp.xhtml.CrossReference</class>
+ </command>
+
+ <menu label="Forrest" mnemonic="F">
+ <insert/>
+ <separator />
+ <item label="Go to Opposite Link End"
+ mnemonic="G"
+ command="forrest.crossReference"
+ parameter="swap"/>
+ <item label="Go to Next Link"
+ mnemonic="N"
+ command="forrest.crossReference"
+ parameter="next"/>
+ <item label="Go to Previous Link"
+ mnemonic="P"
+ command="forrest.crossReference"
+ parameter="previous"/>
+ </menu>
</configuration>
Modified: forrest/trunk/tools/xxe/toolBar.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/tools/xxe/toolBar.xml?rev=329038&r1=329037&r2=329038&view=diff
==============================================================================
--- forrest/trunk/tools/xxe/toolBar.xml (original)
+++ forrest/trunk/tools/xxe/toolBar.xml Thu Oct 27 19:07:15 2005
@@ -17,30 +17,29 @@
-->
<configuration
xsi:schemaLocation="http://www.xmlmind.com/xmleditor/schema/configuration
- ../configuration/xsd/configuration.xsd"
+ xxe-config:configuration/xsd/configuration.xsd"
xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
<toolBar>
- <insert />
<button toolTip="Convert to strong"
- icon="../common/icons2/b.gif">
+ icon="xxe-config:common/icons2/b.gif">
<command name="convert" parameter="[implicitElement] strong" />
</button>
<button toolTip="Convert to emphasis"
- icon="../common/icons2/emphasis.gif">
+ icon="xxe-config:common/icons2/emphasis.gif">
<command name="convert" parameter="[implicitElement] em" />
</button>
<button toolTip="Convert to code"
- icon="../common/icons2/tt.gif">
+ icon="xxe-config:common/icons2/tt.gif">
<command name="convert" parameter="[implicitElement] code" />
</button>
<button toolTip="Convert to link"
- icon="../common/icons2/link_menu.gif">
+ icon="xxe-config:common/icons2/link_menu.gif">
<menu>
<item label="link" command="forrest.convertLink"/>
<item label="fork" command="forrest.convertFork"/>
@@ -55,27 +54,27 @@
<command name="convert" parameter="[implicitElement] sup" />
</button>
- <button toolTip="Convert to plain text" icon="../common/icons2/plain.gif">
+ <button toolTip="Convert to plain text" icon="xxe-config:common/icons2/plain.gif">
<command name="convert" parameter="[implicitElement] #text" />
</button>
<separator />
- <button toolTip="Add section" icon="../common/icons2/section.gif">
+ <button toolTip="Add section" icon="xxe-config:common/icons2/section.gif">
<command name="add" parameter="after[implicitElement] section" />
</button>
- <button toolTip="Add paragraph" icon="../common/icons2/para.gif">
+ <button toolTip="Add paragraph" icon="xxe-config:common/icons2/para.gif">
<command name="add" parameter="after[implicitElement] p" />
</button>
- <button toolTip="Add source" icon="../common/icons2/edit.gif">
+ <button toolTip="Add source" icon="xxe-config:common/icons2/edit.gif">
<command name="add" parameter="after[implicitElement] source" />
</button>
<button toolTip="Add note" icon="icons/note.png">
<menu>
- <item label="Add note" command="add" parameter="after[implicitElement] note" icon="icons/note.png"/>
+ <item label="Add note" command="add" parameter="after[implicitElement] note" />
<item label="Add warning" command="add" parameter="after[implicitElement] warning" />
<item label="Add fixme" command="add" parameter="after[implicitElement] fixme" />
</menu>
@@ -84,23 +83,30 @@
<separator />
<button toolTip="Add unordered list"
- icon="../common/icons2/itemizedlist.gif">
+ icon="xxe-config:common/icons2/itemizedlist.gif">
<command name="add" parameter="after[implicitElement] ul" />
</button>
- <button toolTip="Add ordered list" icon="../common/icons2/orderedlist.gif">
+ <button toolTip="Add ordered list" icon="xxe-config:common/icons2/orderedlist.gif">
<command name="add" parameter="after[implicitElement] ol" />
</button>
- <button toolTip="Table" icon="../common/icons2/table.gif">
+ <button toolTip="Table" icon="xxe-config:common/icons2/table.gif">
<menu>
<item label="With heading row" command="add" parameter="after[implicitElement] #template(table,tableHeaded)" />
<item label="Without heading row" command="add" parameter="after[implicitElement] #template(table,tableUnheaded)" />
- <item label="Add row" command="add" parameter="after[implicitElement] #template(tr,tableRow)" />
+ <separator />
+ <item label="Insert Column Before" command="forrest.tableColumn" parameter="insertBefore"/>
+ <item label="Insert Column After" command="forrest.tableColumn" parameter="insertAfter"/>
+ <item label="Delete Column" command="forrest.tableColumn" parameter="delete"/>
+ <separator />
+ <item label="Insert Row Before" command="forrest.tableRow" parameter="insertBefore"/>
+ <item label="Insert Row After" command="forrest.tableRow" parameter="insertAfter"/>
+ <item label="Delete Row" command="forrest.tableRow" parameter="delete"/>
</menu>
</button>
- <button toolTip="Add image" icon="../common/icons2/figure.gif">
+ <button toolTip="Add image" icon="xxe-config:common/icons2/figure.gif">
<command name="add" parameter="after[implicitElement] img" />
</button>