Changeset 175 for smplayer/vendor/current/src/infofile.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/infofile.cpp (modified) (10 diffs)

smplayer/vendor/current/src/infofile.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 #include "infofile.h"
+#include "discname.h"
+#include "images.h"
+
 #include <QFileInfo>
 #include <QCoreApplication>
-#include "discname.h"
-#include "images.h"
-
-
-InfoFile::InfoFile() {
-        row = 0;
+#include <QFile>
+#include <QDebug>
+
+InfoFile::InfoFile(QObject * parent)
+        : QObject(parent)
+#ifndef INFO_SIMPLE_LAYOUT
+        , row(0)
+#endif
+{
 }
 
@@ -55 +61 @@
         }
         icon = icon.replace(".png", ""); // FIXME
-        icon = "<img src=\"" + Images::file(icon) + "\"> ";
+        //icon = "<img src=\"" + Images::file(icon) + "\"> ";
 
 #ifdef BLURAY_SUPPORT
@@ -64 +70 @@
         {
                 DiscData disc_data = DiscName::split(md.filename);
-                s += title( icon + disc_data.protocol + "://" + QString::number(disc_data.title) );
+                s += title(disc_data.protocol + "://" + QString::number(disc_data.title), icon);
         } else {
-                s += title( icon + md.displayName() );
+                s += title(md.displayName(), icon);
         }
 
@@ -128 +134 @@
         if (md.audios.numItems() > 0) {
                 s += openPar( tr("Audio Streams") );
-                row++;
-                s += openItem();
-                s += "<td>" + tr("#", "Info for translators: this is a abbreviation for number") + "</td><td>" + 
-              tr("Language") + "</td><td>" + tr("Name") +"</td><td>" +
-              tr("ID", "Info for translators: this is a identification code") + "</td>";
-                s += closeItem();
+                s += addTrackColumns( QStringList() << "#" << tr("Language") << tr("Name") << "ID" );
+
                 for (int n = 0; n < md.audios.numItems(); n++) {
+                        #ifndef INFO_SIMPLE_LAYOUT
                         row++;
+                        #endif
                         s += openItem();
                         QString lang = md.audios.itemAt(n).lang();
-                        if (lang.isEmpty()) lang = "<i>&lt;"+tr("empty")+"&gt;</i>";
+                        if (lang.isEmpty()) lang = "<i>&lt;"+tr("undefined")+"&gt;</i>";
                         QString name = md.audios.itemAt(n).name();
-                        if (name.isEmpty()) name = "<i>&lt;"+tr("empty")+"&gt;</i>";
-                        s += QString("<td>%1</td><td>%2</td><td>%3</td><td>%4</td>")
-                 .arg(n).arg(lang).arg(name)
-                 .arg(md.audios.itemAt(n).ID());
+                        if (name.isEmpty()) name = "<i>&lt;"+tr("undefined")+"&gt;</i>";
+                        s += addTrack(n, lang, name, md.audios.itemAt(n).ID());
                         s += closeItem();
                 }
@@ -152 +154 @@
         if (md.subs.numItems() > 0) {
                 s += openPar( tr("Subtitles") );
-                row++;
-                s += openItem();
-                s += "<td>" + tr("#", "Info for translators: this is a abbreviation for number") + "</td><td>" + 
-              tr("Type") + "</td><td>" +
-              tr("Language") + "</td><td>" + tr("Name") +"</td><td>" +
-              tr("ID", "Info for translators: this is a identification code") + "</td>";
-                s += closeItem();
+                s += addTrackColumns( QStringList() << "#" << tr("Type") << tr("Language") << tr("Name") << "ID" );
                 for (int n = 0; n < md.subs.numItems(); n++) {
+                        #ifndef INFO_SIMPLE_LAYOUT
                         row++;
+                        #endif
                         s += openItem();
                         QString t;
@@ -169 +167 @@
                         }
                         QString lang = md.subs.itemAt(n).lang();
-                        if (lang.isEmpty()) lang = "<i>&lt;"+tr("empty")+"&gt;</i>";
+                        if (lang.isEmpty()) lang = "<i>&lt;"+tr("undefined")+"&gt;</i>";
                         QString name = md.subs.itemAt(n).name();
-                        if (name.isEmpty()) name = "<i>&lt;"+tr("empty")+"&gt;</i>";
-                        /*
-                        s += QString("<td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td>")
-                 .arg(n).arg(t).arg(lang).arg(name)
-                 .arg(md.subs.itemAt(n).ID());
-                        */
-            s += "<td>" + QString::number(n) + "</td><td>" + t + 
-                 "</td><td>" + lang + "</td><td>" + name + 
-                 "</td><td>" + QString::number(md.subs.itemAt(n).ID()) + "</td>";
+                        if (name.isEmpty()) name = "<i>&lt;"+tr("undefined")+"&gt;</i>";
+                        s += addTrack(n, lang, name, md.subs.itemAt(n).ID(), t);
                         s += closeItem();
                 }
@@ -185 +176 @@
         }
 
