Open the meta data configuration dialog modeless

[dolphin.git] / src / panels / information / informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index bd24e568d27ba47b8ec98669337a4e35ec7c56fe..b54f3cef64a03a2159bbdb806799ca5f12d16bc3 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -21,6 +21,7 @@
 
 #include <kdialog.h>
 #include <kfileitem.h>
+#include <kfilemetadatawidget.h>
 #include <kfileplacesmodel.h>
 #include <kio/previewjob.h>
 #include <kiconeffect.h>
@@ -46,8 +47,7 @@
 
 #include "dolphin_informationpanelsettings.h"
 #include "settings/dolphinsettings.h"
-#include "kmetadatawidget.h"
-#include "kmetadataconfigurationdialog.h"
+#include "settings/filemetadataconfigurationdialog.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
@@ -101,7 +101,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     const bool showPreview = InformationPanelSettings::showPreview();
     m_preview->setVisible(showPreview);
 
-    m_metaDataWidget = new KMetaDataWidget(parent);
+    m_metaDataWidget = new KFileMetaDataWidget(parent);
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));
 
@@ -147,7 +147,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
     m_pendingPreview = false;
 
     const KUrl itemUrl = item.url();
-    const bool isNepomukSearchUrl = (itemUrl.protocol() == "nepomuksearch") && item.nepomukUri().isEmpty();
+    const bool isNepomukSearchUrl = itemUrl.protocol().startsWith("nepomuk") && item.nepomukUri().isEmpty();
     if (!applyPlace(itemUrl)) {
         if (isNepomukSearchUrl) {
             // in the case of a Nepomuk query-URL the URL is not readable for humans
@@ -184,7 +184,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));
 
-            setNameLabelText(itemUrl.fileName());
+            setNameLabelText(item.text());
         }
     }
 
@@ -193,7 +193,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
             m_metaDataWidget->hide();
         } else {
             m_metaDataWidget->show();
-            m_metaDataWidget->setItem(item);
+            m_metaDataWidget->setItems(KFileItemList() << item);
         }
     }
 
@@ -245,36 +245,27 @@ void InformationPanelContent::showItems(const KFileItemList& items)
 
 bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
 {
-    if (event->type() == QEvent::Resize) {
+    switch (event->type()) {
+    case QEvent::Resize: {
         QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
         if (obj == m_metaDataArea->viewport()) {
             // The size of the meta text area has changed. Adjust the fixed
             // width in a way that no horizontal scrollbar needs to be shown.
             m_metaDataWidget->setFixedWidth(resizeEvent->size().width());
         } else if (obj == parent()) {
-            // 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 panel gets increased.
-            // To prevent this, the maximum width is adjusted to
-            // the current width of the panel.
-            const int maxWidth = resizeEvent->size().width() - KDialog::spacingHint() * 4;
-            m_nameLabel->setMaximumWidth(maxWidth);
-
-            // The metadata widget also contains a text widget which may return
-            // a large preferred width.
-            if (m_metaDataWidget != 0) {
-                m_metaDataWidget->setMaximumWidth(maxWidth);
-            }
+            adjustWidgetSizes(resizeEvent->size().width());
+        }
+        break;
+    }
 
-            // try to increase the preview as large as possible
-            m_preview->setSizeHint(QSize(maxWidth, maxWidth));
+    case QEvent::Polish:
+        adjustWidgetSizes(parentWidget()->width());
+        break;
 
-            if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
-                // assure that the size of the video player is the same as the preview size
-                m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
-            }
-        }
+    default:
+        break;
     }
+
     return Panel::eventFilter(obj, event);
 }
 
@@ -302,15 +293,15 @@ void InformationPanelContent::configureSettings()
         m_preview->setVisible(isChecked);
         InformationPanelSettings::setShowPreview(isChecked);
     } else if (action == configureAction) {
-        QPointer<KMetaDataConfigurationDialog> dialog = new KMetaDataConfigurationDialog(m_metaDataWidget, this, Qt::Dialog);
+        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
         dialog->setDescription(i18nc("@label::textbox",
-                               "Configure which data should be shown in the Information Panel."));
-        dialog->exec();
-        delete dialog;
-    }
-
-    if (!m_item.isNull() && m_item.nepomukUri().isValid()) {
-        showItem(m_item);
+                                     "Configure which data should be shown in the tooltip."));
+        dialog->setItems(m_metaDataWidget->items());
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        dialog->raise();
+        dialog->activateWindow();
+        connect(dialog, SIGNAL(destroyed()), this, SLOT(refreshMetaData()));
     }
 }
 
@@ -324,7 +315,7 @@ void InformationPanelContent::showIcon(const KFileItem& item)
 }
 
 void InformationPanelContent::showPreview(const KFileItem& item,
-                                  const QPixmap& pixmap)
+                                          const QPixmap& pixmap)
 {
     m_outdatedPreviewTimer->stop();
 
@@ -354,6 +345,13 @@ void InformationPanelContent::slotPlayingStopped()
     m_preview->setVisible(true);
 }
 
+void InformationPanelContent::refreshMetaData()
+{
+    if (!m_item.isNull() && m_item.nepomukUri().isValid()) {
+        showItem(m_item);
+    }
+}
+
 bool InformationPanelContent::applyPlace(const KUrl& url)
 {
     KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
@@ -401,4 +399,29 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     m_nameLabel->setText(wrappedText);
 }
 
+void InformationPanelContent::adjustWidgetSizes(int width)
+{
+    // 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 panel gets increased.
+    // To prevent this, the maximum width is adjusted to
+    // the current width of the panel.
+    const int maxWidth = width - KDialog::spacingHint() * 4;
+    m_nameLabel->setMaximumWidth(maxWidth);
+
+    // The metadata widget also contains a text widget which may return
+    // a large preferred width.
+    if (m_metaDataWidget != 0) {
+        m_metaDataWidget->setMaximumWidth(maxWidth);
+    }
+
+    // try to increase the preview as large as possible
+    m_preview->setSizeHint(QSize(maxWidth, maxWidth));
+
+    if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
+        // assure that the size of the video player is the same as the preview size
+        m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
+    }
+}
+
 #include "informationpanelcontent.moc"