From bc2f47a4a00812f2278bf7d052287107ab46ed95 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Tue, 10 Feb 2015 07:01:41 +0000 Subject: [PATCH] Merge W4LDialogs into W2LDialogs2 git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@228 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- build.xml | 4 +- .../comp/writer2latex/ApplicationsDialog.java | 6 +-- .../da/comp/writer2latex/BibTeXDialog.java | 15 ++++++- .../da/comp/writer2latex/LogViewerDialog.java | 6 +-- .../da/comp/writer2latex/Writer2LaTeX.java | 6 +-- source/oxt/writer2latex/META-INF/manifest.xml | 4 -- .../oxt/writer2latex/ToolbarOptionPages.xcu | 6 +-- .../Applications.xdl | 0 .../AutoConfigInfo.xdl | 0 .../writer2latex/W2LDialogs2/BibTeXEntry.xdl | 29 +++++++++++++ .../Bibliography.xdl | 0 .../{W4LDialogs => W2LDialogs2}/LogViewer.xdl | 0 .../ToolbarConfigurationRoot.xdl} | 0 .../oxt/writer2latex/W2LDialogs2/dialog.xlb | 7 ++++ .../writer2latex/W4LDialogs/BibTeXEntry.xdl | 26 ------------ .../oxt/writer2latex/W4LDialogs/Module1.xba | 10 ----- source/oxt/writer2latex/W4LDialogs/dialog.xlb | 10 ----- source/oxt/writer2latex/W4LDialogs/script.xlb | 5 --- .../bibtex.xhp | 41 +++++++++++-------- 19 files changed, 88 insertions(+), 87 deletions(-) rename source/oxt/writer2latex/{W4LDialogs => W2LDialogs2}/Applications.xdl (100%) rename source/oxt/writer2latex/{W4LDialogs => W2LDialogs2}/AutoConfigInfo.xdl (100%) create mode 100644 source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl rename source/oxt/writer2latex/{W4LDialogs => W2LDialogs2}/Bibliography.xdl (100%) rename source/oxt/writer2latex/{W4LDialogs => W2LDialogs2}/LogViewer.xdl (100%) rename source/oxt/writer2latex/{W4LDialogs/ConfigurationRoot.xdl => W2LDialogs2/ToolbarConfigurationRoot.xdl} (100%) delete mode 100644 source/oxt/writer2latex/W4LDialogs/BibTeXEntry.xdl delete mode 100644 source/oxt/writer2latex/W4LDialogs/Module1.xba delete mode 100644 source/oxt/writer2latex/W4LDialogs/dialog.xlb delete mode 100644 source/oxt/writer2latex/W4LDialogs/script.xlb diff --git a/build.xml b/build.xml index 2a9a04d..85b37fa 100644 --- a/build.xml +++ b/build.xml @@ -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) ############################################################################ --> @@ -37,7 +37,7 @@ - + diff --git a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java index b02c972..1391e73 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java @@ -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); diff --git a/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java b/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java index 1dcb8bd..77026fe 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java @@ -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"); diff --git a/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java b/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java index dfcab73..af611c6 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java @@ -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; diff --git a/source/java/org/openoffice/da/comp/writer2latex/Writer2LaTeX.java b/source/java/org/openoffice/da/comp/writer2latex/Writer2LaTeX.java index c1472c6..e48e144 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/Writer2LaTeX.java +++ b/source/java/org/openoffice/da/comp/writer2latex/Writer2LaTeX.java @@ -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"); } } diff --git a/source/oxt/writer2latex/META-INF/manifest.xml b/source/oxt/writer2latex/META-INF/manifest.xml index b72ce38..c8c578e 100644 --- a/source/oxt/writer2latex/META-INF/manifest.xml +++ b/source/oxt/writer2latex/META-INF/manifest.xml @@ -61,10 +61,6 @@ manifest:full-path="W2LDialogs2/" manifest:media-type="application/vnd.sun.star.basic-library"/> - - diff --git a/source/oxt/writer2latex/ToolbarOptionPages.xcu b/source/oxt/writer2latex/ToolbarOptionPages.xcu index 8be669f..22a16d7 100644 --- a/source/oxt/writer2latex/ToolbarOptionPages.xcu +++ b/source/oxt/writer2latex/ToolbarOptionPages.xcu @@ -28,7 +28,7 @@ Writer2LaTeX toolbar - %origin%/W4LDialogs/ConfigurationRoot.xdl + %origin%/W2LDialogs2/ToolbarConfigurationRoot.xdl @@ -45,7 +45,7 @@ Applications - %origin%/W4LDialogs/Applications.xdl + %origin%/W2LDialogs2/Applications.xdl org.openoffice.da.writer2latex.ApplicationsDialog @@ -60,7 +60,7 @@ Bibliography - %origin%/W4LDialogs/Bibliography.xdl + %origin%/W2LDialogs2/Bibliography.xdl org.openoffice.da.writer2latex.BibliographyDialog diff --git a/source/oxt/writer2latex/W4LDialogs/Applications.xdl b/source/oxt/writer2latex/W2LDialogs2/Applications.xdl similarity index 100% rename from source/oxt/writer2latex/W4LDialogs/Applications.xdl rename to source/oxt/writer2latex/W2LDialogs2/Applications.xdl diff --git a/source/oxt/writer2latex/W4LDialogs/AutoConfigInfo.xdl b/source/oxt/writer2latex/W2LDialogs2/AutoConfigInfo.xdl similarity index 100% rename from source/oxt/writer2latex/W4LDialogs/AutoConfigInfo.xdl rename to source/oxt/writer2latex/W2LDialogs2/AutoConfigInfo.xdl diff --git a/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl b/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl new file mode 100644 index 0000000..6ff1747 --- /dev/null +++ b/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2latex/W4LDialogs/Bibliography.xdl b/source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl similarity index 100% rename from source/oxt/writer2latex/W4LDialogs/Bibliography.xdl rename to source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl diff --git a/source/oxt/writer2latex/W4LDialogs/LogViewer.xdl b/source/oxt/writer2latex/W2LDialogs2/LogViewer.xdl similarity index 100% rename from source/oxt/writer2latex/W4LDialogs/LogViewer.xdl rename to source/oxt/writer2latex/W2LDialogs2/LogViewer.xdl diff --git a/source/oxt/writer2latex/W4LDialogs/ConfigurationRoot.xdl b/source/oxt/writer2latex/W2LDialogs2/ToolbarConfigurationRoot.xdl similarity index 100% rename from source/oxt/writer2latex/W4LDialogs/ConfigurationRoot.xdl rename to source/oxt/writer2latex/W2LDialogs2/ToolbarConfigurationRoot.xdl diff --git a/source/oxt/writer2latex/W2LDialogs2/dialog.xlb b/source/oxt/writer2latex/W2LDialogs2/dialog.xlb index d474ee9..46574db 100644 --- a/source/oxt/writer2latex/W2LDialogs2/dialog.xlb +++ b/source/oxt/writer2latex/W2LDialogs2/dialog.xlb @@ -14,4 +14,11 @@ + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2latex/W4LDialogs/BibTeXEntry.xdl b/source/oxt/writer2latex/W4LDialogs/BibTeXEntry.xdl deleted file mode 100644 index 1857c85..0000000 --- a/source/oxt/writer2latex/W4LDialogs/BibTeXEntry.xdl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/oxt/writer2latex/W4LDialogs/Module1.xba b/source/oxt/writer2latex/W4LDialogs/Module1.xba deleted file mode 100644 index 9c46f60..0000000 --- a/source/oxt/writer2latex/W4LDialogs/Module1.xba +++ /dev/null @@ -1,10 +0,0 @@ - - -REM ***** BASIC ***** - -Sub Main - -End Sub - - - \ No newline at end of file diff --git a/source/oxt/writer2latex/W4LDialogs/dialog.xlb b/source/oxt/writer2latex/W4LDialogs/dialog.xlb deleted file mode 100644 index 166d19d..0000000 --- a/source/oxt/writer2latex/W4LDialogs/dialog.xlb +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/source/oxt/writer2latex/W4LDialogs/script.xlb b/source/oxt/writer2latex/W4LDialogs/script.xlb deleted file mode 100644 index 76fa668..0000000 --- a/source/oxt/writer2latex/W4LDialogs/script.xlb +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibtex.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibtex.xhp index 723e8af..15fdc6a 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibtex.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibtex.xhp @@ -15,25 +15,25 @@ 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. The dialog presents a list of BibTeX files from a specific folder. The folder to search is configured in the bibliography settings. - + Inserting BibTeX references To insert a bibliographic reference, select an item and click the Insert reference button. - File + BibTeX file Select the BibTeX file to use in this list. Select the BibTeX file to use - Entry + BibTeX entry 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. @@ -45,22 +45,31 @@ the currently selected entry. Click to insert a reference to the current entry - - Cancel - Click this button to close the dialog without inserting any references. - Click to close the dialog + + Refresh + Click this button to reload the BibTeX + files and update all references. You should do this if you have edited a BibTeX file. + Click to refresh the contents of all references + + + Close + Click this button to close the dialog + Click to close the dialog + + Managing BibTeX files + + + New + Click this button create a new BibTeX file in the configured + directory. Enter a name for the file in the dialog. + Click to create a new BibTeX file - Edit... + Edit 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. Click to edit the current file in your BibTeX editor - - - Refresh - Click this button to reload the BibTeX - files. You should do this if you have edited a BibTeX file. - Click to refresh the contents of the lists + \ No newline at end of file