dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to QStringLiteral operator

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-20 06:38:55 +02:00
parent 722035913e
commit ef9ef63f02
202 changed files with 2036 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/playlist/dynamicplaylistcontrols.cpp
View File

@@ -41,7 +41,7 @@ DynamicPlaylistControls::DynamicPlaylistControls(QWidget *parent)
QObject::connect(ui_->repopulate, &QPushButton::clicked, this, &DynamicPlaylistControls::Repopulate);
QObject::connect(ui_->off, &QPushButton::clicked, this, &DynamicPlaylistControls::TurnOff);
QFile stylesheet_file(QStringLiteral(":/style/dynamicplaylistcontrols.css"));
QFile stylesheet_file(u":/style/dynamicplaylistcontrols.css"_s);
if (stylesheet_file.open(QIODevice::ReadOnly)) {
QString stylesheet = QString::fromLatin1(stylesheet_file.readAll());
stylesheet_file.close();

2
src/playlist/playlist.cpp
View File

@@ -782,7 +782,7 @@ Qt::ItemFlags Playlist::flags(const QModelIndex &idx) const {
QStringList Playlist::mimeTypes() const {
return QStringList() << QStringLiteral("text/uri-list") << QLatin1String(kRowsMimetype);
return QStringList() << u"text/uri-list"_s << QLatin1String(kRowsMimetype);
}

82
src/playlist/playlistbackend.cpp
View File

@@ -115,10 +115,10 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl
QStringList condition_list;
if (flags & GetPlaylistsFlags::GetPlaylists_OpenInUi) {
condition_list << QStringLiteral("ui_order != -1");
condition_list << u"ui_order != -1"_s;
}
if (flags & GetPlaylistsFlags::GetPlaylists_Favorite) {
condition_list << QStringLiteral("is_favorite != 0");
condition_list << u"is_favorite != 0"_s;
}
QString condition;
if (!condition_list.isEmpty()) {
@@ -126,7 +126,7 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl
}
SqlQuery q(db);
q.prepare(QStringLiteral("SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists ") + condition + QStringLiteral(" ORDER BY ui_order"));
q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists "_s + condition + u" ORDER BY ui_order"_s);
if (!q.Exec()) {
db_->ReportErrors(q);
return ret;
@@ -156,9 +156,9 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) {
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists WHERE ROWID=:id"));
q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists WHERE ROWID=:id"_s);
q.BindValue(QStringLiteral(":id"), id);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
return Playlist();
@@ -196,7 +196,7 @@ PlaylistItemPtrList PlaylistBackend::GetPlaylistItems(const int playlist) {
// Forward iterations only may be faster
q.setForwardOnly(true);
q.prepare(query);
q.BindValue(QStringLiteral(":playlist"), playlist);
q.BindValue(u":playlist"_s, playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return PlaylistItemPtrList();
@@ -226,13 +226,13 @@ SongList PlaylistBackend::GetPlaylistSongs(const int playlist) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
QString query = QStringLiteral("SELECT %1, %2, p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist").arg(Song::JoinSpec(QStringLiteral("songs")), Song::JoinSpec(QStringLiteral("p")));
QString query = QStringLiteral("SELECT %1, %2, p.type FROM playlist_items AS p LEFT JOIN songs ON p.collection_id = songs.ROWID WHERE p.playlist = :playlist").arg(Song::JoinSpec(u"songs"_s), Song::JoinSpec(u"p"_s));
SqlQuery q(db);
// Forward iterations only may be faster
q.setForwardOnly(true);
q.prepare(query);
q.BindValue(QStringLiteral(":playlist"), playlist);
q.BindValue(u":playlist"_s, playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return SongList();
@@ -344,8 +344,8 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
// Clear the existing items in the playlist
{
SqlQuery q(db);
q.prepare(QStringLiteral("DELETE FROM playlist_items WHERE playlist = :playlist"));
q.BindValue(QStringLiteral(":playlist"), playlist);
q.prepare(u"DELETE FROM playlist_items WHERE playlist = :playlist"_s);
q.BindValue(u":playlist"_s, playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -355,8 +355,8 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
// Save the new ones
for (PlaylistItemPtr item : items) { // clazy:exclude=range-loop-reference
SqlQuery q(db);
q.prepare(QStringLiteral("INSERT INTO playlist_items (playlist, type, collection_id, ") + Song::kColumnSpec + QStringLiteral(") VALUES (:playlist, :type, :collection_id, ") + Song::kBindSpec + QStringLiteral(")"));
q.BindValue(QStringLiteral(":playlist"), playlist);
q.prepare(u"INSERT INTO playlist_items (playlist, type, collection_id, "_s + Song::kColumnSpec + u") VALUES (:playlist, :type, :collection_id, "_s + Song::kBindSpec + u")"_s);
q.BindValue(u":playlist"_s, playlist);
item->BindToQuery(&q);
if (!q.Exec()) {
@@ -368,19 +368,19 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item
// Update the last played track number
{
SqlQuery q(db);
q.prepare(QStringLiteral("UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend WHERE ROWID=:playlist"));
q.BindValue(QStringLiteral(":last_played"), last_played);
q.prepare(u"UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend WHERE ROWID=:playlist"_s);
q.BindValue(u":last_played"_s, last_played);
if (dynamic) {
q.BindValue(QStringLiteral(":dynamic_type"), static_cast<int>(dynamic->type()));
q.BindValue(QStringLiteral(":dynamic_data"), dynamic->Save());
q.BindValue(QStringLiteral(":dynamic_backend"), dynamic->collection()->songs_table());
q.BindValue(u":dynamic_type"_s, static_cast<int>(dynamic->type()));
q.BindValue(u":dynamic_data"_s, dynamic->Save());
q.BindValue(u":dynamic_backend"_s, dynamic->collection()->songs_table());
}
else {
q.BindValue(QStringLiteral(":dynamic_type"), 0);
q.BindValue(QStringLiteral(":dynamic_data"), QByteArray());
q.BindValue(QStringLiteral(":dynamic_backend"), QString());
q.BindValue(u":dynamic_type"_s, 0);
q.BindValue(u":dynamic_data"_s, QByteArray());
q.BindValue(u":dynamic_backend"_s, QString());
}
q.BindValue(QStringLiteral(":playlist"), playlist);
q.BindValue(u":playlist"_s, playlist);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -397,9 +397,9 @@ int PlaylistBackend::CreatePlaylist(const QString &name, const QString &special_
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("INSERT INTO playlists (name, special_type) VALUES (:name, :special_type)"));
q.BindValue(QStringLiteral(":name"), name);
q.BindValue(QStringLiteral(":special_type"), special_type);
q.prepare(u"INSERT INTO playlists (name, special_type) VALUES (:name, :special_type)"_s);
q.BindValue(u":name"_s, name);
q.BindValue(u":special_type"_s, special_type);
if (!q.Exec()) {
db_->ReportErrors(q);
return -1;
@@ -418,8 +418,8 @@ void PlaylistBackend::RemovePlaylist(int id) {
{
SqlQuery q(db);
q.prepare(QStringLiteral("DELETE FROM playlists WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":id"), id);
q.prepare(u"DELETE FROM playlists WHERE ROWID=:id"_s);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -428,8 +428,8 @@ void PlaylistBackend::RemovePlaylist(int id) {
{
SqlQuery q(db);
q.prepare(QStringLiteral("DELETE FROM playlist_items WHERE playlist=:id"));
q.BindValue(QStringLiteral(":id"), id);
q.prepare(u"DELETE FROM playlist_items WHERE playlist=:id"_s);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -445,9 +445,9 @@ void PlaylistBackend::RenamePlaylist(const int id, const QString &new_name) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("UPDATE playlists SET name=:name WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":name"), new_name);
q.BindValue(QStringLiteral(":id"), id);
q.prepare(u"UPDATE playlists SET name=:name WHERE ROWID=:id"_s);
q.BindValue(u":name"_s, new_name);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
@@ -460,9 +460,9 @@ void PlaylistBackend::FavoritePlaylist(const int id, const bool is_favorite) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("UPDATE playlists SET is_favorite=:is_favorite WHERE ROWID=:id"));
q.BindValue(QStringLiteral(":is_favorite"), is_favorite ? 1 : 0);
q.BindValue(QStringLiteral(":id"), id);
q.prepare(u"UPDATE playlists SET is_favorite=:is_favorite WHERE ROWID=:id"_s);
q.BindValue(u":is_favorite"_s, is_favorite ? 1 : 0);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
@@ -477,16 +477,16 @@ void PlaylistBackend::SetPlaylistOrder(const QList<int> &ids) {
ScopedTransaction transaction(&db);
SqlQuery q(db);
q.prepare(QStringLiteral("UPDATE playlists SET ui_order=-1"));
q.prepare(u"UPDATE playlists SET ui_order=-1"_s);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
}
q.prepare(QStringLiteral("UPDATE playlists SET ui_order=:index WHERE ROWID=:id"));
q.prepare(u"UPDATE playlists SET ui_order=:index WHERE ROWID=:id"_s);
for (int i = 0; i < ids.count(); ++i) {
q.BindValue(QStringLiteral(":index"), i);
q.BindValue(QStringLiteral(":id"), ids[i]);
q.BindValue(u":index"_s, i);
q.BindValue(u":id"_s, ids[i]);
if (!q.Exec()) {
db_->ReportErrors(q);
return;
@@ -502,12 +502,12 @@ void PlaylistBackend::SetPlaylistUiPath(const int id, const QString &path) {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
SqlQuery q(db);
q.prepare(QStringLiteral("UPDATE playlists SET ui_path=:path WHERE ROWID=:id"));
q.prepare(u"UPDATE playlists SET ui_path=:path WHERE ROWID=:id"_s);
ScopedTransaction transaction(&db);
q.BindValue(QStringLiteral(":path"), path);
q.BindValue(QStringLiteral(":id"), id);
q.BindValue(u":path"_s, path);
q.BindValue(u":id"_s, id);
if (!q.Exec()) {
db_->ReportErrors(q);
return;

12
src/playlist/playlistcontainer.cpp
View File

@@ -61,6 +61,8 @@
#include "widgets/searchfield.h"
#include "settings/appearancesettingspage.h"
using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kSettingsGroup[] = "Playlist";
constexpr int kFilterDelayMs = 100;
@@ -97,7 +99,7 @@ PlaylistContainer::PlaylistContainer(QWidget *parent)
no_matches_label_->setPalette(no_matches_palette);
// Remove QFrame border
ui_->toolbar->setStyleSheet(QStringLiteral("QFrame { border: 0px; }"));
ui_->toolbar->setStyleSheet(u"QFrame { border: 0px; }"_s);
// Make it bold
QFont no_matches_font = no_matches_label_->font();
@@ -228,9 +230,9 @@ void PlaylistContainer::SetViewModel(Playlist *playlist, const int scroll_positi
delete redo_;
undo_ = playlist->undo_stack()->createUndoAction(this, tr("Undo"));
redo_ = playlist->undo_stack()->createRedoAction(this, tr("Redo"));
undo_->setIcon(IconLoader::Load(QStringLiteral("edit-undo")));
undo_->setIcon(IconLoader::Load(u"edit-undo"_s));
undo_->setShortcut(QKeySequence::Undo);
redo_->setIcon(IconLoader::Load(QStringLiteral("edit-redo")));
redo_->setIcon(IconLoader::Load(u"edit-redo"_s));
redo_->setShortcut(QKeySequence::Redo);
ui_->undo->setDefaultAction(undo_);
@@ -279,11 +281,11 @@ void PlaylistContainer::FocusSearchField() {
}
void PlaylistContainer::ActivePlaying() {
UpdateActiveIcon(QIcon(QStringLiteral(":/pictures/tiny-play.png")));
UpdateActiveIcon(QIcon(u":/pictures/tiny-play.png"_s));
}
void PlaylistContainer::ActivePaused() {
UpdateActiveIcon(QIcon(QStringLiteral(":/pictures/tiny-pause.png")));
UpdateActiveIcon(QIcon(u":/pictures/tiny-pause.png"_s));
}
void PlaylistContainer::ActiveStopped() { UpdateActiveIcon(QIcon()); }

16
src/playlist/playlistdelegates.cpp
View File

@@ -114,7 +114,7 @@ void QueuedItemDelegate::DrawBox(QPainter *painter, const QRect line_rect, const
smaller.setBold(true);
if (width == -1) {
width = QFontMetrics(font).horizontalAdvance(text + QStringLiteral(" "));
width = QFontMetrics(font).horizontalAdvance(text + u" "_s);
}
QRect rect(line_rect);
@@ -387,13 +387,13 @@ TagCompletionModel::TagCompletionModel(SharedPtr<CollectionBackend> backend, con
QString TagCompletionModel::database_column(const Playlist::Column column) {
switch (column) {
case Playlist::Column::Artist: return QStringLiteral("artist");
case Playlist::Column::Album: return QStringLiteral("album");
case Playlist::Column::AlbumArtist: return QStringLiteral("albumartist");
case Playlist::Column::Composer: return QStringLiteral("composer");
case Playlist::Column::Performer: return QStringLiteral("performer");
case Playlist::Column::Grouping: return QStringLiteral("grouping");
case Playlist::Column::Genre: return QStringLiteral("genre");
case Playlist::Column::Artist: return u"artist"_s;
case Playlist::Column::Album: return u"album"_s;
case Playlist::Column::AlbumArtist: return u"albumartist"_s;
case Playlist::Column::Composer: return u"composer"_s;
case Playlist::Column::Performer: return u"performer"_s;
case Playlist::Column::Grouping: return u"grouping"_s;
case Playlist::Column::Genre: return u"genre"_s;
default:
qLog(Warning) << "Unknown column" << static_cast<int>(column);
return QString();

5
src/playlist/playlistitem.cpp
View File

@@ -38,6 +38,7 @@
#include "radios/radioplaylistitem.h"
using std::make_shared;
using namespace Qt::Literals::StringLiterals;
PlaylistItemPtr PlaylistItem::NewFromSource(const Song::Source source) {
@@ -93,8 +94,8 @@ PlaylistItem::~PlaylistItem() = default;
void PlaylistItem::BindToQuery(SqlQuery *query) const {
query->BindValue(QStringLiteral(":type"), static_cast<int>(source_));
query->BindValue(QStringLiteral(":collection_id"), DatabaseValue(Column_CollectionId));
query->BindValue(u":type"_s, static_cast<int>(source_));
query->BindValue(u":collection_id"_s, DatabaseValue(Column_CollectionId));
DatabaseSongMetadata().BindToQuery(query);

15
src/playlist/playlistlistcontainer.cpp
View File

@@ -66,6 +66,7 @@
#endif
using std::make_unique;
using namespace Qt::Literals::StringLiterals;
PlaylistListContainer::PlaylistListContainer(QWidget *parent)
: QWidget(parent),
@@ -169,14 +170,14 @@ void PlaylistListContainer::showEvent(QShowEvent *e) {
if (!loaded_icons_) {
loaded_icons_ = true;
action_new_folder_->setIcon(IconLoader::Load(QStringLiteral("folder-new")));
action_remove_->setIcon(IconLoader::Load(QStringLiteral("edit-delete")));
action_save_playlist_->setIcon(IconLoader::Load(QStringLiteral("document-save")));
action_new_folder_->setIcon(IconLoader::Load(u"folder-new"_s));
action_remove_->setIcon(IconLoader::Load(u"edit-delete"_s));
action_save_playlist_->setIcon(IconLoader::Load(u"document-save"_s));
#ifndef Q_OS_WIN
action_copy_to_device_->setIcon(IconLoader::Load(QStringLiteral("device")));
action_copy_to_device_->setIcon(IconLoader::Load(u"device"_s));
#endif
model_->SetIcons(IconLoader::Load(QStringLiteral("view-media-playlist")), IconLoader::Load(QStringLiteral("folder")));
model_->SetIcons(IconLoader::Load(u"view-media-playlist"_s), IconLoader::Load(u"folder"_s));
// Apply these icons to items that have already been created.
RecursivelySetIcons(model_->invisibleRootItem());
@@ -500,7 +501,7 @@ void PlaylistListContainer::contextMenuEvent(QContextMenuEvent *e) {
void PlaylistListContainer::ActivePlaying() {
if (padded_play_icon_.isNull()) {
QPixmap pixmap(QStringLiteral(":/pictures/tiny-play.png"));
QPixmap pixmap(u":/pictures/tiny-play.png"_s);
QPixmap new_pixmap(QSize(pixmap.height(), pixmap.height()));
new_pixmap.fill(Qt::transparent);
@@ -515,7 +516,7 @@ void PlaylistListContainer::ActivePlaying() {
}
void PlaylistListContainer::ActivePaused() {
UpdateActiveIcon(active_playlist_id_, QIcon(QStringLiteral(":/pictures/tiny-pause.png")));
UpdateActiveIcon(active_playlist_id_, QIcon(u":/pictures/tiny-pause.png"_s));
}
void PlaylistListContainer::ActiveStopped() {

4
src/playlist/playlistproxystyle.cpp
View File

@@ -30,6 +30,8 @@
#include "playlistproxystyle.h"
#include "playlist.h"
using namespace Qt::Literals::StringLiterals;
PlaylistProxyStyle::PlaylistProxyStyle(const QString &style) : QProxyStyle(style), common_style_(new QCommonStyle) {}
void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const {
@@ -41,7 +43,7 @@ void PlaylistProxyStyle::drawControl(ControlElement element, const QStyleOption
const QFontMetrics &font_metrics = header_option->fontMetrics;
// Spaces added to make transition less abrupt
if (rect.width() < font_metrics.horizontalAdvance(text + QStringLiteral(" "))) {
if (rect.width() < font_metrics.horizontalAdvance(text + u" "_s)) {
const Playlist::Column column = static_cast<Playlist::Column>(header_option->section);
QStyleOptionHeader new_option(*header_option);
new_option.text = Playlist::abbreviated_column_name(column);

18
src/playlist/playlistsequence.cpp
View File

@@ -39,6 +39,8 @@
#include "playlistsequence.h"
#include "ui_playlistsequence.h"
using namespace Qt::Literals::StringLiterals;
namespace {
constexpr char kSettingsGroup[] = "PlaylistSequence";
}
@@ -56,12 +58,12 @@ PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
ui_->setupUi(this);
// Icons
ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load(QStringLiteral("media-playlist-repeat"))));
ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle"))));
ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-repeat"_s)));
ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-shuffle"_s)));
// Remove arrow indicators
ui_->repeat->setStyleSheet(QStringLiteral("QToolButton::menu-indicator { image: none; }"));
ui_->shuffle->setStyleSheet(QStringLiteral("QToolButton::menu-indicator { image: none; }"));
ui_->repeat->setStyleSheet(u"QToolButton::menu-indicator { image: none; }"_s);
ui_->shuffle->setStyleSheet(u"QToolButton::menu-indicator { image: none; }"_s);
settings_->set_group(kSettingsGroup);
@@ -97,8 +99,8 @@ PlaylistSequence::~PlaylistSequence() {
void PlaylistSequence::Load() {
loading_ = true; // Stops these setter functions calling Save()
SetShuffleMode(static_cast<ShuffleMode>(settings_->value(QStringLiteral("shuffle_mode"), static_cast<int>(ShuffleMode::Off)).toInt()));
SetRepeatMode(static_cast<RepeatMode>(settings_->value(QStringLiteral("repeat_mode"), static_cast<int>(RepeatMode::Off)).toInt()));
SetShuffleMode(static_cast<ShuffleMode>(settings_->value(u"shuffle_mode"_s, static_cast<int>(ShuffleMode::Off)).toInt()));
SetRepeatMode(static_cast<RepeatMode>(settings_->value(u"repeat_mode"_s, static_cast<int>(RepeatMode::Off)).toInt()));
loading_ = false;
}
@@ -107,8 +109,8 @@ void PlaylistSequence::Save() {
if (loading_) return;
settings_->setValue(QStringLiteral("shuffle_mode"), static_cast<int>(shuffle_mode_));
settings_->setValue(QStringLiteral("repeat_mode"), static_cast<int>(repeat_mode_));
settings_->setValue(u"shuffle_mode"_s, static_cast<int>(shuffle_mode_));
settings_->setValue(u"repeat_mode"_s, static_cast<int>(repeat_mode_));
}

10
src/playlist/playlisttabbar.cpp
View File

@@ -81,10 +81,10 @@ PlaylistTabBar::PlaylistTabBar(QWidget *parent)
setUsesScrollButtons(true);
setTabsClosable(true);
action_star_ = menu_->addAction(IconLoader::Load(QStringLiteral("star")), tr("Star playlist"), this, &PlaylistTabBar::StarSlot);
action_close_ = menu_->addAction(IconLoader::Load(QStringLiteral("list-remove")), tr("Close playlist"), this, &PlaylistTabBar::CloseSlot);
action_rename_ = menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Rename playlist..."), this, &PlaylistTabBar::RenameSlot);
action_save_ = menu_->addAction(IconLoader::Load(QStringLiteral("document-save")), tr("Save playlist..."), this, &PlaylistTabBar::SaveSlot);
action_star_ = menu_->addAction(IconLoader::Load(u"star"_s), tr("Star playlist"), this, &PlaylistTabBar::StarSlot);
action_close_ = menu_->addAction(IconLoader::Load(u"list-remove"_s), tr("Close playlist"), this, &PlaylistTabBar::CloseSlot);
action_rename_ = menu_->addAction(IconLoader::Load(u"edit-rename"_s), tr("Rename playlist..."), this, &PlaylistTabBar::RenameSlot);
action_save_ = menu_->addAction(IconLoader::Load(u"document-save"_s), tr("Save playlist..."), this, &PlaylistTabBar::SaveSlot);
menu_->addSeparator();
rename_editor_->setVisible(false);
@@ -228,7 +228,7 @@ void PlaylistTabBar::CloseSlot() {
if (ask_for_delete && !manager_->IsPlaylistFavorite(playlist_id) && !manager_->playlist(playlist_id)->GetAllSongs().empty()) {
QMessageBox confirmation_box;
confirmation_box.setWindowIcon(QIcon(QStringLiteral(":/icons/64x64/strawberry.png")));
confirmation_box.setWindowIcon(QIcon(u":/icons/64x64/strawberry.png"_s));
confirmation_box.setWindowTitle(tr("Remove playlist"));
confirmation_box.setIcon(QMessageBox::Question);
confirmation_box.setText(

14
src/playlist/playlistview.cpp
View File

@@ -128,8 +128,8 @@ PlaylistView::PlaylistView(QWidget *parent)
inhibit_autoscroll_(false),
currently_autoscrolling_(false),
row_height_(-1),
currenttrack_play_(QStringLiteral(":/pictures/currenttrack_play.png")),
currenttrack_pause_(QStringLiteral(":/pictures/currenttrack_pause.png")),
currenttrack_play_(u":/pictures/currenttrack_play.png"_s),
currenttrack_pause_(u":/pictures/currenttrack_pause.png"_s),
cached_current_row_row_(-1),
drop_indicator_row_(-1),
drag_over_(false),
@@ -415,9 +415,9 @@ void PlaylistView::RestoreHeaderState() {
void PlaylistView::ReloadBarPixmaps() {
currenttrack_bar_left_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_left.png"), true);
currenttrack_bar_mid_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_mid.png"), false);
currenttrack_bar_right_ = LoadBarPixmap(QStringLiteral(":/pictures/currenttrack_bar_right.png"), true);
currenttrack_bar_left_ = LoadBarPixmap(u":/pictures/currenttrack_bar_left.png"_s, true);
currenttrack_bar_mid_ = LoadBarPixmap(u":/pictures/currenttrack_bar_mid.png"_s, false);
currenttrack_bar_right_ = LoadBarPixmap(u":/pictures/currenttrack_bar_right.png"_s, true);
}
@@ -463,8 +463,8 @@ QList<QPixmap> PlaylistView::LoadBarPixmap(const QString &filename, const bool k
void PlaylistView::LoadTinyPlayPausePixmaps(const int desired_size) {
QImage image_play = QImage(QStringLiteral(":/pictures/tiny-play.png")).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_pause = QImage(QStringLiteral(":/pictures/tiny-pause.png")).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_play = QImage(u":/pictures/tiny-play.png"_s).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage image_pause = QImage(u":/pictures/tiny-pause.png"_s).scaled(desired_size, desired_size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
pixmap_tinyplay_ = QPixmap::fromImage(image_play);
pixmap_tinypause_ = QPixmap::fromImage(image_pause);