iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

USe SVG icons for views

Browse Source
This commit is contained in:
craig.p.drummond
2014-04-16 17:49:50 +00:00
committed by craig.p.drummond
parent b6fd0973ce
commit ccfc1d0bf0
10 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/albumsmodel.cpp
View File

@@ -203,7 +203,7 @@ QModelIndex AlbumsModel::index(int row, int col, const QModelIndex &parent) cons
}
#ifdef ENABLE_UBUNTU
static const QString constDefaultCover="qrc:/album.png";
static const QString constDefaultCover=QLatin1String("qrc:/album.svg");
#endif
QVariant AlbumsModel::data(const QModelIndex &index, int role) const

10
models/dirviewmodel.cpp
View File

@@ -164,6 +164,10 @@ int DirViewModel::columnCount(const QModelIndex &) const
return 1;
}
#ifdef ENABLE_UBUNTU
static const QString constFolderIcon=QLatin1String("qrc:/folder.svg");
#endif
QVariant DirViewModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) {
@@ -175,12 +179,12 @@ QVariant DirViewModel::data(const QModelIndex &index, int role) const
switch (role) {
#ifdef ENABLE_UBUNTU
case ItemView::Role_Image:
return QString();
return DirViewItem::Type_Dir==item->type() ? constFolderIcon : QString();
#else
case Qt::DecorationRole: {
if (item->type() == DirViewItem::Type_Dir) {
if (DirViewItem::Type_Dir==item->type()) {
return Icons::self()->folderIcon;
} else if (item->type() == DirViewItem::Type_File) {
} else if (DirViewItem::Type_File==item->type()) {
return DirViewItemFile::Audio!=static_cast<DirViewItemFile *>(item)->fileType() ? Icons::self()->playlistIcon : Icons::self()->audioFileIcon;
}
break;

2
models/musiclibraryitemalbum.cpp
View File

@@ -45,7 +45,7 @@
static MusicLibraryItemAlbum::CoverSize coverSize=MusicLibraryItemAlbum::CoverNone;
#ifdef ENABLE_UBUNTU
static const QString constDefaultCover="qrc:/album.png";
static const QString constDefaultCover=QLatin1String("qrc:/album.svg");
#else
static QPixmap *theDefaultIcon=0;
#endif

4
models/musiclibraryitemartist.cpp
View File

@@ -55,8 +55,8 @@ bool MusicLibraryItemArtist::lessThan(const MusicLibraryItem *a, const MusicLibr
}
#ifdef ENABLE_UBUNTU
static const QString constDefaultCover="qrc:/artist.png";
static const QString constDefaultVariousCover="qrc:/variousartists.png";
static const QString constDefaultCover=QLatin1String("qrc:/artist.svg");
static const QString constDefaultVariousCover=QLatin1String("qrc:/variousartists.svg");
#else
static QPixmap *theDefaultIcon=0;
static QPixmap *theVariousArtistsIcon=0;

BIN
ubuntu/icons/items/album.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

22
ubuntu/icons/items/album.svg Normal file
View File

@@ -0,0 +1,22 @@
<svg id="svg3367" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs id="defs3369">
<linearGradient id="linearGradient3029" y2="14.203" gradientUnits="userSpaceOnUse" x2="35.391" gradientTransform="matrix(0,1.1714,-1.1714,0,51.06,-4.1145)" y1="32.416" x1="12.274">
<stop id="stop3265" stop-color="#dedbde" offset="0"/>
<stop id="stop3267" stop-color="#e6e6e6" offset=".5"/>
<stop id="stop3269" stop-color="#d2d2d2" offset="1"/>
</linearGradient>
<linearGradient id="linearGradient3031" y2="45.033" gradientUnits="userSpaceOnUse" x2="-21.916" gradientTransform="translate(50.265)" y1="3" x1="-21.916">
<stop id="stop3774" stop-color="#b4b4b4" offset="0"/>
<stop id="stop3776" stop-color="#969696" offset="1"/>
</linearGradient>
<linearGradient id="linearGradient3033" y2="32.509" gradientUnits="userSpaceOnUse" x2="21.448" gradientTransform="matrix(.9375 0 0 .9375 1.5 1.5)" y1="15.5" x1="21.448">
<stop id="stop3430" stop-color="#aaa" offset="0"/>
<stop id="stop3432" stop-color="#d4d4d4" offset="1"/>
</linearGradient>
</defs>
<g id="g3024" transform="matrix(2.9241 0 0 2.9241 -5.7724 -5.7724)">
<path id="path2781" fill="url(#linearGradient3029)" d="m44.5 24c0-11.363-9.137-20.5-20.5-20.5s-20.5 9.137-20.5 20.5 9.137 20.5 20.5 20.5 20.5-9.137 20.5-20.5zm-13 0c0 4.1281-3.2893 7.5-7.5 7.5-4.2933 0-7.5-3.4553-7.5-7.5 0-4.1273 3.0415-7.5 7.5-7.5s7.5 3.4545 7.5 7.5z" stroke="url(#linearGradient3031)"/>
<path id="path2474" opacity=".5" fill="#fff" d="m24 16c-4.416 0-8 3.584-8 8s3.584 8 8 8 8-3.584 8-8-3.584-8-8-8zm0 4c2.208 0 4 1.792 4 4s-1.792 4-4 4-4-1.792-4-4 1.792-4 4-4z"/>
<path id="path3418" stroke-linejoin="round" d="m24 16.5c-4.14 0-7.5 3.36-7.5 7.5s3.36 7.5 7.5 7.5 7.5-3.36 7.5-7.5-3.36-7.5-7.5-7.5zm0 3.75c2.07 0 3.75 1.68 3.75 3.75s-1.68 3.75-3.75 3.75-3.75-1.68-3.75-3.75 1.68-3.75 3.75-3.75z" stroke="url(#linearGradient3033)" fill="none"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

14
ubuntu/icons/items/artist.svg Normal file
View File

@@ -0,0 +1,14 @@
<svg id="svg1307" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs id="defs1309">
<radialGradient id="radialGradient4433" gradientUnits="userSpaceOnUse" cy="115.71" cx="63.912" gradientTransform="matrix(1 0 0 .19780 0 92.822)" r="63.912">
<stop id="stop3293-0" stop-color="#43ACE8" offset="0"/>
<stop id="stop3295-3" stop-color="#43ACE8" stop-opacity="0" offset="1"/>
</radialGradient>
</defs>
<g id="layer1">
<path id="path2276-8" d="m71.673 8.711v-2.0908 2.0908z" fill-opacity=".75688" fill="#fff"/>
<path id="path3289-7" opacity=".38140" d="m127.82 115.71a63.912 12.642 0 1 1 -127.82 0 63.912 12.642 0 1 1 127.82 0z" transform="matrix(.74813 0 0 .31172 33.798 61.811)" fill="url(#radialGradient4433)"/>
<path id="path2876" d="m63.75 15c-4.6296 0.05915-9.1134 2.2397-12.787 7.3353-10.128 2.7139-12.74 17.106-13.63 27.111-1.1308 12.711 5.3732 20.701 14.225 24.137-0.12897 1.4427-0.45014 2.6716-0.89213 3.4199-1.6632 2.8158-5.4393 5.2584-11.969 7.1123-7.2854 2.0684-13.064 4.0783-17.248 7.7566-3.7041 3.2565-6.0963 7.0221-6.0963 11.846 0 12.52 96.921 13.183 96.921 0 0-4.8235-2.3921-8.5891-6.0963-11.846-4.1376-3.6375-9.9158-5.7741-17.248-7.8557-6.5786-1.8677-10.352-4.2333-11.994-7.0132-0.54845-0.92852-0.88943-2.5716-0.9417-4.4855 8.0534-3.7619 14.425-11.025 15.365-21.733 1.489-16.999-13.72-35.962-27.609-35.785z" stroke-opacity=".20732" stroke="#000" stroke-width="1.586"/>
<path id="path2276" d="m38.379 25.541v-2.2697 2.2697z" fill-opacity=".75688" fill="#fff"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

25
ubuntu/icons/items/folder.svg Normal file
View File

@@ -0,0 +1,25 @@
<svg id="svg2906" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs id="defs2908">
<linearGradient id="linearGradient3039" y2="16.19" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(1.3408,0,0,1.33,-68.673,-1.51)" y1="13.183" x1="62.989">
<stop id="stop6406" stop-color="#f9f9f9" offset="0"/>
<stop id="stop6408" stop-color="#c9c9c9" offset="1"/>
</linearGradient>
<radialGradient id="radialGradient3041" gradientUnits="userSpaceOnUse" cy="5.0172" cx="3" gradientTransform="matrix(-1.7093e-8,2.28,-2.8952,-1.9417e-8,16.801,2.2898)" r="21">
<stop id="stop3486" stop-color="#bdbdbd" offset="0"/>
<stop id="stop3488" stop-color="#d0d0d0" offset="1"/>
</radialGradient>
<radialGradient id="radialGradient3043" gradientUnits="userSpaceOnUse" cy="14.113" cx="63.969" gradientTransform="matrix(2.0979,-1.262e-7,8.2824e-8,1.3475,-115.97,9.3537)" r="23.097">
<stop id="stop3618-2" stop-color="#edb763" offset="0"/>
<stop id="stop2559" stop-color="#de7f32" offset=".5"/>
<stop id="stop3620-1" stop-color="#d24413" offset="1"/>
</radialGradient>
<linearGradient id="linearGradient3045" y2="15.944" gradientUnits="userSpaceOnUse" x2="65.34" gradientTransform="matrix(1.3408,0,0,1.3265,-72.463,-1.6032)" y1="45.114" x1="82.453">
<stop id="stop3624-5" stop-color="#bb2b12" offset="0"/>
<stop id="stop3626-7" stop-color="#cd7233" offset="1"/>
</linearGradient>
</defs>
<g id="g3035" stroke-linejoin="round" stroke-linecap="round" transform="matrix(2.0162 0 0 2.0162 -1.0405 -9.2428)">
<path id="path2856" d="m5.2811 9.6095c-0.9255 0.0102-1.6447 0.6555-1.6447 1.5305 0 7.334 0.043 12.953 0 19.618 1.9246 0 56.896-4.936 56.896-7.054v-8.58c0-0.875-0.643-1.54-1.569-1.53h-27.158c-2.745 0-4.691-3.999-6.704-3.999l-19.82 0.0145z" stroke="url(#radialGradient3041)" fill="url(#linearGradient3039)"/>
<path id="path2866" d="m2.5259 20.468c-1.4382 0.164-0.8699 1.86-0.9846 2.814 0.5263 11.235 1.2577 22.244 1.7807 33.479 0.4584 1.281 2.1379 0.625 3.202 0.788h53.07c1.46-0.142 0.853-1.868 1.059-2.855 0.526-11.236 1.258-22.244 1.781-33.48-0.337-1.265-2.238-0.562-3.235-0.746h-56.673z" stroke="url(#linearGradient3045)" stroke-width=".99868" fill="url(#radialGradient3043)"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

13
ubuntu/icons/items/variousartists.svg Normal file
View File

@@ -0,0 +1,13 @@
<svg id="svg1307" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
<defs id="defs1309">
<radialGradient id="radialGradient2995" gradientUnits="userSpaceOnUse" cy="115.71" cx="63.912" gradientTransform="matrix(.74813 0 0 .061658 32.713 93.457)" r="63.912">
<stop id="stop3293-0" stop-color="#43ACE8" offset="0"/>
<stop id="stop3295-3" stop-color="#43ACE8" stop-opacity="0" offset="1"/>
</radialGradient>
</defs>
<path id="path2876-4" d="m79.947 13.799c-4.265 0.0544-8.395 2.0631-11.779 6.7574-9.33 2.5-11.736 15.757-12.556 24.973-1.0416 11.709 4.9496 19.069 13.103 22.234-0.11881 1.329-0.41466 2.4609-0.8218 3.1502-1.532 2.5938-5.0105 4.8438-11.026 6.5516-6.711 1.9053-12.034 3.7568-15.888 7.1451-3.4121 2.9998-5.6157 6.4685-5.6157 10.912 0 11.533 89.28 12.144 89.28 0 0-4.4432-2.2035-7.912-5.6157-10.912-3.8114-3.3507-9.134-5.3189-15.888-7.2364-6.0599-1.7204-9.5362-3.8996-11.049-6.4603-0.50521-0.85532-0.81931-2.3689-0.86746-4.1318 7.42-3.465 13.29-10.156 14.15-20.02 1.38-15.659-12.632-33.127-25.426-32.963z" stroke-opacity=".20732" stroke="#43ace8" stroke-width="1.461" fill="#43ace8"/>
<path id="path2276-8" d="m70.588 11.423v-2.0909 2.0909z" fill-opacity=".75688" fill="#fff"/>
<path id="path3289-7" opacity=".38140" d="m128.34 100.59a47.814 3.9408 0 1 1 -95.626 0 47.814 3.9408 0 1 1 95.626 0z" fill="url(#radialGradient2995)"/>
<path id="path2876" d="m52.12 22.172c-4.6296 0.05915-9.1134 2.2397-12.787 7.3353-10.128 2.7139-12.74 17.106-13.63 27.111-1.1308 12.711 5.3732 20.701 14.225 24.137-0.12897 1.4427-0.45014 2.6716-0.89213 3.4199-1.6632 2.8158-5.4393 5.2584-11.969 7.1123-7.2854 2.0684-13.064 4.0783-17.248 7.7566-3.7041 3.2565-6.0963 7.0221-6.0963 11.846 0 12.52 96.921 13.183 96.921 0 0-4.8235-2.3921-8.5891-6.0963-11.846-4.1376-3.6375-9.9158-5.7741-17.248-7.8557-6.5786-1.8677-10.352-4.2333-11.994-7.0132-0.54845-0.92852-0.88943-2.5716-0.9417-4.4855 8.0534-3.7619 14.425-11.025 15.365-21.733 1.489-16.999-13.72-35.962-27.609-35.785z" stroke-opacity=".20732" stroke="#000" stroke-width="1.586"/>
<path id="path2276" d="m37.294 28.253v-2.2697 2.2697z" fill-opacity=".75688" fill="#fff"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

7
ubuntu/ubuntu.qrc
View File

@@ -16,9 +16,10 @@
<file>icons/toolbar/media-skip-forward.svg</file>
<file>icons/toolbar/media-playback-pause.svg</file>
<file alias="icons/cantata.svg">../icons/cantata.svg</file>
<file alias="album.png">icons/items/album.png</file>
<file alias="artist.png">../icons/view-media-artist128.png</file>
<file alias="variousartists.png">../icons/hi128-action-cantata-view-media-artist-various.png</file>
<file alias="album.svg">icons/items/album.svg</file>
<file alias="artist.svg">icons/items/artist.svg</file>
<file alias="folder.svg">icons/items/folder.svg</file>
<file alias="variousartists.svg">icons/items/variousartists.svg</file>
<file>icons/toolbar/navigation-menu.svg</file>
<file>icons/toolbar/clear.svg</file>
<file>icons/toolbar/speaker.svg</file>