Merge branch 'Applications/19.04'

6 files changed, 22 insertions, 53 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c522d9a89..474fbc839 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
 
 install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
-install( FILES dolphin.khotkeys DESTINATION ${KDE_INSTALL_DATADIR}/khotkeys )
-
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/dolphin.khotkeys b/dolphin.khotkeys
deleted file mode 100644
index ae6fb02b4..000000000
--- a/dolphin.khotkeys
+++ /dev/null
@@ -1,33 +0,0 @@
-[Main]
-ImportId=dolphin
-Version=2
-Autostart=true
-Disabled=false
-
-[Data]
-DataCount=1
-
-[Data_1]
-Comment=Global keyboard shortcut to launch Dolphin
-Enabled=true
-Name=Launch Dolphin
-Type=MENUENTRY_SHORTCUT_ACTION_DATA
-
-[Data_1Actions]
-ActionsCount=1
-
-[Data_1Actions0]
-CommandURL=org.kde.dolphin.desktop
-Type=MENUENTRY
-
-[Data_1Conditions]
-Comment=
-ConditionsCount=0
-
-[Data_1Triggers]
-Comment=Simple_action
-TriggersCount=1
-
-[Data_1Triggers0]
-Key=Meta+E
-Type=SHORTCUT
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bcadcdb80..296cb1400 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1045,6 +1045,10 @@ void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
         oldViewContainer->disconnect(this);
         oldViewContainer->view()->disconnect(this);
         oldViewContainer->urlNavigator()->disconnect(this);
+
+        // except the requestItemInfo so that on hover the information panel can still be updated
+        connect(oldViewContainer->view(), &DolphinView::requestItemInfo,
+                this, &DolphinMainWindow::requestItemInfo);
     }
 
     connectViewSignals(viewContainer);
diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 05947145d..f63af1e53 100644
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -75,7 +75,7 @@ protected:
 private slots:
     /**
      * Shows the information for the item of the URL which has been provided by
-     * InformationPanel::requestItemInfo() and provides default actions.
+     * InformationPanel::requestDelayedItemInfo() and provides default actions.
      */
     void showItemInfo();
 
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 95f535713..77e066d37 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -106,7 +106,7 @@ void PhononWidget::showEvent(QShowEvent *event)
         m_topLayout = new QVBoxLayout(this);
         m_topLayout->setContentsMargins(0, 0, 0, 0);
 
-        QHBoxLayout *controlsLayout = new QHBoxLayout(this);
+        QHBoxLayout *controlsLayout = new QHBoxLayout();
         controlsLayout->setContentsMargins(0, 0, 0, 0);
         controlsLayout->setSpacing(0);
 
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index d0dbcce88..224eb0c64 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -175,6 +175,22 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
     const bool isDevice = !item->udi().isEmpty();
     const bool isTrash = (item->url().scheme() == QLatin1String("trash"));
+    if (isTrash) {
+        emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"));
+        emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full"));
+        menu.addSeparator();
+    }
+
+    QAction* openInNewWindowAction = menu.addAction(QIcon::fromTheme(QStringLiteral("window-new")), i18nc("@item:inmenu", "Open in New Window"));
+    QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@item:inmenu", "Open in New Tab"));
+    QAction* propertiesAction = nullptr;
+    if (item->url().isLocalFile()) {
+        propertiesAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18nc("@action:inmenu", "Properties"));
+    }
+    if (!isDevice && !isTrash) {
+        menu.addSeparator();
+    }
+    
     if (isDevice) {
         ejectAction = m_model->ejectAction(index);
         if (ejectAction) {
@@ -205,22 +221,6 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
         if (teardownAction || ejectAction || mountAction) {
             menu.addSeparator();
         }
-    } else {
-        if (isTrash) {
-            emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"));
-            emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full"));
-            menu.addSeparator();
-        }
-    }
-
-    QAction* openInNewWindowAction = menu.addAction(QIcon::fromTheme(QStringLiteral("window-new")), i18nc("@item:inmenu", "Open in New Window"));
-    QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme(QStringLiteral("tab-new")), i18nc("@item:inmenu", "Open in New Tab"));
-    QAction* propertiesAction = nullptr;
-    if (item->url().isLocalFile()) {
-        propertiesAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-properties")), i18nc("@action:inmenu", "Properties"));
-    }
-    if (!isDevice && !isTrash) {
-        menu.addSeparator();
     }
 
     if (!isDevice) {