Skip to content
GitLab
Menu
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
130a6355
Commit
130a6355
authored
Aug 30, 2021
by
Nate Graham
Browse files
Rename "Radios" to "Radio Stations"
This is a more natural description of the feature.
BUG: 441732
FIXED-IN: 21.12
parent
792339e8
Pipeline
#77409
passed with stage
in 8 minutes and 36 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/viewsmodeltest.cpp
View file @
130a6355
...
...
@@ -323,7 +323,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
simpleSwitchToEmbeddedArtistCategory
()
...
...
@@ -368,7 +368,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
simpleSwitchToEmbeddedGenreCategory
()
...
...
@@ -413,7 +413,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Artists"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
simpleSwitchToEmbeddedAlbumCategoryWithoutDatabase
()
...
...
@@ -453,7 +453,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
simpleSwitchToEmbeddedArtistCategoryWithoutDatabase
()
...
...
@@ -493,7 +493,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
simpleSwitchToEmbeddedGenreCategoryWithoutDatabase
()
...
...
@@ -533,7 +533,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Artists"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
void
switchToEmbeddedAlbumCategoryAndToEmbeddedArtistCategory
()
...
...
@@ -579,7 +579,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
viewsModel
.
viewsData
()
->
setEmbeddedCategory
(
ElisaUtils
::
Album
);
...
...
@@ -599,7 +599,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"album1"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
9
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"album2"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
10
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"album3"
));
...
...
@@ -624,7 +624,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
4
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"artist1"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
9
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"artist1 and artist2"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
10
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"artist2"
));
...
...
@@ -652,7 +652,7 @@ private Q_SLOTS:
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
5
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Tracks"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
6
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Genres"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
7
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Files"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radios"
));
QCOMPARE
(
viewsModel
.
data
(
viewsModel
.
index
(
8
,
0
),
Qt
::
DisplayRole
),
QStringLiteral
(
"Radio
Station
s"
));
}
};
...
...
src/databaseinterface.cpp
View file @
130a6355
...
...
@@ -7148,7 +7148,7 @@ DataTypes::TrackDataType DatabaseInterface::buildRadioDataFromDatabaseRecord(con
result
[
DataTypes
::
TrackDataType
::
key_type
::
DatabaseIdRole
]
=
trackRecord
.
value
(
DatabaseInterfacePrivate
::
RadioId
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
TitleRole
]
=
trackRecord
.
value
(
DatabaseInterfacePrivate
::
RadioTitle
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
AlbumRole
]
=
i18n
(
"Radios"
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
AlbumRole
]
=
i18n
(
"Radio
Station
s"
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
ResourceRole
]
=
trackRecord
.
value
(
DatabaseInterfacePrivate
::
RadioHttpAddress
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
ImageUrlRole
]
=
trackRecord
.
value
(
DatabaseInterfacePrivate
::
RadioImageAddress
);
result
[
DataTypes
::
TrackDataType
::
key_type
::
RatingRole
]
=
trackRecord
.
value
(
DatabaseInterfacePrivate
::
RadioRating
);
...
...
src/qml/SettingsForm.qml
View file @
130a6355
...
...
@@ -161,7 +161,7 @@ ColumnLayout {
i18nc
(
"
Title of the view of all tracks
"
,
"
Tracks
"
),
i18nc
(
"
Title of the view of all genres
"
,
"
Genres
"
),
i18nc
(
"
Title of the file browser view
"
,
"
Files
"
),
i18nc
(
"
Title of the file radios browser view
"
,
"
Radios
"
),
i18nc
(
"
Title of the file radios browser view
"
,
"
Radio
Station
s
"
),
]
editable
:
false
...
...
src/viewslistdata.cpp
View file @
130a6355
...
...
@@ -129,7 +129,7 @@ public:
ViewManager
::
IsFlatModel
,
QUrl
::
fromLocalFile
(
QDir
::
homePath
())
},
{{
i18nc
(
"Title of the file radios browser view"
,
"Radios"
)},
{{
i18nc
(
"Title of the file radios browser view"
,
"Radio
Station
s"
)},
QUrl
{
QStringLiteral
(
"image://icon/radio"
)},
ViewManager
::
ListView
,
ViewManager
::
GenericDataModel
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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