From 049bf052bc6acba458132e4497543f314c3b5917 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Thu, 23 Oct 2014 12:47:27 +0000 Subject: [PATCH] Replace w4l menu with toolbar + ensure compatibility of toolbars with AOO4 git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@186 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 3 + .../da/comp/writer4latex/Writer4LaTeX.java | 15 +- .../writer2latex/api/ConverterFactory.java | 4 +- source/oxt/writer4latex/Addons.xcu | 148 +++++++++--------- source/oxt/writer4latex/AddonsAOO4.xcu | 88 +++++++++++ source/oxt/writer4latex/META-INF/manifest.xml | 8 + .../Office/UI/WriterWindowState.xcu | 15 ++ source/oxt/writer4latex/W4LDialogs/Addons.xcu | 83 ++++++++++ source/oxt/writer4latex/icons/bibtex_16.bmp | Bin 0 -> 890 bytes source/oxt/writer4latex/icons/bibtex_26.bmp | Bin 0 -> 2202 bytes source/oxt/writer4latex/icons/custom_16.bmp | Bin 0 -> 890 bytes source/oxt/writer4latex/icons/custom_26.bmp | Bin 0 -> 2202 bytes source/oxt/writer4latex/icons/latex_16.bmp | Bin 0 -> 890 bytes source/oxt/writer4latex/icons/latex_26.bmp | Bin 0 -> 2202 bytes source/oxt/writer4latex/icons/log_16.bmp | Bin 0 -> 890 bytes source/oxt/writer4latex/icons/log_26.bmp | Bin 0 -> 2202 bytes 16 files changed, 288 insertions(+), 76 deletions(-) create mode 100644 source/oxt/writer4latex/AddonsAOO4.xcu create mode 100644 source/oxt/writer4latex/Office/UI/WriterWindowState.xcu create mode 100644 source/oxt/writer4latex/W4LDialogs/Addons.xcu create mode 100644 source/oxt/writer4latex/icons/bibtex_16.bmp create mode 100644 source/oxt/writer4latex/icons/bibtex_26.bmp create mode 100644 source/oxt/writer4latex/icons/custom_16.bmp create mode 100644 source/oxt/writer4latex/icons/custom_26.bmp create mode 100644 source/oxt/writer4latex/icons/latex_16.bmp create mode 100644 source/oxt/writer4latex/icons/latex_26.bmp create mode 100644 source/oxt/writer4latex/icons/log_16.bmp create mode 100644 source/oxt/writer4latex/icons/log_26.bmp diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 4e1b200..db1ce02 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.5.1 ---------- +[w4l] Replaced menu with a toolbar with four buttons: Insert BibTeX citation (not yet implemented), publish to LaTeX, + view log files and edit custom format. (Publishing without showing the dialog is currently removed.) + [w2x] Added toolbar with four buttons: Publish directly to XHTML, publish directly to EPUB, edit EPUB metadata and edit custom configuration. Publishing directly implies that the export dialog is not displayed. Instead the document will be exported to the same directory as the currently open document and with the same name. diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java index 9bb432f..ae0e80d 100644 --- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java +++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2011 by Henrik Just + * Copyright: 2002-2014 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2011-03-23) + * Version 1.6 (2014-10-23) * */ @@ -134,6 +134,8 @@ public final class Writer4LaTeX extends WeakBase return this; else if ( aURL.Path.compareTo("ViewLog") == 0 ) return this; + else if ( aURL.Path.compareTo("InsertBibTeX") == 0 ) + return this; } return null; } @@ -174,6 +176,10 @@ public final class Writer4LaTeX extends WeakBase viewLog(); return; } + else if ( aURL.Path.compareTo("InsertBibTeX") == 0 ) { + insertBibTeX(); + return; + } } } @@ -339,6 +345,11 @@ public final class Writer4LaTeX extends WeakBase } } } + + private void insertBibTeX() { + MessageBox msgBox = new MessageBox(m_xContext, m_xFrame); + msgBox.showMessage("Writer4LaTeX","This feature is not implemented yet"); + } // Some utility methods private void prepareMediaProperties() { diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java index 8ce439f..e0f75e5 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 (2014-10-22) + * Version 1.6 (2014-10-23) * */ @@ -33,7 +33,7 @@ public class ConverterFactory { // Version information private static final String VERSION = "1.5.1"; - private static final String DATE = "2014-10-22"; + private static final String DATE = "2014-10-23"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
diff --git a/source/oxt/writer4latex/Addons.xcu b/source/oxt/writer4latex/Addons.xcu index 3008089..56daf13 100644 --- a/source/oxt/writer4latex/Addons.xcu +++ b/source/oxt/writer4latex/Addons.xcu @@ -2,78 +2,82 @@ - - - - com.sun.star.text.TextDocument - - - LaTe~X - - - _self - - - - - - - - com.sun.star.text.TextDocument - - - Run ~LaTeX... - Kør ~LaTeX... - - - _self - - - org.openoffice.da.writer4latex:ProcessDocument - - - - - - - - com.sun.star.text.TextDocument - - - Run LaTe~X directly - Kør LaTe~X direkte - - - _self - - - org.openoffice.da.writer4latex:ProcessDirectly - - - - - - - - com.sun.star.text.TextDocument - - - View Lo~g files - Vis lo~gfiler - - - _self - - - org.openoffice.da.writer4latex:ViewLog - - - - - - - - + + + + + com.sun.star.text.TextDocument + + + Insert BibTeX citation + Indsæt BibTeX-reference + + + _self + + + org.openoffice.da.writer4latex:InsertBibTeX + + + %origin%/icons/bibtex + + + + + com.sun.star.text.TextDocument + + + Publish to LaTeX + Publicer til LaTeX + + + _self + + + org.openoffice.da.writer4latex:ProcessDocument + + + %origin%/icons/latex + + + + + com.sun.star.text.TextDocument + + + View log files + Vis logfiler + + + _self + + + org.openoffice.da.writer4latex:ViewLog + + + %origin%/icons/log + + + + + com.sun.star.text.TextDocument + + + Edit custom format + Rediger brugerdefineret format + + + _self + + + .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl + + + %origin%/icons/custom + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/AddonsAOO4.xcu b/source/oxt/writer4latex/AddonsAOO4.xcu new file mode 100644 index 0000000..507a46d --- /dev/null +++ b/source/oxt/writer4latex/AddonsAOO4.xcu @@ -0,0 +1,88 @@ + + + + + + + + Writer4LaTeX + + + + + com.sun.star.text.TextDocument + + + Insert BibTeX citation + Indsæt BibTeX-reference + + + _self + + + org.openoffice.da.writer4latex:InsertBibTeX + + + %origin%/icons/bibtex + + + + + com.sun.star.text.TextDocument + + + Publish to LaTeX + Publicer til LaTeX + + + _self + + + org.openoffice.da.writer4latex:ProcessDocument + + + %origin%/icons/latex + + + + + com.sun.star.text.TextDocument + + + View log files + Vis logfiler + + + _self + + + org.openoffice.da.writer4latex:ViewLog + + + %origin%/icons/log + + + + + com.sun.star.text.TextDocument + + + Edit custom format + Rediger brugerdefineret format + + + _self + + + .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl + + + %origin%/icons/custom + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/META-INF/manifest.xml b/source/oxt/writer4latex/META-INF/manifest.xml index 5c0c6d2..bc0142a 100644 --- a/source/oxt/writer4latex/META-INF/manifest.xml +++ b/source/oxt/writer4latex/META-INF/manifest.xml @@ -8,6 +8,14 @@ + + + + + + + + + + Writer4LaTeX + + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/W4LDialogs/Addons.xcu b/source/oxt/writer4latex/W4LDialogs/Addons.xcu new file mode 100644 index 0000000..56daf13 --- /dev/null +++ b/source/oxt/writer4latex/W4LDialogs/Addons.xcu @@ -0,0 +1,83 @@ + + + + + + + + + com.sun.star.text.TextDocument + + + Insert BibTeX citation + Indsæt BibTeX-reference + + + _self + + + org.openoffice.da.writer4latex:InsertBibTeX + + + %origin%/icons/bibtex + + + + + com.sun.star.text.TextDocument + + + Publish to LaTeX + Publicer til LaTeX + + + _self + + + org.openoffice.da.writer4latex:ProcessDocument + + + %origin%/icons/latex + + + + + com.sun.star.text.TextDocument + + + View log files + Vis logfiler + + + _self + + + org.openoffice.da.writer4latex:ViewLog + + + %origin%/icons/log + + + + + com.sun.star.text.TextDocument + + + Edit custom format + Rediger brugerdefineret format + + + _self + + + .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl + + + %origin%/icons/custom + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/icons/bibtex_16.bmp b/source/oxt/writer4latex/icons/bibtex_16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..03b12cb60a3f6b322c9486bd8be0ca77ea6785b0 GIT binary patch literal 890 zcmZ?rtzu>XgDN1I1H=MQ%*Y@C7H0s;3v)v-M1X<8$vvnT#wM0#LR0u*hy$$Nfd~S9 zhAE3C0_4J#!5LW9z-6&A;DQjnKrUPaD+4ZwW*0~s%-L`Tni^y-SUJ?2nCjsoXv!d5 cG+9hFaKB(O&`dyc67lNc=3v^6CPgDI022bV>Hq)$ literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/bibtex_26.bmp b/source/oxt/writer4latex/icons/bibtex_26.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6687557e3d03e6646c22bcec6c5d9d184569d104 GIT binary patch literal 2202 zcmeHFyAHxI5DQF5j4X(WZ|TCs!gsK-@hSXcAD_S_M^CPkl&CE%P${X;c6^tr)%me; z;knCxm34TnmD>mYDEe-zD-g0(r^~I!rSCNvyG0-87LDuvdGo&KN4_8ZK~lDDi*u^M znAi`Jz*rZiX&P{O3zc+A)!~&oeQ&Oh#XgDN1I1H=MQ%*Y@C7H0s;3v)v-M1X<8$vvnT#wM0#LR0tw8-S?6CWBpU zkf?_{1FIk5vT#4ZMbOj(xj;2=S%`XME>KvN9oLKMK2!5MG`Kn4UL hs|2!<1%Yg2jZh7EDI(P)TZ-2_s3fWCi7}IMH2_Nh1GxYI literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/custom_26.bmp b/source/oxt/writer4latex/icons/custom_26.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2fecb2b25ad045513c0b7a187f522c41906746a7 GIT binary patch literal 2202 zcmd^7F%H5o3=B+2j4X(Ww{&4*;T>#jeG0Ga6L4&7u5O#UB8Z`p;>PFmofEaWK6i;% zOYu(o^xm6vWc*C^!(KK66q?KJq37s#>xf;|l~Pr??mv3+M3I}s=39xLUDN$yl;T?& zjlg~dSzOFiJ4l~JBMTzwv|gW;vrz$aE9#+`>(IWB1Cqg2h(r3lY>K_Chrn!ineY?6vgM+x MzTcvz0(pIUFLmf%6951J literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/latex_16.bmp b/source/oxt/writer4latex/icons/latex_16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2a3b2726f0f7fbdfb6e0dfc9d62411a6cfc11537 GIT binary patch literal 890 zcmZ?rtzu>XgDN1I1H=MQ%*Y@C7H0s;3v)v-M1X<8$vvnT#wM0#LR0tw72uaeRSV*g zrykQBTp|$jamm8P;mY9d0ZPFIAxCn#+7e`}2xNt!<#mHP_mBgq=a{$%30C-lqiU0rr literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/latex_26.bmp b/source/oxt/writer4latex/icons/latex_26.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb3b5063ac8943ad0d90720e4579aa3885fac6ab GIT binary patch literal 2202 zcmeH^F%kkX2t}inGnO`vm1o(;%Eoip*?AOCxkr!%gC9tu?nEnhCh_M34-$vtZI$@D z(tf73d#pv;vcISJW-W^i+J?jFlJ&d4OP4ry{Zi_R8|yrG4L!E||C-mHCPrV)7c1J% zcX{&YG68BgQw*tN=Tn;iqT{Y1Y@&s;cn+yB_KR&?1?GshjOmnp%&lc%j%rE95(;Im zWML4sGEns9@iY_EHnFE?9NVL=<%{p>AMlDz>O7pIsJrq6mhXtS!rqvLe$<$0HRXyC h_lOY(0nXv~i==;$Y{vTL0Pyc!I-Yr+9bO*#yy5s-= literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/log_16.bmp b/source/oxt/writer4latex/icons/log_16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..88f3b377a2213e97bd47e99568725de4064855c9 GIT binary patch literal 890 zcmZ?rtzu>XgDN1I1H=MQ%*Y@C7H0s;3v)v-M1X<8$vvnT#wM0#LR0vG5I|N>NG(Vn zSv`fvsHn-3R3Gap$2nx#OM Wa9Ow%K?bJz__felJ$~CMmjwX%#@tE( literal 0 HcmV?d00001 diff --git a/source/oxt/writer4latex/icons/log_26.bmp b/source/oxt/writer4latex/icons/log_26.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1539a64c3b37ecfe947a1465a5b5177a282a188f GIT binary patch literal 2202 zcmeH@F%H5o3`GMI5+e)h#96v9v2YGHHjct6dxRRh`895xrjSZVB~lXG|L4U?eR=Kz zj|Z(cnpHP9;mGw9>4&{cF3?h+ulE?|?ptGQijEM9;+kLKd7t)ae}+e?{9D|=`9)!u z;}Ho+?r+$<>c1Dw8+su|3