wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Selectively update the tree branch of the document whose bookmarks were changed.

Browse Source 
This way, there's no need to rebuild the tree.

svn path=/trunk/KDE/kdegraphics/okular/; revision=793532
remotes/origin/KDE/4.1
Pino Toscano 18 years ago
parent 8932cdd742
commit 39b730d371
2 changed files with 81 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 89
      ui/bookmarklist.cpp
  2. 5
      ui/bookmarklist.h

89
ui/bookmarklist.cpp
Unescape View File

@ -30,6 +30,7 @@
static const int BookmarkItemType = QTreeWidgetItem::UserType + 1;
static const int FileItemType = QTreeWidgetItem::UserType + 2;
static const int UrlRole = Qt::UserRole + 1;
class BookmarkItem : public QTreeWidgetItem
{
@ -79,7 +80,7 @@ class BookmarkItem : public QTreeWidgetItem
BookmarkList::BookmarkList( Okular::Document *document, QWidget *parent )
: QWidget( parent ), m_document( document )
: QWidget( parent ), m_document( document ), m_currentDocumentItem( 0 )
{
QVBoxLayout *mainlay = new QVBoxLayout( this );
mainlay->setMargin( 0 );
@ -119,6 +120,8 @@ BookmarkList::BookmarkList( Okular::Document *document, QWidget *parent )
m_showBoomarkOnlyAction->setCheckable( true );
connect( m_showBoomarkOnlyAction, SIGNAL( toggled( bool ) ), this, SLOT( slotFilterBookmarks( bool ) ) );
connect( m_document->bookmarkManager(), SIGNAL( bookmarksChanged( const KUrl& ) ), this, SLOT( slotBookmarksChanged( const KUrl& ) ) );
rebuildTree( m_showBoomarkOnlyAction->isChecked() );
}
@ -142,17 +145,6 @@ void BookmarkList::notifySetup( const QVector< Okular::Page * > & pages, int set
rebuildTree( m_showBoomarkOnlyAction->isChecked() );
}
void BookmarkList::notifyPageChanged( int pageNumber, int changedFlags )
{
// only check if there are changes to bookmarks
if ( !( changedFlags & Okular::DocumentObserver::Bookmark ) )
return;
(void)pageNumber;
rebuildTree( m_showBoomarkOnlyAction->isChecked() );
}
void BookmarkList::slotFilterBookmarks( bool on )
{
rebuildTree( on );
@ -200,6 +192,33 @@ void BookmarkList::slotContextMenu( const QPoint& p )
m_document->bookmarkManager()->removeBookmark( bmItem->url(), bmItem->bookmark() );
}
void BookmarkList::slotBookmarksChanged( const KUrl& url )
{
// special case here, as m_currentDocumentItem could represent
// the invisible root item
if ( url == m_document->currentDocument() )
{
selectiveUrlUpdate( m_document->currentDocument(), m_currentDocumentItem );
return;
}
// we are showing the bookmarks for the current document only
if ( m_showBoomarkOnlyAction->isChecked() )
return;
const int count = m_tree->topLevelItemCount();
for ( int i = 0; i < count; ++i )
{
QTreeWidgetItem *item = m_tree->topLevelItem( i );
const KUrl itemurl = item->data( 0, UrlRole ).value< KUrl >();
if ( itemurl.isValid() && itemurl == url )
{
selectiveUrlUpdate( url, item );
break;
}
}
}
QList<QTreeWidgetItem*> createItems( const KUrl& baseurl, const KBookmark::List& bmlist )
{
(void)baseurl;
@ -221,6 +240,7 @@ void BookmarkList::rebuildTree( bool filter )
// signals for all the current items
disconnect( m_tree, SIGNAL( itemChanged( QTreeWidgetItem *, int ) ), this, SLOT( slotChanged( QTreeWidgetItem * ) ) );
m_currentDocumentItem = 0;
m_tree->clear();
KUrl::List urls = m_document->bookmarkManager()->files();
@ -233,6 +253,7 @@ void BookmarkList::rebuildTree( bool filter )
if ( url == m_document->currentDocument() )
{
m_tree->addTopLevelItems( createItems( url, m_document->bookmarkManager()->bookmarks( url ) ) );
m_currentDocumentItem = m_tree->invisibleRootItem();
break;
}
}
@ -250,6 +271,7 @@ void BookmarkList::rebuildTree( bool filter )
QString fileString = url.isLocalFile() ? url.path() : url.prettyUrl();
item->setText( 0, fileString );
item->setToolTip( 0, i18ncp( "%1 is the file name", "%1\n\nOne bookmark", "%1\n\n%2 bookmarks", fileString, subitems.count() ) );
item->setData( 0, UrlRole, qVariantFromValue( url ) );
item->addChildren( subitems );
if ( !currenturlitem && url == m_document->currentDocument() )
{
@ -262,6 +284,7 @@ void BookmarkList::rebuildTree( bool filter )
currenturlitem->setExpanded( true );
currenturlitem->setIcon( 0, KIcon( "bookmarks" ) );
m_tree->scrollToItem( currenturlitem, QAbstractItemView::PositionAtTop );
m_currentDocumentItem = currenturlitem;
}
}
@ -281,5 +304,47 @@ void BookmarkList::goTo( BookmarkItem * item )
}
}
void BookmarkList::selectiveUrlUpdate( const KUrl& url, QTreeWidgetItem*& item )
{
const KBookmark::List urlbookmarks = m_document->bookmarkManager()->bookmarks( url );
if ( urlbookmarks.isEmpty() )
{
if ( item != m_tree->invisibleRootItem() )
{
m_tree->invisibleRootItem()->removeChild( item );
item = 0;
}
else if ( item )
{
for ( int i = item->childCount(); i >= 0; --i )
{
item->removeChild( item->child( i ) );
}
}
}
else
{
const QString fileString = url.isLocalFile() ? url.path() : url.prettyUrl();
if ( item )
{
for ( int i = item->childCount(); i >= 0; --i )
{
item->removeChild( item->child( i ) );
}
}
else
{
item = new QTreeWidgetItem( m_tree, FileItemType );
item->setIcon( 0, KIcon( "bookmarks" ) );
item->setExpanded( true );
item->setText( 0, fileString );
}
item->addChildren( createItems( url, urlbookmarks ) );
if ( item != m_tree->invisibleRootItem() )
{
item->setToolTip( 0, i18ncp( "%1 is the file name", "%1\n\nOne bookmark", "%1\n\n%2 bookmarks", fileString, item->childCount() ) );
}
}
}
#include "bookmarklist.moc"

5
ui/bookmarklist.h
Unescape View File

@ -18,6 +18,7 @@ class QAction;
class QTreeWidget;
class QTreeWidgetItem;
class KTreeWidgetSearchLine;
class KUrl;
class BookmarkItem;
namespace Okular {
@ -35,22 +36,24 @@ class BookmarkList : public QWidget, public Okular::DocumentObserver
// inherited from DocumentObserver
uint observerId() const;
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
void notifyPageChanged( int pageNumber, int changedFlags );
private slots:
void slotFilterBookmarks( bool );
void slotExecuted( QTreeWidgetItem * item );
void slotChanged( QTreeWidgetItem * item );
void slotContextMenu( const QPoint& p );
void slotBookmarksChanged( const KUrl& url );
private:
void rebuildTree( bool filter );
void goTo( BookmarkItem * item );
void selectiveUrlUpdate( const KUrl& url, QTreeWidgetItem*& item );
Okular::Document * m_document;
QTreeWidget * m_tree;
KTreeWidgetSearchLine * m_searchLine;
QAction * m_showBoomarkOnlyAction;
QTreeWidgetItem * m_currentDocumentItem;
};
#endif

Write Preview
Loading…
Cancel
Save