From d854a50a2d5926472c60f0a25e30b7cf23db74fb Mon Sep 17 00:00:00 2001 From: henrikjust Date: Tue, 28 Jul 2015 08:01:16 +0000 Subject: [PATCH] w2l: Add status label to BibTeX dialog git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@265 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 3 +++ .../da/comp/writer2latex/BibTeXDialog.java | 26 ++++++++++++------- .../writer2latex/api/ConverterFactory.java | 4 +-- .../writer2latex/W2LDialogs2/BibTeXEntry.xdl | 7 ++--- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 50d3c60..2f89228 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.6 beta ---------- +[w2x] In the BibTeX dialog, updating references generates a status message. This is now moved from a message box + to in a label at the bottom of the dialog. + [w2x] No longer add cellspacing attribute if exporting to HTML5 [w2l] Added support for non-ASCII BibTeX files. The new option bibtex_encoding is used to specify the encoding of diff --git a/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java b/source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java index 23db380..7259a00 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-07-24) + * Version 1.6 (2015-07-28) * */ @@ -168,6 +168,7 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti // **** Implement XDialogEventHandler @Override public boolean callHandlerMethod(XDialog xDialog, Object event, String sMethod) { + clearUpdateLabel(); if (sMethod.equals("FileChange")) { //$NON-NLS-1$ // The user has selected another BibTeX file fileChange(); @@ -206,6 +207,11 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti // **** Implement the UI functions + // Clear the contents of the update info label + private void clearUpdateLabel() { + setLabelText("UpdateLabel",""); + } + // (Re)load the list of BibTeX files private void reload(String sSelectedFileName) { String sFile = null; @@ -509,15 +515,15 @@ public class BibTeXDialog extends DialogBase implements com.sun.star.lang.XIniti } // Inform the user about the result - if (xFrame!=null) { - MessageBox msgBox = new MessageBox(xContext, xFrame); - if (notUpdated.isEmpty()) { - msgBox.showMessage("Writer2LaTeX",Messages.getString("BibTeXDialog.allbibfieldsupdated")); //$NON-NLS-1$ //$NON-NLS-2$ - } - else { - msgBox.showMessage("Writer2LaTeX",Messages.getString("BibTeXDialog.bibfieldsnotupdated")+":\n"+notUpdated.toString()); //$NON-NLS-1$ //$NON-NLS-2$ - } - } + //MessageBox msgBox = new MessageBox(xContext, xFrame); + if (notUpdated.isEmpty()) { + setLabelText("UpdateLabel",Messages.getString("BibTeXDialog.allbibfieldsupdated")); //$NON-NLS-1$ //$NON-NLS-2$ + //msgBox.showMessage("Writer2LaTeX",Messages.getString("BibTeXDialog.allbibfieldsupdated")); //$NON-NLS-1$ //$NON-NLS-2$ + } + else { + setLabelText("UpdateLabel",Messages.getString("BibTeXDialog.bibfieldsnotupdated")+":\n"+notUpdated.toString()); //$NON-NLS-1$ //$NON-NLS-2$ + //msgBox.showMessage("Writer2LaTeX",Messages.getString("BibTeXDialog.bibfieldsnotupdated")+":\n"+notUpdated.toString()); //$NON-NLS-1$ //$NON-NLS-2$ + } } } diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 3350c79..c5be97e 100644 --- a/source/java/writer2latex/api/ConverterFactory.java +++ b/source/java/writer2latex/api/ConverterFactory.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.6 (2015-07-27) + * Version 1.6 (2015-07-28) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.6"; - private static final String DATE = "2015-07-27"; + private static final String DATE = "2015-07-28"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl b/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl index 180f452..04ba151 100644 --- a/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl +++ b/source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl @@ -1,6 +1,6 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,6 +27,7 @@ - + + \ No newline at end of file