diff -Nru goldendict-0.9.1~git20100707/debian/changelog goldendict-0.9.1~git20100719/debian/changelog --- goldendict-0.9.1~git20100707/debian/changelog 2010-07-21 12:45:41.000000000 +0200 +++ goldendict-0.9.1~git20100719/debian/changelog 2010-07-21 12:45:41.000000000 +0200 @@ -1,3 +1,17 @@ +goldendict (0.9.1~git20100719-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #608168). Remaining changes: + - Add build-dep on libqt4-webkit-dev. + + -- Angel Abad Wed, 21 Jul 2010 00:28:18 +0100 + +goldendict (0.9.1~git20100719-1) unstable; urgency=low + + * New GIT-snapshot + * Added menu item, closes: #589302. + + -- Dmitry E. Oboukhov Mon, 19 Jul 2010 09:44:35 +0400 + goldendict (0.9.1~git20100707-1ubuntu1) maverick; urgency=low * Merge from debian unstable.(LP: #604298) Remaining changes: diff -Nru goldendict-0.9.1~git20100707/debian/goldendict.menu goldendict-0.9.1~git20100719/debian/goldendict.menu --- goldendict-0.9.1~git20100707/debian/goldendict.menu 1970-01-01 01:00:00.000000000 +0100 +++ goldendict-0.9.1~git20100719/debian/goldendict.menu 2010-07-21 12:45:41.000000000 +0200 @@ -0,0 +1,5 @@ +?package(goldendict):needs="X11" section="Applications/Office"\ + title="GoldenDict" command="/usr/bin/goldendict"\ + hints="a feature-rich dictionary lookup program" \ + icon="/usr/share/pixmaps/goldendict.png" + diff -Nru goldendict-0.9.1~git20100707/mouseover.cc goldendict-0.9.1~git20100719/mouseover.cc --- goldendict-0.9.1~git20100707/mouseover.cc 2010-06-09 09:50:42.000000000 +0200 +++ goldendict-0.9.1~git20100719/mouseover.cc 2010-07-19 07:44:21.000000000 +0200 @@ -2,6 +2,7 @@ #include "utf8.hh" #include #include +#include #ifdef Q_OS_WIN32 #include "mouseover_win32/ThTypes.h" @@ -181,6 +182,20 @@ word = wordSeq.mid( begin, end - begin ); } + // See if we have an RTL char. Reverse the whole string if we do. + + for( int x = 0; x < word.size(); ++x ) + { + QChar::Direction d = word[ x ].direction(); + + if ( d == QChar::DirR || d == QChar::DirAL || + d == QChar::DirRLE || d == QChar::DirRLO ) + { + std::reverse( word.begin(), word.end() ); + break; + } + } + emit instance().hovered( word ); }