From fd2f7bdbac15374cb9f76ebfd72135bcd43cb098 Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Tue, 15 Aug 2017 22:57:07 +0100 Subject: [PATCH] Use em-dash where appropriate Issue #1064 --- gui/trayitem.cpp | 4 ++-- models/devicesmodel.cpp | 2 +- models/playlistsmodel.cpp | 4 ++-- models/playqueuemodel.cpp | 2 +- models/searchmodel.cpp | 4 ++-- models/streamsmodel.cpp | 2 +- mpd-interface/song.cpp | 6 +++--- playlists/dynamic.cpp | 2 +- widgets/groupedview.cpp | 8 ++++---- widgets/itemview.cpp | 2 +- widgets/nowplayingwidget.cpp | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp index a93ce3703..400e25f07 100644 --- a/gui/trayitem.cpp +++ b/gui/trayitem.cpp @@ -214,7 +214,7 @@ void TrayItem::songChanged(const Song &song, bool isPlaying) if (useable) { QString text=song.describe(false); if (song.time>0) { - text+=QLatin1String(" - ")+Utils::formatTime(song.time); + text+=QLatin1String(" – ")+Utils::formatTime(song.time); } MacNotify::showMessage(tr("Now playing"), text, CurrentCover::self()->image()); } @@ -227,7 +227,7 @@ void TrayItem::songChanged(const Song &song, bool isPlaying) if (useable) { QString text=song.describe(false); if (song.time>0) { - text+=QLatin1String(" - ")+Utils::formatTime(song.time); + text+=QLatin1String(" – ")+Utils::formatTime(song.time); } if (trayItem) { diff --git a/models/devicesmodel.cpp b/models/devicesmodel.cpp index 326b19673..3eed4266d 100644 --- a/models/devicesmodel.cpp +++ b/models/devicesmodel.cpp @@ -342,7 +342,7 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const } if (!dev->isConnected()) { QString sub=dev->subText(); - return tr("Not Connected")+(sub.isEmpty() ? QString() : (QString(" - ")+sub)); + return tr("Not Connected")+(sub.isEmpty() ? QString() : (QString(" – ")+sub)); } if (Device::AudioCd==dev->devType()) { return dev->subText(); diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp index 5df27355c..f6389d459 100644 --- a/models/playlistsmodel.cpp +++ b/models/playlistsmodel.cpp @@ -455,8 +455,8 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const case Cantata::Role_MainText: return s->title.isEmpty() ? s->name().isEmpty() ? s->file : s->name() : s->title; case Cantata::Role_SubText: - return (s->artist.isEmpty() ? QString() : (s->artist+QLatin1String(" - ")))+ - (s->displayAlbum().isEmpty() ? QString() : (s->displayAlbum()+QLatin1String(" - ")))+ + return (s->artist.isEmpty() ? QString() : (s->artist+QLatin1String(" – ")))+ + (s->displayAlbum().isEmpty() ? QString() : (s->displayAlbum()+QLatin1String(" – ")))+ (s->time>0 ? Utils::formatTime(s->time) : QString()); default: return ActionModel::data(index, role); diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp index d0f163584..f7a491a5f 100644 --- a/models/playqueuemodel.cpp +++ b/models/playqueuemodel.cpp @@ -364,7 +364,7 @@ QVariant PlayQueueModel::data(const QModelIndex &index, int role) const } case Cantata::Role_SubText: { const Song &s=songs.at(index.row()); - return s.artist+QLatin1String(" - ")+s.displayAlbum(); + return s.artist+QLatin1String(" – ")+s.displayAlbum(); } case Cantata::Role_Time: { const Song &s=songs.at(index.row()); diff --git a/models/searchmodel.cpp b/models/searchmodel.cpp index 626fb6415..e520958f1 100644 --- a/models/searchmodel.cpp +++ b/models/searchmodel.cpp @@ -219,13 +219,13 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const QString al=song->displayAlbum(); if (!al.isEmpty()) { if (!resp.isEmpty()) { - resp+=QLatin1String(" - "); + resp+=QLatin1String(" – "); } resp+=al; } if (song->time>0) { if (!resp.isEmpty()) { - resp+=QLatin1String(" - "); + resp+=QLatin1String(" – "); } resp+=Utils::formatTime(song->time); } diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index 4e255fa47..b887e215c 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -133,7 +133,7 @@ QString StreamsModel::Item::modifiedName() const if (!cat || !cat->addCatToModifiedName || name.startsWith(cat->name)) { return name; } - return cat->name+QLatin1String(" - ")+name; + return cat->name+QLatin1String(" – ")+name; } StreamsModel::CategoryItem * StreamsModel::Item::getTopLevelCategory() const diff --git a/mpd-interface/song.cpp b/mpd-interface/song.cpp index 4e1005b6a..c03d2fe5b 100644 --- a/mpd-interface/song.cpp +++ b/mpd-interface/song.cpp @@ -499,8 +499,8 @@ QString Song::albumId() const QString Song::artistSong() const { - //return artist+QLatin1String(" - ")+title; - return title+QLatin1String(" - ")+artist; + //return artist+QLatin1String(" – ")+title; + return title+QLatin1String(" – ")+artist; } QString Song::trackAndTitleStr(bool showArtistIfDifferent) const @@ -783,7 +783,7 @@ void Song::populateSorts() // ? QString() // : artist.isEmpty() // ? title -// : trc("track - artist", "%1 - %2", title, artist); +// : trc("track – artist", "%1 – %2", title, artist); //} QDataStream & operator<<(QDataStream &stream, const Song &song) diff --git a/playlists/dynamic.cpp b/playlists/dynamic.cpp index d2747e9e2..17f0a6e5d 100644 --- a/playlists/dynamic.cpp +++ b/playlists/dynamic.cpp @@ -240,7 +240,7 @@ QVariant Dynamic::data(const QModelIndex &index, int role) const return IS_ACTIVE(entryList.at(index.row()).name) ? Icons::self()->replacePlayQueueIcon : Icons::self()->dynamicListIcon; case Cantata::Role_SubText: { const Entry &e=entryList.at(index.row()); - return tr("%n Rule(s)", "", e.rules.count())+(e.haveRating() ? tr(" - Rating: %1..%2") + return tr("%n Rule(s)", "", e.rules.count())+(e.haveRating() ? tr(" – Rating: %1..%2") .arg((double)e.ratingFrom/Song::Rating_Step).arg((double)e.ratingTo/Song::Rating_Step) : QString()); } case Cantata::Role_Actions: { diff --git a/widgets/groupedview.cpp b/widgets/groupedview.cpp index eae78237e..d7d7b685a 100644 --- a/widgets/groupedview.cpp +++ b/widgets/groupedview.cpp @@ -172,14 +172,14 @@ static QString streamText(const Song &song, const QString &trackTitle, bool useN ? song.title : song.title.isEmpty() ? songName - : (song.title + " - " + songName); + : (song.title + " – " + songName); } else if (!song.title.isEmpty() && !song.artist.isEmpty()) { QString name=song.name(); - return song.artist + " - " + (!useName || name.isEmpty() + return song.artist + " – " + (!useName || name.isEmpty() ? song.title : song.title.isEmpty() ? name - : (song.title + " - " + name)); + : (song.title + " – " + name)); } else { return trackTitle; } @@ -302,7 +302,7 @@ void GroupedViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o if (song.isFromOnlineService()) { title=Song::displayAlbum(song.albumName(), Song::albumYear(song)); } else { - title=song.artistOrComposer()+QLatin1String(" - ")+Song::displayAlbum(song.albumName(), Song::albumYear(song)); + title=song.artistOrComposer()+QLatin1String(" – ")+Song::displayAlbum(song.albumName(), Song::albumYear(song)); } track=song.trackAndTitleStr(); } diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp index 243dfbce2..f97a0f06f 100644 --- a/widgets/itemview.cpp +++ b/widgets/itemview.cpp @@ -494,7 +494,7 @@ public: if (text.count()>1) { int mainWidth=textMetrics.width(str); text.takeFirst(); - str=text.join(" - "); + str=text.join(" – "); textRect=QRect(r.x()+(mainWidth+8), r.y()+((r.height()-textHeight)/2), r.width()-(mainWidth+8), textHeight); if (textRect.width()>4) { str = textMetrics.elidedText(str, Qt::ElideRight, textRect.width(), QPalette::WindowText); diff --git a/widgets/nowplayingwidget.cpp b/widgets/nowplayingwidget.cpp index d8950d3ae..eea1c0f73 100644 --- a/widgets/nowplayingwidget.cpp +++ b/widgets/nowplayingwidget.cpp @@ -333,7 +333,7 @@ void NowPlayingWidget::update(const Song &song) artist->setText(song.artist); } else { // Artist here is always artist, and not album artist or composer - artist->setText(song.artist+QLatin1String(" - ")+song.displayAlbum(false)); + artist->setText(song.artist+QLatin1String(" – ")+song.displayAlbum(false)); } } }