FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:skunkos/rssguard

This commit is contained in:
Martin Rotter 2016-03-09 19:01:51 +01:00
parent 15e2dad052 24f7445451
commit f0abec110d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/text/CHANGELOG
View File

@ -1,4 +1,4 @@
3.1.0 3.1.1
————— —————
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -14,6 +14,7 @@ Added:
Fixed: Fixed:
▪ Fixed little problem with feed list hiding. (bug #163) ▪ Fixed little problem with feed list hiding. (bug #163)
▪ Web browser search context menu item now trims the searched string. (bug #168)
3.1.0 3.1.0
————— —————

3
src/network-web/webview.cpp
View File

@ -21,6 +21,7 @@
#include "miscellaneous/settings.h" #include "miscellaneous/settings.h"
#include "miscellaneous/skinfactory.h" #include "miscellaneous/skinfactory.h"
#include "miscellaneous/iconfactory.h" #include "miscellaneous/iconfactory.h"
#include "miscellaneous/textfactory.h"
#include "network-web/webpage.h" #include "network-web/webpage.h"
#include "network-web/webfactory.h" #include "network-web/webfactory.h"
#include "gui/messagebox.h" #include "gui/messagebox.h"
@ -330,7 +331,7 @@ void WebView::popupContextMenu(const QPoint &pos) {
} }
if (!selectedText().isEmpty()) { if (!selectedText().isEmpty()) {
m_actionLookupText->setText(tr("Search \"%1\" via Google...").arg(selectedText())); m_actionLookupText->setText(tr("Search \"%1\" via Google...").arg(TextFactory::shorten(selectedText())));
context_menu.addAction(m_actionLookupText); context_menu.addAction(m_actionLookupText);
} }