]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/filterbar/filterbar.cpp
dolphinmainwindow: zoom action is now a KToolBarPopupAction
[dolphin.git] / src / filterbar / filterbar.cpp
index 8ef26435c2ae697acfd3b1e1e085dbb6b8c8cb09..e4aea4b61fafa5286591d0bd3e58a1324cefccb3 100644 (file)
@@ -1,73 +1,58 @@
-/***************************************************************************
- *   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  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006-2010 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2006 Gregor Kališnik <gregor@podnapisi.net>
+ * SPDX-FileCopyrightText: 2012 Stuart Citrin <ctrn3e8@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
 #include "filterbar.h"
 
-#include <QBoxLayout>
+#include <KLocalizedString>
+
+#include <QApplication>
+#include <QHBoxLayout>
 #include <QKeyEvent>
-#include <QLabel>
+#include <QLineEdit>
 #include <QToolButton>
 
-#include <KIcon>
-#include <KLocale>
-#include <KLineEdit>
-#include <KIconLoader>
-
-FilterBar::FilterBar(QWidget* parent) :
-    QWidget(parent)
+FilterBar::FilterBar(QWidget *parent)
+    : AnimatedHeightWidget{parent}
 {
-    // Create close button
-    QToolButton *closeButton = new QToolButton(this);
-    closeButton->setAutoRaise(true);
-    closeButton->setIcon(KIcon("dialog-close"));
-    closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
-    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
+    QWidget *contentsContainer = prepareContentsContainer();
 
     // Create button to lock text when changing folders
-    m_lockButton = new QToolButton(this);
+    m_lockButton = new QToolButton(contentsContainer);
     m_lockButton->setAutoRaise(true);
     m_lockButton->setCheckable(true);
-    m_lockButton->setIcon(KIcon("object-unlocked"));
+    m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("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(contentsContainer);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
-    m_filterInput->setClearButtonShown(true);
-    connect(m_filterInput, &KLineEdit::textChanged,
-            this, &FilterBar::filterChanged);
+    m_filterInput->setClearButtonEnabled(true);
+    m_filterInput->setPlaceholderText(i18n("Filter…"));
+    connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 
+    // Create close button
+    QToolButton *closeButton = new QToolButton(contentsContainer);
+    closeButton->setAutoRaise(true);
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
+    closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
+    connect(closeButton, &QToolButton::clicked, this, &FilterBar::closeRequest);
+
     // Apply layout
-    QHBoxLayout* hLayout = new QHBoxLayout(this);
-    hLayout->setMargin(0);
-    hLayout->addWidget(closeButton);
-    hLayout->addWidget(filterLabel);
-    hLayout->addWidget(m_filterInput);
+    QHBoxLayout *hLayout = new QHBoxLayout(contentsContainer);
+    hLayout->setContentsMargins(0, 0, 0, 0);
     hLayout->addWidget(m_lockButton);
+    hLayout->addWidget(m_filterInput);
+    hLayout->addWidget(closeButton);
 
-    filterLabel->setBuddy(m_filterInput);
+    setTabOrder(m_lockButton, closeButton);
+    setTabOrder(closeButton, m_filterInput);
 }
 
 FilterBar::~FilterBar()
@@ -76,7 +61,7 @@ FilterBar::~FilterBar()
 
 void FilterBar::closeFilterBar()
 {
-    hide();
+    setVisible(false, WithAnimation);
     clear();
     if (m_lockButton) {
         m_lockButton->setChecked(false);
@@ -93,7 +78,7 @@ void FilterBar::clear()
     m_filterInput->clear();
 }
 
-void FilterBar::slotUrlChanged()
+void FilterBar::clearIfUnlocked()
 {
     if (!m_lockButton || !(m_lockButton->isChecked())) {
         clear();
@@ -103,41 +88,58 @@ void FilterBar::slotUrlChanged()
 void FilterBar::slotToggleLockButton(bool checked)
 {
     if (checked) {
-        m_lockButton->setIcon(KIcon("object-locked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-locked")));
     } else {
-        m_lockButton->setIcon(KIcon("object-unlocked"));
+        m_lockButton->setIcon(QIcon::fromTheme(QStringLiteral("object-unlocked")));
         clear();
     }
 }
 
-void FilterBar::showEvent(QShowEventevent)
+void FilterBar::showEvent(QShowEvent *event)
 {
     if (!event->spontaneous()) {
         m_filterInput->setFocus();
     }
 }
 
-void FilterBar::keyReleaseEvent(QKeyEvent* event)
+void FilterBar::keyPressEvent(QKeyEvent *event)
 {
-    QWidget::keyReleaseEvent(event);
-
     switch (event->key()) {
     case Qt::Key_Escape:
         if (m_filterInput->text().isEmpty()) {
-            emit closeRequest();
+            Q_EMIT closeRequest();
         } else {
             m_filterInput->clear();
         }
-        break;
+        return;
 
     case Qt::Key_Enter:
     case Qt::Key_Return:
-        emit focusViewRequest();
-        break;
+        Q_EMIT focusViewRequest();
+        return;
+
+    case Qt::Key_Down:
+    case Qt::Key_PageDown:
+    case Qt::Key_Up:
+    case Qt::Key_PageUp: {
+        Q_EMIT focusViewRequest();
+        QWidget *focusWidget = QApplication::focusWidget();
+        if (focusWidget && focusWidget != this) {
+            QApplication::sendEvent(focusWidget, event);
+        }
+        return;
+    }
 
     default:
         break;
     }
+
+    QWidget::keyPressEvent(event);
+}
+
+int FilterBar::preferredHeight() const
+{
+    return std::max(m_filterInput->sizeHint().height(), m_lockButton->sizeHint().height());
 }
 
-#include "filterbar.moc"
+#include "moc_filterbar.cpp"