hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 21:04:09 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity
goldendict-ng/articleview.cc

2838 lines
82 KiB
C++
Raw Normal View History

Update year in copyright notices.
2012-02-20 21:47:14 +00:00
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#include "articleview.hh"
make ArticleView::hasSound() async
2022-03-27 14:22:42 +00:00
#include "QtCore/qvariant.h"
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
#include "folding.hh"
#include "fulltextsearch.hh"
#include "gddebug.hh"
#include "gestures.hh"
#include "programs.hh"
#include "utils.hh"
#include "webmultimediadownload.hh"
bword link in Hunspell dictionary.
2021-12-11 16:34:37 +00:00
#include "weburlrequestinterceptor.h"
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
#include "wildcard.hh"
#include "wstring_qt.hh"
#include <QClipboard>
#include <QCryptographicHash>
#include <QDebug>
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
#include <QDesktopServices>
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
#include <QFileDialog>
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QRegularExpression>
#include <QWebChannel>
webkit to webengine
2021-07-06 13:01:50 +00:00
#include <QWebEngineHistory>
#include <QWebEngineScript>
#include <QWebEngineScriptCollection>
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
#include <QWebEngineSettings>
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
#include <assert.h>
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
#include <map>
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0) && QT_VERSION < QT_VERSION_CHECK(6,0,0))
right context menu link .
2021-12-28 13:59:49 +00:00
#include <QWebEngineContextMenuData>
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#endif
#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
upgrade to 6.2,linux compile
2022-02-27 14:42:40 +00:00
#include <QtCore5Compat/QRegExp>
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#include <QWebEngineContextMenuRequest>
#include <QWebEngineFindTextResult>
#endif
Re-introduce native Windows audio playback. This one can only play .wav files, but is far more stable than Phonon. Any existing installations would auto-switch from Phonon to this one. Any attempt to play a non-wav file would suggest switching to Phonon.
2010-11-14 15:38:41 +00:00
#ifdef Q_OS_WIN32
#include <windows.h>
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#include <QPainter>
Re-introduce native Windows audio playback. This one can only play .wav files, but is far more stable than Phonon. Any existing installations would auto-switch from Phonon to this one. Any attempt to play a non-wav file would suggest switching to Phonon.
2010-11-14 15:38:41 +00:00
#endif
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
Use Phonon framework for audio playback. This is now the default way to play back sound under Windows. The other one, "Use external program", was also made available there. The old method of audio playback under Windows (via PlaySound) was completely removed. Since Phonon uses DirectShow as a backend under Windows, all file types supported by it should now play back. Therefore, the previous limitation to just .wav files is now lifted. Since Phonon is only available starting from Qt 4.6.0 under Windows, no older versions of Qt are supported anymore there.
2010-01-02 18:16:22 +00:00
#include <QBuffer>
Use "phonon/mediaobject.h"-style includes for Phonon, as the older ones don't work under Debian sid anymore. If you know how to make this actually work everywhere, please send in a patch.
2010-03-29 13:13:29 +00:00
Mac-specific: Adjust code for Qt5 build
2014-05-12 13:53:13 +00:00
#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
Mac-specific: Implement text-to-speech feature under Mac OS X
2013-05-07 13:39:35 +00:00
#include "speechclient.hh"
#endif
improve:right context menu active dictionaries
2022-01-08 06:51:24 +00:00
#include "globalbroadcaster.h"
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
using std::map;
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
using std::list;
Full-text search: Highlight words with accent mark added by DSL tag
2014-04-24 14:12:00 +00:00
/// AccentMarkHandler class
///
/// Remove accent marks from text
/// and mirror position in normalized text to original text
class AccentMarkHandler
{
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
protected:
Full-text search: Highlight words with accent mark added by DSL tag
2014-04-24 14:12:00 +00:00
QString normalizedString;
QVector< int > accentMarkPos;
public:
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
AccentMarkHandler()
{}
virtual ~AccentMarkHandler()
{}
Full-text search: Highlight words with accent mark added by DSL tag
2014-04-24 14:12:00 +00:00
static QChar accentMark()
{ return QChar( 0x301 ); }
/// Create text without accent marks
/// and store mark positions
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
virtual void setText( QString const & baseString )
Full-text search: Highlight words with accent mark added by DSL tag
2014-04-24 14:12:00 +00:00
{
accentMarkPos.clear();
normalizedString.clear();
int pos = 0;
QChar mark = accentMark();
for( int x = 0; x < baseString.length(); x++ )
{
if( baseString.at( x ) == mark )
{
accentMarkPos.append( pos );
continue;
}
normalizedString.append( baseString.at( x ) );
pos++;
}
}
/// Return text without accent marks
QString const & normalizedText() const
{ return normalizedString; }
/// Convert position into position in original text
int mirrorPosition( int const & pos ) const
{
int newPos = pos;
for( int x = 0; x < accentMarkPos.size(); x++ )
{
if( accentMarkPos.at( x ) < pos )
newPos++;
else
break;
}
return newPos;
}
};
/// End of DslAccentMark class
Use Phonon framework for audio playback. This is now the default way to play back sound under Windows. The other one, "Use external program", was also made available there. The old method of audio playback under Windows (via PlaySound) was completely removed. Since Phonon uses DirectShow as a backend under Windows, all file types supported by it should now play back. Therefore, the previous limitation to just .wav files is now lifted. Since Phonon is only available starting from Qt 4.6.0 under Windows, no older versions of Qt are supported anymore there.
2010-01-02 18:16:22 +00:00
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
/// DiacriticsHandler class
///
/// Remove diacritics from text
/// and mirror position in normalized text to original text
class DiacriticsHandler : public AccentMarkHandler
{
public:
DiacriticsHandler()
{}
~DiacriticsHandler()
{}
/// Create text without diacriticss
/// and store diacritic marks positions
virtual void setText( QString const & baseString )
{
accentMarkPos.clear();
normalizedString.clear();
gd::wstring baseText = gd::toWString( baseString );
gd::wstring normText;
int pos = 0;
normText.reserve( baseText.size() );
gd::wchar const * nextChar = baseText.data();
size_t consumed;
for( size_t left = baseText.size(); left; )
{
if( *nextChar >= 0x10000U )
{
// Will be translated into surrogate pair
normText.push_back( *nextChar );
pos += 2;
nextChar++; left--;
continue;
}
gd::wchar ch = Folding::foldedDiacritic( nextChar, left, consumed );
if( Folding::isCombiningMark( ch ) )
{
accentMarkPos.append( pos );
nextChar++; left--;
continue;
}
if( consumed > 1 )
{
for( size_t i = 1; i < consumed; i++ )
accentMarkPos.append( pos );
}
normText.push_back( ch );
pos += 1;
nextChar += consumed;
left -= consumed;
}
normalizedString = gd::toQString( normText );
}
};
/// End of DiacriticsHandler class
found dictionaries panel update
2021-11-24 14:38:37 +00:00
void ArticleView::emitJavascriptFinished(){
emit notifyJavascriptFinished();
}
Fix javascript errors when try to evaluate undefined variables
2013-05-29 07:03:37 +00:00
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
namespace {
char const * const scrollToPrefix = "gdfrom-";
bool isScrollTo( QString const & id )
{
return id.startsWith( scrollToPrefix );
}
QString dictionaryIdFromScrollTo( QString const & scrollTo )
{
Q_ASSERT( isScrollTo( scrollTo ) );
const int scrollToPrefixLength = 7;
return scrollTo.mid( scrollToPrefixLength );
}
Show current match and match count during FTS result navigation This information is going to be especially useful in the upcoming Qt WebEngine version of GoldenDict. In the Qt WebEngine version only the words equal to the last found result can be highlighted, not all FTS matches as in the Qt WebKit version.
2022-07-02 13:36:19 +00:00
QString searchStatusMessageNoMatches()
{
return ArticleView::tr( "Phrase not found" );
}
QString searchStatusMessage( int activeMatch, int matchCount )
{
Q_ASSERT( matchCount > 0 );
Q_ASSERT( activeMatch > 0 );
Q_ASSERT( activeMatch <= matchCount );
return ArticleView::tr( "%1 of %2 matches" ).arg( activeMatch ).arg( matchCount );
}
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
} // unnamed namespace
QString ArticleView::scrollToFromDictionaryId( QString const & dictionaryId )
{
Q_ASSERT( !isScrollTo( dictionaryId ) );
return scrollToPrefix + dictionaryId;
}
clean:open dictionary folder in windows make windows's logic same as linux
2022-02-16 14:50:44 +00:00
ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, AudioPlayerPtr const & audioPlayer_,
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
std::vector< sptr< Dictionary::Class > > const & allDictionaries_,
clean:open dictionary folder in windows make windows's logic same as linux
2022-02-16 14:50:44 +00:00
Instances::Groups const & groups_, bool popupView_, Config::Class const & cfg_,
QAction & openSearchAction_, QAction * dictionaryBarToggled_,
GroupComboBox const * groupComboBox_ ) :
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
QFrame( parent ),
articleNetMgr( nm ),
Make adding new audio player implementations easy * add a new interface class AudioPlayerInterface; * inherit a new proxy class Ffmpeg::AudioPlayer from it; * partially switch ArlticleView to using the interface; * expose MainWindow's AudioPlayerInterface instance to all ArticleView instances; * add a new AudioPlayerFactory class responsible for creating instances of concrete classes derived from AudioPlayerInterface depending on relevant Config::Preferences values; * increase minimum supported Qt version from 4.5 to 4.6 in README in order to use QScopedPointer introduced in Qt 4.6.
2018-03-21 17:49:34 +00:00
audioPlayer( audioPlayer_ ),
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
allDictionaries( allDictionaries_ ),
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
groups( groups_ ),
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
popupView( popupView_ ),
+ Pasting in the definition window defines word from clipboard.
2009-05-12 10:52:11 +00:00
cfg( cfg_ ),
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
pasteAction( this ),
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
articleUpAction( this ),
articleDownAction( this ),
+! Save and restore scroll offsets programatically - this helps when websites are involved, as they expand after WebKit restores the position.
2009-05-29 22:04:43 +00:00
goBackAction( this ),
goForwardAction( this ),
Select an enire text of the current article (Ctrl+Shift+A). Plus a context menu for that as well.
2013-01-18 14:37:24 +00:00
selectCurrentArticleAction( this ),
Add "Copy as text" feature (issue #311)
2013-05-15 13:52:47 +00:00
copyAsTextAction( this ),
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
inspectAction( this ),
Implement full-text search
2014-04-16 16:18:28 +00:00
openSearchAction( openSearchAction_ ),
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
searchIsOpened( false ),
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
dictionaryBarToggled( dictionaryBarToggled_ ),
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
groupComboBox( groupComboBox_ ),
ftsSearchIsOpened( false ),
ftsSearchMatchCase( false ),
ftsPosition( 0 )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
ui.setupUi( this );
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
ui.definition->setUp( const_cast< Config::Class * >( &cfg ) );
+! Save and restore scroll offsets programatically - this helps when websites are involved, as they expand after WebKit restores the position.
2009-05-29 22:04:43 +00:00
goBackAction.setShortcut( QKeySequence( "Alt+Left" ) );
ui.definition->addAction( &goBackAction );
connect( &goBackAction, SIGNAL( triggered() ),
this, SLOT( back() ) );
+ Alt+Left/Right act as Back/Forward shortcuts.
2009-05-15 14:24:37 +00:00
+! Save and restore scroll offsets programatically - this helps when websites are involved, as they expand after WebKit restores the position.
2009-05-29 22:04:43 +00:00
goForwardAction.setShortcut( QKeySequence( "Alt+Right" ) );
ui.definition->addAction( &goForwardAction );
connect( &goForwardAction, SIGNAL( triggered() ),
this, SLOT( forward() ) );
+ Alt+Left/Right act as Back/Forward shortcuts.
2009-05-15 14:24:37 +00:00
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->pageAction( QWebEnginePage::Copy )->setShortcut( QKeySequence::Copy );
ui.definition->addAction( ui.definition->pageAction( QWebEnginePage::Copy ) );
+! Add support for clipboard copying operations in article views.
2009-04-03 21:57:23 +00:00
change to setcontent
2021-08-21 01:41:40 +00:00
QAction * selectAll = ui.definition->pageAction( QWebEnginePage::SelectAll );
selectAll->setShortcut( QKeySequence::SelectAll );
selectAll->setShortcutContext( Qt::WidgetWithChildrenShortcut );
ui.definition->addAction( selectAll );
Fixed #164: Add an option to copy the entire article (Ctrl+A)
2013-01-18 13:22:24 +00:00
change to setcontent
2021-08-21 01:41:40 +00:00
ui.definition->setContextMenuPolicy( Qt::CustomContextMenu );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
connect(ui.definition, SIGNAL(loadFinished(bool)), this,
SLOT(loadFinished(bool)));
imp. : zoom factor ,set zoom also in loading process
2022-01-20 12:34:14 +00:00
connect(ui.definition, SIGNAL(loadProgress(int)), this,
SLOT(loadProgress(int)));
opt:use acceptNavigationRequest instead of weburlinterceptor
2022-05-18 14:31:47 +00:00
connect( ui.definition, SIGNAL( linkClicked( QUrl ) ), this, SLOT( linkClicked( QUrl ) ) );
imp. : zoom factor ,set zoom also in loading process
2022-01-20 12:34:14 +00:00
connect( ui.definition->page(), SIGNAL( titleChanged( QString ) ),
this, SLOT( handleTitleChanged( QString ) ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
remove inspector -- useless code
2021-10-05 01:51:51 +00:00
connect( ui.definition->page(), SIGNAL( urlChanged(QUrl) ),
this, SLOT( handleUrlChanged(QUrl) ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
connect( ui.definition, SIGNAL( customContextMenuRequested( QPoint const & ) ),
this, SLOT( contextMenuRequested( QPoint const & ) ) );
webkit to webengine
2021-07-06 13:01:50 +00:00
connect( ui.definition->page(), SIGNAL( linkHovered ( const QString &) ),
this, SLOT( linkHovered ( const QString & ) ) );
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
connect( ui.definition, SIGNAL( doubleClicked( QPoint ) ),this,SLOT( doubleClicked( QPoint ) ) );
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
+ Pasting in the definition window defines word from clipboard.
2009-05-12 10:52:11 +00:00
pasteAction.setShortcut( QKeySequence::Paste );
ui.definition->addAction( &pasteAction );
connect( &pasteAction, SIGNAL( triggered() ), this, SLOT( pasteTriggered() ) );
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
articleUpAction.setShortcut( QKeySequence( "Alt+Up" ) );
ui.definition->addAction( &articleUpAction );
connect( &articleUpAction, SIGNAL( triggered() ), this, SLOT( moveOneArticleUp() ) );
articleDownAction.setShortcut( QKeySequence( "Alt+Down" ) );
ui.definition->addAction( &articleDownAction );
connect( &articleDownAction, SIGNAL( triggered() ), this, SLOT( moveOneArticleDown() ) );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
ui.definition->addAction( &openSearchAction );
connect( &openSearchAction, SIGNAL( triggered() ), this, SLOT( openSearch() ) );
Select an enire text of the current article (Ctrl+Shift+A). Plus a context menu for that as well.
2013-01-18 14:37:24 +00:00
selectCurrentArticleAction.setShortcut( QKeySequence( "Ctrl+Shift+A" ));
selectCurrentArticleAction.setText( tr( "Select Current Article" ) );
ui.definition->addAction( &selectCurrentArticleAction );
connect( &selectCurrentArticleAction, SIGNAL( triggered() ),
this, SLOT( selectCurrentArticle() ) );
Add "Copy as text" feature (issue #311)
2013-05-15 13:52:47 +00:00
copyAsTextAction.setShortcut( QKeySequence( "Ctrl+Shift+C" ) );
copyAsTextAction.setText( tr( "Copy as text" ) );
ui.definition->addAction( &copyAsTextAction );
connect( &copyAsTextAction, SIGNAL( triggered() ),
this, SLOT( copyAsText() ) );
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
inspectAction.setShortcut( QKeySequence( Qt::Key_F12 ) );
inspectAction.setText( tr( "Inspect" ) );
ui.definition->addAction( &inspectAction );
F12 inspect element
2021-11-30 03:40:57 +00:00
optimize: F12 inspect element optimize:inspect element dialog
2022-02-17 17:13:01 +00:00
connect(&inspectAction, &QAction::triggered, this, &ArticleView::inspectElement);
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
ui.definition->installEventFilter( this );
Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated Also fixed #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 21:04:45 +00:00
ui.searchFrame->installEventFilter( this );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
ui.ftsSearchFrame->installEventFilter( this );
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
modify webenginesettings to support qt6.2
2022-02-27 07:49:29 +00:00
QWebEngineSettings * settings = ui.definition->settings();
add QWebEngineSettings::UnknownUrlSchemePolicy to qwebenginesettings
2022-03-14 15:24:53 +00:00
settings->setUnknownUrlSchemePolicy(QWebEngineSettings::UnknownUrlSchemePolicy::DisallowUnknownUrlSchemes);
modify webenginesettings to support qt6.2
2022-02-27 07:49:29 +00:00
#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
opt : set webengine font family make it take effect immediately
2022-05-17 13:24:30 +00:00
settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessRemoteUrls, true );
settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessFileUrls, true );
settings->defaultSettings()->setAttribute( QWebEngineSettings::ErrorPageEnabled, false );
opt: add javascript clipboard support
2022-04-26 12:21:45 +00:00
settings->defaultSettings()->setAttribute( QWebEngineSettings::PluginsEnabled, cfg.preferences.enableWebPlugins );
settings->defaultSettings()->setAttribute( QWebEngineSettings::PlaybackRequiresUserGesture, false );
settings->defaultSettings()->setAttribute( QWebEngineSettings::JavascriptCanAccessClipboard, true );
disable print background
2022-05-24 13:40:53 +00:00
settings->defaultSettings()->setAttribute( QWebEngineSettings::PrintElementBackgrounds, false );
modify webenginesettings to support qt6.2
2022-02-27 07:49:29 +00:00
#else
opt : set webengine font family make it take effect immediately
2022-05-17 13:24:30 +00:00
settings->setAttribute( QWebEngineSettings::LocalContentCanAccessRemoteUrls, true );
settings->setAttribute( QWebEngineSettings::LocalContentCanAccessFileUrls, true );
settings->setAttribute( QWebEngineSettings::ErrorPageEnabled, false );
modify webenginesettings to support qt6.2
2022-02-27 07:49:29 +00:00
settings->setAttribute( QWebEngineSettings::PluginsEnabled, cfg.preferences.enableWebPlugins );
settings->setAttribute( QWebEngineSettings::PlaybackRequiresUserGesture, false );
opt: add javascript clipboard support
2022-04-26 12:21:45 +00:00
settings->setAttribute( QWebEngineSettings::JavascriptCanAccessClipboard, true );
disable print background
2022-05-24 13:40:53 +00:00
settings->setAttribute( QWebEngineSettings::PrintElementBackgrounds, false );
opt: add dictionary fallback font family settings
2022-05-08 08:00:08 +00:00
#endif
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
fix:about blank page handle
2022-08-23 12:12:03 +00:00
ui.definition->load( QUrl("gdlookup://localhost?word=(untitled)&blank=1") );
fix: blank page
2022-08-23 11:09:38 +00:00
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
expandOptionalParts = cfg.preferences.alwaysExpandOptionalParts;
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
ui.definition->grabGesture( Gestures::GDPinchGestureType );
ui.definition->grabGesture( Gestures::GDSwipeGestureType );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
// Variable name for store current selection range
rangeVarName = QString( "sr_%1" ).arg( QString::number( (quint64)this, 16 ) );
fix:single click to select work (inside html iframe)
2022-01-04 13:01:16 +00:00
opt: rename emitDicts signal to dictionaryChanges
2022-05-14 09:22:34 +00:00
connect(GlobalBroadcaster::instance(), SIGNAL( dictionaryChanges(ActiveDictIds)), this,
improve:right context menu active dictionaries
2022-01-08 06:51:24 +00:00
SLOT(setActiveDictIds(ActiveDictIds)));
opt: update dictionaries when disable certain dictionary
2022-07-16 22:54:53 +00:00
connect( GlobalBroadcaster::instance(), &GlobalBroadcaster::dictionaryClear, this,
&ArticleView::dictionaryClear );
fix:single click to select work (inside html iframe)
2022-01-04 13:01:16 +00:00
channel = new QWebChannel(ui.definition->page());
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
agent = new ArticleViewAgent(this);
attachWebChannelToHtml();
add 'send to anki' function users can configure the ankiconnect to use together with anki
2022-05-21 06:03:26 +00:00
ankiConnector = new AnkiConnector( this, cfg );
connect( ankiConnector,
&AnkiConnector::errorText,
this,
[ this ]( QString const & errorText ) { emit statusBarMessage( errorText ); } );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Fixed a bug with incorrect restored sizes of sidebars.
2012-12-27 20:32:16 +00:00
// explicitly report the minimum size, to avoid
// sidebar widgets' improper resize during restore
QSize ArticleView::minimumSizeHint() const
{
return ui.searchFrame->minimumSizeHint();
}
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
void ArticleView::setGroupComboBox( GroupComboBox const * g )
{
groupComboBox = g;
}
+ Support for sound playback under Windows added (limited to .wavs though).
2009-02-06 15:37:37 +00:00
ArticleView::~ArticleView()
{
* Rework the way temporary files are handled so they'd work under Windows without locking issues.
2009-02-08 21:54:19 +00:00
cleanupTemp();
Run a single external audio player process at a time External and internal audio players work similarly now. Fixes #950. * inherit a new ExternalAudioPlayer class from AudioPlayerInterface; * use an existing ExternalViewer class to implement ExternalAudioPlayer; * take (const char *, int) instead of std::vector<char> in ExternalViewer constructor to fit into AudioPlayerInterface; * extend ExternalViewer API to let ExternalAudioPlayer stop superseded audio player processes; * make AudioPlayerInterface::play() return an error message string to allow reporting immediate failures from derived classes; * Document AudioPlayerInterface API; * Document AudioPlayerFactory::player(); * use the common audio interface exclusively in ArticleView.
2018-03-22 17:07:10 +00:00
audioPlayer->stop();
fix: crash when edit dictionary through menu. when goldendict starts.
2022-01-23 03:22:40 +00:00
//channel->deregisterObject(this);
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
ui.definition->ungrabGesture( Gestures::GDPinchGestureType );
ui.definition->ungrabGesture( Gestures::GDSwipeGestureType );
+ Support for sound playback under Windows added (limited to .wavs though).
2009-02-06 15:37:37 +00:00
}
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
void ArticleView::showDefinition( Config::InputPhrase const & phrase, unsigned group,
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QString const & scrollTo,
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
Contexts const & contexts_ )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
fix:double click translation ,right context menu invalid
2022-02-10 12:07:05 +00:00
currentWord = phrase.phrase.trimmed();
fix:return directly when the searched word is empty
2022-11-04 13:25:55 +00:00
if( currentWord.isEmpty() )
return;
fix: when history forward/back ,the founded dictionary does not change fixed #184
2022-11-04 13:23:42 +00:00
historyMode = false;
fix:right context menu not display correctly when select wikiweb dictionary
2022-01-08 13:45:10 +00:00
currentActiveDictIds.clear();
Stop the internal audio player when the page is closed or changed
2013-06-23 09:53:10 +00:00
// first, let's stop the player
Run a single external audio player process at a time External and internal audio players work similarly now. Fixes #950. * inherit a new ExternalAudioPlayer class from AudioPlayerInterface; * use an existing ExternalViewer class to implement ExternalAudioPlayer; * take (const char *, int) instead of std::vector<char> in ExternalViewer constructor to fit into AudioPlayerInterface; * extend ExternalViewer API to let ExternalAudioPlayer stop superseded audio player processes; * make AudioPlayerInterface::play() return an error message string to allow reporting immediate failures from derived classes; * Document AudioPlayerInterface API; * Document AudioPlayerFactory::player(); * use the common audio interface exclusively in ArticleView.
2018-03-22 17:07:10 +00:00
audioPlayer->stop();
Stop the internal audio player when the page is closed or changed
2013-06-23 09:53:10 +00:00
Remove Url::Class, add Qt4x5::Url::ensureLeadingSlash() and fix all related
2013-05-31 04:20:25 +00:00
QUrl req;
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
Contexts contexts( contexts_ );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
req.setScheme( "gdlookup" );
req.setHost( "localhost" );
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "word", phrase.phrase );
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
if ( !phrase.punctuationSuffix.isEmpty() )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "punctuation_suffix", phrase.punctuationSuffix );
Utils::Url::addQueryItem( req, "group", QString::number( group ) );
Add option to ignore diacritics while articles search
2018-06-13 16:00:42 +00:00
if( cfg.preferences.ignoreDiacritics )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "ignore_diacritics", "1" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
if ( scrollTo.size() )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "scrollto", scrollTo );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
opt: clear the delayedHighlight text earlier
2022-06-03 04:32:27 +00:00
if( delayedHighlightText.size() )
{
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
Utils::Url::addQueryItem( req, "regexp", delayedHighlightText );
opt: clear the delayedHighlight text earlier
2022-06-03 04:32:27 +00:00
delayedHighlightText.clear();
}
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
Contexts::Iterator pos = contexts.find( "gdanchor" );
if( pos != contexts.end() )
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "gdanchor", contexts[ "gdanchor" ] );
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
contexts.erase( pos );
}
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
if ( contexts.size() )
{
QBuffer buf;
buf.open( QIODevice::WriteOnly );
QDataStream stream( &buf );
stream << contexts;
buf.close();
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "contexts", QString::fromLatin1( buf.buffer().toBase64() ) );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
QString mutedDicts = getMutedForGroup( group );
if ( mutedDicts.size() )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "muted", mutedDicts );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
// Update headwords history
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
emit sendWordToHistory( phrase.phrase );
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
// Any search opened is probably irrelevant now
closeSearch();
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
// Clear highlight all button selection
ui.highlightAllButton->setChecked(false);
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
emit setExpandMode( expandOptionalParts );
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
load( req );
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
//QApplication::setOverrideCursor( Qt::WaitCursor );
ui.definition->setCursor( Qt::WaitCursor );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
void ArticleView::showDefinition( QString const & word, unsigned group,
QString const & scrollTo,
Contexts const & contexts_ )
{
showDefinition( Config::InputPhrase::fromPhrase( word ), group, scrollTo, contexts_ );
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
void ArticleView::showDefinition( QString const & word, QStringList const & dictIDs,
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
QRegExp const & searchRegExp, unsigned group,
bool ignoreDiacritics )
Implement full-text search
2014-04-16 16:18:28 +00:00
{
if( dictIDs.isEmpty() )
return;
fix:double click translation ,right context menu invalid
2022-02-10 12:07:05 +00:00
currentWord = word.trimmed();
fix:return directly when the searched word is empty
2022-11-04 13:25:55 +00:00
if( currentWord.isEmpty() )
return;
fix: when history forward/back ,the founded dictionary does not change fixed #184
2022-11-04 13:23:42 +00:00
historyMode = false;
Implement full-text search
2014-04-16 16:18:28 +00:00
// first, let's stop the player
Run a single external audio player process at a time External and internal audio players work similarly now. Fixes #950. * inherit a new ExternalAudioPlayer class from AudioPlayerInterface; * use an existing ExternalViewer class to implement ExternalAudioPlayer; * take (const char *, int) instead of std::vector<char> in ExternalViewer constructor to fit into AudioPlayerInterface; * extend ExternalViewer API to let ExternalAudioPlayer stop superseded audio player processes; * make AudioPlayerInterface::play() return an error message string to allow reporting immediate failures from derived classes; * Document AudioPlayerInterface API; * Document AudioPlayerFactory::player(); * use the common audio interface exclusively in ArticleView.
2018-03-22 17:07:10 +00:00
audioPlayer->stop();
Implement full-text search
2014-04-16 16:18:28 +00:00
QUrl req;
req.setScheme( "gdlookup" );
req.setHost( "localhost" );
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "word", word );
Utils::Url::addQueryItem( req, "dictionaries", dictIDs.join( ",") );
Utils::Url::addQueryItem( req, "regexp", searchRegExp.pattern() );
fix: fix todo when upgrade to 6.2
2022-03-20 11:27:35 +00:00
if( searchRegExp.caseSensitivity() == Qt::CaseSensitive )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "matchcase", "1" );
fix: fix todo when upgrade to 6.2
2022-03-20 11:27:35 +00:00
if( searchRegExp.patternSyntax() == QRegExp::WildcardUnix )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "wildcards", "1" );
Utils::Url::addQueryItem( req, "group", QString::number( group ) );
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
if( ignoreDiacritics )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( req, "ignore_diacritics", "1" );
Implement full-text search
2014-04-16 16:18:28 +00:00
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
// Update headwords history
Implement full-text search
2014-04-16 16:18:28 +00:00
emit sendWordToHistory( word );
// Any search opened is probably irrelevant now
closeSearch();
// Clear highlight all button selection
ui.highlightAllButton->setChecked(false);
emit setExpandMode( expandOptionalParts );
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
load( req );
Implement full-text search
2014-04-16 16:18:28 +00:00
ui.definition->setCursor( Qt::WaitCursor );
}
add 'send to anki' function users can configure the ankiconnect to use together with anki
2022-05-21 06:03:26 +00:00
void ArticleView::sendToAnki(QString const & word, QString const & text ){
ankiConnector->sendToAnki(word,text);
}
+ Indicate that the user should be anticipating the result when scan popup is searching for the translation.
2009-02-08 16:50:18 +00:00
void ArticleView::showAnticipation()
{
ui.definition->setHtml( "" );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
ui.definition->setCursor( Qt::WaitCursor );
+ Indicate that the user should be anticipating the result when scan popup is searching for the translation.
2009-02-08 16:50:18 +00:00
}
opt: make the inspect window's instance to exactly only one.
2022-05-20 09:18:38 +00:00
void ArticleView::inspectElement()
{
article inspector debug info
2022-08-08 12:48:46 +00:00
emit inspectSignal( ui.definition->page() );
optimize: F12 inspect element optimize:inspect element dialog
2022-02-17 17:13:01 +00:00
}
fix:when auto pronounce enabled. the sentence audio can not be played.
2022-02-04 13:19:32 +00:00
void ArticleView::loadFinished( bool result )
+ Indicate that the user should be anticipating the result when scan popup is searching for the translation.
2009-02-08 16:50:18 +00:00
{
opt: make the inspect window's instance to exactly only one.
2022-05-20 09:18:38 +00:00
setZoomFactor( cfg.preferences.zoomFactor );
fix:zoom in does not take affect.
2021-12-30 12:41:38 +00:00
QUrl url = ui.definition->url();
opt: return directly when load about:blank or load unsuccessful
2022-07-28 13:23:52 +00:00
qDebug() << "article view loaded url:" << url.url().left( 200 ) << result;
if( url.url() == "about:blank" )
{
return;
}
if( !result )
{
qWarning() << "article loaded unsuccessful";
return;
}
Add "Automatically scroll to target article" option When a user clicks on a link in a dictionary or requests translation of a word by double-clicking or translates selection via the context menu, at first the article from the highest-priority dictionary is at the top. Then, after approximately one second, the article from the dictionary, out of which the translation was requested, becomes current and the view scrolls down to this article placing it on top, hiding articles from the dictionaries above it. Such application behavior is inconvenient in some workflows so that the user manually navigates to the top dictionary translation when this automatic scrolling happens. For example: a user has English->Russian dictionaries and English->English dictionaries. The English->Russian dictionaries are higher up in the dictionary order because they provide easier/faster to understand translations. Some rare words and phrases are missing from the English->Russian dictionaries however. Thus the user occasionally reads the English explanation of a word/phrase. When the user double-clicks on a word or follows a link in the English->English dictionary article, she would rather see translations from the preferable English->Russian dictionaries. The new option allows to disable automatic scrolling and ensure that articles from higher-priority dictionaries are visible. The option doesn't affect backward/forward navigation via arrow buttons or Alt+Arrow shortcuts: these still scroll to the stored vertical position among articles. This remaining automatic scrolling happens much faster, is not a problem for the described use case and hopefully for other use cases.
2019-01-11 13:50:40 +00:00
if( cfg.preferences.autoScrollToTargetArticle )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString const scrollTo = Utils::Url::queryItemValue( url, "scrollto" );
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
if( isScrollTo( scrollTo ) )
{
setCurrentArticle( scrollTo, true );
}
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
ui.definition->unsetCursor();
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
Automatically expand collapsed article if only one loaded
2013-06-03 17:14:05 +00:00
// Expand collapsed article if only one loaded
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->runJavaScript( QString( "gdCheckArticlesNumber();" ) );
Automatically expand collapsed article if only one loaded
2013-06-03 17:14:05 +00:00
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( !Utils::Url::queryItemValue( url, "gdanchor" ).isEmpty() )
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString anchor = QUrl::fromPercentEncoding( Utils::Url::encodedQueryItemValue( url, "gdanchor" ) );
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
// Find GD anchor on page
int n = anchor.indexOf( '_' );
MDict: Fix handling of anchors like "<a id="xxx">
2016-05-11 14:41:13 +00:00
if( n == 33 )
// MDict pattern: ("g" + dictionary ID (33 chars total))_(articleID(quint64, hex))_(original anchor)
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
n = anchor.indexOf( '_', n + 1 );
Slob: Handle inter-article anchors
2015-10-30 18:01:38 +00:00
else
n = 0;
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
if( n > 0 )
{
QString originalAnchor = anchor.mid( n + 1 );
webkit to webengine
2021-07-06 13:01:50 +00:00
int end = originalAnchor.indexOf('_');
QString hash=originalAnchor.left(end);
url.clear();
url.setFragment(hash);
ui.definition->page()->runJavaScript(
QString("window.location.hash = \"%1\"").arg(QString::fromUtf8(url.toEncoded())));
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
}
Slob: Handle inter-article anchors
2015-10-30 18:01:38 +00:00
else
{
Fix anchor handling in Qt 5 builds
2016-04-01 13:38:07 +00:00
url.clear();
Slob: Handle inter-article anchors
2015-10-30 18:01:38 +00:00
url.setFragment( anchor );
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->runJavaScript(
Fix anchor handling in Qt 5 builds
2016-04-01 13:38:07 +00:00
QString( "window.location.hash = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
Slob: Handle inter-article anchors
2015-10-30 18:01:38 +00:00
}
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
}
fix:when auto pronounce enabled. the sentence audio can not be played.
2022-02-04 13:19:32 +00:00
//the click audio url such as gdau://xxxx ,webview also emit a pageLoaded signal but with the result is false.need future investigation.
//the audio link click ,no need to emit pageLoaded signal
if(result){
emit pageLoaded( this );
}
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( ui.definition->url(), "regexp" ) )
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
highlightFTSResults();
+ Indicate that the user should be anticipating the result when scan popup is searching for the translation.
2009-02-08 16:50:18 +00:00
}
imp. : zoom factor ,set zoom also in loading process
2022-01-20 12:34:14 +00:00
void ArticleView::loadProgress(int ){
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void ArticleView::handleTitleChanged( QString const & title )
{
Fix anchor handling in Qt 5 builds
2016-04-01 13:38:07 +00:00
if( !title.isEmpty() ) // Qt 5.x WebKit raise signal titleChanges(QString()) while navigation within page
emit titleChanged( this, title );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void ArticleView::handleUrlChanged( QUrl const & url )
{
QIcon icon;
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
unsigned group = getGroup( url );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
if ( group )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
// Find the group's instance corresponding to the fragment value
for( unsigned x = 0; x < groups.size(); ++x )
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
if ( groups[ x ].id == group )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
// Found it
Correctly display custom icons in tabs.
2010-07-05 19:47:22 +00:00
icon = groups[ x ].makeIcon();
break;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
}
emit iconChanged( this, icon );
}
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
unsigned ArticleView::getGroup( QUrl const & url )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if ( url.scheme() == "gdlookup" && Utils::Url::hasQueryItem( url, "group" ) )
return Utils::Url::queryItemValue( url, "group" ).toUInt();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
return 0;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
QStringList ArticleView::getArticlesList()
fix conflict
2021-12-13 14:45:16 +00:00
{
improve:right context menu active dictionaries
2022-01-08 06:51:24 +00:00
return currentActiveDictIds;
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
}
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
QString ArticleView::getActiveArticleId()
{
fix:right context menu ,select current article
2022-01-19 12:16:45 +00:00
return activeDictId;
}
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
fix:right context menu ,select current article
2022-01-19 12:16:45 +00:00
void ArticleView::setActiveArticleId(QString const & dictId){
this->activeDictId=dictId;
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
}
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
QString ArticleView::getCurrentArticle()
{
imp. : "select current article" ,if not in the view.scroll into view.
2022-01-20 13:59:47 +00:00
QString dictId=getActiveArticleId();
return scrollToFromDictionaryId( dictId );
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
}
Jump to article when double-clicking on dictinary in "Found in Dictionaries" This forces the jump even when the dictionary is already a current/active dictionary. This is convenient for the following use-cases: 1. User manually scrolls far away from the current dictionary and would like to return. 2. User jumps far away from the current dictionary when doing search (Ctrl+F). 3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 16:00:13 +00:00
void ArticleView::jumpToDictionary( QString const & id, bool force )
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
{
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
QString targetArticle = scrollToFromDictionaryId( id );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
Jump to article when double-clicking on dictinary in "Found in Dictionaries" This forces the jump even when the dictionary is already a current/active dictionary. This is convenient for the following use-cases: 1. User manually scrolls far away from the current dictionary and would like to return. 2. User jumps far away from the current dictionary when doing search (Ctrl+F). 3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 16:00:13 +00:00
// jump only if neceessary, or when forced
if ( force || targetArticle != getCurrentArticle() )
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
{
setCurrentArticle( targetArticle, true );
}
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
}
Set current article at most once in loadFinished() When the current article is set and the user expands or collapses optional parts (e.g. via the Ctrl+* shortcut), ArticleView::setCurrentArticle() is called twice from ArticleView::loadFinished(). Furthermore, the window scroll position is restored before the second jump. This is wasteful. Move the higher-priority setCurrentArticle() call up and, if it succeeds, skip the other call and the scrolling. I have measured the time spent running the affected code fragment on my GNU/Linux system before and at this commit. When the loaded articles are not very large, the performance gain of this commit is only about 1 ms. However, when one of the displayed articles was huge (the "United States" English Wikipedia article), the time went from 120 ms to 5 ms.
2022-05-24 11:47:15 +00:00
bool ArticleView::setCurrentArticle( QString const & id, bool moveToIt )
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
{
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
if ( !isScrollTo( id ) )
Set current article at most once in loadFinished() When the current article is set and the user expands or collapses optional parts (e.g. via the Ctrl+* shortcut), ArticleView::setCurrentArticle() is called twice from ArticleView::loadFinished(). Furthermore, the window scroll position is restored before the second jump. This is wasteful. Move the higher-priority setCurrentArticle() call up and, if it succeeds, skip the other call and the scrolling. I have measured the time spent running the affected code fragment on my GNU/Linux system before and at this commit. When the loaded articles are not very large, the performance gain of this commit is only about 1 ms. However, when one of the displayed articles was huge (the "United States" English Wikipedia article), the time went from 120 ms to 5 ms.
2022-05-24 11:47:15 +00:00
return false; // Incorrect id
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
Don't jump to dictionary when new page opens in background
2014-02-09 15:00:48 +00:00
if ( !ui.definition->isVisible() )
Set current article at most once in loadFinished() When the current article is set and the user expands or collapses optional parts (e.g. via the Ctrl+* shortcut), ArticleView::setCurrentArticle() is called twice from ArticleView::loadFinished(). Furthermore, the window scroll position is restored before the second jump. This is wasteful. Move the higher-priority setCurrentArticle() call up and, if it succeeds, skip the other call and the scrolling. I have measured the time spent running the affected code fragment on my GNU/Linux system before and at this commit. When the loaded articles are not very large, the performance gain of this commit is only about 1 ms. However, when one of the displayed articles was huge (the "United States" English Wikipedia article), the time went from 120 ms to 5 ms.
2022-05-24 11:47:15 +00:00
return false; // No action on background page, scrollIntoView there don't work
Don't jump to dictionary when new page opens in background
2014-02-09 15:00:48 +00:00
right panel founded dictionaries
2021-10-05 01:23:30 +00:00
if(moveToIt){
fix: scroll to current article
2022-02-25 14:48:43 +00:00
QString dictId = id.mid( 7 );
if( dictId.isEmpty() )
fix upstream merge conflict
2022-05-24 23:57:43 +00:00
return false;
fix: scroll to current article
2022-02-25 14:48:43 +00:00
QString script = QString( "var elem=document.getElementById('%1'); "
"if(elem!=undefined){elem.scrollIntoView(true);} gdMakeArticleActive('%2',true);" )
.arg( id, dictId );
onJsActiveArticleChanged( id );
ui.definition->page()->runJavaScript( script );
setActiveArticleId( dictId );
right panel founded dictionaries
2021-10-05 01:23:30 +00:00
}
Set current article at most once in loadFinished() When the current article is set and the user expands or collapses optional parts (e.g. via the Ctrl+* shortcut), ArticleView::setCurrentArticle() is called twice from ArticleView::loadFinished(). Furthermore, the window scroll position is restored before the second jump. This is wasteful. Move the higher-priority setCurrentArticle() call up and, if it succeeds, skip the other call and the scrolling. I have measured the time spent running the affected code fragment on my GNU/Linux system before and at this commit. When the loaded articles are not very large, the performance gain of this commit is only about 1 ms. However, when one of the displayed articles was huge (the "United States" English Wikipedia article), the time went from 120 ms to 5 ms.
2022-05-24 11:47:15 +00:00
return true;
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
}
Select an enire text of the current article (Ctrl+Shift+A). Plus a context menu for that as well.
2013-01-18 14:37:24 +00:00
void ArticleView::selectCurrentArticle()
{
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->runJavaScript(
imp. : "select current article" ,if not in the view.scroll into view.
2022-01-20 13:59:47 +00:00
QString( "gdSelectArticle( '%1' );var elem=document.getElementById('%2'); if(elem!=undefined){elem.scrollIntoView(true);}" ).arg( getActiveArticleId() ,getCurrentArticle()) );
Select an enire text of the current article (Ctrl+Shift+A). Plus a context menu for that as well.
2013-01-18 14:37:24 +00:00
}
fix code review indent issue
2022-03-30 15:08:24 +00:00
void ArticleView::isFramedArticle( QString const & ca, const std::function< void( bool ) > & callback )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
{
fix code review indent issue
2022-03-30 15:08:24 +00:00
if( ca.isEmpty() )
callback( false );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
make isFramedArticle async, and remvoe runJavaScriptSync()
2022-03-27 15:05:45 +00:00
ui.definition->page()->runJavaScript( QString( "!!document.getElementById('gdexpandframe-%1');" ).arg( ca.mid( 7 ) ),
fix code review indent issue
2022-03-30 15:08:24 +00:00
[ callback ]( const QVariant & res ) { callback( res.toBool() ); } );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
bool ArticleView::isExternalLink( QUrl const & url )
{
improve: handle invalid resource url such as bres://upload.wikimedia....
2022-01-11 14:20:38 +00:00
return Utils::isExternalLink(url);
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
void ArticleView::tryMangleWebsiteClickedUrl( QUrl & url, Contexts & contexts )
{
Play audio files from websites. Here we also add Google as a web dictionary as an initial website example. Sounds there work just fine.
2010-05-29 11:33:04 +00:00
// Don't try mangling audio urls, even if they are from the framed websites
fix code review indent issue
2022-03-30 15:08:24 +00:00
if( ( url.scheme() == "http" || url.scheme() == "https" ) && !Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
{
// Maybe a link inside a website was clicked?
QString ca = getCurrentArticle();
fix: remove useless code .
2022-07-08 14:13:40 +00:00
isFramedArticle( ca, []( bool framed ){} );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
}
+! Save and restore scroll offsets programatically - this helps when websites are involved, as they expand after WebKit restores the position.
2009-05-29 22:04:43 +00:00
void ArticleView::saveHistoryUserData()
{
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->setProperty("sx", ui.definition->page()->scrollPosition().x());
ui.definition->setProperty("sy", ui.definition->page()->scrollPosition().y());
+! Save and restore scroll offsets programatically - this helps when websites are involved, as they expand after WebKit restores the position.
2009-05-29 22:04:43 +00:00
}
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
void ArticleView::load( QUrl const & url )
{
saveHistoryUserData();
ui.definition->load( url );
}
* Rework the way temporary files are handled so they'd work under Windows without locking issues.
2009-02-08 21:54:19 +00:00
void ArticleView::cleanupTemp()
{
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
QSet< QString >::iterator it = desktopOpenedTempFiles.begin();
while( it != desktopOpenedTempFiles.end() )
* Rework the way temporary files are handled so they'd work under Windows without locking issues.
2009-02-08 21:54:19 +00:00
{
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
if( QFile::remove( *it ) )
it = desktopOpenedTempFiles.erase( it );
else
++it;
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
}
* Rework the way temporary files are handled so they'd work under Windows without locking issues.
2009-02-08 21:54:19 +00:00
}
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
bool ArticleView::handleF3( QObject * /*obj*/, QEvent * ev )
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
{
A little refactoring of keys handling (old solution don't work correctly in Qt5)
2014-04-23 13:46:48 +00:00
if ( ev->type() == QEvent::ShortcutOverride
|| ev->type() == QEvent::KeyPress )
{
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
QKeyEvent * ke = static_cast<QKeyEvent *>( ev );
if ( ke->key() == Qt::Key_F3 && isSearchOpened() ) {
if ( !ke->modifiers() )
{
A little refactoring of keys handling (old solution don't work correctly in Qt5)
2014-04-23 13:46:48 +00:00
if( ev->type() == QEvent::KeyPress )
on_searchNext_clicked();
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
ev->accept();
return true;
}
if ( ke->modifiers() == Qt::ShiftModifier )
{
A little refactoring of keys handling (old solution don't work correctly in Qt5)
2014-04-23 13:46:48 +00:00
if( ev->type() == QEvent::KeyPress )
on_searchPrevious_clicked();
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
ev->accept();
return true;
}
Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated Also fixed #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 21:04:45 +00:00
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
if ( ke->key() == Qt::Key_F3 && ftsSearchIsOpened )
{
if ( !ke->modifiers() )
{
A little refactoring of keys handling (old solution don't work correctly in Qt5)
2014-04-23 13:46:48 +00:00
if( ev->type() == QEvent::KeyPress )
on_ftsSearchNext_clicked();
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
ev->accept();
return true;
}
if ( ke->modifiers() == Qt::ShiftModifier )
{
A little refactoring of keys handling (old solution don't work correctly in Qt5)
2014-04-23 13:46:48 +00:00
if( ev->type() == QEvent::KeyPress )
on_ftsSearchPrevious_clicked();
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
ev->accept();
return true;
}
Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated Also fixed #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 21:04:45 +00:00
}
}
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
return false;
}
bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
{
make isFramedArticle async, and remvoe runJavaScriptSync()
2022-03-27 15:05:45 +00:00
#ifdef Q_OS_MAC
make ArticleView::hasSound() async
2022-03-27 14:22:42 +00:00
fix more indent issue
2022-03-30 15:10:37 +00:00
if( ev->type() == QEvent::NativeGesture )
{
qDebug() << "it's a Native Gesture!";
// handle Qt::ZoomNativeGesture Qt::SmartZoomNativeGesture here
// ignore swipe left/right.
// QWebEngine can handle Qt::SmartZoomNativeGesture.
}
make isFramedArticle async, and remvoe runJavaScriptSync()
2022-03-27 15:05:45 +00:00
#else
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
if( ev->type() == QEvent::Gesture )
{
Gestures::GestureResult result;
QPoint pt;
bool handled = Gestures::handleGestureEvent( obj, ev, result, pt );
if( handled )
{
if( result == Gestures::ZOOM_IN )
zoomIn();
else
if( result == Gestures::ZOOM_OUT )
zoomOut();
else
if( result == Gestures::SWIPE_LEFT )
back();
else
if( result == Gestures::SWIPE_RIGHT )
forward();
else
if( result == Gestures::SWIPE_UP || result == Gestures::SWIPE_DOWN )
{
int delta = result == Gestures::SWIPE_UP ? -120 : 120;
QWidget *widget = static_cast< QWidget * >( obj );
improve: replace all the deprecated method before 5.15
2022-01-08 13:16:22 +00:00
QPoint angleDelta(0, delta);
QPoint pixelDetal;
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
QWidget *child = widget->childAt( widget->mapFromGlobal( pt ) );
if( child )
{
improve: replace all the deprecated method before 5.15
2022-01-08 13:16:22 +00:00
QWheelEvent whev( child->mapFromGlobal( pt ), pt, pixelDetal,angleDelta, Qt::NoButton, Qt::NoModifier,Qt::NoScrollPhase,false);
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
qApp->sendEvent( child, &whev );
}
else
{
improve: replace all the deprecated method before 5.15
2022-01-08 13:16:22 +00:00
QWheelEvent whev( widget->mapFromGlobal( pt ), pt,pixelDetal, angleDelta,Qt::NoButton, Qt::NoModifier,Qt::NoScrollPhase,false );
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
qApp->sendEvent( widget, &whev );
}
}
}
return handled;
}
make isFramedArticle async, and remvoe runJavaScriptSync()
2022-03-27 15:05:45 +00:00
#endif
Handle some touch screen gestures in article view window
2014-02-04 13:35:42 +00:00
if( ev->type() == QEvent::MouseMove )
{
if( Gestures::isFewTouchPointsPresented() )
{
ev->accept();
return true;
}
}
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
if ( handleF3( obj, ev ) )
{
return true;
}
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
if ( obj == ui.definition )
{
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
if ( ev->type() == QEvent::MouseButtonPress ) {
QMouseEvent * event = static_cast< QMouseEvent * >( ev );
if ( event->button() == Qt::XButton1 ) {
back();
return true;
}
if ( event->button() == Qt::XButton2 ) {
forward();
return true;
}
}
else
fix issue mentioned in https://github.com/goldendict/goldendict/issues/1393#issuecomment-993716654
2021-12-15 15:43:03 +00:00
if ( ev->type() == QEvent::KeyPress || ev->type ()==QEvent::ShortcutOverride)
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
{
QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
*! No typing event can occur if Ctrl, Alt or Shift is pressed.
2009-05-14 20:43:32 +00:00
if ( keyEvent->modifiers() &
Keys with Shift pressed are to be interpreted as typing events (undoes a change by jdepetris)
2011-05-08 21:24:41 +00:00
( Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier ) )
*! No typing event can occur if Ctrl, Alt or Shift is pressed.
2009-05-14 20:43:32 +00:00
return false; // A non-typing modifier is pressed
improvement: refactor code,move ignoreKeyEvent method to utils.
2022-01-14 14:58:19 +00:00
if ( Utils::ignoreKeyEvent(keyEvent)||
Fixed activating link with <Enter>; fixed FullTextSearchDialog tab order; fixed switching between UI elements via shortcuts.
2014-05-11 11:52:25 +00:00
keyEvent->key() == Qt::Key_Return ||
improvement: refactor code,move ignoreKeyEvent method to utils.
2022-01-14 14:58:19 +00:00
keyEvent->key() == Qt::Key_Enter )
*! Some fixes for "type-to-search" feature.
2009-05-12 15:54:37 +00:00
return false; // Those key have other uses than to start typing
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
QString text = keyEvent->text();
if ( text.size() )
{
emit typingEvent( text );
return true;
}
}
fix: mouse scroll zoom in out
2022-02-17 16:39:24 +00:00
else if( ev->type() == QEvent::Wheel )
{
QWheelEvent * pe = static_cast< QWheelEvent * >( ev );
if( pe->modifiers().testFlag( Qt::ControlModifier ) )
{
if( pe->angleDelta().y() > 0 )
{
zoomIn();
}
else
{
zoomOut();
}
}
}
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
}
else
return QFrame::eventFilter( obj, ev );
return false;
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
QString ArticleView::getMutedForGroup( unsigned group )
{
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() )
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
{
// Dictionary bar is active -- mute the muted dictionaries
Instances::Group const * groupInstance = groups.findGroup( group );
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
// Find muted dictionaries for current group
Config::Group const * grp = cfg.getGroup( group );
Config::MutedDictionaries const * mutedDictionaries;
if( group == Instances::Group::AllGroupId )
mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
else
mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : 0;
if( !mutedDictionaries )
return QString();
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
QStringList mutedDicts;
if ( groupInstance )
{
for( unsigned x = 0; x < groupInstance->dictionaries.size(); ++x )
{
QString id = QString::fromStdString(
groupInstance->dictionaries[ x ]->getId() );
Implement dictionary bar for scan popup. This dictionary bar operates completely separately from the dictionary bar in the main window, and has its own set of muted dictionaries. The bar is on the right of the window by default, but can be moved once the window is pinned down. Windows users, please test, this may have some Windows-specific problems.
2010-03-30 20:15:55 +00:00
if ( mutedDictionaries->contains( id ) )
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
mutedDicts.append( id );
}
}
if ( mutedDicts.size() )
return mutedDicts.join( "," );
}
return QString();
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
code clean: format
2022-01-01 10:19:11 +00:00
QStringList ArticleView::getMutedDictionaries(unsigned group) {
if (dictionaryBarToggled && dictionaryBarToggled->isChecked()) {
// Dictionary bar is active -- mute the muted dictionaries
Instances::Group const *groupInstance = groups.findGroup(group);
// Find muted dictionaries for current group
Config::Group const *grp = cfg.getGroup(group);
Config::MutedDictionaries const *mutedDictionaries;
if (group == Instances::Group::AllGroupId)
mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
else
mutedDictionaries = grp ? (popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries) : 0;
if (!mutedDictionaries)
return QStringList();
QStringList mutedDicts;
if (groupInstance) {
for (unsigned x = 0; x < groupInstance->dictionaries.size(); ++x) {
QString id = QString::fromStdString(groupInstance->dictionaries[x]->getId());
if (mutedDictionaries->contains(id))
mutedDicts.append(id);
}
}
return mutedDicts;
}
return QStringList();
found in dictionaries list widgets
2021-10-03 11:28:26 +00:00
}
webkit to webengine
2021-07-06 13:01:50 +00:00
void ArticleView::linkHovered ( const QString & link )
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
{
QString msg;
Remove Url::Class, add Qt4x5::Url::ensureLeadingSlash() and fix all related
2013-05-31 04:20:25 +00:00
QUrl url(link);
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
if ( url.scheme() == "bres" )
{
msg = tr( "Resource" );
}
else
if ( url.scheme() == "gdau" || Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
{
msg = tr( "Audio" );
}
else
Some more TTS from Timon Wong
2013-04-24 16:01:44 +00:00
if ( url.scheme() == "gdtts" )
{
msg = tr( "TTS Voice" );
}
else
Images size limit for dsl dictionaries
2012-12-07 11:59:29 +00:00
if ( url.scheme() == "gdpicture" )
{
msg = tr( "Picture" );
}
else
DSL: Support video resources
2013-06-22 16:36:25 +00:00
if ( url.scheme() == "gdvideo" )
{
if ( url.path().isEmpty() )
{
msg = tr( "Video" );
}
else
{
QString path = url.path();
if ( path.startsWith( '/' ) )
{
path = path.mid( 1 );
}
msg = tr( "Video: %1" ).arg( path );
}
}
else
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
if (url.scheme() == "gdlookup" || url.scheme().compare( "bword" ) == 0)
{
QString def = url.path();
if (def.startsWith("/"))
{
def = def.mid( 1 );
}
Show target dictionary name in status line if link points to other dictionary
2012-11-26 13:13:56 +00:00
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( url, "dict" ) )
Show target dictionary name in status line if link points to other dictionary
2012-11-26 13:13:56 +00:00
{
// Link to other dictionary
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString dictName( Utils::Url::queryItemValue( url, "dict" ) );
Show target dictionary name in status line if link points to other dictionary
2012-11-26 13:13:56 +00:00
if( !dictName.isEmpty() )
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
msg = tr( "Definition from dictionary \"%1\": %2" ).arg( dictName , def );
Show target dictionary name in status line if link points to other dictionary
2012-11-26 13:13:56 +00:00
}
if( msg.isEmpty() )
Show #link as a tooltip instead of empty "Definition: " Internal links in MediaWiki articles don't lead to word definitions, so the "Definition: " prefix is not correct for them. It also does not provide any information and is largely useless. Perhaps the actual footnote text should be displayed in the tooltip, but this requires distinguishing them from citations/references and backlinks.
2018-02-21 10:48:11 +00:00
{
if( def.isEmpty() && url.hasFragment() )
msg = '#' + url.fragment(); // this must be a citation, footnote or backlink
else
msg = tr( "Definition: %1").arg( def );
}
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
}
else
{
msg = link;
}
emit statusBarMessage( msg );
}
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
void ArticleView::attachWebChannelToHtml() {
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
// set the web channel to be used by the page
// see http://doc.qt.io/qt-5/qwebenginepage.html#setWebChannel
ui.definition->page()->setWebChannel(channel, QWebEngineScript::MainWorld);
webkit to webengine
2021-07-06 13:01:50 +00:00
add javascript qt object to html(used to communicate between html and c++) add jquery framework .
2021-12-19 10:37:27 +00:00
// register QObjects to be exposed to JavaScript
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
channel->registerObject(QStringLiteral("articleview"), agent);
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
}
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
void ArticleView::linkClicked( QUrl const & url_ )
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
{
Lock jump on links while Alt key is pressed
2017-03-14 14:47:38 +00:00
Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
// Lock jump on links while Alt key is pressed
if( kmod & Qt::AltModifier )
return;
Remove Url::Class, add Qt4x5::Url::ensureLeadingSlash() and fix all related
2013-05-31 04:20:25 +00:00
QUrl url( url_ );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
Contexts contexts;
tryMangleWebsiteClickedUrl( url, contexts );
Ctrl/Shift-Click on links opens them in a new tab. This is in sync with Ctrl/Shift-DoubleClick and Ctrl/Shift-Enter behaviors that we already have. And this is in sync with browsers.
2011-07-06 06:53:42 +00:00
if ( !popupView &&
( ui.definition->isMidButtonPressed() ||
opt: do not allow open audio link in new tab
2022-07-10 02:09:58 +00:00
( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) ) && !isAudioLink(url) )
+ Clicking a link with middle mouse button opens it in a new tab.
2009-10-22 11:38:11 +00:00
{
Ctrl/Shift-Click on links opens them in a new tab. This is in sync with Ctrl/Shift-DoubleClick and Ctrl/Shift-Enter behaviors that we already have. And this is in sync with browsers.
2011-07-06 06:53:42 +00:00
// Mid button or Control/Shift is currently pressed - open the link in new tab
fix:middle mouse click open in new tab
2022-03-03 16:17:21 +00:00
ui.definition->resetMidButtonPressed();
+ Clicking a link with middle mouse button opens it in a new tab.
2009-10-22 11:38:11 +00:00
emit openLinkInNewTab( url, ui.definition->url(), getCurrentArticle(), contexts );
}
else
openLink( url, ui.definition->url(), getCurrentArticle(), contexts );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
}
fix:single click on link,the emulated db click will still work on new page
2022-01-14 00:19:49 +00:00
void ArticleView::linkClickedInHtml( QUrl const & url_ )
{
emit ui.definition->linkClickedInHtml(url_);
fix:gdau link show blocked in devtool network
2022-03-16 14:29:04 +00:00
if(!url_.isEmpty())
{
linkClicked( url_ );
}
fix:single click on link,the emulated db click will still work on new page
2022-01-14 00:19:49 +00:00
}
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
void ArticleView::openLink( QUrl const & url, QUrl const & ref,
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QString const & scrollTo,
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
Contexts const & contexts_ )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
fix:when auto pronounce enabled. the sentence audio can not be played.
2022-02-04 13:19:32 +00:00
audioPlayer->stop();
single click to open external link in external browser
2021-12-29 15:28:26 +00:00
qDebug() << "open link url:" << url;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
refactor getqueryword
2022-06-07 00:05:49 +00:00
auto [valid, word] = Utils::Url::getQueryWord( url );
if( valid && word.isEmpty() )
fix: invalid gdlookup url should be forbidden.
2022-05-27 15:10:50 +00:00
{
// invalid gdlookup url.
return;
}
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
Contexts contexts( contexts_ );
Images size limit for dsl dictionaries
2012-12-07 11:59:29 +00:00
if( url.scheme().compare( "gdpicture" ) == 0 )
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
load( url );
Images size limit for dsl dictionaries
2012-12-07 11:59:29 +00:00
else
support mdex builtin link entry:
2022-06-07 00:11:10 +00:00
if ( url.scheme().compare( "bword" ) == 0 || url.scheme().compare( "entry" ) == 0 )
+! Correctly handle bword:// links when they contain non-ascii letters and dots by independently decoding IDN for each part.
2009-08-31 14:27:19 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
Full-text search: Fix handling of some DSL headwords
2014-04-21 16:20:24 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" )
clean code: QString::SkipEmptyParts=>Qt::SkipEmptyParts
2021-12-29 14:29:06 +00:00
.split( ",", Qt::SkipEmptyParts );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix: invalid gdlookup url should be forbidden.
2022-05-27 15:10:50 +00:00
showDefinition( word, dictsList, QRegExp(), getGroup( ref ), false );
Full-text search: Fix handling of some DSL headwords
2014-04-21 16:20:24 +00:00
}
else
fix: invalid gdlookup url should be forbidden.
2022-05-27 15:10:50 +00:00
showDefinition( word,
Full-text search: Fix handling of some DSL headwords
2014-04-21 16:20:24 +00:00
getGroup( ref ), scrollTo, contexts );
+! Correctly handle bword:// links when they contain non-ascii letters and dots by independently decoding IDN for each part.
2009-08-31 14:27:19 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
else
if ( url.scheme() == "gdlookup" ) // Plain html links inherit gdlookup scheme
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
if ( url.hasFragment() )
{
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->runJavaScript(
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
}
else
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
Full-text search: Fix handling of some DSL headwords
2014-04-21 16:20:24 +00:00
{
// Specific dictionary group from full-text search
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" )
clean code: QString::SkipEmptyParts=>Qt::SkipEmptyParts
2021-12-29 14:29:06 +00:00
.split( ",", Qt::SkipEmptyParts );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
showDefinition( url.path().mid( 1 ), dictsList, QRegExp(), getGroup( ref ), false );
Full-text search: Fix handling of some DSL headwords
2014-04-21 16:20:24 +00:00
return;
}
Handle "dict" attribute in "ref" tag for dsl dictionaries
2012-11-24 20:30:32 +00:00
QString newScrollTo( scrollTo );
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( url, "dict" ) )
Handle "dict" attribute in "ref" tag for dsl dictionaries
2012-11-24 20:30:32 +00:00
{
// Link to other dictionary
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString dictName( Utils::Url::queryItemValue( url, "dict" ) );
Handle "dict" attribute in "ref" tag for dsl dictionaries
2012-11-24 20:30:32 +00:00
for( unsigned i = 0; i < allDictionaries.size(); i++ )
{
if( dictName.compare( QString::fromUtf8( allDictionaries[ i ]->getName().c_str() ) ) == 0 )
{
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
newScrollTo = scrollToFromDictionaryId( QString::fromUtf8( allDictionaries[ i ]->getId().c_str() ) );
Handle "dict" attribute in "ref" tag for dsl dictionaries
2012-11-24 20:30:32 +00:00
break;
}
}
}
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( url, "gdanchor" ) )
contexts[ "gdanchor" ] = Utils::Url::queryItemValue( url, "gdanchor" );
MDict: Handle inter-article anchors
2015-10-28 19:56:58 +00:00
fix issue mentioned in https://github.com/goldendict/goldendict/issues/1393#issuecomment-993716654
2021-12-15 15:43:03 +00:00
showDefinition( word,
Handle "dict" attribute in "ref" tag for dsl dictionaries
2012-11-24 20:30:32 +00:00
getGroup( ref ), newScrollTo, contexts );
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
else
DSL: Support video resources
2013-06-22 16:36:25 +00:00
if ( url.scheme() == "bres" || url.scheme() == "gdau" || url.scheme() == "gdvideo" ||
Play audio files from websites. Here we also add Google as a web dictionary as an initial website example. Sounds there work just fine.
2010-05-29 11:33:04 +00:00
Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
// Download it
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// Clear any pending ones
resourceDownloadRequests.clear();
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
resourceDownloadUrl = url;
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
Play audio files from websites. Here we also add Google as a web dictionary as an initial website example. Sounds there work just fine.
2010-05-29 11:33:04 +00:00
if ( Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
{
sptr< Dictionary::DataRequest > req =
new Dictionary::WebMultimediaDownload( url, articleNetMgr );
resourceDownloadRequests.push_back( req );
connect( req.get(), SIGNAL( finished() ),
this, SLOT( resourceDownloadFinished() ) );
}
else
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
if ( url.scheme() == "gdau" && url.host() == "search" )
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
{
// Since searches should be limited to current group, we just do them
// here ourselves since otherwise we'd need to pass group id to netmgr
// and it should've been having knowledge of the current groups, too.
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
unsigned currentGroup = getGroup( ref );
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
std::vector< sptr< Dictionary::Class > > const * activeDicts = 0;
if ( groups.size() )
{
for( unsigned x = 0; x < groups.size(); ++x )
if ( groups[ x ].id == currentGroup )
{
activeDicts = &( groups[ x ].dictionaries );
break;
}
}
else
activeDicts = &allDictionaries;
if ( activeDicts )
Refactor resource downloading
2017-04-27 20:55:53 +00:00
{
Dsl: Add support for "#SOUND_DICTIONARY" directive
2017-07-09 17:15:35 +00:00
unsigned preferred = UINT_MAX;
if( url.hasFragment() )
{
// Find sound in the preferred dictionary
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString preferredName = Utils::Url::fragment( url );
Dsl: Add support for "#SOUND_DICTIONARY" directive
2017-07-09 17:15:35 +00:00
try
{
for( unsigned x = 0; x < activeDicts->size(); ++x )
{
if( preferredName.compare( QString::fromUtf8( (*activeDicts)[ x ]->getName().c_str() ) ) == 0 )
{
preferred = x;
sptr< Dictionary::DataRequest > req =
(*activeDicts)[ x ]->getResource(
url.path().mid( 1 ).toUtf8().data() );
resourceDownloadRequests.push_back( req );
if ( !req->isFinished() )
{
// Queued loading
connect( req.get(), SIGNAL( finished() ),
this, SLOT( resourceDownloadFinished() ) );
}
else
{
// Immediate loading
if( req->dataSize() > 0 )
{
// Resource already found, stop next search
resourceDownloadFinished();
return;
}
}
break;
}
}
}
catch( std::exception & e )
{
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("ERROR: %1").arg(e.what()),
10000, QPixmap(":/icons/error.svg"));
Dsl: Add support for "#SOUND_DICTIONARY" directive
2017-07-09 17:15:35 +00:00
}
}
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
for( unsigned x = 0; x < activeDicts->size(); ++x )
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
{
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
try
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
{
Dsl: Add support for "#SOUND_DICTIONARY" directive
2017-07-09 17:15:35 +00:00
if( x == preferred )
continue;
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
sptr< Dictionary::DataRequest > req =
(*activeDicts)[ x ]->getResource(
url.path().mid( 1 ).toUtf8().data() );
Refactor resource downloading
2017-04-27 20:55:53 +00:00
resourceDownloadRequests.push_back( req );
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
if ( !req->isFinished() )
{
A little optimization for resources search
2017-04-28 12:25:45 +00:00
// Queued loading
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
connect( req.get(), SIGNAL( finished() ),
this, SLOT( resourceDownloadFinished() ) );
}
A little optimization for resources search
2017-04-28 12:25:45 +00:00
else
{
// Immediate loading
if( req->dataSize() > 0 )
{
// Resource already found, stop next search
break;
}
}
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
}
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
catch( std::exception & e )
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
{
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("ERROR: %1").arg(e.what()),
10000, QPixmap(":/icons/error.svg"));
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
}
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
}
* Make "search" audio links be bound by the current group.
2009-02-06 16:19:05 +00:00
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
else
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// Normal resource download
QString contentType;
Use desktop services to open all types of files but the audio ones.
2009-02-08 14:40:26 +00:00
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
sptr< Dictionary::DataRequest > req =
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
articleNetMgr.getResource( url, contentType );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
if ( !req.get() )
{
// Request failed, fail
}
else
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
if ( req->isFinished() && req->dataSize() >= 0 )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// Have data ready, handle it
resourceDownloadRequests.push_back( req );
resourceDownloadFinished();
Use desktop services to open all types of files but the audio ones.
2009-02-08 14:40:26 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
return;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
else
if ( !req->isFinished() )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// Queue to be handled when done
Use desktop services to open all types of files but the audio ones.
2009-02-08 14:40:26 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
resourceDownloadRequests.push_back( req );
connect( req.get(), SIGNAL( finished() ),
this, SLOT( resourceDownloadFinished() ) );
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Use desktop services to open all types of files but the audio ones.
2009-02-08 14:40:26 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
if ( resourceDownloadRequests.empty() ) // No requests were queued
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict", tr( "The referenced resource doesn't exist." ) );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
return;
* Rework the way temporary files are handled so they'd work under Windows without locking issues.
2009-02-08 21:54:19 +00:00
}
*! Fix problems handling audio gdau searches when there are no groups. *! If article network manager fails to get the requested resource, check that and don't crash.
2009-04-25 21:04:49 +00:00
else
resourceDownloadFinished(); // Check any requests finished already
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
else
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
if ( url.scheme() == "gdprg" )
{
// Program. Run it.
QString id( url.host() );
for( Config::Programs::const_iterator i = cfg.programs.begin();
i != cfg.programs.end(); ++i )
{
if ( i->id == id )
{
// Found the corresponding program.
Add new program type - 'Prefix Match', which allows listing word matches as you type.
2011-06-04 21:35:09 +00:00
Programs::RunInstance * req = new Programs::RunInstance;
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
Add new program type - 'Prefix Match', which allows listing word matches as you type.
2011-06-04 21:35:09 +00:00
connect( req, SIGNAL(finished(QByteArray,QString)),
req, SLOT( deleteLater() ) );
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
Add new program type - 'Prefix Match', which allows listing word matches as you type.
2011-06-04 21:35:09 +00:00
QString error;
// Delete the request if it fails to start
if ( !req->start( *i, url.path().mid( 1 ), error ) )
{
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
delete req;
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict",
Add new program type - 'Prefix Match', which allows listing word matches as you type.
2011-06-04 21:35:09 +00:00
error );
}
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
return;
}
}
// Still here? No such program exists.
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict",
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
tr( "The referenced audio program doesn't exist." ) );
}
else
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
if ( url.scheme() == "gdtts" )
{
// TODO: Port TTS
Mac-specific: Adjust code for Qt5 build
2014-05-12 13:53:13 +00:00
#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
// Text to speech
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString md5Id = Utils::Url::queryItemValue( url, "engine" );
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
QString text( url.path().mid( 1 ) );
for ( Config::VoiceEngines::const_iterator i = cfg.voiceEngines.begin();
i != cfg.voiceEngines.end(); ++i )
{
QString itemMd5Id = QString( QCryptographicHash::hash(
i->id.toUtf8(),
Some more TTS from Timon Wong
2013-04-24 16:01:44 +00:00
QCryptographicHash::Md5 ).toHex() );
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
Some more TTS from Timon Wong
2013-04-24 16:01:44 +00:00
if ( itemMd5Id == md5Id )
{
Win-specific: Add volume and rate tuning for TTS, fix some errors
2013-04-26 13:41:39 +00:00
SpeechClient * speechClient = new SpeechClient( *i, this );
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
connect( speechClient, SIGNAL( finished() ), speechClient, SLOT( deleteLater() ) );
Some more TTS from Timon Wong
2013-04-24 16:01:44 +00:00
speechClient->tell( text );
Win-specific: Add TTS support for Windows (by Timon Wong)
2013-04-24 14:52:04 +00:00
break;
}
}
#endif
}
else
Properly support file:// external links in the articles.
2010-06-30 16:43:08 +00:00
if ( isExternalLink( url ) )
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
{
Properly support file:// external links in the articles.
2010-06-30 16:43:08 +00:00
// Use the system handler for the conventional external links
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
QDesktopServices::openUrl( url );
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QString & fileName )
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
{
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
return saveResource( url, ui.definition->url(), fileName );
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QUrl & ref, const QString & fileName )
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, fileName );
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
sptr< Dictionary::DataRequest > req;
Add "gdvideo://" scheme to saved resources
2017-04-27 15:05:28 +00:00
if( url.scheme() == "bres" || url.scheme() == "gico" || url.scheme() == "gdau" || url.scheme() == "gdvideo" )
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
{
if ( url.host() == "search" )
{
// Since searches should be limited to current group, we just do them
// here ourselves since otherwise we'd need to pass group id to netmgr
// and it should've been having knowledge of the current groups, too.
unsigned currentGroup = getGroup( ref );
std::vector< sptr< Dictionary::Class > > const * activeDicts = 0;
if ( groups.size() )
{
for( unsigned x = 0; x < groups.size(); ++x )
if ( groups[ x ].id == currentGroup )
{
activeDicts = &( groups[ x ].dictionaries );
break;
}
}
else
activeDicts = &allDictionaries;
if ( activeDicts )
{
DSL: Fix sound saving from preferred dictionary
2019-06-27 15:09:00 +00:00
unsigned preferred = UINT_MAX;
if( url.hasFragment() && url.scheme() == "gdau" )
{
// Find sound in the preferred dictionary
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString preferredName = Utils::Url::fragment( url );
DSL: Fix sound saving from preferred dictionary
2019-06-27 15:09:00 +00:00
for( unsigned x = 0; x < activeDicts->size(); ++x )
{
try
{
if( preferredName.compare( QString::fromUtf8( (*activeDicts)[ x ]->getName().c_str() ) ) == 0 )
{
preferred = x;
sptr< Dictionary::DataRequest > req =
(*activeDicts)[ x ]->getResource(
url.path().mid( 1 ).toUtf8().data() );
handler->addRequest( req );
if( req->isFinished() && req->dataSize() > 0 )
{
handler->downloadFinished();
return handler;
}
break;
}
}
catch( std::exception & e )
{
gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
(*activeDicts)[ x ]->getName().c_str() );
}
}
}
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
for( unsigned x = 0; x < activeDicts->size(); ++x )
{
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
try
{
DSL: Fix sound saving from preferred dictionary
2019-06-27 15:09:00 +00:00
if( x == preferred )
continue;
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
req = (*activeDicts)[ x ]->getResource(
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
handler->addRequest( req );
A little optimization for resources search
2017-04-28 12:25:45 +00:00
if( req->isFinished() && req->dataSize() > 0 )
{
// Resource already found, stop next search
break;
}
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
}
catch( std::exception & e )
{
Fix logging to file UTF-8 encoded messages
2013-11-16 18:34:09 +00:00
gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
Fix unhandled exceptions at resources loading
2013-10-18 12:50:29 +00:00
(*activeDicts)[ x ]->getName().c_str() );
}
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
}
}
}
else
{
// Normal resource download
QString contentType;
req = articleNetMgr.getResource( url, contentType );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Fix exception handling at article save
2013-10-18 14:32:58 +00:00
if( req.get() )
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
handler->addRequest( req );
Fix exception handling at article save
2013-10-18 14:32:58 +00:00
}
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
}
}
else
{
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
req = new Dictionary::WebMultimediaDownload( url, articleNetMgr );
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
handler->addRequest( req );
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( handler->isEmpty() ) // No requests were queued
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
{
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("ERROR: %1").arg(tr("The referenced resource doesn't exist.")),
10000, QPixmap(":/icons/error.svg"));
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
// Check already finished downloads
handler->downloadFinished();
return handler;
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
void ArticleView::updateMutedContents()
{
Remove Url::Class, add Qt4x5::Url::ensureLeadingSlash() and fix all related
2013-05-31 04:20:25 +00:00
QUrl currentUrl = ui.definition->url();
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
if ( currentUrl.scheme() != "gdlookup" )
return; // Weird url -- do nothing
unsigned group = getGroup( currentUrl );
if ( !group )
return; // No group in url -- do nothing
QString mutedDicts = getMutedForGroup( group );
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if ( Utils::Url::queryItemValue( currentUrl, "muted" ) != mutedDicts )
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
{
// The list has changed -- update the url
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::removeQueryItem( currentUrl, "muted" );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
if ( mutedDicts.size() )
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
Utils::Url::addQueryItem( currentUrl, "muted", mutedDicts );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
Refactor: extract ArticleView::load() This way it is clearer that the pages history is updated just before each navigation to a different page. The call to ArticleView::saveHistoryUserData() now occurs slightly later in ArticleView::showDefinition(). I don't think the intervening code can affect the current article or window position. So the reordering most likely does not affect application behavior.
2022-06-12 11:26:15 +00:00
load( currentUrl );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
//QApplication::setOverrideCursor( Qt::WaitCursor );
ui.definition->setCursor( Qt::WaitCursor );
}
}
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
bool ArticleView::canGoBack()
{
// First entry in a history is always an empty page,
// so we skip it.
return ui.definition->history()->currentItemIndex() > 1;
}
bool ArticleView::canGoForward()
{
return ui.definition->history()->canGoForward();
}
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
void ArticleView::setSelectionBySingleClick( bool set )
{
ui.definition->setSelectionBySingleClick( set );
}
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
void ArticleView::setDelayedHighlightText(QString const & text)
{
delayedHighlightText = text;
}
Don't allow navigating back to the empty initial pages.
2011-06-07 07:57:25 +00:00
void ArticleView::back()
{
// Don't allow navigating back to page 0, which is usually the initial
// empty page
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
if ( canGoBack() )
Don't allow navigating back to the empty initial pages.
2011-06-07 07:57:25 +00:00
{
saveHistoryUserData();
fix: when history forward/back ,the founded dictionary does not change fixed #184
2022-11-04 13:23:42 +00:00
currentActiveDictIds.clear();
historyMode = true;
Don't allow navigating back to the empty initial pages.
2011-06-07 07:57:25 +00:00
ui.definition->back();
}
}
void ArticleView::forward()
{
saveHistoryUserData();
fix: when history forward/back ,the founded dictionary does not change fixed #184
2022-11-04 13:23:42 +00:00
currentActiveDictIds.clear();
historyMode = true;
Don't allow navigating back to the empty initial pages.
2011-06-07 07:57:25 +00:00
ui.definition->forward();
}
Always jump to current article before reloading MainWindow calls ArticleView::reload() when the group list is updated. This updating may add/remove/reorder dictionaries in the active group. MainWindow also calls ArticleView::reload() when the display or addon style changes. In both of the above scenarios uncontrolled jumps and current article change can occur (see also the parent commit message). Move setting articleToJump from above the only ArticleView's reload() call into ArticleView::reload() itself.
2022-06-11 17:57:52 +00:00
void ArticleView::reload()
{
ui.definition->reload();
}
fix code review indent issue
2022-03-30 15:08:24 +00:00
void ArticleView::hasSound( const std::function< void( bool ) > & callback )
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
{
fix: F12 inspect windows open on the first time
2022-06-15 00:12:27 +00:00
ui.definition->page()->runJavaScript( "if(typeof(gdAudioLinks)!=\"undefined\") gdAudioLinks.first",
fix code review indent issue
2022-03-30 15:08:24 +00:00
[ callback ]( const QVariant & v )
{
bool has = false;
if( v.type() == QVariant::String )
has = !v.toString().isEmpty();
callback( has );
} );
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
}
fix conflict
2021-12-13 14:45:16 +00:00
//use webengine javascript to playsound
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
void ArticleView::playSound()
{
imp. revert the playsound in the toolbar to use the builtin goldendict engine .
2022-01-29 03:32:44 +00:00
QString variable = " (function(){ var link=gdAudioLinks[gdAudioLinks.current]; "
found dictionaries panel update
2021-11-24 14:38:37 +00:00
" if(link==undefined){ "
" link=gdAudioLinks.first; "
" } "
imp. revert the playsound in the toolbar to use the builtin goldendict engine .
2022-01-29 03:32:44 +00:00
" return link;})(); ";
clean code: remove comment
2022-01-31 00:42:36 +00:00
make ArticleView::hasSound() async
2022-03-27 14:22:42 +00:00
ui.definition->page()->runJavaScript(variable,[this](const QVariant & result){
if (result.type() == QVariant::String) {
QString soundScript = result.toString();
if (!soundScript.isEmpty())
openLink(QUrl::fromEncoded(soundScript.toUtf8()), ui.definition->url());
}
});
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
}
fix code review indent issue
2022-03-30 15:08:24 +00:00
void ArticleView::toHtml( const std::function< void( QString & ) > & callback )
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
{
fix code review indent issue
2022-03-30 15:08:24 +00:00
ui.definition->page()->toHtml(
[ = ]( const QString & content )
{
QString html = content;
callback( html );
} );
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
}
change function declarition
2021-08-15 03:05:38 +00:00
void ArticleView::setHtml(const QString& content,const QUrl& baseUrl){
connect reply content to article view
2021-08-14 07:25:10 +00:00
ui.definition->page()->setHtml(content,baseUrl);
}
change to setcontent
2021-08-21 01:41:40 +00:00
void ArticleView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl ){
ui.definition->page()->setContent(data,mimeType,baseUrl);
}
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
QString ArticleView::getTitle()
{
webkit to webengine
2021-07-06 13:01:50 +00:00
return ui.definition->page()->title();
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
}
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
Config::InputPhrase ArticleView::getPhrase() const
{
const QUrl url = ui.definition->url();
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
return Config::InputPhrase( Utils::Url::queryItemValue( url, "word" ),
Utils::Url::queryItemValue( url, "punctuation_suffix" ) );
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
}
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
void ArticleView::print( QPrinter * printer ) const
{
fix:qt6.2 printer preview
2022-03-12 10:12:17 +00:00
QEventLoop loop;
bool result;
auto printPreview = [ & ]( bool success )
{
result = success;
loop.quit();
};
fix:qt6.2 print preview
2022-03-29 12:34:41 +00:00
#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
fix:qt6.2 printer preview
2022-03-12 10:12:17 +00:00
ui.definition->page()->print( printer, std::move( printPreview ) );
fix:qt6.2 print preview
2022-03-29 12:34:41 +00:00
#else
connect( ui.definition, &QWebEngineView::printFinished, &loop, std::move( printPreview ) );
ui.definition->print( printer );
#endif
fix:qt6.2 printer preview
2022-03-12 10:12:17 +00:00
loop.exec();
if( !result )
{
qDebug() << "print failed";
}
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void ArticleView::contextMenuRequested( QPoint const & pos )
{
// Is that a link? Is there a selection?
remove dead code
2021-09-22 04:01:17 +00:00
QWebEnginePage* r=ui.definition->page();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
QMenu menu( this );
QAction * followLink = 0;
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QAction * followLinkExternal = 0;
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
QAction * followLinkNewTab = 0;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
QAction * lookupSelection = 0;
add 'send to anki' function users can configure the ankiconnect to use together with anki
2022-05-21 06:03:26 +00:00
QAction * sendToAnkiAction = 0 ;
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
QAction * lookupSelectionGr = 0;
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
QAction * lookupSelectionNewTab = 0;
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
QAction * lookupSelectionNewTabGr = 0;
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
QAction * maxDictionaryRefsAction = 0;
Add word to history through context menu
2012-09-12 14:11:30 +00:00
QAction * addWordToHistoryAction = 0;
Add tab header to history via contex menu
2012-09-15 13:24:04 +00:00
QAction * addHeaderToHistoryAction = 0;
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
QAction * sendWordToInputLineAction = 0;
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
QAction * saveImageAction = 0;
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
QAction * saveSoundAction = 0;
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
QAction * saveBookmark = 0;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
const QWebEngineContextMenuData * menuData = &(r->contextMenuData());
#else
QWebEngineContextMenuRequest * menuData = ui.definition->lastContextMenuRequest();
#endif
QUrl targetUrl(menuData->linkUrl());
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
Contexts contexts;
tryMangleWebsiteClickedUrl( targetUrl, contexts );
cors support
2021-12-29 12:09:29 +00:00
if ( !targetUrl.isEmpty() )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
if ( !isExternalLink( targetUrl ) )
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
{
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
followLink = new QAction( tr( "&Open Link" ), &menu );
menu.addAction( followLink );
+! Add support for clipboard copying operations in article views.
2009-04-03 21:57:23 +00:00
opt: do not allow open audio link in new tab
2022-07-10 02:09:58 +00:00
if( !popupView && !isAudioLink( targetUrl ) )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
{
high dpi:change icon reference in code from png to svg.
2022-01-24 14:23:38 +00:00
followLinkNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
tr( "Open Link in New &Tab" ), &menu );
menu.addAction( followLinkNewTab );
}
}
+! Add support for clipboard copying operations in article views.
2009-04-03 21:57:23 +00:00
cors support
2021-12-29 12:09:29 +00:00
if ( isExternalLink( targetUrl ) )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
{
followLinkExternal = new QAction( tr( "Open Link in &External Browser" ), &menu );
menu.addAction( followLinkExternal );
webkit to webengine
2021-07-06 13:01:50 +00:00
menu.addAction( ui.definition->pageAction( QWebEnginePage::CopyLinkToClipboard ) );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
right menu context
2022-01-02 08:30:16 +00:00
QUrl imageUrl;
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
if( !popupView && menuData->mediaType ()==QWebEngineContextMenuData::MediaTypeImage)
#else
if( !popupView && menuData->mediaType ()==QWebEngineContextMenuRequest::MediaType::MediaTypeImage)
#endif
right menu context
2022-01-02 08:30:16 +00:00
{
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
imageUrl = menuData->mediaUrl ();
right menu context
2022-01-02 08:30:16 +00:00
if( !imageUrl.isEmpty() )
{
menu.addAction( ui.definition->pageAction( QWebEnginePage::CopyImageToClipboard ) );
saveImageAction = new QAction( tr( "Save &image..." ), &menu );
menu.addAction( saveImageAction );
}
}
opt: do not allow open audio link in new tab
2022-07-10 02:09:58 +00:00
if( !popupView && isAudioLink( targetUrl ) )
right menu context
2022-01-02 08:30:16 +00:00
{
saveSoundAction = new QAction( tr( "Save s&ound..." ), &menu );
menu.addAction( saveSoundAction );
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
QString selectedText = ui.definition->selectedText();
opt: right context menu ,remove non-sense characters like punctuation and space and symbols
2022-05-29 04:26:39 +00:00
QString text = Utils::trimNonChar( selectedText );
+! Don't add options to translate the selected word in the article's context menu if the selection size is larger or equal to 60 symbols. This fixes overblown menus when there's a large selection present.
2009-09-08 20:31:31 +00:00
Don't show some context menu items for selection with spaces only
2017-04-24 14:41:07 +00:00
if ( text.size() && text.size() < 60 )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
+! Don't add options to translate the selected word in the article's context menu if the selection size is larger or equal to 60 symbols. This fixes overblown menus when there's a large selection present.
2009-09-08 20:31:31 +00:00
// We don't prompt for selections larger or equal to 60 chars, since
// it ruins the menu and it's hardly a single word anyway.
RTL languages support for tab and main window header and article context menu
2013-07-06 21:45:13 +00:00
if( text.isRightToLeft() )
{
text.insert( 0, (ushort)0x202E ); // RLE, Right-to-Left Embedding
text.append( (ushort)0x202C ); // PDF, POP DIRECTIONAL FORMATTING
}
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
lookupSelection = new QAction( tr( "&Look up \"%1\"" ).
RTL languages support for tab and main window header and article context menu
2013-07-06 21:45:13 +00:00
arg( text ),
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
&menu );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
menu.addAction( lookupSelection );
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
if ( !popupView )
{
high dpi:change icon reference in code from png to svg.
2022-01-24 14:23:38 +00:00
lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
tr( "Look up \"%1\" in &New Tab" ).
RTL languages support for tab and main window header and article context menu
2013-07-06 21:45:13 +00:00
arg( text ),
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
&menu );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
menu.addAction( lookupSelectionNewTab );
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
sendWordToInputLineAction = new QAction( tr( "Send \"%1\" to input line" ).
RTL languages support for tab and main window header and article context menu
2013-07-06 21:45:13 +00:00
arg( text ),
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
&menu );
menu.addAction( sendWordToInputLineAction );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
}
+! Add support for clipboard copying operations in article views.
2009-04-03 21:57:23 +00:00
Add word to history via context menu from ScapPopup window
2012-09-16 10:30:14 +00:00
addWordToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).
RTL languages support for tab and main window header and article context menu
2013-07-06 21:45:13 +00:00
arg( text ),
Add word to history via context menu from ScapPopup window
2012-09-16 10:30:14 +00:00
&menu );
menu.addAction( addWordToHistoryAction );
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
Instances::Group const * altGroup =
( groupComboBox && groupComboBox->getCurrentGroup() != getGroup( ui.definition->url() ) ) ?
groups.findGroup( groupComboBox->getCurrentGroup() ) : 0;
if ( altGroup )
{
QIcon icon = altGroup->icon.size() ? QIcon( ":/flags/" + altGroup->icon ) :
QIcon();
-! Remove duplicate accelerator key.
2009-05-24 16:40:53 +00:00
lookupSelectionGr = new QAction( icon, tr( "Look up \"%1\" in %2" ).
Don't show some context menu items for selection with spaces only
2017-04-24 14:41:07 +00:00
arg( text ).
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
arg( altGroup->name ), &menu );
menu.addAction( lookupSelectionGr );
if ( !popupView )
{
high dpi:change icon reference in code from png to svg.
2022-01-24 14:23:38 +00:00
lookupSelectionNewTabGr = new QAction( QIcon( ":/icons/addtab.svg" ),
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
tr( "Look up \"%1\" in %2 in &New Tab" ).
Don't show some context menu items for selection with spaces only
2017-04-24 14:41:07 +00:00
arg( text ).
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
arg( altGroup->name ), &menu );
menu.addAction( lookupSelectionNewTabGr );
}
}
+! Don't add options to translate the selected word in the article's context menu if the selection size is larger or equal to 60 symbols. This fixes overblown menus when there's a large selection present.
2009-09-08 20:31:31 +00:00
}
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
if(text.size())
{
clean code: remove \n in parameter of GD_DPRINTF
2022-06-01 15:40:00 +00:00
// avoid too long in the menu ,use left 30 characters.
saveBookmark = new QAction( tr( "Save &Bookmark \"%1...\"" ).arg( text.left( 30 ) ), &menu );
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
menu.addAction( saveBookmark );
}
add 'send to anki' function users can configure the ankiconnect to use together with anki
2022-05-21 06:03:26 +00:00
// add anki menu
if( !text.isEmpty() && cfg.preferences.ankiConnectServer.enabled )
{
QString txt = ui.definition->title();
sendToAnkiAction = new QAction( tr( "&Send \"%1\" to anki with selected text." ).arg( txt ), &menu );
menu.addAction( sendToAnkiAction );
}
Don't show some context menu items for selection with spaces only
2017-04-24 14:41:07 +00:00
if( text.isEmpty() && !cfg.preferences.storeHistory)
Revert "Remove rather useless context menu to add title to history." This reverts commit c03b3461140df2b24e01e9203325b723cbe0fd6f. The menu item is not completely useless, it useful when the automatic history gathering is disabled and this menu could be used to add items to the history manually.
2013-01-17 18:38:49 +00:00
{
Limit headword length in article context menu
2015-10-14 15:18:11 +00:00
QString txt = ui.definition->title();
if( txt.size() > 60 )
txt = txt.left( 60 ) + "...";
addHeaderToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).
arg( txt ),
Revert "Remove rather useless context menu to add title to history." This reverts commit c03b3461140df2b24e01e9203325b723cbe0fd6f. The menu item is not completely useless, it useful when the automatic history gathering is disabled and this menu could be used to add items to the history manually.
2013-01-17 18:38:49 +00:00
&menu );
Limit headword length in article context menu
2015-10-14 15:18:11 +00:00
menu.addAction( addHeaderToHistoryAction );
Revert "Remove rather useless context menu to add title to history." This reverts commit c03b3461140df2b24e01e9203325b723cbe0fd6f. The menu item is not completely useless, it useful when the automatic history gathering is disabled and this menu could be used to add items to the history manually.
2013-01-17 18:38:49 +00:00
}
Fixed #164: Add an option to copy the entire article (Ctrl+A)
2013-01-18 13:22:24 +00:00
if ( selectedText.size() )
{
webkit to webengine
2021-07-06 13:01:50 +00:00
menu.addAction( ui.definition->pageAction( QWebEnginePage::Copy ) );
Add "Copy as text" feature (issue #311)
2013-05-15 13:52:47 +00:00
menu.addAction( &copyAsTextAction );
Fixed #164: Add an option to copy the entire article (Ctrl+A)
2013-01-18 13:22:24 +00:00
}
else
{
Select an enire text of the current article (Ctrl+Shift+A). Plus a context menu for that as well.
2013-01-18 14:37:24 +00:00
menu.addAction( &selectCurrentArticleAction );
webkit to webengine
2021-07-06 13:01:50 +00:00
menu.addAction( ui.definition->pageAction( QWebEnginePage::SelectAll ) );
Fixed #164: Add an option to copy the entire article (Ctrl+A)
2013-01-18 13:22:24 +00:00
}
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
map< QAction *, QString > tableOfContents;
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
// Add table of contents
+ Save currently focused articles when navigating. + Lingvo style headers look closer to Lingvo now, and the currently chosen article gets its header highlighted, too.
2009-05-11 22:25:22 +00:00
QStringList ids = getArticlesList();
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
if ( !menu.isEmpty() && ids.size() )
menu.addSeparator();
*! Limit the amount of items shown in the TOC of context menu to 20 maximum, so they don't overwhelm everything.
2009-04-14 18:35:27 +00:00
unsigned refsAdded = 0;
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
bool maxDictionaryRefsReached = false;
*! Limit the amount of items shown in the TOC of context menu to 20 maximum, so they don't overwhelm everything.
2009-04-14 18:35:27 +00:00
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
for( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd();
*! Limit the amount of items shown in the TOC of context menu to 20 maximum, so they don't overwhelm everything.
2009-04-14 18:35:27 +00:00
++i, ++refsAdded )
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
{
// Find this dictionary
for( unsigned x = allDictionaries.size(); x--; )
{
if ( allDictionaries[ x ]->getId() == i->toUtf8().data() )
{
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
QAction * action = 0;
New interface preference: Context menu dictionaries limit Controls both context menus, in the dictionary bar and in the article view. Can be adjusted in Preferences -> Interface -> Context menu dictionaries limit. By default, it is set to 20.
2013-06-11 18:31:01 +00:00
if ( refsAdded == cfg.preferences.maxDictionaryRefsInContextMenu )
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
{
// Enough! Or the menu would become too large.
maxDictionaryRefsAction = new QAction( ".........", &menu );
action = maxDictionaryRefsAction;
maxDictionaryRefsReached = true;
}
else
{
action = new QAction(
allDictionaries[ x ]->getIcon(),
QString::fromUtf8( allDictionaries[ x ]->getName().c_str() ),
&menu );
Fix typos found by codespell
2018-07-07 09:33:15 +00:00
// Force icons in menu on all platforms,
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
// since without them it will be much harder
// to find things.
action->setIconVisibleInMenu( true );
}
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
menu.addAction( action );
tableOfContents[ action ] = *i;
break;
}
}
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
if( maxDictionaryRefsReached )
break;
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
}
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
menu.addSeparator();
opt:scanpopup inspect element action optimization
2022-09-08 13:11:25 +00:00
if(!popupView||cfg.pinPopupWindow)
menu.addAction( &inspectAction );
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
if ( !menu.isEmpty() )
{
Close popup menus when ScanPopup window closes
2012-09-12 14:18:16 +00:00
connect( this, SIGNAL( closePopupMenu() ), &menu, SLOT( close() ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
QAction * result = menu.exec( ui.definition->mapToGlobal( pos ) );
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
if ( !result )
return;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
if ( result == followLink )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
openLink( targetUrl, ui.definition->url(), getCurrentArticle(), contexts );
else
if ( result == followLinkExternal )
cors support
2021-12-29 12:09:29 +00:00
QDesktopServices::openUrl( targetUrl );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
else
if ( result == lookupSelection )
clean code: remove \n in parameter of GD_DPRINTF
2022-06-01 15:40:00 +00:00
showDefinition( text, getGroup( ui.definition->url() ), getCurrentArticle() );
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
else if( result == saveBookmark )
{
clean code: remove \n in parameter of GD_DPRINTF
2022-06-01 15:40:00 +00:00
emit saveBookmarkSignal( text.left( 60 ) );
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
}
fix: a bug with send to anki
2022-05-22 02:05:22 +00:00
else if( result == sendToAnkiAction )
add 'send to anki' function users can configure the ankiconnect to use together with anki
2022-05-21 06:03:26 +00:00
{
sendToAnki( ui.definition->title(), ui.definition->selectedText() );
}
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
else
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
if ( result == lookupSelectionGr && groupComboBox )
showDefinition( selectedText, groupComboBox->getCurrentGroup(), QString() );
else
Add word to history through context menu
2012-09-12 14:11:30 +00:00
if ( result == addWordToHistoryAction )
emit forceAddWordToHistory( selectedText );
Add tab header to history via contex menu
2012-09-15 13:24:04 +00:00
if ( result == addHeaderToHistoryAction )
emit forceAddWordToHistory( ui.definition->title() );
Add word to history through context menu
2012-09-12 14:11:30 +00:00
else
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
if( result == sendWordToInputLineAction )
emit sendWordToInputLine( selectedText );
else
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
if ( !popupView && result == followLinkNewTab )
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
emit openLinkInNewTab( targetUrl, ui.definition->url(), getCurrentArticle(), contexts );
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
else
if ( !popupView && result == lookupSelectionNewTab )
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
emit showDefinitionInNewTab( selectedText, getGroup( ui.definition->url() ),
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
getCurrentArticle(), Contexts() );
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
else
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
if ( !popupView && result == lookupSelectionNewTabGr && groupComboBox )
emit showDefinitionInNewTab( selectedText, groupComboBox->getCurrentGroup(),
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QString(), Contexts() );
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
else
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
if( result == saveImageAction || result == saveSoundAction )
{
fix:save image (right context menu on image action)
2022-01-09 14:18:53 +00:00
QUrl url = ( result == saveImageAction ) ? imageUrl : targetUrl;
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
QString savePath;
QString fileName;
if ( cfg.resourceSavePath.isEmpty() )
savePath = QDir::homePath();
else
{
savePath = QDir::fromNativeSeparators( cfg.resourceSavePath );
if ( !QDir( savePath ).exists() )
savePath = QDir::homePath();
}
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QString name = Utils::Url::path( url ).section( '/', -1 );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
if ( result == saveSoundAction )
{
// Audio data
if ( name.indexOf( '.' ) < 0 )
name += ".wav";
fileName = savePath + "/" + name;
fileName = QFileDialog::getSaveFileName( parentWidget(), tr( "Save sound" ),
fileName,
Add support for *.oga audio files For example, the first audio link in "The United States" English Wikipedia article - "The Star-Spangled Banner" - ends with ".oga". Without this commit the audio link is not recognized by GoldenDict: * it is not pronounced when a Preferences=>Audio=>"Auto-pronounce..." option is enabled; * clicking on the link opens it in the default browser instead of playing inside GoldenDict.
2021-06-11 15:04:42 +00:00
tr( "Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape);;All files (*.*)" ) );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
}
else
{
// Image data
// Check for babylon image name
if ( name[ 0 ] == '\x1E' )
name.remove( 0, 1 );
if ( name.length() && name[ name.length() - 1 ] == '\x1F' )
name.chop( 1 );
fileName = savePath + "/" + name;
fileName = QFileDialog::getSaveFileName( parentWidget(), tr( "Save image" ),
fileName,
tr( "Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)" ) );
}
if ( !fileName.isEmpty() )
{
QFileInfo fileInfo( fileName );
emit storeResourceSavePath( QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() ) );
saveResource( url, ui.definition->url(), fileName );
}
}
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
else
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
{
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
if ( !popupView && result == maxDictionaryRefsAction )
emit showDictsPane();
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
// Match against table of contents
QString id = tableOfContents[ result ];
if ( id.size() )
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
setCurrentArticle( scrollToFromDictionaryId( id ), true );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
optimize: double click send select text to tranlateline box.
2022-03-30 07:21:16 +00:00
qDebug()<< "title = "<< r->title();
remove dead code
2021-09-22 04:01:17 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
void ArticleView::resourceDownloadFinished()
{
if ( resourceDownloadRequests.empty() )
return; // Stray signal
// Find any finished resources
for( list< sptr< Dictionary::DataRequest > >::iterator i =
resourceDownloadRequests.begin(); i != resourceDownloadRequests.end(); )
{
if ( (*i)->isFinished() )
{
Revert "fix possible crash in archlinux" This reverts commit 971909177662ac78fad6fce5cf206f3a32e8c997. Revert "fix crash on archlinux" This reverts commit 0dc2b4d416a7b62f189c8cf1c85ca19b839f4087.
2022-11-01 09:40:20 +00:00
if ( (*i)->dataSize() >= 0 )
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
// Ok, got one finished, all others are irrelevant now
vector< char > const & data = (*i)->getFullData();
Play audio files from websites. Here we also add Google as a web dictionary as an initial website example. Sounds there work just fine.
2010-05-29 11:33:04 +00:00
if ( resourceDownloadUrl.scheme() == "gdau" ||
Dictionary::WebMultimediaDownload::isAudioUrl( resourceDownloadUrl ) )
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
Use Phonon framework for audio playback. This is now the default way to play back sound under Windows. The other one, "Use external program", was also made available there. The old method of audio playback under Windows (via PlaySound) was completely removed. Since Phonon uses DirectShow as a backend under Windows, all file types supported by it should now play back. Therefore, the previous limitation to just .wav files is now lifted. Since Phonon is only available starting from Qt 4.6.0 under Windows, no older versions of Qt are supported anymore there.
2010-01-02 18:16:22 +00:00
// Audio data
Run a single external audio player process at a time External and internal audio players work similarly now. Fixes #950. * inherit a new ExternalAudioPlayer class from AudioPlayerInterface; * use an existing ExternalViewer class to implement ExternalAudioPlayer; * take (const char *, int) instead of std::vector<char> in ExternalViewer constructor to fit into AudioPlayerInterface; * extend ExternalViewer API to let ExternalAudioPlayer stop superseded audio player processes; * make AudioPlayerInterface::play() return an error message string to allow reporting immediate failures from derived classes; * Document AudioPlayerInterface API; * Document AudioPlayerFactory::player(); * use the common audio interface exclusively in ArticleView.
2018-03-22 17:07:10 +00:00
connect( audioPlayer.data(), SIGNAL( error( QString ) ), this, SLOT( audioPlayerError( QString ) ), Qt::UniqueConnection );
QString errorMessage = audioPlayer->play( data.data(), data.size() );
if( !errorMessage.isEmpty() )
QMessageBox::critical( this, "GoldenDict", tr( "Failed to play sound file: %1" ).arg( errorMessage ) );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
else
{
// Create a temporary file
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
// Remove the ones previously used, if any
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
cleanupTemp();
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
QString fileName;
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
QTemporaryFile tmp(
QDir::temp().filePath( "XXXXXX-" + resourceDownloadUrl.path().section( '/', -1 ) ), this );
Fix some warnings
2012-10-31 13:58:35 +00:00
if ( !tmp.open() || (size_t) tmp.write( &data.front(), data.size() ) != data.size() )
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict", tr( "Failed to create temporary file." ) );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
return;
}
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
tmp.setAutoRemove( false );
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
desktopOpenedTempFiles.insert( fileName = tmp.fileName() );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
if ( !QDesktopServices::openUrl( QUrl::fromLocalFile( fileName ) ) )
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict",
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
tr( "Failed to auto-open resource file, try opening manually: %1." ).arg( fileName ) );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
// Ok, whatever it was, it's finished. Remove this and any other
// requests and finish.
resourceDownloadRequests.clear();
return;
}
else
{
Add support for launching arbitrary executables (tts, manpages etc).
2011-05-29 05:08:37 +00:00
// This one had no data. Erase it.
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
resourceDownloadRequests.erase( i++ );
}
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
else // Unfinished, wait.
break;
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
if ( resourceDownloadRequests.empty() )
{
Various status bar related fixes: * Status Bar now available for Scan Popup window as well. * Fixed #13: Eliminated modal box when sound is not available: Instead of modal dialog box we now show the status bar message, with error icon, thus making it visible but not disruptive. * Proper handling of status bar images. * Styling of the status bar in both modes (in Mani Window and in Popup Window).
2011-07-14 20:11:57 +00:00
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
10000, QPixmap(":/icons/error.svg"));
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
}
Add internal audio player(ffmpeg/libav + libao). * phonon, bass, playsound are removed.
2013-05-05 10:22:12 +00:00
void ArticleView::audioPlayerError( QString const & message )
{
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
emit statusBarMessage(tr("WARNING: Audio Player: %1").arg(message),
10000, QPixmap(":/icons/error.svg"));
Add internal audio player(ffmpeg/libav + libao). * phonon, bass, playsound are removed.
2013-05-05 10:22:12 +00:00
}
+ Pasting in the definition window defines word from clipboard.
2009-05-12 10:52:11 +00:00
void ArticleView::pasteTriggered()
{
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
Config::InputPhrase phrase = cfg.preferences.sanitizeInputPhrase( QApplication::clipboard()->text() );
+ Pasting in the definition window defines word from clipboard.
2009-05-12 10:52:11 +00:00
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
if ( phrase.isValid() )
Fixed #387: Paste word into new tab looks up ALL dics instead of currently selected group
2013-08-22 16:05:39 +00:00
{
unsigned groupId = getGroup( ui.definition->url() );
if ( groupId == 0 )
{
// We couldn't figure out the group out of the URL,
// so let's try the currently selected group.
groupId = groupComboBox->getCurrentGroup();
}
Add input phrase's punctuation suffix to alts Preferences::sanitizeInputPhrase() transforms an input phrase by removing its whitespace/punctuation prefix and suffix. Translating a phrase from X11 primary selection or from clipboard, via mouse-over or from the command line results in such sanitization. This is useful when a punctuation mark or a space is selected accidentally alongside a word. This sanitization can be undesirable, however, when an abbreviated word is selected. For example: "etc.", "e.g.", "i.e.". This commit implements searching for the input word with the punctuation suffix preserved as an alternative form of the sanitized word to show articles for both. For example, when the word "etc." is translated from the clipboard, both "ETC" and "etc." articles are displayed. The punctuation suffix is preserved when the word is passed from the scan popup to the main window and when the translate line text is refreshed (e.g. when the current group is changed). The suffix is not stored in history and favorites (doing so would require file format changes and possibly substantial code changes, this can be implemented later if need be). Trim the input phrase once in ArticleNetworkAccessManager::getResource() instead of verbose trimming in multiple places in ArticleMaker::makeDefinitionFor(). Closes #1350.
2021-06-10 16:13:11 +00:00
showDefinition( phrase, groupId, getCurrentArticle() );
Fixed #387: Paste word into new tab looks up ALL dics instead of currently selected group
2013-08-22 16:05:39 +00:00
}
+ Pasting in the definition window defines word from clipboard.
2009-05-12 10:52:11 +00:00
}
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
void ArticleView::moveOneArticleUp()
{
QString current = getCurrentArticle();
if ( current.size() )
{
QStringList lst = getArticlesList();
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
int idx = lst.indexOf( dictionaryIdFromScrollTo( current ) );
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
if ( idx != -1 )
{
--idx;
if ( idx < 0 )
idx = lst.size() - 1;
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
setCurrentArticle( scrollToFromDictionaryId( lst[ idx ] ), true );
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
}
}
}
void ArticleView::moveOneArticleDown()
{
QString current = getCurrentArticle();
fix:Alt+Down,Alt+Up when foundDicts panel is hidden on startup.
2022-02-22 16:27:30 +00:00
QString currentDictId = dictionaryIdFromScrollTo( current );
QStringList lst = getArticlesList();
// if current article is empty .use the first as default.
if( currentDictId.isEmpty() && !lst.isEmpty() )
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
{
fix:Alt+Down,Alt+Up when foundDicts panel is hidden on startup.
2022-02-22 16:27:30 +00:00
currentDictId = lst[ 0 ];
}
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
fix:Alt+Down,Alt+Up when foundDicts panel is hidden on startup.
2022-02-22 16:27:30 +00:00
int idx = lst.indexOf( currentDictId );
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
fix:Alt+Down,Alt+Up when foundDicts panel is hidden on startup.
2022-02-22 16:27:30 +00:00
if( idx != -1 )
{
idx = ( idx + 1 ) % lst.size();
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
fix:Alt+Down,Alt+Up when foundDicts panel is hidden on startup.
2022-02-22 16:27:30 +00:00
setCurrentArticle( scrollToFromDictionaryId( lst[ idx ] ), true );
+ Alt+Up/Alt+Down nagivate within articles in the definition view.
2009-05-15 14:11:54 +00:00
}
}
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
void ArticleView::openSearch()
{
Implement full-text search
2014-04-16 16:18:28 +00:00
if( !isVisible() )
return;
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
if( ftsSearchIsOpened )
closeSearch();
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
if ( !searchIsOpened )
{
ui.searchFrame->show();
ui.searchText->setText( getTitle() );
searchIsOpened = true;
}
ui.searchText->setFocus();
ui.searchText->selectAll();
// Clear any current selection
if ( ui.definition->selectedText().size() )
{
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->
runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
if ( ui.searchText->property( "noResults" ).toBool() )
{
ui.searchText->setProperty( "noResults", false );
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
// Reload stylesheet
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
reloadStyleSheet();
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
}
void ArticleView::on_searchPrevious_clicked()
{
Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated Also fixed #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 21:04:45 +00:00
if ( searchIsOpened )
performFindOperation( false, true );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
void ArticleView::on_searchNext_clicked()
{
Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated Also fixed #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 21:04:45 +00:00
if ( searchIsOpened )
performFindOperation( false, false );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
void ArticleView::on_searchText_textEdited()
{
performFindOperation( true, false );
}
void ArticleView::on_searchText_returnPressed()
{
on_searchNext_clicked();
}
void ArticleView::on_searchCloseButton_clicked()
{
closeSearch();
}
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
void ArticleView::on_searchCaseSensitive_clicked()
{
Restart search when case sensitivity changes One issue with the current implementation is that a wrong-cased match remains selected when the user checks the Case Sensitive checkbox. Another issue is that the noResults property of searchText is not updated right away, which means that searchText's background color remains wrong until next search. Handle toggling case sensitivity in the same way as editing the searched text: restart search from the beginning of the page. This improves the Search-in-page UI consistency.
2022-06-16 18:13:56 +00:00
performFindOperation( true, false );
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
}
void ArticleView::on_highlightAllButton_clicked()
{
performFindOperation( false, false, true );
}
fix:right context menu , "select current article".
2022-01-18 15:04:27 +00:00
//the id start with "gdform-"
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
void ArticleView::onJsActiveArticleChanged(QString const & id)
{
Extract duplicated "gdfrom-" string manipulation into functions Such helper functions facilitate understanding of the code and simplify implementing new features.
2021-06-29 08:59:16 +00:00
if ( !isScrollTo( id ) )
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
return; // Incorrect id
fix: scroll to current article
2022-02-25 14:48:43 +00:00
QString dictId = dictionaryIdFromScrollTo( id );
setActiveArticleId( dictId );
emit activeArticleChanged( this, dictId );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
}
Send image to external viewer by double click
2017-03-13 14:38:27 +00:00
void ArticleView::doubleClicked( QPoint pos )
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
{
// We might want to initiate translation of the selected word
fix: double click to translation should stop audio first. there are cases when the audio is too long (in wiki). when double click occured .the audio is still playing.
2022-02-25 15:33:34 +00:00
audioPlayer->stop();
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
if ( cfg.preferences.doubleClickTranslates )
{
QString selectedText = ui.definition->selectedText();
fix: double click image will clear translate input line
2022-05-08 13:02:23 +00:00
// ignore empty word;
if( selectedText.isEmpty() )
return;
optimize: double click send select text to tranlateline box.
2022-03-30 07:21:16 +00:00
emit sendWordToInputLine( selectedText );
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
// Do some checks to make sure there's a sensible selection indeed
if ( Folding::applyWhitespaceOnly( gd::toWString( selectedText ) ).size() &&
Fixed #167: Not everything gets logged in History
2013-01-18 11:00:38 +00:00
selectedText.size() < 60 )
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
{
// Initiate translation
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
support Shift + Enter and Shift + double click to open a definition in a new tab (Opera browser standard) in addition to Ctrl + Enter and Ctrl + double click (other browsers standard). The selection with Shift + double click is not as perfect as with Ctrl + double click but it's ok.
2011-05-02 00:37:56 +00:00
if (kmod & (Qt::ControlModifier | Qt::ShiftModifier))
double click on a word with while Control key is down opens translation in a new tab
2010-09-16 18:53:39 +00:00
{ // open in new tab
emit showDefinitionInNewTab( selectedText, getGroup( ui.definition->url() ),
getCurrentArticle(), Contexts() );
}
else
Full-text search: Set group for ArticleView::showDefinition() when view article
2014-04-22 18:45:42 +00:00
{
QUrl const & ref = ui.definition->url();
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
Full-text search: Set group for ArticleView::showDefinition() when view article
2014-04-22 18:45:42 +00:00
{
rename qt4x5.hh to utils.hh the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-11-27 07:17:33 +00:00
QStringList dictsList = Utils::Url::queryItemValue(ref, "dictionaries" )
clean code: QString::SkipEmptyParts=>Qt::SkipEmptyParts
2021-12-29 14:29:06 +00:00
.split( ",", Qt::SkipEmptyParts );
Full-text search: Allow ignore diacritics while search
2018-04-10 14:49:52 +00:00
showDefinition( selectedText, dictsList, QRegExp(), getGroup( ref ), false );
Full-text search: Set group for ArticleView::showDefinition() when view article
2014-04-22 18:45:42 +00:00
}
else
showDefinition( selectedText, getGroup( ref ), getCurrentArticle() );
}
Double-clicking the words in an article translates them right away. This feature may be turned off in preferences, but it is on by default.
2010-04-08 20:37:59 +00:00
}
}
}
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
void ArticleView::performFindOperation( bool restart, bool backwards, bool checkHighlight )
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
{
QString text = ui.searchText->text();
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
if ( restart || checkHighlight )
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
{
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
if( restart ) {
// Anyone knows how we reset the search position?
// For now we resort to this hack:
if ( ui.definition->selectedText().size() )
{
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->
runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
}
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
webkit to webengine
2021-07-06 13:01:50 +00:00
QWebEnginePage::FindFlags f( 0 );
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
if ( ui.searchCaseSensitive->isChecked() )
webkit to webengine
2021-07-06 13:01:50 +00:00
f |= QWebEnginePage::FindCaseSensitively;
Add "Highlight all" to Article search (Ctrl + F)
2011-06-12 23:59:35 +00:00
ui.definition->findText( "", f );
if( ui.highlightAllButton->isChecked() )
ui.definition->findText( text, f );
if( checkHighlight )
return;
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
webkit to webengine
2021-07-06 13:01:50 +00:00
QWebEnginePage::FindFlags f( 0 );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
if ( ui.searchCaseSensitive->isChecked() )
webkit to webengine
2021-07-06 13:01:50 +00:00
f |= QWebEnginePage::FindCaseSensitively;
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
if ( backwards )
webkit to webengine
2021-07-06 13:01:50 +00:00
f |= QWebEnginePage::FindBackward;
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
findText( text,
f,
fix:crash when searching
2022-08-17 18:36:17 +00:00
[ text, this ]( bool match )
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
{
bool setMark = !text.isEmpty() && !match;
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
if( ui.searchText->property( "noResults" ).toBool() != setMark )
{
ui.searchText->setProperty( "noResults", setMark );
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
// Reload stylesheet
reloadStyleSheet();
}
} );
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
}
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
void ArticleView::findText( QString & text,
const QWebEnginePage::FindFlags & f,
const std::function< void( bool match ) > & callback )
webkit to webengine
2021-07-06 13:01:50 +00:00
{
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
ui.definition->findText( text,
f,
[ callback ]( const QWebEngineFindTextResult & result )
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
{
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
auto r = result.numberOfMatches() > 0;
if( callback )
callback( r );
} );
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#else
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
ui.definition->findText( text,
f,
[ callback ]( bool result )
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
{
feature: save bookmark to favorite panel reuse fulltext match to implement this bookmark feature
2022-06-01 15:11:41 +00:00
if( callback )
callback( result );
} );
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#endif
webkit to webengine
2021-07-06 13:01:50 +00:00
}
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
void ArticleView::reloadStyleSheet()
{
for( QWidget * w = parentWidget(); w; w = w->parentWidget() )
{
if ( w->styleSheet().size() )
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
{
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
w->setStyleSheet( w->styleSheet() );
break;
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
}
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
}
}
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
bool ArticleView::closeSearch()
{
if ( searchIsOpened )
{
ui.searchFrame->hide();
ui.definition->setFocus();
searchIsOpened = false;
return true;
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
else
if( ftsSearchIsOpened )
{
allMatches.clear();
uniqueMatches.clear();
ftsPosition = 0;
ftsSearchIsOpened = false;
ui.ftsSearchFrame->hide();
ui.definition->setFocus();
webkit to webengine
2021-07-06 13:01:50 +00:00
QWebEnginePage::FindFlags flags ( 0 );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
ui.definition->findText( "", flags );
return true;
}
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
else
return false;
}
Add shortcuts for Previous/Next actions on Article search (Ctrl + F)
2011-06-29 19:12:46 +00:00
bool ArticleView::isSearchOpened()
{
return searchIsOpened;
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void ArticleView::showEvent( QShowEvent * ev )
{
QFrame::showEvent( ev );
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
if ( !searchIsOpened )
ui.searchFrame->hide();
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
if( !ftsSearchIsOpened )
ui.ftsSearchFrame->hide();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
void ArticleView::receiveExpandOptionalParts( bool expand )
{
if( expandOptionalParts != expand )
ArticleView: deduplicate expand-optional-parts code
2022-06-11 17:34:52 +00:00
switchExpandOptionalParts();
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
}
void ArticleView::switchExpandOptionalParts()
{
expandOptionalParts = !expandOptionalParts;
emit setExpandMode( expandOptionalParts );
reload();
}
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
Add "Copy as text" feature (issue #311)
2013-05-15 13:52:47 +00:00
void ArticleView::copyAsText()
{
QString text = ui.definition->selectedText();
if( !text.isEmpty() )
QApplication::clipboard()->setText( text );
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
void ArticleView::highlightFTSResults()
{
closeSearch();
// Clear any current selection
fix code review indent issue
2022-03-30 15:08:24 +00:00
if( ui.definition->selectedText().size() )
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
{
fix code review indent issue
2022-03-30 15:08:24 +00:00
ui.definition->page()->runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
}
fix code review indent issue
2022-03-30 15:08:24 +00:00
ui.definition->page()->toPlainText(
[ & ]( const QString pageText )
make getWebPageText async
2022-03-28 09:29:00 +00:00
{
fix : fulltext search will crash close issue #69
2022-05-19 12:28:52 +00:00
const QUrl & url = ui.definition->url();
QString regString = Utils::Url::queryItemValue( url, "regexp" );
fix merge conflict
2022-07-02 11:13:53 +00:00
if( regString.isEmpty() )
return;
bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
if( ignoreDiacritics )
fix : fulltext search will crash close issue #69
2022-05-19 12:28:52 +00:00
regString = gd::toQString( Folding::applyDiacriticsOnly( gd::toWString( regString ) ) );
else
regString = regString.remove( AccentMarkHandler::accentMark() );
fix: highlight a rare case when toPlainText omit space between two words
2022-06-16 13:03:58 +00:00
//<div><i>watch</i>out</div> to plainText will return "watchout".
//if application goes here,that means the article text must contains the search text.
//whole word match regString will contain \b . can not match the above senario.
//workaround ,remove \b from the regstring="(\bwatch\b)"
regString.remove( QRegularExpression( "\\\\b" ) );
fix : fulltext search will crash close issue #69
2022-05-19 12:28:52 +00:00
QRegularExpression regexp;
if( Utils::Url::hasQueryItem( url, "wildcards" ) )
regexp.setPattern( wildcardsToRegexp( regString ) );
else
regexp.setPattern( regString );
QRegularExpression::PatternOptions patternOptions =
QRegularExpression::DotMatchesEverythingOption | QRegularExpression::UseUnicodePropertiesOption |
QRegularExpression::MultilineOption | QRegularExpression::InvertedGreedinessOption;
if( !Utils::Url::hasQueryItem( url, "matchcase" ) )
patternOptions |= QRegularExpression::CaseInsensitiveOption;
regexp.setPatternOptions( patternOptions );
if( regexp.pattern().isEmpty() || !regexp.isValid() )
return;
sptr< AccentMarkHandler > marksHandler = ignoreDiacritics ? new DiacriticsHandler : new AccentMarkHandler;
fix code review indent issue
2022-03-30 15:08:24 +00:00
marksHandler->setText( pageText );
Full-text search: Highlight words with accent mark added by DSL tag
2014-04-24 14:12:00 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
QRegularExpressionMatchIterator it = regexp.globalMatch( marksHandler->normalizedText() );
while( it.hasNext() )
{
QRegularExpressionMatch match = it.next();
Full-text search: QRegularExpression instead of QRegExp to highlight found words in Qt5-based builds
2018-09-25 14:58:51 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
// Mirror pos and matched length to original string
int pos = match.capturedStart();
int spos = marksHandler->mirrorPosition( pos );
int matched = marksHandler->mirrorPosition( pos + match.capturedLength() ) - spos;
Full-text search: QRegularExpression instead of QRegExp to highlight found words in Qt5-based builds
2018-09-25 14:58:51 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
// Add mark pos (if presented)
while( spos + matched < pageText.length() && pageText[ spos + matched ].category() == QChar::Mark_NonSpacing )
matched++;
Full-text search: QRegularExpression instead of QRegExp to highlight found words in Qt5-based builds
2018-09-25 14:58:51 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
if( matched > FTS::MaxMatchLengthForHighlightResults )
{
gdWarning( "ArticleView::highlightFTSResults(): Too long match - skipped (matched length %i, allowed %i)",
match.capturedLength(),
FTS::MaxMatchLengthForHighlightResults );
make getWebPageText async
2022-03-28 09:29:00 +00:00
}
fix code review indent issue
2022-03-30 15:08:24 +00:00
else
allMatches.append( pageText.mid( spos, matched ) );
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
ftsSearchMatchCase = Utils::Url::hasQueryItem( url, "matchcase" );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix : fulltext search will crash close issue #69
2022-05-19 12:28:52 +00:00
QWebEnginePage::FindFlags flags( QWebEnginePage::FindBackward );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
if( ftsSearchMatchCase )
flags |= QWebEnginePage::FindCaseSensitively;
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
Show current match and match count during FTS result navigation This information is going to be especially useful in the upcoming Qt WebEngine version of GoldenDict. In the Qt WebEngine version only the words equal to the last found result can be highlighted, not all FTS matches as in the Qt WebKit version.
2022-07-02 13:36:19 +00:00
if( allMatches.isEmpty() )
ui.ftsSearchStatusLabel->setText( searchStatusMessageNoMatches() );
else
fix code review indent issue
2022-03-30 15:08:24 +00:00
{
opt: findText will clear the last findText , so this line is useless it will override by the following findText
2022-06-03 05:09:18 +00:00
// highlightAllFtsOccurences( flags );
fix code review indent issue
2022-03-30 15:08:24 +00:00
ui.definition->findText( allMatches.at( 0 ), flags );
// if( ui.definition->findText( allMatches.at( 0 ), flags ) )
remove javascript highlight logic webengine's findtext(highlight) has little features compared to webkits
2022-06-15 23:53:14 +00:00
// {
// ui.definition->page()->runJavaScript(
// QString( "%1=window.getSelection().getRangeAt(0);_=0;" ).arg( rangeVarName ) );
// }
Merge branch 'master' of https://github.com/goldendict/goldendict into goldendict-master # Conflicts: # .travis.yml # articleview.cc # locale/ar_SA.ts # locale/ay_WI.ts # locale/be_BY.ts # locale/be_BY@latin.ts # locale/bg_BG.ts # locale/cs_CZ.ts # locale/de_DE.ts # locale/el_GR.ts # locale/eo_EO.ts # locale/es_AR.ts # locale/es_BO.ts # locale/es_ES.ts # locale/fa_IR.ts # locale/fi_FI.ts # locale/fr_FR.ts # locale/hi_IN.ts # locale/ie_001.ts # locale/it_IT.ts # locale/ja_JP.ts # locale/jb_JB.ts # locale/ko_KR.ts # locale/lt_LT.ts # locale/mk_MK.ts # locale/nl_NL.ts # locale/pl_PL.ts # locale/pt_BR.ts # locale/qu_WI.ts # locale/ru_RU.ts # locale/sk_SK.ts # locale/sq_AL.ts # locale/sr_SR.ts # locale/sv_SE.ts # locale/tg_TJ.ts # locale/tk_TM.ts # locale/tr_TR.ts # locale/uk_UA.ts # locale/vi_VN.ts # locale/zh_CN.ts # locale/zh_TW.ts
2022-07-10 04:39:12 +00:00
Q_ASSERT( ftsPosition == 0 );
ui.ftsSearchStatusLabel->setText( searchStatusMessage( 1, allMatches.size() ) );
fix code review indent issue
2022-03-30 15:08:24 +00:00
}
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
ui.ftsSearchFrame->show();
ui.ftsSearchPrevious->setEnabled( false );
ui.ftsSearchNext->setEnabled( allMatches.size() > 1 );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
fix code review indent issue
2022-03-30 15:08:24 +00:00
ftsSearchIsOpened = true;
} );
webkit to webengine
2021-07-06 13:01:50 +00:00
}
fix: merge conflict from upstream
2022-05-24 12:21:40 +00:00
void ArticleView::highlightAllFtsOccurences( QWebEnginePage::FindFlags flags )
Extract ArticleView::highlightAllFtsOccurences() Extracting this function allows to simplify the code and facilitates optimizing it in the next commit. Remove `#if QT_VERSION >= 0x040600` along the way as GoldenDict does not support Qt versions older than 4.6 for several years now.
2022-05-22 19:12:30 +00:00
{
Optimize highlighting FTS matches in articles The wall time of calls to ArticleView::highlightAllFtsOccurences() on my GNU/Linux system before and at this commit: allMatches.size() uniqueMatches.size() before(ms) at(ms) 79 1 277 4 98 1 380 4 267 1 16803 65
2022-05-22 19:21:00 +00:00
// Usually allMatches contains mostly duplicates. Thus searching for each element of
// allMatches to highlight them takes a long time => collect unique elements into a
// set and search for them instead.
// Don't use QList::toSet() or QSet's range constructor because they reserve space
// for QList::size() elements, whereas the final QSet size is likely 1 or 2.
QSet< QString > uniqueMatches;
for( int x = 0; x < allMatches.size(); ++x )
{
QString const & match = allMatches.at( x );
// Consider words that differ only in case equal if the search is case-insensitive.
uniqueMatches.insert( ftsSearchMatchCase ? match : match.toLower() );
}
for( QSet< QString >::const_iterator it = uniqueMatches.constBegin(); it != uniqueMatches.constEnd(); ++it )
ui.definition->findText( *it, flags );
Extract ArticleView::highlightAllFtsOccurences() Extracting this function allows to simplify the code and facilitates optimizing it in the next commit. Remove `#if QT_VERSION >= 0x040600` along the way as GoldenDict does not support Qt versions older than 4.6 for several years now.
2022-05-22 19:12:30 +00:00
}
improve:right context menu active dictionaries
2022-01-08 06:51:24 +00:00
void ArticleView::setActiveDictIds(ActiveDictIds ad) {
fix: when history forward/back ,the founded dictionary does not change fixed #184
2022-11-04 13:23:42 +00:00
if (ad.word == currentWord || historyMode) {
opt: update dictionaries when disable certain dictionary
2022-07-16 22:54:53 +00:00
// ignore all other signals.
qDebug() << "receive dicts, current word:" << currentWord << ad.word << ":" << ad.dictIds;
fix:right context menu not display correctly when select wikiweb dictionary
2022-01-08 13:45:10 +00:00
currentActiveDictIds << ad.dictIds;
currentActiveDictIds.removeDuplicates();
improve:foundDictsPane refresh logic
2022-01-09 04:54:50 +00:00
emit updateFoundInDictsList();
improve:right context menu active dictionaries
2022-01-08 06:51:24 +00:00
}
}
opt: update dictionaries when disable certain dictionary
2022-07-16 22:54:53 +00:00
void ArticleView::dictionaryClear( ActiveDictIds ad )
{
// ignore all other signals.
if( ad.word == currentWord )
{
qDebug() << "clear current dictionaries:" << currentWord;
currentActiveDictIds.clear();
}
}
fix conflict
2021-12-13 14:45:16 +00:00
//todo ,futher refinement?
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
void ArticleView::performFtsFindOperation( bool backwards )
{
if( !ftsSearchIsOpened )
return;
if( allMatches.isEmpty() )
{
Show current match and match count during FTS result navigation This information is going to be especially useful in the upcoming Qt WebEngine version of GoldenDict. In the Qt WebEngine version only the words equal to the last found result can be highlighted, not all FTS matches as in the Qt WebKit version.
2022-07-02 13:36:19 +00:00
ui.ftsSearchStatusLabel->setText( searchStatusMessageNoMatches() );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
ui.ftsSearchNext->setEnabled( false );
ui.ftsSearchPrevious->setEnabled( false );
return;
}
webkit to webengine
2021-07-06 13:01:50 +00:00
QWebEnginePage::FindFlags flags( 0 );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
if( ftsSearchMatchCase )
webkit to webengine
2021-07-06 13:01:50 +00:00
flags |= QWebEnginePage::FindCaseSensitively;
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
// Restore saved highlighted selection
webkit to webengine
2021-07-06 13:01:50 +00:00
ui.definition->page()->
runJavaScript( QString( "var sel=window.getSelection();sel.removeAllRanges();sel.addRange(%1);_=0;" )
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
.arg( rangeVarName ) );
refactor code.F12 optimize
2021-12-12 05:35:32 +00:00
if (backwards) {
if (ftsPosition > 0) {
ftsPosition -= 1;
}
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
ui.definition->findText( allMatches.at( ftsPosition ),
flags | QWebEnginePage::FindBackward,
[ this ]( const QWebEngineFindTextResult & result )
{
if( result.numberOfMatches ()== 0 )
return;
ui.ftsSearchPrevious->setEnabled(true);
if (!ui.ftsSearchNext->isEnabled())
ui.ftsSearchNext->setEnabled(true);
});
#else
refactor code.F12 optimize
2021-12-12 05:35:32 +00:00
ui.definition->findText(allMatches.at(ftsPosition),
flags | QWebEnginePage::FindBackward,
[this](bool res) {
ui.ftsSearchPrevious->setEnabled(res);
if (!ui.ftsSearchNext->isEnabled())
ui.ftsSearchNext->setEnabled(res);
});
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#endif
refactor code.F12 optimize
2021-12-12 05:35:32 +00:00
} else {
if (ftsPosition < allMatches.size() - 1) {
ftsPosition += 1;
}
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
ui.definition->findText(allMatches.at(ftsPosition), flags, [this](const QWebEngineFindTextResult & result ) {
if( result.numberOfMatches() == 0 )
return;
ui.ftsSearchNext->setEnabled(true);
if (!ui.ftsSearchPrevious->isEnabled())
ui.ftsSearchPrevious->setEnabled(true);
});
}
#else
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
refactor code.F12 optimize
2021-12-12 05:35:32 +00:00
ui.definition->findText(allMatches.at(ftsPosition), flags, [this](bool res) {
ui.ftsSearchNext->setEnabled(res);
if (!ui.ftsSearchPrevious->isEnabled())
ui.ftsSearchPrevious->setEnabled(res);
});
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
}
upgrade to qt6.2
2022-02-27 05:17:37 +00:00
#endif
Show current match and match count during FTS result navigation This information is going to be especially useful in the upcoming Qt WebEngine version of GoldenDict. In the Qt WebEngine version only the words equal to the last found result can be highlighted, not all FTS matches as in the Qt WebKit version.
2022-07-02 13:36:19 +00:00
Merge branch 'master' of https://github.com/goldendict/goldendict into goldendict-master # Conflicts: # .travis.yml # articleview.cc # locale/ar_SA.ts # locale/ay_WI.ts # locale/be_BY.ts # locale/be_BY@latin.ts # locale/bg_BG.ts # locale/cs_CZ.ts # locale/de_DE.ts # locale/el_GR.ts # locale/eo_EO.ts # locale/es_AR.ts # locale/es_BO.ts # locale/es_ES.ts # locale/fa_IR.ts # locale/fi_FI.ts # locale/fr_FR.ts # locale/hi_IN.ts # locale/ie_001.ts # locale/it_IT.ts # locale/ja_JP.ts # locale/jb_JB.ts # locale/ko_KR.ts # locale/lt_LT.ts # locale/mk_MK.ts # locale/nl_NL.ts # locale/pl_PL.ts # locale/pt_BR.ts # locale/qu_WI.ts # locale/ru_RU.ts # locale/sk_SK.ts # locale/sq_AL.ts # locale/sr_SR.ts # locale/sv_SE.ts # locale/tg_TJ.ts # locale/tk_TM.ts # locale/tr_TR.ts # locale/uk_UA.ts # locale/vi_VN.ts # locale/zh_CN.ts # locale/zh_TW.ts
2022-07-10 04:39:12 +00:00
ui.ftsSearchStatusLabel->setText( searchStatusMessage( ftsPosition + 1, allMatches.size() ) );
Full-text search: Highlight of the search results
2014-04-22 13:47:02 +00:00
}
void ArticleView::on_ftsSearchPrevious_clicked()
{
performFtsFindOperation( true );
}
void ArticleView::on_ftsSearchNext_clicked()
{
performFtsFindOperation( false );
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
ResourceToSaveHandler::ResourceToSaveHandler(ArticleView * view, QString const & fileName ) :
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
QObject( view ),
1. Don't show "failed to download" error message while saving resources like "gdau://search/..." 2. Stop search if resource is found
2017-04-27 15:04:26 +00:00
fileName( fileName ),
Refactor resource downloading
2017-04-27 20:55:53 +00:00
alreadyDone( false )
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
{
connect( this, SIGNAL( statusBarMessage( QString, int, QPixmap ) ),
view, SIGNAL( statusBarMessage( QString, int, QPixmap ) ) );
Refactor resource downloading
2017-04-27 20:55:53 +00:00
}
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
void ResourceToSaveHandler::addRequest( sptr<Dictionary::DataRequest> req )
{
if( !alreadyDone )
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
downloadRequests.push_back( req );
connect( req.get(), SIGNAL( finished() ),
this, SLOT( downloadFinished() ) );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
}
}
void ResourceToSaveHandler::downloadFinished()
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( downloadRequests.empty() )
return; // Stray signal
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
// Find any finished resources
for( list< sptr< Dictionary::DataRequest > >::iterator i =
downloadRequests.begin(); i != downloadRequests.end(); )
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( (*i)->isFinished() )
{
Revert "fix possible crash in archlinux" This reverts commit 971909177662ac78fad6fce5cf206f3a32e8c997. Revert "fix crash on archlinux" This reverts commit 0dc2b4d416a7b62f189c8cf1c85ca19b839f4087.
2022-11-01 09:40:20 +00:00
if ( (*i)->dataSize() >= 0 && !alreadyDone )
Refactor resource downloading
2017-04-27 20:55:53 +00:00
{
QByteArray resourceData;
vector< char > const & data = (*i)->getFullData();
resourceData = QByteArray( data.data(), data.size() );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
// Write data to file
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( !fileName.isEmpty() )
{
QFileInfo fileInfo( fileName );
QDir().mkpath( fileInfo.absoluteDir().absolutePath() );
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
QFile file( fileName );
if ( file.open( QFile::WriteOnly ) )
{
file.write( resourceData.data(), resourceData.size() );
file.close();
}
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( file.error() )
{
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("ERROR: %1").arg(tr("Resource saving error: ") + file.errorString()),
10000, QPixmap(":/icons/error.svg"));
Refactor resource downloading
2017-04-27 20:55:53 +00:00
}
}
alreadyDone = true;
// Clear other requests
downloadRequests.clear();
break;
}
else
{
// This one had no data. Erase it.
downloadRequests.erase( i++ );
}
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
else // Unfinished, wait.
break;
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if ( downloadRequests.empty() )
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
{
Refactor resource downloading
2017-04-27 20:55:53 +00:00
if( !alreadyDone )
1. Don't show "failed to download" error message while saving resources like "gdau://search/..." 2. Stop search if resource is found
2017-04-27 15:04:26 +00:00
{
emit statusBarMessage(
high dpi:remove coresponding png files with same name with svg close https://github.com/goldendict/goldendict/issues/1441
2022-01-27 00:23:57 +00:00
tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
10000, QPixmap(":/icons/error.svg"));
1. Don't show "failed to download" error message while saving resources like "gdau://search/..." 2. Stop search if resource is found
2017-04-27 15:04:26 +00:00
}
Refactor resource downloading
2017-04-27 20:55:53 +00:00
emit done();
deleteLater();
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
}
}
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
opt: format code and remove default constructor
2022-05-19 12:37:11 +00:00
ArticleViewAgent::ArticleViewAgent( ArticleView * articleView ) : QObject( articleView ), articleView( articleView )
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
{
}
opt: format code and remove default constructor
2022-05-19 12:37:11 +00:00
void ArticleViewAgent::onJsActiveArticleChanged( QString const & id )
{
articleView->onJsActiveArticleChanged( id );
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
}
opt: format code and remove default constructor
2022-05-19 12:37:11 +00:00
void ArticleViewAgent::linkClickedInHtml( QUrl const & url )
{
articleView->linkClickedInHtml( url );
imp. : wrap articleview in webchannel for security reason
2022-01-19 23:29:02 +00:00
}
Copy permalink