Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / urlnavigator.cpp

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 965e3f3d5a29db2683478ab73ed36e1d1fc0975f..4ce0fc00937da06f75ad606ce723972c502fba17 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -30,15 +30,20 @@
 #include <assert.h>
 
 #include <kfileitem.h>
 #include <assert.h>
 
 #include <kfileitem.h>

+#include <kicon.h>

 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
 

+#include <QApplication>
+#include <QClipboard>

 #include <QDir>
 #include <QDir>

-#include <QCheckBox>
+#include <QHBoxLayout>

 #include <QLabel>
 #include <QLineEdit>
 #include <QLabel>
 #include <QLineEdit>

+#include <QMouseEvent>
+#include <QPushButton>

 
 UrlNavigator::HistoryElem::HistoryElem() :
     m_url(),
 
 UrlNavigator::HistoryElem::HistoryElem() :
     m_url(),


@@ -62,33 +67,44 @@ UrlNavigator::HistoryElem::~HistoryElem()
 
 UrlNavigator::UrlNavigator(const KUrl& url,
                            QWidget* parent) :
 
 UrlNavigator::UrlNavigator(const KUrl& url,
                            QWidget* parent) :

-    KHBox(parent),
+    QWidget(parent),

     m_active(true),
     m_historyIndex(0),
     m_active(true),
     m_historyIndex(0),

+    m_layout(0),

     m_protocols(0),
     m_protocolSeparator(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());
     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()),
     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();
     }
 
     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&)));
 
     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);
     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&)));
 
     //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();
 }
 
     updateContent();
 }
 


@@ -174,7 +203,7 @@ void UrlNavigator::setUrlEditable(bool editable)
 {
     if (isUrlEditable() != editable) {
         m_toggleButton->toggle();
 {
     if (isUrlEditable() != editable) {
         m_toggleButton->toggle();

-        slotClicked();
+        switchView();

     }
 }
 
     }
 }
 


@@ -186,9 +215,7 @@ bool UrlNavigator::isUrlEditable() const
 void UrlNavigator::editUrl(bool editOrBrowse)
 {
     setUrlEditable(editOrBrowse);
 void UrlNavigator::editUrl(bool editOrBrowse)
 {
     setUrlEditable(editOrBrowse);

-
-    if (editOrBrowse)
-    {
+    if (editOrBrowse) {

         m_pathBox->setFocus();
     }
 }
         m_pathBox->setFocus();
     }
 }


@@ -207,7 +234,6 @@ void UrlNavigator::setActive(bool active)
 void UrlNavigator::dropUrls(const KUrl::List& urls,
                             const KUrl& destination)
 {
 void UrlNavigator::dropUrls(const KUrl::List& urls,
                             const KUrl& destination)
 {

-    kDebug() << "------------------- URLS dropped" << endl;

     emit urlsDropped(urls, destination);
 }
 
     emit urlsDropped(urls, destination);
 }
 


@@ -275,7 +301,6 @@ void UrlNavigator::setUrl(const KUrl& url)
 
 void UrlNavigator::requestActivation()
 {
 
 void UrlNavigator::requestActivation()
 {

-    kDebug() << "--------------------------- request activation" << endl;

     setActive(true);
 }
 
     setActive(true);
 }
 


@@ -288,12 +313,25 @@ void UrlNavigator::storeContentsPosition(int x, int y)
 
 void UrlNavigator::keyReleaseEvent(QKeyEvent* event)
 {
 
 void UrlNavigator::keyReleaseEvent(QKeyEvent* event)
 {

-    KHBox::keyReleaseEvent(event);
+    QWidget::keyReleaseEvent(event);

     if (isUrlEditable() && (event->key() == Qt::Key_Escape)) {
         setUrlEditable(false);
     }
 }
 
     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
 void UrlNavigator::slotReturnPressed(const QString& text)
 {
     // Parts of the following code have been taken


@@ -314,7 +352,7 @@ void UrlNavigator::slotReturnPressed(const QString& text)
     m_pathBox->setUrls(urls, KUrlComboBox::RemoveBottom);
 
     setUrl(typedUrl);
     m_pathBox->setUrls(urls, KUrlComboBox::RemoveBottom);
 
     setUrl(typedUrl);

-    // The Url might have been adjusted by UrlNavigator::setUrl(), hence
+    // The URL might have been adjusted by UrlNavigator::setUrl(), hence

     // synchronize the result in the path box.
     m_pathBox->setUrl(url());
 }
     // synchronize the result in the path box.
     m_pathBox->setUrl(url());
 }


