=== modified file 'mixxx/src/dlgprepare.cpp'
--- mixxx/src/dlgprepare.cpp	2011-07-19 18:12:33 +0000
+++ mixxx/src/dlgprepare.cpp	2011-11-06 23:00:29 +0000
@@ -88,8 +88,9 @@
 
 void DlgPrepare::onShow()
 {
-    //Refresh crates
-    //m_pCratesTableModel->select();
+    // Refresh table
+    // There might be new tracks dropped to other views
+    m_pPrepareLibraryTableModel->select();
 }
 
 void DlgPrepare::setup(QDomNode node)
@@ -160,7 +161,7 @@
     m_bAnalysisActive = bActive;
     if (bActive) {
         pushButtonAnalyze->setEnabled(true);
-        pushButtonAnalyze->setText(tr("Stop Analysis"));
+        pushButtonAnalyze->setText(tr("SPrepareFeaturetop Analysis"));
     } else {
         pushButtonAnalyze->setText(tr("Analyze"));
         labelProgress->setText("");

=== modified file 'mixxx/src/dlgprepare.h'
--- mixxx/src/dlgprepare.h	2011-03-26 12:29:21 +0000
+++ mixxx/src/dlgprepare.h	2011-11-06 23:00:29 +0000
@@ -10,8 +10,6 @@
 class PrepareLibraryTableModel;
 class WPrepareCratesTableView;
 class WPrepareLibraryTableView;
-class QSqlTableModel;
-class CrateView;
 
 class DlgPrepare : public QWidget, public Ui::DlgPrepare, public virtual LibraryView {
     Q_OBJECT
@@ -57,8 +55,6 @@
     WPrepareLibraryTableView* m_pPrepareLibraryTableView;
     PrepareLibraryTableModel* m_pPrepareLibraryTableModel;
     WPrepareCratesTableView* m_pPrepareCratesTableView;
-    CrateView* m_pCrateView;
-    QSqlTableModel* m_pCratesTableModel;
 };
 
 #endif //DLGTRIAGE_H

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2011-09-25 06:39:39 +0000
+++ mixxx/src/library/library.cpp	2011-11-06 23:02:06 +0000
@@ -60,7 +60,8 @@
     addFeature(m_pCrateFeature);
     addFeature(new BrowseFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
     addFeature(new RecordingFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
-    addFeature(new PrepareFeature(this, pConfig, m_pTrackCollection));
+    m_pPrepareFeature = new PrepareFeature(this, pConfig, m_pTrackCollection);
+    addFeature(m_pPrepareFeature);
     //iTunes and Rhythmbox should be last until we no longer have an obnoxious
     //messagebox popup when you select them. (This forces you to reach for your
     //mouse or keyboard if you're using MIDI control and you scroll through them...)
@@ -189,6 +190,7 @@
 void Library::slotRefreshLibraryModels()
 {
    m_pMixxxLibraryFeature->refreshLibraryModels();
+   m_pPrepareFeature->refreshLibraryModels();
 }
 
 void Library::slotCreatePlaylist()

=== modified file 'mixxx/src/library/library.h'
--- mixxx/src/library/library.h	2011-03-26 19:46:17 +0000
+++ mixxx/src/library/library.h	2011-11-06 23:00:29 +0000
@@ -14,6 +14,7 @@
 #include "configobject.h"
 #include "trackinfoobject.h"
 #include "recording/recordingmanager.h"
+#include "preparefeature.h"
 
 class TrackModel;
 class TrackCollection;
@@ -81,6 +82,7 @@
     PlaylistFeature* m_pPlaylistFeature;
     CrateFeature* m_pCrateFeature;
     PromoTracksFeature* m_pPromoTracksFeature;
+    PrepareFeature* m_pPrepareFeature;
     LibraryControl* m_pLibraryControl;
     RecordingManager* m_pRecordingManager;
 };

=== modified file 'mixxx/src/library/mixxxlibraryfeature.h'
--- mixxx/src/library/mixxxlibraryfeature.h	2011-10-19 16:47:15 +0000
+++ mixxx/src/library/mixxxlibraryfeature.h	2011-11-06 23:00:29 +0000
@@ -28,6 +28,7 @@
     bool dragMoveAccept(QUrl url);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
     TreeItemModel* getChildModel();
+    void refreshLibraryModels();
 
   public slots:
     void activate();
@@ -35,7 +36,6 @@
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
     void onLazyChildExpandation(const QModelIndex& index);
-    void refreshLibraryModels();
 
   private:
     QSharedPointer<BaseTrackCache> m_pBaseTrackCache;

=== modified file 'mixxx/src/library/preparefeature.cpp'
--- mixxx/src/library/preparefeature.cpp	2011-03-26 12:29:21 +0000
+++ mixxx/src/library/preparefeature.cpp	2011-11-06 23:00:29 +0000
@@ -41,37 +41,48 @@
 void PrepareFeature::bindWidget(WLibrarySidebar* sidebarWidget,
                                 WLibrary* libraryWidget,
                                 MixxxKeyboard* keyboard) {
-    DlgPrepare* pPrepareView = new DlgPrepare(libraryWidget,
+    m_pPrepareView = new DlgPrepare(libraryWidget,
                                               m_pConfig,
                                               m_pTrackCollection);
-    connect(pPrepareView, SIGNAL(loadTrack(TrackPointer)),
+    connect(m_pPrepareView, SIGNAL(loadTrack(TrackPointer)),
             this, SIGNAL(loadTrack(TrackPointer)));
-    connect(pPrepareView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
+    connect(m_pPrepareView, SIGNAL(loadTrackToPlayer(TrackPointer, QString)),
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString)));
-    connect(pPrepareView, SIGNAL(analyzeTracks(QList<int>)),
+    connect(m_pPrepareView, SIGNAL(analyzeTracks(QList<int>)),
             this, SLOT(analyzeTracks(QList<int>)));
-    connect(pPrepareView, SIGNAL(stopAnalysis()),
+    connect(m_pPrepareView, SIGNAL(stopAnalysis()),
             this, SLOT(stopAnalysis()));
 
     connect(this, SIGNAL(analysisActive(bool)),
-            pPrepareView, SLOT(analysisActive(bool)));
+            m_pPrepareView, SLOT(analysisActive(bool)));
     connect(this, SIGNAL(trackAnalysisProgress(TrackPointer, int)),
-            pPrepareView, SLOT(trackAnalysisProgress(TrackPointer, int)));
-    connect(this, SIGNAL(trackAnalysisFinished(TrackPointer)),
-            pPrepareView, SLOT(trackAnalysisFinished(TrackPointer)));
-    pPrepareView->installEventFilter(keyboard);
+            m_pPrepareView, SLOT(trackAnalysisProgress(TrackPointer, int)));
+    connect(this, SIGNAL(trackAnalysisFinished(TrackPointer)),
+            m_pPrepareView, SLOT(trackAnalysisFinished(TrackPointer)));
+
+    connect(this, SIGNAL(trackAnalysisFinished(TrackPointer)),
+            m_pPrepareView, SLOT(trackAnalysisFinished(TrackPointer)));
+
+    m_pPrepareView->installEventFilter(keyboard);
 
     // Let the DlgPrepare know whether or not analysis is active.
     bool bAnalysisActive = m_pAnalyserQueue != NULL;
     emit(analysisActive(bAnalysisActive));
 
-    libraryWidget->registerView(m_sPrepareViewName, pPrepareView);
+    libraryWidget->registerView(m_sPrepareViewName, m_pPrepareView);
 }
 
 TreeItemModel* PrepareFeature::getChildModel() {
     return &m_childModel;
 }
 
+void PrepareFeature::refreshLibraryModels()
+{
+    if (m_pPrepareView) {
+        m_pPrepareView->onShow();
+    }
+}
+
 void PrepareFeature::activate() {
     //qDebug() << "PrepareFeature::activate()";
     emit(switchToView(m_sPrepareViewName));

=== modified file 'mixxx/src/library/preparefeature.h'
--- mixxx/src/library/preparefeature.h	2011-03-26 12:29:21 +0000
+++ mixxx/src/library/preparefeature.h	2011-11-06 23:00:29 +0000
@@ -9,6 +9,7 @@
 #include "library/libraryfeature.h"
 #include "configobject.h"
 #include "treeitemmodel.h"
+#include "dlgprepare.h"
 
 class AnalyserQueue;
 class LibraryTableModel;
@@ -35,6 +36,7 @@
                     MixxxKeyboard* keyboard);
 
     TreeItemModel* getChildModel();
+    void refreshLibraryModels();
 
   signals:
     void trackAnalysisProgress(TrackPointer pTrack, int progress);
@@ -63,6 +65,7 @@
     int m_iOldBpmEnabled;
     TreeItemModel m_childModel;
     const static QString m_sPrepareViewName;
+    DlgPrepare* m_pPrepareView;
 };