mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-24 18:35:37 +00:00
applying patch_113 (tinyurl.com/8t5ec)
svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=428591
This commit is contained in:
parent
383459da8d
commit
60463481c5
19
part.cpp
19
part.cpp
|
@ -83,13 +83,14 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
|
|||
QObject *parent, const char *name,
|
||||
const QStringList & /*args*/ )
|
||||
: DCOPObject("kpdf"), KParts::ReadOnlyPart(parent, name), m_dirtyViewport( 0 ),
|
||||
m_showMenuBarAction(0), m_showFullScreenAction(0), m_actionsSearched(false), m_searchStarted(false)
|
||||
m_showMenuBarAction(0), m_showFullScreenAction(0), m_actionsSearched(false),
|
||||
m_searchStarted(false), m_notifyOpening(false)
|
||||
{
|
||||
// load catalog for translation
|
||||
KGlobal::locale()->insertCatalogue("kpdf");
|
||||
|
||||
// create browser extension (for printing when embedded into browser)
|
||||
new BrowserExtension(this);
|
||||
m_bExtension = new BrowserExtension(this);
|
||||
|
||||
// xpdf 'extern' global class (m_count is a static instance counter)
|
||||
//if ( m_count ) TODO check if we need to insert these lines..
|
||||
|
@ -107,7 +108,7 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
|
|||
connect( m_document, SIGNAL( linkGoToPage() ), this, SLOT( slotGoToPage() ) );
|
||||
connect( m_document, SIGNAL( linkPresentation() ), this, SLOT( slotShowPresentation() ) );
|
||||
connect( m_document, SIGNAL( linkEndPresentation() ), this, SLOT( slotHidePresentation() ) );
|
||||
connect( m_document, SIGNAL( openURL(const KURL &) ), this, SLOT( openURL(const KURL &) ) );
|
||||
connect( m_document, SIGNAL( openURL(const KURL &) ), this, SLOT( openURLFromDocument(const KURL &) ) );
|
||||
|
||||
// widgets: [] splitter []
|
||||
m_splitter = new QSplitter( parentWidget, widgetName );
|
||||
|
@ -377,6 +378,12 @@ bool Part::openFile()
|
|||
return true;
|
||||
}
|
||||
|
||||
void Part::openURLFromDocument(const KURL &url)
|
||||
{
|
||||
m_notifyOpening = true;
|
||||
openURL(url);
|
||||
}
|
||||
|
||||
bool Part::openURL(const KURL &url)
|
||||
{
|
||||
// note: this can be the right place to check the file for gz or bz2 extension
|
||||
|
@ -385,6 +392,12 @@ bool Part::openURL(const KURL &url)
|
|||
|
||||
// this calls in sequence the 'closeURL' and 'openFile' methods
|
||||
bool openOk = KParts::ReadOnlyPart::openURL(url);
|
||||
if ( m_notifyOpening )
|
||||
{
|
||||
m_bExtension->openURLNotify();
|
||||
m_bExtension->setLocationBarURL( url.prettyURL() );
|
||||
m_notifyOpening = false;
|
||||
}
|
||||
if ( openOk )
|
||||
{
|
||||
delete m_dirtyViewport;
|
||||
|
|
4
part.h
4
part.h
|
@ -111,6 +111,8 @@ protected slots:
|
|||
// can be connected to widget elements
|
||||
void updateViewActions();
|
||||
void enableTOC(bool enable);
|
||||
|
||||
void openURLFromDocument(const KURL &url);
|
||||
|
||||
public slots:
|
||||
// connected to Shell action (and browserExtension), not local one
|
||||
|
@ -162,6 +164,8 @@ private:
|
|||
KToggleAction* m_showFullScreenAction;
|
||||
bool m_actionsSearched;
|
||||
bool m_searchStarted;
|
||||
BrowserExtension *m_bExtension;
|
||||
bool m_notifyOpening;
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue