diff --git a/ChangeLog b/ChangeLog index 278c8abcf..f6322fc97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ 27. Fix crash if try to expand dirble and --no-network passed to Cantata. 28. Modify name of supplied font-awesome font to Cantata-FontAwesome, so as to avoid conflicts with any system installed font. +29. Remove custom icon theme, and just use FontAwesome. 2.3.0 ----- diff --git a/devices/audiocddevice.cpp b/devices/audiocddevice.cpp index 8c9385586..df2ad23b9 100644 --- a/devices/audiocddevice.cpp +++ b/devices/audiocddevice.cpp @@ -36,6 +36,7 @@ #include "mpd-interface/mpdconnection.h" #include "gui/covers.h" #include "gui/settings.h" +#include "widgets/icons.h" #include #include #include @@ -89,6 +90,9 @@ AudioCdDevice::AudioCdDevice(MusicLibraryModel *m, Solid::Device &dev) , autoPlay(false) { icn=Icon("media-optical"); + if (icn.isNull()) { + icn=Icons::self()->albumMonoIcon; + } drive=dev.parent().as(); Solid::Block *block=dev.as(); if (block) { diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp index cc24a2f9f..2077bd23a 100644 --- a/devices/mtpdevice.cpp +++ b/devices/mtpdevice.cpp @@ -40,6 +40,7 @@ #include "filejob.h" #include "support/configuration.h" #include "support/thread.h" +#include "support/monoicon.h" #include #include #include @@ -1212,6 +1213,9 @@ MtpDevice::MtpDevice(MusicLibraryModel *m, Solid::Device &dev, unsigned int busN setData(opts.name); } icn=Icon("multimedia-player"); + if (icn.isNull()) { + icn=MonoIcon::icon(FontAwesome::mobilephone, Utils::clampColor(qApp->palette().text().color())); + } } MtpDevice::~MtpDevice() diff --git a/devices/remotefsdevice.cpp b/devices/remotefsdevice.cpp index 1531c0b23..2b8a68b57 100644 --- a/devices/remotefsdevice.cpp +++ b/devices/remotefsdevice.cpp @@ -28,6 +28,7 @@ #include "actiondialog.h" #include "support/inputdialog.h" #include "support/utils.h" +#include "support/monoicon.h" #include "http/httpserver.h" #include "support/configuration.h" #include "mountpoints.h" @@ -220,6 +221,13 @@ RemoteFsDevice::RemoteFsDevice(MusicLibraryModel *m, const DeviceOptions &option : constSshfsProtocol==details.url.scheme() ? Icon(QStringList() << "folder-network" << "utilities-terminal") : Icon(QStringList() << "folder-samba" << "network-server"); + if (icn.isNull()) { + icn=MonoIcon::icon(details.isLocalFile() + ? FontAwesome::foldero + : constSshfsProtocol==details.url.scheme() + ? FontAwesome::linux_os + : FontAwesome::windows, Utils::clampColor(qApp->palette().text().color())); + } } RemoteFsDevice::RemoteFsDevice(MusicLibraryModel *m, const Details &d) diff --git a/devices/umsdevice.cpp b/devices/umsdevice.cpp index 93b4dcc41..c3d6ccea1 100644 --- a/devices/umsdevice.cpp +++ b/devices/umsdevice.cpp @@ -23,6 +23,7 @@ #include "umsdevice.h" #include "support/utils.h" +#include "support/monoicon.h" #include "devicepropertiesdialog.h" #include "devicepropertieswidget.h" #include "actiondialog.h" @@ -58,6 +59,9 @@ UmsDevice::UmsDevice(MusicLibraryModel *m, Solid::Device &dev) setup(); icn=Icon(QStringList() << "drive-removable-media-usb-pendrive" << "drive-removable-media-usb" << "multimedia-player"); + if (icn.isNull()) { + icn=MonoIcon::icon(FontAwesome::usb, Utils::clampColor(qApp->palette().text().color())); + } } UmsDevice::~UmsDevice() diff --git a/gui/application_mac.cpp b/gui/application_mac.cpp index 5881061ea..595c1b11b 100644 --- a/gui/application_mac.cpp +++ b/gui/application_mac.cpp @@ -25,21 +25,12 @@ #include "support/utils.h" #include "config.h" #include -#include #include Application::Application(int &argc, char **argv) : SingleApplication(argc, argv) { setAttribute(Qt::AA_DontShowIconsInMenus, true); - // Setup icon path... - QStringList paths=QIcon::themeSearchPaths(); - QString path=Utils::systemDir("icons"); - if (!paths.contains(path)) { - QIcon::setThemeSearchPaths(QStringList() << path << paths); - } - - QIcon::setThemeName(QLatin1String("cantata")); // Set DYLD_LIBRARY_PATH so that Qt finds our openSSL libs QDir dir(argv[0]); diff --git a/gui/application_qt.cpp b/gui/application_qt.cpp index 8e79704a4..30cb4f620 100644 --- a/gui/application_qt.cpp +++ b/gui/application_qt.cpp @@ -26,16 +26,6 @@ #include #include #include -#include - -static void setupIconTheme(Application *app) -{ - QIcon::setThemeSearchPaths(QStringList() << CANTATA_SYS_ICONS_DIR << QIcon::themeSearchPaths()); - QIcon::setThemeName(QLatin1String("cantata")); - if (Utils::KDE!=Utils::currentDe()) { - app->setAttribute(Qt::AA_DontShowIconsInMenus, true); - } -} Application::Application(int &argc, char **argv) : QApplication(argc, argv) @@ -48,7 +38,9 @@ Application::Application(int &argc, char **argv) bool Application::start() { if (QDBusConnection::sessionBus().registerService(CANTATA_REV_URL)) { - setupIconTheme(this); + if (Utils::KDE!=Utils::currentDe()) { + setAttribute(Qt::AA_DontShowIconsInMenus, true); + } return true; } loadFiles(); diff --git a/gui/application_win.cpp b/gui/application_win.cpp index 05e40f6c2..98ab64bc5 100644 --- a/gui/application_win.cpp +++ b/gui/application_win.cpp @@ -23,14 +23,12 @@ #include "application_win.h" #include "config.h" -#include #include Application::Application(int &argc, char **argv) : SingleApplication(argc, argv) { installNativeEventFilter(this); - QIcon::setThemeName(QLatin1String("cantata")); setAttribute(Qt::AA_DontShowIconsInMenus, true); } diff --git a/gui/initialsettingswizard.cpp b/gui/initialsettingswizard.cpp index 17858416d..2411b9e8a 100644 --- a/gui/initialsettingswizard.cpp +++ b/gui/initialsettingswizard.cpp @@ -74,7 +74,7 @@ InitialSettingsWizard::InitialSettingsWizard(QWidget *p) int iconSize=Icon::dlgIconSize(); groupWarningIcon->setPixmap(Icon("dialog-warning").pixmap(iconSize, iconSize)); introPage->setBackground(Icons::self()->appIcon); - connectionPage->setBackground(Icons::self()->audioFileIcon); + connectionPage->setBackground(Icons::self()->audioListIcon); coversPage->setBackground(Icons::self()->albumIconLarge); finishedPage->setBackground(Icon("dialog-ok")); fetchCovers->setChecked(Settings::self()->fetchCovers()); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index b00673953..9aab71700 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -1393,11 +1393,11 @@ void MainWindow::outputsUpdated(const QList &outputs) if (!switchedOn.isEmpty() && switchedOff.isEmpty()) { QStringList names=switchedOn.toList(); qSort(names); - trayItem->showMessage(tr("Outputs"), tr("Enabled: %1").arg(names.join(QLatin1String(", "))), Icons::self()->speakerIcon.pixmap(64, 64).toImage()); + trayItem->showMessage(tr("Outputs"), tr("Enabled: %1").arg(names.join(QLatin1String(", ")))); } else if (!switchedOff.isEmpty() && switchedOn.isEmpty()) { QStringList names=switchedOff.toList(); qSort(names); - trayItem->showMessage(tr("Outputs"), tr("Disabled: %1").arg(names.join(QLatin1String(", "))), Icons::self()->speakerIcon.pixmap(64, 64).toImage()); + trayItem->showMessage(tr("Outputs"), tr("Disabled: %1").arg(names.join(QLatin1String(", ")))); } else if (!switchedOn.isEmpty() && !switchedOff.isEmpty()) { QStringList on=switchedOn.toList(); qSort(on); @@ -1405,7 +1405,7 @@ void MainWindow::outputsUpdated(const QList &outputs) qSort(off); trayItem->showMessage(tr("Outputs"), tr("Enabled: %1").arg(on.join(QLatin1String(", ")))+QLatin1Char('\n')+ - tr("Disabled: %1").arg(off.join(QLatin1String(", "))), Icons::self()->speakerIcon.pixmap(64, 64).toImage()); + tr("Disabled: %1").arg(off.join(QLatin1String(", ")))); } } setProperty(constMpdEnabledOuptuts, QStringList() << enabledMpd.toList()); diff --git a/gui/playbacksettings.cpp b/gui/playbacksettings.cpp index 864df2678..516abeae6 100644 --- a/gui/playbacksettings.cpp +++ b/gui/playbacksettings.cpp @@ -160,7 +160,7 @@ void PlaybackSettings::mpdConnectionStateChanged(bool c) crossfadingLabel->setEnabled(c); replayGainLabel->setEnabled(rgSupported); replayGain->setEnabled(rgSupported); - messageIcon->setPixmap(Icon(c ? "dialog-information" : "dialog-warning").pixmap(messageIcon->minimumSize())); + messageIcon->setPixmap(style()->standardIcon(c ? QStyle::SP_MessageBoxInformation : QStyle::SP_MessageBoxWarning).pixmap(messageIcon->minimumSize())); if (c) { messageLabel->setText(tr("Connected to %1
The entries below apply to the currently connected MPD collection.") .arg(MPDConnection::self()->getDetails().description())); diff --git a/gui/preferencesdialog.cpp b/gui/preferencesdialog.cpp index 34307569e..e96d0a66b 100644 --- a/gui/preferencesdialog.cpp +++ b/gui/preferencesdialog.cpp @@ -41,6 +41,7 @@ #include "shortcutssettingspage.h" #include "scrobbling/scrobblingsettings.h" #include "apikeyssettings.h" +#include "support/monoicon.h" #include #include @@ -65,34 +66,32 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) apiKeys = new ApiKeysSettings(this); server->load(); playback->load(); - //cover->load(); interface->load(); context->load(); scrobbling->load(); custom->load(); - addPage(QLatin1String("collection"), server, tr("Collection"), Icon("audio-x-generic"), tr("Collection Settings")); - addPage(QLatin1String("playback"), playback, tr("Playback"), Icons::self()->speakerIcon, tr("Playback Settings")); - //addPage(QLatin1String("cover"), files, tr("Covers"), Icons::self()->filesIcon, tr("Album Cover Settings")); - addPage(QLatin1String("interface"), interface, tr("Interface"), Icon("preferences-other"), tr("Interface Settings")); - addPage(QLatin1String("info"), context, tr("Info"), Icons::self()->contextIcon, tr("Info View Settings")); - addPage(QLatin1String("scrobbling"), scrobbling, tr("Scrobbling"), Icons::self()->lastFmIcon, tr("Scrobbling Settings")); + QColor iconColor = Utils::clampColor(palette().text().color()); + addPage(QLatin1String("collection"), server, tr("Collection"), MonoIcon::icon(FontAwesome::music, iconColor), tr("Collection Settings")); + addPage(QLatin1String("playback"), playback, tr("Playback"), MonoIcon::icon(FontAwesome::volumeup, iconColor), tr("Playback Settings")); + addPage(QLatin1String("interface"), interface, tr("Interface"), MonoIcon::icon(FontAwesome::cog, iconColor), tr("Interface Settings")); + addPage(QLatin1String("info"), context, tr("Info"), MonoIcon::icon(FontAwesome::infocircle, iconColor), tr("Info View Settings")); + addPage(QLatin1String("scrobbling"), scrobbling, tr("Scrobbling"), MonoIcon::icon(FontAwesome::lastfm, iconColor), tr("Scrobbling Settings")); #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND audiocd = new AudioCdSettings(0); audiocd->load(); - addPage(QLatin1String("cd"), audiocd, tr("Audio CD"), Icons::self()->albumIcon(32), tr("Audio CD Settings")); + addPage(QLatin1String("cd"), audiocd, tr("Audio CD"), Icons::self()->albumMonoIcon, tr("Audio CD Settings")); #endif #ifdef ENABLE_PROXY_CONFIG proxy = new ProxySettings(0); proxy->load(); - addPage(QLatin1String("proxy"), proxy, tr("Proxy"), Icon("preferences-system-network"), tr("Proxy Settings")); + addPage(QLatin1String("proxy"), proxy, tr("Proxy"), MonoIcon::icon(FontAwesome::globe, iconColor), tr("Proxy Settings")); #endif shortcuts = new ShortcutsSettingsPage(nullptr); - addPage(QLatin1String("shortcuts"), shortcuts, tr("Shortcuts"), Icon(QStringList() << "preferences-desktop-keyboard" << "keyboard"), - tr("Keyboard Shortcut Settings")); + addPage(QLatin1String("shortcuts"), shortcuts, tr("Shortcuts"), MonoIcon::icon(FontAwesome::keyboardo, iconColor), tr("Keyboard Shortcut Settings")); shortcuts->load(); - addPage(QLatin1String("cache"), cache, tr("Cache"), Icon(QStringList() << "folder-temp" << "folder"), tr("Cached Items")); - addPage(QLatin1String("custom"), custom, tr("Custom Actions"), Icon(QStringList() << "fork" << "gtk-execute"), tr("Custom Actions")); - addPage(QLatin1String("apikeys"), apiKeys, tr("Service Keys"), Icon("key"), tr("Service API Keys")); + addPage(QLatin1String("cache"), cache, tr("Cache"), MonoIcon::icon(FontAwesome::foldero, iconColor), tr("Cached Items")); + addPage(QLatin1String("custom"), custom, tr("Custom Actions"), MonoIcon::icon(FontAwesome::rocket, iconColor), tr("Custom Actions")); + addPage(QLatin1String("apikeys"), apiKeys, tr("Service Keys"), MonoIcon::icon(FontAwesome::key, iconColor), tr("Service API Keys")); #ifdef Q_OS_MAC setCaption(tr("Cantata Preferences")); setMinimumWidth(800); diff --git a/gui/trayitem.h b/gui/trayitem.h index b3817fc18..76a2b7107 100644 --- a/gui/trayitem.h +++ b/gui/trayitem.h @@ -45,7 +45,7 @@ public: TrayItem(MainWindow *p); ~TrayItem() override { } - void showMessage(const QString &title, const QString &text, const QImage &img); + void showMessage(const QString &title, const QString &text, const QImage &img=QImage()); void setup(); #ifdef Q_OS_MAC bool isActive() const { return false; } diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 0fea78f6b..62914c53b 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -55,8 +55,6 @@ if (NOT HAIKU) install(FILES cantata-panel-light.svg DESTINATION ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/icons/cantata/svg) endif (NOT WIN32 AND NOT APPLE) - add_subdirectory(theme) - #if (APPLE) # install(FILES trayicon-mono-dark.svg DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/scalable/apps RENAME cantata-panel.svg) #endif (APPLE) diff --git a/icons/theme/AUTHORS b/icons/theme/AUTHORS deleted file mode 100755 index 04f10ebf5..000000000 --- a/icons/theme/AUTHORS +++ /dev/null @@ -1,13 +0,0 @@ -svg64/dialog-*.svg are from breeze - --------------------------------------------------------------------- - -playlist.svg and dynamic-playlist.svg are created using papirus -mimetype background - ------------------------- ICON THEME PAPIRUS ------------------------ -SOURCES: -Sam Hewitt - author icon theme Paper (https://github.com/snwh/paper-icon-theme) - -CUSTOMIZER: -Alexey Varfolomeev - Papirus Pack KDE (https://github.com/varlesh/papirus-pack-kde) diff --git a/icons/theme/CMakeLists.txt b/icons/theme/CMakeLists.txt deleted file mode 100644 index c4b09aa61..000000000 --- a/icons/theme/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -set(ICON_FILES -svg/audio-x-generic.svg -svg/information.svg -svg/folder-temp.svg -svg/fork.svg -svg/inode-directory.svg -svg/network-server-database.svg -svg/preferences-desktop-keyboard.svg -svg/preferences-other.svg -svg/speaker.svg -svg/key.svg -svg64/dialog-error.svg -svg64/dialog-information.svg -svg64/dialog-question.svg -svg64/dialog-warning.svg -) - -if (ENABLE_PROXY_CONFIG) - set(ICON_FILES svg/preferences-system-network.svg ${ICON_FILES}) -endif (ENABLE_PROXY_CONFIG) - -if (ENABLE_DEVICES_SUPPORT) - set(ICON_FILES svg/drive-removable-media-usb-pendrive.svg svg/multimedia-player.svg ${ICON_FILES}) - if (ENABLE_REMOTE_DEVICES) - set(ICON_FILES svg/folder-network.svg svg/folder-samba.svg ${ICON_FILES}) - endif (ENABLE_REMOTE_DEVICES) -endif (ENABLE_DEVICES_SUPPORT) - -if (WIN32 OR APPLE) - set(CANTATA_ICON_THEME_PATH ${CANTATA_ICON_INSTALL_PREFIX}) -else (WIN32 OR APPLE) - set(CANTATA_ICON_THEME_PATH ${SHARE_INSTALL_PREFIX}/${CMAKE_PROJECT_NAME}/icons/cantata) -endif (WIN32 OR APPLE) - -foreach(ICON ${ICON_FILES}) - get_filename_component(ICON_PATH ${ICON} PATH) - install(FILES ${ICON} DESTINATION ${CANTATA_ICON_THEME_PATH}/${ICON_PATH}) -endforeach(ICON ${ICON_FILES}) -install(FILES AUTHORS index.theme LICENSE DESTINATION ${CANTATA_ICON_THEME_PATH}) - -install(FILES ../cantata128.png DESTINATION ${CANTATA_ICON_THEME_PATH}/128 RENAME cantata.png) -if (NOT WIN32 AND NOT APPLE) - install(FILES ../cantata.svg DESTINATION ${CANTATA_ICON_THEME_PATH}/svg) -endif (NOT WIN32 AND NOT APPLE) - diff --git a/icons/theme/LICENSE b/icons/theme/LICENSE deleted file mode 100755 index fb8952828..000000000 --- a/icons/theme/LICENSE +++ /dev/null @@ -1,425 +0,0 @@ -Creative Commons Attribution-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More_considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-ShareAlike 4.0 International Public -License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-ShareAlike 4.0 International Public License ("Public -License"). To the extent this Public License may be interpreted as a -contract, You are granted the Licensed Rights in consideration of Your -acceptance of these terms and conditions, and the Licensor grants You -such rights in consideration of benefits the Licensor receives from -making the Licensed Paper available under these terms and -conditions. - - -Section 1 -- Definitions. - - a. Adapted Paper means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Paper - and in which the Licensed Paper is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Paper is a musical work, performance, or sound recording, - Adapted Paper is always produced where the Licensed Paper is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Paper in - accordance with the terms and conditions of this Public License. - - c. BY-SA Compatible License means a license listed at - creativecommons.org/compatiblelicenses, approved by Creative - Commons as essentially the equivalent of this Public License. - - d. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - e. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - f. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Paper. - - g. License Elements means the license attributes listed in the name - of a Creative Commons Public License. The License Elements of this - Public License are Attribution and ShareAlike. - - h. Licensed Paper means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - i. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Paper and that the Licensor has authority to license. - - j. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - k. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - l. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - m. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Paper to: - - a. reproduce and Share the Licensed Paper, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Paper. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Paper. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Paper. Every - recipient of the Licensed Paper automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Paper. - Every recipient of Adapted Paper from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Paper - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Paper if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Paper. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Paper is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Paper (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Paper: - - i. identification of the creator(s) of the Licensed - Paper and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Paper to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Paper and - retain an indication of any previous modifications; and - - c. indicate the Licensed Paper is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Paper. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Paper You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Paper. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Paper that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Paper: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Paper, - - including for purposes of Section 3(b); and - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Paper has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Paper under separate terms or conditions or stop - distributing the Licensed Paper at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Paper not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Paper that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public licenses. -Notwithstanding, Creative Commons may elect to apply one of its public -licenses to material it publishes and in those instances will be -considered the "Licensor." Except for the limited purpose of indicating -that material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the public -licenses. - -Creative Commons may be contacted at creativecommons.org. \ No newline at end of file diff --git a/icons/theme/index.theme b/icons/theme/index.theme deleted file mode 100755 index ce4035ea0..000000000 --- a/icons/theme/index.theme +++ /dev/null @@ -1,23 +0,0 @@ -[Icon Theme] -Name=Cantata -Comment=Icons taken from Papirus theme. -Inherits=breeze,oxygen,hicolor -Directories=svg,svg64,128 - -[128] -Context=Applications -Size=128 -Type=Fixed - -[svg] -Size=48 -MinSize=8 -MaxSize=512 -Type=Scalable - -[svg64] -Size=64 -MinSize=8 -MaxSize=512 -Type=Scalable - diff --git a/icons/theme/svg/audio-x-generic.svg b/icons/theme/svg/audio-x-generic.svg deleted file mode 100644 index 9b2db89f0..000000000 --- a/icons/theme/svg/audio-x-generic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/icons/theme/svg/drive-removable-media-usb-pendrive.svg b/icons/theme/svg/drive-removable-media-usb-pendrive.svg deleted file mode 100644 index 0ca462de4..000000000 --- a/icons/theme/svg/drive-removable-media-usb-pendrive.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/icons/theme/svg/folder-network.svg b/icons/theme/svg/folder-network.svg deleted file mode 100644 index f0ce4a6ea..000000000 --- a/icons/theme/svg/folder-network.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/folder-samba.svg b/icons/theme/svg/folder-samba.svg deleted file mode 100644 index e345ab3ad..000000000 --- a/icons/theme/svg/folder-samba.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/folder-temp.svg b/icons/theme/svg/folder-temp.svg deleted file mode 100644 index b2278ad61..000000000 --- a/icons/theme/svg/folder-temp.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/icons/theme/svg/fork.svg b/icons/theme/svg/fork.svg deleted file mode 100644 index 73fa61963..000000000 --- a/icons/theme/svg/fork.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/information.svg b/icons/theme/svg/information.svg deleted file mode 100644 index 2984b0b41..000000000 --- a/icons/theme/svg/information.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/icons/theme/svg/inode-directory.svg b/icons/theme/svg/inode-directory.svg deleted file mode 100644 index e8d94b691..000000000 --- a/icons/theme/svg/inode-directory.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/icons/theme/svg/key.svg b/icons/theme/svg/key.svg deleted file mode 100644 index dff3e8248..000000000 --- a/icons/theme/svg/key.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/icons/theme/svg/multimedia-player.svg b/icons/theme/svg/multimedia-player.svg deleted file mode 100644 index 4613f35bd..000000000 --- a/icons/theme/svg/multimedia-player.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/network-server-database.svg b/icons/theme/svg/network-server-database.svg deleted file mode 100644 index 062399b26..000000000 --- a/icons/theme/svg/network-server-database.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/preferences-desktop-keyboard.svg b/icons/theme/svg/preferences-desktop-keyboard.svg deleted file mode 100644 index 90229d879..000000000 --- a/icons/theme/svg/preferences-desktop-keyboard.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/icons/theme/svg/preferences-other.svg b/icons/theme/svg/preferences-other.svg deleted file mode 100644 index 1f712ae5d..000000000 --- a/icons/theme/svg/preferences-other.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/icons/theme/svg/preferences-system-network.svg b/icons/theme/svg/preferences-system-network.svg deleted file mode 100644 index 5f1ced50a..000000000 --- a/icons/theme/svg/preferences-system-network.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg/speaker.svg b/icons/theme/svg/speaker.svg deleted file mode 100644 index cbd16e39d..000000000 --- a/icons/theme/svg/speaker.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/icons/theme/svg64/dialog-error.svg b/icons/theme/svg64/dialog-error.svg deleted file mode 100644 index 3db029ddd..000000000 --- a/icons/theme/svg64/dialog-error.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg64/dialog-information.svg b/icons/theme/svg64/dialog-information.svg deleted file mode 100644 index bc57aaac3..000000000 --- a/icons/theme/svg64/dialog-information.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg64/dialog-question.svg b/icons/theme/svg64/dialog-question.svg deleted file mode 100644 index f4c723546..000000000 --- a/icons/theme/svg64/dialog-question.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/theme/svg64/dialog-warning.svg b/icons/theme/svg64/dialog-warning.svg deleted file mode 100644 index 4051a7f52..000000000 --- a/icons/theme/svg64/dialog-warning.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/online/podcastsearchdialog.cpp b/online/podcastsearchdialog.cpp index 568554a53..99b4c9503 100644 --- a/online/podcastsearchdialog.cpp +++ b/online/podcastsearchdialog.cpp @@ -216,7 +216,7 @@ void PodcastPage::addPodcast(const QString &title, const QUrl &url, const QUrl & podItem->setData(0, ImageUrlRole, image); podItem->setData(0, DescriptionRole, description); podItem->setData(0, WebPageUrlRole, webPage); - podItem->setIcon(0, Icons::self()->audioFileIcon); + podItem->setIcon(0, Icons::self()->audioListIcon); } static QString encode(const QImage &img) @@ -480,7 +480,7 @@ void OpmlBrowsePage::addCategory(const OpmlParser::Category &cat, QTreeWidgetIte : new QTreeWidgetItem(tree, QStringList() << cat.name); catItem->setData(0, IsPodcastRole, false); - catItem->setIcon(0, Icons::self()->folderIcon); + catItem->setIcon(0, Icons::self()->folderListIcon); for (const OpmlParser::Podcast &pod: cat.podcasts) { addPodcast(pod, catItem); } diff --git a/support/monoicon.h b/support/monoicon.h index ce8297c82..c4baffe13 100644 --- a/support/monoicon.h +++ b/support/monoicon.h @@ -594,6 +594,7 @@ namespace FontAwesome { unlockalt = 0xf13e, unsorted = 0xf0dc, upload = 0xf093, + usb = 0xf287, usd = 0xf155, user = 0xf007, usermd = 0xf0f0, diff --git a/support/pagewidget.cpp b/support/pagewidget.cpp index c70f34eb6..6eea4d5c8 100644 --- a/support/pagewidget.cpp +++ b/support/pagewidget.cpp @@ -118,10 +118,10 @@ public: const QString text = index.model()->data(index, Qt::DisplayRole).toString(); const QIcon icon = index.model()->data(index, Qt::DecorationRole).value(); - const QPixmap pixmap = icon.pixmap(iconSize, iconSize); + const QPixmap pixmap = icon.pixmap(iconSize, iconSize, option.state&QStyle::State_Selected ? QIcon::Selected : QIcon::Normal); QFontMetrics fm = painter->fontMetrics(); - QSize layoutSize = pixmap.size() / pixmap.DEVICE_PIXEL_RATIO(); + QSize layoutSize = pixmap.isNull() ? QSize(iconSize, iconSize) : (pixmap.size() / pixmap.DEVICE_PIXEL_RATIO()); QTextLayout iconTextLayout(text, option.font); QTextOption textOption(Qt::AlignHCenter); @@ -157,7 +157,9 @@ public: painter->setPen(option.palette.color(cg, QPalette::Text)); } - painter->drawPixmap(option.rect.x() + (option.rect.width()/2)-(layoutSize.width()/2), option.rect.y() + 5, pixmap); + if (!pixmap.isNull()) { + painter->drawPixmap(option.rect.x() + (option.rect.width()/2)-(layoutSize.width()/2), option.rect.y() + 5, pixmap); + } if (!text.isEmpty()) { iconTextLayout.draw(painter, QPoint(option.rect.x() + (option.rect.width()/2)-(maxWidth/2), option.rect.y() + layoutSize.height()+7)); } @@ -180,7 +182,7 @@ public: QFontMetrics fm = option.fontMetrics; int gap = fm.height(); - QSize layoutSize = pixmap.size() / pixmap.DEVICE_PIXEL_RATIO(); + QSize layoutSize = pixmap.isNull() ? QSize(iconSize, iconSize) : (pixmap.size() / pixmap.DEVICE_PIXEL_RATIO()); if (layoutSize.height() == 0) { /** diff --git a/support/proxystyle.cpp b/support/proxystyle.cpp index 0f5ec3627..bd28c616c 100644 --- a/support/proxystyle.cpp +++ b/support/proxystyle.cpp @@ -42,6 +42,10 @@ ProxyStyle::ProxyStyle(int modView) #if !defined Q_OS_WIN && !defined Q_OS_MAC editClearIcon=MonoIcon::icon(FontAwesome::timescircle, QColor(128, 128, 128), QColor(128, 128, 128)); #endif + errorIcon=MonoIcon::icon(FontAwesome::timescircleo, MonoIcon::constRed, MonoIcon::constRed); + warningIcon=MonoIcon::icon(FontAwesome::exclamationtriangle, QColor(0xff, 0x99, 0x00), QColor(0xff, 0x99, 0x00)); + questionIcon=MonoIcon::icon(FontAwesome::questioncircle, QColor(0x1a, 0x8c, 0xff), QColor(0x1a, 0x8c, 0xff)); + infoIcon=MonoIcon::icon(FontAwesome::infocircle, QColor(0x1a, 0x8c, 0xff), QColor(0x1a, 0x8c, 0xff)); } void ProxyStyle::polish(QWidget *widget) @@ -92,21 +96,43 @@ void ProxyStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *opt } } -#if !defined Q_OS_WIN && !defined Q_OS_MAC QPixmap ProxyStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opt, const QWidget *widget) const { QPixmap pixmap=baseStyle()->standardPixmap(sp, opt, widget); - if (SP_LineEditClearButton==sp) { + switch (sp) { + #if !defined Q_OS_WIN && !defined Q_OS_MAC + case SP_LineEditClearButton: return editClearIcon.pixmap(pixmap.size()); + #endif + case SP_MessageBoxCritical: + return errorIcon.pixmap(pixmap.size()); + case SP_MessageBoxWarning: + return warningIcon.pixmap(pixmap.size()); + case SP_MessageBoxQuestion: + return questionIcon.pixmap(pixmap.size()); + case SP_MessageBoxInformation: + return infoIcon.pixmap(pixmap.size()); + default: + return pixmap; } - return pixmap; } QIcon ProxyStyle::standardIcon(StandardPixmap sp, const QStyleOption *opt, const QWidget *widget) const { - if (SP_LineEditClearButton==sp) { + switch (sp) { + #if !defined Q_OS_WIN && !defined Q_OS_MAC + case SP_LineEditClearButton: return editClearIcon; + #endif + case SP_MessageBoxCritical: + return errorIcon; + case SP_MessageBoxWarning: + return warningIcon; + case SP_MessageBoxQuestion: + return questionIcon; + case SP_MessageBoxInformation: + return infoIcon; + default: + return baseStyle()->standardIcon(sp, opt, widget); } - return baseStyle()->standardIcon(sp, opt, widget); } -#endif diff --git a/support/proxystyle.h b/support/proxystyle.h index ecd59fa4c..7f46e9ca1 100644 --- a/support/proxystyle.h +++ b/support/proxystyle.h @@ -48,16 +48,18 @@ public: int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const override; int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const override; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const override; - #if !defined Q_OS_WIN && !defined Q_OS_MAC QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt, const QWidget *widget) const override; QIcon standardIcon(StandardPixmap sp, const QStyleOption *opt, const QWidget *widget) const override; - #endif private: int modViewFrame; #if !defined Q_OS_WIN && !defined Q_OS_MAC QIcon editClearIcon; #endif + QIcon errorIcon; + QIcon warningIcon; + QIcon questionIcon; + QIcon infoIcon; }; #endif diff --git a/widgets/actionlabel.cpp b/widgets/actionlabel.cpp index 44969086a..97d43f5d7 100644 --- a/widgets/actionlabel.cpp +++ b/widgets/actionlabel.cpp @@ -61,7 +61,7 @@ ActionLabel::ActionLabel(QWidget *parent) setAlignment(Qt::AlignCenter); if(0==theUsageCount++) { - QImage img(Icons::self()->audioFileIcon.pixmap(iconSize, iconSize).toImage()); + QImage img(Icons::self()->audioListIcon.pixmap(iconSize, iconSize).toImage()); double increment=360.0/constNumIcons; for(int i=0; i