X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=4fff6021216078e5f0d09c0b33c2a0632e8ee9e4;hp=1f733cfb1e0d371f118d0a0ac0074a08c39db1bc;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 1f733cfb..4fff6021 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,26 +18,27 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BUFFERVIEW_H_
-#define BUFFERVIEW_H_
+#pragma once
+
+#include "uisupport-export.h"
 
 #include <QAction>
 #include <QMenu>
 #include <QDockWidget>
 #include <QModelIndex>
 #include <QStyledItemDelegate>
-#include <QTreeView>
 #include <QPointer>
 
 #include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
+#include "treeviewtouch.h"
 #include "types.h"
 
 /*****************************************
  * The TreeView showing the Buffers
  *****************************************/
-class BufferView : public QTreeView
+class UISUPPORT_EXPORT BufferView : public TreeViewTouch
 {
     Q_OBJECT
 
@@ -47,10 +48,10 @@ public:
         Backward = -1
     };
 
-    BufferView(QWidget *parent = 0);
+    BufferView(QWidget *parent = nullptr);
     void init();
 
-    void setModel(QAbstractItemModel *model);
+    void setModel(QAbstractItemModel *model) override;
     void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
 
     void setConfig(BufferViewConfig *config);
@@ -59,6 +60,8 @@ public:
     void addActionsToMenu(QMenu *menu, const QModelIndex &index);
     void addFilterActions(QMenu *contextMenu, const QModelIndex &index);
 
+    void selectFirstBuffer();
+
 public slots:
     void setRootIndexForNetworkId(const NetworkId &networkId);
     void removeSelectedBuffers(bool permanently = false);
@@ -66,31 +69,54 @@ public slots:
     void nextBuffer();
     void previousBuffer();
     void hideCurrentBuffer();
+    void filterTextChanged(const QString& filterString);
+    void changeHighlight(Direction direction);
+    void selectHighlighted();
+    void clearHighlight();
 
 signals:
     void removeBuffer(const QModelIndex &);
     void removeBufferPermanently(const QModelIndex &);
 
 protected:
-    virtual void keyPressEvent(QKeyEvent *);
-    virtual void dropEvent(QDropEvent *event);
-    virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-    virtual void wheelEvent(QWheelEvent *);
-    virtual QSize sizeHint() const;
-    virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
-    virtual void contextMenuEvent(QContextMenuEvent *event);
-
-#if QT_VERSION < 0x050000
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-#else
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
-#endif
+    void dropEvent(QDropEvent *event) override;
+    void rowsInserted(const QModelIndex &parent, int start, int end) override;
+    void wheelEvent(QWheelEvent *) override;
+    QSize sizeHint() const override;
+    void focusInEvent(QFocusEvent *event) override { QAbstractScrollArea::focusInEvent(event); }
+    void contextMenuEvent(QContextMenuEvent *event) override;
+
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override;
 
 private slots:
     void joinChannel(const QModelIndex &index);
     void toggleHeader(bool checked);
 
+    /**
+     * Expand all active networks and collapse inactive ones unless manually changed
+     *
+     * Applies to all networks.  Shouldn't need called except during initialization.
+     */
+    void setExpandedState();
+
+    /**
+     * Save the current display state of the given network
+     *
+     * Tracks expanded or collapsed and active or inactive.
+     *
+     * @see setExpandedState()
+     * @param[in] networkIdx QModelIndex of the root network to store
+     */
     void storeExpandedState(const QModelIndex &networkIdx);
+
+    /**
+     * Set the display state of the given network according to network status and manual changes
+     *
+     * Expands if active or previously expanded, collapses if inactive or previously collapsed.
+     *
+     * @see storeExpandedState()
+     * @param[in] networkIdx QModelIndex of the root network to update
+     */
     void setExpandedState(const QModelIndex &networkIdx);
 
     void on_configChanged();
@@ -106,11 +132,12 @@ private:
         WasActive = 0x02
     };
     QHash<NetworkId, short> _expandedState;
+    QModelIndex _currentHighlight;
 };
 
 
 // ******************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ******************************
 
 class BufferViewDelegate : public QStyledItemDelegate
@@ -118,18 +145,23 @@ class BufferViewDelegate : public QStyledItemDelegate
     Q_OBJECT
 
 public:
-    BufferViewDelegate(QObject *parent = 0);
-    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index);
+    BufferViewDelegate(QObject *parent = nullptr);
+    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+
+public:
+    QModelIndex currentHighlight;
 
 protected:
-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
 };
 
 
 // ==============================
 //  BufferView Dock
 // ==============================
-class BufferViewDock : public QDockWidget
+class UISUPPORT_EXPORT BufferViewDock : public QDockWidget
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive STORED true)
@@ -141,19 +173,30 @@ public :
     BufferViewConfig *config() const;
     inline BufferView *bufferView() const { return qobject_cast<BufferView *>(widget()); }
     inline bool isActive() const { return _active; }
+    void setWidget(QWidget *newWidget);
+    void setLocked(bool locked);
+    QWidget *widget() const { return _childWidget; }
+
+    void activateFilter();
 
 public slots:
     void setActive(bool active = true);
 
+protected slots:
+    bool eventFilter(QObject *object, QEvent *event) override;
+    void focusInEvent(QFocusEvent*event) override { qDebug() << event; }
+
 private slots:
     void bufferViewRenamed(const QString &newName);
     void updateTitle();
+    void configChanged();
+    void onFilterReturnPressed();
 
 private:
-
+    QWidget *_childWidget;
+    QWidget *_widget;
+    QPointer<QWidget> _oldFocusItem; // QPointer in case the old item gets deleted
+    QLineEdit *_filterEdit;
     bool _active;
     QString _title;
 };
-
-
-#endif