Commit 6abad83f authored by Raphael Kubo da Costa's avatar Raphael Kubo da Costa
Browse files

Install a hicolor version of Ark's icon.

In a similar fashion to Okular commit df5364d (and probably others
spread across KDE's repositories), we need to install a hicolor
version of our icons so things such as menu entries are shown with an
actual icon in non-KDE desktops.

... And it is time for some history digging once again.

Until the 3.5 series, Ark had its set of icons which were correctly
installed according to the icon naming spec. During the transition
from the Crystal to the Oxygen icon set, for some reason it was
decided that some applications should start using more generic names
for their icons. Some of those names are defined in the icon naming
freedesktop.org spec, so other desktops are expected to have their own
versions available anyway. KCalc uses accessories-calculator, for
example.

According to [1], however, some icons fell in the category of

  "not in the spec, but let's keep it out of there anyways,
   it's not really suited to be a standard icon".

This happened to "utilities-file-archiver", which was added to the
Oxygen icon set and is used by a few different KDE applications.

This in itself would be fine, as Oxygen is a dependency for KDE
applications anyway, so KIconLoader and friends end up always finding
it.

However, if one is using another desktop, the algorithm it uses to
find icons for the applications shown in a panel or something like
that is usually the one defined in the icon theme XDG spec. Which
means Oxygen is normally not looked for, so the application gets no
icon (or has a default icon).

Git commit b479aea4 then made Ark and
its desktop files use "utilities-file-archiver" in the Icon entry, and
commit bc40140a moved the existing
icons out of Ark, since they were part of the Crystal icon set.

We are now sort of reverting those commits by copying the
"utilities-file-archiver" icons from Oxygen into Ark
again. infopanel.cpp still refers to "utilities-file-archiver" due to
the explanation about KIconLoader given above.

[1] http://techbase.kde.org/Projects/Oxygen/namingSpec/apps

BUG: 287547
FIXED-IN: 4.8.5
parent 5ba73bba
The Oxygen Icon Theme
Copyright (C) 2007 Nuno Pinheiro <nuno@oxygen-icons.org>
Copyright (C) 2007 David Vignoni <david@icon-king.com>
Copyright (C) 2007 David Miller <miller@oxygen-icons.org>
Copyright (C) 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
Copyright (C) 2007 Kenneth Wimer <kwwii@bootsplash.org>
Copyright (C) 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
and others
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
Clarification:
The GNU Lesser General Public License or LGPL is written for
software libraries in the first place. We expressly want the LGPL to
be valid for this artwork library too.
KDE Oxygen theme icons is a special kind of software library, it is an
artwork library, it's elements can be used in a Graphical User Interface, or
GUI.
Source code, for this library means:
- where they exist, SVG;
- otherwise, if applicable, the multi-layered formats xcf or psd, or
otherwise png.
The LGPL in some sections obliges you to make the files carry
notices. With images this is in some cases impossible or hardly useful.
With this library a notice is placed at a prominent place in the directory
containing the elements. You may follow this practice.
The exception in section 5 of the GNU Lesser General Public License covers
the use of elements of this art library in a GUI.
kde-artists [at] kde.org
-----
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
add_subdirectory(icons)
set(ark_SRCS
batchextract.cpp
main.cpp
mainwindow.cpp
)
kde4_add_app_icon(ark_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/utilities-file-archiver.png")
# For Mac and Windows.
kde4_add_app_icon(ark_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-ark.png")
kde4_add_executable( ark ${ark_SRCS} )
......
......@@ -146,7 +146,7 @@ Name[x-test]=xxArkxx
Name[zh_CN]=Ark
Name[zh_TW]=Ark
Exec=ark -caption "%c" %U
Icon=utilities-file-archiver
Icon=ark
X-DocPath=ark/index.html
Type=Application
Terminal=false
......
......@@ -120,7 +120,7 @@ Name[wa]=Cial
Name[x-test]=xxHerexx
Name[zh_CN]=这里
Name[zh_TW]=這裡
Icon=utilities-file-archiver
Icon=ark
Exec=ark --changetofirstpath --add --autofilename tar.gz %F
[Desktop Action compressAsZip]
......@@ -179,7 +179,7 @@ Name[wa]=Come årtchive ZIP
Name[x-test]=xxAs ZIP Archivexx
Name[zh_CN]=为 ZIP 归档
Name[zh_TW]=成 ZIP 壓縮檔
Icon=utilities-file-archiver
Icon=ark
Exec=ark --changetofirstpath --add --autofilename zip %F
[Desktop Action compressAsRar]
......@@ -238,7 +238,7 @@ Name[wa]=Come årtchive RAR
Name[x-test]=xxAs RAR Archivexx
Name[zh_CN]=为 RAR 归档
Name[zh_TW]=成 RAR 壓縮檔
Icon=utilities-file-archiver
Icon=ark
Exec=ark --changetofirstpath --add --autofilename rar %F
[Desktop Action compressAsTar]
......@@ -297,7 +297,7 @@ Name[wa]=Come årtchive ZIP/TAR
Name[x-test]=xxAs ZIP/TAR Archivexx
Name[zh_CN]=为 ZIP/TAR 归档
Name[zh_TW]=成 ZIP/TAR 壓縮檔
Icon=utilities-file-archiver
Icon=ark
Exec=ark --changetofirstpath --add --autofilename tar.gz %F
[Desktop Action compressTo]
......@@ -356,5 +356,5 @@ Name[wa]=Rastrinde eyet rlomer...
Name[x-test]=xxCompress To...xx
Name[zh_CN]=压缩到...
Name[zh_TW]=壓縮為...
Icon=utilities-file-archiver
Icon=ark
Exec=ark --add --changetofirstpath --dialog %F
......@@ -103,7 +103,7 @@ Name[wa]=Saetchî l' årtchive foû cial
Name[x-test]=xxExtract Archive Herexx
Name[zh_CN]=在此解压缩归档
Name[zh_TW]=在此解壓縮
Icon=utilities-file-archiver
Icon=ark
Exec=ark --batch --autodestination %F
[Desktop Action arkExtractTo]
......@@ -161,7 +161,7 @@ Name[wa]=Saetchî l' årtchive foû eyet l' rilomer...
Name[x-test]=xxExtract Archive To...xx
Name[zh_CN]=解压缩归档到...
Name[zh_TW]=解壓縮到...
Icon=utilities-file-archiver
Icon=ark
Exec=ark --batch --autodestination --dialog %F
[Desktop Action arkAutoExtractHere]
......@@ -219,5 +219,5 @@ Name[wa]=Saetchî l' årtchive foû cial, deteccion otomatike do ridant efant
Name[x-test]=xxExtract Archive Here, Autodetect Subfolderxx
Name[zh_CN]=在此解压缩归档,自动探测子文件夹
Name[zh_TW]=在此解壓縮,自動偵測子資料夾
Icon=utilities-file-archiver
Icon=ark
Exec=ark --batch --autodestination --autosubfolder %F
kde4_install_icons(${ICON_INSTALL_DIR})
......@@ -86,7 +86,7 @@ int main(int argc, char **argv)
ki18n("bkisofs code"),
QByteArray(),
"http://littlesvr.ca/misc/contactandrew.php");
aboutData.setProgramIconName(QLatin1String( "utilities-file-archiver" ));
aboutData.setProgramIconName(QLatin1String("ark"));
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions option;
......
[Desktop Entry]
Icon=utilities-file-archiver
Icon=ark
Name=Archiver
Name[af]=Argifeerder
Name[ar]=المؤرشف
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment