X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/175fe7ff47ccff39b0e77f80491a9701d025375e..acfccceb916b885aa2764759076bad1b9d121eb2:/src/urlnavigator.cpp diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 93de43e67..f1b39fb32 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) * + * Copyright (C) 2006 by Peter Penz () * * Copyright (C) 2006 by Aaron J. Seigo () * * Copyright (C) 2006 by Patrice Tremblay * * * @@ -21,42 +21,29 @@ #include "urlnavigator.h" +#include "bookmarkselector.h" +#include "dolphinsettings.h" +#include "dolphin_generalsettings.h" +#include "protocolcombo.h" +#include "urlnavigatorbutton.h" + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//Added by qt3to4: -#include -#include -#include -#include - -#include -#include -#include -#include #include +#include #include #include -#include #include #include -#include -#include -#include "bookmarkselector.h" -#include "dolphinsettings.h" -#include "generalsettings.h" -#include "protocolcombo.h" -#include "urlnavigatorbutton.h" +#include +#include +#include +#include +#include +#include +#include +#include UrlNavigator::HistoryElem::HistoryElem() : m_url(), @@ -80,33 +67,45 @@ UrlNavigator::HistoryElem::~HistoryElem() UrlNavigator::UrlNavigator(const KUrl& url, QWidget* parent) : - KHBox(parent), + QWidget(parent), m_active(true), + m_showHiddenFiles(false), 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 QToolButton(); + m_toggleButton->setCheckable(true); + m_toggleButton->setAutoRaise(true); + m_toggleButton->setIcon(KIcon("editinput")); // 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); @@ -120,6 +119,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(); } @@ -130,7 +142,9 @@ UrlNavigator::~UrlNavigator() const KUrl& UrlNavigator::url() const { assert(!m_history.empty()); - return m_history[m_historyIndex].url(); + QLinkedList::const_iterator it = m_history.begin(); + it += m_historyIndex; + return (*it).url(); } KUrl UrlNavigator::url(int index) const @@ -147,7 +161,7 @@ KUrl UrlNavigator::url(int index) const return path; } -const Q3ValueList& UrlNavigator::history(int& index) const +const QLinkedList& UrlNavigator::history(int& index) const { index = m_historyIndex; return m_history; @@ -190,7 +204,7 @@ void UrlNavigator::setUrlEditable(bool editable) { if (isUrlEditable() != editable) { m_toggleButton->toggle(); - slotClicked(); + switchView(); } } @@ -202,9 +216,7 @@ bool UrlNavigator::isUrlEditable() const void UrlNavigator::editUrl(bool editOrBrowse) { setUrlEditable(editOrBrowse); - - if (editOrBrowse) - { + if (editOrBrowse) { m_pathBox->setFocus(); } } @@ -220,16 +232,28 @@ void UrlNavigator::setActive(bool active) } } +void UrlNavigator::setShowHiddenFiles( bool show ) +{ + m_showHiddenFiles = show; +} + void UrlNavigator::dropUrls(const KUrl::List& urls, const KUrl& destination) { - kDebug() << "------------------- URLS dropped" << endl; emit urlsDropped(urls, destination); } void UrlNavigator::setUrl(const KUrl& url) { QString urlStr(url.pathOrUrl()); + + // TODO: a patch has been submitted by Filip Brcic which adjusts + // the URL for tar and zip files. See https://bugs.kde.org/show_bug.cgi?id=142781 + // for details. The URL navigator part of the patch has not been committed yet, + // as the URL navigator will be subject of change and + // we might think of a more generic approach to check the protocol + MIME type for + // this use case. + //kDebug() << "setUrl(" << url << ")" << endl; if ( urlStr.length() > 0 && urlStr.at(0) == '~') { // replace '~' by the home directory @@ -243,7 +267,9 @@ void UrlNavigator::setUrl(const KUrl& url) // Check whether the previous element of the history has the same Url. // If yes, just go forward instead of inserting a duplicate history // element. - const KUrl& nextUrl = m_history[m_historyIndex - 1].url(); + QLinkedList::const_iterator it = m_history.begin(); + it += m_historyIndex - 1; + const KUrl& nextUrl = (*it).url(); if (transformedUrl == nextUrl) { goForward(); // kDebug() << "goin' forward in history" << endl; @@ -251,7 +277,8 @@ void UrlNavigator::setUrl(const KUrl& url) } } - const KUrl& currUrl = m_history[m_historyIndex].url(); + QLinkedList::iterator it = m_history.begin() + m_historyIndex; + const KUrl& currUrl = (*it).url(); if (currUrl == transformedUrl) { // don't insert duplicate history elements // kDebug() << "currUrl == transformedUrl" << endl; @@ -259,8 +286,6 @@ void UrlNavigator::setUrl(const KUrl& url) } updateHistoryElem(); - - const Q3ValueListIterator it = m_history.at(m_historyIndex); m_history.insert(it, HistoryElem(transformedUrl)); updateContent(); @@ -290,24 +315,37 @@ void UrlNavigator::setUrl(const KUrl& url) void UrlNavigator::requestActivation() { - kDebug() << "--------------------------- request activation" << endl; setActive(true); } void UrlNavigator::storeContentsPosition(int x, int y) { - m_history[m_historyIndex].setContentsX(x); - m_history[m_historyIndex].setContentsY(y); + QLinkedList::iterator it = m_history.begin() + m_historyIndex; + (*it).setContentsX(x); + (*it).setContentsY(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 @@ -319,7 +357,7 @@ void UrlNavigator::slotReturnPressed(const QString& text) KUrl typedUrl(text); if (typedUrl.hasPass()) { - typedUrl.setPass(QString::null); + typedUrl.setPass(QString()); } QStringList urls = m_pathBox->urls(); @@ -328,7 +366,7 @@ void UrlNavigator::slotReturnPressed(const QString& text) 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()); } @@ -391,8 +429,9 @@ void UrlNavigator::slotProtocolChanged(const QString& protocol) url.setProtocol(protocol); //url.setPath(KProtocolInfo::protocolClass(protocol) == ":local" ? "/" : ""); url.setPath("/"); - Q3ValueList::const_iterator it = m_navButtons.constBegin(); - while (it != m_navButtons.constEnd()) { + QLinkedList::const_iterator it = m_navButtons.begin(); + const QLinkedList::const_iterator itEnd = m_navButtons.end(); + while (it != itEnd) { (*it)->close(); (*it)->deleteLater(); ++it; @@ -405,7 +444,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())); @@ -434,16 +475,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() @@ -451,21 +492,13 @@ void UrlNavigator::updateHistoryElem() assert(m_historyIndex >= 0); const KFileItem* item = 0; // TODO: m_dolphinView->currentFileItem(); if (item != 0) { - m_history[m_historyIndex].setCurrentFileName(item->name()); + QLinkedList::iterator it = m_history.begin() + m_historyIndex; + (*it).setCurrentFileName(item->name()); } } void UrlNavigator::updateContent() { - // delete all existing Url navigator buttons - Q3ValueList::const_iterator it = m_navButtons.constBegin(); - while (it != m_navButtons.constEnd()) { - (*it)->close(); - (*it)->deleteLater(); - ++it; - } - m_navButtons.clear(); - m_bookmarkSelector->updateSelection(url()); m_toggleButton->setToolTip(QString()); @@ -481,6 +514,8 @@ void UrlNavigator::updateContent() 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)); @@ -491,9 +526,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(); - QString dir_name; + m_filler->show(); // get the data from the currently selected bookmark KBookmark bookmark = m_bookmarkSelector->selectedBookmark(); @@ -515,8 +550,8 @@ void UrlNavigator::updateContent() } 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('/')) { @@ -531,7 +566,9 @@ void UrlNavigator::updateContent() if (!url().isLocalFile() && bookmark.isNull()) { QString protocol = url().protocol(); 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&))); } @@ -540,18 +577,18 @@ void UrlNavigator::updateContent() } m_protocols->show(); - if (KProtocolInfo::protocolClass(protocol) != ":local") - { + if (KProtocolInfo::protocolClass(protocol) != ":local") { QString hostText = url().host(); - if (!url().user().isEmpty()) - { - hostText = url().user() + "@" + hostText; + if (!url().user().isEmpty()) { + hostText = url().user() + '@' + hostText; } 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())); @@ -578,39 +615,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::iterator it = m_navButtons.begin(); + const QLinkedList::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); - ++idx; } - } while (hasNext); + else { + ++it; + } + ++idx; + } + } while (hasNext); + + // delete buttons which are not used anymore + QLinkedList::iterator itBegin = it; + while (it != itEnd) { + (*it)->close(); + (*it)->deleteLater(); + ++it; } + m_navButtons.erase(itBegin, m_navButtons.end()); +} + +void UrlNavigator::deleteButtons() +{ + QLinkedList::iterator itBegin = m_navButtons.begin(); + QLinkedList::iterator itEnd = m_navButtons.end(); + QLinkedList::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"