Hello community, here is the log from the commit of package juk for openSUSE:Factory checked in at 2016-05-29 03:09:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/juk (Old) and /work/SRC/openSUSE:Factory/.juk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "juk" Changes: -------- --- /work/SRC/openSUSE:Factory/juk/juk.changes 2016-03-29 09:57:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.juk.new/juk.changes 2016-05-29 03:09:34.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:12:22 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 05:52:14 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:32:25 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- juk-15.12.3.tar.xz New: ---- juk-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ juk.spec ++++++ --- /var/tmp/diff_new_pack.ItFUaC/_old 2016-05-29 03:09:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ItFUaC/_new 2016-05-29 03:09:35.000000000 +0200 @@ -25,7 +25,7 @@ License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://www.kde.org -Version: 15.12.3 +Version: 16.04.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ juk-15.12.3.tar.xz -> juk-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-15.12.3/juk.appdata.xml new/juk-16.04.1/juk.appdata.xml --- old/juk-15.12.3/juk.appdata.xml 2015-12-05 05:55:54.000000000 +0100 +++ new/juk-16.04.1/juk.appdata.xml 2016-04-26 02:58:04.000000000 +0200 @@ -79,6 +79,7 @@ <p xml:lang="ca">El JuK és una aplicació de màquina de discos musicals, que accepta col·leccions de fitxers d'àudio MP3, Ogg Vorbis, i FLAC. Permet editar les "etiquetes" dels fitxers d'àudio, i gestionar les col·leccions i les llistes de reproducció. De fet, el seu focus principal és en la gestió de la música.</p> <p xml:lang="ca-valencia">El JuK és una aplicació de màquina de discos musicals, que accepta col·leccions de fitxers d'àudio MP3, Ogg Vorbis, i FLAC. Permet editar les "etiquetes" dels fitxers d'àudio, i gestionar les col·leccions i les llistes de reproducció. De fet, el seu focus principal és en la gestió de la música.</p> <p xml:lang="da">JuK er et lydjukebox-program, som understøtter samlinger af MP3-, Ogg Vorbis- og FLAC-lydfiler. Den lader dig redigere "mærkerne" i dine lydfiler og håndtere din samling og spillelister. Dens hovedfokus er faktisk på musikhåndtering.</p> + <p xml:lang="de">JuK ist eine Jukebox-Anwendung für Musikstücke und unterstützt Sammlungen von MP3-, Ogg-, Vorbis-, und FLAC-Audiodateien. Sie können Stichwörter Ihrer Audiodateien bearbeiten und Ihre Musiksammlungen und Wiedergabelisten verwalten. Die wichtigste Funktion ist die Musikverwaltung.</p> <p xml:lang="el">Το JuK είναι μια εφαρμογή μουσικού κουτιού, που υποστηρίζει συλλογές MP3, Ogg Vorbis, και FLAC αρχεία ήχου. Σας επιτρέπει να επεξεργαστείτε τις "ετικέτες" των αρχείων ήχου σας, και να διαχειριστείτε τις συλλογές και τις λίστες αναπαραγωγής. Εστιάζει κυρίως στη διαχείριση μουσικής.</p> <p xml:lang="en-GB">JuK is an audio jukebox application, supporting collections of MP3, Ogg Vorbis, and FLAC audio files. It allows you to edit the "tags" of your audio files, and manage your collection and playlists. It's main focus, in fact, is on music management.</p> <p xml:lang="es">JuK es una aplicación jukebox de audio, que soporta colecciones de archivos MP3, Ogg Vorbis y FLAC. Le permite editar los "tags" de sus archivos de audio, y administrar sus colecciones y listas de reproducción. Su principal cometido, de hecho, es administrar la música.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-15.12.3/main.cpp new/juk-16.04.1/main.cpp --- old/juk-15.12.3/main.cpp 2015-12-05 05:55:54.000000000 +0100 +++ new/juk-16.04.1/main.cpp 2016-04-26 02:58:04.000000000 +0200 @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.12", ki18n(description), KAboutData::License_GPL, + "3.12.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002–2014, Scott Wheeler, Michael Pyne, and others"), KLocalizedString(), "http://www.kde.org/applications/multimedia/juk/";); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-15.12.3/nowplaying.cpp new/juk-16.04.1/nowplaying.cpp --- old/juk-15.12.3/nowplaying.cpp 2015-12-05 05:55:54.000000000 +0100 +++ new/juk-16.04.1/nowplaying.cpp 2016-04-26 02:58:04.000000000 +0200 @@ -39,6 +39,7 @@ #include <QUrl> #include <QList> #include <QTextDocument> +#include <QFontMetrics> #include "playlistcollection.h" #include "playlistitem.h" @@ -47,11 +48,9 @@ #include "tag.h" #include "collectionlist.h" -static const int imageSize = 64; - -struct Line : public QFrame -{ - Line(QWidget *parent) : QFrame(parent) { setFrameShape(VLine); } +// Anon namespace to hide symbol from outside this translation unit +namespace { + static int g_imageSize = 64; }; //////////////////////////////////////////////////////////////////////////////// @@ -72,11 +71,17 @@ layout->setMargin(0); layout->setSpacing(3); - setFixedHeight(imageSize + 2); + + // With HiDPI the text might actually be bigger... try to account for + // that. + QFont defaultLargeFont(KGlobalSettings::largeFont(QLatin1String("XXXXXXX"))); + const QFontMetrics fm(defaultLargeFont, this); + + g_imageSize = qMax(g_imageSize, fm.lineSpacing()); + setFixedHeight(g_imageSize + 2); layout->addWidget(new CoverItem(this), 0); layout->addWidget(new TrackItem(this), 2); - layout->addWidget(new Line(this), 0); hide(); } @@ -120,7 +125,7 @@ QLabel(parent), NowPlayingItem(parent) { - setObjectName( QLatin1String("CoverItem" )); + setObjectName(QLatin1String("CoverItem")); setFixedHeight(parent->height() - parent->layout()->margin() * 2); setMargin(1); setAcceptDrops(true); @@ -134,7 +139,7 @@ show(); setPixmap( file.coverInfo()->pixmap(CoverInfo::Thumbnail) - .scaled(imageSize, imageSize, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + .scaled(g_imageSize, g_imageSize, Qt::KeepAspectRatio, Qt::SmoothTransformation)); } else hide(); @@ -237,7 +242,7 @@ QWidget(parent), NowPlayingItem(parent) { - setObjectName( QLatin1String("TrackItem" )); + setObjectName(QLatin1String("TrackItem")); setFixedHeight(parent->height() - parent->layout()->margin() * 2); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); @@ -249,7 +254,7 @@ m_label->setTextInteractionFlags(Qt::LinksAccessibleByMouse|Qt::LinksAccessibleByKeyboard); layout->addStretch(); - layout->addWidget(m_label); + layout->addWidget(m_label, 1); layout->addStretch(); connect(m_label, SIGNAL(linkActivated(QString)), this, @@ -269,7 +274,7 @@ void TrackItem::slotOpenLink(const QString &link) { - PlaylistCollection *collection = NowPlayingItem::parent()->collection(); + PlaylistCollection *collection = parentManager()->collection(); if(link == "artist") collection->showMore(m_file.tag()->artist()); @@ -301,23 +306,26 @@ "<br />" "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>"; - if(NowPlayingItem::parent()->collection()->showMoreActive()) + if(parentManager()->collection()->showMoreActive()) format.append(QString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist"))); format.append("</font>"); + int parentHeight = parentManager()->contentsRect().height(); + int neededHeight = 0; do { m_label->setText(format.arg(size).arg(title).arg(size - 2) .arg(artist).arg(separator).arg(album)); --size; - } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0); + neededHeight = m_label->heightForWidth(m_label->width()); + } while(neededHeight > parentHeight && size >= -1); - m_label->setFixedHeight(qMin(imageSize, m_label->heightForWidth(m_label->width()))); + m_label->setFixedHeight(qMin(neededHeight, parentHeight)); } void TrackItem::slotClearShowMore() { - PlaylistCollection *collection = NowPlayingItem::parent()->collection(); + PlaylistCollection *collection = parentManager()->collection(); Q_ASSERT(collection); collection->clearShowMore(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/juk-15.12.3/nowplaying.h new/juk-16.04.1/nowplaying.h --- old/juk-15.12.3/nowplaying.h 2015-12-05 05:55:54.000000000 +0100 +++ new/juk-16.04.1/nowplaying.h 2016-04-26 02:58:04.000000000 +0200 @@ -81,7 +81,7 @@ public: virtual ~NowPlayingItem() {} virtual void update(const FileHandle &file) = 0; - NowPlaying *parent() const { return m_parent; } + NowPlaying *parentManager() const { return m_parent; } protected: NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); } private:
