From d94f8e007a9ec408f63e4d5795af465d0f9aafb0 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 21 May 2008 09:09:44 +0000 Subject: [PATCH] Make BufferView compile --- src/uisupport/bufferview.cpp | 28 +++---- src/uisupport/bufferview.h | 152 ++++++++++++++++++----------------- 2 files changed, 93 insertions(+), 87 deletions(-) diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index e3206018..7f690e17 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -303,7 +303,7 @@ void BufferView::toggleHeader(bool checked) { header()->setSectionHidden((action->property("column")).toInt(), !checked); } -bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState) { +bool BufferView::checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState) { if(!index.isValid()) return false; @@ -311,9 +311,9 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re // if(!(itemType & validItemTypes)) // return false; - itemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() - ? activeState - : inactiveState; + ItemActiveStates isActive = index.data(NetworkModel::ItemActiveRole).toBool() + ? ActiveState + : InactiveState; if(!(isActive & requiredActiveState)) return false; @@ -321,7 +321,7 @@ bool BufferView::checkRequirements(const QModelIndex &index, itemActiveStates re return true; } -void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addAction(&action); action.setVisible(true); @@ -340,7 +340,7 @@ void BufferView::addItemToMenu(QAction &action, QMenu &menu, bool condition) { } -void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addMenu(&subMenu); subMenu.setVisible(true); @@ -349,7 +349,7 @@ void BufferView::addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &i } } -void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState) { +void BufferView::addSeparatorToMenu(QMenu &menu, const QModelIndex &index, ItemActiveStates requiredActiveState) { if(checkRequirements(index, requiredActiveState)) { menu.addSeparator(); } @@ -393,20 +393,20 @@ void BufferView::contextMenuEvent(QContextMenuEvent *event) { case NetworkModel::NetworkItemType: _disconnectNetAction.setIcon(connectionStateIcon); _connectNetAction.setIcon(connectionStateIcon); - addItemToMenu(_disconnectNetAction, contextMenu, index, activeState); - addItemToMenu(_connectNetAction, contextMenu, index, inactiveState); - addSeparatorToMenu(contextMenu, index, activeState); - addItemToMenu(_joinChannelAction, contextMenu, index, activeState); + addItemToMenu(_disconnectNetAction, contextMenu, index, ActiveState); + addItemToMenu(_connectNetAction, contextMenu, index, InactiveState); + addSeparatorToMenu(contextMenu, index, ActiveState); + addItemToMenu(_joinChannelAction, contextMenu, index, ActiveState); break; case NetworkModel::BufferItemType: { BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value(); switch(bufferInfo.type()) { case BufferInfo::ChannelBuffer: - addItemToMenu(_joinBufferAction, contextMenu, index, inactiveState); - addItemToMenu(_partBufferAction, contextMenu, index, activeState); + addItemToMenu(_joinBufferAction, contextMenu, index, InactiveState); + addItemToMenu(_partBufferAction, contextMenu, index, ActiveState); addItemToMenu(_hideBufferAction, contextMenu, (bool)config()); - addItemToMenu(_removeBufferAction, contextMenu, index, inactiveState); + addItemToMenu(_removeBufferAction, contextMenu, index, InactiveState); createHideEventsSubMenu(contextMenu); addItemToMenu(_ignoreListAction, contextMenu); break; diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h index 82db16d0..cb5a68de 100644 --- a/src/uisupport/bufferview.h +++ b/src/uisupport/bufferview.h @@ -37,88 +37,94 @@ * The TreeView showing the Buffers *****************************************/ class BufferView : public QTreeView { - Q_OBJECT - -public: - BufferView(QWidget *parent = 0); - void init(); - - void setModel(QAbstractItemModel *model); - void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config); - virtual void setSelectionModel(QItemSelectionModel *selectionModel); - - void setConfig(BufferViewConfig *config); - inline BufferViewConfig *config() { return _config; } - -public slots: - void setRootIndexForNetworkId(const NetworkId &networkId); - void removeSelectedBuffers(); - -signals: - void removeBuffer(const QModelIndex &); - -protected: - virtual void keyPressEvent(QKeyEvent *); - virtual void rowsInserted (const QModelIndex & parent, int start, int end); - virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); - virtual void wheelEvent(QWheelEvent *); - virtual QSize sizeHint() const; - virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); } - virtual void contextMenuEvent(QContextMenuEvent *event); - -private slots: - void joinChannel(const QModelIndex &index); - void toggleHeader(bool checked); - // void showContextMenu(const QPoint &); - void layoutChanged(); - -private: - enum itemActiveState { - inactiveState = 0x01, - activeState = 0x02 - }; - Q_DECLARE_FLAGS(itemActiveStates, itemActiveState); - - QPointer _config; - - QAction _connectNetAction; - QAction _disconnectNetAction; - QAction _joinChannelAction; - - QAction _joinBufferAction; - QAction _partBufferAction; - QAction _hideBufferAction; - QAction _removeBufferAction; - QAction _ignoreListAction; - - QAction _hideJoinAction; - QAction _hidePartAction; - QAction _hideKillAction; - QAction _hideQuitAction; - QAction _hideModeAction; - - bool checkRequirements(const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState); - void addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState); - void addItemToMenu(QAction &action, QMenu &menu, bool condition = true); - void addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState); - void addSeparatorToMenu(QMenu &menu, const QModelIndex &index, itemActiveStates requiredActiveState = activeState | inactiveState); - QMenu *createHideEventsSubMenu(QMenu &menu); + Q_OBJECT + + public: + BufferView(QWidget *parent = 0); + void init(); + + void setModel(QAbstractItemModel *model); + void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config); + virtual void setSelectionModel(QItemSelectionModel *selectionModel); + + void setConfig(BufferViewConfig *config); + inline BufferViewConfig *config() { return _config; } + + public slots: + void setRootIndexForNetworkId(const NetworkId &networkId); + void removeSelectedBuffers(); + + signals: + void removeBuffer(const QModelIndex &); + + protected: + virtual void keyPressEvent(QKeyEvent *); + virtual void rowsInserted(const QModelIndex & parent, int start, int end); + virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); + virtual void wheelEvent(QWheelEvent *); + virtual QSize sizeHint() const; + virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); } + virtual void contextMenuEvent(QContextMenuEvent *event); + + private slots: + void joinChannel(const QModelIndex &index); + void toggleHeader(bool checked); + // void showContextMenu(const QPoint &); + void layoutChanged(); + + private: + enum ItemActiveState { + InactiveState = 0x01, + ActiveState = 0x02 + }; + public: + Q_DECLARE_FLAGS(ItemActiveStates, ItemActiveState); + + private: + QPointer _config; + + QAction _connectNetAction; + QAction _disconnectNetAction; + QAction _joinChannelAction; + + QAction _joinBufferAction; + QAction _partBufferAction; + QAction _hideBufferAction; + QAction _removeBufferAction; + QAction _ignoreListAction; + + QAction _hideJoinAction; + QAction _hidePartAction; + QAction _hideKillAction; + QAction _hideQuitAction; + QAction _hideModeAction; + + bool checkRequirements(const QModelIndex &index, + ItemActiveStates requiredActiveState = QFlags(ActiveState) | QFlags(InactiveState)); + void addItemToMenu(QAction &action, QMenu &menu, const QModelIndex &index, + ItemActiveStates requiredActiveState = QFlags(ActiveState) | QFlags(InactiveState)); + void addItemToMenu(QAction &action, QMenu &menu, bool condition = true); + void addItemToMenu(QMenu &subMenu, QMenu &menu, const QModelIndex &index, + ItemActiveStates requiredActiveState = QFlags(ActiveState) | QFlags(InactiveState)); + void addSeparatorToMenu(QMenu &menu, const QModelIndex &index, + ItemActiveStates requiredActiveState = QFlags(ActiveState) | QFlags(InactiveState)); + QMenu *createHideEventsSubMenu(QMenu &menu); }; -Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::itemActiveStates); +Q_DECLARE_OPERATORS_FOR_FLAGS(BufferView::ItemActiveStates); // ============================== // BufferView Dock // ============================== class BufferViewDock : public QDockWidget { - Q_OBJECT + Q_OBJECT -public: - BufferViewDock(BufferViewConfig *config, QWidget *parent); - BufferViewDock(QWidget *parent); + public: + BufferViewDock(BufferViewConfig *config, QWidget *parent); + BufferViewDock(QWidget *parent); -public slots: - void bufferViewRenamed(const QString &newName); + public slots: + void bufferViewRenamed(const QString &newName); }; #endif -- 2.20.1