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

20
src/queue/queue.cpp
View File

@@ -39,7 +39,9 @@
#include "playlist/playlist.h"
#include "queue.h"
const char *Queue::kRowsMimetype = "application/x-strawberry-queue-rows";
namespace {
constexpr char kRowsMimetype[] = "application/x-strawberry-queue-rows";
}
Queue::Queue(Playlist *playlist, QObject *parent) : QAbstractProxyModel(parent), playlist_(playlist), total_length_ns_(0) {
@@ -153,7 +155,7 @@ QVariant Queue::data(const QModelIndex &proxy_index, int role) const {
case Playlist::Role_QueuePosition:
return proxy_index.row();
case Qt::DisplayRole: {
case Qt::DisplayRole:{
const QString artist = source_index.sibling(source_index.row(), Playlist::Column_Artist).data().toString();
const QString title = source_index.sibling(source_index.row(), Playlist::Column_Title).data().toString();
@@ -252,7 +254,7 @@ void Queue::UpdateSummaryText() {
summary += tr("%n track(s)", "", tracks);
if (nanoseconds > 0) {
summary += " - [ " + Utilities::WordyTimeNanosec(nanoseconds) + " ]";
summary += QStringLiteral(" - [ ") + Utilities::WordyTimeNanosec(nanoseconds) + QStringLiteral(" ]");
}
emit SummaryTextChanged(summary);
@@ -320,7 +322,7 @@ void Queue::MoveDown(int row) {
}
QStringList Queue::mimeTypes() const {
return QStringList() << kRowsMimetype << Playlist::kRowsMimetype;
return QStringList() << QLatin1String(kRowsMimetype) << QLatin1String(Playlist::kRowsMimetype);
}
Qt::DropActions Queue::supportedDropActions() const {
@@ -343,7 +345,7 @@ QMimeData *Queue::mimeData(const QModelIndexList &indexes) const {
QDataStream stream(&buf);
stream << rows;
buf.close();
data->setData(kRowsMimetype, buf.data());
data->setData(QLatin1String(kRowsMimetype), buf.data());
}
return data;
@@ -355,11 +357,11 @@ bool Queue::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
if (action == Qt::IgnoreAction)
return false;
if (data->hasFormat(kRowsMimetype)) {
if (data->hasFormat(QLatin1String(kRowsMimetype))) {
// Dragged from the queue
QList<int> proxy_rows;
QDataStream stream(data->data(kRowsMimetype));
QDataStream stream(data->data(QLatin1String(kRowsMimetype)));
stream >> proxy_rows;
// Make sure we take them in order
@@ -367,12 +369,12 @@ bool Queue::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
Move(proxy_rows, row);
}
else if (data->hasFormat(Playlist::kRowsMimetype)) {
else if (data->hasFormat(QLatin1String(Playlist::kRowsMimetype))) {
// Dragged from the playlist
Playlist *playlist = nullptr;
QList<int> source_rows;
QDataStream stream(data->data(Playlist::kRowsMimetype));
QDataStream stream(data->data(QLatin1String(Playlist::kRowsMimetype)));
stream.readRawData(reinterpret_cast<char*>(&playlist), sizeof(Playlist));
stream >> source_rows;

2
src/queue/queue.h
View File

@@ -41,8 +41,6 @@ class Queue : public QAbstractProxyModel {
public:
explicit Queue(Playlist *playlist, QObject *parent = nullptr);
static const char *kRowsMimetype;
// Query the queue
bool is_empty() const;
int PositionOf(const QModelIndex &source_index) const;

3
src/queue/queueview.cpp
View File

@@ -35,6 +35,7 @@
#include "core/shared_ptr.h"
#include "core/iconloader.h"
#include "core/settings.h"
#include "playlist/playlist.h"
#include "playlist/playlistdelegates.h"
#include "playlist/playlistmanager.h"
@@ -86,7 +87,7 @@ void QueueView::SetPlaylistManager(SharedPtr<PlaylistManager> playlist_manager)
void QueueView::ReloadSettings() {
QSettings s;
Settings s;
s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
int iconsize = s.value(AppearanceSettingsPage::kIconSizeLeftPanelButtons, 22).toInt();
s.endGroup();