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

Disable automatic conversions from 8-bit strings

Browse Source
This commit is contained in:
Jonas Kvinge
2024-04-11 02:56:01 +02:00
parent 58944993b8
commit 0c6872b352
310 changed files with 2501 additions and 2332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/osdbase.cpp
View File

@@ -34,6 +34,7 @@
#include "core/shared_ptr.h"
#include "core/application.h"
#include "core/logging.h"
#include "core/settings.h"
#ifdef Q_OS_MACOS
# include "core/macsystemtrayicon.h"
#else
@@ -74,7 +75,7 @@ OSDBase::~OSDBase() {
void OSDBase::ReloadSettings() {
QSettings s;
Settings s;
s.beginGroup(kSettingsGroup);
behaviour_ = static_cast<OSDBase::Behaviour>(s.value("Behaviour", static_cast<int>(Behaviour::Native)).toInt());
timeout_msec_ = s.value("Timeout", 5000).toInt();
@@ -200,7 +201,7 @@ void OSDBase::Paused() {
else {
summary = last_song_.PrettyTitle();
if (!last_song_.artist().isEmpty()) {
summary.prepend(" - ");
summary.prepend(QStringLiteral(" - "));
summary.prepend(last_song_.artist());
}
if (behaviour_ == Behaviour::Pretty) {
@@ -245,7 +246,7 @@ void OSDBase::Stopped() {
else {
summary = last_song_.PrettyTitle();
if (!last_song_.artist().isEmpty()) {
summary.prepend(" - ");
summary.prepend(QStringLiteral(" - "));
summary.prepend(last_song_.artist());
}
if (behaviour_ == Behaviour::Pretty) {
@@ -385,7 +386,7 @@ QString OSDBase::ReplaceMessage(const MessageType type, const QString &message,
case Behaviour::Native:
#if defined(Q_OS_MACOS)
html_escaped = false;
newline = "\n";
newline = QStringLiteral("\n");
break;
#elif defined(HAVE_DBUS)
switch (type) {
@@ -394,7 +395,7 @@ QString OSDBase::ReplaceMessage(const MessageType type, const QString &message,
newline = QLatin1String("");
break;
}
case MessageType::Message: {
case MessageType::Message:{
html_escaped = true;
newline = QStringLiteral("<br />");
break;