diff options
author | Andras Timar <andras.timar@collabora.com> | 2022-02-11 21:56:12 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-02-13 09:38:58 +0100 |
commit | e32e0124f8da122af300210e637362832298ba96 (patch) | |
tree | 76ee47ff9f88169dc521a9c75f16a9fd784f842e /sysui | |
parent | 9f0bcaac08f13a58a341e0e51b7a2c647271a7d4 (diff) |
[cp] Collabora Office branding
Change-Id: I694d9a6c508853d2d980f76cc259ce1e39149da4
Diffstat (limited to 'sysui')
19 files changed, 163 insertions, 8 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index d4858842b8e9..3afa0600de08 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -24,6 +24,7 @@ Name: %pkgprefix-freedesktop-menus #BuildRequires: perl Group: Office License: LGPLv3 with MPLv2, ALv2 and others +Provides: collaboraoffice-desktop-integration Provides: libreoffice-desktop-integration Conflicts: %pkgprefix-suse-menus Conflicts: %pkgprefix-debian-menus @@ -375,7 +376,7 @@ fi # glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374) # https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362 %defattr(-, root, root) -%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion" +%if "%unixfilename" != "collaboraoffice" && "%unixfilename" != "collaboraofficedev" # compat symlinks %attr(0755,root,root) /opt/%unixfilename %endif diff --git a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png Binary files differindex 24f9c06a52fe..89141931c921 100644 --- a/sysui/desktop/icons/hicolor/1024x1024/apps/main.png +++ b/sysui/desktop/icons/hicolor/1024x1024/apps/main.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png Binary files differindex fbb923cb21ce..b8b464c53a59 100644 --- a/sysui/desktop/icons/hicolor/128x128/apps/main.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png Binary files differindex fbb923cb21ce..b8b464c53a59 100644 --- a/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png Binary files differindex 60092d562254..0cf7c1aa675d 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/main.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png Binary files differindex 60092d562254..0cf7c1aa675d 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/256x256/apps/main.png b/sysui/desktop/icons/hicolor/256x256/apps/main.png Binary files differindex 69292e13f2b0..19abcb268960 100644 --- a/sysui/desktop/icons/hicolor/256x256/apps/main.png +++ b/sysui/desktop/icons/hicolor/256x256/apps/main.png diff --git a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png Binary files differindex 69292e13f2b0..19abcb268960 100644 --- a/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/256x256/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png Binary files differindex db088f225a48..3684743e2fd2 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/main.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png Binary files differindex db088f225a48..3684743e2fd2 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png Binary files differindex 5f526a5dd7af..3ba5174457c3 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/main.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png Binary files differindex 5f526a5dd7af..3ba5174457c3 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/startcenter.png diff --git a/sysui/desktop/icons/hicolor/512x512/apps/main.png b/sysui/desktop/icons/hicolor/512x512/apps/main.png Binary files differindex e6e69fec47de..dd87a1b95254 100644 --- a/sysui/desktop/icons/hicolor/512x512/apps/main.png +++ b/sysui/desktop/icons/hicolor/512x512/apps/main.png diff --git a/sysui/desktop/icons/hicolor/scalable/apps/main.svg b/sysui/desktop/icons/hicolor/scalable/apps/main.svg index 918722b2d295..105dbb8b6c4d 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/main.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/main.svg @@ -1 +1,77 @@ -<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="108.00134" x2="20.00134" y1="122" y2="6"><stop offset="0" stop-color="#e6e6e6"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="b" gradientTransform="matrix(7.99974 0 0 7.9977797 -873.96742 -7808.7674)" gradientUnits="userSpaceOnUse" x1="122.75008" x2="111.74973" y1="991.62115" y2="977.11713"><stop offset="0" stop-color="#535353"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m17.253295 0c-.25037 0-.50072.011156-.75.035156-3.66708.6998-4.56576 2.2662469-4.5 5.9980468v115.9687472c.0004 4.1875 1.81149 5.99765 6 5.99805h91.998055c4.1885-.0004 5.99764-1.81055 5.99804-5.99805v-71.818356c.048-2.1119-.78004-4.230247-2.25-5.748047l-42.160145-42.1503908c-1.51819-1.4691999-3.63759-2.2988999-5.75-2.25h-47.83595c-.24919-.024-.49962-.0351562-.75-.0351562zm70.00978.013672c-.20997 0-.41948.016828-.62695.048828-2.66247.8528-3.55843 4.904547-1.50586 6.810547l24.095695 24.220703c2.22593 2.1217 6.6581.306209 6.77538-2.775391v-24.220703c-.00024-2.1136998-1.91298-4.034856-4.01561-4.035156h-24.093755c-.20758-.032-.41894-.048828-.6289-.048828z" fill="url(#b)"/><path d="m18.001355 6v116h92.000015v-72l-43.999995-44z" fill="url(#a)"/></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="134.19557mm" + height="134.19557mm" + viewBox="0 0 134.19557 134.19557" + version="1.1" + id="svg4519" + sodipodi:docname="collabora-online-logo.svg" + inkscape:version="0.92.0 unknown"> + <defs + id="defs4513" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.98994949" + inkscape:cx="256.04006" + inkscape:cy="260.75029" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1301" + inkscape:window-height="744" + inkscape:window-x="65" + inkscape:window-y="24" + inkscape:window-maximized="1" /> + <metadata + id="metadata4516"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(164.06501,-114.9656)"> + <polygon + id="polygon14" + points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 " + style="fill:#ffffff" + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + style="fill:#504999;fill-opacity:1" + id="polygon16" + points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 " + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + id="polygon18" + points="17.358,44.386 17.258,20.718 29.864,32.599 " + style="fill:#c8c8c8" + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + style="fill:#38257a;fill-opacity:1" + id="polygon20" + points="27.743,35.628 18.807,44.052 31.847,41.483 " + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + </g> +</svg> diff --git a/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg b/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg index 918722b2d295..105dbb8b6c4d 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/startcenter.svg @@ -1 +1,77 @@ -<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="108.00134" x2="20.00134" y1="122" y2="6"><stop offset="0" stop-color="#e6e6e6"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="b" gradientTransform="matrix(7.99974 0 0 7.9977797 -873.96742 -7808.7674)" gradientUnits="userSpaceOnUse" x1="122.75008" x2="111.74973" y1="991.62115" y2="977.11713"><stop offset="0" stop-color="#535353"/><stop offset="1" stop-color="#7e7e7e"/></linearGradient><path d="m17.253295 0c-.25037 0-.50072.011156-.75.035156-3.66708.6998-4.56576 2.2662469-4.5 5.9980468v115.9687472c.0004 4.1875 1.81149 5.99765 6 5.99805h91.998055c4.1885-.0004 5.99764-1.81055 5.99804-5.99805v-71.818356c.048-2.1119-.78004-4.230247-2.25-5.748047l-42.160145-42.1503908c-1.51819-1.4691999-3.63759-2.2988999-5.75-2.25h-47.83595c-.24919-.024-.49962-.0351562-.75-.0351562zm70.00978.013672c-.20997 0-.41948.016828-.62695.048828-2.66247.8528-3.55843 4.904547-1.50586 6.810547l24.095695 24.220703c2.22593 2.1217 6.6581.306209 6.77538-2.775391v-24.220703c-.00024-2.1136998-1.91298-4.034856-4.01561-4.035156h-24.093755c-.20758-.032-.41894-.048828-.6289-.048828z" fill="url(#b)"/><path d="m18.001355 6v116h92.000015v-72l-43.999995-44z" fill="url(#a)"/></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="134.19557mm" + height="134.19557mm" + viewBox="0 0 134.19557 134.19557" + version="1.1" + id="svg4519" + sodipodi:docname="collabora-online-logo.svg" + inkscape:version="0.92.0 unknown"> + <defs + id="defs4513" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.98994949" + inkscape:cx="256.04006" + inkscape:cy="260.75029" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1301" + inkscape:window-height="744" + inkscape:window-x="65" + inkscape:window-y="24" + inkscape:window-maximized="1" /> + <metadata + id="metadata4516"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(164.06501,-114.9656)"> + <polygon + id="polygon14" + points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386 17.258,20.718 " + style="fill:#ffffff" + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + style="fill:#504999;fill-opacity:1" + id="polygon16" + points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 " + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + id="polygon18" + points="17.358,44.386 17.258,20.718 29.864,32.599 " + style="fill:#c8c8c8" + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + <polygon + style="fill:#38257a;fill-opacity:1" + id="polygon20" + points="27.743,35.628 18.807,44.052 31.847,41.483 " + transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" /> + </g> +</svg> diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns Binary files differindex c3e1bf693142..830409c3984d 100644 --- a/sysui/desktop/icons/main.icns +++ b/sysui/desktop/icons/main.icns diff --git a/sysui/desktop/icons/soffice.ico b/sysui/desktop/icons/soffice.ico Binary files differindex 1f2319cb569c..b7ca1a0afd3e 100644 --- a/sysui/desktop/icons/soffice.ico +++ b/sysui/desktop/icons/soffice.ico diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index ce6475cd5ca5..159a64093113 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -39,14 +39,14 @@ office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API bootstrap functions running right ln -sf "${office_root}/program/soffice" "${DESTDIR}/${BINDIR}/${PREFIX}" -if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then +if test "${PREFIX}" != collaboraoffice -a "${PREFIX}" != collaboraofficedev ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" - ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" - ln -sf /${BINDIR}/${PREFIX} "${DESTDIR}/${BINDIR}/libreoffice${PRODUCTVERSION}" + ln -sf collaboraoffice "${DESTDIR}${office_root}" + ln -sf /${BINDIR}/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/collaboraoffice" fi -test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" +test "${PREFIX}" = collaboraofficedev && mime_def_file="collaboraofficedev.xml" || mime_def_file="collaboraoffice.xml" mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages" cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file" diff --git a/sysui/productlist.mk b/sysui/productlist.mk index 5d21a8e52b87..0349b741be9e 100644 --- a/sysui/productlist.mk +++ b/sysui/productlist.mk @@ -7,12 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -PRODUCTLIST := libreoffice libreofficedev +PRODUCTLIST := collaboraoffice PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR) PRODUCTNAME.libreoffice := LibreOffice PRODUCTNAME.libreofficedev := LibreOfficeDev +PRODUCTNAME.collaboraoffice := CollaboraOffice UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT) UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT) +UNIXFILENAME.collaboraoffice := collaboraoffice # vim: set noet sw=4 ts=4: |