Variables in svg attributes

build/depends.py

@@ -194,7 +194,7 @@ def enabled_modules(build):
         qt_modules = [
             'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg',
             'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork',
-            'QtTest'
+            'QtTest', 'QtScriptTools'
         ]
         if qt5:
             qt_modules.extend(['QtWidgets', 'QtConcurrent'])
@@ -866,6 +866,8 @@ def sources(self, build):
                    "skin/colorschemeparser.cpp",
                    "skin/tooltips.cpp",
                    "skin/skincontext.cpp",
+                   "skin/svgparser.cpp",
+                   "skin/pixmapsource.cpp",
 
                    "sampleutil.cpp",
                    "trackinfoobject.cpp",

script/console/__init__.js

@@ -0,0 +1,21 @@
+__setupPackage__(__extension__);
+/**
+ * This is a fake Firebug console api. To debug scripts a few more like in
+ * javascript.
+ * 
+ * More info :
+ * http://blog.qt.digia.com/blog/2012/03/01/debugging-qt-quick-2-console-api/
+ * 
+ */
+
+
+console = {
+    log : function(){
+        var out = [],
+            i   = 0;
+        for( ; i<arguments.length; i++ ){
+            out.push( JSON.stringify(arguments[i]) );
+        }
+        print(out.join(' '));
+    }
+}

script/svg/__init__.js

@@ -0,0 +1,57 @@
+__setupPackage__(__extension__);
+/**
+ * This extension provides the api to add hooks into attributes in
+ * the SVG parser.
+ */
+svg.templateHooks = {};
+
+svg.regexpQuote = function (str, delimiter) {
+    return String(str).replace(
+        new RegExp(
+            '[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\' + (delimiter || '') + '-]',
+            'g'
+        ),
+        '\\$&'
+    );
+}
+
+svg.getHooksPattern = function(){
+    var hookNames = [],
+        that = this;
+    for( var i in this.templateHooks )
+        hookNames.push(i);
+
+    // hook_name( arg1 [, arg2]... )
+    if( hookNames.length ){
+        var pattern = "("+hookNames.join('|')+")\\(([^\\(\\)]+)\\)\\s*;?";
+        return pattern;
+    }
+}
+
+global = this;
+svg.templateHooks.variable = function( varName ){
+    if( varName in global ){
+        return global[varName];
+    }
+    return '';
+}
+
+svg.templateHooks.prop = function( propName, varName ){
+    var out = '';
+
+    if( (varName in global) ){
+        var value = global[varName];
+
+        if( isNumber(value) ){
+            out = propName + ':' + value + ';';
+        } else if( value.length ) {
+            out = propName + ':' + value + ';';
+        }
+
+    } else {
+        console.log( 'Unable to find ' + varName + ' for prop hook.' );
+    }
+
+    return out;
+}
+

src/mixxx.cpp

@@ -1321,7 +1321,7 @@ void MixxxMainWindow::initActions()
     m_pDeveloperTools->setShortcut(
         QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
                                                   "OptionsMenu_DeveloperTools"),
-                                                  tr("Ctrl+Shift+D"))));
+                                                  tr("Ctrl+Shift+T"))));
     m_pDeveloperTools->setShortcutContext(Qt::ApplicationShortcut);
     m_pDeveloperTools->setStatusTip(developerToolsText);
     m_pDeveloperTools->setWhatsThis(buildWhatsThis(developerToolsTitle, developerToolsText));
@@ -1362,6 +1362,29 @@ void MixxxMainWindow::initActions()
     connect(m_pDeveloperStatsBase, SIGNAL(triggered()),
             this, SLOT(slotDeveloperStatsBase()));
 
+
+
+
+    QString scriptDebuggerTitle = tr("Debugger Enabled");
+    QString scriptDebuggerText = tr("Enables the debugger during skin parsing");
+    bool scriptDebuggerEnabled = m_pConfig->getValueString(
+        ConfigKey("[ScriptDebugger]", "Enabled")) == "1";
+    m_pDeveloperDebugger = new QAction(scriptDebuggerTitle, this);
+
+    m_pDeveloperDebugger->setShortcut(
+        QKeySequence(m_pKbdConfig->getValueString(ConfigKey("[KeyboardShortcuts]",
+                                                  "DeveloperMenu_EnableDebugger"),
+                                                  tr("Ctrl+Shift+D"))));
+    m_pDeveloperDebugger->setShortcutContext(Qt::ApplicationShortcut);
+    m_pDeveloperDebugger->setWhatsThis(buildWhatsThis(keyboardShortcutTitle, keyboardShortcutText));
+    m_pDeveloperDebugger->setCheckable(true);
+    m_pDeveloperDebugger->setStatusTip(scriptDebuggerText);
+    m_pDeveloperDebugger->setChecked(scriptDebuggerEnabled);
+    connect(m_pDeveloperDebugger, SIGNAL(toggled(bool)),
+            this, SLOT(slotDeveloperDebugger(bool)));
+
+
+
     // TODO: This code should live in a separate class.
     m_TalkoverMapper = new QSignalMapper(this);
     connect(m_TalkoverMapper, SIGNAL(mapped(int)),
@@ -1439,6 +1462,7 @@ void MixxxMainWindow::initMenuBar()
     m_pDeveloperMenu->addAction(m_pDeveloperTools);
     m_pDeveloperMenu->addAction(m_pDeveloperStatsExperiment);
     m_pDeveloperMenu->addAction(m_pDeveloperStatsBase);
+    m_pDeveloperMenu->addAction(m_pDeveloperDebugger);
 
     // menuBar entry helpMenu
     m_pHelpMenu->addAction(m_pHelpSupport);
@@ -1545,6 +1569,11 @@ void MixxxMainWindow::slotDeveloperTools() {
     m_pDeveloperToolsDlg->activateWindow();
 }
 
+void MixxxMainWindow::slotDeveloperDebugger(bool toggle) {
+    m_pConfig->set(ConfigKey("[ScriptDebugger]","Enabled"),
+                   ConfigValue(toggle ? 1 : 0));
+}
+
 void MixxxMainWindow::slotDeveloperToolsClosed() {
     m_pDeveloperToolsDlg = NULL;
 }
@@ -1567,6 +1596,8 @@ void MixxxMainWindow::slotDeveloperStatsBase() {
     }
 }
 
