diff --git a/plugins/documentview/kdevdocumentmodel.cpp b/plugins/documentview/kdevdocumentmodel.cpp index 643e662649..5df013b991 100644 --- a/plugins/documentview/kdevdocumentmodel.cpp +++ b/plugins/documentview/kdevdocumentmodel.cpp @@ -1,122 +1,123 @@ /* This file is part of KDevelop Copyright 2005 Adam Treat This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kdevdocumentmodel.h" #include #include KDevDocumentItem::KDevDocumentItem( const QString &name ) : QStandardItem( name ), m_documentState( KDevelop::IDocument::Clean ) { setIcon(icon()); } KDevDocumentItem::~KDevDocumentItem() {} // KDevDocumentItem *KDevDocumentItem::itemAt( int index ) const // { // return static_cast( QStandardItem::itemFromIndex( index ) ); // } -KDevMimeTypeItem::KDevMimeTypeItem( const QString &name ) +KDevCategoryItem::KDevCategoryItem( const QString &name ) : KDevDocumentItem( name ) { + setIcon(KIcon("inode-directory")); setToolTip(name); } -KDevMimeTypeItem::~KDevMimeTypeItem() +KDevCategoryItem::~KDevCategoryItem() {} -QList KDevMimeTypeItem::fileList() const +QList KDevCategoryItem::fileList() const { QList lst; for ( int i = 0; i < rowCount(); ++i ) { if ( KDevFileItem * item = dynamic_cast( child( i ) ) ->fileItem() ) lst.append( item ); } return lst; } -KDevFileItem* KDevMimeTypeItem::file( const KUrl &url ) const +KDevFileItem* KDevCategoryItem::file( const KUrl &url ) const { foreach( KDevFileItem * item, fileList() ) { if ( item->url() == url ) return item; } return 0; } KDevFileItem::KDevFileItem( const KUrl &url ) : KDevDocumentItem( url.fileName() ), m_url( url ) { KFileItem fi = KFileItem( url, QString(), 0 ); m_fileIcon = fi.iconName(); setIcon( KIcon( m_fileIcon ) ); } KDevFileItem::~KDevFileItem() {} KDevDocumentModel::KDevDocumentModel( QObject *parent ) : QStandardItemModel( parent ) { setRowCount(0); setColumnCount(1); } KDevDocumentModel::~KDevDocumentModel() {} -QList KDevDocumentModel::mimeTypeList() const +QList KDevDocumentModel::mimeTypeList() const { - QList lst; + QList lst; for ( int i = 0; i < rowCount() ; ++i ) { - if ( KDevMimeTypeItem * mimeitem = dynamic_cast( item( i ) ) ->mimeTypeItem() ) + if ( KDevCategoryItem * mimeitem = dynamic_cast( item( i ) ) ->mimeTypeItem() ) { lst.append( mimeitem ); } } return lst; } -KDevMimeTypeItem* KDevDocumentModel::mimeType( const QString& mimeType ) const +KDevCategoryItem* KDevDocumentModel::mimeType( const QString& mimeType ) const { - foreach( KDevMimeTypeItem * item, mimeTypeList() ) + foreach( KDevCategoryItem * item, mimeTypeList() ) { if ( item->text() == mimeType ) return item; } return 0; } #include "kdevdocumentmodel.moc" diff --git a/plugins/documentview/kdevdocumentmodel.h b/plugins/documentview/kdevdocumentmodel.h index db106fb45f..8ab5a3c910 100644 --- a/plugins/documentview/kdevdocumentmodel.h +++ b/plugins/documentview/kdevdocumentmodel.h @@ -1,139 +1,139 @@ /* This file is part of KDevelop Copyright 2005 Adam Treat This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KDEVDOCUMENTMODEL_H #define KDEVDOCUMENTMODEL_H #include #include #include #include #include #include class KUrl; class KDevDocumentItem; -class KDevMimeTypeItem; +class KDevCategoryItem; class KDevFileItem; class KDevDocumentItem: public QStandardItem { public: explicit KDevDocumentItem( const QString &name ); virtual ~KDevDocumentItem(); // virtual KDevDocumentItem *itemAt( int index ) const; - virtual KDevMimeTypeItem *mimeTypeItem() const + virtual KDevCategoryItem *mimeTypeItem() const { return 0; } virtual KDevFileItem *fileItem() const { return 0; } QIcon icon() const { switch ( m_documentState ) { case KDevelop::IDocument::Clean: return KIcon ( m_fileIcon ); case KDevelop::IDocument::Modified: return KIcon( "document-save" ); case KDevelop::IDocument::Dirty: return KIcon( "document-revert" ); case KDevelop::IDocument::DirtyAndModified: return KIcon( "edit-delete" ); default: return KIcon("inode-directory"); } } KDevelop::IDocument::DocumentState documentState() const { return m_documentState; } void setDocumentState( KDevelop::IDocument::DocumentState state ) { m_documentState = state; setIcon(icon()); } protected: QString m_fileIcon; private: KDevelop::IDocument::DocumentState m_documentState; }; -class KDevMimeTypeItem: public KDevDocumentItem +class KDevCategoryItem: public KDevDocumentItem { public: - explicit KDevMimeTypeItem( const QString &name ); - virtual ~KDevMimeTypeItem(); + explicit KDevCategoryItem( const QString &name ); + virtual ~KDevCategoryItem(); - virtual KDevMimeTypeItem *mimeTypeItem() const + virtual KDevCategoryItem *mimeTypeItem() const { - return const_cast( this ); + return const_cast( this ); } QList fileList() const; KDevFileItem* file( const KUrl &url ) const; }; class KDevFileItem: public KDevDocumentItem { public: explicit KDevFileItem( const KUrl &url ); virtual ~KDevFileItem(); virtual KDevFileItem *fileItem() const { return const_cast( this ); } const KUrl &url() const { return m_url; } void setUrl( const KUrl &url ) { m_url = url; } private: KUrl m_url; }; class KDevDocumentModel: public QStandardItemModel { Q_OBJECT public: KDevDocumentModel( QObject *parent = 0 ); virtual ~KDevDocumentModel(); - QList mimeTypeList() const; - KDevMimeTypeItem* mimeType( const QString& mimeType ) const; + QList mimeTypeList() const; + KDevCategoryItem* mimeType( const QString& mimeType ) const; }; #endif // KDEVDOCUMENTMODEL_H diff --git a/plugins/documentview/kdevdocumentview.cpp b/plugins/documentview/kdevdocumentview.cpp index 5680b4df1c..2be67dee62 100644 --- a/plugins/documentview/kdevdocumentview.cpp +++ b/plugins/documentview/kdevdocumentview.cpp @@ -1,326 +1,326 @@ /* This file is part of KDevelop Copyright 2005 Adam Treat This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kdevdocumentview.h" #include "kdevdocumentviewplugin.h" #include "kdevdocumentmodel.h" #include #include #include #include #include #include //#include #include #include #include "kdevdocumentselection.h" #include "kdevdocumentviewdelegate.h" #include #include #include #include #include #include KDevDocumentView::KDevDocumentView( KDevDocumentViewPlugin *plugin, QWidget *parent ) : QTreeView( parent ), m_plugin( plugin ) { m_documentModel = new KDevDocumentModel(); m_delegate = new KDevDocumentViewDelegate( this, this ); m_proxy = new QSortFilterProxyModel( this ); m_proxy->setSourceModel( m_documentModel ); m_proxy->setDynamicSortFilter( true ); m_proxy->setSortCaseSensitivity( Qt::CaseInsensitive ); m_proxy->sort(0); m_selectionModel = new KDevDocumentSelection( m_proxy ); setModel( m_proxy ); setSelectionModel( m_selectionModel ); setItemDelegate( m_delegate ); setObjectName( i18n( "Documents" ) ); setWindowIcon( SmallIcon( "document-multiple" ) ); setWindowTitle( i18n( "Documents" ) ); setFocusPolicy( Qt::NoFocus ); setRootIsDecorated( false ); header()->hide(); setSelectionBehavior( QAbstractItemView::SelectRows ); setSelectionMode( QAbstractItemView::ExtendedSelection ); } KDevDocumentView::~KDevDocumentView() {} KDevDocumentViewPlugin *KDevDocumentView::plugin() const { return m_plugin; } void KDevDocumentView::mousePressEvent( QMouseEvent * event ) { QModelIndex proxyIndex = indexAt( event->pos() ); QModelIndex index = m_proxy->mapToSource( proxyIndex ); if ( event->button() == Qt::LeftButton && proxyIndex.parent().isValid() && event->modifiers() == Qt::NoModifier ) { KDevelop::IDocumentController* dc = m_plugin->core()->documentController(); KUrl documentUrl = static_cast( m_documentModel->itemFromIndex( index ) )->fileItem()->url(); if (dc->documentForUrl(documentUrl) != dc->activeDocument()) { dc->openDocument(documentUrl); return; } } if ( !proxyIndex.parent().isValid() ) { setExpanded( proxyIndex, !isExpanded( proxyIndex ) ); return; } QTreeView::mousePressEvent( event ); } template void KDevDocumentView::visitItems(F f, bool selectedItems) { KDevelop::IDocumentController* dc = m_plugin->core()->documentController(); QList docs = selectedItems ? m_selectedDocs : m_unselectedDocs; foreach(const KUrl& url, docs) { KDevelop::IDocument* doc = dc->documentForUrl(url); if (doc) f(doc); } } namespace { class DocSaver { public: void operator()(KDevelop::IDocument* doc) { doc->save(); } }; class DocCloser { public: void operator()(KDevelop::IDocument* doc) { doc->close(); } }; class DocReloader { public: void operator()(KDevelop::IDocument* doc) { doc->reload(); } }; } void KDevDocumentView::saveSelected() { visitItems(DocSaver(), true); } void KDevDocumentView::closeSelected() { visitItems(DocCloser(), true); } void KDevDocumentView::closeUnselected() { visitItems(DocCloser(), false); } void KDevDocumentView::reloadSelected() { visitItems(DocReloader(), true); } void KDevDocumentView::contextMenuEvent( QContextMenuEvent * event ) { updateSelectedDocs(); if (!m_selectedDocs.isEmpty()) { KMenu* ctxMenu = new KMenu(this); KDevelop::FileContext context(m_selectedDocs); QList extensions = m_plugin->core()->pluginController()->queryPluginsForContextMenuExtensions( &context ); QList vcsActions; QList fileActions; QList editActions; QList extensionActions; foreach( const KDevelop::ContextMenuExtension& ext, extensions ) { fileActions += ext.actions(KDevelop::ContextMenuExtension::FileGroup); vcsActions += ext.actions(KDevelop::ContextMenuExtension::VcsGroup); editActions += ext.actions(KDevelop::ContextMenuExtension::EditGroup); extensionActions += ext.actions(KDevelop::ContextMenuExtension::ExtensionGroup); } appendActions(ctxMenu, fileActions); KAction* save = KStandardAction::save(this, SLOT(saveSelected()), ctxMenu); save->setEnabled(selectedDocHasChanges()); ctxMenu->addAction(save); ctxMenu->addAction(KIcon("view-refresh"), i18n( "Reload" ), this, SLOT(reloadSelected())); appendActions(ctxMenu, editActions); ctxMenu->addAction(KStandardAction::close(this, SLOT(closeSelected()), ctxMenu)); QAction* closeUnselected = ctxMenu->addAction(KIcon("document-close"), i18n( "Close Other Files" ), this, SLOT(closeUnselected())); closeUnselected->setEnabled(!m_unselectedDocs.isEmpty()); appendActions(ctxMenu, vcsActions); appendActions(ctxMenu, extensionActions); connect(ctxMenu, SIGNAL(aboutToHide()), ctxMenu, SLOT(deleteLater())); ctxMenu->popup( event->globalPos() ); } } void KDevDocumentView::appendActions(QMenu* menu, const QList& actions) { foreach( QAction* act, actions ) { menu->addAction(act); } menu->addSeparator(); } bool KDevDocumentView::selectedDocHasChanges() { KDevelop::IDocumentController* dc = m_plugin->core()->documentController(); foreach(const KUrl& url, m_selectedDocs) { KDevelop::IDocument* doc = dc->documentForUrl(url); if (!doc) continue; if (doc->state() != KDevelop::IDocument::Clean) { return true; } } return false; } void KDevDocumentView::updateSelectedDocs() { m_selectedDocs.clear(); m_unselectedDocs.clear(); QList allItems = m_documentModel->findItems("*", Qt::MatchWildcard | Qt::MatchRecursive); foreach (QStandardItem* item, allItems) { if (KDevFileItem * fileItem = dynamic_cast(item)->fileItem()) { if (m_selectionModel->isSelected(m_proxy->mapFromSource(m_documentModel->indexFromItem(fileItem)))) m_selectedDocs << fileItem->url(); else m_unselectedDocs << fileItem->url(); } } } void KDevDocumentView::activated( KDevelop::IDocument* document ) { setCurrentIndex( m_proxy->mapFromSource( m_documentModel->indexFromItem( m_doc2index[ document ] ) ) ); } void KDevDocumentView::saved( KDevelop::IDocument* ) { } void KDevDocumentView::opened( KDevelop::IDocument* document ) { const QString projectPath = "/home/sebas/kf5/src/plasma-framework/src/"; const QString homePath = "/home/sebas/"; QString label = document->url().path().replace( projectPath, "" ); label.replace( homePath, "~/" ); QStringList ps = label.split( '/' ); ps.removeLast(); label = ps.join( "/" ) + '/'; - KDevMimeTypeItem *mimeItem = m_documentModel->mimeType( label ); + KDevCategoryItem *mimeItem = m_documentModel->mimeType( label ); if ( !mimeItem ) { - mimeItem = new KDevMimeTypeItem( label ); + mimeItem = new KDevCategoryItem( label ); m_documentModel->insertRow( m_documentModel->rowCount(), mimeItem ); setExpanded( m_proxy->mapFromSource( m_documentModel->indexFromItem( mimeItem ) ), false); } if ( !mimeItem->file( document->url() ) ) { KDevFileItem * fileItem = new KDevFileItem( document->url() ); mimeItem->setChild( mimeItem->rowCount(), fileItem ); setCurrentIndex( m_proxy->mapFromSource( m_documentModel->indexFromItem( fileItem ) ) ); m_doc2index[ document ] = fileItem; } } void KDevDocumentView::closed( KDevelop::IDocument* document ) { KDevFileItem* file = m_doc2index[ document ]; if ( !file ) return; QStandardItem* mimeItem = file->parent(); qDeleteAll(mimeItem->takeRow(m_documentModel->indexFromItem(file).row())); m_doc2index.remove(document); if ( mimeItem->hasChildren() ) return; qDeleteAll(m_documentModel->takeRow(m_documentModel->indexFromItem(mimeItem).row())); doItemsLayout(); } void KDevDocumentView::contentChanged( KDevelop::IDocument* ) { } void KDevDocumentView::stateChanged( KDevelop::IDocument* document ) { KDevDocumentItem * documentItem = m_doc2index[ document ]; if ( documentItem && documentItem->documentState() != document->state() ) documentItem->setDocumentState( document->state() ); doItemsLayout(); } void KDevDocumentView::documentUrlChanged( KDevelop::IDocument* document ) { closed(document); opened(document); } #include "kdevdocumentview.moc" diff --git a/plugins/documentview/kdevdocumentviewdelegate.cpp b/plugins/documentview/kdevdocumentviewdelegate.cpp index 08eec7c6f8..fd12063651 100644 --- a/plugins/documentview/kdevdocumentviewdelegate.cpp +++ b/plugins/documentview/kdevdocumentviewdelegate.cpp @@ -1,92 +1,92 @@ /* This file is part of KDevelop Copyright 2005 Adam Treat This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "kdevdocumentviewdelegate.h" #include #include KDevDocumentViewDelegate::KDevDocumentViewDelegate( QTreeView *view, QObject *parent ) : QItemDelegate( parent ), m_view( view ) {} KDevDocumentViewDelegate::~KDevDocumentViewDelegate() {} void KDevDocumentViewDelegate::paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const { const QAbstractItemModel * model = index.model(); Q_ASSERT( model ); - if ( !model->parent( index ).isValid() ) + // easy way to disable custom painting for top level items + const bool useExpandIndicator = true; + + if ( !model->parent( index ).isValid() && useExpandIndicator) { // this is a top-level item. QStyleOptionButton buttonOption; buttonOption.state = option.state; #ifdef Q_WS_MAC buttonOption.state |= QStyle::State_Raised; #endif buttonOption.state &= ~QStyle::State_HasFocus; buttonOption.rect = option.rect; buttonOption.palette = option.palette; buttonOption.features = QStyleOptionButton::None; - //m_view->style() ->drawControl( QStyle::CE_PushButton, &buttonOption, painter, m_view ); QStyleOption branchOption; static const int i = 9; // ### hardcoded in qcommonstyle.cpp QRect r = option.rect; branchOption.rect = QRect( r.left() + i / 2, r.top() + ( r.height() - i ) / 2, i, i ); branchOption.palette = option.palette; branchOption.state = QStyle::State_Children; if ( m_view->isExpanded( index ) ) branchOption.state |= QStyle::State_Open; m_view->style() ->drawPrimitive( QStyle::PE_IndicatorBranch, &branchOption, painter, m_view ); // draw text - QRect textrect = QRect( r.left() + i * 2, r.top(), r.width() - ( ( 5 * i ) / 2 ), r.height() ); QString text = elidedText( option.fontMetrics, textrect.width(), Qt::ElideRight, model->data( index, Qt::DisplayRole ).toString() ); m_view->style() ->drawItemText( painter, textrect, Qt::AlignLeft | Qt::AlignVCenter, option.palette, m_view->isEnabled(), text ); - //kDebug() << "Textrect:: " << textrect << text; } else { QItemDelegate::paint( painter, option, index ); } } QSize KDevDocumentViewDelegate::sizeHint( const QStyleOptionViewItem &opt, const QModelIndex &index ) const { QStyleOptionViewItem option = opt; QSize sz = QItemDelegate::sizeHint( opt, index ) + QSize( 2, 4 ); return sz; } #include "kdevdocumentviewdelegate.moc"