-        return "<html><body bgcolor=\"white\"><font color=\"black\">"+ s + "</font></body></html>";
-}
-
-QString InfoFile::title(QString text) {
-        return "<h1>" + text + "</h1>";
+        QString page = "<html><head><style type=\"text/css\">" + style() + "</style></head><body>"+ s + "</body></html>";
+        //qDebug() << "InfoFile::getInfo:" << page;
+        return page;
+}
+
+
+#ifdef INFO_SIMPLE_LAYOUT
+QString InfoFile::title(QString text, QString /* icon */) {
+        return QString("<h1>%1</h1>").arg(text);
+}
+
+QString InfoFile::openPar(QString text) {
+        return "<h2>" + text + "</h2><ul>";
+}
+
+QString InfoFile::closePar() {
+        return "</ul>";
+}
+
+QString InfoFile::openItem() {
+        return "<li>";
+}
+
+QString InfoFile::closeItem() {
+        return "</li>";
+}
+
+QString InfoFile::addItem( QString tag, QString value ) {
+        return openItem() + QString("<b>%1</b>: %2").arg(tag).arg(value) + closeItem();
+}
+
+QString InfoFile::addTrackColumns(QStringList /* l */) {
+        return "";
+}
+
+QString InfoFile::addTrack(int n, QString lang, QString name, int ID, QString type) {
+        QString s = "<b>" + tr("Track %1").arg(n) + "</b>";
+        #if 1
+        s += "<ul>";
+        s += "<li>" + tr("Language: %1").arg(lang) + "</li>";
+        s += "<li>" + tr("Name: %1").arg(name) + "</li>";
+        s += "<li>" + tr("ID: %1").arg(ID) + "</li>";
+        if (!type.isEmpty()) {
+                s += "<li>" + tr("Type: %1").arg(type) + "</li>";
+        }
+        s += "</ul>";
+        #else
+        s += "<br>&nbsp;&bull; " + tr("Language: %1").arg(lang);
+        s += "<br>&nbsp;&bull; " + tr("Name: %1").arg(name);
+        s += "<br>&nbsp;&bull; " + tr("ID: %1").arg(ID);
+        if (!type.isEmpty()) {
+                s += "<br>&nbsp;&bull; " + tr("Type: %1").arg(type);
+        }
+        #endif
+        return s;
+}
+
+QString InfoFile::defaultStyle() {
+        return
+                "ul { margin: 0px; }"
+                //"body { background-color: gray; }"
+                "h2 { background-color: whitesmoke; color: navy;}"
+        ;
+}
+
+#else
+
+QString InfoFile::title(QString text, QString icon) {
+        return QString("<h1><img src=\"%1\">%2</h1>").arg(Images::file(icon)).arg(text);
 }
 
@@ -211 +266 @@
 QString InfoFile::closeItem() {
         return "</tr>";
+}
+
+QString InfoFile::addTrackColumns(QStringList l) {
+        row = 0;
+        QString s = openItem();
+        foreach(QString i, l) { s += "<td>" + i + "</td>"; }
+        s += closeItem();
+        return s;
 }
 
@@ -221 +284 @@
 }
 
-
-inline QString InfoFile::tr( const char * sourceText, const char * comment, int n )  {
-#if QT_VERSION >= 0x050000
-        return QCoreApplication::translate("InfoFile", sourceText, comment, n );
-#else
-        return QCoreApplication::translate("InfoFile", sourceText, comment, QCoreApplication::CodecForTr, n );
+QString InfoFile::addTrack(int n, QString lang, QString name, int ID, QString type) {
+        QString s = "<td>" + QString::number(n) + "</td>";
+        if (!type.isEmpty()) s += "<td>" + type + "</td>";
+        s += QString("<td>%1</td><td>%2</td><td>%3</td>").arg(lang).arg(name).arg(ID);
+        return s;
+}
+
+QString InfoFile::defaultStyle() {
+        return "";
+}
 #endif
-}
-
+
+QString InfoFile::style() {
+        QString s = defaultStyle();
+
+        QString stylesheet_file = Images::file("infofile.css");
+        qDebug() << "InfoFile::style: stylesheet_file:" << stylesheet_file;
+
+        QFile file(stylesheet_file);
+        if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                s = file.readAll();
+        }
+
+        return s;
+}
+
+#include "moc_infofile.cpp"