Allow having the UrlNavigators below the tab bar

[dolphin.git] / src / dolphinnavigatorswidgetaction.cpp

diff --git a/src/dolphinnavigatorswidgetaction.cpp b/src/dolphinnavigatorswidgetaction.cpp
index 984e1f35c85c7d58807b4c1bc55c81f8e268d374..b8c77c69b1ab7c94a803aeba933b867fe9b954b9 100644 (file)
--- a/src/dolphinnavigatorswidgetaction.cpp
+++ b/src/dolphinnavigatorswidgetaction.cpp
@@ -13,10 +13,12 @@
 #include <KXMLGUIFactory>
 #include <KXmlGuiWindow>
 
 #include <KXMLGUIFactory>
 #include <KXmlGuiWindow>
 

+#include <QApplication>

 #include <QDomDocument>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QSplitter>
 #include <QDomDocument>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QSplitter>

+#include <QToolBar>

 
 #include <limits>
 
 
 #include <limits>
 


@@ -34,7 +36,6 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
     setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));
 
     m_splitter->setChildrenCollapsible(false);
     setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));
 
     m_splitter->setChildrenCollapsible(false);

-    setDefaultWidget(m_splitter.get());

 
     m_splitter->addWidget(createNavigatorWidget(Primary));
 
 
     m_splitter->addWidget(createNavigatorWidget(Primary));
 


@@ -44,34 +45,6 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
             this, &DolphinNavigatorsWidgetAction::adjustSpacing);
 }
 
             this, &DolphinNavigatorsWidgetAction::adjustSpacing);
 }
 

-bool DolphinNavigatorsWidgetAction::addToToolbarAndSave(KXmlGuiWindow *mainWindow)
-{
-    const QString rawXml = KXMLGUIFactory::readConfigFile(mainWindow->xmlFile());
-    QDomDocument domDocument;
-    if (rawXml.isEmpty() || !domDocument.setContent(rawXml) || domDocument.isNull()) {
-        return false;
-    }
-    QDomNode toolbar = domDocument.elementsByTagName(QStringLiteral("ToolBar")).at(0);
-    if (toolbar.isNull()) {
-        return false;
-    }
-
-    QDomElement urlNavigatorElement = domDocument.createElement(QStringLiteral("Action"));
-    urlNavigatorElement.setAttribute(QStringLiteral("name"), QStringLiteral("url_navigators"));
-
-    QDomNode position = toolbar.firstChildElement(QStringLiteral("Spacer"));
-    if (position.isNull()) {
-        toolbar.appendChild(urlNavigatorElement);
-    } else {
-        toolbar.replaceChild(urlNavigatorElement, position);
-    }
-
-    KXMLGUIFactory::saveConfigFile(domDocument, mainWindow->xmlFile());
-    mainWindow->reloadXML();
-    mainWindow->createGUI();
-    return true;
-}
-

 void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()
 {
     Q_ASSERT(m_splitter->count() == 1);
 void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()
 {
     Q_ASSERT(m_splitter->count() == 1);


@@ -90,14 +63,29 @@ void DolphinNavigatorsWidgetAction::followViewContainersGeometry(
                                     int globalXOfPrimary,   int widthOfPrimary,
                                     int globalXOfSecondary, int widthOfSecondary)
 {
                                     int globalXOfPrimary,   int widthOfPrimary,
                                     int globalXOfSecondary, int widthOfSecondary)
 {

-    m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x();
-    m_globalXOfPrimary = globalXOfPrimary;
+    if (QApplication::layoutDirection() == Qt::LeftToRight) {
+        m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x();
+        m_globalXOfPrimary = globalXOfPrimary;
+        m_globalXOfSecondary = globalXOfSecondary;
+    } else {
+        // When the direction is reversed, globalX does not change.
+        // For the adjustSpacing() code to work we need globalX to measure from right to left
+        // and to measure up to the rightmost point of a widget instead of the leftmost.
+        m_globalXOfSplitter = (-1) * (m_splitter->mapToGlobal(QPoint(0,0)).x() + m_splitter->width());
+        m_globalXOfPrimary = (-1) * (globalXOfPrimary + widthOfPrimary);
+        m_globalXOfSecondary = (globalXOfSecondary == INT_MIN) ? INT_MIN :
+                               (-1) * (globalXOfSecondary + widthOfSecondary);
+    }

     m_widthOfPrimary = widthOfPrimary;
     m_widthOfPrimary = widthOfPrimary;

-    m_globalXOfSecondary = globalXOfSecondary;

     m_widthOfSecondary = widthOfSecondary;
     adjustSpacing();
 }
 
     m_widthOfSecondary = widthOfSecondary;
     adjustSpacing();
 }
 

+bool DolphinNavigatorsWidgetAction::isInToolbar() const
+{
+    return qobject_cast<QToolBar *>(m_splitter->parentWidget());
+}
+

 DolphinUrlNavigator* DolphinNavigatorsWidgetAction::primaryUrlNavigator() const
 {
     Q_ASSERT(m_splitter);
 DolphinUrlNavigator* DolphinNavigatorsWidgetAction::primaryUrlNavigator() const
 {
     Q_ASSERT(m_splitter);


@@ -126,6 +114,29 @@ void DolphinNavigatorsWidgetAction::setSecondaryNavigatorVisible(bool visible)
     updateText();
 }
 
     updateText();
 }
 

+QWidget *DolphinNavigatorsWidgetAction::createWidget(QWidget *parent)
+{
+    QWidget *oldParent = m_splitter->parentWidget();
+    if (oldParent && oldParent->layout()) {
+        oldParent->layout()->removeWidget(m_splitter.get());
+        QGridLayout *layout = qobject_cast<QGridLayout *>(oldParent->layout());
+        if (qobject_cast<QToolBar *>(parent) && layout) {
+            // in DolphinTabPage::insertNavigatorsWidget the minimumHeight of this row was
+            // set to fit the m_splitter. Since we are now removing it again, the
+            // minimumHeight can be reset to 0.
+            layout->setRowMinimumHeight(0, 0);
+        }
+    }
+    m_splitter->setParent(parent);
+    return m_splitter.get();
+}
+
+void DolphinNavigatorsWidgetAction::deleteWidget(QWidget *widget)
+{
+    Q_UNUSED(widget)
+    m_splitter->setParent(nullptr);
+}
+

 void DolphinNavigatorsWidgetAction::adjustSpacing()
 {
     Q_ASSERT(m_globalXOfSplitter != INT_MIN);
 void DolphinNavigatorsWidgetAction::adjustSpacing()
 {
     Q_ASSERT(m_globalXOfSplitter != INT_MIN);