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

[Libreoffice Gerrit user]

 sysui/desktop/debian/openoffice.org-debian-menus          |   12 ++++++------
 sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png |binary
 sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png   |binary
 sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png   |binary
 sysui/desktop/share/create_tree.sh                        |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 122f4519f16c9145271cfd3842f2197746df591e
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue Aug 7 21:34:40 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Tue Aug 7 21:34:40 2018 +0000

    Next try for getting cleaner desktop icons on Linux.

diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus
index d6f92825854b..e703962c08c7 100644
--- a/sysui/desktop/debian/openoffice.org-debian-menus
+++ b/sysui/desktop/debian/openoffice.org-debian-menus
@@ -2,35 +2,35 @@
   title="%PRODUCTNAME Writer" command="%PREFIX -writer"\
   hints="Word Processors"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-writer.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-writer.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-writer.png"
 
 ?package(openoffice.org-calc):needs="X11" section="Apps/Math"\
   title="%PRODUCTNAME Calc" command="%PREFIX -calc"\
   hints="Spreadsheets"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-calc.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-calc.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-calc.png"
 
 ?package(openoffice.org-draw):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Draw" command="%PREFIX -draw"\
   hints="Drawing"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-draw.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-draw.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-draw.png"
 
 ?package(openoffice.org-impress):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Impress" command="%PREFIX -impress"\
   hints="Presentation"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-impress.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-impress.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-impress.png"
 
 ?package(openoffice.org-base):needs="X11" section="Apps/Databases"\
   title="%PRODUCTNAME Base" command="%PREFIX -base"\
   hints="Database"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-base.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-base.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png"
 
 ?package(openoffice.org-core02):needs="X11" section="Apps/System"\
@@ -38,5 +38,5 @@
   command="%PREFIX-printeradmin"\
   hints="Setup,Printer,Config"\
   kderemove="y"\
-  icon="/usr/share/icons/hicolor/48x48/apps/%ICONPREFIX-printeradmin.png"\
+  icon="/usr/share/icons/hicolor/128x128/apps/%ICONPREFIX-printeradmin.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-printeradmin.png"
diff --git a/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png b/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
index 646adcb4eb20..21b5504d9463 100644
Binary files a/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
index 399076c9934d..1ea7d9e9f867 100755
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png differ
diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
index b09999c7d083..2b85a6c2f000 100755
Binary files a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png and b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png differ
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index f86b60bb93b9..db95abafa74c 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -23,7 +23,7 @@ umask 022
 if [ "${KDEMAINDIR}" ]
 then
   echo Copying icons ..
-  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? hicolor/???x??? locolor} -name "*.png"`
   do
     targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
     mkdir -p $targetdir
@@ -42,7 +42,7 @@ fi
 if [ "${GNOMEDIR}" ]
 then
   echo Copying GNOME icons ..
-  for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"`
+  for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? ???x??? -name "*.png"`
   do
     targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i`
     mkdir -p $targetdir