Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

okular: adjust to KUrl changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-06 07:48:04 +03:00
parent 60ac26eab1
commit 87ca54536d
5 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
okular/core/bookmarkmanager.cpp
View file

@ -41,7 +41,7 @@ class OkularBookmarkAction : public KBookmarkAction
if ( vp.isValid() ) if ( vp.isValid() )
setText( QString::number( vp.pageNumber + 1 ) + " - " + text() ); setText( QString::number( vp.pageNumber + 1 ) + " - " + text() );
setProperty("pageNumber", vp.pageNumber + 1); setProperty("pageNumber", vp.pageNumber + 1);
setProperty("htmlRef", bk.url().htmlRef()); setProperty("htmlRef", bk.url().fragment());
} }
inline int pageNumber() const inline int pageNumber() const
@ -75,8 +75,8 @@ static inline bool documentViewportFuzzyCompare( const DocumentViewport &vp1, co
static inline bool bookmarkLessThan( const KBookmark &b1, const KBookmark &b2 ) static inline bool bookmarkLessThan( const KBookmark &b1, const KBookmark &b2 )
{ {
DocumentViewport vp1( b1.url().htmlRef() ); DocumentViewport vp1( b1.url().fragment() );
DocumentViewport vp2( b2.url().htmlRef() ); DocumentViewport vp2( b2.url().fragment() );
return vp1 < vp2; return vp1 < vp2;
} }
@ -279,7 +279,7 @@ KBookmark::List BookmarkManager::bookmarks( int page ) const
KBookmark::List ret; KBookmark::List ret;
foreach( const KBookmark &bm, bmarks ) foreach( const KBookmark &bm, bmarks )
{ {
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( vp.isValid() && vp.pageNumber == page ) if ( vp.isValid() && vp.pageNumber == page )
{ {
ret.append(bm); ret.append(bm);
@ -294,7 +294,7 @@ KBookmark BookmarkManager::bookmark( int page ) const
const KBookmark::List bmarks = bookmarks(); const KBookmark::List bmarks = bookmarks();
foreach( const KBookmark &bm, bmarks ) foreach( const KBookmark &bm, bmarks )
{ {
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( vp.isValid() && vp.pageNumber == page ) if ( vp.isValid() && vp.pageNumber == page )
{ {
return bm; return bm;
@ -318,7 +318,7 @@ KBookmark BookmarkManager::bookmark( const DocumentViewport &viewport ) const
if ( bm.isSeparator() || bm.isGroup() ) if ( bm.isSeparator() || bm.isGroup() )
continue; continue;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( documentViewportFuzzyCompare( vp, viewport ) ) if ( documentViewportFuzzyCompare( vp, viewport ) )
{ {
return bm; return bm;
@ -417,7 +417,7 @@ bool BookmarkManager::addBookmark( const KUrl& referurl, const Okular::DocumentV
if ( bm.isSeparator() || bm.isGroup() ) if ( bm.isSeparator() || bm.isGroup() )
continue; continue;
DocumentViewport bmViewport( bm.url().htmlRef() ); DocumentViewport bmViewport( bm.url().fragment() );
if ( bmViewport.isValid() && bmViewport.pageNumber == vp.pageNumber ) if ( bmViewport.isValid() && bmViewport.pageNumber == vp.pageNumber )
{ {
++count; ++count;
@ -446,7 +446,7 @@ bool BookmarkManager::addBookmark( const KUrl& referurl, const Okular::DocumentV
newtitle = title; newtitle = title;
KUrl newurl = referurl; KUrl newurl = referurl;
newurl.setHTMLRef( vp.toString() ); newurl.setFragment( vp.toString() );
thebg.addBookmark( newtitle, newurl, QString() ); thebg.addBookmark( newtitle, newurl, QString() );
if ( referurl == d->document->m_url ) if ( referurl == d->document->m_url )
{ {
@ -517,7 +517,7 @@ int BookmarkManager::removeBookmark( const KUrl& referurl, const KBookmark& bm )
if ( !referurl.isValid() || bm.isNull() || bm.isGroup() || bm.isSeparator() ) if ( !referurl.isValid() || bm.isNull() || bm.isGroup() || bm.isSeparator() )
return -1; return -1;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( !vp.isValid() ) if ( !vp.isValid() )
return -1; return -1;
@ -557,7 +557,7 @@ void BookmarkManager::removeBookmarks( const KUrl& referurl, const KBookmark::Li
thebg.deleteBookmark( bm ); thebg.deleteBookmark( bm );
deletedAny = true; deletedAny = true;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( referurl == d->document->m_url ) if ( referurl == d->document->m_url )
{ {
d->urlBookmarks[ vp.pageNumber ]--; d->urlBookmarks[ vp.pageNumber ]--;
@ -601,7 +601,7 @@ QList< QAction * > BookmarkManager::actionsForUrl( const KUrl& url ) const
if ( b.isSeparator() || b.isGroup() ) if ( b.isSeparator() || b.isGroup() )
continue; continue;
ret.append( new OkularBookmarkAction( DocumentViewport( b.url().htmlRef() ), b, d, 0 ) ); ret.append( new OkularBookmarkAction( DocumentViewport( b.url().fragment() ), b, d, 0 ) );
} }
break; break;
} }
@ -622,7 +622,7 @@ void BookmarkManager::setUrl( const KUrl& url )
if ( bm.isSeparator() || bm.isGroup() ) if ( bm.isSeparator() || bm.isGroup() )
continue; continue;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( !vp.isValid() ) if ( !vp.isValid() )
continue; continue;
@ -645,7 +645,7 @@ bool BookmarkManager::setPageBookmark( int page )
if ( bm.isSeparator() || bm.isGroup() ) if ( bm.isSeparator() || bm.isGroup() )
continue; continue;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( vp.isValid() && vp.pageNumber == page ) if ( vp.isValid() && vp.pageNumber == page )
found = true; found = true;
@ -656,7 +656,7 @@ bool BookmarkManager::setPageBookmark( int page )
DocumentViewport vp; DocumentViewport vp;
vp.pageNumber = page; vp.pageNumber = page;
KUrl newurl = d->url; KUrl newurl = d->url;
newurl.setHTMLRef( vp.toString() ); newurl.setFragment( vp.toString() );
thebg.addBookmark( QString::fromLatin1( "#" ) + QString::number( vp.pageNumber + 1 ), newurl, QString() ); thebg.addBookmark( QString::fromLatin1( "#" ) + QString::number( vp.pageNumber + 1 ), newurl, QString() );
added = true; added = true;
d->manager->emitChanged( thebg ); d->manager->emitChanged( thebg );
@ -677,7 +677,7 @@ bool BookmarkManager::removePageBookmark( int page )
if ( bm.isSeparator() || bm.isGroup() ) if ( bm.isSeparator() || bm.isGroup() )
continue; continue;
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( vp.isValid() && vp.pageNumber == page ) if ( vp.isValid() && vp.pageNumber == page )
{ {
found = true; found = true;
@ -709,7 +709,7 @@ KBookmark BookmarkManager::nextBookmark( const DocumentViewport &viewport) const
KBookmark bookmark; KBookmark bookmark;
foreach ( const KBookmark &bm, bmarks ) foreach ( const KBookmark &bm, bmarks )
{ {
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( viewport < vp ) if ( viewport < vp )
{ {
bookmark = bm; bookmark = bm;
@ -729,7 +729,7 @@ KBookmark BookmarkManager::previousBookmark( const DocumentViewport &viewport )
for ( KBookmark::List::const_iterator it = bmarks.constEnd(); it != bmarks.constBegin(); --it ) for ( KBookmark::List::const_iterator it = bmarks.constEnd(); it != bmarks.constBegin(); --it )
{ {
KBookmark bm = *(it-1); KBookmark bm = *(it-1);
DocumentViewport vp( bm.url().htmlRef() ); DocumentViewport vp( bm.url().fragment() );
if ( vp < viewport ) if ( vp < viewport )
{ {
bookmark = bm; bookmark = bm;

14
okular/part.cpp
View file

@ -942,10 +942,10 @@ void Part::openUrlFromDocument(const KUrl &url)
void Part::openUrlFromBookmarks(const KUrl &_url) void Part::openUrlFromBookmarks(const KUrl &_url)
{ {
KUrl url = _url; KUrl url = _url;
Okular::DocumentViewport vp( _url.htmlRef() ); Okular::DocumentViewport vp( _url.fragment() );
if ( vp.isValid() ) if ( vp.isValid() )
m_document->setNextDocumentViewport( vp ); m_document->setNextDocumentViewport( vp );
url.setHTMLRef( QString() ); url.setFragment( QString() );
if ( m_document->currentDocument() == url ) if ( m_document->currentDocument() == url )
{ {
if ( vp.isValid() ) if ( vp.isValid() )
@ -1416,9 +1416,9 @@ bool Part::openUrl(const KUrl &_url)
return false; return false;
KUrl url( _url ); KUrl url( _url );
if ( url.hasHTMLRef() ) if ( url.hasRef() )
{ {
const QString dest = url.htmlRef(); const QString dest = url.fragment();
bool ok = true; bool ok = true;
const int page = dest.toInt( &ok ); const int page = dest.toInt( &ok );
if ( ok ) if ( ok )
@ -1434,7 +1434,7 @@ bool Part::openUrl(const KUrl &_url)
{ {
m_document->setNextDocumentDestination( dest ); m_document->setNextDocumentDestination( dest );
} }
url.setHTMLRef( QString() ); url.setFragment( QString() );
} }
// this calls in sequence the 'closeUrl' and 'openFile' methods // this calls in sequence the 'closeUrl' and 'openFile' methods
@ -2033,7 +2033,7 @@ void Part::slotPreviousBookmark()
if ( !bookmark.isNull() ) if ( !bookmark.isNull() )
{ {
DocumentViewport vp( bookmark.url().htmlRef() ); DocumentViewport vp( bookmark.url().fragment() );
m_document->setViewport( vp ); m_document->setViewport( vp );
} }
} }
@ -2045,7 +2045,7 @@ void Part::slotNextBookmark()
if ( !bookmark.isNull() ) if ( !bookmark.isNull() )
{ {
DocumentViewport vp( bookmark.url().htmlRef() ); DocumentViewport vp( bookmark.url().fragment() );
m_document->setViewport( vp ); m_document->setViewport( vp );
} }
} }

4
okular/shell/shellutils.cpp
View file

@ -55,11 +55,11 @@ KUrl urlFromArg( const QString& _arg, FileExistFunc exist_func, const QString& p
if ( sharpPos != -1 ) if ( sharpPos != -1 )
{ {
url = KCmdLineArgs::makeURL( arg.left( sharpPos ).toUtf8() ); url = KCmdLineArgs::makeURL( arg.left( sharpPos ).toUtf8() );
url.setHTMLRef( arg.mid( sharpPos + 1 ) ); url.setFragment( arg.mid( sharpPos + 1 ) );
} }
else if ( !pageArg.isEmpty() ) else if ( !pageArg.isEmpty() )
{ {
url.setHTMLRef( pageArg ); url.setFragment( pageArg );
} }
return url; return url;
} }

2
okular/tests/parttest.cpp
View file

@ -136,7 +136,7 @@ void PartTest::testFowardPDF()
part.closeUrl(); part.closeUrl();
KUrl u(pdfResult); KUrl u(pdfResult);
u.setHTMLRef("src:100" + texDestination); u.setFragment("src:100" + texDestination);
part.openUrl(u); part.openUrl(u);
QCOMPARE(part.m_document->currentPage(), 1u); QCOMPARE(part.m_document->currentPage(), 1u);
#endif #endif

4
okular/ui/bookmarklist.cpp
View file

@ -40,8 +40,8 @@ class BookmarkItem : public QTreeWidgetItem
{ {
setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable ); setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable );
m_url = m_bookmark.url(); m_url = m_bookmark.url();
m_viewport = Okular::DocumentViewport( m_url.htmlRef() ); m_viewport = Okular::DocumentViewport( m_url.fragment() );
m_url.setHTMLRef( QString() ); m_url.setFragment( QString() );
setText( 0, m_bookmark.fullText() ); setText( 0, m_bookmark.fullText() );
if ( m_viewport.isValid() ) if ( m_viewport.isValid() )
setData( 0, PageItemDelegate::PageRole, QString::number( m_viewport.pageNumber + 1 ) ); setData( 0, PageItemDelegate::PageRole, QString::number( m_viewport.pageNumber + 1 ) );