diff --git a/tabbox/clientmodel.h b/tabbox/clientmodel.h index 131cf2984..4178a5d06 100644 --- a/tabbox/clientmodel.h +++ b/tabbox/clientmodel.h @@ -1,103 +1,102 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2009 Martin Gräßlin 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, see . *********************************************************************/ #ifndef TABBOXMODEL_H #define TABBOXMODEL_H #include "tabboxhandler.h" #include /** * @file * This file defines the class ClientModel, the model for TabBoxClients. * * @author Martin Gräßlin * @since 4.4 */ namespace KWin { namespace TabBox { -class TabBoxConfig; /** * The model for TabBoxClients used in TabBox. * * @author Martin Gräßlin * @since 4.4 */ class ClientModel : public QAbstractItemModel { public: enum { ClientRole = Qt::UserRole, ///< The TabBoxClient CaptionRole = Qt::UserRole + 1, ///< The caption of TabBoxClient DesktopNameRole = Qt::UserRole + 2, ///< The name of the desktop the TabBoxClient is on IconRole = Qt::UserRole + 3, // TODO: to be removed EmptyRole = Qt::UserRole + 4, ///< Indicates if the model contains TabBoxClients WIdRole = Qt::UserRole + 5, ///< The window ID of TabBoxClient MinimizedRole = Qt::UserRole + 6 ///< TabBoxClient is minimized }; ClientModel( QObject* parent = 0 ); ~ClientModel(); virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const; virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const; virtual QModelIndex parent( const QModelIndex& child ) const; virtual QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const; /** * @param client The TabBoxClient whose index should be returned * @return Returns the ModelIndex of given TabBoxClient or an invalid ModelIndex * if the model does not contain the given TabBoxClient. */ QModelIndex index( TabBoxClient* client ) const; /** * Generates a new list of TabBoxClients based on the current config. * Calling this method will reset the model. If partialReset is true * the top of the list is kept as a starting point. If not the the * current active client is used as the starting point to generate the * list. * @param desktop The desktop for which the list should be created * @param partialReset Keep the currently selected client or regenerate everything */ void createClientList( int desktop, bool partialReset = false ); /** * This method is provided as a overload for current desktop * @see createClientList */ void createClientList( bool partialReset = false ); /** * @return Returns the current list of TabBoxClients. */ TabBoxClientList clientList() const { return m_clientList; } private: TabBoxClientList m_clientList; }; } // namespace Tabbox } // namespace KWin #endif // TABBOXMODEL_H diff --git a/tabbox/desktopmodel.h b/tabbox/desktopmodel.h index e25bd33ac..f8242402b 100644 --- a/tabbox/desktopmodel.h +++ b/tabbox/desktopmodel.h @@ -1,88 +1,87 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2009 Martin Gräßlin 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, see . *********************************************************************/ #ifndef DESKTOPMODEL_H #define DESKTOPMODEL_H #include /** * @file * This file defines the class DesktopModel, the model for desktops. * * @author Martin Gräßlin * @since 4.4 */ namespace KWin { namespace TabBox { class ClientModel; -class TabBoxConfig; /** * The model for desktops used in TabBox. * * @author Martin Gräßlin * @since 4.4 */ class DesktopModel : public QAbstractItemModel { public: enum { DesktopRole = Qt::UserRole, ///< Desktop number DesktopNameRole = Qt::UserRole + 1, ///< Desktop name ClientModelRole = Qt::UserRole + 2 ///< Clients on this desktop }; DesktopModel( QObject* parent = 0 ); ~DesktopModel(); virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const; virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const; virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const; virtual QModelIndex parent( const QModelIndex& child ) const; virtual QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const; /** * Generates a new list of desktops based on the current config. * Calling this method will reset the model. */ void createDesktopList(); /** * @return The current list of desktops. */ QList< int > desktopList() const { return m_desktopList; } /** * @param desktop The desktop whose ModelIndex should be retrieved * @return The ModelIndex of given desktop or an invalid ModelIndex if * the desktop is not in the model. */ QModelIndex desktopIndex( int desktop ) const; private: QList< int > m_desktopList; QMap< int, ClientModel* > m_clientModels; }; } // namespace Tabbox } // namespace KWin #endif // DESKTOPMODEL_H