@@ -377,8 +415,8 @@ void UrlNavigator::slotProtocolChanged(const QString& protocol)
     url.setProtocol(protocol);
     //url.setPath(KProtocolInfo::protocolClass(protocol) == ":local" ? "/" : "");
     url.setPath("/");
     url.setProtocol(protocol);
     //url.setPath(KProtocolInfo::protocolClass(protocol) == ":local" ? "/" : "");
     url.setPath("/");

-    QLinkedList<QWidget*>::const_iterator it = m_navButtons.begin();
-    const QLinkedList<QWidget*>::const_iterator itEnd = m_navButtons.end();
+    QLinkedList<UrlNavigatorButton*>::const_iterator it = m_navButtons.begin();
+    const QLinkedList<UrlNavigatorButton*>::const_iterator itEnd = m_navButtons.end();

     while (it != itEnd) {
         (*it)->close();
         (*it)->deleteLater();
     while (it != itEnd) {
         (*it)->close();
         (*it)->deleteLater();


@@ -392,7 +430,9 @@ void UrlNavigator::slotProtocolChanged(const QString& protocol)
     else {
         if (!m_host) {
             m_protocolSeparator = new QLabel("://", this);
     else {
         if (!m_host) {
             m_protocolSeparator = new QLabel("://", this);

+            appendWidget(m_protocolSeparator);

             m_host = new QLineEdit(this);
             m_host = new QLineEdit(this);

+            appendWidget(m_host);

 
             connect(m_host, SIGNAL(lostFocus()),
                     this, SLOT(slotRemoteHostActivated()));
 
             connect(m_host, SIGNAL(lostFocus()),
                     this, SLOT(slotRemoteHostActivated()));


@@ -421,16 +461,16 @@ kDebug() << "received redirection from " << oldUrl << " to " << newUrl << endl;
     m_urls.append(newUrl);*/
 }
 
     m_urls.append(newUrl);*/
 }
 

-void UrlNavigator::slotClicked()
+void UrlNavigator::switchView()

 {
 {

+    updateContent();

     if (isUrlEditable()) {
         m_pathBox->setFocus();
     if (isUrlEditable()) {
         m_pathBox->setFocus();

-        updateContent();

     }
     else {
         setUrl(m_pathBox->currentText());
     }
     else {
         setUrl(m_pathBox->currentText());

-        emit requestActivation();

     }
     }

+    emit requestActivation();

 }
 
 void UrlNavigator::updateHistoryElem()
 }
 
 void UrlNavigator::updateHistoryElem()


@@ -445,16 +485,6 @@ void UrlNavigator::updateHistoryElem()
 
 void UrlNavigator::updateContent()
 {
 
 void UrlNavigator::updateContent()
 {

-    // delete all existing Url navigator buttons
-    QLinkedList<QWidget*>::const_iterator it = m_navButtons.begin();
-    const QLinkedList<QWidget*>::const_iterator itEnd = m_navButtons.end();
-    while (it != itEnd) {
-        (*it)->close();
-        (*it)->deleteLater();
-        ++it;
-    }
-    m_navButtons.clear();
-

     m_bookmarkSelector->updateSelection(url());
 
     m_toggleButton->setToolTip(QString());
     m_bookmarkSelector->updateSelection(url());
 
     m_toggleButton->setToolTip(QString());


@@ -470,6 +500,8 @@ void UrlNavigator::updateContent()
         delete m_protocols; m_protocols = 0;
         delete m_protocolSeparator; m_protocolSeparator = 0;
         delete m_host; m_host = 0;
         delete m_protocols; m_protocols = 0;
         delete m_protocolSeparator; m_protocolSeparator = 0;
         delete m_host; m_host = 0;

+        deleteButtons();
+        m_filler->hide();

 
         m_toggleButton->setToolTip(i18n("Browse (%1, Escape)", shortcut));
 
 
         m_toggleButton->setToolTip(i18n("Browse (%1, Escape)", shortcut));
 


@@ -480,9 +512,9 @@ void UrlNavigator::updateContent()
     else {
         m_toggleButton->setToolTip(i18n("Edit location (%1)", shortcut));
 
     else {
         m_toggleButton->setToolTip(i18n("Edit location (%1)", shortcut));
 

-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);

         m_pathBox->hide();
         m_pathBox->hide();

-        QString dir_name;
+        m_filler->show();

 
         // get the data from the currently selected bookmark
         KBookmark bookmark = m_bookmarkSelector->selectedBookmark();
 
         // get the data from the currently selected bookmark
         KBookmark bookmark = m_bookmarkSelector->selectedBookmark();


@@ -504,8 +536,8 @@ void UrlNavigator::updateContent()
         }
         const uint len = bookmarkPath.length();
 
         }
         const uint len = bookmarkPath.length();
 

-        // calculate the start point for the Url navigator buttons by counting
-        // the slashs inside the bookmark Url
+        // calculate the start point for the URL navigator buttons by counting
+        // the slashs inside the bookmark URL

         int slashCount = 0;
         for (uint i = 0; i < len; ++i) {
             if (bookmarkPath.at(i) == QChar('/')) {
         int slashCount = 0;
         for (uint i = 0; i < len; ++i) {
             if (bookmarkPath.at(i) == QChar('/')) {


@@ -520,7 +552,9 @@ void UrlNavigator::updateContent()
         if (!url().isLocalFile() && bookmark.isNull()) {
             QString protocol = url().protocol();
             if (!m_protocols) {
         if (!url().isLocalFile() && bookmark.isNull()) {
             QString protocol = url().protocol();
             if (!m_protocols) {

+                deleteButtons();

                 m_protocols = new ProtocolCombo(protocol, this);
                 m_protocols = new ProtocolCombo(protocol, this);

+                appendWidget(m_protocols);

                 connect(m_protocols, SIGNAL(activated(const QString&)),
                         this, SLOT(slotProtocolChanged(const QString&)));
             }
                 connect(m_protocols, SIGNAL(activated(const QString&)),
                         this, SLOT(slotProtocolChanged(const QString&)));
             }


@@ -529,18 +563,18 @@ void UrlNavigator::updateContent()
             }
             m_protocols->show();
 
             }
             m_protocols->show();
 

-            if (KProtocolInfo::protocolClass(protocol) != ":local")
-            {
+            if (KProtocolInfo::protocolClass(protocol) != ":local") {

                 QString hostText = url().host();
 
                 QString hostText = url().host();
 

-                if (!url().user().isEmpty())
-                {
+                if (!url().user().isEmpty()) {

                     hostText = url().user() + "@" + hostText;
                 }
 
                 if (!m_host) {
                     m_protocolSeparator = new QLabel("://", this);
                     hostText = url().user() + "@" + hostText;
                 }
 
                 if (!m_host) {
                     m_protocolSeparator = new QLabel("://", this);

+                    appendWidget(m_protocolSeparator);

                     m_host = new QLineEdit(hostText, this);
                     m_host = new QLineEdit(hostText, this);

+                    appendWidget(m_host);

 
                     connect(m_host, SIGNAL(lostFocus()),
                             this, SLOT(slotRemoteHostActivated()));
 
                     connect(m_host, SIGNAL(lostFocus()),
                             this, SLOT(slotRemoteHostActivated()));


@@ -567,39 +601,93 @@ void UrlNavigator::updateContent()
             }
         }
 
             }
         }
 

-        // create Url navigator buttons
-        int idx = slashCount;
-        bool hasNext = true;
-        do {
-            dir_name = path.section('/', idx, idx);
-            const bool isFirstButton = (idx == slashCount);
-            hasNext = isFirstButton || !dir_name.isEmpty();
-            if (hasNext) {
-                UrlNavigatorButton* button = new UrlNavigatorButton(idx, this);
-                if (isFirstButton) {
-                    // the first Url navigator button should get the name of the
-                    // bookmark instead of the directory name
-                    QString text = bookmark.text();
-                    if (text.isEmpty()) {
-                        if (url().isLocalFile())
-                        {
-                            text = i18n("Custom Path");
-                        }
-                        else
-                        {
-                            delete button;
-                            ++idx;
-                            continue;
-                        }
+        updateButtons(path, slashCount);
+    }
+}
+
+void UrlNavigator::updateButtons(const QString& path, int startIndex)
+{
+    QLinkedList<UrlNavigatorButton*>::iterator it = m_navButtons.begin();
+    const QLinkedList<UrlNavigatorButton*>::const_iterator itEnd = m_navButtons.end();
+    bool createButton = false;
+
+    int idx = startIndex;
+    bool hasNext = true;
+    do {
+        createButton = (it == itEnd);
+
+        const QString dirName = path.section('/', idx, idx);
+        const bool isFirstButton = (idx == startIndex);
+        hasNext = isFirstButton || !dirName.isEmpty();
+        if (hasNext) {
+            QString text;
+            if (isFirstButton) {
+                // the first URL navigator button should get the name of the
+                // bookmark instead of the directory name
+                const KBookmark bookmark = m_bookmarkSelector->selectedBookmark();
+                text = bookmark.text();
+                if (text.isEmpty()) {
+                    if (url().isLocalFile()) {
+                        text = i18n("Custom Path");
+                    }
+                    else {
+                        ++idx;
+                        continue;

                     }
                     }

-                    button->setText(text);

                 }
                 }

+            }
+
+            UrlNavigatorButton* button = 0;
+            if (createButton) {
+                button = new UrlNavigatorButton(idx, this);
+                appendWidget(button);
+            }
+            else {
+                button = *it;
+                button->setIndex(idx);
+            }
+
+            if (isFirstButton) {
+                button->setText(text);
+            }
+
+            if (createButton) {

                 button->show();
                 m_navButtons.append(button);
                 button->show();
                 m_navButtons.append(button);

-                ++idx;

             }
             }

-        } while (hasNext);
+            else {
+                ++it;
+            }
+            ++idx;
+        }
+    } while (hasNext);
+
+    // delete buttons which are not used anymore
+    QLinkedList<UrlNavigatorButton*>::iterator itBegin = it;
+    while (it != itEnd) {
+        (*it)->close();
+        (*it)->deleteLater();
+        ++it;

     }
     }

+    m_navButtons.erase(itBegin, m_navButtons.end());
+}
+
+void UrlNavigator::deleteButtons()
+{
+    QLinkedList<UrlNavigatorButton*>::iterator itBegin = m_navButtons.begin();
+    QLinkedList<UrlNavigatorButton*>::iterator itEnd = m_navButtons.end();
+    QLinkedList<UrlNavigatorButton*>::iterator it = itBegin;
+    while (it != itEnd) {
+        (*it)->close();
+        (*it)->deleteLater();
+        ++it;
+    }
+    m_navButtons.erase(itBegin, itEnd);
+}
+
+void UrlNavigator::appendWidget(QWidget* widget)
+{
+    m_layout->insertWidget(m_layout->count() - 1, widget);

 }
 
 #include "urlnavigator.moc"
 }
 
 #include "urlnavigator.moc"