1 files changed, 42 insertions, 15 deletions

diff --git a/src/gui/entry/EntryView.h b/src/gui/entry/EntryView.h
index 6a545f62a..a8422c563 100644
--- a/src/gui/entry/EntryView.h
+++ b/src/gui/entry/EntryView.h
@@ -1,18 +1,19 @@
 /*
- *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ * Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
+ * Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
  *
- *  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 or (at your option)
- *  version 3 of the License.
+ * 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 or (at your option)
+ * version 3 of the License.
  *
- *  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.
+ * 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, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KEEPASSX_ENTRYVIEW_H
@@ -26,6 +27,7 @@ class Entry;
 class EntryModel;
 class Group;
 class SortFilterHideProxyModel;
+class QActionGroup;
 
 class EntryView : public QTreeView
 {
@@ -38,29 +40,54 @@ public:
     void setCurrentEntry(Entry* entry);
     Entry* entryFromIndex(const QModelIndex& index);
     void setEntryList(const QList<Entry*>& entries);
-    bool inEntryListMode();
+    bool inSearchMode();
     int numberOfSelectedEntries();
     void setFirstEntryActive();
+    bool isUsernamesHidden() const;
+    void setUsernamesHidden(const bool hide);
+    bool isPasswordsHidden() const;
+    void setPasswordsHidden(const bool hide);
+    QByteArray viewState() const;
+    bool setViewState(const QByteArray& state);
 
 public slots:
     void setGroup(Group* group);
 
 signals:
     void entryActivated(Entry* entry, EntryModel::ModelColumn column);
+    void entryPressed(Entry* entry);
     void entrySelectionChanged();
+    void viewStateChanged();
 
 protected:
     void keyPressEvent(QKeyEvent* event) override;
 
 private slots:
     void emitEntryActivated(const QModelIndex& index);
-    void switchToEntryListMode();
-    void switchToGroupMode();
+    void emitEntryPressed(const QModelIndex& index);
+    void switchToListMode();
+    void switchToSearchMode();
+    void showHeaderMenu(const QPoint& position);
+    void toggleColumnVisibility(QAction *action);
+    void fitColumnsToWindow();
+    void fitColumnsToContents();
+    void resetViewToDefaults();
 
 private:
+    void fillRemainingWidth(bool lastColumnOnly);
+    void resetFixedColumns();
+    
     EntryModel* const m_model;
     SortFilterHideProxyModel* const m_sortModel;
-    bool m_inEntryListMode;
+    bool m_inSearchMode;
+
+    QByteArray m_defaultListViewState;
+    QByteArray m_defaultSearchViewState;
+
+    QMenu* m_headerMenu;
+    QAction* m_hideUsernamesAction;
+    QAction* m_hidePasswordsAction;
+    QActionGroup* m_columnActions;
 };
 
 #endif // KEEPASSX_ENTRYVIEW_H