[Libreoffice-commits] .: sdext/source
Andras Timar
timar at kemper.freedesktop.org
Sun Oct 30 14:56:31 PDT 2011
sdext/source/minimizer/description-en-US.txt | 2 -
sdext/source/minimizer/description.xml | 2 -
sdext/source/minimizer/help/component.txt | 2 +
sdext/source/minimizer/makefile.mk | 18 ++------------
sdext/source/pdfimport/config/component.txt | 1
sdext/source/pdfimport/config/description.xml | 33 ++++++++++++++++++++++++++
sdext/source/pdfimport/description-en-US.txt | 1
sdext/source/pdfimport/description.xml | 33 --------------------------
sdext/source/pdfimport/makefile.mk | 18 +++++---------
sdext/source/presenter/description-en-US.txt | 2 -
sdext/source/presenter/description.xml | 2 -
sdext/source/presenter/help/component.txt | 2 +
sdext/source/presenter/makefile.mk | 16 +++++-------
13 files changed, 57 insertions(+), 75 deletions(-)
New commits:
commit a18bfb0830796fbbb2f2699e9213d29045a7ef19
Author: Andras Timar <atimar at suse.com>
Date: Sun Oct 30 22:56:43 2011 +0100
Revert "enable localization of extension descriptions in sdext"
This reverts commit 184653370717f99e0cce817822caecde01d20006.
diff --git a/sdext/source/minimizer/description-en-US.txt b/sdext/source/minimizer/description-en-US.txt
deleted file mode 100644
index 98f2687..0000000
--- a/sdext/source/minimizer/description-en-US.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed, and data that is no longer needed will be removed.
-The Presentation Minimizer can optimize the image quality size. Presentations designed for screen or projector do not require the same high quality as presentations designed for print.
diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml
index eef22a7..f8762c7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,7 +28,7 @@
</icon>
<extension-description>
- <src xlink:href="description-en-US.txt" lang="en-US" />
+ <src xlink:href="help/component.txt" lang="en-US" />
</extension-description>
</description>
diff --git a/sdext/source/minimizer/help/component.txt b/sdext/source/minimizer/help/component.txt
new file mode 100755
index 0000000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/help/component.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current presentation. Images will be compressed, and data that is no longer needed will be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations designed for screen or projector do not require the same high quality as presentations designed for print.
diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index 0913921..fcca6aa 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,15 +103,11 @@ COMPONENT_IMAGES=\
# rather freestyle or common to all?
COMPONENT_HELP= \
$(EXTENSIONDIR)$/help$/help_de.odt \
- $(EXTENSIONDIR)$/help$/help_en-US.odt
-
-DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
-
-COMPONENT_DESCRIPTION= \
- $(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
+ $(EXTENSIONDIR)$/help$/help_en-US.odt \
+ $(EXTENSIONDIR)$/help$/component.txt
# make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) $(COMPONENT_DESCRIPTION)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
ZIP2TARGET= presentation_minimizer_develop
.IF "$(WITH_LANG)"!=""
@@ -147,12 +143,4 @@ $(COMPONENT_HELP) : help$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(DESCRIPTION_SRC) : description.xml
- @@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
-
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
- $(COPY) description-en-US.txt $(EXTENSIONDIR)
- $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
-
.ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/config/component.txt b/sdext/source/pdfimport/config/component.txt
new file mode 100644
index 0000000..969581e
--- /dev/null
+++ b/sdext/source/pdfimport/config/component.txt
@@ -0,0 +1 @@
+The PDF Import Extension allows you to import and modify PDF documents. Best results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF file that contains an embedded ODF source file. Hybrid PDF/ODF files will be opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
new file mode 100644
index 0000000..ac0d502
--- /dev/null
+++ b/sdext/source/pdfimport/config/description.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description
+
+ xmlns="http://openoffice.org/extensions/description/2006"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:dep="http://openoffice.org/extensions/description/2006">
+ <identifier value="UPDATED_IDENTIFIER" />
+
+ <dependencies>
+ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
+ </dependencies>
+
+ <version value="1.0.5" />
+
+ <platform value="UPDATED_SUPPORTED_PLATFORM" />
+
+ <publisher>
+ <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
+ </publisher>
+
+ <display-name>
+ <name lang="en-US">PDF Import</name>
+ </display-name>
+
+ <icon>
+ <default xlink:href="images/extension_32.png" />
+ </icon>
+
+ <extension-description>
+ <src xlink:href="component.txt" lang="en-US" />
+ </extension-description>
+
+</description>
diff --git a/sdext/source/pdfimport/description-en-US.txt b/sdext/source/pdfimport/description-en-US.txt
deleted file mode 100644
index 0cde58a..0000000
--- a/sdext/source/pdfimport/description-en-US.txt
+++ /dev/null
@@ -1 +0,0 @@
-The PDF Import Extension allows you to import and modify PDF documents. Best results with 100% layout accuracy can be achieved with the "PDF/ODF hybrid file" format, which this extension also enables. A hybrid PDF/ODF file is a PDF file that contains an embedded ODF source file. Hybrid PDF/ODF files will be opened in LibreOffice as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/description.xml b/sdext/source/pdfimport/description.xml
deleted file mode 100644
index 503753a..0000000
--- a/sdext/source/pdfimport/description.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<description
-
- xmlns="http://openoffice.org/extensions/description/2006"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dep="http://openoffice.org/extensions/description/2006">
- <identifier value="UPDATED_IDENTIFIER" />
-
- <dependencies>
- <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
- </dependencies>
-
- <version value="1.0.5" />
-
- <platform value="UPDATED_SUPPORTED_PLATFORM" />
-
- <publisher>
- <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
- </publisher>
-
- <display-name>
- <name lang="en-US">PDF Import</name>
- </display-name>
-
- <icon>
- <default xlink:href="images/extension_32.png" />
- </icon>
-
- <extension-description>
- <src xlink:href="description-en-US.txt" lang="en-US" />
- </extension-description>
-
-</description>
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 3606a76..02d2213 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -97,7 +97,7 @@ DEF1NAME=$(SHL1TARGET)
# --- Extension packaging ------------------------------------------
-DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
+DESCRIPTION_SRC:=config$/description.xml
MANIFEST_SRC:=config$/manifest.xml
COMPONENT_CONFIGDIR:=config
COMPONENT_CONFIGDEST:=.
@@ -117,8 +117,8 @@ COMPONENT_DIALOGS= \
$(EXTENSIONDIR)$/basic$/writer.png \
$(EXTENSIONDIR)$/xpdfimport_err.pdf
-COMPONENT_DESCRIPTION= \
- $(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
+COMPONENT_HELP= \
+ $(EXTENSIONDIR)$/component.txt
# native libraries
COMPONENT_LIBRARIES= \
@@ -127,7 +127,7 @@ COMPONENT_LIBRARIES= \
COMPONENT_IMAGES=\
$(EXTENSIONDIR)$/images$/extension_32.png
-EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_DESCRIPTION) $(COMPONENT_IMAGES) makefile.mk
+EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk
.INCLUDE : extension_pre.mk
.ENDIF # L10N_framework
@@ -135,10 +135,6 @@ EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_DESCRIPTIO
.IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk
-$(DESCRIPTION_SRC) : description.xml
- @@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
-
$(CONVERTER_FILE) : $(BIN)$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
@@ -147,9 +143,9 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
- $(COPY) description-en-US.txt $(EXTENSIONDIR)
- $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+$(COMPONENT_HELP) : config$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
diff --git a/sdext/source/presenter/description-en-US.txt b/sdext/source/presenter/description-en-US.txt
deleted file mode 100644
index 26a10c6..0000000
--- a/sdext/source/presenter/description-en-US.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
-To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views.
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index 22e5119..bf9ce72 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,7 +28,7 @@
</icon>
<extension-description>
- <src xlink:href="description-en-US.txt" lang="en-US" />
+ <src xlink:href="help/component.txt" lang="en-US" />
</extension-description>
</description>
diff --git a/sdext/source/presenter/help/component.txt b/sdext/source/presenter/help/component.txt
new file mode 100755
index 0000000..26a10c6
--- /dev/null
+++ b/sdext/source/presenter/help/component.txt
@@ -0,0 +1,2 @@
+The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
+To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views.
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index edf3919..1afbb1e 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -247,11 +247,9 @@ COMPONENT_LIBRARY= \
PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
COMPONENT_HELP= \
+ $(ZIP1DIR)$/help/component.txt \
$(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
-COMPONENT_DESCRIPTION= \
- $(foreach,lang,$(alllangiso) $(ZIP1DIR)$/description-$(lang).txt)
-
ZIP1DEPS= \
$(DESCRIPTION) \
$(COMPONENT_MANIFEST) \
@@ -259,7 +257,6 @@ ZIP1DEPS= \
$(COMPONENT_BITMAPS) \
$(COMPONENT_IMAGES) \
$(COMPONENT_LIBRARY) \
- $(COMPONENT_DESCRIPTION) \
$(COMPONENT_HELP)
LINKNAME:=help
@@ -287,6 +284,10 @@ $(COMPONENT_MANIFEST) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
+$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
@echo creating $@
@-$(MKDIRHIER) $(@:d)
@@ -350,7 +351,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
.ENDIF #"$(COM)"=="GCC"
.ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES"
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+
$(ZIP1DIR)/%.xcu : %.xcu
@@-$(MKDIRHIER) $(@:d)
@@ -367,10 +368,7 @@ PHONYDESC=.PHONY
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
- $(GNUCOPY) description-en-US.txt $(ZIP1DIR)/description-en-US.txt
- $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
- $(TYPE) $@ | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@.new
- mv $@.new $@
+ $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
ALLTAR: $(MISC)/../bin/presenter-screen.oxt
# hotfix to missing localizations
More information about the Libreoffice-commits
mailing list