Author: mseidel
Date: Tue Aug 7 11:01:06 2018
New Revision: 1837591
URL: http://svn.apache.org/viewvc?rev=1837591&view=rev
Log:
Adding two missing higher resolution icons (128x128) and (hopefully) getting
cleaner desktop icons.
Added:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
(with props)
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png
(with props)
Modified:
openoffice/trunk/main/sysui/desktop/share/makefile.mk
Added:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png?rev=1837591&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png?rev=1837591&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png
------------------------------------------------------------------------------
svn:executable = *
Propchange:
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/trunk/main/sysui/desktop/share/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/makefile.mk?rev=1837591&r1=1837590&r2=1837591&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/makefile.mk (original)
+++ openoffice/trunk/main/sysui/desktop/share/makefile.mk Tue Aug 7 11:01:06
2018
@@ -43,10 +43,10 @@ ULFDIR:=.
.ENDIF # "$(WITH_LANG)"!=""
ULFFILES= \
- documents.ulf \
- launcher_comment.ulf \
- launcher_genericname.ulf \
- launcher_name.ulf
+ documents.ulf \
+ launcher_comment.ulf \
+ launcher_genericname.ulf \
+ launcher_name.ulf
LAUNCHERLIST = writer calc draw impress math base printeradmin qstart
startcenter javafilter
LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
@@ -92,8 +92,8 @@ MIMELIST = \
openxmlformats-officedocument-spreadsheetml-template \
openxmlformats-officedocument-wordprocessingml-document \
openxmlformats-officedocument-wordprocessingml-template \
- ms-excel-sheet-binary-12 \
- extension
+ ms-excel-sheet-binary-12 \
+ extension
MIMEICONLIST = \
oasis-text \
@@ -119,11 +119,11 @@ MIMEICONLIST = \
formula \
master-document \
database \
- extension
+ extension
ICONDEPN = \
- ../icons/hicolor/{16x16 32x32
48x48}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
- ../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \
+ ../icons/hicolor/{16x16 32x32 48x48
128x128}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
+ ../icons/hicolor/{16x16 32x32 48x48
128x128}/mimetypes/{$(MIMEICONLIST)}.png \
../icons/locolor/{16x16
32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png
@@ -137,12 +137,12 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES
.ENDIF # "$(GUI)"=="UNIX"
#
-# Copy/patch the .desktop files to the output tree and
-# merge-in the translations.
+# Copy/patch the .desktop files to the output tree and
+# merge-in the translations.
#
$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf
$(ULFDIR)/launcher_genericname.ulf
-$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
+$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@echo ---------------------------------
@@ -169,7 +169,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/apacheo
#
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys :
../mimetypes/openoffice.mime brand.pl translate.pl ../productversion.mk
$(ULFDIR)$/documents.ulf
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys :
../mimetypes/{$(MIMELIST)}.keys
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.keys :
../mimetypes/{$(MIMELIST)}.keys
@@-$(MKDIRHIER) $(@:d)
@echo Creating GNOME .keys file for $(@:d:d:f) ..
@echo ---------------------------------
@@ -185,7 +185,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoff
@cat $< | tr -d "\015" > $@.$(INPATH)
@mv -f $@.$(INPATH) $@
-$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications :
../productversion.mk
+$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications : ../productversion.mk
$(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.applications : ../mimetypes/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
@echo Creating GNOME .applications file for $(@:d:d:f) ..
@@ -205,7 +205,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnk
@$(PERL) ../share/translate.pl -p "$(PRODUCTNAME.$(@:d:d:f))" -d
$(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/documents.ulf
@mv -f $(@:db).$(INPATH)/* $(@:d)
@rmdir $(@:db).$(INPATH)
- @echo "{$(MIMELIST)}.desktop" > $@
+ @echo "{$(MIMELIST)}.desktop" > $@
#
# Generate customized install scripts
