1 files changed, 12 insertions, 30 deletions

diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
index 0bb8829..629a69c 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -16,12 +16,13 @@
 #include <QToolButton>
 #include "backend/btinstallbackend.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/bookshelfmanager/installpage/btinstallpage.h"
 #include "frontend/bookshelfmanager/installpage/btinstallpagemodel.h"
 #include "frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h"
 #include "frontend/btbookshelfview.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 namespace {
@@ -55,7 +56,6 @@ BtInstallPageWorksWidget::BtInstallPageWorksWidget(
             , m_backend(0)
             , m_myModel(0)
 {
-    namespace DU = util::directory;
 
     setTreeModel(new BtInstallPageModel(g, this));
 
@@ -65,15 +65,20 @@ BtInstallPageWorksWidget::BtInstallPageWorksWidget(
 
     m_sourceRefreshButton = new QToolButton(this);
     m_sourceRefreshButton->setAutoRaise(true);
-    m_sourceRefreshButton ->setToolTip(tr("Refresh the list of works from this source"));
-    m_sourceRefreshButton ->setIcon(DU::getIcon(CResMgr::bookshelfmgr::installpage::refresh_icon));
+    m_sourceRefreshButton->setToolTip(tr("Refresh the list of works from this source"));
+    m_sourceRefreshButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::installpage::refresh_icon));
     setRightCornerWidget(m_sourceRefreshButton);
 
     connect(m_sourceRefreshButton, SIGNAL(clicked()),
             this,                  SLOT(slotSourceRefresh()));
 
-    // Delayed init, part 1 - disable parent:
-    parent->setEnabled(false);
+    m_backend = BtInstallBackend::backend(m_source);
+    Q_ASSERT(m_backend != 0);
+    m_myModel = new BtBookshelfModel(this);
+    Q_FOREACH(CSwordModuleInfo *module, m_backend->moduleList()) {
+        if (filter(module)) m_myModel->addModule(module);
+    }
+    setSourceModel(m_myModel);
 }
 
 BtInstallPageWorksWidget::~BtInstallPageWorksWidget() {
@@ -83,7 +88,6 @@ BtInstallPageWorksWidget::~BtInstallPageWorksWidget() {
 void BtInstallPageWorksWidget::deleteSource() {
     qDebug() << "Deleting source" << m_source.caption;
 
-    setEnabled(false);
     m_myModel->clear();
     BtInstallBackend::deleteSource(QString(m_source.caption));
 }
@@ -103,28 +107,6 @@ void BtInstallPageWorksWidget::updateTree() {
     }
 }
 
-void BtInstallPageWorksWidget::paintEvent(QPaintEvent *e) {
-    // Delayed init, part 2 - queue init when painted:
-    if (m_myModel == 0) {
-        QTimer::singleShot(0, this, SLOT(slotDelayedInit()));
-    }
-    BtBookshelfWidget::paintEvent(e);
-}
-
-void BtInstallPageWorksWidget::slotDelayedInit() {
-    // Delayed init, part 3 - initialize + reenable parent
-    qApp->setOverrideCursor(Qt::WaitCursor);
-    m_backend = BtInstallBackend::backend(m_source);
-    Q_ASSERT(m_backend != 0);
-    m_myModel = new BtBookshelfModel(this);
-    Q_FOREACH(CSwordModuleInfo *module, m_backend->moduleList()) {
-        if (filter(module)) m_myModel->addModule(module);
-    }
-    setSourceModel(m_myModel);
-    m_parent->setEnabled(true);
-    qApp->restoreOverrideCursor();
-}
-
 void BtInstallPageWorksWidget::slotSourceRefresh() {
     qDebug() << "Refreshing source" << m_source.caption;