Merge lp:~mixxxdevelopers/mixxx/features_promo into lp:~mixxxdevelopers/mixxx/trunk

[Albert Santoni]

[Albert Santoni (gamegod)]

Fixed the conflicts... does this regenerate the diff?

review: Needs Resubmitting

[RJ Skerry-Ryan (rryan)]

Yea Launchpad is weird like this with regenerating diffs. I think the old merge proposal updated. The feature looks good -- I have a couple comments:

- The local and remote URL strings have 1.8.0~1 written into them. Can you use
  defs_version.h and automatically generate that?

- You add getTracksToAutoLoad() to Library, along with a pointer to the
  PromoTracksFeature and a 'firstRun' bool parameter to the Library
  constructor. Ideally we would have a static createDefaultLibrary() method or
  something so that the constructor for Library does not add its own features. I
  can see that you had to add the PromoTracksFeature into the Library in order
  to insert it at the right position. Also, you needed to know the right index
  to set the default sidebar model thing.

  Ideally, MixxxApp would create the PromoTracksFeature and use it
  directly.. also the firstLoad thing is only used in MixxxApp directly
  following the library construction. There should be some external way
  to set the default feature to load (maybe a default false argument to
  addFeature). Someday we should fix that, but for today it seems fine
  to add getTracksToAutoLoad() to the Library.

- Can you remove the 'Created by' and 'FORK FORK FORK' messages from the top of
  the files? They aren't accurate :).

review: Approve

[Albert Santoni (gamegod)]

On Tue, Feb 2, 2010 at 8:25 PM, RJ Ryan <email address hidden> wrote:
> Review: Approve
> Yea Launchpad is weird like this with regenerating diffs. I think the old merge proposal updated. The feature looks good -- I have a couple comments:
>
> - The local and remote URL strings have 1.8.0~1 written into them. Can you use
>  defs_version.h and automatically generate that?

Fixed
>
> - You add getTracksToAutoLoad() to Library, along with a pointer to the
>  PromoTracksFeature and a 'firstRun' bool parameter to the Library
>  constructor. Ideally we would have a static createDefaultLibrary() method or
>  something so that the constructor for Library does not add its own features. I
>  can see that you had to add the PromoTracksFeature into the Library in order
>  to insert it at the right position. Also, you needed to know the right index
>  to set the default sidebar model thing.
>
>  Ideally, MixxxApp would create the PromoTracksFeature and use it
>  directly.. also the firstLoad thing is only used in MixxxApp directly
>  following the library construction. There should be some external way
>  to set the default feature to load (maybe a default false argument to
>  addFeature). Someday we should fix that, but for today it seems fine
>  to add getTracksToAutoLoad() to the Library.

Agreed, we can refactor this at some point.

>
> - Can you remove the 'Created by' and 'FORK FORK FORK' messages from the top of
>  the files? They aren't accurate :).
>
>

Updated the copyright headers on those files...

Thanks for the speedy review!
Albert

[lp:~mixxxdevelopers/mixxx/features_promo]

2264. By Albert Santoni on 2010-02-03

* As per RJ's code review:
  * Fixed hardcoded version strings in promo URLs
  * Added copyright header to promo tracks files

2265. By Albert Santoni on 2010-02-03

Merge updates from trunk

=== modified file 'mixxx/build/qt4.py'
--- mixxx/build/qt4.py	2009-08-17 20:28:30 +0000
+++ mixxx/build/qt4.py	2010-02-03 05:15:24 +0000
@@ -386,6 +386,7 @@
 		'QtDesigner',
 		'QtDBUS',
 		'QtScript',
