diff --git a/LICENSE.LESSER b/LICENSE.LESSER new file mode 100644 index 0000000..e1ba909 --- /dev/null +++ b/LICENSE.LESSER @@ -0,0 +1,212 @@ +Files: tray/resources/icons/* + widgets/resources/icons/* + +This subset of The Breeze Icon Theme is + + Copyright (C) 2014 Uri Herrera 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 . + +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 Breeze 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. + + https://vdesign.kde.org/ + +----- + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. diff --git a/README.md b/README.md index 352180d..b0c2f25 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,12 @@ The **PianoBooster** documentation and music are released under the Creative Com [PianoBooster License](license.txt) +## Attribution for 3rd party content +The icons found under `images/breeze` are taken from the +[KDE/Breeze](https://invent.kde.org/frameworks/breeze-icons) project. The icon +`media-playback-from-start.svg` is not an exact copy but made of elements from Breeze icons. + + # SOURCE CODE As part of GNU General Public License the source code for **PianoBooster** is available from diff --git a/src/GuiTopBar.cpp b/src/GuiTopBar.cpp index a1d0ea8..69a194c 100644 --- a/src/GuiTopBar.cpp +++ b/src/GuiTopBar.cpp @@ -164,13 +164,13 @@ void GuiTopBar::setPlayButtonState(bool checked, bool atTheEnd) playButton->setChecked(checked); if (checked) { - playButton->setIcon(QIcon(":/images/stop.png")); + playButton->setIcon(QIcon(QStringLiteral(":/images/breeze/media-playback-stop.svg"))); playButton->setToolTip(""); playFromStartButton->setToolTip(""); } else { - playButton->setIcon(QIcon(":/images/play.png")); + playButton->setIcon(QIcon(QStringLiteral(":/images/breeze/media-playback-start.svg"))); playButton->setToolTip(tr("Start and stop playing music")); playFromStartButton->setToolTip(tr("Playing music from the beginning")); } diff --git a/src/GuiTopBar.ui b/src/GuiTopBar.ui index 33fcd61..ce51514 100644 --- a/src/GuiTopBar.ui +++ b/src/GuiTopBar.ui @@ -59,7 +59,7 @@ - :/images/play-from-start.png:/images/play-from-start.png + :/images/breeze/media-playback-from-start.svg:/images/breeze/media-playback-from-start.svg @@ -82,7 +82,7 @@ - :/images/play.png:/images/play.png + :/images/breeze/media-playback-start.svg:/images/breeze/media-playback-start.svg @@ -174,7 +174,7 @@ - :/images/flag.png:/images/flag.png + :/images/breeze/flag-red.svg:/images/breeze/flag-red.svg diff --git a/src/QtWindow.cpp b/src/QtWindow.cpp index 042b267..eb65167 100644 --- a/src/QtWindow.cpp +++ b/src/QtWindow.cpp @@ -326,7 +326,7 @@ void QtWindow::addShortcutAction(const QString & key, const char * method) void QtWindow::createActions() { - m_openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); + m_openAct = new QAction(QIcon(QStringLiteral(":/images/breeze/document-open.svg")), tr("&Open..."), this); m_openAct->setShortcut(tr("Ctrl+O")); m_openAct->setToolTip(tr("Open an existing file")); connect(m_openAct, SIGNAL(triggered()), this, SLOT(open())); @@ -641,12 +641,15 @@ void QtWindow::about() tr("This program is made available " "under the terms of the GNU General Public License version 3 as published by " "the Free Software Foundation.

" - ) + ) % #ifdef USE_BUNDLED_RTMIDI - % tr("This program also contains RtMIDI: realtime MIDI i/o C++ classes
") % - tr("Copyright(c) Gary P. Scavone, 2003-2019; All rights reserved.") + tr("Copyright(c) Gary P. Scavone, 2003-2019; All rights reserved.") % + QStringLiteral("

") % #endif + tr("Fallback icons from KDE/Breeze " + "project (copyright © 2014 Uri Herrera and others, see the according %1)").arg( + QStringLiteral("LGPL-3.0 license")) ); msgBox.setMinimumWidth(600); msgBox.exec(); diff --git a/src/application.qrc b/src/application.qrc index b21da42..7887764 100644 --- a/src/application.qrc +++ b/src/application.qrc @@ -1,15 +1,15 @@ - + images/pianobooster.png - images/copy.png - images/cut.png - images/flag.png - images/new.png - images/open.png - images/paste.png - images/play-from-start.png - images/play.png - images/save.png - images/stop.png + images/breeze/document-new.svg + images/breeze/document-open.svg + images/breeze/document-save.svg + images/breeze/edit-copy.svg + images/breeze/edit-cut.svg + images/breeze/edit-paste.svg + images/breeze/flag-red.svg + images/breeze/media-playback-from-start.svg + images/breeze/media-playback-start.svg + images/breeze/media-playback-stop.svg diff --git a/src/images/breeze/document-new.svg b/src/images/breeze/document-new.svg new file mode 100644 index 0000000..6434a18 --- /dev/null +++ b/src/images/breeze/document-new.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/images/breeze/document-open.svg b/src/images/breeze/document-open.svg new file mode 100644 index 0000000..5c24804 --- /dev/null +++ b/src/images/breeze/document-open.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/images/breeze/document-save.svg b/src/images/breeze/document-save.svg new file mode 100644 index 0000000..cd2db5a --- /dev/null +++ b/src/images/breeze/document-save.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/images/breeze/edit-copy.svg b/src/images/breeze/edit-copy.svg new file mode 100644 index 0000000..266e34b --- /dev/null +++ b/src/images/breeze/edit-copy.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/images/breeze/edit-cut.svg b/src/images/breeze/edit-cut.svg new file mode 100644 index 0000000..8945d6b --- /dev/null +++ b/src/images/breeze/edit-cut.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/images/breeze/edit-paste.svg b/src/images/breeze/edit-paste.svg new file mode 100644 index 0000000..62d4b52 --- /dev/null +++ b/src/images/breeze/edit-paste.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/src/images/breeze/flag-red.svg b/src/images/breeze/flag-red.svg new file mode 100644 index 0000000..72a6312 --- /dev/null +++ b/src/images/breeze/flag-red.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/images/breeze/media-playback-from-start.svg b/src/images/breeze/media-playback-from-start.svg new file mode 100644 index 0000000..675fa75 --- /dev/null +++ b/src/images/breeze/media-playback-from-start.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/src/images/breeze/media-playback-start.svg b/src/images/breeze/media-playback-start.svg new file mode 100644 index 0000000..678fd09 --- /dev/null +++ b/src/images/breeze/media-playback-start.svg @@ -0,0 +1,8 @@ + + + + diff --git a/src/images/breeze/media-playback-stop.svg b/src/images/breeze/media-playback-stop.svg new file mode 100644 index 0000000..caf7580 --- /dev/null +++ b/src/images/breeze/media-playback-stop.svg @@ -0,0 +1,8 @@ + + + + diff --git a/src/images/copy.png b/src/images/copy.png deleted file mode 100644 index 2aeb282..0000000 Binary files a/src/images/copy.png and /dev/null differ diff --git a/src/images/cut.png b/src/images/cut.png deleted file mode 100644 index 54638e9..0000000 Binary files a/src/images/cut.png and /dev/null differ diff --git a/src/images/flag.png b/src/images/flag.png deleted file mode 100644 index ad4bb8c..0000000 Binary files a/src/images/flag.png and /dev/null differ diff --git a/src/images/new.png b/src/images/new.png deleted file mode 100644 index 12131b0..0000000 Binary files a/src/images/new.png and /dev/null differ diff --git a/src/images/open.png b/src/images/open.png deleted file mode 100644 index 45fa288..0000000 Binary files a/src/images/open.png and /dev/null differ diff --git a/src/images/paste.png b/src/images/paste.png deleted file mode 100644 index c14425c..0000000 Binary files a/src/images/paste.png and /dev/null differ diff --git a/src/images/play-from-start.png b/src/images/play-from-start.png deleted file mode 100644 index 94dd801..0000000 Binary files a/src/images/play-from-start.png and /dev/null differ diff --git a/src/images/play.png b/src/images/play.png deleted file mode 100644 index 2aca2cd..0000000 Binary files a/src/images/play.png and /dev/null differ diff --git a/src/images/save.png b/src/images/save.png deleted file mode 100644 index daba865..0000000 Binary files a/src/images/save.png and /dev/null differ diff --git a/src/images/stop.png b/src/images/stop.png deleted file mode 100644 index 76c885e..0000000 Binary files a/src/images/stop.png and /dev/null differ