diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-04-02 16:12:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-03 09:07:32 +0100 |
commit | 2a5077c1070cd4c0041c6bded778e8400dd56f30 (patch) | |
tree | bad0272cf9fc0b00ec52731a1da499f771168776 | |
parent | 4c5bada9d76d8f9247dd5fb269065f91abc233d0 (diff) |
start deprecating spadmin by removing it from the menus
we keep the printer admin tool, just not install the .desktop
file for it anymore.
Change-Id: I41fcdcca555e16d76fa2de4a929b6ad508b6c066
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 10 | ||||
-rw-r--r-- | sysui/CustomTarget_share.mk | 8 | ||||
-rwxr-xr-x | sysui/desktop/debian/openoffice.org-debian-menus | 8 | ||||
-rwxr-xr-x | sysui/desktop/freedesktop/freedesktop-menus.spec | 1 | ||||
-rw-r--r-- | sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png | bin | 544 -> 0 bytes | |||
-rw-r--r-- | sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png | bin | 1104 -> 0 bytes | |||
-rw-r--r-- | sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png | bin | 1629 -> 0 bytes | |||
-rw-r--r-- | sysui/desktop/icons/locolor/16x16/apps/printeradmin.png | bin | 532 -> 0 bytes | |||
-rw-r--r-- | sysui/desktop/icons/locolor/32x32/apps/printeradmin.png | bin | 1126 -> 0 bytes | |||
-rwxr-xr-x | sysui/desktop/mandriva/mandriva-menus.spec | 11 | ||||
-rwxr-xr-x | sysui/desktop/menus/printeradmin.desktop | 27 | ||||
-rw-r--r-- | sysui/desktop/share/launcher_name.ulf | 3 | ||||
-rwxr-xr-x | sysui/desktop/solaris/prototype | 1 | ||||
-rwxr-xr-x | sysui/desktop/suse/suse-menus.spec | 1 |
14 files changed, 2 insertions, 68 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 4dfe36f810f6..0a6a52309d40 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -78,7 +78,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Extension, gid_Brand_File_Share_Xdg_Impress, gid_Brand_File_Share_Xdg_Math, - gid_Brand_File_Share_Xdg_Printeradmin, gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, gid_Brand_File_Share_Xdg_Writer, @@ -697,15 +696,6 @@ End #endif #if defined UNX && ! defined MACOSX -File gid_Brand_File_Share_Xdg_Printeradmin - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Xdg; - Styles = (PACKED,SCPZIP_REPLACE); - Name = "printeradmin.desktop"; -End -#endif - -#if defined UNX && ! defined MACOSX #ifdef ENABLE_GTK File gid_Brand_File_Share_Xdg_QStart TXT_FILE_BODY; diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 0c2f023ade29..074c7a721f16 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -10,7 +10,7 @@ share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share) share_SRCDIR := $(SRCDIR)/sysui/desktop -LAUNCHERLIST_APPS := writer calc draw impress math base printeradmin startcenter +LAUNCHERLIST_APPS := writer calc draw impress math base startcenter LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter LAUNCHERS := $(foreach launcher,$(LAUNCHERLIST),$(share_SRCDIR)/menus/$(launcher).desktop) @@ -98,9 +98,7 @@ MIMEDESKTOPS := $(foreach mime,$(MIMELIST),$(share_SRCDIR)/mimetypes/$(mime).des ULFS := documents.ulf \ launcher_comment.ulf \ launcher_genericname.ulf \ - launcher_unityquicklist.ulf \ - launcher_name.ulf - + launcher_unityquicklist.ulf PRODUCTLIST := libreoffice libreofficedev oxygenoffice PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) @@ -202,8 +200,6 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ $(PERL) $(share_SRCDIR)/share/brand.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -u '$$(UNIXPRODUCTNAME)$$(BRANDPACKAGEVERSION)' \ --iconprefix '$$(UNIXBASISROOTNAME)' $^ $(share_WORKDIR)/$* $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ - --ext "desktop" --key "Name" $(share_WORKDIR)/launcher_name.ulf - $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "Comment" $(share_WORKDIR)/launcher_comment.ulf $(PERL) $(share_SRCDIR)/share/translate.pl -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "GenericName" $(share_WORKDIR)/launcher_genericname.ulf diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus index c477d7363546..8d15ccb24570 100755 --- a/sysui/desktop/debian/openoffice.org-debian-menus +++ b/sysui/desktop/debian/openoffice.org-debian-menus @@ -32,11 +32,3 @@ kderemove="y"\ icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png" - -?package(libreoffice-core02):needs="X11" section="Apps/System"\ - title="%PRODUCTNAME Printer Administration"\ - command="%PREFIX-printeradmin"\ - hints="Setup,Printer,Config"\ - kderemove="y"\ - icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-printeradmin.png"\ - icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-printeradmin.png" diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 0c1d776979cf..5a1042b5ba92 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -399,7 +399,6 @@ done /usr/share/applications/%unixfilename-draw.desktop /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-writer.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop diff --git a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png Binary files differdeleted file mode 100644 index 7f2a94691351..000000000000 --- a/sysui/desktop/icons/hicolor/16x16/apps/printeradmin.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png Binary files differdeleted file mode 100644 index 05cfd5fb6338..000000000000 --- a/sysui/desktop/icons/hicolor/32x32/apps/printeradmin.png +++ /dev/null diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png Binary files differdeleted file mode 100644 index ab5c0ef1403e..000000000000 --- a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png +++ /dev/null diff --git a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png b/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png Binary files differdeleted file mode 100644 index c84c387b9dcb..000000000000 --- a/sysui/desktop/icons/locolor/16x16/apps/printeradmin.png +++ /dev/null diff --git a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png b/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png Binary files differdeleted file mode 100644 index 9d13304ff2ea..000000000000 --- a/sysui/desktop/icons/locolor/32x32/apps/printeradmin.png +++ /dev/null diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec index aff28fd357cb..b1b2b3b27479 100755 --- a/sysui/desktop/mandriva/mandriva-menus.spec +++ b/sysui/desktop/mandriva/mandriva-menus.spec @@ -305,16 +305,6 @@ GenerateMenu "%unixfilename --math" \ "math" \ "application/vnd.oasis.opendocument.formula,application/vnd.sun.xml.math,application/vnd.stardivision.math" -# -# FIXME: Is there a better group than System/Configuration/Printing? I think no ... -# -GenerateMenu "%unixfilename-printeradmin" \ - "System/Configuration/Printing" \ - "printeradmin" \ - "%productname %{menuversion} Printeradmin" \ - "%productname %{menuversion} Printer Administration" \ - "core02" - %clean rm -rf $RPM_BUILD_ROOT @@ -351,7 +341,6 @@ fi /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop /usr/share/applications/%unixfilename-base.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/mime-info/*.keys /usr/share/mime-info/*.mime diff --git a/sysui/desktop/menus/printeradmin.desktop b/sysui/desktop/menus/printeradmin.desktop deleted file mode 100755 index 2b7db5ecdb47..000000000000 --- a/sysui/desktop/menus/printeradmin.desktop +++ /dev/null @@ -1,27 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# -[Desktop Entry] -Version=1.0 -Terminal=false -Icon=printeradmin -Type=Application -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office; -Exec=${UNIXBASISROOTNAME}-printeradmin -Name=%PRODUCTNAME Printer Administration -StartupNotify=true -X-GIO-NoFuse=true diff --git a/sysui/desktop/share/launcher_name.ulf b/sysui/desktop/share/launcher_name.ulf deleted file mode 100644 index db97e2686d47..000000000000 --- a/sysui/desktop/share/launcher_name.ulf +++ /dev/null @@ -1,3 +0,0 @@ -[printeradmin] -en-US = "%PRODUCTNAME Printer Administration" - diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype index ef541c3134ea..6b1360a2eff2 100755 --- a/sysui/desktop/solaris/prototype +++ b/sysui/desktop/solaris/prototype @@ -29,7 +29,6 @@ s none usr/share/applications/%PREFIX-draw.desktop=../../../opt/%PREFIX/share/xd s none usr/share/applications/%PREFIX-impress.desktop=../../../opt/%PREFIX/share/xdg/impress.desktop s none usr/share/applications/%PREFIX-math.desktop=../../../opt/%PREFIX/share/xdg/math.desktop s none usr/share/applications/%PREFIX-base.desktop=../../../opt/%PREFIX/share/xdg/base.desktop -s none usr/share/applications/%PREFIX-printeradmin.desktop=../../../opt/%PREFIX/share/xdg/printeradmin.desktop f none usr/share/mime-info/%PREFIX.keys=%SOURCE/openoffice.keys f none usr/share/mime-info/%PREFIX.mime=%SOURCE/openoffice.mime f none usr/share/pixmaps/%ICONPREFIX-writer.png=../icons/hicolor/48x48/apps/writer.png diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 58dae1d5808f..9789a56a938a 100755 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -371,7 +371,6 @@ done /usr/share/applications/%unixfilename-impress.desktop /usr/share/applications/%unixfilename-math.desktop /usr/share/applications/%unixfilename-base.desktop -/usr/share/applications/%unixfilename-printeradmin.desktop /usr/share/applications/%unixfilename-startcenter.desktop /usr/share/applications/%unixfilename-xsltfilter.desktop /opt/gnome/share/mime-info/*.keys |