+		'QtWebKit',
 		'QtXmlPatterns'
 		]
 	pclessModules = [

=== added directory 'mixxx/res/promo'
=== modified file 'mixxx/src/SConscript'
--- mixxx/src/SConscript	2010-01-29 19:38:32 +0000
+++ mixxx/src/SConscript	2010-02-03 05:15:24 +0000
@@ -425,6 +425,8 @@
                 library/dao/settingsdao.cpp
                 library/librarymidicontrol.cpp
                 library/schemamanager.cpp
+                library/promotracksfeature.cpp
+                library/promotrackswebview.cpp
 
                 xmlparse.cpp
                 parser.cpp
@@ -652,7 +654,8 @@
 		'QtSvg',
 		'QtSql',
 		'QtScript',
-		'QtXmlPatterns'
+		'QtXmlPatterns',
+		'QtWebKit'
 		#'QtUiTools',
 		#'QtDesigner',
 		#'QtWebKit',
@@ -671,13 +674,14 @@
 	env.Append(LINKFLAGS='-framework OpenGL')
 
 	#QT4
-	env.Append(LINKFLAGS = '-framework QtCore -framework QtOpenGL -framework Qt3Support -framework QtGui -framework QtSql -framework QtXml -framework QtXmlPatterns  -framework QtNetwork -framework QtSql -framework QtScript')
+	env.Append(LINKFLAGS = '-framework QtCore -framework QtOpenGL -framework Qt3Support -framework QtGui -framework QtSql -framework QtXml -framework QtXmlPatterns  -framework QtNetwork -framework QtSql -framework QtScript -framework QtWebKit')
 	env.Append(CPPPATH = ['/Library/Frameworks/QtCore.framework/Headers/',
 				'/Library/Frameworks/QtOpenGL.framework/Headers/',
 				'/Library/Frameworks/Qt3Support.framework/Headers/',
 				'/Library/Frameworks/QtGui.framework/Headers/',
 				'/Library/Frameworks/QtXml.framework/Headers/',
 				'/Library/Frameworks/QtSql.framework/Headers/',
+				'/Library/Frameworks/QtWebKit.framework/Headers/',
 				'/Library/Frameworks/QtScript.framework/Headers/'])
 
 	#Non-standard libpaths for fink and darwin ports
@@ -741,6 +745,7 @@
 	env.Append(LIBS = 'QtGui')
 	env.Append(LIBS = 'QtCore')
 	env.Append(LIBS = 'QtOpenGL')
+	env.Append(LIBS = 'QtWebKit')
 	env.Append(LIBS = 'QtScript')
 	env.Append(LIBS = 'sndfile') #? we shouldn't have to do this...
 	env.Append(LIBS = 'vorbisfile') #? we shouldn't have to do this...
@@ -752,6 +757,7 @@
 	env.Append(LIBS = 'QtSql4');
 	env.Append(LIBS = 'QtGui4');
 	env.Append(LIBS = 'QtCore4');
+	env.Append(LIBS = 'QtWebKit4');
 	env.Append(LIBS = 'QtOpenGL4');
 	env.Append(LIBS = 'WinMM'); #Needed for Midi stuff
 	env.Append(LIBS = 'ogg_static')

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2010-01-31 09:15:16 +0000
+++ mixxx/src/library/library.cpp	2010-02-03 05:15:24 +0000
@@ -18,6 +18,7 @@
 #include "library/autodjfeature.h"
 #include "library/playlistfeature.h"
 #include "library/preparefeature.h"
+#include "library/promotracksfeature.h"
 
 #include "wtracktableview.h"
 #include "widget/wlibrary.h"
@@ -29,15 +30,30 @@
 // WLibrary
 const QString Library::m_sTrackViewName = QString("WTrackTableView");
 
-Library::Library(QObject* parent, ConfigObject<ConfigValue>* pConfig)
+Library::Library(QObject* parent, ConfigObject<ConfigValue>* pConfig, bool firstRun)
     : m_pConfig(pConfig) {
     m_pTrackCollection = new TrackCollection(pConfig);
     m_pSidebarModel = new SidebarModel(parent);
     m_pLibraryMIDIControl = NULL;  //Initialized in bindWidgets
+
+    //Show the promo tracks view on first run, otherwise show the library
+    if (firstRun) {
+        qDebug() << "First Run, switching to PROMO view!";
+        m_pSidebarModel->setDefaultSelection(1);
+        //Note the promo tracks item has index=1... hardcoded hack. :/
+    }
+
     // TODO(rryan) -- turn this construction / adding of features into a static
     // method or something -- CreateDefaultLibrary
     m_pMixxxLibraryFeature = new MixxxLibraryFeature(this, m_pTrackCollection);
     addFeature(m_pMixxxLibraryFeature);
+    if(PromoTracksFeature::isSupported(m_pConfig)) {
+        m_pPromoTracksFeature = new PromoTracksFeature(this, pConfig, 
+                                                       m_pTrackCollection);
+        addFeature(m_pPromoTracksFeature);
+    }
+    else
+        m_pPromoTracksFeature = NULL;
     addFeature(new AutoDJFeature(this, pConfig, m_pTrackCollection));
     m_pPlaylistFeature = new PlaylistFeature(this, m_pTrackCollection);
     addFeature(m_pPlaylistFeature);
@@ -81,7 +97,7 @@
 
     connect(this, SIGNAL(switchToView(const QString&)),
             pLibraryWidget, SLOT(switchToView(const QString&)));
-
+    
     m_pLibraryMIDIControl = new LibraryMIDIControl(pLibraryWidget, pSidebarWidget);
 
     // Setup the sources view
@@ -90,6 +106,12 @@
             m_pSidebarModel, SLOT(clicked(const QModelIndex&)));
     connect(pSidebarWidget, SIGNAL(rightClicked(const QPoint&, const QModelIndex&)),
             m_pSidebarModel, SLOT(rightClicked(const QPoint&, const QModelIndex&)));
+    
+    QListIterator<LibraryFeature*> feature_it(m_features);
+    while(feature_it.hasNext()) {
+        LibraryFeature* feature = feature_it.next();
+        feature->bindWidget(pSidebarWidget, pLibraryWidget);
+    }
 
     // Enable the default selection
     pSidebarWidget->selectionModel()
@@ -97,11 +119,6 @@
                  QItemSelectionModel::SelectCurrent);
     m_pSidebarModel->activateDefaultSelection();
 
