From c20e9c18c2e5fb8f36ae1c5524175a3d8623cd34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 4 Nov 2011 20:08:23 +0100
Subject: [PATCH] Load main QML file while creating TabBox View

Layout loading still delayed till first show event.
---
 tabbox/declarative.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tabbox/declarative.cpp b/tabbox/declarative.cpp
index 1567964d99..4d92127ac9 100644
--- a/tabbox/declarative.cpp
+++ b/tabbox/declarative.cpp
@@ -104,7 +104,7 @@ DeclarativeView::DeclarativeView(QAbstractItemModel *model, QWidget *parent)
     kdeclarative.initialize();
     kdeclarative.setupBindings();
     rootContext()->setContextProperty("clientModel", model);
-    updateQmlSource();
+    setSource(QUrl(KStandardDirs::locate("data", "kwin/tabbox/tabbox.qml")));
 
     // FrameSvg
     m_frame->setImagePath("dialogs/background");
@@ -116,6 +116,7 @@ DeclarativeView::DeclarativeView(QAbstractItemModel *model, QWidget *parent)
 
 void DeclarativeView::showEvent(QShowEvent *event)
 {
+    updateQmlSource();
     m_currentScreenGeometry = Kephal::ScreenUtils::screenGeometry(tabBox->activeScreen());
     rootObject()->setProperty("screenWidth", m_currentScreenGeometry.width());
     rootObject()->setProperty("screenHeight", m_currentScreenGeometry.height());
@@ -188,7 +189,6 @@ void DeclarativeView::updateQmlSource()
         return;
     }
     m_currentLayout = tabBox->config().layoutName();
-    setSource(QUrl(KStandardDirs::locate("data", "kwin/tabbox/tabbox.qml")));
     QString file = KStandardDirs::locate("data", "kwin/tabbox/" + m_currentLayout.toLower().replace(' ', '_') + ".qml");
     if (file.isNull()) {
         // fallback to default