Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Elisa
Commits
a2905e1e
Commit
a2905e1e
authored
Nov 13, 2021
by
Andreas Kainz
🎯
Browse files
BUG 445357 Use media-default-album instead of media-optical-audio
parent
1d55d2e8
Pipeline
#97661
passed with stage
in 8 minutes and 9 seconds
Changes
6
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
a2905e1e
...
...
@@ -572,7 +572,7 @@ if (ANDROID)
media-repeat-none
media-repeat-single
media-repeat-all
media-
optical-audio
media-
default-album
player-volume-muted
player-volume
delete
...
...
src/models/trackmetadatamodel.cpp
View file @
a2905e1e
...
...
@@ -239,7 +239,7 @@ QString TrackMetadataModel::fileUrl() const
QUrl
TrackMetadataModel
::
coverUrl
()
const
{
if
(
mCoverImage
.
isEmpty
())
{
return
QUrl
(
QStringLiteral
(
"image://icon/media-
optical-audio
"
));
return
QUrl
(
QStringLiteral
(
"image://icon/media-
default-album
"
));
}
else
{
return
mCoverImage
;
}
...
...
src/qml/BaseTheme.qml
View file @
a2905e1e
...
...
@@ -8,13 +8,13 @@ import QtQuick 2.7
import
org
.
kde
.
kirigami
2.12
as
Kirigami
Item
{
property
string
defaultAlbumImage
:
'
image://icon/media-
optical-audio
'
property
string
defaultAlbumImage
:
'
image://icon/media-
default-album
'
property
string
defaultArtistImage
:
'
image://icon/view-media-artist
'
property
string
defaultBackgroundImage
:
'
qrc:///background.png
'
property
string
nowPlayingIcon
:
'
image://icon/view-media-lyrics
'
property
string
artistIcon
:
'
image://icon/view-media-artist
'
property
string
albumIcon
:
'
image://icon/view-media-album-cover
'
property
string
albumCoverIcon
:
'
image://icon/media-
optical-audio
'
property
string
albumCoverIcon
:
'
image://icon/media-
default-album
'
property
string
tracksIcon
:
'
image://icon/view-media-track
'
property
string
genresIcon
:
'
image://icon/view-media-genre
'
property
string
clearIcon
:
'
image://icon/edit-clear
'
...
...
src/upnp/upnpcontentdirectorymodel.cpp
View file @
a2905e1e
...
...
@@ -193,9 +193,9 @@ QVariant UpnpContentDirectoryModel::data(const QModelIndex &index, int role) con
result
=
d
->
mAllTrackData
[
index
.
internalId
()][
DataTypes
::
ImageUrlRole
].
toUrl
();
}
else
{
if
(
d
->
mUseLocalIcons
)
{
result
=
QUrl
(
QStringLiteral
(
"qrc:/media-
optical-audio
.svg"
));
result
=
QUrl
(
QStringLiteral
(
"qrc:/media-
default-album
.svg"
));
}
else
{
result
=
QUrl
(
QStringLiteral
(
"image://icon/media-
optical-audio
"
));
result
=
QUrl
(
QStringLiteral
(
"image://icon/media-
default-album
"
));
}
}
break
;
...
...
src/viewmanager.cpp
View file @
a2905e1e
...
...
@@ -72,7 +72,7 @@ public:
{
i18n
(
"Title"
),
i18n
(
"Genre"
),
i18n
(
"Year"
)},
Qt
::
AscendingOrder
,
{
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"Oldest First"
),
i18n
(
"Newest First"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
optical-audio
"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
default-album
"
)},
ViewManager
::
DelegateWithSecondaryText
,
ViewManager
::
ViewShowRating
,
ViewManager
::
IsFlatModel
}},
...
...
src/viewslistdata.cpp
View file @
a2905e1e
...
...
@@ -64,7 +64,7 @@ public:
{
i18n
(
"Title"
),
i18n
(
"Artist"
),
i18n
(
"Genre"
),
i18n
(
"Year"
)},
Qt
::
AscendingOrder
,
{
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"Oldest First"
),
i18n
(
"Newest First"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
optical-audio
"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
default-album
"
)},
ViewManager
::
DelegateWithSecondaryText
,
ViewManager
::
ViewShowRating
,
ViewManager
::
IsFlatModel
},
...
...
@@ -331,7 +331,7 @@ void ViewsListData::artistsAdded(const DataTypes::ListArtistDataType &newData)
oneArtist
.
databaseId
(),
ElisaUtils
::
Album
,
ElisaUtils
::
Artist
,
QUrl
{
QStringLiteral
(
"image://icon/media-
optical-audio
"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
default-album
"
)},
ViewManager
::
DelegateWithSecondaryText
,
ViewManager
::
ViewShowRating
});
}
...
...
@@ -566,7 +566,7 @@ void ViewsListData::refreshEmbeddedCategory()
{
i18n
(
"Title"
),
i18n
(
"Artist"
),
i18n
(
"Genre"
),
i18n
(
"Year"
)},
Qt
::
AscendingOrder
,
{
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"A-Z"
),
i18n
(
"Z-A"
),
i18n
(
"Oldest First"
),
i18n
(
"Newest First"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
optical-audio
"
)},
QUrl
{
QStringLiteral
(
"image://icon/media-
default-album
"
)},
ViewManager
::
DelegateWithSecondaryText
,
ViewManager
::
ViewShowRating
,
ViewManager
::
IsFlatModel
});
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment