litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

w2l: Add status label to BibTeX dialog

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@265 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2015-07-28 08:01:16 +00:00
parent f70c77e5ca
commit d854a50a2d
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/distro/changelog.txt
View file

@ -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

26
source/java/org/openoffice/da/comp/writer2latex/BibTeXDialog.java
View file

@ -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$
}
}
}

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -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)<br/>

7
source/oxt/writer2latex/W2LDialogs2/BibTeXEntry.xdl
View file

@ -1,6 +1,6 @@
<?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: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="118" 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">
@ -19,7 +19,7 @@
<dlg:button dlg:id="Reload" dlg:tab-index="5" dlg:left="205" dlg:top="38" dlg:width="60" dlg:height="12" dlg:help-url="org.openoffice.da.writer2latex.oxt:BibTeXReload" dlg:value="Reload">
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Reload" 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:text dlg:id="EntryInformation" dlg:tab-index="11" dlg:left="10" dlg:top="40" dlg:width="255" dlg:height="34"/>
<dlg:button dlg:id="Insert" dlg:tab-index="6" 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>
@ -27,6 +27,7 @@
<script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.UNO:Update" script:language="UNO"/>
</dlg:button>
<dlg:button dlg:id="Close" dlg:tab-index="8" 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="9" 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:button dlg:id="Help" dlg:tab-index="10" 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:text dlg:id="UpdateLabel" dlg:tab-index="12" dlg:left="10" dlg:top="94" dlg:width="253" dlg:height="20"/>
</dlg:bulletinboard>
</dlg:window>