diff --git a/LICENSE.LESSER b/LICENSE.LESSER new file mode 100644 index 0000000..41419d7 --- /dev/null +++ b/LICENSE.LESSER @@ -0,0 +1,212 @@ +Files: resources/icons/* + 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 59e36fb..3118518 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,6 @@ The following Qt modules are required: core gui widgets network Copyright © 2015-2022 Marius Kittler All code is licensed under [GPL-2-or-later](LICENSE). + +## Attribution for 3rd party content +All icons found in this repository are taken from the [KDE/Breeze](https://invent.kde.org/frameworks/breeze-icons) project. diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index cc6a99a..31a2b6c 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -195,8 +195,12 @@ MainWindow::~MainWindow() void MainWindow::showAboutDialog() { if (!m_aboutDlg) { - m_aboutDlg = new AboutDialog(this, QStringLiteral(APP_URL), - tr("Simple video downloader with Qt GUI and backends for multiple platforms, e.g. YouTube and Vimeo."), + m_aboutDlg = new AboutDialog(this, QString(), + QStringLiteral("

Developed by " APP_AUTHOR + "
Program icon and fallback icons from KDE/Breeze " + "project (copyright © 2014 Uri Herrera and others, see the according " + "LGPL-3.0 license)

"), + QString(), QString(), tr("Simple video downloader with Qt GUI and backends for multiple platforms, e.g. YouTube and Vimeo."), QImage(QStringLiteral(":/icons/hicolor/128x128/apps/videodownloader.png"))); } if (m_aboutDlg->isHidden()) { @@ -895,11 +899,7 @@ void MainWindow::setupTrayIcon() { #ifdef CONFIG_USE_TRAY_ICON if (!m_trayIcon) { -#ifdef OS_WIN32 - m_trayIcon = new QSystemTrayIcon(QIcon(QStringLiteral(":/icons/hicolor/16x16/misc/trayicon.ico"))); -#else m_trayIcon = new QSystemTrayIcon(QIcon(QStringLiteral(":/icons/hicolor/128x128/apps/videodownloader.png"))); -#endif connect(m_trayIcon, &QSystemTrayIcon::activated, this, static_cast(&MainWindow::trayIconActivated)); } diff --git a/gui/settings.cpp b/gui/settings.cpp index cfd93f4..494fba1 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -406,13 +406,13 @@ SettingsDialog::SettingsDialog(QWidget *parent) category->setDisplayName(tr("General")); category->assignPages({ new TargetPage(this), new UiPage() }); category->setIcon( - QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/preferences-general.png")))); + QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/preferences-other.svg")))); categories << category; category = new OptionCategory(this); category->setDisplayName(tr("Network")); category->setIcon(QIcon::fromTheme( - QStringLiteral("preferences-system-network"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/preferences-network.png")))); + QStringLiteral("preferences-system-network"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/applications-internet.svg")))); category->assignPages({ new ProxyPage(), new UserAgentPage(), new MiscPage(), new StatsPage() }); categories << category; @@ -422,7 +422,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) setMinimumSize(800, 450); setWindowIcon( - QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/preferences-general.png")))); + QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/32x32/categories/preferences-other.svg")))); } SettingsDialog::~SettingsDialog() diff --git a/resources/icons.qrc b/resources/icons.qrc index 941c205..462041e 100644 --- a/resources/icons.qrc +++ b/resources/icons.qrc @@ -1,7 +1,7 @@ icons/hicolor/128x128/apps/videodownloader.png - icons/hicolor/32x32/categories/preferences-general.png - icons/hicolor/32x32/categories/preferences-network.png + icons/hicolor/32x32/categories/applications-internet.svg + icons/hicolor/32x32/categories/preferences-other.svg diff --git a/resources/icons/hicolor/128x128/apps/videodownloader.png b/resources/icons/hicolor/128x128/apps/videodownloader.png index 63226d5..99711a0 100644 Binary files a/resources/icons/hicolor/128x128/apps/videodownloader.png and b/resources/icons/hicolor/128x128/apps/videodownloader.png differ diff --git a/resources/icons/hicolor/128x128/apps/youtube.png b/resources/icons/hicolor/128x128/apps/youtube.png deleted file mode 100644 index 72a8467..0000000 Binary files a/resources/icons/hicolor/128x128/apps/youtube.png and /dev/null differ diff --git a/resources/icons/hicolor/128x128/misc/youtubedownload.ico b/resources/icons/hicolor/128x128/misc/youtubedownload.ico deleted file mode 100644 index 694dca1..0000000 Binary files a/resources/icons/hicolor/128x128/misc/youtubedownload.ico and /dev/null differ diff --git a/resources/icons/hicolor/128x128/misc/youtubedownload.psd b/resources/icons/hicolor/128x128/misc/youtubedownload.psd deleted file mode 100644 index aec45e8..0000000 Binary files a/resources/icons/hicolor/128x128/misc/youtubedownload.psd and /dev/null differ diff --git a/resources/icons/hicolor/16x16/misc/trayicon.ico b/resources/icons/hicolor/16x16/misc/trayicon.ico deleted file mode 100644 index d9f3591..0000000 Binary files a/resources/icons/hicolor/16x16/misc/trayicon.ico and /dev/null differ diff --git a/resources/icons/hicolor/256x256/app/videodownloader.png b/resources/icons/hicolor/256x256/app/videodownloader.png deleted file mode 100644 index 6752141..0000000 Binary files a/resources/icons/hicolor/256x256/app/videodownloader.png and /dev/null differ diff --git a/resources/icons/hicolor/256x256/apps/videodownloader.png b/resources/icons/hicolor/256x256/apps/videodownloader.png new file mode 100644 index 0000000..2a167b9 Binary files /dev/null and b/resources/icons/hicolor/256x256/apps/videodownloader.png differ diff --git a/resources/icons/hicolor/32x32/categories/applications-internet.svg b/resources/icons/hicolor/32x32/categories/applications-internet.svg new file mode 100644 index 0000000..136db36 --- /dev/null +++ b/resources/icons/hicolor/32x32/categories/applications-internet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/icons/hicolor/32x32/categories/preferences-general.png b/resources/icons/hicolor/32x32/categories/preferences-general.png deleted file mode 100644 index 711881e..0000000 Binary files a/resources/icons/hicolor/32x32/categories/preferences-general.png and /dev/null differ diff --git a/resources/icons/hicolor/32x32/categories/preferences-network.png b/resources/icons/hicolor/32x32/categories/preferences-network.png deleted file mode 100644 index 0e16fd7..0000000 Binary files a/resources/icons/hicolor/32x32/categories/preferences-network.png and /dev/null differ diff --git a/resources/icons/hicolor/32x32/categories/preferences-other.svg b/resources/icons/hicolor/32x32/categories/preferences-other.svg new file mode 100644 index 0000000..8e41272 --- /dev/null +++ b/resources/icons/hicolor/32x32/categories/preferences-other.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/hicolor/scalable/apps/videodownloader.svg b/resources/icons/hicolor/scalable/apps/videodownloader.svg index a5b3e27..2e56f04 100644 --- a/resources/icons/hicolor/scalable/apps/videodownloader.svg +++ b/resources/icons/hicolor/scalable/apps/videodownloader.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/hicolor/scalable/apps/youtube.svg b/resources/icons/hicolor/scalable/apps/youtube.svg deleted file mode 100644 index ab3abb0..0000000 --- a/resources/icons/hicolor/scalable/apps/youtube.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file