Refactor Overlay Handling

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 54cd3bf71b974d6fa66ad340302d12f31321d8a6..50c7f2e0e7951c89be9d6a0d8802d0f7d9a911e8 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -54,6 +54,7 @@
 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KRecentFilesAction>
 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KRecentFilesAction>

+#include <KRuntimePlatform>

 #include <KShell>
 #include <KShortcutsDialog>
 #include <KStandardAction>
 #include <KShell>
 #include <KShortcutsDialog>
 #include <KStandardAction>


@@ -190,7 +191,8 @@ DolphinMainWindow::DolphinMainWindow()
 
     setupDockWidgets();
 
 
     setupDockWidgets();
 

-    setupGUI(Save | Create | ToolBar);
+    const bool usePhoneUi{KRuntimePlatform::runtimePlatform().contains(QLatin1String("phone"))};
+    setupGUI(Save | Create | ToolBar, usePhoneUi ? QStringLiteral("dolphinuiforphones.rc") : QString() /* load the default dolphinui.rc file */);

     stateChanged(QStringLiteral("new_file"));
 
     QClipboard *clipboard = QApplication::clipboard();
     stateChanged(QStringLiteral("new_file"));
 
     QClipboard *clipboard = QApplication::clipboard();


@@ -201,6 +203,15 @@ DolphinMainWindow::DolphinMainWindow()
 
     if (firstRun) {
         menuBar()->setVisible(false);
 
     if (firstRun) {
         menuBar()->setVisible(false);

+
+        if (usePhoneUi) {
+            Q_ASSERT(qobject_cast<QDockWidget *>(m_placesPanel->parent()));
+            m_placesPanel->parentWidget()->hide();
+            auto settings = GeneralSettings::self();
+            settings->setShowZoomSlider(false); // Zooming can be done with pinch gestures instead and we are short on horizontal space.
+            settings->setRenameInline(false); // This works around inline renaming currently not working well with virtual keyboards.
+            settings->save(); // Otherwise the RenameInline setting is not picked up for the first time Dolphin is used.
+        }

     }
 
     const bool showMenu = !menuBar()->isHidden();
     }
 
     const bool showMenu = !menuBar()->isHidden();


@@ -374,7 +385,7 @@ void DolphinMainWindow::changeUrl(const QUrl &url)
     updateGoActions();
 
     // will signal used urls to activities manager, too
     updateGoActions();
 
     // will signal used urls to activities manager, too

-    m_recentFiles->addUrl(url);
+    m_recentFiles->addUrl(url, QString(), "inode/directory");

 
     Q_EMIT urlChanged(url);
 }
 
     Q_EMIT urlChanged(url);
 }


@@ -478,9 +489,9 @@ void DolphinMainWindow::addToPlaces()
     }
 }
 
     }
 }
 

-void DolphinMainWindow::openNewTab(const QUrl &url)
+DolphinTabPage *DolphinMainWindow::openNewTab(const QUrl &url)

 {
 {

-    m_tabWidget->openNewTab(url, QUrl());
+    return m_tabWidget->openNewTab(url, QUrl());

 }
 
 void DolphinMainWindow::openNewTabAndActivate(const QUrl &url)
 }
 
 void DolphinMainWindow::openNewTabAndActivate(const QUrl &url)


@@ -1015,8 +1026,15 @@ void DolphinMainWindow::invertSelection()
 
 void DolphinMainWindow::toggleSplitView()
 {
 
 void DolphinMainWindow::toggleSplitView()
 {

+    QUrl newSplitViewUrl;
+    const KFileItemList list = m_activeViewContainer->view()->selectedItems();
+    if (list.count() == 1) {
+        const KFileItem &item = list.first();
+        newSplitViewUrl = DolphinView::openItemAsFolderUrl(item);
+    }
+

     DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     DolphinTabPage *tabPage = m_tabWidget->currentTabPage();

-    tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled(), WithAnimation);
+    tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled(), WithAnimation, newSplitViewUrl);

     m_tabWidget->updateTabName(m_tabWidget->indexOf(tabPage));
     updateViewActions();
 }
     m_tabWidget->updateTabName(m_tabWidget->indexOf(tabPage));
     updateViewActions();
 }


@@ -1118,8 +1136,10 @@ void DolphinMainWindow::replaceLocation()
 
     // If the text field currently has focus and everything is selected,
     // pressing the keyboard shortcut returns the whole thing to breadcrumb mode
 
     // If the text field currently has focus and everything is selected,
     // pressing the keyboard shortcut returns the whole thing to breadcrumb mode

+    // and goes back to the view, just like how it was before this action was triggered the first time.

     if (navigator->isUrlEditable() && lineEdit->hasFocus() && lineEdit->selectedText() == lineEdit->text()) {
         navigator->setUrlEditable(false);
     if (navigator->isUrlEditable() && lineEdit->hasFocus() && lineEdit->selectedText() == lineEdit->text()) {
         navigator->setUrlEditable(false);

+        m_activeViewContainer->view()->setFocus();

     } else {
         navigator->setUrlEditable(true);
         navigator->setFocus();
     } else {
         navigator->setUrlEditable(true);
         navigator->setFocus();


@@ -1543,6 +1563,8 @@ void DolphinMainWindow::slotPlaceActivated(const QUrl &url)
         // We can end up here if the user clicked a device in the Places Panel
         // which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385.
         reloadView();
         // We can end up here if the user clicked a device in the Places Panel
         // which had been unmounted earlier, see https://bugs.kde.org/show_bug.cgi?id=161385.
         reloadView();

+
+        m_activeViewContainer->view()->setFocus(); // We always want the focus on the view after activating a place.

     } else {
         view->disableUrlNavigatorSelectionRequests();
         changeUrl(url);
     } else {
         view->disableUrlNavigatorSelectionRequests();
         changeUrl(url);


@@ -2443,7 +2465,7 @@ void DolphinMainWindow::updateFileAndEditActions()
     QAction *addToPlacesAction = col->action(QStringLiteral("add_to_places"));
     QAction *copyToOtherViewAction = col->action(QStringLiteral("copy_to_inactive_split_view"));
     QAction *moveToOtherViewAction = col->action(QStringLiteral("move_to_inactive_split_view"));
     QAction *addToPlacesAction = col->action(QStringLiteral("add_to_places"));
     QAction *copyToOtherViewAction = col->action(QStringLiteral("copy_to_inactive_split_view"));
     QAction *moveToOtherViewAction = col->action(QStringLiteral("move_to_inactive_split_view"));

-    QAction *copyLocation = col->action(QString("copy_location"));
+    QAction *copyLocation = col->action(QStringLiteral("copy_location"));

 
     if (list.isEmpty()) {
         stateChanged(QStringLiteral("has_no_selection"));
 
     if (list.isEmpty()) {
         stateChanged(QStringLiteral("has_no_selection"));


@@ -2969,7 +2991,7 @@ bool DolphinMainWindow::isItemVisibleInAnyView(const QString &urlOfItem)
 
 void DolphinMainWindow::slotDoubleClickViewBackground(Qt::MouseButton button)
 {
 
 void DolphinMainWindow::slotDoubleClickViewBackground(Qt::MouseButton button)
 {

-    if (button == Qt::MouseButton::LeftButton) {
+    if (button != Qt::MouseButton::LeftButton) {

         // only handle left mouse button for now
         return;
     }
         // only handle left mouse button for now
         return;
     }