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 c30e6ed558a6417b92f40dbd85c942c79eafed6b..4ce0fc00937da06f75ad606ce723972c502fba17 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -30,6 +30,7 @@
 #include <assert.h>
 
 #include <kfileitem.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kurlcombobox.h>
@@ -37,12 +38,12 @@
 
 #include <QApplication>
 #include <QClipboard>
-#include <QCheckBox>
 #include <QDir>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMouseEvent>
+#include <QPushButton>
 
 UrlNavigator::HistoryElem::HistoryElem() :
     m_url(),
@@ -72,7 +73,8 @@ UrlNavigator::UrlNavigator(const KUrl& url,
     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);
@@ -81,21 +83,28 @@ UrlNavigator::UrlNavigator(const KUrl& url,
     m_history.prepend(HistoryElem(url));
 
     QFontMetrics fontMetrics(font());
-    setMinimumHeight(fontMetrics.height() + 8);
-
-    m_toggleButton = new QCheckBox();
+    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);
@@ -113,13 +122,13 @@ UrlNavigator::UrlNavigator(const KUrl& url,
     // 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.
-    QWidget* filler = new QWidget();
-    filler->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    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(filler);
+    m_layout->addWidget(m_filler);
     setLayout(m_layout);
 
     updateContent();
@@ -194,7 +203,7 @@ void UrlNavigator::setUrlEditable(bool editable)
 {
     if (isUrlEditable() != editable) {
         m_toggleButton->toggle();
-        slotClicked();
+        switchView();
     }
 }
 
@@ -421,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()));
@@ -450,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()
@@ -490,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));
 
@@ -502,6 +514,7 @@ void UrlNavigator::updateContent()
 
         setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         m_pathBox->hide();
+        m_filler->show();
 
         // get the data from the currently selected bookmark
         KBookmark bookmark = m_bookmarkSelector->selectedBookmark();
@@ -541,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&)));
             }