X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/00b23eaa5233666bf7fa04800ae365234b50aed4..abf17941f7:/src/urlnavigator.cpp

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index d700be2a0..4ce0fc009 100644
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -30,15 +30,20 @@
 #include <assert.h>
 
 #include <kfileitem.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 
+#include <QApplication>
+#include <QClipboard>
 #include <QDir>
-#include <QCheckBox>
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMouseEvent>
+#include <QPushButton>
 
 UrlNavigator::HistoryElem::HistoryElem() :
     m_url(),
@@ -62,33 +67,44 @@ UrlNavigator::HistoryElem::~HistoryElem()
 
 UrlNavigator::UrlNavigator(const KUrl& url,
                            QWidget* parent) :
-    KHBox(parent),
+    QWidget(parent),
     m_active(true),
     m_historyIndex(0),
+    m_layout(0),
     m_protocols(0),
     m_protocolSeparator(0),
-    m_host(0)
+    m_host(0),
+    m_filler(0)
 {
+    m_layout = new QHBoxLayout();
+    m_layout->setSpacing(0);
+    m_layout->setMargin(0);
+
     m_history.prepend(HistoryElem(url));
 
     QFontMetrics fontMetrics(font());
-    setMinimumHeight(fontMetrics.height() + 8);
-
-    m_toggleButton = new QCheckBox(this);
-    //m_toggleButton->setFlat(true);
-    //m_toggleButton->setToggleButton(true);
+    setMinimumHeight(fontMetrics.height() + 10);
+
+    // intialize toggle button which switches between the breadcrumb view
+    // and the traditional view
+    m_toggleButton = new QPushButton();
+    m_toggleButton->setCheckable(true);
+    m_toggleButton->setFlat(true);
+    m_toggleButton->setIcon(KIcon("locationbar_erase")); // TODO: is just a placeholder icon
     m_toggleButton->setFocusPolicy(Qt::NoFocus);
     m_toggleButton->setMinimumHeight(minimumHeight());
     connect(m_toggleButton, SIGNAL(clicked()),
-            this, SLOT(slotClicked()));
+            this, SLOT(switchView()));
     if (DolphinSettings::instance().generalSettings()->editableUrl()) {
         m_toggleButton->toggle();
     }
 
+    // initialize the bookmark selector
     m_bookmarkSelector = new BookmarkSelector(this);
     connect(m_bookmarkSelector, SIGNAL(bookmarkActivated(const KUrl&)),
             this, SLOT(setUrl(const KUrl&)));
 
+    // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Directories, true, this);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);
@@ -102,6 +118,19 @@ UrlNavigator::UrlNavigator(const KUrl& url,
 
     //connect(dolphinView, SIGNAL(redirection(const KUrl&, const KUrl&)),
     //        this, SLOT(slotRedirection(const KUrl&, const KUrl&)));
+
+    // Append a filler widget at the end, which automatically resizes to the
+    // maximum available width. This assures that the URL navigator uses the
+    // whole width, so that the clipboard content can be dropped.
+    m_filler = new QWidget();
+    m_filler->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    m_layout->addWidget(m_toggleButton);
+    m_layout->addWidget(m_bookmarkSelector);
+    m_layout->addWidget(m_pathBox);
+    m_layout->addWidget(m_filler);
+    setLayout(m_layout);
+
     updateContent();
 }
 
@@ -174,7 +203,7 @@ void UrlNavigator::setUrlEditable(bool editable)
 {
     if (isUrlEditable() != editable) {
         m_toggleButton->toggle();
-        slotClicked();
+        switchView();
     }
 }
 
@@ -284,12 +313,25 @@ void UrlNavigator::storeContentsPosition(int x, int y)
 
 void UrlNavigator::keyReleaseEvent(QKeyEvent* event)
 {
-    KHBox::keyReleaseEvent(event);
+    QWidget::keyReleaseEvent(event);
     if (isUrlEditable() && (event->key() == Qt::Key_Escape)) {
         setUrlEditable(false);
     }
 }
 
+void UrlNavigator::mouseReleaseEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::MidButton) {
+        QClipboard* clipboard = QApplication::clipboard();
+        const QMimeData* mimeData = clipboard->mimeData();
+        if (mimeData->hasText()) {
+            const QString text = mimeData->text();
+            setUrl(KUrl(text));
+        }
+    }
+    QWidget::mouseReleaseEvent(event);
+}
+
 void UrlNavigator::slotReturnPressed(const QString& text)
 {
     // Parts of the following code have been taken
@@ -388,7 +430,9 @@ void UrlNavigator::slotProtocolChanged(const QString& protocol)
     else {
         if (!m_host) {
             m_protocolSeparator = new QLabel("://", this);
+            appendWidget(m_protocolSeparator);
             m_host = new QLineEdit(this);
+            appendWidget(m_host);
 
             connect(m_host, SIGNAL(lostFocus()),
                     this, SLOT(slotRemoteHostActivated()));
@@ -417,16 +461,16 @@ kDebug() << "received redirection from " << oldUrl << " to " << newUrl << endl;
     m_urls.append(newUrl);*/
 }
 
-void UrlNavigator::slotClicked()
+void UrlNavigator::switchView()
 {
+    updateContent();
     if (isUrlEditable()) {
         m_pathBox->setFocus();
-        updateContent();
     }
     else {
         setUrl(m_pathBox->currentText());
-        emit requestActivation();
     }
+    emit requestActivation();
 }
 
 void UrlNavigator::updateHistoryElem()
@@ -457,6 +501,7 @@ void UrlNavigator::updateContent()
         delete m_protocolSeparator; m_protocolSeparator = 0;
         delete m_host; m_host = 0;
         deleteButtons();
+        m_filler->hide();
 
         m_toggleButton->setToolTip(i18n("Browse (%1, Escape)", shortcut));
 
@@ -467,8 +512,9 @@ void UrlNavigator::updateContent()
     else {
         m_toggleButton->setToolTip(i18n("Edit location (%1)", shortcut));
 
-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         m_pathBox->hide();
+        m_filler->show();
 
         // get the data from the currently selected bookmark
         KBookmark bookmark = m_bookmarkSelector->selectedBookmark();
@@ -508,6 +554,7 @@ void UrlNavigator::updateContent()
             if (!m_protocols) {
                 deleteButtons();
                 m_protocols = new ProtocolCombo(protocol, this);
+                appendWidget(m_protocols);
                 connect(m_protocols, SIGNAL(activated(const QString&)),
                         this, SLOT(slotProtocolChanged(const QString&)));
             }
@@ -525,7 +572,9 @@ void UrlNavigator::updateContent()
 
                 if (!m_host) {
                     m_protocolSeparator = new QLabel("://", this);
+                    appendWidget(m_protocolSeparator);
                     m_host = new QLineEdit(hostText, this);
+                    appendWidget(m_host);
 
                     connect(m_host, SIGNAL(lostFocus()),
                             this, SLOT(slotRemoteHostActivated()));
@@ -591,6 +640,7 @@ void UrlNavigator::updateButtons(const QString& path, int startIndex)
             UrlNavigatorButton* button = 0;
             if (createButton) {
                 button = new UrlNavigatorButton(idx, this);
+                appendWidget(button);
             }
             else {
                 button = *it;
@@ -635,4 +685,9 @@ void UrlNavigator::deleteButtons()
     m_navButtons.erase(itBegin, itEnd);
 }
 
+void UrlNavigator::appendWidget(QWidget* widget)
+{
+    m_layout->insertWidget(m_layout->count() - 1, widget);
+}
+
 #include "urlnavigator.moc"