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

10
src/settings/appearancesettingspage.cpp
View File

@@ -52,6 +52,8 @@
#include "settingsdialog.h"
#include "ui_appearancesettingspage.h"
using namespace Qt::Literals::StringLiterals;
const char *AppearanceSettingsPage::kSettingsGroup = "Appearance";
const char *AppearanceSettingsPage::kStyle = "style";
@@ -90,9 +92,9 @@ AppearanceSettingsPage::AppearanceSettingsPage(SettingsDialog *dialog, QWidget *
background_image_type_(BackgroundImageType::Default) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("view-media-visualization"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"view-media-visualization"_s, true, 0, 32));
ui_->combobox_style->addItem(QStringLiteral("default"), QStringLiteral("default"));
ui_->combobox_style->addItem(u"default"_s, u"default"_s);
const QStringList styles = QStyleFactory::keys();
for (const QString &style : styles) {
ui_->combobox_style->addItem(style, style);
@@ -146,7 +148,7 @@ void AppearanceSettingsPage::Load() {
Settings s;
s.beginGroup(kSettingsGroup);
ComboBoxLoadFromSettings(s, ui_->combobox_style, QLatin1String(kStyle), QStringLiteral("default"));
ComboBoxLoadFromSettings(s, ui_->combobox_style, QLatin1String(kStyle), u"default"_s);
#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
ui_->checkbox_system_icons->setChecked(s.value(kSystemThemeIcons, false).toBool());
@@ -301,7 +303,7 @@ void AppearanceSettingsPage::UpdateColorSelectorColor(QWidget *color_selector, c
void AppearanceSettingsPage::SelectBackgroundImage() {
QString selected_filename = QFileDialog::getOpenFileName(this, tr("Select background image"), background_image_filename_, tr(AlbumCoverChoiceController::kLoadImageFileFilter) + QStringLiteral(";;") + tr(AlbumCoverChoiceController::kAllFilesFilter));
QString selected_filename = QFileDialog::getOpenFileName(this, tr("Select background image"), background_image_filename_, tr(AlbumCoverChoiceController::kLoadImageFileFilter) + u";;"_s + tr(AlbumCoverChoiceController::kAllFilesFilter));
if (selected_filename.isEmpty()) return;
background_image_filename_ = selected_filename;
ui_->background_image_filename->setText(background_image_filename_);

32
src/settings/backendsettingspage.cpp
View File

@@ -57,6 +57,8 @@
#include "settingsdialog.h"
#include "ui_backendsettingspage.h"
using namespace Qt::Literals::StringLiterals;
const char *BackendSettingsPage::kSettingsGroup = "Backend";
const qint64 BackendSettingsPage::kDefaultBufferDuration = 4000;
const double BackendSettingsPage::kDefaultBufferLowWatermark = 0.33;
@@ -65,10 +67,10 @@ const double BackendSettingsPage::kDefaultBufferHighWatermark = 0.99;
namespace {
constexpr char kOutputAutomaticallySelect[] = "Automatically select";
constexpr char kOutputCustom[] = "Custom";
static const QRegularExpression kRegex_ALSA_HW(QStringLiteral("^hw:.*"));
static const QRegularExpression kRegex_ALSA_PlugHW(QStringLiteral("^plughw:.*"));
static const QRegularExpression kRegex_ALSA_PCM_Card(QStringLiteral("^.*:.*CARD=.*"));
static const QRegularExpression kRegex_ALSA_PCM_Dev(QStringLiteral("^.*:.*DEV=.*"));
static const QRegularExpression kRegex_ALSA_HW(u"^hw:.*"_s);
static const QRegularExpression kRegex_ALSA_PlugHW(u"^plughw:.*"_s);
static const QRegularExpression kRegex_ALSA_PCM_Card(u"^.*:.*CARD=.*"_s);
static const QRegularExpression kRegex_ALSA_PCM_Dev(u"^.*:.*DEV=.*"_s);
} // namespace
BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -79,12 +81,12 @@ BackendSettingsPage::BackendSettingsPage(SettingsDialog *dialog, QWidget *parent
enginetype_current_(EngineBase::Type::None) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("soundcard"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"soundcard"_s, true, 0, 32));
ui_->label_replaygainpreamp->setMinimumWidth(QFontMetrics(ui_->label_replaygainpreamp->font()).horizontalAdvance(QStringLiteral("-WW.W dB")));
ui_->label_replaygainfallbackgain->setMinimumWidth(QFontMetrics(ui_->label_replaygainfallbackgain->font()).horizontalAdvance(QStringLiteral("-WW.W dB")));
ui_->label_replaygainpreamp->setMinimumWidth(QFontMetrics(ui_->label_replaygainpreamp->font()).horizontalAdvance(u"-WW.W dB"_s));
ui_->label_replaygainfallbackgain->setMinimumWidth(QFontMetrics(ui_->label_replaygainfallbackgain->font()).horizontalAdvance(u"-WW.W dB"_s));
ui_->label_ebur128_target_level->setMinimumWidth(QFontMetrics(ui_->label_ebur128_target_level->font()).horizontalAdvance(QStringLiteral("-WW.W LUFS")));
ui_->label_ebur128_target_level->setMinimumWidth(QFontMetrics(ui_->label_ebur128_target_level->font()).horizontalAdvance(u"-WW.W LUFS"_s));
QObject::connect(ui_->combobox_engine, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BackendSettingsPage::EngineChanged);
QObject::connect(ui_->combobox_output, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BackendSettingsPage::OutputChanged);
@@ -130,7 +132,7 @@ void BackendSettingsPage::Load() {
if (enginetype == EngineBase::Type::None && engine()) enginetype = engine()->type();
ui_->combobox_engine->clear();
ui_->combobox_engine->addItem(IconLoader::Load(QStringLiteral("gstreamer")), EngineBase::Description(EngineBase::Type::GStreamer), static_cast<int>(EngineBase::Type::GStreamer));
ui_->combobox_engine->addItem(IconLoader::Load(u"gstreamer"_s), EngineBase::Description(EngineBase::Type::GStreamer), static_cast<int>(EngineBase::Type::GStreamer));
enginetype_current_ = enginetype;
output_current_ = s.value("output", QString()).toString();
@@ -249,7 +251,7 @@ void BackendSettingsPage::Load() {
bool BackendSettingsPage::EngineInitialized() {
if (!engine() || engine()->type() == EngineBase::Type::None) {
errordialog_.ShowMessage(QStringLiteral("Engine is not initialized! Please restart."));
errordialog_.ShowMessage(u"Engine is not initialized! Please restart."_s);
return false;
}
return true;
@@ -359,7 +361,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
#ifdef Q_OS_WIN
if (engine()->type() != EngineBase::Type::GStreamer)
#endif
ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), QLatin1String(kOutputAutomaticallySelect), QVariant());
ui_->combobox_device->addItem(IconLoader::Load(u"soundcard"_s), QLatin1String(kOutputAutomaticallySelect), QVariant());
const QList<DeviceFinder*> device_finders = dialog()->app()->device_finders()->ListFinders();
for (DeviceFinder *f : device_finders) {
@@ -373,7 +375,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
}
if (engine()->CustomDeviceSupport(output)) {
ui_->combobox_device->addItem(IconLoader::Load(QStringLiteral("soundcard")), QLatin1String(kOutputCustom), QVariant());
ui_->combobox_device->addItem(IconLoader::Load(u"soundcard"_s), QLatin1String(kOutputCustom), QVariant());
ui_->lineedit_device->setEnabled(true);
}
else {
@@ -544,7 +546,7 @@ void BackendSettingsPage::EngineChanged(const int index) {
if (engine()->type() == enginetype) return;
if (engine()->state() != EngineBase::State::Empty) {
errordialog_.ShowMessage(QStringLiteral("Can't switch engine while playing!"));
errordialog_.ShowMessage(u"Can't switch engine while playing!"_s);
ui_->combobox_engine->setCurrentIndex(ui_->combobox_engine->findData(static_cast<int>(engine()->type())));
return;
}
@@ -716,7 +718,7 @@ void BackendSettingsPage::radiobutton_alsa_hw_clicked(const bool checked) {
QString device_new = ui_->lineedit_device->text();
if (device_new.contains(kRegex_ALSA_PlugHW)) {
device_new = device_new.replace(kRegex_ALSA_PlugHW, QStringLiteral("hw:"));
device_new = device_new.replace(kRegex_ALSA_PlugHW, u"hw:"_s);
}
if (!device_new.contains(kRegex_ALSA_HW)) {
@@ -745,7 +747,7 @@ void BackendSettingsPage::radiobutton_alsa_plughw_clicked(const bool checked) {
QString device_new = ui_->lineedit_device->text();
if (device_new.contains(kRegex_ALSA_HW)) {
device_new = device_new.replace(kRegex_ALSA_HW, QStringLiteral("plughw:"));
device_new = device_new.replace(kRegex_ALSA_HW, u"plughw:"_s);
}
if (!device_new.contains(kRegex_ALSA_PlugHW)) {

13
src/settings/behavioursettingspage.cpp
View File

@@ -40,7 +40,6 @@
#include <QStandardPaths>
#include "core/iconloader.h"
#include "core/mainwindow.h"
#include "core/settings.h"
#include "settings/settingspage.h"
#include "behavioursettingspage.h"
@@ -65,7 +64,7 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *pa
ui_(new Ui_BehaviourSettingsPage) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("strawberry"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"strawberry"_s, true, 0, 32));
QObject::connect(ui_->checkbox_showtrayicon, &QCheckBox::toggled, this, &BehaviourSettingsPage::ShowTrayIconToggled);
@@ -81,13 +80,13 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *pa
#ifdef HAVE_TRANSLATIONS
// Populate the language combo box. We do this by looking at all the compiled in translations.
QDir dir1(QStringLiteral(":/i18n"));
QDir dir1(u":/i18n"_s);
QDir dir2(QStringLiteral(TRANSLATIONS_DIR));
QStringList codes = dir1.entryList(QStringList() << QStringLiteral("*.qm"));
QStringList codes = dir1.entryList(QStringList() << u"*.qm"_s);
if (dir2.exists()) {
codes << dir2.entryList(QStringList() << QStringLiteral("*.qm"));
codes << dir2.entryList(QStringList() << u"*.qm"_s);
}
static const QRegularExpression lang_re(QStringLiteral("^strawberry_(.*).qm$"));
static const QRegularExpression lang_re(u"^strawberry_(.*).qm$"_s);
for (const QString &filename : std::as_const(codes)) {
QRegularExpressionMatch re_match = lang_re.match(filename);
@@ -106,7 +105,7 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog, QWidget *pa
if (!native_name.isEmpty()) {
language_name = native_name;
}
QString name = QStringLiteral("%1 (%2)").arg(language_name, code);
QString name = u"%1 (%2)"_s.arg(language_name, code);
language_map_[name] = code;
}

4
src/settings/collectionsettingsdirectorymodel.cpp
View File

@@ -26,9 +26,11 @@
#include "core/iconloader.h"
#include "collectionsettingsdirectorymodel.h"
using namespace Qt::Literals::StringLiterals;
CollectionSettingsDirectoryModel::CollectionSettingsDirectoryModel(QObject *parent)
: QStandardItemModel(parent),
dir_icon_(IconLoader::Load(QStringLiteral("document-open-folder"))) {}
dir_icon_(IconLoader::Load(u"document-open-folder"_s)) {}
void CollectionSettingsDirectoryModel::AddDirectory(const QString &path) {

22
src/settings/collectionsettingspage.cpp
View File

@@ -60,6 +60,8 @@
#include "settings/settingspage.h"
#include "ui_collectionsettingspage.h"
using namespace Qt::Literals::StringLiterals;
const char *CollectionSettingsPage::kSettingsGroup = "Collection";
const char *CollectionSettingsPage::kSettingsCacheSize = "cache_size";
const char *CollectionSettingsPage::kSettingsCacheSizeUnit = "cache_size_unit";
@@ -81,15 +83,15 @@ CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog, QWidget *
ui_->list->setItemDelegate(new NativeSeparatorsDelegate(this));
// Icons
setWindowIcon(IconLoader::Load(QStringLiteral("library-music"), true, 0, 32));
ui_->add_directory->setIcon(IconLoader::Load(QStringLiteral("document-open-folder")));
setWindowIcon(IconLoader::Load(u"library-music"_s, true, 0, 32));
ui_->add_directory->setIcon(IconLoader::Load(u"document-open-folder"_s));
ui_->combobox_cache_size->addItem(QStringLiteral("KB"), static_cast<int>(CacheSizeUnit::KB));
ui_->combobox_cache_size->addItem(QStringLiteral("MB"), static_cast<int>(CacheSizeUnit::MB));
ui_->combobox_cache_size->addItem(u"KB"_s, static_cast<int>(CacheSizeUnit::KB));
ui_->combobox_cache_size->addItem(u"MB"_s, static_cast<int>(CacheSizeUnit::MB));
ui_->combobox_disk_cache_size->addItem(QStringLiteral("KB"), static_cast<int>(CacheSizeUnit::KB));
ui_->combobox_disk_cache_size->addItem(QStringLiteral("MB"), static_cast<int>(CacheSizeUnit::MB));
ui_->combobox_disk_cache_size->addItem(QStringLiteral("GB"), static_cast<int>(CacheSizeUnit::GB));
ui_->combobox_disk_cache_size->addItem(u"KB"_s, static_cast<int>(CacheSizeUnit::KB));
ui_->combobox_disk_cache_size->addItem(u"MB"_s, static_cast<int>(CacheSizeUnit::MB));
ui_->combobox_disk_cache_size->addItem(u"GB"_s, static_cast<int>(CacheSizeUnit::GB));
QObject::connect(ui_->add_directory, &QPushButton::clicked, this, &CollectionSettingsPage::AddDirectory);
QObject::connect(ui_->remove_directory, &QPushButton::clicked, this, &CollectionSettingsPage::RemoveDirectory);
@@ -157,7 +159,7 @@ void CollectionSettingsPage::Load() {
ui_->mark_songs_unavailable->setChecked(ui_->song_tracking->isChecked() ? true : s.value("mark_songs_unavailable", true).toBool());
ui_->expire_unavailable_songs_days->setValue(s.value("expire_unavailable_songs", 60).toInt());
QStringList filters = s.value("cover_art_patterns", QStringList() << QStringLiteral("front") << QStringLiteral("cover")).toStringList();
QStringList filters = s.value("cover_art_patterns", QStringList() << u"front"_s << u"cover"_s).toStringList();
ui_->cover_art_patterns->setText(filters.join(u','));
ui_->spinbox_cache_size->setValue(s.value(kSettingsCacheSize, kSettingsCacheSizeDefault).toInt());
@@ -177,7 +179,7 @@ void CollectionSettingsPage::Load() {
DiskCacheEnable(ui_->checkbox_disk_cache->checkState());
ui_->disk_cache_in_use->setText((dialog()->app()->collection_model()->icon_cache_disk_size() == 0 ? QStringLiteral("empty") : Utilities::PrettySize(dialog()->app()->collection_model()->icon_cache_disk_size())));
ui_->disk_cache_in_use->setText((dialog()->app()->collection_model()->icon_cache_disk_size() == 0 ? u"empty"_s : Utilities::PrettySize(dialog()->app()->collection_model()->icon_cache_disk_size())));
Init(ui_->layout_collectionsettingspage->parentWidget());
if (!Settings().childGroups().contains(QLatin1String(kSettingsGroup))) set_changed();
@@ -295,7 +297,7 @@ void CollectionSettingsPage::DiskCacheEnable(const int state) {
void CollectionSettingsPage::ClearPixmapDiskCache() {
ui_->disk_cache_in_use->setText(QStringLiteral("empty"));
ui_->disk_cache_in_use->setText(u"empty"_s);
}

14
src/settings/contextsettingspage.cpp
View File

@@ -44,6 +44,8 @@
#include "contextsettingspage.h"
#include "ui_contextsettingspage.h"
using namespace Qt::Literals::StringLiterals;
const char *ContextSettingsPage::kSettingsGroup = "Context";
const char *ContextSettingsPage::kSettingsTitleFmt = "TitleFmt";
const char *ContextSettingsPage::kSettingsSummaryFmt = "SummaryFmt";
@@ -64,7 +66,7 @@ ContextSettingsPage::ContextSettingsPage(SettingsDialog *dialog, QWidget *parent
ui_(new Ui_ContextSettingsPage) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("view-choose"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"view-choose"_s, true, 0, 32));
checkboxes_[static_cast<int>(ContextSettingsOrder::ALBUM)] = ui_->checkbox_album;
checkboxes_[static_cast<int>(ContextSettingsOrder::TECHNICAL_DATA)] = ui_->checkbox_technical_data;
@@ -104,15 +106,15 @@ ContextSettingsPage::ContextSettingsPage(SettingsDialog *dialog, QWidget *parent
QObject::connect(ui_->context_exp_chooser2, &QToolButton::triggered, this, &ContextSettingsPage::InsertVariableSecondLine);
// Icons
ui_->context_exp_chooser1->setIcon(IconLoader::Load(QStringLiteral("list-add")));
ui_->context_exp_chooser2->setIcon(IconLoader::Load(QStringLiteral("list-add")));
ui_->context_exp_chooser1->setIcon(IconLoader::Load(u"list-add"_s));
ui_->context_exp_chooser2->setIcon(IconLoader::Load(u"list-add"_s));
QObject::connect(ui_->font_headline, &QFontComboBox::currentFontChanged, this, &ContextSettingsPage::HeadlineFontChanged);
QObject::connect(ui_->font_size_headline, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &ContextSettingsPage::HeadlineFontChanged);
QObject::connect(ui_->font_normal, &QFontComboBox::currentFontChanged, this, &ContextSettingsPage::NormalFontChanged);
QObject::connect(ui_->font_size_normal, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &ContextSettingsPage::NormalFontChanged);
QFile file(QStringLiteral(":/text/ghosts.txt"));
QFile file(u":/text/ghosts.txt"_s);
if (file.open(QIODevice::ReadOnly)) {
QString text = QString::fromUtf8(file.readAll());
ui_->preview_headline->setText(text);
@@ -132,8 +134,8 @@ void ContextSettingsPage::Load() {
Settings s;
s.beginGroup(kSettingsGroup);
ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, QStringLiteral("%title% - %artist%")).toString());
ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, QStringLiteral("%album%")).toString());
ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, u"%title% - %artist%"_s).toString());
ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, u"%album%"_s).toString());
for (int i = 0; i < static_cast<int>(ContextSettingsOrder::NELEMS); ++i) {
checkboxes_[i]->setChecked(s.value(kSettingsGroupEnable[i], checkboxes_[i]->isChecked()).toBool());

10
src/settings/coverssettingspage.cpp
View File

@@ -65,7 +65,7 @@ CoversSettingsPage::CoversSettingsPage(SettingsDialog *dialog, QWidget *parent)
types_selected_(false) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("cdcase"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"cdcase"_s, true, 0, 32));
QObject::connect(ui_->providers_up, &QPushButton::clicked, this, &CoversSettingsPage::ProvidersMoveUp);
QObject::connect(ui_->providers_down, &QPushButton::clicked, this, &CoversSettingsPage::ProvidersMoveDown);
@@ -114,10 +114,10 @@ void CoversSettingsPage::Load() {
Settings s;
s.beginGroup(kSettingsGroup);
const QStringList all_types = QStringList() << QStringLiteral("art_unset")
<< QStringLiteral("art_manual")
<< QStringLiteral("art_automatic")
<< QStringLiteral("art_embedded");
const QStringList all_types = QStringList() << u"art_unset"_s
<< u"art_manual"_s
<< u"art_automatic"_s
<< u"art_embedded"_s;
const QStringList types = s.value(kTypes, all_types).toStringList();

14
src/settings/globalshortcutssettingspage.cpp
View File

@@ -62,7 +62,7 @@ GlobalShortcutsSettingsPage::GlobalShortcutsSettingsPage(SettingsDialog *dialog,
ui_->setupUi(this);
ui_->shortcut_options->setEnabled(false);
ui_->list->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
setWindowIcon(IconLoader::Load(QStringLiteral("keyboard"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"keyboard"_s, true, 0, 32));
QObject::connect(ui_->list, &QTreeWidget::currentItemChanged, this, &GlobalShortcutsSettingsPage::ItemClicked);
QObject::connect(ui_->radio_none, &QRadioButton::clicked, this, &GlobalShortcutsSettingsPage::NoneClicked);
@@ -276,9 +276,9 @@ void GlobalShortcutsSettingsPage::ShortcutOptionsChanged() {
void GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties() {
if (!QProcess::startDetached(QStringLiteral("gnome-keybinding-properties"), QStringList())) {
if (!QProcess::startDetached(QStringLiteral("gnome-control-center"), QStringList() << QStringLiteral("keyboard"))) {
QMessageBox::warning(this, QStringLiteral("Error"), tr("The \"%1\" command could not be started.").arg("gnome-keybinding-properties"_L1));
if (!QProcess::startDetached(u"gnome-keybinding-properties"_s, QStringList())) {
if (!QProcess::startDetached(u"gnome-control-center"_s, QStringList() << u"keyboard"_s)) {
QMessageBox::warning(this, u"Error"_s, tr("The \"%1\" command could not be started.").arg("gnome-keybinding-properties"_L1));
}
}
@@ -286,9 +286,9 @@ void GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties() {
void GlobalShortcutsSettingsPage::OpenMateKeybindingProperties() {
if (!QProcess::startDetached(QStringLiteral("mate-keybinding-properties"), QStringList())) {
if (!QProcess::startDetached(QStringLiteral("mate-control-center"), QStringList() << QStringLiteral("keyboard"))) {
QMessageBox::warning(this, QStringLiteral("Error"), tr("The \"%1\" command could not be started.").arg("mate-keybinding-properties"_L1));
if (!QProcess::startDetached(u"mate-keybinding-properties"_s, QStringList())) {
if (!QProcess::startDetached(u"mate-control-center"_s, QStringList() << u"keyboard"_s)) {
QMessageBox::warning(this, u"Error"_s, tr("The \"%1\" command could not be started.").arg("mate-keybinding-properties"_L1));
}
}

4
src/settings/lyricssettingspage.cpp
View File

@@ -45,6 +45,8 @@
#include "lyrics/lyricsprovider.h"
#include "widgets/loginstatewidget.h"
using namespace Qt::Literals::StringLiterals;
const char *LyricsSettingsPage::kSettingsGroup = "Lyrics";
LyricsSettingsPage::LyricsSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -53,7 +55,7 @@ LyricsSettingsPage::LyricsSettingsPage(SettingsDialog *dialog, QWidget *parent)
provider_selected_(false) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("view-media-lyrics"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"view-media-lyrics"_s, true, 0, 32));
QObject::connect(ui_->providers_up, &QPushButton::clicked, this, &LyricsSettingsPage::ProvidersMoveUp);
QObject::connect(ui_->providers_down, &QPushButton::clicked, this, &LyricsSettingsPage::ProvidersMoveDown);

6
src/settings/moodbarsettingspage.cpp
View File

@@ -45,6 +45,8 @@
#include "moodbarsettingspage.h"
#include "ui_moodbarsettingspage.h"
using namespace Qt::Literals::StringLiterals;
const char *MoodbarSettingsPage::kSettingsGroup = "Moodbar";
const int MoodbarSettingsPage::kMoodbarPreviewWidth = 150;
const int MoodbarSettingsPage::kMoodbarPreviewHeight = 18;
@@ -55,7 +57,7 @@ MoodbarSettingsPage::MoodbarSettingsPage(SettingsDialog *dialog, QWidget *parent
initialized_(false) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("moodbar"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"moodbar"_s, true, 0, 32));
MoodbarSettingsPage::Load();
@@ -103,7 +105,7 @@ void MoodbarSettingsPage::InitMoodbarPreviews() {
ui_->moodbar_style->setIconSize(preview_size);
// Read the sample data
QFile file(QStringLiteral(":/mood/sample.mood"));
QFile file(u":/mood/sample.mood"_s);
if (!file.open(QIODevice::ReadOnly)) {
qLog(Warning) << "Failed to open moodbar sample file" << file.fileName() << "for reading:" << file.errorString();
return;

4
src/settings/networkproxysettingspage.cpp
View File

@@ -37,6 +37,8 @@
#include "settings/settingspage.h"
#include "ui_networkproxysettingspage.h"
using namespace Qt::Literals::StringLiterals;
class SettingsDialog;
const char *NetworkProxySettingsPage::kSettingsGroup = "NetworkProxy";
@@ -46,7 +48,7 @@ NetworkProxySettingsPage::NetworkProxySettingsPage(SettingsDialog *dialog, QWidg
ui_(new Ui_NetworkProxySettingsPage) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("applications-internet"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"applications-internet"_s, true, 0, 32));
}

10
src/settings/notificationssettingspage.cpp
View File

@@ -54,6 +54,8 @@
#include "notificationssettingspage.h"
#include "ui_notificationssettingspage.h"
using namespace Qt::Literals::StringLiterals;
class QHideEvent;
class QShowEvent;
@@ -63,9 +65,9 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog *dialog, QWi
pretty_popup_(new OSDPretty(OSDPretty::Mode::Draggable)) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("help-hint"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"help-hint"_s, true, 0, 32));
pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(QStringLiteral(":/pictures/cdcase.png")));
pretty_popup_->SetMessage(tr("OSD Preview"), tr("Drag to reposition"), QImage(u":/pictures/cdcase.png"_s));
ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole);
ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetRed), Qt::DecorationRole);
@@ -130,8 +132,8 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog *dialog, QWi
QObject::connect(ui_->notifications_preview, &QPushButton::clicked, this, &NotificationsSettingsPage::PrepareNotificationPreview);
// Icons
ui_->notifications_exp_chooser1->setIcon(IconLoader::Load(QStringLiteral("list-add")));
ui_->notifications_exp_chooser2->setIcon(IconLoader::Load(QStringLiteral("list-add")));
ui_->notifications_exp_chooser1->setIcon(IconLoader::Load(u"list-add"_s));
ui_->notifications_exp_chooser2->setIcon(IconLoader::Load(u"list-add"_s));
QObject::connect(pretty_popup_, &OSDPretty::PositionChanged, this, &NotificationsSettingsPage::PrettyOSDChanged);

4
src/settings/playlistsettingspage.cpp
View File

@@ -33,6 +33,8 @@
#include "playlistsettingspage.h"
#include "ui_playlistsettingspage.h"
using namespace Qt::Literals::StringLiterals;
class SettingsDialog;
const char *PlaylistSettingsPage::kSettingsGroup = "Playlist";
@@ -42,7 +44,7 @@ PlaylistSettingsPage::PlaylistSettingsPage(SettingsDialog *dialog, QWidget *pare
ui_(new Ui_PlaylistSettingsPage) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("document-new"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"document-new"_s, true, 0, 32));
}

14
src/settings/qobuzsettingspage.cpp
View File

@@ -41,6 +41,8 @@
#include "streaming/streamingservices.h"
#include "qobuz/qobuzservice.h"
using namespace Qt::Literals::StringLiterals;
const char *QobuzSettingsPage::kSettingsGroup = "Qobuz";
QobuzSettingsPage::QobuzSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -49,7 +51,7 @@ QobuzSettingsPage::QobuzSettingsPage(SettingsDialog *dialog, QWidget *parent)
service_(dialog->app()->streaming_services()->Service<QobuzService>()) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("qobuz"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"qobuz"_s, true, 0, 32));
QObject::connect(ui_->button_login, &QPushButton::clicked, this, &QobuzSettingsPage::LoginClicked);
QObject::connect(ui_->login_state, &LoginStateWidget::LogoutClicked, this, &QobuzSettingsPage::LogoutClicked);
@@ -61,10 +63,10 @@ QobuzSettingsPage::QobuzSettingsPage(SettingsDialog *dialog, QWidget *parent)
dialog->installEventFilter(this);
ui_->format->addItem(QStringLiteral("MP3 320"), 5);
ui_->format->addItem(QStringLiteral("FLAC Lossless"), 6);
ui_->format->addItem(QStringLiteral("FLAC Hi-Res <= 96kHz"), 7);
ui_->format->addItem(QStringLiteral("FLAC Hi-Res > 96kHz"), 27);
ui_->format->addItem(u"MP3 320"_s, 5);
ui_->format->addItem(u"FLAC Lossless"_s, 6);
ui_->format->addItem(u"FLAC Hi-Res <= 96kHz"_s, 7);
ui_->format->addItem(u"FLAC Hi-Res > 96kHz"_s, 27);
}
@@ -85,7 +87,7 @@ void QobuzSettingsPage::Load() {
if (password.isEmpty()) ui_->password->clear();
else ui_->password->setText(QString::fromUtf8(QByteArray::fromBase64(password)));
ComboBoxLoadFromSettings(s, ui_->format, QStringLiteral("format"), 27);
ComboBoxLoadFromSettings(s, ui_->format, u"format"_s, 27);
ui_->searchdelay->setValue(s.value("searchdelay", 1500).toInt());
ui_->artistssearchlimit->setValue(s.value("artistssearchlimit", 4).toInt());
ui_->albumssearchlimit->setValue(s.value("albumssearchlimit", 10).toInt());

12
src/settings/scrobblersettingspage.cpp
View File

@@ -42,6 +42,8 @@
#include "scrobbler/librefmscrobbler.h"
#include "scrobbler/listenbrainzscrobbler.h"
using namespace Qt::Literals::StringLiterals;
const char *ScrobblerSettingsPage::kSettingsGroup = "Scrobbler";
ScrobblerSettingsPage::ScrobblerSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -56,7 +58,7 @@ ScrobblerSettingsPage::ScrobblerSettingsPage(SettingsDialog *dialog, QWidget *pa
listenbrainz_waiting_for_auth_(false) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("scrobble"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"scrobble"_s, true, 0, 32));
// Last.fm
QObject::connect(&*lastfmscrobbler_, &LastFMScrobbler::AuthenticationComplete, this, &ScrobblerSettingsPage::LastFM_AuthenticationComplete);
@@ -79,7 +81,7 @@ ScrobblerSettingsPage::ScrobblerSettingsPage(SettingsDialog *dialog, QWidget *pa
QObject::connect(ui_->widget_listenbrainz_login_state, &LoginStateWidget::LogoutClicked, this, &ScrobblerSettingsPage::ListenBrainz_Logout);
ui_->widget_listenbrainz_login_state->AddCredentialGroup(ui_->widget_listenbrainz_login);
ui_->label_listenbrainz_token->setText(QStringLiteral("<html><head/><body><p>") + tr("Enter your user token from") + QLatin1Char(' ') + QStringLiteral("<a href=\"https://listenbrainz.org/profile/\"><span style=\"text-decoration: underline; color:#0000ff;\">https://listenbrainz.org/profile/</span></a></p></body></html>"));
ui_->label_listenbrainz_token->setText(u"<html><head/><body><p>"_s + tr("Enter your user token from") + QLatin1Char(' ') + u"<a href=\"https://listenbrainz.org/profile/\"><span style=\"text-decoration: underline; color:#0000ff;\">https://listenbrainz.org/profile/</span></a></p></body></html>"_s);
resize(sizeHint());
@@ -201,7 +203,7 @@ void ScrobblerSettingsPage::LastFM_AuthenticationComplete(const bool success, co
Save();
}
else {
if (!error.isEmpty()) QMessageBox::warning(this, QStringLiteral("Authentication failed"), error);
if (!error.isEmpty()) QMessageBox::warning(this, u"Authentication failed"_s, error);
}
LastFM_RefreshControls(success);
@@ -236,7 +238,7 @@ void ScrobblerSettingsPage::LibreFM_AuthenticationComplete(const bool success, c
Save();
}
else {
QMessageBox::warning(this, QStringLiteral("Authentication failed"), error);
QMessageBox::warning(this, u"Authentication failed"_s, error);
}
LibreFM_RefreshControls(success);
@@ -271,7 +273,7 @@ void ScrobblerSettingsPage::ListenBrainz_AuthenticationComplete(const bool succe
Save();
}
else {
QMessageBox::warning(this, QStringLiteral("Authentication failed"), error);
QMessageBox::warning(this, u"Authentication failed"_s, error);
}
ListenBrainz_RefreshControls(success);

4
src/settings/settingsdialog.cpp
View File

@@ -87,6 +87,8 @@
#include "ui_settingsdialog.h"
using namespace Qt::Literals::StringLiterals;
const char *SettingsDialog::kSettingsGroup = "SettingsDialog";
SettingsItemDelegate::SettingsItemDelegate(QObject *parent) : QStyledItemDelegate(parent) {}
@@ -360,7 +362,7 @@ void SettingsDialog::CurrentItemChanged(QTreeWidgetItem *item) {
}
// Set the title
ui_->title->setText(QStringLiteral("<b>") + item->text(0) + QStringLiteral("</b>"));
ui_->title->setText(QStringLiteral("<b>") + item->text(0) + u"</b>"_s);
// Display the right page
const QList<PageData> pages = pages_.values();

4
src/settings/spotifysettingspage.cpp
View File

@@ -45,6 +45,8 @@
#include "spotify/spotifyservice.h"
#include "widgets/loginstatewidget.h"
using namespace Qt::Literals::StringLiterals;
const char *SpotifySettingsPage::kSettingsGroup = "Spotify";
SpotifySettingsPage::SpotifySettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -53,7 +55,7 @@ SpotifySettingsPage::SpotifySettingsPage(SettingsDialog *dialog, QWidget *parent
service_(dialog->app()->streaming_services()->Service<SpotifyService>()) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("spotify")));
setWindowIcon(IconLoader::Load(u"spotify"_s));
QObject::connect(ui_->button_login, &QPushButton::clicked, this, &SpotifySettingsPage::LoginClicked);
QObject::connect(ui_->login_state, &LoginStateWidget::LogoutClicked, this, &SpotifySettingsPage::LogoutClicked);

32
src/settings/tidalsettingspage.cpp
View File

@@ -41,6 +41,8 @@
#include "tidal/tidalservice.h"
#include "widgets/loginstatewidget.h"
using namespace Qt::Literals::StringLiterals;
const char *TidalSettingsPage::kSettingsGroup = "Tidal";
TidalSettingsPage::TidalSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -49,7 +51,7 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *dialog, QWidget *parent)
service_(dialog->app()->streaming_services()->Service<TidalService>()) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("tidal"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"tidal"_s, true, 0, 32));
QObject::connect(ui_->button_login, &QPushButton::clicked, this, &TidalSettingsPage::LoginClicked);
QObject::connect(ui_->login_state, &LoginStateWidget::LogoutClicked, this, &TidalSettingsPage::LogoutClicked);
@@ -63,20 +65,20 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *dialog, QWidget *parent)
dialog->installEventFilter(this);
ui_->quality->addItem(QStringLiteral("Low"), QStringLiteral("LOW"));
ui_->quality->addItem(QStringLiteral("High"), QStringLiteral("HIGH"));
ui_->quality->addItem(QStringLiteral("Lossless"), QStringLiteral("LOSSLESS"));
ui_->quality->addItem(QStringLiteral("Hi resolution"), QStringLiteral("HI_RES"));
ui_->quality->addItem(u"Low"_s, u"LOW"_s);
ui_->quality->addItem(u"High"_s, u"HIGH"_s);
ui_->quality->addItem(u"Lossless"_s, u"LOSSLESS"_s);
ui_->quality->addItem(u"Hi resolution"_s, u"HI_RES"_s);
ui_->coversize->addItem(QStringLiteral("160x160"), QStringLiteral("160x160"));
ui_->coversize->addItem(QStringLiteral("320x320"), QStringLiteral("320x320"));
ui_->coversize->addItem(QStringLiteral("640x640"), QStringLiteral("640x640"));
ui_->coversize->addItem(QStringLiteral("750x750"), QStringLiteral("750x750"));
ui_->coversize->addItem(QStringLiteral("1280x1280"), QStringLiteral("1280x1280"));
ui_->coversize->addItem(u"160x160"_s, u"160x160"_s);
ui_->coversize->addItem(u"320x320"_s, u"320x320"_s);
ui_->coversize->addItem(u"640x640"_s, u"640x640"_s);
ui_->coversize->addItem(u"750x750"_s, u"750x750"_s);
ui_->coversize->addItem(u"1280x1280"_s, u"1280x1280"_s);
ui_->streamurl->addItem(QStringLiteral("streamurl"), static_cast<int>(StreamUrlMethod::StreamUrl));
ui_->streamurl->addItem(QStringLiteral("urlpostpaywall"), static_cast<int>(StreamUrlMethod::UrlPostPaywall));
ui_->streamurl->addItem(QStringLiteral("playbackinfopostpaywall"), static_cast<int>(StreamUrlMethod::PlaybackInfoPostPaywall));
ui_->streamurl->addItem(u"streamurl"_s, static_cast<int>(StreamUrlMethod::StreamUrl));
ui_->streamurl->addItem(u"urlpostpaywall"_s, static_cast<int>(StreamUrlMethod::UrlPostPaywall));
ui_->streamurl->addItem(u"playbackinfopostpaywall"_s, static_cast<int>(StreamUrlMethod::PlaybackInfoPostPaywall));
}
@@ -97,14 +99,14 @@ void TidalSettingsPage::Load() {
if (password.isEmpty()) ui_->password->clear();
else ui_->password->setText(QString::fromUtf8(QByteArray::fromBase64(password)));
ComboBoxLoadFromSettings(s, ui_->quality, QStringLiteral("quality"), QStringLiteral("LOSSLESS"));
ComboBoxLoadFromSettings(s, ui_->quality, u"quality"_s, u"LOSSLESS"_s);
ui_->searchdelay->setValue(s.value("searchdelay", 1500).toInt());
ui_->artistssearchlimit->setValue(s.value("artistssearchlimit", 4).toInt());
ui_->albumssearchlimit->setValue(s.value("albumssearchlimit", 10).toInt());
ui_->songssearchlimit->setValue(s.value("songssearchlimit", 10).toInt());
ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool());
ui_->checkbox_download_album_covers->setChecked(s.value("downloadalbumcovers", true).toBool());
ComboBoxLoadFromSettings(s, ui_->coversize, QStringLiteral("coversize"), QStringLiteral("640x640"));
ComboBoxLoadFromSettings(s, ui_->coversize, u"coversize"_s, u"640x640"_s);
ui_->streamurl->setCurrentIndex(ui_->streamurl->findData(s.value("streamurl", static_cast<int>(StreamUrlMethod::StreamUrl)).toInt()));
ui_->checkbox_album_explicit->setChecked(s.value("album_explicit", false).toBool());

4
src/settings/transcodersettingspage.cpp
View File

@@ -36,6 +36,8 @@
#include "transcodersettingspage.h"
#include "ui_transcodersettingspage.h"
using namespace Qt::Literals::StringLiterals;
class SettingsDialog;
TranscoderSettingsPage::TranscoderSettingsPage(SettingsDialog *dialog, QWidget *parent)
@@ -43,7 +45,7 @@ TranscoderSettingsPage::TranscoderSettingsPage(SettingsDialog *dialog, QWidget *
ui_(new Ui_TranscoderSettingsPage) {
ui_->setupUi(this);
setWindowIcon(IconLoader::Load(QStringLiteral("tools-wizard"), true, 0, 32));
setWindowIcon(IconLoader::Load(u"tools-wizard"_s, true, 0, 32));
}