diff options
21 files changed, 36 insertions, 30 deletions
diff --git a/mysqlc/images/sun_extension.png b/mysqlc/images/sun_extension.png Binary files differdeleted file mode 100644 index cf3fe5f0d598..000000000000 --- a/mysqlc/images/sun_extension.png +++ /dev/null diff --git a/mysqlc/images/sun_extension_hc.png b/mysqlc/images/sun_extension_hc.png Binary files differdeleted file mode 100644 index 535a6bfdff4f..000000000000 --- a/mysqlc/images/sun_extension_hc.png +++ /dev/null diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index 0dc3284fa869..bc7563d39177 100644..100755 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -20,8 +20,8 @@ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <icon> - <default xlink:href="images/sun_extension.png" /> - <high-contrast xlink:href="images/sun_extension_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/> diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 516f10a7dc0a..49c67344698f 100644..100755 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -225,8 +225,8 @@ COMPONENT_LIBRARIES=\ $(COMPONENT_LIBRARY) COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/sun_extension.png \ - $(EXTENSIONDIR)$/images$/sun_extension_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png # ........ component description ........ @@ -267,9 +267,9 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE) .INCLUDE : target.mk .INCLUDE : extension_post.mk -$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) - @$(COPY) $< $@ > $(NULLDEV) + $(COPY) $< $@ # existing descriptions: just copy $(EXTENSIONDIR)$/description$/%.txt: .$/description$/%.txt diff --git a/reportbuilder/images/em47.png b/reportbuilder/images/em47.png Binary files differdeleted file mode 100644 index cf3fe5f0d598..000000000000 --- a/reportbuilder/images/em47.png +++ /dev/null diff --git a/reportbuilder/images/em47_hc.png b/reportbuilder/images/em47_hc.png Binary files differdeleted file mode 100644 index 535a6bfdff4f..000000000000 --- a/reportbuilder/images/em47_hc.png +++ /dev/null diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index a4031236bd2b..a96d41bbe6af 100644..100755 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -3,8 +3,7 @@ xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> <display-name> - <name lang="en-US">Oracle Report Builder</name> - <!-- <name lang="en-US">Sun(TM) Report Builder</name> --> + <name lang="en-US">Report Builder</name> </display-name> <registration> <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > @@ -20,8 +19,8 @@ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <icon> - <default xlink:href="images/em47.png" /> - <high-contrast xlink:href="images/em47_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src xlink:href="help/component.txt" lang="en" /> diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 7ff8f64e7938..c52e85841f68 100644..100755 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -41,8 +41,8 @@ EXTENSION_VERSION_BASE=1.2.1 .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk -# EXTENSIONNAME:=oracle-report-builder -EXTENSION_ZIPNAME:=oracle-report-builder +# EXTENSIONNAME:=report-builder +EXTENSION_ZIPNAME:=report-builder # create Extension ----------------------------- @@ -76,8 +76,8 @@ COMPONENT_OTR_FILES= \ $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/em47.png \ - $(EXTENSIONDIR)$/images$/em47_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ $(EXTENSIONDIR)$/readme_en-US.html \ @@ -133,7 +133,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk index 566132247f9f..566132247f9f 100644..100755 --- a/reportbuilder/util/makefile.pmk +++ b/reportbuilder/util/makefile.pmk diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 3d2ec9c98bd7..64a67a05b343 100644..100755 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -30,8 +30,8 @@ </display-name> <icon> - <default xlink:href="bitmaps/em47.png" /> - <high-contrast xlink:href="bitmaps/em47_hc.png" /> + <default xlink:href="bitmaps/extension_32.png" /> + <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/minimizer/images/em47.png b/sdext/source/minimizer/images/em47.png Binary files differdeleted file mode 100644 index cf3fe5f0d598..000000000000 --- a/sdext/source/minimizer/images/em47.png +++ /dev/null diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png Binary files differdeleted file mode 100644 index 535a6bfdff4f..000000000000 --- a/sdext/source/minimizer/images/em47_hc.png +++ /dev/null diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 5b14f7215fd0..8a3a385fc8f2 100644..100755 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -103,8 +103,8 @@ COMPONENT_BITMAPS= \ $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/bitmaps$/em47.png \ - $(EXTENSIONDIR)$/bitmaps$/em47_hc.png + $(EXTENSIONDIR)$/bitmaps$/extension_32.png \ + $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png # rather freestyle or common to all? COMPONENT_HELP= \ @@ -129,7 +129,7 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : images$/$$(@:f) +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index a49f81ff2c42..ec30133996c8 100644..100755 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -29,8 +29,8 @@ </display-name> <icon> - <default xlink:href="images/pdfiext.png" /> - <high-contrast xlink:href="images/pdfiext_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/pdfimport/images/pdfiext.png b/sdext/source/pdfimport/images/pdfiext.png Binary files differdeleted file mode 100644 index cf3fe5f0d598..000000000000 --- a/sdext/source/pdfimport/images/pdfiext.png +++ /dev/null diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png Binary files differdeleted file mode 100644 index 535a6bfdff4f..000000000000 --- a/sdext/source/pdfimport/images/pdfiext_hc.png +++ /dev/null diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 436345216b55..8a7f7de20e18 100644..100755 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -125,8 +125,8 @@ COMPONENT_LIBRARIES= \ $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/images$/pdfiext.png \ - $(EXTENSIONDIR)$/images$/pdfiext_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk @@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : images$/$$(@:f) +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ .ENDIF # L10N_framework diff --git a/sdext/source/presenter/bitmaps/em47.png b/sdext/source/presenter/bitmaps/em47.png Binary files differdeleted file mode 100644 index cf3fe5f0d598..000000000000 --- a/sdext/source/presenter/bitmaps/em47.png +++ /dev/null diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png Binary files differdeleted file mode 100644 index 535a6bfdff4f..000000000000 --- a/sdext/source/presenter/bitmaps/em47_hc.png +++ /dev/null diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 3919bef973a4..ede52f0bf1bb 100644..100755 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -30,8 +30,8 @@ </display-name> <icon> - <default xlink:href="bitmaps/em47.png" /> - <high-contrast xlink:href="bitmaps/em47_hc.png" /> + <default xlink:href="bitmaps/extension_32.png" /> + <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index b0bedecd4f8b..08a3470fc24d 100644..100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -231,9 +231,11 @@ COMPONENT_BITMAPS= \ \ $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png \ $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png \ - $(ZIP1DIR)$/bitmaps$/em47.png \ - $(ZIP1DIR)$/bitmaps$/em47_hc.png + $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png + +COMPONENT_IMAGES=\ + $(ZIP1DIR)$/bitmaps$/extension_32.png \ + $(ZIP1DIR)$/bitmaps$/extension_32_h.png COMPONENT_MANIFEST= \ $(ZIP1DIR)$/META-INF$/manifest.xml @@ -257,6 +259,7 @@ ZIP1DEPS= \ $(COMPONENT_MANIFEST) \ $(COMPONENT_FILES) \ $(COMPONENT_BITMAPS) \ + $(COMPONENT_IMAGES) \ $(COMPONENT_LIBRARY) \ $(COMPONENT_HELP) # $(COMPONENT_MERGED_XCU) \ @@ -290,6 +293,10 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ |
