X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/342954bb1fdc59fde0a95f2ba97b7e7712cfb47d..2b895e7e2bd096e55faa1032ebc6a355a72c2325:/src/filterbar/filterbar.cpp

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 8e4dfcc9b..82d5f549e 100644
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
  *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
+ *   Copyright (C) 2012 by Stuart Citrin <ctrn3e8@gmail.com>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,15 +20,14 @@
  ***************************************************************************/
 #include "filterbar.h"
 
-#include <QBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QToolButton>
+#include <QHBoxLayout>
 
-#include <kicon.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kiconloader.h>
+#include <QIcon>
+#include <KLocalizedString>
+#include <QLineEdit>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
@@ -35,19 +35,27 @@ FilterBar::FilterBar(QWidget* parent) :
     // Create close button
     QToolButton *closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(KIcon("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme("dialog-close"));
     closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
-    connect(closeButton, SIGNAL(clicked()), this, SIGNAL(closeRequest()));
+    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
+
+    // Create button to lock text when changing folders
+    m_lockButton = new QToolButton(this);
+    m_lockButton->setAutoRaise(true);
+    m_lockButton->setCheckable(true);
+    m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+    m_lockButton->setToolTip(i18nc("@info:tooltip", "Keep Filter When Changing Folders"));
+    connect(m_lockButton, &QToolButton::toggled, this, &FilterBar::slotToggleLockButton);
 
     // Create label
     QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this);
 
     // Create filter editor
-    m_filterInput = new KLineEdit(this);
+    m_filterInput = new QLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
-    m_filterInput->setClearButtonShown(true);
-    connect(m_filterInput, SIGNAL(textChanged(const QString&)),
-            this, SIGNAL(filterChanged(const QString&)));
+    m_filterInput->setClearButtonEnabled(true);
+    connect(m_filterInput, &QLineEdit::textChanged,
+            this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
     // Apply layout
@@ -56,6 +64,7 @@ FilterBar::FilterBar(QWidget* parent) :
     hLayout->addWidget(closeButton);
     hLayout->addWidget(filterLabel);
     hLayout->addWidget(m_filterInput);
+    hLayout->addWidget(m_lockButton);
 
     filterLabel->setBuddy(m_filterInput);
 }
@@ -64,6 +73,15 @@ FilterBar::~FilterBar()
 {
 }
 
+void FilterBar::closeFilterBar()
+{
+    hide();
+    clear();
+    if (m_lockButton) {
+        m_lockButton->setChecked(false);
+    }
+}
+
 void FilterBar::selectAll()
 {
     m_filterInput->selectAll();
@@ -74,6 +92,23 @@ void FilterBar::clear()
     m_filterInput->clear();
 }
 
+void FilterBar::slotUrlChanged()
+{
+    if (!m_lockButton || !(m_lockButton->isChecked())) {
+        clear();
+    }
+}
+
+void FilterBar::slotToggleLockButton(bool checked)
+{
+    if (checked) {
+        m_lockButton->setIcon(QIcon::fromTheme("object-locked"));
+    } else {
+        m_lockButton->setIcon(QIcon::fromTheme("object-unlocked"));
+        clear();
+    }
+}
+
 void FilterBar::showEvent(QShowEvent* event)
 {
     if (!event->spontaneous()) {
@@ -84,13 +119,23 @@ void FilterBar::showEvent(QShowEvent* event)
 void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
-    if ((event->key() == Qt::Key_Escape)) {
+
+    switch (event->key()) {
+    case Qt::Key_Escape:
         if (m_filterInput->text().isEmpty()) {
             emit closeRequest();
         } else {
             m_filterInput->clear();
         }
+        break;
+
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+        emit focusViewRequest();
+        break;
+
+    default:
+        break;
     }
 }
 
-#include "filterbar.moc"