Merge W4LDialogs into W2LDialogs2

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@228 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2015-02-10 07:01:41 +00:00
parent 9f9b9bd7a7
commit bc2f47a4a0
19 changed files with 88 additions and 87 deletions

View file

@ -2,7 +2,7 @@
############################################################################
# This is the Ant build file for writer2latex
# Original: Sep 2004 (mgn)
# version 1.6 (2014-11-24)
# version 1.6 (2015-02-10)
############################################################################
-->
<project name="w2l" default="help" basedir=".">
@ -37,7 +37,7 @@
<!-- configure the directories -->
<property name="jarfile" value="writer2latex"/>
<property name="basename" value="writer2latex15"/>
<property name="distrofile" value="${basename}1alpha.zip" />
<property name="distrofile" value="${basename}2alpha.zip" />
<!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
<property name="src" location="source/java"/>
<property name="source.distro" location="source/distro" />

View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2014 by Henrik Just
* Copyright: 2002-2015 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.6 (2014-10-29)
* Version 1.6 (2015-02-10)
*
*/
@ -419,7 +419,7 @@ public final class ApplicationsDialog
private void displayAutoConfigInfo(String sText) {
XDialog xDialog = getDialog("W4LDialogs.AutoConfigInfo");
XDialog xDialog = getDialog("W2LDialogs2.AutoConfigInfo");
if (xDialog!=null) {
DialogAccess info = new DialogAccess(xDialog);
info.setTextFieldText("Info", sText);

View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.6 (2015-02-09)
* Version 1.6 (2015-02-10)
*
*/
@ -103,7 +103,7 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti
/** Return the name of the library containing the dialog
*/
@Override public String getDialogLibraryName() {
return "W4LDialogs";
return "W2LDialogs2";
}
/** Return the name of the dialog within the library
@ -131,6 +131,9 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti
else if (sMethod.equals("InsertReference")) {
insertReference();
}
else if (sMethod.equals("New")) {
newFile();
}
else if (sMethod.equals("Edit")) {
edit();
}
@ -286,6 +289,14 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti
}
}
// Create a new BibTeX file
private void newFile() {
if (xFrame!=null) {
MessageBox msgBox = new MessageBox(xContext, xFrame);
msgBox.showMessage("Writer2LaTeX","This feature is not implemented yet");
}
}
// Edit the currently selected BibTeX file, if any
private void edit() {
int nFile = getListBoxSelectedItem("File");

View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2014 by Henrik Just
* Copyright: 2002-2015 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.6 (2014-11-20)
* Version 1.6 (2015-02-10)
*
*/
@ -55,7 +55,7 @@ public class LogViewerDialog extends DialogBase
/** Return the name of the library containing the dialog
*/
public String getDialogLibraryName() {
return "W4LDialogs";
return "W2LDialogs2";
}
private String sBaseUrl = null;

View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2014 by Henrik Just
* Copyright: 2002-2015 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.6 (2014-12-27)
* Version 1.6 (2015-02-09)
*
*/
@ -199,7 +199,7 @@ public final class Writer2LaTeX extends WeakBase
private void createUNOPublisher() {
if (unoPublisher==null) {
unoPublisher = new LaTeXUNOPublisher(m_xContext,m_xFrame,"Writer2latex");
unoPublisher = new LaTeXUNOPublisher(m_xContext,m_xFrame,"Writer2LaTeX");
}
}

View file

@ -61,10 +61,6 @@
manifest:full-path="W2LDialogs2/"
manifest:media-type="application/vnd.sun.star.basic-library"/>
<manifest:file-entry
manifest:full-path="W4LDialogs/"
manifest:media-type="application/vnd.sun.star.basic-library"/>
<manifest:file-entry
manifest:full-path="writer2latex.rdb"
manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>

View file

@ -28,7 +28,7 @@
<value xml:lang="en-US">Writer2LaTeX toolbar</value>
</prop>
<prop oor:name="OptionsPage">
<value>%origin%/W4LDialogs/ConfigurationRoot.xdl</value>
<value>%origin%/W2LDialogs2/ToolbarConfigurationRoot.xdl</value>
</prop>
<prop oor:name="EventHandlerService">
<value></value>
@ -45,7 +45,7 @@
<value xml:lang="en-US">Applications</value>
</prop>
<prop oor:name="OptionsPage">
<value>%origin%/W4LDialogs/Applications.xdl</value>
<value>%origin%/W2LDialogs2/Applications.xdl</value>
</prop>
<prop oor:name="EventHandlerService">
<value>org.openoffice.da.writer2latex.ApplicationsDialog</value>
@ -60,7 +60,7 @@
<value xml:lang="en-US">Bibliography</value>
</prop>
<prop oor:name="OptionsPage">
<value>%origin%/W4LDialogs/Bibliography.xdl</value>
<value>%origin%/W2LDialogs2/Bibliography.xdl</value>
</prop>
<prop oor:name="EventHandlerService">
<value>org.openoffice.da.writer2latex.BibliographyDialog</value>

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="BibTeXEntry" dlg:left="117" dlg:top="53" dlg:width="275" dlg:height="100" dlg:closeable="true" dlg:moveable="true" dlg:title="Edit BibTeX references">
<dlg:bulletinboard>
<dlg:text dlg:id="FileLabel" dlg:tab-index="0" dlg:left="10" dlg:top="10" dlg:width="60" dlg:height="12" dlg:value="BibTeX file"/>
<dlg:menulist dlg:id="File" dlg:tab-index="1" dlg:left="75" dlg:top="10" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXFile" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:FileChange" script:language="UNO"/>
</dlg:menulist>
<dlg:text dlg:id="EntryLabel" dlg:tab-index="9" dlg:left="10" dlg:top="24" dlg:width="60" dlg:height="12" dlg:value="BibTeX entry"/>
<dlg:menulist dlg:id="Entry" dlg:tab-index="2" dlg:left="75" dlg:top="24" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXEntry" dlg:spin="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EntryChange" script:language="UNO"/>
</dlg:menulist>
<dlg:button dlg:id="New" dlg:tab-index="3" dlg:left="205" dlg:top="10" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXNew" dlg:value="New...">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:New" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="Edit" dlg:tab-index="4" dlg:left="205" dlg:top="24" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXEdit" dlg:value="Edit">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Edit" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="EntryInformation" dlg:tab-index="10" dlg:left="10" dlg:top="40" dlg:width="255" dlg:height="34"/>
<dlg:button dlg:id="Insert" dlg:tab-index="5" dlg:left="10" dlg:top="78" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXInsert" dlg:value="Insert reference" dlg:button-type="ok">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:InsertReference" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="Refresh" dlg:tab-index="6" dlg:left="75" dlg:top="78" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXRefresh" dlg:value="Refresh">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Refresh" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="Close" dlg:tab-index="7" dlg:left="140" dlg:top="78" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXClose" dlg:value="Close" dlg:button-type="cancel"/>
<dlg:button dlg:id="Help" dlg:tab-index="8" dlg:left="205" dlg:top="78" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXDialog" dlg:value="Help" dlg:button-type="help"/>
</dlg:bulletinboard>
</dlg:window>

View file

@ -14,4 +14,11 @@
<library:element library:name="NewDialog"/>
<library:element library:name="Characters"/>
<library:element library:name="LoadDefaults"/>
<library:element library:name="ToolbarConfigurationRoot"/>
<library:element library:name="Applications"/>
<library:element library:name="Bibliography"/>
<library:element library:name="LogViewer"/>
<library:element library:name="AutoConfigInfo"/>
<library:element library:name="BibTeXEntry"/>
</library:library>

View file

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="BibTeXEntry" dlg:left="117" dlg:top="53" dlg:width="250" dlg:height="100" dlg:closeable="true" dlg:moveable="true" dlg:title="Insert BibTeX reference">
<dlg:bulletinboard>
<dlg:text dlg:id="FileLabel" dlg:tab-index="0" dlg:left="10" dlg:top="10" dlg:width="60" dlg:height="12" dlg:value="BibTeX file"/>
<dlg:menulist dlg:id="File" dlg:tab-index="1" dlg:left="75" dlg:top="10" dlg:width="95" dlg:height="12" dlg:spin="true" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXFile">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:FileChange" script:language="UNO"/>
</dlg:menulist>
<dlg:button dlg:id="Edit" dlg:tab-index="2" dlg:left="180" dlg:top="10" dlg:width="60" dlg:height="12" dlg:value="Edit..." dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXEdit">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Edit" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="EntryLabel" dlg:tab-index="3" dlg:left="10" dlg:top="24" dlg:width="60" dlg:height="12" dlg:value="BibTeX entry"/>
<dlg:menulist dlg:id="Entry" dlg:tab-index="4" dlg:left="75" dlg:top="24" dlg:width="95" dlg:height="12" dlg:spin="true" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXEntry">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EntryChange" script:language="UNO"/>
</dlg:menulist>
<dlg:button dlg:id="Refresh" dlg:tab-index="5" dlg:left="180" dlg:top="24" dlg:width="60" dlg:height="12" dlg:value="Refresh" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXRefresh">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Refresh" script:language="UNO"/>
</dlg:button>
<dlg:text dlg:id="EntryInformation" dlg:tab-index="6" dlg:left="10" dlg:top="40" dlg:width="210" dlg:height="34"/>
<dlg:button dlg:id="Insert" dlg:tab-index="7" dlg:left="10" dlg:top="78" dlg:width="60" dlg:height="12" dlg:value="Insert reference" dlg:button-type="ok" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXInsert">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:InsertReference" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="Cancel" dlg:tab-index="8" dlg:left="75" dlg:top="78" dlg:width="60" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXCancel"/>
<dlg:button dlg:id="Help" dlg:tab-index="9" dlg:left="180" dlg:top="78" dlg:width="60" dlg:height="12" dlg:value="Help" dlg:button-type="help" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXDialog"/>
</dlg:bulletinboard>
</dlg:window>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Module1" script:language="StarBasic">REM ***** BASIC *****
Sub Main
End Sub
</script:module>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="W4LDialogs" library:readonly="false" library:passwordprotected="false">
<library:element library:name="ConfigurationRoot"/>
<library:element library:name="Applications"/>
<library:element library:name="Bibliography"/>
<library:element library:name="LogViewer"/>
<library:element library:name="AutoConfigInfo"/>
<library:element library:name="BibTeXEntry"/>
</library:library>

View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
<library:library xmlns:library="http://openoffice.org/2000/library" library:name="W4LDialogs" library:readonly="false" library:passwordprotected="false">
<library:element library:name="Module1"/>
</library:library>

View file

@ -15,25 +15,25 @@
</section>
<paragraph role="paragraph" xml-lang="en-US">BibTeX is the standard database format for bibliographic references in LaTeX.
This is used to insert bibliographic references in %PRODUCTNAME Writer from BibTeX files.
This enables you to maintain your references in BibTeX, rather that using the biblipography database in %PRODUCTNAME Writer.
This dialog is used to insert bibliographic references in %PRODUCTNAME Writer from BibTeX files.
This enables you to maintain your references in BibTeX, rather that using the bibliography database in %PRODUCTNAME Writer.
</paragraph>
<paragraph role="paragraph" xml-lang="en-US">The dialog presents a list of BibTeX files from a specific folder.
The folder to search is configured in the <link href="org.openoffice.da.writer2latex.oxt/bibliography.xhp"
name="Bibliography settings">bibliography settings</link>.</paragraph>
<paragraph role="heading" level="2" xml-lang="en-US">Inserting BibTeX references</paragraph>
<paragraph role="paragraph" xml-lang="en-US">To insert a bibliographic reference, select an item and
click the <emph>Insert reference</emph> button.</paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXFile" id="bm_bibtexfile"/>
<paragraph role="heading" level="3" xml-lang="en-US">File</paragraph>
<paragraph role="heading" level="3" xml-lang="en-US">BibTeX file</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Select the BibTeX file to use in this list.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXFile" visibility="hidden">Select the BibTeX file to use</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXEntry" id="bm_bibtexentry"/>
<paragraph role="heading" level="3" xml-lang="en-US">Entry</paragraph>
<paragraph role="heading" level="3" xml-lang="en-US">BibTeX entry</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Select the entry to use in this list. The list contains the keys of all entries
in the selected BibTeX file.
Basic information about the entry is displayed in the field below the list.</paragraph>
@ -45,22 +45,31 @@
the currently selected entry.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXInsert" visibility="hidden">Click to insert a reference to the current entry</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXCancel" id="bm_bibtexcancel"/>
<paragraph role="heading" level="3" xml-lang="en-US">Cancel</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button to close the dialog without inserting any references.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXCancel" visibility="hidden">Click to close the dialog</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXRefresh" id="bm_bibtexrefresh"/>
<paragraph role="heading" level="3" xml-lang="en-US">Refresh</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button to reload the BibTeX
files and update all references. You should do this if you have edited a BibTeX file.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXRefresh" visibility="hidden">Click to refresh the contents of all references</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXClose" id="bm_bibtexclose"/>
<paragraph role="heading" level="3" xml-lang="en-US">Close</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button to close the dialog</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXClose" visibility="hidden">Click to close the dialog</ahelp></paragraph>
<paragraph role="heading" level="2" xml-lang="en-US">Managing BibTeX files</paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXNew" id="bm_bibtexnew"/>
<paragraph role="heading" level="3" xml-lang="en-US">New</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button create a new BibTeX file in the configured
directory. Enter a name for the file in the dialog.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXNew" visibility="hidden">Click to create a new BibTeX file</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXEdit" id="bm_bibtexedit"/>
<paragraph role="heading" level="3" xml-lang="en-US">Edit...</paragraph>
<paragraph role="heading" level="3" xml-lang="en-US">Edit</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button to edit the currently selected BibTeX file.
The file will open in your default BibTeX editor. If no default BibTeX editor was found on your system,
an error message is displayed.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXEdit" visibility="hidden">Click to edit the current file in your BibTeX editor</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2latex.oxt:BibTeXRefresh" id="bm_bibtexrefresh"/>
<paragraph role="heading" level="3" xml-lang="en-US">Refresh</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Click this button to reload the BibTeX
files. You should do this if you have edited a BibTeX file.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibTeXRefresh" visibility="hidden">Click to refresh the contents of the lists</ahelp></paragraph>
</body>
</helpdocument>