-    QListIterator<LibraryFeature*> feature_it(m_features);
-    while(feature_it.hasNext()) {
-        LibraryFeature* feature = feature_it.next();
-        feature->bindWidget(pSidebarWidget, pLibraryWidget);
-    }
 }
 
 void Library::addFeature(LibraryFeature* feature) {
@@ -155,3 +172,11 @@
 {
     m_pPlaylistFeature->slotCreatePlaylist();
 }
+
+QList<TrackInfoObject*> Library::getTracksToAutoLoad()
+{
+    if (m_pPromoTracksFeature)
+        return m_pPromoTracksFeature->getTracksToAutoLoad();
+    else
+        return QList<TrackInfoObject*>();
+}

=== modified file 'mixxx/src/library/library.h'
--- mixxx/src/library/library.h	2009-12-30 23:56:16 +0000
+++ mixxx/src/library/library.h	2010-02-03 05:15:24 +0000
@@ -23,6 +23,7 @@
 class WLibrary;
 class WSearchLineEdit;
 class MixxxLibraryFeature;
+class PromoTracksFeature;
 class PlaylistFeature;
 class LibraryMIDIControl;
 
@@ -30,12 +31,14 @@
     Q_OBJECT
 public:
     Library(QObject* parent,
-            ConfigObject<ConfigValue>* pConfig);
+            ConfigObject<ConfigValue>* pConfig,
+            bool firstRun);
     virtual ~Library();
 
     void bindWidget(WLibrarySidebar* sidebarWidget,
                     WLibrary* libraryWidget);
     void addFeature(LibraryFeature* feature);
+    QList<TrackInfoObject*> getTracksToAutoLoad();
 
     // TODO(rryan) Transitionary only -- the only reason this is here is so the
     // waveform widgets can signal to a player to load a track. This can be
@@ -71,6 +74,7 @@
     const static QString m_sAutoDJViewName;
     MixxxLibraryFeature* m_pMixxxLibraryFeature;
     PlaylistFeature* m_pPlaylistFeature;
+    PromoTracksFeature* m_pPromoTracksFeature;
     LibraryMIDIControl* m_pLibraryMIDIControl;
 };
 