+
+
 void MixxxMainWindow::slotViewFullScreen(bool toggle)
 {
     if (m_pViewFullScreen)

src/mixxx.h

@@ -126,6 +126,8 @@ class MixxxMainWindow : public QMainWindow {
     void slotDeveloperToolsClosed();
     void slotDeveloperStatsExperiment();
     void slotDeveloperStatsBase();
+    // toogle the script debugger
+    void slotDeveloperDebugger(bool toggle);
 
     void slotToCenterOfPrimaryScreen();
 
@@ -246,6 +248,7 @@ class MixxxMainWindow : public QMainWindow {
     QAction* m_pDeveloperStatsExperiment;
     QAction* m_pDeveloperStatsBase;
     DlgDeveloperTools* m_pDeveloperToolsDlg;
+    QAction* m_pDeveloperDebugger;
 
     int m_iNoPlaylists;
 

src/skin/legacyskinparser.cpp

@@ -325,7 +325,7 @@ QWidget* LegacySkinParser::parseSkin(QString skinPath, QWidget* pParent) {
     // created parent so MixxxMainWindow can use it for nefarious purposes (
     // fullscreen mostly) --bkgood
     m_pParent = pParent;
-    m_pContext = new SkinContext();
+    m_pContext = new SkinContext(m_pConfig, skinPath + "/skin.xml");
     m_pContext->setSkinBasePath(skinPath.append("/"));
     QList<QWidget*> widgets = parseNode(skinDocument);
 
@@ -1338,7 +1338,8 @@ QList<QWidget*> LegacySkinParser::parseTemplate(QDomElement node) {
     // Take any <SetVariable> elements from this node and update the context
     // with them.
     m_pContext->updateVariables(node);
-
+    m_pContext->setXmlPath(path);
+
     QList<QWidget*> widgets;
 
     QDomNode child = templateNode.firstChild();

src/skin/pixmapsource.cpp

@@ -0,0 +1,59 @@
+#include <QtDebug>
+
+#include "skin/pixmapsource.h"
+
+PixmapSource::PixmapSource() {
+}
+
+PixmapSource::PixmapSource(const QString &filepath) {
+    setPath(filepath);
+}
+
+PixmapSource::~PixmapSource() {
+}
+
+QByteArray PixmapSource::getData() const {
+    return m_baData;
+}
+
+QString PixmapSource::getPath() const {
+    return m_path;
+}
+
+void PixmapSource::setPath(const QString &newPath) {
+    m_baData.truncate(0);
+    m_path = newPath;
+    if (m_path.endsWith(".svg", Qt::CaseInsensitive)) {
+        m_eType = SVG;
+    } else {
+        m_eType = BITMAP;
+    }
+}
+
+bool PixmapSource::isEmpty() const {
+    return m_path.isEmpty() && m_baData.isEmpty() ;
+}
+
+bool PixmapSource::isSVG() const {
+    return m_eType == SVG;
+}
+
+bool PixmapSource::isBitmap() const {
+    return m_eType == BITMAP;
+}
+
+void PixmapSource::setSVG(const QByteArray &content) {
+    m_baData = content;
+    m_eType = SVG;
+}
+
+QString PixmapSource::getId() const {
+    quint16 checksum;
+    if (m_baData.isEmpty()) {
+        checksum = qChecksum( m_path.toAscii().constData(), m_path.length() );
+    } else {
+        checksum = qChecksum( m_baData.constData(), m_baData.length() );
+    }
+    return m_path + QString::number(checksum);
+}
+

src/skin/pixmapsource.h

@@ -0,0 +1,32 @@
+#ifndef PIXMAPSOURCE_H
+#define PIXMAPSOURCE_H
+
+// A class representing an image source for a pixmap
+// A bundle of a file path, raw data or inline svg
+class PixmapSource {
+  public:
+    PixmapSource();
+    PixmapSource(const QString &filepath);
+    virtual ~PixmapSource();
+
+    bool isEmpty() const;
+    bool isSVG() const;
+    bool isBitmap() const;
+    void setSVG(const QByteArray &content);
+    void setPath(const QString &newPath);
+    QString getPath() const;
+    QByteArray getData() const;
+    QString getId() const;
+
+  private:
+    enum Type {
+        SVG,
+        BITMAP
+    };
+
+    QString m_path;
+    QByteArray m_baData;
+    enum Type m_eType;
+};
+
+#endif /* PIXMAPSOURCE_H */