Attachment #45523 for bug #72804




  saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, QString::null, 0, d->m_suggestedFilename );
}

void KHTMLPopupGUIClient::slotCopyLinkLocation()
{
  KURL safeURL(d->m_url);
  safeURL.setPass(QString::null);
#ifndef QT_NO_MIMECLIPBOARD
  // Set it in both the mouse selection and in the clipboard
  KURL::List lst;
  lst.append( safeURL );
  QApplication::clipboard()->setSelectionMode(true);
  QApplication::clipboard()->setData( new KURLDrag( lst ) );
  QApplication::clipboard()->setSelectionMode(false);
  QApplication::clipboard()->setData( new KURLDrag( lst ) );
#else
  QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}

void KHTMLPopupGUIClient::slotStopAnimations()
{
  d->m_khtml->stopAnimations();
}

void KHTMLPopupGUIClient::slotCopyImageLocation()
{
  KURL safeURL(d->m_imageURL);
  safeURL.setPass(QString::null);
#ifndef QT_NO_MIMECLIPBOARD
  // Set it in both the mouse selection and in the clipboard
  KURL::List lst;
  lst.append( safeURL );
  QApplication::clipboard()->setSelectionMode(true);
  QApplication::clipboard()->setData( new KURLDrag( lst ) );
  QApplication::clipboard()->setSelectionMode(false);
  QApplication::clipboard()->setData( new KURLDrag( lst ) );
#else
  QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}

void KHTMLPopupGUIClient::slotViewImage()
{

Lines 5978-5987 void KHTMLPart::khtmlMouseMoveEvent( kht Link Here

(-)khtml_part.cpp (-2 / +4 lines)
5978	// Text or image link...	5978	// Text or image link...
5979	u = completeURL( d->m_strSelectedURL );	5979	u = completeURL( d->m_strSelectedURL );
5980	pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);	5980	pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
5981	}	5981	}
5982		5982
		5983	u.setPass(QString::null);
		5984
5983	KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );	5985	KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
5984	if ( !d->m_referrer.isEmpty() )	5986	if ( !d->m_referrer.isEmpty() )
5985	urlDrag->metaData()["referrer"] = d->m_referrer;	5987	urlDrag->metaData()["referrer"] = d->m_referrer;
5986		5988
5987	if( img ) {	5989	if( img ) {
Lines 5996-6006 void KHTMLPart::khtmlMouseMoveEvent( kht Link Here
5996	if ( !pix.isNull() )	5998	if ( !pix.isNull() )
5997	drag->setPixmap( pix );	5999	drag->setPixmap( pix );
5998		6000
5999	stopAutoScroll();	6001	stopAutoScroll();
6000	if(drag)	6002	if(drag)
6001	drag->drag();	6003	drag->drag();
6002		6004
6003	// when we finish our drag, we need to undo our mouse press	6005	// when we finish our drag, we need to undo our mouse press
6004	d->m_bMousePressed = false;	6006	d->m_bMousePressed = false;
6005	d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;	6007	d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
6006	return;	6008	return;
Lines 6730-6740 void KHTMLPart::walletOpened(KWallet::Wa Link Here
6730	}	6732	}
6731		6733
6732	d->m_wallet = wallet;	6734	d->m_wallet = wallet;
6733	d->m_bWalletOpened = true;	6735	d->m_bWalletOpened = true;
6734	connect(d->m_wallet, SIGNAL(walletClosed()), SLOT(slotWalletClosed()));	6736	connect(d->m_wallet, SIGNAL(walletClosed()), SLOT(slotWalletClosed()));
6735		6737
6736	if (!d->m_statusBarWalletLabel) {	6738	if (!d->m_statusBarWalletLabel) {
6737	d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());	6739	d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
6738	d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));	6740	d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
6739	d->m_statusBarWalletLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));	6741	d->m_statusBarWalletLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
6740	d->m_statusBarWalletLabel->setUseCursor(false);	6742	d->m_statusBarWalletLabel->setUseCursor(false);

Return to bug 72804

Lines 543-582 void KHTMLPopupGUIClient::slotSaveImageA Link Here

(-)khtml_ext.cpp (-4 / +8 lines)
543	saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, QString::null, 0, d->m_suggestedFilename );	543	saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, QString::null, 0, d->m_suggestedFilename );
544	}	544	}
545		545
546	void KHTMLPopupGUIClient::slotCopyLinkLocation()	546	void KHTMLPopupGUIClient::slotCopyLinkLocation()
547	{	547	{
		548	KURL safeURL(d->m_url);
		549	safeURL.setPass(QString::null);
548	#ifndef QT_NO_MIMECLIPBOARD	550	#ifndef QT_NO_MIMECLIPBOARD
549	// Set it in both the mouse selection and in the clipboard	551	// Set it in both the mouse selection and in the clipboard
550	KURL::List lst;	552	KURL::List lst;
551	lst.append( d->m_url );	553	lst.append( safeURL );
552	QApplication::clipboard()->setSelectionMode(true);	554	QApplication::clipboard()->setSelectionMode(true);
553	QApplication::clipboard()->setData( new KURLDrag( lst ) );	555	QApplication::clipboard()->setData( new KURLDrag( lst ) );
554	QApplication::clipboard()->setSelectionMode(false);	556	QApplication::clipboard()->setSelectionMode(false);
555	QApplication::clipboard()->setData( new KURLDrag( lst ) );	557	QApplication::clipboard()->setData( new KURLDrag( lst ) );
556	#else	558	#else
557	QApplication::clipboard()->setText( d->m_url.url() ); //FIXME(E): Handle multiple entries	559	QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
558	#endif	560	#endif
559	}	561	}
560		562
561	void KHTMLPopupGUIClient::slotStopAnimations()	563	void KHTMLPopupGUIClient::slotStopAnimations()
562	{	564	{
563	d->m_khtml->stopAnimations();	565	d->m_khtml->stopAnimations();
564	}	566	}
565		567
566	void KHTMLPopupGUIClient::slotCopyImageLocation()	568	void KHTMLPopupGUIClient::slotCopyImageLocation()
567	{	569	{
		570	KURL safeURL(d->m_imageURL);
		571	safeURL.setPass(QString::null);
568	#ifndef QT_NO_MIMECLIPBOARD	572	#ifndef QT_NO_MIMECLIPBOARD
569	// Set it in both the mouse selection and in the clipboard	573	// Set it in both the mouse selection and in the clipboard
570	KURL::List lst;	574	KURL::List lst;
571	lst.append( d->m_imageURL);	575	lst.append( safeURL );
572	QApplication::clipboard()->setSelectionMode(true);	576	QApplication::clipboard()->setSelectionMode(true);
573	QApplication::clipboard()->setData( new KURLDrag( lst ) );	577	QApplication::clipboard()->setData( new KURLDrag( lst ) );
574	QApplication::clipboard()->setSelectionMode(false);	578	QApplication::clipboard()->setSelectionMode(false);
575	QApplication::clipboard()->setData( new KURLDrag( lst ) );	579	QApplication::clipboard()->setData( new KURLDrag( lst ) );
576	#else	580	#else
577	QApplication::clipboard()->setText(d->m_imageURL.url()); //FIXME(E): Handle multiple entries	581	QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
578	#endif	582	#endif
579	}	583	}
580		584
581	void KHTMLPopupGUIClient::slotViewImage()	585	void KHTMLPopupGUIClient::slotViewImage()
582	{	586	{