You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/08/07 21:34:40 UTC
svn commit: r1837621 - in /openoffice/trunk/main/sysui/desktop:
debian/openoffice.org-debian-menus
icons/hicolor/128x128/apps/printeradmin.png
icons/hicolor/16x16/apps/printeradmin.png
icons/hicolor/32x32/apps/printeradmin.png share/create_tree.sh
Author: mseidel
Date: Tue Aug 7 21:34:40 2018
New Revision: 1837621
URL: http://svn.apache.org/viewvc?rev=1837621&view=rev
Log:
Next try for getting cleaner desktop icons on Linux.
Modified:
openoffice/trunk/main/sysui/desktop/debian/openoffice.org-debian-menus
openoffice/trunk/main/sysui/desktop/icons/hicolor/128x128/apps/printeradmin.png
openoffice/trunk/main/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
openoffice/trunk/main/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
openoffice/trunk/main/sysui/desktop/share/create_tree.sh
Modified: openoffice/trunk/main/sysui/desktop/debian/openoffice.org-debian-menus
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/debian/openoffice.org-debian-menus?rev=1837621&r1=1837620&r2=1837621&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/debian/openoffice.org-debian-menus (original)
+++ openoffice/trunk/main/sysui/desktop/debian/openoffice.org-debian-menus Tue Aug 7 21:34:40 2018
@@ -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"
Modified: 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=1837621&r1=1837620&r2=1837621&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png?rev=1837621&r1=1837620&r2=1837621&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png?rev=1837621&r1=1837620&r2=1837621&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/sysui/desktop/share/create_tree.sh
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sysui/desktop/share/create_tree.sh?rev=1837621&r1=1837620&r2=1837621&view=diff
==============================================================================
--- openoffice/trunk/main/sysui/desktop/share/create_tree.sh (original)
+++ openoffice/trunk/main/sysui/desktop/share/create_tree.sh Tue Aug 7 21:34:40 2018
@@ -22,8 +22,8 @@ umask 022
if [ "${KDEMAINDIR}" ]
then
- echo Copying icons ..
- for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+ echo Copying icons ..
+ 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
@@ -31,18 +31,18 @@ then
cp ${ICON_SOURCE_DIR}/$i $destfile
chmod 0644 $destfile
done
-
+
mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application
for i in `cat mimelnklist`; do
cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i
done
- chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*
+ chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*
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
@@ -50,7 +50,7 @@ then
cp ${ICON_SOURCE_DIR}/hicolor/$i $destfile
chmod 0644 $destfile
done
-
+
mkdir -p ${DESTDIR}/${GNOMEDIR}/share/mime-info
cp openoffice.mime ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime
cp openoffice.keys ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys
@@ -61,9 +61,9 @@ then
chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
if [ "${GNOME_MIME_THEME}" ]
- then
+ then
echo "Creating legacy mimetype symlinks for GNOME .."
- # add symlinks so that nautilus can identify the mime-icons
+ # add symlinks so that nautilus can identify the mime-icons
# not strictly freedesktop-stuff but there is no common naming scheme yet.
# One proposal is "mime-application:vnd.oasis.opendocument.spreadsheet.png"
# for e.g. application/vnd.oasis.opendocument.spreadsheet
@@ -72,7 +72,7 @@ then
then
link_target_root="${DESTDIR}/${GNOMEDIR}/share/icons/gnome"
fi
-
+
for subdir in `cd ${link_target_root}; ls -d *`
do
link_target_dir=""