=== added file 'mixxx/src/library/promotracksfeature.cpp'
--- mixxx/src/library/promotracksfeature.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/promotracksfeature.cpp	2010-02-03 05:15:24 +0000
@@ -0,0 +1,140 @@
+/***************************************************************************
+                          promotracksfeature.cpp
+                             -------------------
+    begin                : Jan 2010
+    copyright            : (C) 2010 Albert Santoni
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include <QtDebug>
+
+#include "library/promotracksfeature.h"
+#include "library/promotrackswebview.h"
+#include "library/proxytrackmodel.h"
+#include "library/trackcollection.h"
+#include "trackinfoobject.h"
+#include "defs_version.h"
+#include "widget/wlibrary.h"
+#include "widget/wlibrarysidebar.h"
+
+const QString PromoTracksFeature::m_sPromoTracksViewName = tr("Featured Artists");
+QString PromoTracksFeature::m_sPromoLocalHTMLLocation;
+QString PromoTracksFeature::m_sPromoRemoteHTMLLocation;
+#define LOCAL_HTML_LOCATION (config->getConfigPath() + "/promo/" + VERSION + "/index.html")
+
+PromoTracksFeature::PromoTracksFeature(QObject* parent,
+                             ConfigObject<ConfigValue>* config,
+                             TrackCollection* pTrackCollection)
+        : LibraryFeature(parent),
+          m_pConfig(config),
+          m_pPromoTracksView(NULL),
+          m_pTrackCollection(pTrackCollection) {
+
+    m_sPromoRemoteHTMLLocation = QString("http://promo.mixxx.org/%1/index.html").arg(VERSION); //m_pConfig->getConfigPath() + "/promo/promotracks.html";
+    m_sPromoLocalHTMLLocation = LOCAL_HTML_LOCATION;
+    m_sPromoAutoloadLocation = m_pConfig->getConfigPath() + "/promo/" + VERSION + "/autoload.dat";
+
+    //Load the extra.dat file so we can peek at some extra information, such 
+    //as which songs to auto-load into Mixxx's players.
+    QFile file(m_sPromoAutoloadLocation);
+    if (file.open(QIODevice::ReadOnly))
+    {
+        QTextStream extra(&file);
+        
+        qDebug() << "PROMO: Autoload" << (file.exists() ? "" : "not") << "found";
+        while (!extra.atEnd())
+        {
+            QString trackPath = extra.readLine();
+            qDebug() << "PROMO: Auto-loading track" << trackPath;
+            m_tracksToAutoLoad.append(new TrackInfoObject(trackPath));
+        }
+        file.close();
+    }
+}
+
+PromoTracksFeature::~PromoTracksFeature() {
+}
+
+QVariant PromoTracksFeature::title() {
+    return m_sPromoTracksViewName;
+}
+
+QIcon PromoTracksFeature::getIcon() {
+    return QIcon();
+}
+
+bool PromoTracksFeature::isSupported(ConfigObject<ConfigValue>* config) {
+    m_sPromoLocalHTMLLocation = LOCAL_HTML_LOCATION;
+    qDebug() << "Promo dir:" << m_sPromoLocalHTMLLocation;
+    return (QFile::exists(m_sPromoLocalHTMLLocation));
+}
+
+QList<TrackInfoObject*> PromoTracksFeature::getTracksToAutoLoad()
+{
+    return m_tracksToAutoLoad;
+}
+
+void PromoTracksFeature::bindWidget(WLibrarySidebar* sidebarWidget,
+                               WLibrary* libraryWidget) {
+
+    m_pPromoTracksView = new PromoTracksWebView(libraryWidget, m_pConfig->getConfigPath(), m_sPromoLocalHTMLLocation, m_sPromoRemoteHTMLLocation);
+
+    libraryWidget->registerView(m_sPromoTracksViewName, m_pPromoTracksView);
+    connect(m_pPromoTracksView, SIGNAL(loadTrack(TrackInfoObject*)),
+            this, SIGNAL(loadTrack(TrackInfoObject*)));
+    connect(m_pPromoTracksView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+}
+
+QAbstractItemModel* PromoTracksFeature::getChildModel() {
+    return &m_childModel;
+}
+
+void PromoTracksFeature::activate() {
+    //qDebug() << "PromoTracksFeature::activate()";
+    //emit(showTrackModel(m_pPromoTracksTableModelProxy));
+    
+    /*
+    if (m_pPromoTracksView->page()->bytesReceived() == 0) {
+        qDebug() << "PROMO: Loading local page";
+        m_pPromoTracksView->load(m_sPromoLocalHTMLLocation);
+    }*/
+    emit(switchToView(m_sPromoTracksViewName));
+}
+
+void PromoTracksFeature::activateChild(const QModelIndex& index) {
+
+}
+
+void PromoTracksFeature::onRightClick(const QPoint& globalPos) {
+}
+
+void PromoTracksFeature::onRightClickChild(const QPoint& globalPos,
+                                            QModelIndex index) {
+}
+
+bool PromoTracksFeature::dropAccept(QUrl url) {
+    return false;
+}
+
+bool PromoTracksFeature::dropAcceptChild(const QModelIndex& index, QUrl url) {
+    return false;
+}
+
+bool PromoTracksFeature::dragMoveAccept(QUrl url) {
+    return false;
+}
+
+bool PromoTracksFeature::dragMoveAcceptChild(const QModelIndex& index,
+                                              QUrl url) {
+    return false;
+}

