[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sysui/desktop

[Libreoffice Gerrit user]

 sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png   |binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png |binary
 sysui/desktop/share/makefile.mk                             |   16 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d1b2d78a418afa81faf6fa8687a3b388ab86b16c
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue Aug 7 11:01:06 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Tue Aug 7 11:01:06 2018 +0000

    Adding two missing higher resolution icons (128x128) and (hopefully) getting cleaner desktop icons.

diff --git a/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png b/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
new file mode 100644
index 000000000000..646adcb4eb20
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png b/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png
new file mode 100755
index 000000000000..1cf56d1883e2
Binary files /dev/null and b/sysui/desktop/icons/hicolor/128x128/mimetypes/extension.png differ
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 4fb0b9ad38d1..01c3d5c6a4e4 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -122,8 +122,8 @@ MIMEICONLIST = \
     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) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build
 .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)}$/apacheopenoffice.xml : $(ULFDIR)$/documents.ulf
 #
 
 $(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)}$/openoffice.mime : ../mimetypes/$$(@:f)
     @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)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto
     @$(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