Author: tgoettlicher Date: Thu Dec 1 17:49:14 2011 New Revision: 66977 URL: http://svn.opensuse.org/viewcvs/yast?rev=66977&view=rev Log: Follow links to anchors in YQTextBrowser (bnc #727330) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQRichText.cc trunk/qt/src/YQRichText.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=66977&r1=66976&r2=66977&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Dec 1 17:49:14 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "21") -SET(VERSION_PATCH "7") +SET(VERSION_MINOR "22") +SET(VERSION_PATCH "0") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=66977&r1=66976&r2=66977&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu Dec 1 17:49:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 1 17:46:33 CET 2011 - tgoettlicher@suse.de + +- Follow links to anchors in YQTextBrowser (bnc #727330) +- V 2.22.0 + +------------------------------------------------------------------- Tue Oct 4 10:25:15 CEST 2011 - tgoettlicher@suse.de - Don't overwrite wizard's dialog title Modified: trunk/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=66977&r1=66976&r2=66977&view=diff ============================================================================== --- trunk/qt/src/YQRichText.cc (original) +++ trunk/qt/src/YQRichText.cc Thu Dec 1 17:49:14 2011 @@ -235,6 +235,16 @@ return true; } +void YQTextBrowser::setSource( const QUrl & name ) +{ + // scroll to link if it's available in the current document + // but prevent loading empty pages + + if ( name.toString().startsWith("#") ) + scrollToAnchor( name.toString().mid(1) ); + +} + #include "YQRichText.moc" Modified: trunk/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.h?rev=66977&r1=66976&r2=66977&view=diff ============================================================================== --- trunk/qt/src/YQRichText.h (original) +++ trunk/qt/src/YQRichText.h Thu Dec 1 17:49:14 2011 @@ -189,7 +189,7 @@ * Reimplemented from QTextBrowser to avoid having an empty text each time * the user clicks on a hyperlink. **/ - virtual void setSource( const QUrl & name ) {} + virtual void setSource( const QUrl & name ); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org