=== added file 'mixxx/src/library/promotracksfeature.h'
--- mixxx/src/library/promotracksfeature.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/promotracksfeature.h	2010-02-03 05:15:24 +0000
@@ -0,0 +1,75 @@
+/***************************************************************************
+                          promotracksfeature.cpp
+                             -------------------
+    begin                : Jan 2010
+    copyright            : (C) 2010 Albert Santoni
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#ifndef PROMOTRACKSFEATURE_H 
+#define PROMOTRACKSFEATURE_H
+
+#include <QStringListModel>
+
+#include "library/libraryfeature.h"
+#include "library/dao/playlistdao.h"
+#include "configobject.h"
+
+class PlaylistTableModel;
+class ProxyTrackModel;
+class TrackCollection;
+class TrackInfoObject;
+class PromoTracksWebView;
+
+class PromoTracksFeature : public LibraryFeature {
+    Q_OBJECT
+    public:
+    PromoTracksFeature(QObject* parent,
+                  ConfigObject<ConfigValue>* pConfig,
+                  TrackCollection* pTrackCollection);
+    virtual ~PromoTracksFeature();
+    static bool isSupported(ConfigObject<ConfigValue>* config);
+    QList<TrackInfoObject*> getTracksToAutoLoad();
+
+    QVariant title();
+    QIcon getIcon();
+
+    bool dropAccept(QUrl url);
+    bool dropAcceptChild(const QModelIndex& index, QUrl url);
+    bool dragMoveAccept(QUrl url);
+    bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
+
+    void bindWidget(WLibrarySidebar* sidebarWidget,
+                    WLibrary* libraryWidget);
+
+    QAbstractItemModel* getChildModel();
+
+public slots:
+    void activate();
+    void activateChild(const QModelIndex& index);
+    void onRightClick(const QPoint& globalPos);
+    void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+
+private:
+    ConfigObject<ConfigValue>* m_pConfig;
+    TrackCollection* m_pTrackCollection;
+    PromoTracksWebView* m_pPromoTracksView;
+    const static QString m_sPromoTracksViewName;
+    static QString m_sPromoLocalHTMLLocation;
+    static QString m_sPromoRemoteHTMLLocation;
+    QString m_sPromoAutoloadLocation;
+    QStringListModel m_childModel;
+    QList<TrackInfoObject*> m_tracksToAutoLoad;
+};
+
+
+#endif /* PROMOTRACKSFEATURE_H */

