6 files changed, 75 insertions, 2 deletions
diff --git a/tools/qmldebugger/engine.png b/tools/qmldebugger/engine.png
new file mode 100644
index 0000000..a0a8a04
--- /dev/null
+++ b/tools/qmldebugger/engine.png
diff --git a/tools/qmldebugger/engines.qml b/tools/qmldebugger/engines.qml
new file mode 100644
index 0000000..2435f10
--- /dev/null
+++ b/tools/qmldebugger/engines.qml
@@ -0,0 +1,44 @@
+Item {
+    height: 100
+    id: Root
+    signal engineClicked(int id)
+    signal refreshEngines()
+
+    HorizontalLayout {
+        anchors.fill: parent
+        Repeater {
+            dataSource: engines
+            Item {
+                width: 100; height: 100; 
+                Image { 
+                    id: Image; 
+                    source: "engine.png" 
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+                Text { 
+                    anchors.top: Image.bottom; 
+                    text: modelData.name + "(" + modelData.engineId + ")" 
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+                MouseRegion {
+                    anchors.fill: parent
+                    onClicked: Root.engineClicked(modelData.engineId);
+                }
+            }
+        }
+    }
+
+
+    Image { 
+        y: 15
+        source: "refresh.png"; 
+        width: 75; 
+        height: 63; 
+        smooth: true 
+        anchors.right: parent.right
+        MouseRegion {
+            anchors.fill: parent
+            onClicked: Root.refreshEngines()
+        }
+    }
+}
diff --git a/tools/qmldebugger/refresh.png b/tools/qmldebugger/refresh.png
new file mode 100644
index 0000000..8befc80
--- /dev/null
+++ b/tools/qmldebugger/refresh.png
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index db0a28f..ae9c356 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -149,4 +149,3 @@ int main(int argc, char ** argv)
 
     return app.exec();
 }
-
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index cdabd86..e9af477 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -17,6 +17,7 @@
 #include "qmlviewer.h"
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
+#include "qmlpalette.h"
 #include "qml.h"
 #include <private/qperformancelog_p.h>
 #include "deviceskin.h"
@@ -132,6 +133,8 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     devicemode = false;
     skin = 0;
     canvas = 0;
+    palette = 0;
+    disabledPalette = 0;
     record_autotime = 0;
     record_period = 20;
 
@@ -324,7 +327,7 @@ void QmlViewer::toggleRecording()
 
 void QmlViewer::addLibraryPath(const QString& lib)
 {
-    canvas->engine()->addNameSpacePath("",lib);
+    canvas->engine()->addImportPath(lib);
 }
 
 void QmlViewer::reload()
@@ -380,6 +383,7 @@ void QmlViewer::openQml(const QString& fileName)
         }
     }
 
+    setupPalettes();
     canvas->setUrl(url);
 
     QTime t;
@@ -404,6 +408,18 @@ void QmlViewer::openQml(const QString& fileName)
 #endif
 }
 
+void QmlViewer:: setupPalettes()
+{
+    delete palette;
+    palette = new QmlPalette;
+    QmlContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("activePalette", palette);
+
+    delete disabledPalette;
+    disabledPalette = new QmlPalette;
+    disabledPalette->setColorGroup(QPalette::Disabled);
+    ctxt->setContextProperty("disabledPalette", disabledPalette);
+}
 
 void QmlViewer::setSkin(const QString& skinDirectory)
 {
@@ -483,6 +499,15 @@ void QmlViewer::setRecordFile(const QString& f)
     record_file = f;
 }
 
+bool QmlViewer::event(QEvent *event)
+{
+    if (event->type() == QEvent::PaletteChange) {
+        setupPalettes();
+        return true;
+    }
+    return QWidget::event(event);
+}
+
 void QmlViewer::setRecordPeriod(int ms)
 {
     record_period = ms;
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index c46f185..365d6b2 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -24,6 +24,7 @@ QT_BEGIN_NAMESPACE
 class QFxView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
+class QmlPalette;
 class QProcess;
 
 class QmlViewer : public QWidget
@@ -60,6 +61,7 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void timerEvent(QTimerEvent *);
+    virtual bool event(QEvent *event);
 
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
@@ -69,11 +71,14 @@ private slots:
 
 private:
     void setupProxy();
+    void setupPalettes();
 
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QFxView *canvas;
+    QmlPalette *palette;
+    QmlPalette *disabledPalette;
     QBasicTimer recordTimer;
     QList<QImage*> frames;
     QProcess* frame_stream;