X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3b8f32042f4191eb6fe91ad3572dbcf5e2d34f2f..fbfcbd5b952faea346823efa868ca88cb8ea1738:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index dd0f33121..3a94a7107 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -29,7 +29,6 @@
 #include <kaboutdata.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
-#include <kdebug.h>
 #include <kdirlister.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -49,9 +48,7 @@
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
-// The componentdata name must be dolphinpart so that dolphinpart.rc is found
-// Alternatively we would have to install it as dolphin/dolphinpart.rc
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
@@ -403,6 +400,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
 void DolphinPart::slotUrlChanged(const KUrl& url)
 {
+    KParts::ReadOnlyPart::setUrl(url);
     QString prettyUrl = url.pathOrUrl();
     emit m_extension->setLocationBarUrl(prettyUrl);
 }
@@ -451,11 +449,19 @@ void DolphinPart::slotEditMimeType()
 
 void DolphinPart::slotProperties()
 {
-    const KFileItemList items = m_view->selectedItems();
-    if (!items.isEmpty()) {
-        KPropertiesDialog dialog(items.first().url(), m_view);
-        dialog.exec();
+    KPropertiesDialog* dialog = 0;
+    const KFileItemList list = m_view->selectedItems();
+    if (list.isEmpty()) {
+        const KUrl url = m_view->url();
+        dialog = new KPropertiesDialog(url, m_view);
+    } else {
+        dialog = new KPropertiesDialog(list, m_view);
     }
+
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+    dialog->raise();
+    dialog->activateWindow();
 }
 
 void DolphinPart::setCurrentViewMode(const QString& viewModeName)