- Fix crash found while investigating https://bugs.kde.org/show_bug.cgi?id=170927

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 1cdf73f3e2dc5d80265e78f23f267e748abd82dd..05bc2216a58d3a806de6532831fdad0d09ac3582 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -67,6 +67,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     //connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted()));
     connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl)));
     connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl)));
+    connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int)));
 
     m_dolphinModel = new DolphinModel(this);
     m_dolphinModel->setDirLister(m_dirLister);
@@ -107,6 +108,14 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     connect(m_view, SIGNAL(modeChanged()),
             this, SIGNAL(viewModeChanged())); // relay signal
 
+    // Watch for changes that should result in updates to the
+    // status bar text.
+    connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)),
+            this, SLOT(updateStatusBar()));
+    connect(m_dirLister, SIGNAL(clear()),
+            this, SLOT(updateStatusBar()));
+
+
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     m_actionHandler->setCurrentView(m_view);
 
@@ -293,6 +302,11 @@ void DolphinPart::slotErrorMessage(const QString& msg)
 void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 {
     emit m_extension->mouseOverInfo(item);
+    if (item.isNull()) {
+        updateStatusBar();
+    } else {
+        ReadOnlyPart::setStatusBarText(item.getStatusBarInfo());
+    }
 }
 
 void DolphinPart::slotItemTriggered(const KFileItem& item)
@@ -367,8 +381,9 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
                 addDel = true;
             }
             else {
-                KConfigGroup configGroup( KGlobal::config(), "KDE" );
-                if ( configGroup.readEntry( "ShowDeleteCommand", false) )
+                KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+                KConfigGroup configGroup(globalConfig, "KDE");
+                if ( configGroup.readEntry("ShowDeleteCommand", false) )
                     addDel = true;
             }
         }
@@ -378,6 +393,13 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
         if (addDel)
             editActions.append(actionCollection()->action("delete"));
         actionGroups.insert("editactions", editActions);
+
+        // Normally KonqPopupMenu only shows the "Create new" subdir in the current view
+        // since otherwise the created file would not be visible.
+        // But in treeview mode we should allow it.
+        if (m_view->itemsExpandable())
+            popupFlags |= KParts::BrowserExtension::ShowCreateDirectory;
+
     }
 
     // TODO: We should change the signature of the slots (and signals) for being able
@@ -487,4 +509,14 @@ void DolphinPart::updateNewMenu()
     m_newMenu->setPopupFiles(url());
 }
 
+void DolphinPart::updateStatusBar()
+{
+    emit ReadOnlyPart::setStatusBarText(m_view->statusBarText());
+}
+
+void DolphinPart::updateProgress(int percent)
+{
+    m_extension->loadingProgress(percent);
+}
+
 #include "dolphinpart.moc"