Commit 6d3c7e57 authored by Michael Pyne's avatar Michael Pyne

Fix bug 230041 (JuK system tray tooltip clips letters in words instead of at spaces) in

trunk by applying two patches provided by Glad Deschrijver.

The first removes an old hack that had been keeping lines from being broken that doesn't
work with the new DBus-based system tray.

The second patch uses italics on the song title to get the intended effect of the first,
an easy visual distinction between song artist and title. This one could be bad depending
on the font, but there are plenty of high-quality free fonts available, and we can't even
blame the Apple font hinting patent now.

Will backport to 4.5 as the fix is completely non-invasive and corrects an annoying visual
flaw in the UI experience.

CCBUG:230041

svn path=/trunk/KDE/kdemultimedia/juk/; revision=1153775
parent 63fca355
......@@ -46,7 +46,7 @@ static const char laurent[] = I18N_NOOP("Porting to KDE 4 when no one else w
int main(int argc, char *argv[])
{
KAboutData aboutData("juk", 0, ki18n("JuK"),
"3.5", ki18n(description), KAboutData::License_GPL,
"3.6", ki18n(description), KAboutData::License_GPL,
ki18n("© 2002 - 2010, Scott Wheeler"), KLocalizedString(),
"http://developer.kde.org/~wheeler/juk.html");
......
......@@ -486,9 +486,7 @@ void SystemTray::setToolTip(const QString &tip, const QPixmap &cover)
myCover = cover.scaled(iconSize, iconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
}
QString html = QString("%1").arg(tip);
html.replace(" ", " ");
KStatusNotifierItem::setToolTip(QIcon(myCover), i18n("JuK"), html);
KStatusNotifierItem::setToolTip(QIcon(myCover), i18n("JuK"), tip);
}
}
......
......@@ -94,7 +94,7 @@ QString Tag::playingString() const
str = title();
else {
str = i18nc("a playing track, %1 is artist, %2 is song title",
"%1 - %2", artist(), title());
"%1 - <i>%2</i>", artist(), title());
}
return str;
......
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