=== added file 'mixxx/src/library/promotrackswebview.cpp'
--- mixxx/src/library/promotrackswebview.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/promotrackswebview.cpp	2010-02-03 05:15:24 +0000
@@ -0,0 +1,124 @@
+/***************************************************************************
+                          promotrackswebview.cpp
+                             -------------------
+    begin                : Jan 2010
+    copyright            : (C) 2010 Albert Santoni
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#include <QtXml>
+#include <QDebug>
+#include <QDesktopServices>
+#include "promotrackswebview.h"
+
+#define LOAD_TIMEOUT 5000
+
+PromoTracksWebView::PromoTracksWebView(QWidget* parent, QString mixxxPath, QString localURL, QString remoteURL) : QWebView(parent), LibraryView()
+{
+    m_sMixxxPath = mixxxPath;
+    m_sLocalURL = localURL;
+    m_sRemoteURL = remoteURL;
+    m_bOfflineMode = false;
+
+    QWidget::setContextMenuPolicy(Qt::PreventContextMenu);
+
+    //Allow us to catch if opening the HTML file on promo.mixxx.org
+    //fails, and display a local copy instead.
+    connect(this, SIGNAL(loadFinished(bool)),
+            this, SLOT(handleLoadFinished(bool)));
+    
+    //Load the promo tracks webpage 
+    QWebView::load(QUrl(m_sRemoteURL));
+
+    //Let us manually handle links that are clicked via the linkClicked()
+    //signal...
+    QWebPage* page = QWebView::page();
+    page->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+
+    connect(this, SIGNAL(linkClicked(const QUrl&)), 
+            this, SLOT(handleClickedLink(const QUrl&)));
+
+    QTimer* loadingTimer = new QTimer(this);
+    connect(loadingTimer, SIGNAL(timeout()), 
+            this, SLOT(checkWebpageLoadingProgress()));
+    loadingTimer->start(LOAD_TIMEOUT);
+}
+
+PromoTracksWebView::~PromoTracksWebView()
+{
+
+}
+
+void PromoTracksWebView::setup(QDomNode node)
+{
+
+}
+
+QString PromoTracksWebView::userAgentForUrl (const QUrl & url) const
+{
+    return QCoreApplication::applicationName() + " " + QCoreApplication::applicationVersion();
+}
+
+void PromoTracksWebView::handleLoadFinished(bool ok)
+{
+    //If the remote webpage failed to load, show the
+    //local copy of it.
+    if (!ok)
+    {
+        /* This doesn't work inside this signal handler for some reason:
+        QWebView::stop();
+        QWebView::load(QUrl(m_sLocalURL));
+        */
+        m_bOfflineMode = true;
+        qDebug() << "PROMO: Loading local copy at" << m_sLocalURL;
+    }
+}
+
+void PromoTracksWebView::checkWebpageLoadingProgress()
+{
+    if (QWebView::page()->bytesReceived() == 0) {
+        qDebug() << "PROMO: Load timed out, loading local page";
+        QWebView::stop();
+        QWebView::load(QUrl(m_sLocalURL));
+        m_bOfflineMode = true;
+    }
+}
+
+void PromoTracksWebView::handleClickedLink(const QUrl& url)
+{
+    qDebug() << "link clicked!" << url; 
+
+    if (url.scheme() == "deck1")
+    {
+        TrackInfoObject* track = new TrackInfoObject(m_sMixxxPath + "/" + url.path());
+        emit(loadTrackToPlayer(track, 1));
+    }
+    else if (url.scheme() == "deck2")
+    {
+        TrackInfoObject* track = new TrackInfoObject(m_sMixxxPath + "/" + url.path());
+        emit(loadTrackToPlayer(track, 2));
+    }
+    else
+    {
+        QDesktopServices::openUrl(url);
+    }
+    //emit(loadTrack(track));
+    //int player = 1;
+    //emit(loadTrackToPlayer(track, player));
+}
+
+//TODO: Implement this for MIDI control
+void PromoTracksWebView::keyPressEvent(QKeyEvent* event)
+{
+    //Look at WTrackTableView::keyPressEvent(...) for some
+    //code to start with...
+}

