Do a delayed initialization of all widgets when showing the the Information Panel...

svn path=/trunk/KDE/kdebase/apps/; revision=817992

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index f4fa20855dc706bc026be9992fef5894db96398a..07827fd1dd7d44bfa3c83901948db2eed50e8ea0 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -51,6 +51,7 @@
 
 InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     SidebarPage(parent),
 
 InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     SidebarPage(parent),

+    m_initialized(false),

     m_pendingPreview(false),
     m_shownUrl(),
     m_urlCandidate(),
     m_pendingPreview(false),
     m_shownUrl(),
     m_urlCandidate(),


@@ -61,54 +62,6 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     m_metaDataWidget(0),
     m_metaTextLabel(0)
 {
     m_metaDataWidget(0),
     m_metaTextLabel(0)
 {

-    const int spacing = KDialog::spacingHint();
-
-    m_timer = new QTimer(this);
-    m_timer->setSingleShot(true);
-    connect(m_timer, SIGNAL(timeout()),
-            this, SLOT(slotTimeout()));
-
-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->setSpacing(spacing);
-
-    // name
-    m_nameLabel = new QLabel(this);
-    QFont font = m_nameLabel->font();
-    font.setBold(true);
-    m_nameLabel->setFont(font);
-    m_nameLabel->setAlignment(Qt::AlignHCenter);
-    m_nameLabel->setWordWrap(true);
-    m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-
-    // preview
-    m_preview = new PixmapViewer(this);
-    m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium);
-    m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
-
-    if (MetaDataWidget::metaDataAvailable()) {
-        // rating, comment and tags
-        m_metaDataWidget = new MetaDataWidget(this);
-        m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-    }
-
-    // general meta text information
-    m_metaTextLabel = new MetaTextLabel(this);
-    m_metaTextLabel->setMinimumWidth(spacing);
-    m_metaTextLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-
-    layout->addWidget(m_nameLabel);
-    layout->addWidget(new KSeparator(this));
-    layout->addWidget(m_preview);
-    layout->addWidget(new KSeparator(this));
-    if (m_metaDataWidget != 0) {
-        layout->addWidget(m_metaDataWidget);
-        layout->addWidget(new KSeparator(this));
-    }
-    layout->addWidget(m_metaTextLabel);
-
-    // ensure that widgets in the information side bar are aligned towards the top
-    layout->addStretch(1);
-    setLayout(layout);

 }
 
 InfoSidebarPage::~InfoSidebarPage()
 }
 
 InfoSidebarPage::~InfoSidebarPage()


