Attachment #45527 for bug #72804




  saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData );
}

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()
{




      // Text or image link...
      u = completeURL( d->m_strSelectedURL );
      pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
    }

    u.setPass(QString::null);

    KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
    if ( !d->m_referrer.isEmpty() )
      urlDrag->metaData()["referrer"] = d->m_referrer;

    if( img ) {

    if ( !pix.isNull() )
      drag->setPixmap( pix );

    stopAutoScroll();
    if(drag)
      drag->drag();

    // when we finish our drag, we need to undo our mouse press
    d->m_bMousePressed = false;
    d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
    return;

Return to bug 72804

Lines 442-481 void KHTMLPopupGUIClient::slotSaveImageA Link Here

(-)khtml_ext.cpp (-4 / +8 lines)
442	saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData );	442	saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData );
443	}	443	}
444		444
445	void KHTMLPopupGUIClient::slotCopyLinkLocation()	445	void KHTMLPopupGUIClient::slotCopyLinkLocation()
446	{	446	{
		447	KURL safeURL(d->m_url);
		448	safeURL.setPass(QString::null);
447	#ifndef QT_NO_MIMECLIPBOARD	449	#ifndef QT_NO_MIMECLIPBOARD
448	// Set it in both the mouse selection and in the clipboard	450	// Set it in both the mouse selection and in the clipboard
449	KURL::List lst;	451	KURL::List lst;
450	lst.append( d->m_url );	452	lst.append( safeURL );
451	QApplication::clipboard()->setSelectionMode(true);	453	QApplication::clipboard()->setSelectionMode(true);
452	QApplication::clipboard()->setData( new KURLDrag( lst ) );	454	QApplication::clipboard()->setData( new KURLDrag( lst ) );
453	QApplication::clipboard()->setSelectionMode(false);	455	QApplication::clipboard()->setSelectionMode(false);
454	QApplication::clipboard()->setData( new KURLDrag( lst ) );	456	QApplication::clipboard()->setData( new KURLDrag( lst ) );
455	#else	457	#else
456	QApplication::clipboard()->setText( d->m_url.url() ); //FIXME(E): Handle multiple entries	458	QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
457	#endif	459	#endif
458	}	460	}
459		461
460	void KHTMLPopupGUIClient::slotStopAnimations()	462	void KHTMLPopupGUIClient::slotStopAnimations()
461	{	463	{
462	d->m_khtml->stopAnimations();	464	d->m_khtml->stopAnimations();
463	}	465	}
464		466
465	void KHTMLPopupGUIClient::slotCopyImageLocation()	467	void KHTMLPopupGUIClient::slotCopyImageLocation()
466	{	468	{
		469	KURL safeURL(d->m_imageURL);
		470	safeURL.setPass(QString::null);
467	#ifndef QT_NO_MIMECLIPBOARD	471	#ifndef QT_NO_MIMECLIPBOARD
468	// Set it in both the mouse selection and in the clipboard	472	// Set it in both the mouse selection and in the clipboard
469	KURL::List lst;	473	KURL::List lst;
470	lst.append( d->m_imageURL);	474	lst.append( safeURL );
471	QApplication::clipboard()->setSelectionMode(true);	475	QApplication::clipboard()->setSelectionMode(true);
472	QApplication::clipboard()->setData( new KURLDrag( lst ) );	476	QApplication::clipboard()->setData( new KURLDrag( lst ) );
473	QApplication::clipboard()->setSelectionMode(false);	477	QApplication::clipboard()->setSelectionMode(false);
474	QApplication::clipboard()->setData( new KURLDrag( lst ) );	478	QApplication::clipboard()->setData( new KURLDrag( lst ) );
475	#else	479	#else
476	QApplication::clipboard()->setText(d->m_imageURL.url()); //FIXME(E): Handle multiple entries	480	QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
477	#endif	481	#endif
478	}	482	}
479		483
480	void KHTMLPopupGUIClient::slotViewImage()	484	void KHTMLPopupGUIClient::slotViewImage()
481	{	485	{

Lines 5465-5474 void KHTMLPart::khtmlMouseMoveEvent( kht Link Here

(-)khtml_part.cpp (-1 / +3 lines)
5465	// Text or image link...	5465	// Text or image link...
5466	u = completeURL( d->m_strSelectedURL );	5466	u = completeURL( d->m_strSelectedURL );
5467	pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);	5467	pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
5468	}	5468	}
5469		5469
		5470	u.setPass(QString::null);
		5471
5470	KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );	5472	KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
5471	if ( !d->m_referrer.isEmpty() )	5473	if ( !d->m_referrer.isEmpty() )
5472	urlDrag->metaData()["referrer"] = d->m_referrer;	5474	urlDrag->metaData()["referrer"] = d->m_referrer;
5473		5475
5474	if( img ) {	5476	if( img ) {
Lines 5483-5493 void KHTMLPart::khtmlMouseMoveEvent( kht Link Here
5483	if ( !pix.isNull() )	5485	if ( !pix.isNull() )
5484	drag->setPixmap( pix );	5486	drag->setPixmap( pix );
5485		5487
5486	stopAutoScroll();	5488	stopAutoScroll();
5487	if(drag)	5489	if(drag)
5488	drag->drag();	5490	drag->drag();
5489		5491
5490	// when we finish our drag, we need to undo our mouse press	5492	// when we finish our drag, we need to undo our mouse press
5491	d->m_bMousePressed = false;	5493	d->m_bMousePressed = false;
5492	d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;	5494	d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
5493	return;	5495	return;