From eb686e43dfe70ed61dad183c8dbfd4c73be9996e Mon Sep 17 00:00:00 2001 From: craig Date: Tue, 20 Mar 2012 21:13:18 +0000 Subject: [PATCH] Add #define for default cover icon names --- config.h.cmake | 2 ++ gui/mainwindow.cpp | 10 +++++----- models/albumsmodel.cpp | 4 ++-- models/devicesmodel.cpp | 2 +- models/musiclibraryitemalbum.cpp | 3 ++- models/musiclibrarymodel.cpp | 2 +- models/playlistsmodel.cpp | 2 +- models/streamsmodel.cpp | 2 +- widgets/groupedview.cpp | 5 +++-- widgets/listview.cpp | 3 ++- 10 files changed, 20 insertions(+), 15 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index 8849c83ba..78940a0e1 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -4,6 +4,8 @@ #define PACKAGE_NAME "@PROJECT_NAME@" #define PACKAGE_VERSION "@CANTATA_VERSION_FULL@" #define PACKAGE_STRING PACKAGE_NAME" "PACKAGE_VERSION +#define DEFAULT_ALBUM_ICON "media-optical-audio" +#define DEFAULT_STREAM_ICON "applications-internet" #cmakedefine ENABLE_DEVICES_SUPPORT 1 #cmakedefine COMPLEX_TAGLIB_FILENAME 1 diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 157519637..c53dbbb2a 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -513,8 +513,8 @@ MainWindow::MainWindow(QWidget *parent) positionSlider->setStyle(new ProxyStyle()); - noCover = Icon("media-optical-audio").pixmap(128, 128).scaled(coverWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); - noStreamCover = Icon("applications-internet").pixmap(128, 128).scaled(coverWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); + noCover = Icon(DEFAULT_ALBUM_ICON).pixmap(128, 128).scaled(coverWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); + noStreamCover = Icon(DEFAULT_STREAM_ICON).pixmap(128, 128).scaled(coverWidget->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation); coverWidget->setPixmap(noCover); playbackPlay = Icon("media-playback-start"); @@ -537,7 +537,7 @@ MainWindow::MainWindow(QWidget *parent) // burnAction->setIcon(Icon("tools-media-optical-burn")); // createDataCdAction->setIcon(Icon("media-optical")); -// createAudioCdAction->setIcon(Icon("media-optical-audio")); +// createAudioCdAction->setIcon(Icon(DEFAULT_ALBUM_ICON)); editTagsAction->setIcon(Icon("document-edit")); // QMenu *cdMenu=new QMenu(this); // cdMenu->addAction(createAudioCdAction); @@ -560,11 +560,11 @@ MainWindow::MainWindow(QWidget *parent) refreshAction->setIcon(Icon("view-refresh")); connectAction->setIcon(Icon("network-connect")); libraryTabAction->setIcon(Icon("audio-ac3")); - albumsTabAction->setIcon(Icon("media-optical-audio")); + albumsTabAction->setIcon(Icon(DEFAULT_ALBUM_ICON)); foldersTabAction->setIcon(Icon("inode-directory")); playlistsTabAction->setIcon(Icon("view-media-playlist")); lyricsTabAction->setIcon(Icon("view-media-lyrics")); - streamsTabAction->setIcon(Icon("applications-internet")); + streamsTabAction->setIcon(Icon(DEFAULT_STREAM_ICON)); #ifdef ENABLE_WEBKIT infoTabAction->setIcon(Icon("dialog-information")); #endif diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp index bbce7f305..8d5d15ce8 100644 --- a/models/albumsmodel.cpp +++ b/models/albumsmodel.cpp @@ -218,7 +218,7 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const int iSize=iconSize(); if (Qt::DecorationRole==role && 0==iSize) { - return QIcon::fromTheme("media-optical-audio"); + return QIcon::fromTheme(DEFAULT_ALBUM_ICON); } if (!theDefaultIcon) { @@ -227,7 +227,7 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const if (0==cSize) { cSize=stdSize=22; } - theDefaultIcon = new QPixmap(QIcon::fromTheme("media-optical-audio").pixmap(stdSize, stdSize) + theDefaultIcon = new QPixmap(QIcon::fromTheme(DEFAULT_ALBUM_ICON).pixmap(stdSize, stdSize) .scaled(QSize(cSize, cSize), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } if (!al->coverRequested && iSize) { diff --git a/models/devicesmodel.cpp b/models/devicesmodel.cpp index 1c3ab0ec4..32717ea2a 100644 --- a/models/devicesmodel.cpp +++ b/models/devicesmodel.cpp @@ -179,7 +179,7 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const } case MusicLibraryItem::Type_Album: if (MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize()) { - return QIcon::fromTheme("media-optical-audio"); + return QIcon::fromTheme(DEFAULT_ALBUM_ICON); } else { return static_cast(item)->cover(); } diff --git a/models/musiclibraryitemalbum.cpp b/models/musiclibraryitemalbum.cpp index cd0b245a0..a3e2d016b 100644 --- a/models/musiclibraryitemalbum.cpp +++ b/models/musiclibraryitemalbum.cpp @@ -30,6 +30,7 @@ #include "musiclibraryitemsong.h" #include "song.h" #include "covers.h" +#include "config.h" #include #include @@ -119,7 +120,7 @@ const QPixmap & MusicLibraryItemAlbum::cover() if (0==cSize) { cSize=22; } - theDefaultIcon = new QPixmap(QIcon::fromTheme("media-optical-audio").pixmap(cSize, cSize) + theDefaultIcon = new QPixmap(QIcon::fromTheme(DEFAULT_ALBUM_ICON).pixmap(cSize, cSize) .scaled(QSize(cSize, cSize), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } m_coverIsDefault = true; diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp index c26e096df..e1b718918 100644 --- a/models/musiclibrarymodel.cpp +++ b/models/musiclibrarymodel.cpp @@ -196,7 +196,7 @@ QVariant MusicLibraryModel::data(const QModelIndex &index, int role) const } case MusicLibraryItem::Type_Album: if (MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize()) { - return QIcon::fromTheme("media-optical-audio"); + return QIcon::fromTheme(DEFAULT_ALBUM_ICON); } else { return static_cast(item)->cover(); } diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp index 19a36794a..ad107f82a 100644 --- a/models/playlistsmodel.cpp +++ b/models/playlistsmodel.cpp @@ -275,7 +275,7 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const return text; } case Qt::DecorationRole: - return QIcon::fromTheme(s->title.isEmpty() ? "applications-internet" : "audio-x-generic"); + return QIcon::fromTheme(s->title.isEmpty() ? DEFAULT_STREAM_ICON : "audio-x-generic"); case ItemView::Role_MainText: return s->title.isEmpty() ? s->file : s->title; case ItemView::Role_SubText: diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index 19001a6a1..854913eaf 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -42,7 +42,7 @@ #include "config.h" const QLatin1String StreamsModel::constDefaultCategoryIcon("inode-directory"); -const QLatin1String StreamsModel::constDefaultStreamIcon("applications-internet"); +const QLatin1String StreamsModel::constDefaultStreamIcon(DEFAULT_STREAM_ICON); static bool iconIsValid(const QString &icon) { diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp index ea92c0022..c616002ff 100644 --- a/widgets/groupedview.cpp +++ b/widgets/groupedview.cpp @@ -27,6 +27,7 @@ #include "song.h" #include "actionitemdelegate.h" #include "itemview.h" +#include "config.h" #include #include #include @@ -243,7 +244,7 @@ public: pix=index.data(Qt::DecorationRole).value().pixmap(constCoverSize, constCoverSize); } else { QPixmap *cover=Covers::self()->get(song, constCoverSize); - pix=cover ? *cover : QIcon::fromTheme(stream ? "applications-internet" : "media-optical-audio").pixmap(constCoverSize, constCoverSize); + pix=cover ? *cover : QIcon::fromTheme(stream ? DEFAULT_STREAM_ICON : DEFAULT_ALBUM_ICON).pixmap(constCoverSize, constCoverSize); } if (rtl) { @@ -525,7 +526,7 @@ void GroupedView::dropEvent(QDropEvent *event) QModelIndex parent; quint32 dropRowAdjust=0; if (model() && viewport()->rect().contains(event->pos())) { - // Dont allow to drop on an already selected row - as this seems to cause a crash!!! + // Dont allow to drop on an already selected row - as this seems to cuase a crash!!! QModelIndex idx=TreeView::indexAt(event->pos()); if (idx.isValid() && selectionModel() && selectionModel()->isSelected(idx)) { return; diff --git a/widgets/listview.cpp b/widgets/listview.cpp index 6c8e7034e..e100caaba 100644 --- a/widgets/listview.cpp +++ b/widgets/listview.cpp @@ -22,6 +22,7 @@ */ #include "listview.h" +#include "config.h" #include #include #include @@ -77,7 +78,7 @@ void ListView::startDrag(Qt::DropActions supportedActions) QDrag *drag = new QDrag(this); drag->setMimeData(data); if (indexes.count()>1) { - drag->setPixmap(QIcon::fromTheme("media-optical-audio").pixmap(64, 64)); + drag->setPixmap(QIcon::fromTheme(DEFAULT_ALBUM_ICON).pixmap(64, 64)); } else { drag->setPixmap(QPixmap::fromImage(model()->data(indexes.first(), Qt::DecorationRole).value() .scaled(QSize(64, 64), Qt::KeepAspectRatio, Qt::SmoothTransformation)));