@@ -126,14 +79,22 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 {
     SidebarPage::setUrl(url);
     if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
 {
     SidebarPage::setUrl(url);
     if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {

-        cancelRequest();
-        m_shownUrl = url;
-        showItemInfo();
+        if (m_initialized) {
+            cancelRequest();
+            m_shownUrl = url;
+            showItemInfo();
+        } else {
+            m_shownUrl = url;
+        }

     }
 }
 
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
     }
 }
 
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {

+    if (!m_initialized) {
+        return;
+    }
+

     m_selection = selection;
 
     const int count = selection.count();
     m_selection = selection;
 
     const int count = selection.count();


@@ -150,6 +111,10 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {

+    if (!m_initialized) {
+        return;
+    }
+

     cancelRequest();
 
     m_fileItem = KFileItem();
     cancelRequest();
 
     m_fileItem = KFileItem();


@@ -171,24 +136,32 @@ void InfoSidebarPage::showEvent(QShowEvent* event)
 {
     SidebarPage::showEvent(event);
     if (!event->spontaneous()) {
 {
     SidebarPage::showEvent(event);
     if (!event->spontaneous()) {

+        if (!m_initialized) {
+            // do a delayed initialization so that no performance
+            // penalty is given when Dolphin is started with a closed
+            // Information Panel
+            init();
+        }

         showItemInfo();
     }
 }
 
 void InfoSidebarPage::resizeEvent(QResizeEvent* event)
 {
         showItemInfo();
     }
 }
 
 void InfoSidebarPage::resizeEvent(QResizeEvent* event)
 {

-    // If the text inside the name label or the info label cannot
-    // get wrapped, then the maximum width of the label is increased
-    // so that the width of the information sidebar gets increased.
-    // To prevent this, the maximum width is adjusted to
-    // the current width of the sidebar.
-    const int maxWidth = event->size().width() - KDialog::spacingHint() * 4;
-    m_nameLabel->setMaximumWidth(maxWidth);
-
-    // try to increase the preview as large as possible
-    m_preview->setSizeHint(QSize(maxWidth, maxWidth));
-    m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done
-    m_timer->start(TimerDelay);
+    if (m_initialized) {
+        // If the text inside the name label or the info label cannot
+        // get wrapped, then the maximum width of the label is increased
+        // so that the width of the information sidebar gets increased.
+        // To prevent this, the maximum width is adjusted to
+        // the current width of the sidebar.
+        const int maxWidth = event->size().width() - KDialog::spacingHint() * 4;
+        m_nameLabel->setMaximumWidth(maxWidth);
+
+        // try to increase the preview as large as possible
+        m_preview->setSizeHint(QSize(maxWidth, maxWidth));
+        m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done
+        m_timer->start(TimerDelay);
+    }

 
     SidebarPage::resizeEvent(event);
 }
 
     SidebarPage::resizeEvent(event);
 }


@@ -403,4 +376,58 @@ bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const
     return false;
 }
 
     return false;
 }
 

+void InfoSidebarPage::init()
+{
+    const int spacing = KDialog::spacingHint();
+
+    m_timer = new QTimer(this);
+    m_timer->setSingleShot(true);
+    connect(m_timer, SIGNAL(timeout()),
+            this, SLOT(slotTimeout()));
+
+    QVBoxLayout* layout = new QVBoxLayout;
+    layout->setSpacing(spacing);
+
+    // name
+    m_nameLabel = new QLabel(this);
+    QFont font = m_nameLabel->font();
+    font.setBold(true);
+    m_nameLabel->setFont(font);
+    m_nameLabel->setAlignment(Qt::AlignHCenter);
+    m_nameLabel->setWordWrap(true);
+    m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    // preview
+    m_preview = new PixmapViewer(this);
+    m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium);
+    m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
+
+    if (MetaDataWidget::metaDataAvailable()) {
+        // rating, comment and tags
+        m_metaDataWidget = new MetaDataWidget(this);
+        m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    }
+
+    // general meta text information
+    m_metaTextLabel = new MetaTextLabel(this);
+    m_metaTextLabel->setMinimumWidth(spacing);
+    m_metaTextLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    layout->addWidget(m_nameLabel);
+    layout->addWidget(new KSeparator(this));
+    layout->addWidget(m_preview);
+    layout->addWidget(new KSeparator(this));
+    if (m_metaDataWidget != 0) {
+        layout->addWidget(m_metaDataWidget);
+        layout->addWidget(new KSeparator(this));
+    }
+    layout->addWidget(m_metaTextLabel);
+
+    // ensure that widgets in the information side bar are aligned towards the top
+    layout->addStretch(1);
+    setLayout(layout);
+
+    m_initialized = true;
+}
+

 #include "infosidebarpage.moc"
 #include "infosidebarpage.moc"

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index fa9fa9d411f162ddb3e701a2455d6fae557a317c..bfbaf0e453f7ce99b41c1ea543499baa891376d1 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -132,7 +132,10 @@ private:
      */
     bool convertMetaInfo(const QString& key, QString& text) const;
 
      */
     bool convertMetaInfo(const QString& key, QString& text) const;
 

+    void init();
+

 private:
 private:

+    bool m_initialized;

     bool m_pendingPreview;
     QTimer* m_timer;
     KUrl m_shownUrl;      // URL that is shown as info
     bool m_pendingPreview;
     QTimer* m_timer;
     KUrl m_shownUrl;      // URL that is shown as info