Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6aa0b52c authored by Laurent Montel's avatar Laurent Montel 😁

Q3StyleSheet--

svn path=/trunk/KDE/kdemultimedia/juk/; revision=492896
parent c083adf3
......@@ -35,6 +35,7 @@
#include <QDragEnterEvent>
#include <QMouseEvent>
#include <krandom.h>
#include <QTextDocument>
#include "nowplaying.h"
#include "playlistcollection.h"
......@@ -260,9 +261,9 @@ void TrackItem::slotOpenLink(const QString &link)
void TrackItem::slotUpdate()
{
QString title = Q3StyleSheet::escape(m_file.tag()->title());
QString artist = Q3StyleSheet::escape(m_file.tag()->artist());
QString album = Q3StyleSheet::escape(m_file.tag()->album());
QString title = Qt::escape(m_file.tag()->title());
QString artist = Qt::escape(m_file.tag()->artist());
QString album = Qt::escape(m_file.tag()->album());
QString separator = (artist.isNull() || album.isNull()) ? QString::null : QString(" - ");
// This block-o-nastiness makes the font smaller and smaller until it actually fits.
......@@ -320,7 +321,7 @@ void HistoryItem::update(const FileHandle &file)
it != m_history.end(); ++it)
{
previous = current;
current.append(format.arg((*it).anchor).arg(Q3StyleSheet::escape((*it).file.tag()->title())));
current.append(format.arg((*it).anchor).arg(Qt::escape((*it).file.tag()->title())));
setText(current);
if(heightForWidth(width()) > imageSize) {
setText(previous);
......
......@@ -43,6 +43,7 @@
#include <netwm.h>
#include <QX11Info>
#include <QTextDocument>
#include "tag.h"
#include "systemtray.h"
......@@ -392,14 +393,14 @@ void SystemTray::createPopup()
int labelCount = 0;
QString title = Q3StyleSheet::escape(playingInfo->title());
QString title = Qt::escape(playingInfo->title());
m_labels[labelCount++]->setText(QString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title));
if(!playingInfo->artist().isEmpty())
m_labels[labelCount++]->setText(playingInfo->artist());
if(!playingInfo->album().isEmpty()) {
QString album = Q3StyleSheet::escape(playingInfo->album());
QString album = Qt::escape(playingInfo->album());
QString s = playingInfo->year() > 0
? QString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year())
: QString("<qt><nobr>%1</nobr></qt>").arg(album);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment