[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-08-05 22:23:25
Message-ID: 1123280605.333292.20987.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443371 by aacid:

Fordward port unbreak back fix


 M  +10 -5     part.cpp  
 M  +1 -0      part.h  


--- trunk/KDE/kdegraphics/kpdf/part.cpp #443370:443371
@@ -107,7 +107,7 @@
 	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 &) ) );  connect( m_document, SIGNAL( close() ), this, \
SLOT( close() ) );  
 	if ( parent && parent->metaObject()->indexOfSlot( SLOT( slotQuit() ) ) != -1 )
@@ -158,7 +158,7 @@
 	m_searchWidget = new SearchWidget( thumbsBox, m_document );
 	m_thumbnailList = new ThumbnailList( thumbsBox, m_document );
 //	ThumbnailController * m_tc = new ThumbnailController( thumbsBox, m_thumbnailList \
                );
-	connect( m_thumbnailList, SIGNAL( urlDropped( const KURL& ) ), SLOT( openURL( const \
KURL & )) ); +	connect( m_thumbnailList, SIGNAL( urlDropped( const KURL& ) ), SLOT( \
openURLFromDocument( const KURL & )) );  connect( m_thumbnailList, SIGNAL( \
rightClick(const KPDFPage *, const QPoint &) ), this, SLOT( slotShowMenu(const \
KPDFPage *, const QPoint &) ) );  // shrink the bottom controller toolbar (too \
hackish..)  thumbsBox->setStretchFactor( m_searchWidget, 100 );
@@ -192,7 +192,7 @@
 	// widgets: [] | [right 'pageView']
 	m_pageView = new PageView( m_splitter, m_document );
 	m_pageView->setFocus(); //usability setting
-	connect( m_pageView, SIGNAL( urlDropped( const KURL& ) ), SLOT( openURL( const KURL \
& ))); +	connect( m_pageView, SIGNAL( urlDropped( const KURL& ) ), SLOT( \
openURLFromDocument( const KURL & )));  connect( m_pageView, SIGNAL( rightClick(const \
KPDFPage *, const QPoint &) ), this, SLOT( slotShowMenu(const KPDFPage *, const \
QPoint &) ) );  
 	// add document observers
@@ -412,6 +412,13 @@
     return true;
 }
 
+void Part::openURLFromDocument(const KURL &url)
+{
+    m_bExtension->openURLNotify();
+    m_bExtension->setLocationBarURL(url.prettyURL());
+    openURL(url);
+}
+
 bool Part::openURL(const KURL &url)
 {
     // note: this can be the right place to check the file for gz or bz2 extension
@@ -420,8 +427,6 @@
 
     // this calls the above 'openURL' method
     bool b = KParts::ReadOnlyPart::openURL(url);
-    m_bExtension->openURLNotify();
-    m_bExtension->setLocationBarURL(url.prettyURL());
     if ( !b )
         KMessageBox::error( widget(), i18n("Could not open %1").arg( url.prettyURL() \
) );  else
--- trunk/KDE/kdegraphics/kpdf/part.h #443370:443371
@@ -88,6 +88,7 @@
 	bool closeURL();
 
 protected slots:
+	void openURLFromDocument(const KURL &url);
 	// connected to actions
 	void slotGoToPage();
 	void slotPreviousPage();


[prev in list] [next in list] [prev in thread] [next in thread]