=== added file 'mixxx/src/library/promotrackswebview.h'
--- mixxx/src/library/promotrackswebview.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/promotrackswebview.h	2010-02-03 05:15:24 +0000
@@ -0,0 +1,62 @@
+/***************************************************************************
+                          promotrackswebview.h
+                             -------------------
+    begin                : Jan 2010
+    copyright            : (C) 2010 Albert Santoni
+    email                : [e-mail]
+***************************************************************************/
+
+/***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************/
+
+#ifndef __PROMOTRACKSWEBVIEW_H_
+#define __PROMOTRACKSWEBVIEW_H_
+
+#include <QWebView>
+#include <QUrl>
+#include "trackinfoobject.h"
+#include "library/libraryview.h"
+
+#define MIXXX_PROMO_HTML_LOCATION "promo/promotracks.html"
+
+class PromoTracksWebView : public QWebView, public LibraryView
+{
+    Q_OBJECT 
+    public:
+        PromoTracksWebView(QWidget* parent, QString mixxxPath, 
+                           QString localURL, QString remoteURL);
+        ~PromoTracksWebView();
+        virtual void setup(QDomNode node);
+        virtual void onSearchStarting() {};
+        virtual void onSearchCleared()  {};
+        virtual void onSearch(const QString&) {};
+        virtual void onShow() {};
+        virtual QWidget* getWidgetForMIDIControl() { return this; };
+        virtual void keyPressEvent(QKeyEvent* event);
+
+    public slots: 
+        void handleClickedLink(const QUrl& url);
+        void handleLoadFinished(bool ok);
+        void checkWebpageLoadingProgress();
+
+    signals:
+        void loadTrack(TrackInfoObject* pTrack);
+        void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    protected:
+        virtual QString userAgentForUrl (const QUrl & url) const;
+
+    private:
+        QString m_sMixxxPath; /** Top-level path to directory that contains the promo directory. */
+        QString m_sLocalURL; /** URL to local copy of the promo tracks web page. */
+        QString m_sRemoteURL; /** URL to remotely hosted (promo.mixxx.org) copy of promo tracks web page.*/
+        bool m_bOfflineMode; /** Load promo tracks page locally if we're offline */
+};
+
+
+#endif //__PROMOTRACKSWEBVIEW_H_

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp	2010-01-31 09:15:16 +0000
+++ mixxx/src/library/sidebarmodel.cpp	2010-02-03 05:15:24 +0000
@@ -6,8 +6,8 @@
 #include "library/sidebarmodel.h"
 
 SidebarModel::SidebarModel(QObject* parent)
-    : QAbstractItemModel(parent) {
-
+    : m_iDefaultSelectedIndex(0),
+      QAbstractItemModel(parent) {
 }
 
 SidebarModel::~SidebarModel() {
@@ -34,12 +34,17 @@
 QModelIndex SidebarModel::getDefaultSelection() {
     if (m_sFeatures.size() == 0)
         return QModelIndex();
-    return createIndex(0, 0, (void*)this);
+    return createIndex(m_iDefaultSelectedIndex, 0, (void*)this);
+}
+
+void SidebarModel::setDefaultSelection(unsigned int index)
+{
+    m_iDefaultSelectedIndex = index;
 }
 
 void SidebarModel::activateDefaultSelection() {
     if (m_sFeatures.size() > 0) {
-        m_sFeatures[0]->activate();
+        m_sFeatures[m_iDefaultSelectedIndex]->activate();
     }
 }
 

=== modified file 'mixxx/src/library/sidebarmodel.h'
--- mixxx/src/library/sidebarmodel.h	2009-10-24 09:07:58 +0000
+++ mixxx/src/library/sidebarmodel.h	2010-02-03 05:15:24 +0000
@@ -19,6 +19,7 @@
 
     void addLibraryFeature(LibraryFeature* feature);
     QModelIndex getDefaultSelection();
+    void setDefaultSelection(unsigned int index);
     void activateDefaultSelection();
 
     // Required for QAbstractItemModel
@@ -56,6 +57,7 @@
   private:
     QModelIndex translateSourceIndex(const QModelIndex& parent);
     QList<LibraryFeature*> m_sFeatures;
+    unsigned int m_iDefaultSelectedIndex; /** Index of the item in the sidebar model to select at startup. */
 };
 
 #endif /* SIDEBARMODEL_H */

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2010-02-03 04:37:15 +0000
+++ mixxx/src/mixxx.cpp	2010-02-03 05:15:24 +0000
@@ -72,7 +72,7 @@
 MixxxApp::MixxxApp(QApplication * a, struct CmdlineArgs args)
 {
     app = a;
-
+    
     QString buildRevision, buildFlags;
     #ifdef BUILD_REV
       buildRevision = BUILD_REV;
@@ -90,6 +90,8 @@
     }
 
     qDebug() << "Mixxx" << VERSION << buildRevision << "is starting...";
+    QCoreApplication::setApplicationName("Mixxx");
+    QCoreApplication::setApplicationVersion(VERSION);
     setWindowTitle(tr("Mixxx " VERSION));
     setWindowIcon(QIcon(":/images/icon.svg"));
 
@@ -99,7 +101,9 @@
     m_pMidiDeviceManager = 0;
 
     // Check to see if this is the first time this version of Mixxx is run after an upgrade and make any needed changes.
-    config = versionUpgrade();  // This static function is located in upgrade.cpp
+    Upgrade upgrader;
+    config = upgrader.versionUpgrade();  
+    bool bFirstRun = upgrader.isFirstRun();
     QString qConfigPath = config->getConfigPath();
 
 #ifdef __C_METRICS__
@@ -198,7 +202,7 @@
     frame = new QFrame;
     setCentralWidget(frame);
 
-    m_pLibrary = new Library(this, config);
+    m_pLibrary = new Library(this, config, bFirstRun);
 
 	//Create the "players" (virtual playback decks)
 	m_pPlayer1 = new Player(config, buffer1, "[Channel1]");
@@ -348,6 +352,16 @@
     channel1->setEngineBuffer(buffer1);
     channel2->setEngineBuffer(buffer2);
 
+    //Automatically load specially marked promotional tracks on first run
+    if (bFirstRun) 
+    {
+        QList<TrackInfoObject*> tracksToAutoLoad = m_pLibrary->getTracksToAutoLoad();
+        if (tracksToAutoLoad.count() > 0)
+            m_pPlayer1->slotLoadTrack(tracksToAutoLoad.at(0));
+        if (tracksToAutoLoad.count() > 1)
+            m_pPlayer2->slotLoadTrack(tracksToAutoLoad.at(1));
+    }
+
 #ifdef __SCRIPT__
     scriptEng = new ScriptEngine(this, m_pTrack);
 #endif

=== modified file 'mixxx/src/upgrade.cpp'
--- mixxx/src/upgrade.cpp	2009-09-08 00:07:24 +0000
+++ mixxx/src/upgrade.cpp	2010-02-03 05:15:24 +0000
@@ -21,9 +21,19 @@
 #include "configobject.h"
 #include "upgrade.h"
 
+Upgrade::Upgrade()
+{
+    m_bFirstRun = false;
+}
+
+Upgrade::~Upgrade()
+{
+
+}
+
 // We return the ConfigObject here because we have to make changes to the
 // configuration and the location of the file may change between releases.
-ConfigObject<ConfigValue>* versionUpgrade() {
+ConfigObject<ConfigValue>* Upgrade::versionUpgrade() {
 
 /*  Pre-1.7.0:
 *
@@ -144,7 +154,9 @@
     if (configVersion.isEmpty()) {
         qDebug() << "No version number in configuration file. Setting to" << VERSION;
         config->set(ConfigKey("[Config]","Version"), ConfigValue(VERSION));
-        return config;
+
+        //This must have been the first run... right? :)
+        m_bFirstRun = true;
     }
     
     // Allows for incremental upgrades incase someone upgrades from a few versions prior

=== modified file 'mixxx/src/upgrade.h'
--- mixxx/src/upgrade.h	2009-04-14 04:47:13 +0000
+++ mixxx/src/upgrade.h	2010-02-03 05:15:24 +0000
@@ -18,6 +18,15 @@
 #ifndef UPGRADE_H
 #define UPGRADE_H
 
-ConfigObject<ConfigValue>* versionUpgrade();
+class Upgrade
+{
+    public:
+        Upgrade();
+        ~Upgrade();
+        ConfigObject<ConfigValue>* versionUpgrade();
+        bool isFirstRun() { return m_bFirstRun; };
+    private:
+        bool m_bFirstRun;
+};
 
 #endif

=== modified file 'mixxx/src/widget/wlibrary.cpp'
--- mixxx/src/widget/wlibrary.cpp	2010-01-06 10:29:44 +0000
+++ mixxx/src/widget/wlibrary.cpp	2010-02-03 05:15:24 +0000
@@ -39,10 +39,11 @@
 
 void WLibrary::switchToView(const QString& name) {
     QMutexLocker lock(&m_mutex);
-    //qDebug() << "WLibrary::switchToView" << name;
+    qDebug() << "WLibrary::switchToView" << name;
     if (m_viewMap.contains(name)) {
         QWidget* widget = m_viewMap[name];
         if (widget != NULL && currentWidget() != widget) {
+            qDebug() << "WLibrary::setCurrentWidget" << name;
             setCurrentWidget(widget);
             dynamic_cast<LibraryView*>(widget)->onShow();
         }