1 files changed, 21 insertions, 14 deletions

diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 2a0a07dae5..27bd217f52 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -48,6 +48,8 @@
 #include <QTime>
 #include <QList>
 
+#include "loggerwidget.h"
+
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeView;
@@ -59,6 +61,7 @@ class QDeclarativeTester;
 class QNetworkReply;
 class QNetworkCookieJar;
 class NetworkAccessManagerFactory;
+class QTranslator;
 
 class QDeclarativeViewer
 #if defined(Q_OS_SYMBIAN)
@@ -102,11 +105,13 @@ public:
     void setUseNativeFileBrowser(bool);
     void updateSizeHints();
     void setSizeToView(bool sizeToView);
-    QStringList builtinSkins() const;
 
     QMenuBar *menuBar() const;
 
     QDeclarativeView *view() const;
+    LoggerWidget *warningsWidget() const;
+
+    void enableExperimentalGestures();
 
 public slots:
     void sceneResized(QSize size);
@@ -117,10 +122,9 @@ public slots:
     void toggleRecording();
     void toggleRecordingWithSelection();
     void ffmpegFinished(int code);
-    void setSkin(const QString& skinDirectory);
     void showProxySettings ();
     void proxySettingsChanged ();
-    void setScaleView();
+    void rotateOrientation();
     void statusChanged();
     void setSlowMode(bool);
     void launch(const QString &);
@@ -128,7 +132,6 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual bool event(QEvent *);
-
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
 private slots:
@@ -137,19 +140,19 @@ private slots:
     void recordFrame();
     void chooseRecordingOptions();
     void pickRecordingFile();
-    void setScaleSkin();
-    void setPortrait();
-    void setLandscape();
-    void toggleOrientation();
-    void startNetwork();
     void toggleFullScreen();
+    void changeOrientation(QAction*);
+    void orientationChanged();
+
+    void showWarnings(bool show);
+    void warningsWidgetOpened();
+    void warningsWidgetClosed();
 
 private:
     QString getVideoFileName();
     int menuBarHeight() const;
 
-    PreviewDeviceSkin *skin;
-    QSize skinscreensize;
+    LoggerWidget *loggerWindow;
     QDeclarativeView *canvas;
     QSize initialSize;
     QString currentFileOrUrl;
@@ -179,8 +182,8 @@ private:
     bool ffmpegAvailable;
     bool convertAvailable;
 
-    QAction *portraitOrientation;
-    QAction *landscapeOrientation;
+    QActionGroup *orientation;
+    QAction *showWarningsWindow;
 
     QString m_script;
     ScriptOptions m_scriptOptions;
@@ -188,10 +191,14 @@ private:
 
     QNetworkReply *wgtreply;
     QString wgtdir;
-
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;
+
+    QTranslator *translator;
+    void loadTranslationFile(const QString& directory);
+
+    void loadDummyDataFiles(const QString& directory);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeViewer::ScriptOptions)