diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 0ca199f..bea6f24 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,11 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.3 ---------- +[w2l] In the Application dialog in the toolbar configuration it is now possible to select the systems's default + application for the viewers. This is now the default, and in most cases this will imply that the toolbar works + without configuration. The automatic configuration has been changed to use the default application if it fails + to find the dedicated applications. + [w2l] The Application dialog in the toolbar configuration can now be used to select the behavior after export (do nothing, compile or (default) export, compile and preview) diff --git a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java index 18cad2d..2c67a86 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ApplicationsDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.6 (2015-05-14) + * Version 1.6 (2015-05-19) * */ @@ -48,7 +48,7 @@ import org.openoffice.da.comp.w2lcommon.helper.DialogAccess; import org.openoffice.da.comp.w2lcommon.helper.FilePicker; import org.openoffice.da.comp.w2lcommon.helper.StreamGobbler; -/** This class provides a uno component which implements the configuration +/** This class provides a UNO component which implements the configuration * of applications for the Writer2LaTeX toolbar */ public final class ApplicationsDialog @@ -75,8 +75,9 @@ public final class ApplicationsDialog filePicker = new FilePicker(xContext); } - // Implement XContainerWindowEventHandler - public boolean callHandlerMethod(XWindow xWindow, Object event, String sMethod) + // **** Implement XContainerWindowEventHandler + + @Override public boolean callHandlerMethod(XWindow xWindow, Object event, String sMethod) throws com.sun.star.lang.WrappedTargetException { XDialog xDialog = (XDialog)UnoRuntime.queryInterface(XDialog.class, xWindow); DialogAccess dlg = new DialogAccess(xDialog); @@ -86,11 +87,14 @@ public final class ApplicationsDialog return handleExternalEvent(dlg, event); } else if (sMethod.equals("AfterExportChange")) { - return changeBehavior(dlg); + return changeProcessingLevel(dlg); } else if (sMethod.equals("ApplicationChange")) { return changeApplication(dlg); } + else if (sMethod.equals("UseDefaultChange")) { + return useDefaultChange(dlg) && updateApplication(dlg); + } else if (sMethod.equals("BrowseClick")) { return browseForExecutable(dlg); } @@ -113,26 +117,27 @@ public final class ApplicationsDialog return false; } - public String[] getSupportedMethodNames() { + @Override public String[] getSupportedMethodNames() { String[] sNames = { "external_event", "AfterExportChange", "ApplicationChange", "BrowseClick", "ExecutableUnfocus", "OptionsUnfocus", "AutomaticClick" }; return sNames; } - // Implement the interface XServiceInfo - public boolean supportsService(String sServiceName) { + // **** Implement the interface XServiceInfo + + @Override public boolean supportsService(String sServiceName) { return sServiceName.equals(__serviceName); } - public String getImplementationName() { + @Override public String getImplementationName() { return __implementationName; } - public String[] getSupportedServiceNames() { + @Override public String[] getSupportedServiceNames() { String[] sSupportedServiceNames = { __serviceName }; return sSupportedServiceNames; } - // Private stuff + // **** Event handlers private boolean handleExternalEvent(DialogAccess dlg, Object aEventObject) throws com.sun.star.uno.Exception { @@ -143,7 +148,7 @@ public final class ApplicationsDialog return true; } else if (sMethod.equals("back") || sMethod.equals("initialize")) { externalApps.load(); - updateBehavior(dlg); + updateProcessingLevel(dlg); return changeApplication(dlg); } } @@ -154,12 +159,12 @@ public final class ApplicationsDialog return false; } - private boolean changeBehavior(DialogAccess dlg) { + private boolean changeProcessingLevel(DialogAccess dlg) { externalApps.setProcessingLevel(dlg.getListBoxSelectedItem("AfterExport")); return true; } - private boolean updateBehavior(DialogAccess dlg) { + private boolean updateProcessingLevel(DialogAccess dlg) { dlg.setListBoxSelectedItem("AfterExport", externalApps.getProcessingLevel()); return true; } @@ -170,9 +175,22 @@ public final class ApplicationsDialog String[] s = externalApps.getApplication(sAppName); dlg.setComboBoxText("Executable", s[0]); dlg.setComboBoxText("Options", s[1]); + dlg.setCheckBoxStateAsBoolean("UseDefault", externalApps.getUseDefaultApplication(sAppName)); + dlg.setControlEnabled("UseDefault", externalApps.isViewer(sAppName)); + useDefaultChange(dlg); } return true; } + + private boolean useDefaultChange(DialogAccess dlg) { + boolean bCustomApp = !dlg.getCheckBoxStateAsBoolean("UseDefault"); + dlg.setControlEnabled("ExecutableLabel", bCustomApp); + dlg.setControlEnabled("Executable", bCustomApp); + dlg.setControlEnabled("OptionsLabel", bCustomApp); + dlg.setControlEnabled("Options", bCustomApp); + dlg.setControlEnabled("BrowseButton", bCustomApp); + return true; + } private boolean browseForExecutable(DialogAccess dlg) { String sPath = filePicker.getPath(); @@ -193,10 +211,205 @@ public final class ApplicationsDialog String sAppName = getSelectedAppName(dlg); if (sAppName!=null) { externalApps.setApplication(sAppName, dlg.getComboBoxText("Executable"), dlg.getComboBoxText("Options")); + externalApps.setUseDefaultApplication(sAppName, dlg.getCheckBoxStateAsBoolean("UseDefault")); } return true; } + private boolean autoConfigure(DialogAccess dlg) { + String sOsName = System.getProperty("os.name"); + String sOsVersion = System.getProperty("os.version"); + String sOsArch = System.getProperty("os.arch"); + StringBuilder info = new StringBuilder(); + info.append("Results of configuration:\n\n"); + info.append("Your system identifies itself as "+sOsName+" version "+sOsVersion+ " (" + sOsArch +")\n\n"); + if (sOsName.startsWith("Windows")) { + autoConfigureWindows(dlg, info); + } + else { + autoConfigureUnix(dlg, info); + } + displayAutoConfigInfo(info.toString()); + changeApplication(dlg); + return true; + } + + private void displayAutoConfigInfo(String sText) { + XDialog xDialog = getDialog("W2LDialogs2.AutoConfigInfo"); + if (xDialog!=null) { + DialogAccess info = new DialogAccess(xDialog); + info.setTextFieldText("Info", sText); + xDialog.execute(); + xDialog.endExecute(); + } + } + + private XDialog getDialog(String sDialogName) { + XMultiComponentFactory xMCF = xContext.getServiceManager(); + try { + Object provider = xMCF.createInstanceWithContext( + "com.sun.star.awt.DialogProvider2", xContext); + XDialogProvider2 xDialogProvider = (XDialogProvider2) + UnoRuntime.queryInterface(XDialogProvider2.class, provider); + String sDialogUrl = "vnd.sun.star.script:"+sDialogName+"?location=application"; + return xDialogProvider.createDialogWithHandler(sDialogUrl, this); + } + catch (Exception e) { + return null; + } + } + + private String getSelectedAppName(DialogAccess dlg) { + short nItem = dlg.getListBoxSelectedItem("Application"); + //String sAppName = null; + switch (nItem) { + case 0: return ExternalApps.LATEX; + case 1: return ExternalApps.PDFLATEX; + case 2: return ExternalApps.XELATEX; + case 3: return ExternalApps.DVIPS; + case 4: return ExternalApps.BIBTEX; + case 5: return ExternalApps.MAKEINDEX; + //case 6: return ExternalApps.MK4HT; + case 6: return ExternalApps.DVIVIEWER; + case 7: return ExternalApps.PDFVIEWER; + case 8: return ExternalApps.POSTSCRIPTVIEWER; + } + return "???"; + } + + // **** Automatic configuration of applications for Windows systems (assuming MikTeX) + + private void autoConfigureWindows(DialogAccess dlg, StringBuilder info) { + String sMikTeXPath = getMikTeXPath(); + + // Configure TeX and friends + yap (DVi viewer) + TeXworks (PDF viewer) + boolean bFoundTexworks = false; + if (sMikTeXPath!=null) { + info.append("Found MikTeX\n"); + configureMikTeX(sMikTeXPath, ExternalApps.LATEX, "latex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.DVIPS, "dvips", "%s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.BIBTEX, "bibtex", "%s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.MAKEINDEX, "makeindex", "%s", info, true); + //configureMikTeX(sMikTeXPath, ExternalApps.MK4HT, "mk4ht", "%c %s", info, true); + configureMikTeX(sMikTeXPath, ExternalApps.DVIVIEWER, "yap", "--single-instance %s", info, true); + externalApps.setUseDefaultApplication(ExternalApps.DVIVIEWER, false); + // MikTeX 2.8 provides texworks for pdf viewing + bFoundTexworks = configureMikTeX(sMikTeXPath, ExternalApps.PDFVIEWER, "texworks", "%s", info, true); + } + else { + info.append("Failed to find MikTeX\n"); + info.append("Writer2LaTeX has been configured to work if MikTeX is added to your path\n"); + externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s"); + externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s"); + externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s"); + externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s"); + //externalApps.setApplication(ExternalApps.MK4HT, "mk4ht", "%c %s"); + externalApps.setUseDefaultApplication(ExternalApps.DVIVIEWER, true); + } + externalApps.setUseDefaultApplication(ExternalApps.PDFVIEWER, !bFoundTexworks); + info.append("\n"); + + // Configure gsview (PostScript viewer and fall back viewer for PDF) + String sGsview = getGsviewPath(); + if (sGsview!=null) { + info.append("Found gsview - OK\n"); + externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, sGsview, "-e \"%s\""); + if (!bFoundTexworks) { + externalApps.setApplication(ExternalApps.PDFVIEWER, sGsview, "-e \"%s\""); + externalApps.setUseDefaultApplication(ExternalApps.PDFVIEWER, false); + } + } + else { + if (!bFoundTexworks) { + info.append("Using default application for PDF\n"); + } + info.append("Using default application for PostScript\n"); + } + externalApps.setUseDefaultApplication(ExternalApps.POSTSCRIPTVIEWER, sGsview!=null); + } + + // Windows: Get the path to the MikTeX bin directory + private String getMikTeXPath() { + String[] sPaths = System.getenv("PATH").split(";"); + for (String s : sPaths) { + if (s.toLowerCase().indexOf("miktex")>-1 && containsExecutable(s,"latex.exe")) { + return s; + } + } + for (String s : sPaths) { + if (containsExecutable(s,"latex.exe")) { + return s; + } + } + return null; + } + + // Windows: Get the path to the gsview executable + private String getGsviewPath() { + String sProgramFiles = System.getenv("ProgramFiles"); + if (sProgramFiles!=null) { + if (containsExecutable(sProgramFiles+"\\ghostgum\\gsview","gsview32.exe")) { + return sProgramFiles+"\\ghostgum\\gsview\\gsview32.exe"; + } + } + return null; + } + + // Windows: Test that the given path contains a given executable + private boolean containsExecutable(String sPath,String sExecutable) { + File dir = new File(sPath); + if (dir.exists() && dir.canRead()) { + File exe = new File(dir,sExecutable); + return exe.exists(); + } + return false; + } + + // Windows: Configure a certain MikTeX application + private boolean configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuilder info, boolean bRequired) { + File app = new File(new File(sPath),sAppName+".exe"); + if (app.exists()) { + externalApps.setApplication(sName, sAppName, sArguments); + info.append(" Found "+sName+": "+sAppName+" - OK\n"); + return true; + } + else if (bRequired) { + externalApps.setApplication(sName, "???", "???"); + info.append(" Failed to find "+sName+"\n"); + } + return false; + } + + // **** Automatic configuration of applications for other systems (assuming unix-like systems) + + private void autoConfigureUnix(DialogAccess dlg, StringBuilder info) { + // Assume that the "which" command is supported + configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s",info); + configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s",info); + configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s",info); + configureApp(ExternalApps.DVIPS, "dvips", "%s",info); + configureApp(ExternalApps.BIBTEX, "bibtex", "%s",info); + configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s",info); + //configureApp(ExternalApps.MK4HT, "mk4ht", "%c %s",info); + // We have several possible viewers + String[] sDviViewers = {"evince", "okular", "xdvi"}; + configureViewer(ExternalApps.DVIVIEWER, sDviViewers, "%s",info); + String[] sPdfViewers = {"evince", "okular", "xpdf"}; + configureViewer(ExternalApps.PDFVIEWER, sPdfViewers, "%s",info); + String[] sPsViewers = {"evince", "okular", "ghostview"}; + configureViewer(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s",info); + + // Maybe add some info for Debian/Ubuntu users, e.g. + // sudo apt-get install texlive + // sudo apt-get install texlive-xetex + // sudo apt-get install texlive-latex-extra + // sudo apt-get install tex4ht + } + // Unix: Test to determine whether a certain application is available in the OS // Requires "which", hence Unix only private boolean hasApp(String sAppName) { @@ -230,218 +443,39 @@ public final class ApplicationsDialog } } - // Unix: Configure a certain application testing the availability - private boolean configureApp(String sName, String sAppName, String sArguments) { - if (hasApp(sAppName)) { - externalApps.setApplication(sName, sAppName, sArguments); - return true; - } - else { - externalApps.setApplication(sName, "???", "???"); - return false; - } - } - - // Unix: Configure a certain application, reporting the availability + // Unix: Configure a certain application, testing and reporting the availability private boolean configureApp(String sName, String sAppName, String sArguments, StringBuilder info) { if (hasApp(sAppName)) { externalApps.setApplication(sName, sAppName, sArguments); - info.append("Found "+sAppName+" - OK\n"); + externalApps.setUseDefaultApplication(sName, false); + if (info!=null) { + info.append("Found "+sAppName+" - OK\n"); + } return true; } else { externalApps.setApplication(sName, "???", "???"); - info.append("Failed to find "+sAppName+"\n"); + externalApps.setUseDefaultApplication(sName, false); + if (info!=null) { + info.append("Failed to find "+sAppName+"\n"); + } return false; } } - // Unix: Configure a certain application testing the availability + // Unix: Configure a certain application, testing and reporting the availability // This variant uses an array of potential apps - private boolean configureApp(String sName, String[] sAppNames, String sArguments, StringBuilder info) { + private boolean configureViewer(String sName, String[] sAppNames, String sArguments, StringBuilder info) { for (String sAppName : sAppNames) { - if (configureApp(sName, sAppName, sArguments)) { + if (configureApp(sName, sAppName, sArguments, null)) { info.append("Found "+sName+": "+sAppName+" - OK\n"); return true; } } - info.append("Failed to find "+sName+"\n"); - return false; - } - - // Windows: Test that the given path contains a given executable - private boolean containsExecutable(String sPath,String sExecutable) { - File dir = new File(sPath); - if (dir.exists() && dir.canRead()) { - File exe = new File(dir,sExecutable); - return exe.exists(); - } - return false; - } - - // Windows: Configure a certain MikTeX application - private boolean configureMikTeX(String sPath, String sName, String sAppName, String sArguments, StringBuilder info, boolean bRequired) { - File app = new File(new File(sPath),sAppName+".exe"); - if (app.exists()) { - externalApps.setApplication(sName, sAppName, sArguments); - info.append(" Found "+sName+": "+sAppName+" - OK\n"); - return true; - } - else if (bRequired) { - externalApps.setApplication(sName, "???", "???"); - info.append(" Failed to find "+sName+"\n"); - } - return false; - } - - // Configure the applications automatically (OS dependent) - private boolean autoConfigure(DialogAccess dlg) { - String sOsName = System.getProperty("os.name"); - String sOsVersion = System.getProperty("os.version"); - String sOsArch = System.getProperty("os.arch"); - StringBuilder info = new StringBuilder(); - info.append("Results of configuration:\n\n"); - info.append("Your system identifies itself as "+sOsName+" version "+sOsVersion+ " (" + sOsArch +")\n\n"); - if (sOsName.startsWith("Windows")) { - // Assume MikTeX - String sMikTeXPath = null; - String[] sPaths = System.getenv("PATH").split(";"); - for (String s : sPaths) { - if (s.toLowerCase().indexOf("miktex")>-1 && containsExecutable(s,"latex.exe")) { - sMikTeXPath = s; - break; - } - } - if (sMikTeXPath==null) { - for (String s : sPaths) { - if (containsExecutable(s,"latex.exe")) { - sMikTeXPath = s; - break; - } - } - } - - boolean bFoundTexworks = false; - if (sMikTeXPath!=null) { - info.append("Found MikTeX\n"); - configureMikTeX(sMikTeXPath, ExternalApps.LATEX, "latex", "--interaction=batchmode %s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.DVIPS, "dvips", "%s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.BIBTEX, "bibtex", "%s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.MAKEINDEX, "makeindex", "%s", info, true); - //configureMikTeX(sMikTeXPath, ExternalApps.MK4HT, "mk4ht", "%c %s", info, true); - configureMikTeX(sMikTeXPath, ExternalApps.DVIVIEWER, "yap", "--single-instance %s", info, true); - // MikTeX 2.8 provides texworks for pdf viewing - bFoundTexworks = configureMikTeX(sMikTeXPath, ExternalApps.PDFVIEWER, "texworks", "%s", info, true); - } - else { - info.append("Failed to find MikTeX\n"); - info.append("Writer2LaTeX has been configured to work if MikTeX is added to your path\n"); - externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s"); - externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s"); - externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s"); - externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s"); - //externalApps.setApplication(ExternalApps.MK4HT, "mk4ht", "%c %s"); - externalApps.setApplication(ExternalApps.DVIVIEWER, "yap", "--single-instance %s"); - } - info.append("\n"); - - // Assume gsview for pdf and ps - String sGsview = null; - String sProgramFiles = System.getenv("ProgramFiles"); - if (sProgramFiles!=null) { - if (containsExecutable(sProgramFiles+"\\ghostgum\\gsview","gsview32.exe")) { - sGsview = sProgramFiles+"\\ghostgum\\gsview\\gsview32.exe"; - } - } - - if (sGsview!=null) { - info.append("Found gsview - OK\n"); - } - else { - info.append("Failed to find gsview\n"); - sGsview = "gsview32.exe"; // at least this helps a bit.. - } - if (!bFoundTexworks) { - externalApps.setApplication(ExternalApps.PDFVIEWER, sGsview, "-e \"%s\""); - } - externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, sGsview, "-e \"%s\""); - - } - else { // Assume a Unix-like system supporting the "which" command - configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s",info); - configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s",info); - configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s",info); - configureApp(ExternalApps.DVIPS, "dvips", "%s",info); - configureApp(ExternalApps.BIBTEX, "bibtex", "%s",info); - configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s",info); - //configureApp(ExternalApps.MK4HT, "mk4ht", "%c %s",info); - // We have several possible viewers - String[] sDviViewers = {"evince", "okular", "xdvi"}; - configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s",info); - String[] sPdfViewers = {"evince", "okular", "xpdf"}; - configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s",info); - String[] sPsViewers = {"evince", "okular", "ghostview"}; - configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s",info); - - } - // Maybe add some info for Ubuntu users - // sudo apt-get install texlive - // sudo apt-get install texlive-xetex - // sudo apt-get install texlive-latex-extra - // sudo apt-get install tex4ht - displayAutoConfigInfo(info.toString()); - changeApplication(dlg); - return true; - } - - private String getSelectedAppName(DialogAccess dlg) { - short nItem = dlg.getListBoxSelectedItem("Application"); - //String sAppName = null; - switch (nItem) { - case 0: return ExternalApps.LATEX; - case 1: return ExternalApps.PDFLATEX; - case 2: return ExternalApps.XELATEX; - case 3: return ExternalApps.DVIPS; - case 4: return ExternalApps.BIBTEX; - case 5: return ExternalApps.MAKEINDEX; - //case 6: return ExternalApps.MK4HT; - case 6: return ExternalApps.DVIVIEWER; - case 7: return ExternalApps.PDFVIEWER; - case 8: return ExternalApps.POSTSCRIPTVIEWER; - } - return "???"; - } - - private XDialog getDialog(String sDialogName) { - XMultiComponentFactory xMCF = xContext.getServiceManager(); - try { - Object provider = xMCF.createInstanceWithContext( - "com.sun.star.awt.DialogProvider2", xContext); - XDialogProvider2 xDialogProvider = (XDialogProvider2) - UnoRuntime.queryInterface(XDialogProvider2.class, provider); - String sDialogUrl = "vnd.sun.star.script:"+sDialogName+"?location=application"; - return xDialogProvider.createDialogWithHandler(sDialogUrl, this); - } - catch (Exception e) { - return null; - } - } - - private void displayAutoConfigInfo(String sText) { - XDialog xDialog = getDialog("W2LDialogs2.AutoConfigInfo"); - if (xDialog!=null) { - DialogAccess info = new DialogAccess(xDialog); - info.setTextFieldText("Info", sText); - xDialog.execute(); - xDialog.endExecute(); - } + externalApps.setUseDefaultApplication(sName, true); + info.append("Using default application as "+sName+"\n"); + return true; } } - - diff --git a/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java b/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java index f2b08db..17e9a3f 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java +++ b/source/java/org/openoffice/da/comp/writer2latex/ExternalApps.java @@ -20,18 +20,21 @@ * * All Rights Reserved. * - * Version 1.6 (2015-05-14) + * Version 1.6 (2015-05-19) * */ package org.openoffice.da.comp.writer2latex; +import java.awt.Desktop; import java.io.File; import java.io.IOException; import java.lang.Process; import java.lang.ProcessBuilder; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import java.util.Vector; import org.openoffice.da.comp.w2lcommon.helper.RegistryHelper; @@ -72,14 +75,17 @@ public class ExternalApps { private short nLevel = (short)2; - private HashMap apps; + private Map apps; + private Set defaultApps; - /** Construct a new ExternalApps object, with empty definitions */ + /** Construct a new ExternalApps object with empty content */ public ExternalApps(XComponentContext xContext) { this.xContext = xContext; apps = new HashMap(); + defaultApps = new HashSet(); for (int i=0; i env, boolean bWaitFor) { - return execute(sAppName, "", sFileName, workDir, env, bWaitFor); + if (defaultApps.contains(sAppName)) { + return openWithDefaultApplication(new File(sFileName)) ? 0 : 1; + } + else { + return execute(sAppName, "", sFileName, workDir, env, bWaitFor); + } } + + // Open the file in the default application on this system (if any) + private boolean openWithDefaultApplication(File file) { + if (Desktop.isDesktopSupported()) { + Desktop desktop = Desktop.getDesktop(); + try { + desktop.open(file); + return true; + } catch (IOException e) { + System.err.println(e.getMessage()); + } + } + return false; + } + /** Execute an external application * @param sAppName the name of the application to execute @@ -204,12 +257,14 @@ public class ExternalApps { XMultiHierarchicalPropertySet xProps = (XMultiHierarchicalPropertySet) UnoRuntime.queryInterface(XMultiHierarchicalPropertySet.class, view); for (int i=0; i diff --git a/source/oxt/writer2latex/ToolbarOptions.xcs b/source/oxt/writer2latex/ToolbarOptions.xcs index f655938..c90c8d3 100644 --- a/source/oxt/writer2latex/ToolbarOptions.xcs +++ b/source/oxt/writer2latex/ToolbarOptions.xcs @@ -7,6 +7,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + diff --git a/source/oxt/writer2latex/ToolbarOptions.xcu b/source/oxt/writer2latex/ToolbarOptions.xcu index aa78d2d..81f1b2c 100644 --- a/source/oxt/writer2latex/ToolbarOptions.xcu +++ b/source/oxt/writer2latex/ToolbarOptions.xcu @@ -9,6 +9,9 @@ 2 + + false + latex @@ -17,6 +20,9 @@ + + false + pdflatex @@ -25,6 +31,9 @@ + + false + xelatex @@ -33,6 +42,9 @@ + + false + bibtex @@ -41,6 +53,9 @@ + + false + makeindex @@ -49,6 +64,9 @@ + + false + mk4ht @@ -57,6 +75,9 @@ + + true + dvips @@ -65,6 +86,9 @@ + + true + evince @@ -73,6 +97,9 @@ + + true + evince @@ -81,6 +108,9 @@ + + true + evince diff --git a/source/oxt/writer2latex/W2LDialogs2/Applications.xdl b/source/oxt/writer2latex/W2LDialogs2/Applications.xdl index f97ee10..b26dee6 100644 --- a/source/oxt/writer2latex/W2LDialogs2/Applications.xdl +++ b/source/oxt/writer2latex/W2LDialogs2/Applications.xdl @@ -28,18 +28,23 @@ - - + + + + + + + - + - - + + - + diff --git a/source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl b/source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl index a08cc38..8f927d7 100644 --- a/source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl +++ b/source/oxt/writer2latex/W2LDialogs2/Bibliography.xdl @@ -4,11 +4,11 @@ - + - + @@ -18,29 +18,29 @@ - + - + - + - + - + - + diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp index 102efcd..9c4cf84 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/applications.xhp @@ -9,8 +9,8 @@ Configuration of applications - Before you can use Writer2LaTeX you must configure it to use your LaTeX - distribution as well as viewers for the different output formats. + On this page you can configure the interaction between Writer2LaTeX + and your LaTeX distribution as well as viewers for the different output formats.
Select Tools - Options - Writer2LaTeX toolbar - Applications
@@ -88,7 +88,7 @@ Automatic Configuration If you click this button, Writer2LaTeX will try to locate the external programs and configure them. You will be presented with a short report of the results. Any applications that Writer2LaTeX cannot find for - you must be configured manually. + you should be configured manually. Click here to let Writer2LaTeX configure your external applications automatically @@ -123,6 +123,12 @@ Select the external application you wish to configure here + + Use the system's default application + Select this if you wish to use the default application to view files + of the selected type. + Select this to use the default application to view files of the selected type + Executable Type the full path to the executable or click Browse to find