- GoldenDict-ng is a advanced dictionary lookup program, supporting many - dictionary formats. + GoldenDict-ng is an advanced dictionary lookup program, supporting multiple + dictionary formats and features.
)" ),
"",
@@ -639,19 +640,20 @@ void ArticleRequest::bodyFinished()
fmt::format_to( std::back_inserter( head ),
FMT_COMPILE(
- R"(![]( "{6}")
+ )" ),
dictId,
collapse ? R"(style="cursor:pointer;")" : "",
"",
Html::escape( tr( "From " ).toStdString() ),
Html::escape( activeDict->getName() ),
collapse ? "gdexpandicon" : "gdcollapseicon",
- "" );
+ "",
+ collapse ? "false" : "true" );
head += R"()";
@@ -669,7 +671,7 @@ void ArticleRequest::bodyFinished()
fmt::format_to(
std::back_inserter( head ),
FMT_COMPILE(
- R"(
)";
+ auto separator = R"()";
appendString( separator );
wasUpdated = true;
@@ -857,7 +859,7 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
// Append the beginning
footer += R"(
- 
+ R"(
+
{3}
{4}
- ![]( "{6}")
-
)" ),
+
+ R"(
{3}
{4}
- )" ),
+ R"()" ),
LangCoder::intToCode2( activeDict->getLangFrom() ).toStdString(),
LangCoder::intToCode2( activeDict->getLangTo() ).toStdString(),
collapse ? "none" : "block",
@@ -692,7 +694,7 @@ void ArticleRequest::bodyFinished()
qWarning() << "getDataSlice error:" << e.what();
}
- auto separator = R"(
)"
+ Html::escape( tr( "Compound expressions: " ).toUtf8().data() )
- + "";
+ + "
";
firstCompoundWasFound = true;
}
@@ -877,14 +879,13 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
// The last word was the last possible to start from
if ( firstCompoundWasFound ) {
- footer += "";
+ footer += "
";
}
// Now add links to all the individual words. They conclude the result.
footer += R"()"
- + Html::escape( tr( "Individual words: " ).toUtf8().data() )
- + "
applicationName().toUtf8(), "" ) );
- }
QNetworkReply * reply = QNetworkAccessManager::createRequest( op, newReq, nullptr );
@@ -222,7 +219,31 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::handleLookupScheme(
}
// See if we have some dictionaries muted
- QStringList mutedDictLists = Utils::Url::queryItemValue( url, "muted" ).split( ',' );
+ QString mutedDictsEncoded = Utils::Url::queryItemValue( url, "muted" );
+ QStringList mutedDictLists;
+
+ if ( !mutedDictsEncoded.isEmpty() ) {
+ mutedDictLists = mutedDictsEncoded.split( ',' );
+ }
+ else {
+ // If muted is not provided in URL, we get it from config
+ const Config::Class * cfg = GlobalBroadcaster::instance()->getConfig();
+ if ( cfg ) {
+ bool isPopup = Utils::Url::queryItemValue( url, "popup" ) == "1";
+ const Config::Group * grp = cfg->getGroup( group );
+ const Config::DictionarySets * mutedDictionaries;
+ if ( group == GroupId::AllGroupId ) {
+ mutedDictionaries = isPopup ? &cfg->popupMutedDictionaries : &cfg->mutedDictionaries;
+ }
+ else {
+ mutedDictionaries = grp ? ( isPopup ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
+ }
+
+ if ( mutedDictionaries ) {
+ mutedDictLists = mutedDictionaries->values();
+ }
+ }
+ }
QSet< QString > mutedDicts( mutedDictLists.begin(), mutedDictLists.end() );
// Unpack contexts
diff --git a/src/article_netmgr.hh b/src/article_netmgr.hh
index e64149597b..049543571d 100644
--- a/src/article_netmgr.hh
+++ b/src/article_netmgr.hh
@@ -30,7 +30,6 @@ class ArticleNetworkAccessManager: public QNetworkAccessManager
const vector< sptr< Dictionary::Class > > & dictionaries;
const ArticleMaker & articleMaker;
const bool & disallowContentFromOtherSites;
- const bool & hideGoldenDictHeader;
QMimeDatabase db;
public:
@@ -38,13 +37,11 @@ public:
ArticleNetworkAccessManager( QObject * parent,
const vector< sptr< Dictionary::Class > > & dictionaries_,
const ArticleMaker & articleMaker_,
- const bool & disallowContentFromOtherSites_,
- const bool & hideGoldenDictHeader_ ):
+ const bool & disallowContentFromOtherSites_ ):
QNetworkAccessManager( parent ),
dictionaries( dictionaries_ ),
articleMaker( articleMaker_ ),
- disallowContentFromOtherSites( disallowContentFromOtherSites_ ),
- hideGoldenDictHeader( hideGoldenDictHeader_ )
+ disallowContentFromOtherSites( disallowContentFromOtherSites_ )
{
}
diff --git a/src/common/folding.cc b/src/common/folding.cc
index 1d8ebac989..af7f2098f0 100644
--- a/src/common/folding.cc
+++ b/src/common/folding.cc
@@ -40,6 +40,21 @@ std::u32string apply( const std::u32string & in, bool preserveWildcards )
return caseFolded;
}
+std::string applyForIndex( const QString & in )
+{
+ // remove diacritics (normalization)
+ auto temp = in.normalized( QString::NormalizationForm_KD ).remove( RX::accentPunc ).toStdU32String();
+ // case folding
+ std::u32string caseFolded;
+ caseFolded.reserve( temp.size() );
+ char32_t buf[ foldCaseMaxOut ];
+ for ( const char32_t ch : temp ) {
+ auto n = foldCase( ch, buf );
+ caseFolded.append( buf, n );
+ }
+ return Text::toUtf8( caseFolded );
+}
+
std::u32string applySimpleCaseOnly( const std::u32string & in )
{
const char32_t * nextChar = in.data();
diff --git a/src/common/folding.hh b/src/common/folding.hh
index c36a262fb3..54e3c15d6d 100644
--- a/src/common/folding.hh
+++ b/src/common/folding.hh
@@ -26,7 +26,7 @@ enum {
/// Applies the folding algorithm to each character in the given string,
/// making another one as a result.
std::u32string apply( const std::u32string &, bool preserveWildcards = false );
-
+std::string applyForIndex( const QString & in );
/// Applies only simple case folding algorithm. Since many dictionaries have
/// different case style, we interpret words differing only by case as synonyms.
std::u32string applySimpleCaseOnly( const std::u32string & );
diff --git a/src/common/globalbroadcaster.cc b/src/common/globalbroadcaster.cc
index d09cfca469..8f2151f820 100644
--- a/src/common/globalbroadcaster.cc
+++ b/src/common/globalbroadcaster.cc
@@ -16,7 +16,7 @@ GlobalBroadcaster::GlobalBroadcaster( QObject * parent ):
QStringList whiteUrlHosts = { "googleapis.com", "gstatic.com" };
for ( auto & host : std::as_const( whiteUrlHosts ) ) {
- whitelist.insert( host );
+ hostWhitelist.insert( host );
}
}
@@ -40,29 +40,39 @@ Config::Preferences * GlobalBroadcaster::getPreference() const
return config ? &config->preferences : nullptr;
}
-void GlobalBroadcaster::addWhitelist( QString host )
+void GlobalBroadcaster::addHostWhitelist( QString host )
{
- whitelist.insert( host );
+ hostWhitelist.insert( host );
}
-bool GlobalBroadcaster::existedInWhitelist( QString host ) const
+void GlobalBroadcaster::addRefererWhitelist( QString host )
+{
+ refererWhitelist.insert( host );
+}
+
+bool existedInWhitelistInternal( const QSet< QString > & whitelist, QString host )
{
for ( const QString & item : whitelist ) {
- // Exact match - e.g. "www.example.com" matches "www.example.com"
if ( host == item ) {
return true;
}
-
- // Extract base domain from both host and item for comparison
QString urlBaseDomain = Utils::Url::extractBaseDomain( host );
QString itemBaseDomain = Utils::Url::extractBaseDomain( item );
-
- // Compare base domains
if ( urlBaseDomain == itemBaseDomain ) {
return true;
}
}
- return false; // No match found
+ return false;
+}
+
+bool GlobalBroadcaster::existedInHostWhitelist( QString host ) const
+{
+ return existedInWhitelistInternal( hostWhitelist, host );
+}
+
+bool GlobalBroadcaster::existedInRefererWhitelist( QString host ) const
+{
+ return existedInWhitelistInternal( refererWhitelist, host );
}
diff --git a/src/common/globalbroadcaster.hh b/src/common/globalbroadcaster.hh
index 3bb12f573b..f303919d90 100644
--- a/src/common/globalbroadcaster.hh
+++ b/src/common/globalbroadcaster.hh
@@ -32,13 +32,17 @@ class GlobalBroadcaster: public QObject
const AudioPlayerPtr * audioPlayer = nullptr;
std::vector< sptr< Dictionary::Class > > * allDictionaries = nullptr;
Instances::Groups * groups = nullptr;
- QSet< QString > whitelist;
+ QSet< QString > hostWhitelist;
+ QSet< QString > refererWhitelist;
Icons::DictionaryIconName _icon_names;
QMap< QString, QString > lsaIdToPathMap;
QMap< QString, QString > lsaPathToIdMap;
QMap< QString, sptr< Dictionary::Class > > dictMap;
+
public:
+ std::atomic_bool is_popup;
+
void setConfig( Config::Class * _config );
Config::Class * getConfig() const;
void setAudioPlayer( const AudioPlayerPtr * _audioPlayer );
@@ -54,32 +58,14 @@ public:
// For backward compatibility
Config::Preferences * getPreference() const;
GlobalBroadcaster( QObject * parent = nullptr );
- /// \brief Add a host to whitelist.
- ///
- /// The host should be a full domain. For subdomain matching, add the base domain
- /// (e.g. "example.com"). For special TLDs, add the appropriate form
- /// (e.g. "example.com.uk" for UK sites).
- ///
- /// \param host The host to add to whitelist
- void addWhitelist( QString host );
-
- /// \brief Check if a host exists in the whitelist
- ///
- /// This method checks for exact matches and base domain matches:
- /// 1. Direct string matching - e.g. "www.example.com" matches "www.example.com"
- /// 2. Base domain matching using Utils::Url::extractBaseDomain() - e.g. "example.com" matches "www.example.com"
- ///
- /// Generic pattern handling for TLDs like .com.xx, .co.xx, .org.xx:
- /// - For "www.example.com.jp", the base domain is "example.com"
- /// - For "api.service.org.uk", the base domain is "service.org"
- ///
- /// Cross-TLD matching requires explicit entries:
- /// - To match both ".com" and ".com.xx" domains, both "example.com" and "example.com.xx"
- /// need to be added to the whitelist separately
- ///
+ /// \param host The host to add to host whitelist
+ void addHostWhitelist( QString host );
+ void addRefererWhitelist( QString host );
+
/// \param host The host to check
- /// \return true if the host is in the whitelist, false otherwise
- bool existedInWhitelist( QString host ) const;
+ /// \return true if the host is in the host whitelist, false otherwise
+ bool existedInHostWhitelist( QString host ) const;
+ bool existedInRefererWhitelist( QString host ) const;
static GlobalBroadcaster * instance();
unsigned currentGroupId;
QString translateLineText{};
@@ -101,5 +87,5 @@ signals:
void indexingDictionary( QString );
- void websiteDictionarySignal( QString, QString, QString );
+ void websiteDictionarySignal( QString, QString, QString, bool, QString );
};
diff --git a/src/common/globalregex.cc b/src/common/globalregex.cc
index abe14a5c8b..b1301e21e6 100644
--- a/src/common/globalregex.cc
+++ b/src/common/globalregex.cc
@@ -74,6 +74,7 @@ QRegularExpression Mdx::styleElement( R"((]*>)([\w\W]*?)(<\/style>))",
QRegularExpression Epwing::refWord( R"([r|p](\d+)at(\d+))", QRegularExpression::CaseInsensitiveOption );
+const QRegularExpression RX::qtWebEngineUserAgent( R"(QtWebEngine\/[\d.]+\s*)" );
bool Html::containHtmlEntity( const std::string & text )
{
diff --git a/src/common/globalregex.hh b/src/common/globalregex.hh
index 46febdfa99..343a57a2d8 100644
--- a/src/common/globalregex.hh
+++ b/src/common/globalregex.hh
@@ -68,6 +68,7 @@ bool containHtmlEntity( const std::string & text );
} // namespace Html
const static QRegularExpression accentMark( R"(\p{M})", QRegularExpression::UseUnicodePropertiesOption );
+const static QRegularExpression accentPunc( R"(\p{M}\p{P})", QRegularExpression::UseUnicodePropertiesOption );
//contain unicode space mark,invisible, and punctuation
const static QRegularExpression markPuncSpace( R"([\p{M}\p{Z}\p{C}\p{P}])",
QRegularExpression::UseUnicodePropertiesOption );
@@ -76,4 +77,6 @@ const static QRegularExpression markSpace( R"([\p{M}\p{Z}])", QRegularExpression
const static QRegularExpression whiteSpace( "\\s+" );
+extern const QRegularExpression qtWebEngineUserAgent;
+
} // namespace RX
diff --git a/src/common/utils.cc b/src/common/utils.cc
index 42049fe21b..7df8f67a4f 100644
--- a/src/common/utils.cc
+++ b/src/common/utils.cc
@@ -123,18 +123,10 @@ QString Utils::Url::extractBaseDomain( const QString & domain )
void Utils::Widget::setNoResultColor( QWidget * widget, bool noResult )
{
- if ( noResult ) {
- auto font = widget->font();
- font.setItalic( true );
-
- widget->setFont( font );
- }
- else {
- auto font = widget->font();
- font.setItalic( false );
-
- widget->setFont( font );
- }
+ (void)widget;
+ (void)noResult;
+ // Italic font for no results is removed in favor of other visual cues like
+ // changing the dropdown button color in TranslateBox.
}
std::string Utils::Html::getHtmlCleaner()
diff --git a/src/config.cc b/src/config.cc
index 4f64d2f8c4..de07eb4a7e 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -144,9 +144,7 @@ Preferences::Preferences():
useInternalPlayer( InternalPlayerBackend::anyAvailable() ),
checkForNewReleases( true ),
disallowContentFromOtherSites( false ),
- hideGoldenDictHeader( false ),
- maxNetworkCacheSize( 50 ),
- clearNetworkCacheOnExit( true ),
+
zoomFactor( 1 ),
helpZoomFactor( 1 ),
maxStringsInHistory( 500 ),
@@ -951,21 +949,6 @@ Class load()
( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
}
- if ( !preferences.namedItem( "hideGoldenDictHeader" ).isNull() ) {
- c.preferences.hideGoldenDictHeader =
- ( preferences.namedItem( "hideGoldenDictHeader" ).toElement().text() == "1" );
- }
-
- if ( !preferences.namedItem( "maxNetworkCacheSize" ).isNull() ) {
- c.preferences.maxNetworkCacheSize = preferences.namedItem( "maxNetworkCacheSize" ).toElement().text().toInt();
- }
-
- if ( !preferences.namedItem( "clearNetworkCacheOnExit" ).isNull() ) {
- c.preferences.clearNetworkCacheOnExit =
- ( preferences.namedItem( "clearNetworkCacheOnExit" ).toElement().text() == "1" );
- }
-
-
if ( !preferences.namedItem( "removeInvalidIndexOnExit" ).isNull() ) {
c.preferences.removeInvalidIndexOnExit =
( preferences.namedItem( "removeInvalidIndexOnExit" ).toElement().text() == "1" );
@@ -1986,17 +1969,6 @@ void save( const Class & c )
opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) );
preferences.appendChild( opt );
- opt = dd.createElement( "hideGoldenDictHeader" );
- opt.appendChild( dd.createTextNode( c.preferences.hideGoldenDictHeader ? "1" : "0" ) );
- preferences.appendChild( opt );
-
- opt = dd.createElement( "maxNetworkCacheSize" );
- opt.appendChild( dd.createTextNode( QString::number( c.preferences.maxNetworkCacheSize ) ) );
- preferences.appendChild( opt );
-
- opt = dd.createElement( "clearNetworkCacheOnExit" );
- opt.appendChild( dd.createTextNode( c.preferences.clearNetworkCacheOnExit ? "1" : "0" ) );
- preferences.appendChild( opt );
opt = dd.createElement( "removeInvalidIndexOnExit" );
opt.appendChild( dd.createTextNode( c.preferences.removeInvalidIndexOnExit ? "1" : "0" ) );
diff --git a/src/config.hh b/src/config.hh
index afefef3dc1..2a7d25daad 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -31,7 +31,6 @@ namespace Config {
//define a default font fize value
constexpr int DEFAULT_FONT_SIZE = 12;
-const QString WEBSITE_PROXY_PREFIX = "iframe-";
// Tri states enum for Dark and Dark reader mode
enum class Dark : std::uint8_t {
@@ -344,9 +343,7 @@ struct Preferences
bool checkForNewReleases;
bool disallowContentFromOtherSites;
- bool hideGoldenDictHeader;
- int maxNetworkCacheSize;
- bool clearNetworkCacheOnExit;
+
bool removeInvalidIndexOnExit = false;
bool enableApplicationLog =
#ifdef Q_OS_WIN
diff --git a/src/dict/dictserver.cc b/src/dict/dictserver.cc
index f3ab7a24cf..2ae211731c 100644
--- a/src/dict/dictserver.cc
+++ b/src/dict/dictserver.cc
@@ -184,7 +184,7 @@ class DictServerDictionary: public Dictionary::Class
QStringList serverDatabases;
DictServerState state;
QMutex mutex;
- QTcpSocket socket;
+ QTcpSocket * socket;
QString msgId;
public:
@@ -197,7 +197,8 @@ class DictServerDictionary: public Dictionary::Class
Dictionary::Class( id, vector< string >() ),
url( url_ ),
icon( icon_ ),
- langId( 0 )
+ langId( 0 ),
+ socket( nullptr )
{
dictionaryName = name_;
@@ -216,27 +217,36 @@ class DictServerDictionary: public Dictionary::Class
if ( strategies.isEmpty() ) {
strategies.append( "prefix" );
}
+ }
+
+ void deferredInit() override
+ {
+ if ( socket )
+ return;
+
+ socket = new QTcpSocket( this );
+
QUrl serverUrl( url );
quint16 port = serverUrl.port( DefaultPort );
QString reply;
- socket.connectToHost( serverUrl.host(), port );
- connect( &socket, &QTcpSocket::connected, this, [ this ]() {
+ socket->connectToHost( serverUrl.host(), port );
+ connect( socket, &QTcpSocket::connected, this, [ this ]() {
//initialize the description.
QString req = QString( "SHOW DB\r\n" );
- socket.write( req.toUtf8() );
+ socket->write( req.toUtf8() );
state = DictServerState::DB;
} );
connect( this, &DictServerDictionary::finishDatabase, this, [ this ]() {
- socket.write( QByteArray( "CLIENT GoldenDict\r\n" ) );
+ socket->write( QByteArray( "CLIENT GoldenDict\r\n" ) );
} );
- connect( &socket, &QTcpSocket::errorOccurred, this, []( QAbstractSocket::SocketError error ) {
+ connect( socket, &QTcpSocket::errorOccurred, this, []( QAbstractSocket::SocketError error ) {
qDebug() << "socket error message: " << error;
} );
- connect( &socket, &QTcpSocket::readyRead, this, [ this ]() {
+ connect( socket, &QTcpSocket::readyRead, this, [ this ]() {
const QMutexLocker _( &mutex );
- QByteArray reply = socket.readLine();
+ QByteArray reply = socket->readLine();
qDebug() << "received:" << reply;
if ( state == DictServerState::DB ) {
@@ -249,14 +259,14 @@ class DictServerDictionary: public Dictionary::Class
// Read databases
int x = 0;
for ( ; x < count; x++ ) {
- reply = socket.readLine();
+ reply = socket->readLine();
if ( reply.isEmpty() ) {
return;
}
reply = reply.trimmed();
- qDebug().noquote() << "receive db:" << reply;
+ qDebug() << "receive db:" << reply;
if ( reply[ 0 ] == '.' ) {
state = DictServerState::DB_DATA_FINISHED;
@@ -278,7 +288,7 @@ class DictServerDictionary: public Dictionary::Class
else if ( state == DictServerState::DB_DATA ) {
while ( !reply.isEmpty() ) {
- qDebug().noquote() << "receive db:" << reply;
+ qDebug() << "receive db:" << reply;
if ( reply[ 0 ] == '.' ) {
state = DictServerState::DB_DATA_FINISHED;
emit finishDatabase();
@@ -291,7 +301,7 @@ class DictServerDictionary: public Dictionary::Class
serverDatabases.append( reply );
}
- reply = socket.readLine();
+ reply = socket->readLine();
}
}
} );
@@ -299,7 +309,10 @@ class DictServerDictionary: public Dictionary::Class
~DictServerDictionary() override
{
- disconnectFromServer( socket );
+ if ( socket ) {
+ disconnectFromServer( *socket );
+ delete socket;
+ }
}
diff --git a/src/dict/mediawiki.cc b/src/dict/mediawiki.cc
index b60b403dec..f05f241452 100644
--- a/src/dict/mediawiki.cc
+++ b/src/dict/mediawiki.cc
@@ -157,7 +157,7 @@ MediaWikiWordSearchRequest::MediaWikiWordSearchRequest( const std::u32string & s
qDebug( "wiki request begin" );
QUrl reqUrl( url + "/api.php?action=query&list=allpages&aplimit=40&format=xml" );
- GlobalBroadcaster::instance()->addWhitelist( reqUrl.host() );
+ GlobalBroadcaster::instance()->addHostWhitelist( reqUrl.host() );
Utils::Url::addQueryItem( reqUrl, "apprefix", QString::fromStdU32String( str ).replace( '+', "%2B" ) );
Utils::Url::addQueryItem( reqUrl, "lang", lang );
diff --git a/src/dict/website.cc b/src/dict/website.cc
index 4f1f17094a..26567f3d62 100644
--- a/src/dict/website.cc
+++ b/src/dict/website.cc
@@ -10,6 +10,7 @@
#include
#include
#include
+#include "utils.hh"
namespace WebSite {
@@ -100,7 +101,13 @@ sptr< DataRequest > WebSiteDictionary::getArticle( const std::u32string & str,
//heuristic add url to global whitelist.
QUrl url( urlString );
- GlobalBroadcaster::instance()->addWhitelist( url.host() );
+ GlobalBroadcaster::instance()->addHostWhitelist( url.host() );
+
+ if ( Utils::Url::hasQueryItem( url, "whitelist" ) ) {
+ GlobalBroadcaster::instance()->addRefererWhitelist( url.host() );
+ Utils::Url::removeQueryItem( url, "whitelist" );
+ urlString = url.toString();
+ }
const QString & encodeUrl = urlString;
@@ -110,9 +117,12 @@ sptr< DataRequest > WebSiteDictionary::getArticle( const std::u32string & str,
if ( !urlString.isEmpty() ) {
auto word = QString::fromStdU32String( str );
auto title = QString::fromStdString( getName() );
- // Pass dictId to the websiteDictionarySignal
- emit GlobalBroadcaster::instance()
- -> websiteDictionarySignal( title + "-" + word, urlString, QString::fromStdString( getId() ) );
+ // Pass dictId and word to the websiteDictionarySignal
+ emit GlobalBroadcaster::instance() -> websiteDictionarySignal( title + "-" + word,
+ urlString,
+ QString::fromStdString( getId() ),
+ GlobalBroadcaster::instance()->is_popup,
+ word );
}
fmt::format_to(
diff --git a/src/ftshelpers.cc b/src/ftshelpers.cc
index ade254ccd5..71fec66f9f 100644
--- a/src/ftshelpers.cc
+++ b/src/ftshelpers.cc
@@ -4,6 +4,7 @@
#include "xapian.h"
#include
#include "fulltextsearch.hh"
+#include "folding.hh"
#include "ftshelpers.hh"
#include "dictfile.hh"
#include "utils.hh"
@@ -80,14 +81,11 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
throw exUserAbort();
}
- QList< uint32_t > offsets;
- offsets.resize( setOfOffsets.size() );
- uint32_t * ptr = offsets.data();
-
- for ( QSet< uint32_t >::ConstIterator it = setOfOffsets.constBegin(); it != setOfOffsets.constEnd(); ++it ) {
- *ptr = *it;
- ptr++;
- }
+ // More efficient way to get a sorted list of offsets
+ std::vector< uint32_t > offsets;
+ offsets.assign( setOfOffsets.begin(), setOfOffsets.end() );
+ // Sort offsets to allow for binary search resume
+ std::sort( offsets.begin(), offsets.end() );
// Free memory
setOfOffsets.clear();
@@ -116,17 +114,18 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
long indexedDoc = 0L;
- for ( const auto & address : offsets ) {
- indexedDoc++;
+ auto start_it = offsets.cbegin();
+ if ( skip ) {
+ start_it = std::upper_bound( offsets.cbegin(), offsets.cend(), lastAddress );
+ long num_skipped = std::distance( offsets.cbegin(), start_it );
+ qDebug() << "Resuming FTS indexing from offset" << ( start_it != offsets.cend() ? *start_it : -1 ) << "at index"
+ << num_skipped;
+ indexedDoc += num_skipped;
+ }
- if ( address == lastAddress && skip ) {
- skip = false;
- continue;
- }
- //skip until to the lastAddress;
- if ( skip ) {
- continue;
- }
+ for ( auto it = start_it; it != offsets.cend(); ++it ) {
+ const auto & address = *it;
+ indexedDoc++;
if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
return;
@@ -140,8 +139,8 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
indexer.set_document( doc );
- indexer.index_text( articleStr.toStdString() );
- indexer.index_text( headword.toStdString() );
+ indexer.index_text( Folding::applyForIndex( articleStr ) );
+ indexer.index_text( Folding::applyForIndex( headword ) );
doc.set_data( std::to_string( address ) );
// Add the document to the database.
@@ -194,7 +193,7 @@ void FTSResultsRequest::run()
// Combine the rest of the command line arguments with spaces between
// them, so that simple queries don't have to be quoted at the shell
// level.
- string query_string( searchString.toStdString() );
+ string query_string( Folding::applyForIndex( searchString ) );
// Parse the query string to produce a Xapian::Query object.
Xapian::QueryParser qp;
diff --git a/src/iframeschemehandler.cc b/src/iframeschemehandler.cc
deleted file mode 100644
index ba21169ec2..0000000000
--- a/src/iframeschemehandler.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "iconv.hh"
-#include "iframeschemehandler.hh"
-#include
-
-IframeSchemeHandler::IframeSchemeHandler( QObject * parent ):
- QWebEngineUrlSchemeHandler( parent )
-{
-}
-void IframeSchemeHandler::requestStarted( QWebEngineUrlRequestJob * requestJob )
-{
- QUrl url = requestJob->requestUrl();
-
- // website dictionary iframe url
- if ( url.scheme().startsWith( Config::WEBSITE_PROXY_PREFIX ) ) {
- //"iframe-".length() == 7
- url.setScheme( url.scheme().mid( 7 ) );
- }
- QNetworkRequest request;
- request.setUrl( url );
- request.setAttribute( QNetworkRequest::RedirectPolicyAttribute,
- QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy );
-
- QNetworkReply * reply = mgr.get( request );
-
- auto finishAction = [ = ]() {
- QByteArray contentType = "text/html";
- QString codecName;
- const auto ctHeader = reply->header( QNetworkRequest::ContentTypeHeader );
- if ( ctHeader.isValid() ) {
- contentType = ctHeader.toByteArray();
- const auto ct = ctHeader.toString();
- const auto index = ct.indexOf( "charset=" );
- if ( index > -1 ) {
- codecName = ct.mid( index + 8 );
- }
- }
- auto buffer = new QBuffer( requestJob );
-
- QByteArray replyData = reply->readAll();
- QString articleString;
-
- auto encoding = Iconv::findValidEncoding( { codecName } );
- if ( !encoding.isEmpty() ) {
- articleString = Iconv::toQString( encoding.toUtf8().constData(), replyData.data(), replyData.size() );
- }
- else {
- articleString = QString::fromUtf8( replyData );
- }
- // Handle reply data
- // 404 response may have response body.
- if ( reply->error() != QNetworkReply::NoError && articleString.isEmpty() ) {
- if ( reply->error() == QNetworkReply::ContentNotFoundError ) {
- buffer->deleteLater();
- //work around to fix QTBUG-106573
- requestJob->redirect( url );
- return;
- }
- QString emptyHtml = QString( "%1" ).arg( reply->errorString() );
- buffer->setData( emptyHtml.toUtf8() );
- requestJob->reply( contentType, buffer );
- return;
- }
-
- // Change links from relative to absolute
-
- QString root = reply->url().scheme() + "://" + reply->url().host();
-
- if ( reply->url().port() != 80 && reply->url().port() != 443 && reply->url().port() != -1 ) {
- root = root + ":" + QString::number( reply->url().port() );
- }
- QString base = root + reply->url().path();
-
-
- QRegularExpression baseTag( R"EOF()EOF",
- QRegularExpression::CaseInsensitiveOption
- | QRegularExpression::DotMatchesEverythingOption );
-
-
- if ( const auto match = baseTag.match( articleString ); match.hasMatch() ) {
- base = reply->url().resolved( QUrl( match.captured( 1 ) ) ).url();
- }
-
- QString baseTagHtml = QString( R"()",
- QRegularExpression::CaseInsensitiveOption
- | QRegularExpression::DotMatchesEverythingOption );
- auto match = headTag.match( articleString );
- if ( match.hasMatch() ) {
- articleString.insert( match.capturedEnd(), baseTagHtml );
- articleString.insert( match.capturedEnd(), depressionFocus );
- }
- else {
- // the html contain no head element
- // just insert at the beginning of the html ,and leave it at the mercy of browser(chrome webengine)
- articleString.insert( 0, baseTagHtml );
- articleString.insert( 0, depressionFocus );
- }
-
- buffer->setData( articleString.toUtf8() );
-
- requestJob->reply( "text/html; charset=utf-8", buffer );
- };
- connect( reply, &QNetworkReply::finished, requestJob, finishAction );
-
- connect( requestJob, &QObject::destroyed, reply, &QObject::deleteLater );
-}
diff --git a/src/iframeschemehandler.hh b/src/iframeschemehandler.hh
deleted file mode 100644
index fd8c78365f..0000000000
--- a/src/iframeschemehandler.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "article_netmgr.hh"
-
-class IframeSchemeHandler: public QWebEngineUrlSchemeHandler
-{
- Q_OBJECT
-
-public:
- IframeSchemeHandler( QObject * parent = nullptr );
- void requestStarted( QWebEngineUrlRequestJob * requestJob );
-
-protected:
-
-private:
- QNetworkAccessManager mgr;
-};
diff --git a/src/keyboardstate.cc b/src/keyboardstate.cc
index 40b79df62f..26cc2f67e1 100644
--- a/src/keyboardstate.cc
+++ b/src/keyboardstate.cc
@@ -8,8 +8,8 @@
bool KeyboardState::checkModifiersPressed( int mask )
{
auto modifiers = QApplication::queryKeyboardModifiers();
-
- return !( ( mask & Alt && !( modifiers.testFlag( Qt::AltModifier ) ) )
- || ( mask & Ctrl && !( modifiers.testFlag( Qt::ControlModifier ) ) )
- || ( mask & Shift && !( modifiers.testFlag( Qt::ShiftModifier ) ) ) );
+ return modifiers.testFlags( { ( mask & Alt ? Qt::AltModifier : Qt::NoModifier )
+ | ( mask & Win ? Qt::MetaModifier : Qt::NoModifier )
+ | ( mask & Ctrl ? Qt::ControlModifier : Qt::NoModifier )
+ | ( mask & Shift ? Qt::ShiftModifier : Qt::NoModifier ) } );
}
diff --git a/src/main.cc b/src/main.cc
index 3983518086..e7adb1b4aa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -243,16 +243,20 @@ void processCommandLine( QCoreApplication * app, GDOptions * result )
int main( int argc, char ** argv )
{
#if defined( WITH_X11 )
- // GoldenDict use lots of X11 functions and it currently cannot work
- // natively on Wayland. This workaround will force GoldenDict to use
- // XWayland.
-
- if ( qEnvironmentVariableIsEmpty( "GOLDENDICT_FORCE_WAYLAND" ) && !Utils::isWayland() ) {
- char * xdg_envc = getenv( "XDG_SESSION_TYPE" );
- QString xdg_session = xdg_envc ? QString::fromLatin1( xdg_envc ) : QString();
- if ( !QString::compare( xdg_session, QString( "wayland" ), Qt::CaseInsensitive ) ) {
+ // Platform selection: Higher priority to user intention
+ // 1. Respect QT_QPA_PLATFORM if already set.
+ // 2. GOLDENDICT_FORCE_XCB forces Xcb (fallback mode).
+ // 3. GOLDENDICT_FORCE_WAYLAND forces native Wayland.
+ // 4. By default, we let Qt decide (usually native Wayland on Wayland sessions).
+ // This improves HiDPI support but might affect some X11-specific features.
+
+ if ( qEnvironmentVariableIsEmpty( "QT_QPA_PLATFORM" ) ) {
+ if ( qEnvironmentVariableIsSet( "GOLDENDICT_FORCE_XCB" ) ) {
setenv( "QT_QPA_PLATFORM", "xcb", 1 );
}
+ else if ( qEnvironmentVariableIsSet( "GOLDENDICT_FORCE_WAYLAND" ) ) {
+ setenv( "QT_QPA_PLATFORM", "wayland", 1 );
+ }
}
#endif
@@ -278,19 +282,8 @@ int main( int argc, char ** argv )
QGuiApplication::setHighDpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy::PassThrough );
// Registration of custom URL schemes must be done before QCoreApplication/QApplication is created.
- const QStringList localSchemes = { "gdlookup",
- "gdau",
- "gico",
- "qrcx",
- "bres",
- "bword",
- "gdprg",
- "gdvideo",
- "gdtts",
- "gdinternal",
- "entry",
- "iframe-http",
- "iframe-https" };
+ const QStringList localSchemes =
+ { "gdlookup", "gdau", "gico", "qrcx", "bres", "bword", "gdprg", "gdvideo", "gdtts", "gdinternal", "entry" };
for ( const auto & localScheme : localSchemes ) {
QWebEngineUrlScheme webUiScheme( localScheme.toLatin1() );
diff --git a/src/metadata.cc b/src/metadata.cc
index 74c5eb3634..39eeb0ee35 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -3,6 +3,9 @@
#include
#include
#include
+#ifdef Q_OS_FREEBSD
+ #include
+#endif
std::optional< Metadata::result > Metadata::load( std::string_view filepath )
{
diff --git a/src/resourceschemehandler.cc b/src/resourceschemehandler.cc
index 3c85a185b2..dfeaba9b34 100644
--- a/src/resourceschemehandler.cc
+++ b/src/resourceschemehandler.cc
@@ -10,9 +10,13 @@ void ResourceSchemeHandler::requestStarted( QWebEngineUrlRequestJob * requestJob
{
const QUrl url = requestJob->requestUrl();
QString content_type;
- const QMimeType mineType = db.mimeTypeForUrl( url );
const sptr< Dictionary::DataRequest > reply = this->mManager.getResource( url, content_type );
- content_type = mineType.name();
+
+ if ( content_type.isEmpty() )
+ content_type = db.mimeTypeForUrl( url ).name();
+
+ if ( content_type.startsWith( "text/" ) || content_type == "application/javascript" )
+ content_type.append( "; charset=utf-8" );
if ( reply == nullptr ) {
qDebug() << "Resource failed to load: " << url.toString();
diff --git a/src/scripts/gd-builtin.js b/src/scripts/gd-builtin.js
index f6fa075ee8..027053e627 100644
--- a/src/scripts/gd-builtin.js
+++ b/src/scripts/gd-builtin.js
@@ -108,6 +108,7 @@ function gdExpandArticle(id) {
dictNameElement.style.cursor = "pointer";
dictNameElement.title = "";
+ dictNameElement.setAttribute("aria-expanded", "false");
articleview.collapseInHtml(id, true);
} else {
@@ -117,6 +118,7 @@ function gdExpandArticle(id) {
dictNameElement.style.cursor = "default";
dictNameElement.title = "";
+ dictNameElement.setAttribute("aria-expanded", "true");
articleview.collapseInHtml(id, false);
}
diff --git a/src/stylesheets/article-style-darkmode.css b/src/stylesheets/article-style-darkmode.css
index 974e14c3f5..588c7c418f 100644
--- a/src/stylesheets/article-style-darkmode.css
+++ b/src/stylesheets/article-style-darkmode.css
@@ -1,4 +1,4 @@
-div.gdactivearticle .gddictname {
+.gdactivearticle .gddictname {
color: initial;
background: rgb(0, 102, 184);
}
diff --git a/src/stylesheets/article-style.css b/src/stylesheets/article-style.css
index 62beaa73cd..7e75144306 100644
--- a/src/stylesheets/article-style.css
+++ b/src/stylesheets/article-style.css
@@ -38,6 +38,10 @@ h6 {
p,
em,
+article,
+header,
+section,
+main,
span,
div {
unicode-bidi: plaintext;
@@ -66,6 +70,7 @@ pre {
/* Dictionary's name heading */
.gddictname {
+ display: flow-root;
margin-top: 0.5em;
margin-bottom: 0.5em;
font-weight: bold;
@@ -98,7 +103,12 @@ pre {
user-select: none;
}
+/* The separator is now redundant thanks to flow-root and clear:both on body */
.gddictnamebodyseparator {
+ display: none;
+}
+
+.gdarticlebody {
clear: both;
}
@@ -110,7 +120,7 @@ pre {
/* The article span. Here we have a padding/margin hack to make fragment links
behave better (have some space before the start of article) */
.gdarticle {
- display: block;
+ display: flow-root;
padding-top: 1px;
margin-top: -8px;
margin-bottom: 8px;
@@ -586,11 +596,18 @@ div.xdxf {
}
.gdstemmedsuggestion_head {
- margin-left: 11px;
+ margin-left: 12px;
font-style: italic;
}
.gdstemmedsuggestion_body {
+ display: block;
+ width: 100%;
+ margin: 12px;
+
+ box-sizing: border-box;
+ word-break: break-word;
+ line-height: 1.5;
}
/************* Dictd articles *****************/
diff --git a/src/ui/articleview.cc b/src/ui/articleview.cc
index 9883caf320..9a9d077be0 100644
--- a/src/ui/articleview.cc
+++ b/src/ui/articleview.cc
@@ -111,7 +111,8 @@ ArticleView::ArticleView( QWidget * parent,
translateLine( translateLine_ )
{
// setup GUI
- webview = new ArticleWebView( this );
+ webview = new ArticleWebView( this );
+ webview->setPopup( popupView );
ftsSearchPanel = new FtsSearchPanel( this );
searchPanel = new SearchPanel( this );
searchPanel->hide();
@@ -324,6 +325,10 @@ void ArticleView::showDefinition( const QString & word,
contexts.erase( pos );
}
+ if ( popupView ) {
+ reqQuery.addQueryItem( "popup", "1" );
+ }
+
if ( contexts.size() ) {
QBuffer buf;
buf.open( QIODevice::WriteOnly );
@@ -334,12 +339,6 @@ void ArticleView::showDefinition( const QString & word,
reqQuery.addQueryItem( "contexts", QString::fromLatin1( buf.buffer().toBase64() ) );
}
- QString mutedDicts = getMutedForGroup( group );
-
- if ( !mutedDicts.isEmpty() ) {
- reqQuery.addQueryItem( "muted", mutedDicts );
- }
-
req.setQuery( reqQuery );
@@ -957,53 +956,6 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
return false;
}
-QString ArticleView::getMutedForGroup( unsigned group )
-{
- auto mutedDicts = getMutedDictionaries( group );
- if ( !mutedDicts.empty() ) {
- return mutedDicts.join( "," );
- }
-
- return {};
-}
-
-QStringList ArticleView::getMutedDictionaries( unsigned group )
-{
- if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() ) {
- // Dictionary bar is active -- mute the muted dictionaries
- const Instances::Group * groupInstance = dictionaryGroup->getGroupById( group );
-
- // Find muted dictionaries for current group
- const Config::Group * grp = cfg.getGroup( group );
- const Config::DictionarySets * mutedDictionaries;
- if ( group == GroupId::AllGroupId ) {
- mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
- }
- else {
- mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
- }
- if ( !mutedDictionaries ) {
- return {};
- }
-
- QStringList mutedDicts;
-
- if ( groupInstance ) {
- for ( const auto & dictionarie : groupInstance->dictionaries ) {
- QString id = QString::fromStdString( dictionarie->getId() );
-
- if ( mutedDictionaries->contains( id ) ) {
- mutedDicts.append( id );
- }
- }
- }
-
- return mutedDicts;
- }
-
- return {};
-}
-
void ArticleView::linkHovered( const QString & link )
{
QString msg;
@@ -1327,10 +1279,14 @@ ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QStri
void ArticleView::updateMutedContents()
{
+ if ( isWebsiteView ) {
+ return;
+ }
+
QUrl currentUrl = webview->url();
if ( currentUrl.scheme() != "gdlookup" ) {
- return; // Weird url -- do nothing
+ return;
}
unsigned group = getGroup( currentUrl );
@@ -1339,22 +1295,9 @@ void ArticleView::updateMutedContents()
return; // No group in url -- do nothing
}
- QString mutedDicts = getMutedForGroup( group );
-
- if ( Utils::Url::queryItemValue( currentUrl, "muted" ) != mutedDicts ) {
- // The list has changed -- update the url
-
- Utils::Url::removeQueryItem( currentUrl, "muted" );
-
- if ( mutedDicts.size() ) {
- Utils::Url::addQueryItem( currentUrl, "muted", mutedDicts );
- }
-
- load( currentUrl );
-
- //QApplication::setOverrideCursor( Qt::WaitCursor );
- webview->setCursor( Qt::WaitCursor );
- }
+ // We simply reload the article. ArticleNetworkAccessManager will use the updated muted settings.
+ load( currentUrl );
+ webview->setCursor( Qt::WaitCursor );
}
bool ArticleView::canGoBack()
@@ -1395,6 +1338,11 @@ QString ArticleView::getCurrentWord()
return currentWord;
}
+void ArticleView::setCurrentWord( const QString & word )
+{
+ currentWord = word;
+}
+
void ArticleView::back()
{
// Don't allow navigating back to page 0, which is usually the initial
@@ -2070,6 +2018,7 @@ void ArticleView::onJsActiveArticleChanged( const QString & id )
void ArticleView::doubleClicked( QPoint pos )
{
+ GlobalBroadcaster::instance()->is_popup.store( popupView );
// We might want to initiate translation of the selected word
audioPlayer->stop();
if ( cfg.preferences.doubleClickTranslates ) {
@@ -2081,31 +2030,15 @@ void ArticleView::doubleClicked( QPoint pos )
}
emit sendWordToInputLine( selectedText );
- // Do some checks to make sure there's a sensible selection indeed
- if ( Folding::applyWhitespaceOnly( selectedText.toStdU32String() ).size() && selectedText.size() < 60 ) {
- // Initiate translation
- Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
- if ( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) { // open in new tab
- emit showDefinitionInNewTab( selectedText, getGroup( webview->url() ), getCurrentArticle(), Contexts() );
- }
- else {
- const QUrl & ref = webview->url();
- auto groupId = getGroup( ref ); // Try to get group ID from the current article URL
+ if ( popupView ) {
+ return;
+ }
- // If the group can't be determined from the URL (e.g. on internal or
- // external pages), fall back to the currently selected group in the UI.
- if ( groupId == GroupId::NoGroupId || isInternalPage() ) {
- groupId = currentGroupId;
- }
- if ( Utils::Url::hasQueryItem( ref, "dictionaries" ) ) {
- QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" ).split( ",", Qt::SkipEmptyParts );
- showDefinition( selectedText, dictsList, groupId, false );
- }
- else {
- showDefinition( selectedText, groupId, getCurrentArticle() );
- }
- }
+ // Do some checks to make sure there's a sensible selection indeed
+ if ( Folding::applyWhitespaceOnly( selectedText.toStdU32String() ).size() && selectedText.size() < 60 ) {
+ // Send signal to MainWindow to handle translation
+ emit translateSelectedText( selectedText, webview->url(), getCurrentArticle() );
}
}
}
diff --git a/src/ui/articleview.hh b/src/ui/articleview.hh
index 96e780a9ba..8689082c16 100644
--- a/src/ui/articleview.hh
+++ b/src/ui/articleview.hh
@@ -177,6 +177,7 @@ public:
void syncBackgroundColorWithCfgDarkReader() const;
QString getCurrentWord();
+ void setCurrentWord( const QString & word );
/// Returns whether this view is an internal page (welcome, untitled, etc.)
bool isInternalPage() const
@@ -346,6 +347,9 @@ signals:
void saveBookmarkSignal( const QString & bookmark );
+ /// Signal that the user has double-clicked a word and wants to translate it
+ void translateSelectedText( const QString & word, const QUrl & url, const QString & currentArticle );
+
public slots:
/// Opens the search (Ctrl+F)
@@ -414,12 +418,14 @@ private slots:
void dictionaryClear( const ActiveDictIds & ad );
-private:
+public:
/// Deduces group from the url. If there doesn't seem to be any group,
/// returns 0.
unsigned getGroup( const QUrl & );
+private:
+
/// Returns current article in the view, in the form of "gdfrom-xxx" id.
QString getCurrentArticle();
@@ -452,12 +458,6 @@ private:
bool eventFilter( QObject * obj, QEvent * ev ) override;
void performFindOperation( bool backwards );
-
- /// Returns the comma-separated list of dictionary ids which should be muted
- /// for the given group. If there are none, returns empty string.
- QString getMutedForGroup( unsigned group );
-
- QStringList getMutedDictionaries( unsigned group );
};
class ResourceToSaveHandler: public QObject
diff --git a/src/ui/articlewebpage.cc b/src/ui/articlewebpage.cc
index e670004095..7badb24332 100644
--- a/src/ui/articlewebpage.cc
+++ b/src/ui/articlewebpage.cc
@@ -3,8 +3,9 @@
#include "common/globalbroadcaster.hh"
#include
-ArticleWebPage::ArticleWebPage( QObject * parent ):
- QWebEnginePage{ parent }
+ArticleWebPage::ArticleWebPage( QObject * parent, bool isPopup_ ):
+ QWebEnginePage( parent ),
+ isPopup( isPopup_ )
{
}
bool ArticleWebPage::acceptNavigationRequest( const QUrl & resUrl, NavigationType type, bool isMainFrame )
@@ -18,7 +19,9 @@ bool ArticleWebPage::acceptNavigationRequest( const QUrl & resUrl, NavigationTyp
auto [ valid, word ] = Utils::Url::getQueryWord( resUrl );
urlQuery.addQueryItem( "word", word );
urlQuery.addQueryItem( "group", lastReq.group );
- urlQuery.addQueryItem( "muted", lastReq.mutedDicts );
+ if ( lastReq.isPopup ) {
+ urlQuery.addQueryItem( "popup", "1" );
+ }
url.setQuery( urlQuery );
// Use singleShot to avoid synchronous navigation request within acceptNavigationRequest,
@@ -30,7 +33,14 @@ bool ArticleWebPage::acceptNavigationRequest( const QUrl & resUrl, NavigationTyp
//save current gdlookup's values.
if ( url.scheme() == "gdlookup" ) {
lastReq.group = Utils::Url::queryItemValue( url, "group" );
- lastReq.mutedDicts = Utils::Url::queryItemValue( url, "muted" );
+ // Use the parameter if present, otherwise fall back to our own field
+ QString popupParam = Utils::Url::queryItemValue( url, "popup" );
+ if ( !popupParam.isEmpty() ) {
+ lastReq.isPopup = popupParam == "1";
+ }
+ else {
+ lastReq.isPopup = isPopup;
+ }
}
if ( type == QWebEnginePage::NavigationTypeLinkClicked ) {
diff --git a/src/ui/articlewebpage.hh b/src/ui/articlewebpage.hh
index a7c38bca64..ff9644f1d9 100644
--- a/src/ui/articlewebpage.hh
+++ b/src/ui/articlewebpage.hh
@@ -5,7 +5,7 @@
struct LastReqInfo
{
QString group;
- QString mutedDicts;
+ bool isPopup = false;
};
class ArticleWebPage: public QWebEnginePage
@@ -13,7 +13,11 @@ class ArticleWebPage: public QWebEnginePage
Q_OBJECT
public:
- explicit ArticleWebPage( QObject * parent = nullptr );
+ explicit ArticleWebPage( QObject * parent = nullptr, bool isPopup_ = false );
+ void setPopup( bool popup )
+ {
+ isPopup = popup;
+ }
signals:
void linkClicked( const QUrl & url );
@@ -32,4 +36,5 @@ protected:
private:
LastReqInfo lastReq;
+ bool isPopup = false;
};
diff --git a/src/ui/articlewebview.cc b/src/ui/articlewebview.cc
index f7db25ac8a..6435fc420f 100644
--- a/src/ui/articlewebview.cc
+++ b/src/ui/articlewebview.cc
@@ -29,6 +29,13 @@ void ArticleWebView::setUp( Config::Class * _cfg )
setZoomFactor( _cfg->preferences.zoomFactor );
}
+void ArticleWebView::setPopup( bool isPopup )
+{
+ if ( auto page = qobject_cast< ArticleWebPage * >( this->page() ) ) {
+ page->setPopup( isPopup );
+ }
+}
+
QWebEngineView * ArticleWebView::createWindow( QWebEnginePage::WebWindowType type )
{
if ( type == QWebEnginePage::WebWindowType::WebDialog ) {
diff --git a/src/ui/articlewebview.hh b/src/ui/articlewebview.hh
index c15c678758..20b1ee4e21 100644
--- a/src/ui/articlewebview.hh
+++ b/src/ui/articlewebview.hh
@@ -34,6 +34,7 @@ public:
{
selectionBySingleClick = set;
}
+ void setPopup( bool isPopup );
bool eventFilter( QObject * obj, QEvent * ev ) override;
diff --git a/src/ui/edit_sources_models.cc b/src/ui/edit_sources_models.cc
index bbd865521b..851de01900 100644
--- a/src/ui/edit_sources_models.cc
+++ b/src/ui/edit_sources_models.cc
@@ -731,6 +731,10 @@ QVariant WebSitesModel::data( const QModelIndex & index, int role ) const
}
if ( role == Qt::ToolTipRole ) {
+ if ( index.column() == 4 && !GlobalBroadcaster::instance()->getPreference()->openWebsiteInNewTab ) {
+ return tr(
+ "This column is disabled because \"Open website dictionary in separate tab\" option is not enabled in Preferences." );
+ }
return QVariant();
}
@@ -749,13 +753,6 @@ QVariant WebSitesModel::data( const QModelIndex & index, int role ) const
}
}
- // Set appropriate background for disabled Script column based on dark mode
- if ( role == Qt::BackgroundRole && index.column() == 4 ) { // Script column
- if ( !GlobalBroadcaster::instance()->getPreference()->openWebsiteInNewTab ) {
- return getScriptColumnBackground();
- }
- }
-
if ( role == Qt::CheckStateRole && !index.column() ) {
return webSites[ index.row() ].enabled ? Qt::Checked : Qt::Unchecked;
}
diff --git a/src/ui/favoritespanewidget.cc b/src/ui/favoritespanewidget.cc
index 5a7e015def..f7c6e540b8 100644
--- a/src/ui/favoritespanewidget.cc
+++ b/src/ui/favoritespanewidget.cc
@@ -58,7 +58,7 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, std::initializer_list< QAc
connect( m_addFolder, &QAction::triggered, this, &FavoritesPaneWidget::addFolder );
m_clearAll = new QAction( this );
- m_clearAll->setText( tr( "Clear All" ) );
+ m_clearAll->setText( tr( "Clear" ) );
addAction( m_clearAll );
connect( m_clearAll, &QAction::triggered, this, &FavoritesPaneWidget::clearAllItems );
@@ -304,7 +304,7 @@ void FavoritesPaneWidget::clearAllItems()
{
QMessageBox::StandardButton reply;
reply = QMessageBox::question( this,
- tr( "Clear All Items" ),
+ tr( "Clear Favorites" ),
tr( "Are you sure you want to clear all items?" ),
QMessageBox::Yes | QMessageBox::No );
if ( reply == QMessageBox::Yes ) {
diff --git a/src/ui/favoritespanewidget.hh b/src/ui/favoritespanewidget.hh
index e388240dc3..b6b33b54e8 100644
--- a/src/ui/favoritespanewidget.hh
+++ b/src/ui/favoritespanewidget.hh
@@ -52,6 +52,7 @@ public:
void getDataInPlainText( QString & dataStr );
bool setDataFromXml( const QString & dataStr );
bool setDataFromTxt( const QString & dataStr );
+ void clearAllItems();
void setFocusOnTree()
{
@@ -83,7 +84,6 @@ private slots:
void folderActivation();
void copySelectedItems();
void addFolder();
- void clearAllItems();
public slots:
/// Add if exist, remove if not
void addRemoveWordInActiveFav( const QString & word );
diff --git a/src/ui/groupcombobox.cc b/src/ui/groupcombobox.cc
index 3d508630df..1d5179ecf0 100644
--- a/src/ui/groupcombobox.cc
+++ b/src/ui/groupcombobox.cc
@@ -11,6 +11,7 @@ GroupComboBox::GroupComboBox( QWidget * parent ):
selectNextAction( this ),
selectPreviousAction( this )
{
+ setIconSize( QSize( 16, 16 ) );
setSizeAdjustPolicy( AdjustToContents );
setToolTip( tr( "Choose a Group (Alt+G)" ) );
@@ -62,6 +63,31 @@ void GroupComboBox::fill( const Instances::Groups & groups )
shortcuts.insert( id, x );
}
}
+ updateGeometry();
+}
+
+QSize GroupComboBox::sizeHint() const
+{
+ QSize s = QComboBox::sizeHint();
+ if ( count() > 0 ) {
+ QFontMetrics fm( font() );
+ int maxW = 0;
+ for ( int i = 0; i < count(); ++i ) {
+ maxW = qMax( maxW, fm.horizontalAdvance( itemText( i ) ) );
+ }
+
+ int iconW = iconSize().width();
+ if ( iconW > 0 ) {
+ iconW += 6; // Icon plus some margin
+ }
+
+ // 35 pixels for the arrow and internal padding
+ int estimated = iconW + maxW + 35;
+ if ( s.width() < estimated ) {
+ s.setWidth( estimated );
+ }
+ }
+ return s;
}
bool GroupComboBox::event( QEvent * event )
diff --git a/src/ui/groupcombobox.hh b/src/ui/groupcombobox.hh
index b7ce0b38ec..c8d3f53387 100644
--- a/src/ui/groupcombobox.hh
+++ b/src/ui/groupcombobox.hh
@@ -34,11 +34,13 @@ public:
protected:
/// We handle shortcut events here.
- virtual bool event( QEvent * event );
+ virtual bool event( QEvent * event ) override;
+ virtual QSize sizeHint() const override;
- /// Work around the never-changing QComboBox::minimumSizeHint(), which prevents
- /// reducing the width of a group combobox beyond the value at application start.
- // virtual QSize minimumSizeHint() const { return sizeHint(); }
+ virtual QSize minimumSizeHint() const override
+ {
+ return sizeHint();
+ }
private slots:
diff --git a/src/ui/maintabwidget.hh b/src/ui/maintabwidget.hh
index 31d83c20c4..d72a76a556 100644
--- a/src/ui/maintabwidget.hh
+++ b/src/ui/maintabwidget.hh
@@ -14,6 +14,7 @@ class MainTabWidget: public QTabWidget
Q_PROPERTY( bool hideSingleTab READ isHideSingleTab WRITE setHideSingleTab )
public:
+ using QTabWidget::tabBar;
MainTabWidget( QWidget * parent = 0 );
bool isHideSingleTab() const
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index 7c15759313..479e1f924f 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -12,6 +12,7 @@
#include "edit_dictionaries.hh"
#include "dict/loaddictionaries.hh"
#include "preferences.hh"
+#include "globalregex.hh"
#include "about.hh"
#include "mruqmenu.hh"
#include "gestures.hh"
@@ -157,11 +158,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
history( cfg_.preferences.maxStringsInHistory, cfg_.maxHeadwordSize ),
dictionaryBar( this, configEvents, cfg.preferences.maxDictionaryRefsInContextMenu ),
articleMaker( dictionaries, groupInstances, cfg.preferences ),
- articleNetMgr( this,
- dictionaries,
- articleMaker,
- cfg.preferences.disallowContentFromOtherSites,
- cfg.preferences.hideGoldenDictHeader ),
+ articleNetMgr( this, dictionaries, articleMaker, cfg.preferences.disallowContentFromOtherSites ),
dictNetMgr( this ),
audioPlayerFactory(
cfg.preferences.useInternalPlayer, cfg.preferences.internalPlayerBackend, cfg.preferences.audioPlaybackProgram ),
@@ -193,11 +190,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localScheme.toLatin1(), localSchemeHandler );
}
- iframeSchemeHandler = new IframeSchemeHandler( this );
- QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( ( Config::WEBSITE_PROXY_PREFIX + "http" ).toUtf8(),
- iframeSchemeHandler );
- QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( ( Config::WEBSITE_PROXY_PREFIX + "https" ).toUtf8(),
- iframeSchemeHandler );
QStringList localSchemes = { "gdau", "gico", "qrcx", "bres", "gdprg", "gdvideo", "gdtts" };
resourceSchemeHandler = new ResourceSchemeHandler( articleNetMgr, this );
@@ -207,11 +199,11 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
QWebEngineProfile::defaultProfile()->setUrlRequestInterceptor( new WebUrlRequestInterceptor( this ) );
- if ( !cfg.preferences.hideGoldenDictHeader ) {
- QWebEngineProfile::defaultProfile()->setHttpUserAgent( QWebEngineProfile::defaultProfile()->httpUserAgent()
- + " GoldenDict/WebEngine" );
- }
+ // Identify as GoldenDict, but avoid standard "QtWebEngine/..." identifier which some sites might block
+ QString userAgent = QWebEngineProfile::defaultProfile()->httpUserAgent();
+ userAgent.replace( RX::qtWebEngineUserAgent, "" );
+ QWebEngineProfile::defaultProfile()->setHttpUserAgent( userAgent );
#ifdef EPWING_SUPPORT
Epwing::initialize();
#endif
@@ -246,11 +238,11 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
groupListInToolbar->setObjectName( "groupListToolbar" );
groupListInToolbar->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding );
groupListInToolbar->setSizeAdjustPolicy( QComboBox::AdjustToContents );
- translateBoxLayout->addWidget( groupListInToolbar );
+ translateBoxLayout->addWidget( groupListInToolbar, 0 );
translateBox = new TranslateBox( navToolbar );
translateBox->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::MinimumExpanding );
- translateBoxLayout->addWidget( translateBox );
+ translateBoxLayout->addWidget( translateBox, 1 );
translateBoxToolBarAction = navToolbar->addWidget( translateBoxWidget );
// popup
@@ -761,8 +753,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
this,
&MainWindow::proxyAuthentication );
- setupNetworkCache( cfg.preferences.maxNetworkCacheSize );
-
makeDictionaries();
// After we have dictionaries and groups, we can populate history
@@ -811,26 +801,11 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
}
// Scanpopup related
- scanPopup = new ScanPopup( nullptr, cfg, articleNetMgr, history );
-
- scanPopup->setStyleSheet( styleSheet() );
-
- connect( scanPopup, &ScanPopup::editGroupRequest, this, &MainWindow::editDictionaries, Qt::QueuedConnection );
-
- connect( scanPopup, &ScanPopup::sendPhraseToMainWindow, this, [ this ]( const QString & word ) {
- wordReceived( word );
- } );
-
- connect( scanPopup, &ScanPopup::inspectSignal, this, &MainWindow::inspectElement );
- connect( scanPopup, &ScanPopup::forceAddWordToHistory, this, &MainWindow::forceAddWordToHistory );
- connect( scanPopup, &ScanPopup::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
- connect( scanPopup, &ScanPopup::openDictionaryFolder, this, &MainWindow::openDictionaryFolder );
- connect( scanPopup, &ScanPopup::sendWordToHistory, this, &MainWindow::addWordToHistory );
- connect( this, &MainWindow::setPopupGroupByName, scanPopup, &ScanPopup::setGroupByName );
- connect( scanPopup,
- &ScanPopup::sendWordToFavorites,
- ui.favoritesPaneWidget,
- &FavoritesPaneWidget::addRemoveWordInActiveFav );
+ // Deferred initialization until first use or if scanning is enabled
+ // Use a delayed call to avoid blocking the main window's initial show-up
+ if ( cfg.preferences.startWithScanPopupOn ) {
+ QTimer::singleShot( 1000, this, &MainWindow::ensureScanPopup );
+ }
clipboardListener = clipboardListener::get_impl( this );
connect( clipboardListener, &BaseClipboardListener::changed, this, &MainWindow::clipboardChange );
@@ -868,7 +843,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
updateSearchPaneAndBar( cfg.preferences.searchInDock );
ui.searchPane->setVisible( cfg.preferences.searchInDock );
- trayIconUpdateOrInit();
+ QTimer::singleShot( 1000, this, &MainWindow::trayIconUpdateOrInit );
// Update zoomers
adjustCurrentZoomFactor();
@@ -878,7 +853,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
setAutostart( cfg.preferences.autoStart );
// Initialize global hotkeys
- installHotKeys();
+ QTimer::singleShot( 2000, this, &MainWindow::installHotKeys );
if ( cfg.preferences.alwaysOnTop ) {
on_alwaysOnTop_triggered( true );
@@ -890,7 +865,10 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
}
// makeDictionaries() didn't do deferred init - we do it here, at the end.
- doDeferredInit( dictionaries );
+ // Use a delay to let the UI breathe first
+ QTimer::singleShot( 3000, this, [ this ]() {
+ doDeferredInit( dictionaries );
+ } );
updateStatusLine();
@@ -913,7 +891,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
navForward->setIcon( QIcon( ":/icons/previous.svg" ) );
}
- inspector.reset( new ArticleInspector( this ) );
+ // inspector.reset( new ArticleInspector( this ) ); // Moved to lazy initialization in inspectElement()
#ifdef Q_OS_WIN
// Regiser and update URL Scheme for windows
@@ -934,10 +912,40 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
iconSizeActionTriggered( nullptr );
if ( cfg.preferences.checkForNewReleases ) {
- QTimer::singleShot( 0, this, &MainWindow::checkNewRelease );
+ QTimer::singleShot( 10000, this, &MainWindow::checkNewRelease );
}
}
+
+void MainWindow::ensureScanPopup()
+{
+ if ( scanPopup ) {
+ return;
+ }
+
+ // Scanpopup related
+ scanPopup = new ScanPopup( nullptr, cfg, articleNetMgr, history );
+
+ scanPopup->setStyleSheet( styleSheet() );
+
+ connect( scanPopup, &ScanPopup::editGroupRequest, this, &MainWindow::editDictionaries, Qt::QueuedConnection );
+
+ connect( scanPopup, &ScanPopup::sendPhraseToMainWindow, this, [ this ]( const QString & word ) {
+ wordReceived( word );
+ } );
+
+ connect( scanPopup, &ScanPopup::inspectSignal, this, &MainWindow::inspectElement );
+ connect( scanPopup, &ScanPopup::forceAddWordToHistory, this, &MainWindow::forceAddWordToHistory );
+ connect( scanPopup, &ScanPopup::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
+ connect( scanPopup, &ScanPopup::openDictionaryFolder, this, &MainWindow::openDictionaryFolder );
+ connect( scanPopup, &ScanPopup::sendWordToHistory, this, &MainWindow::addWordToHistory );
+ connect( this, &MainWindow::setPopupGroupByName, scanPopup, &ScanPopup::setGroupByName );
+ connect( scanPopup,
+ &ScanPopup::sendWordToFavorites,
+ ui.favoritesPaneWidget,
+ &FavoritesPaneWidget::addRemoveWordInActiveFav );
+}
+
void MainWindow::prefixMatchUpdated()
{
updateMatchResults( false );
@@ -1010,13 +1018,14 @@ void MainWindow::refreshTranslateLine()
// Visually mark the input line to mark if there's no results
bool setMark = wordFinder.getResults().empty() && !wordFinder.wasSearchUncertain();
Utils::Widget::setNoResultColor( translateLine, setMark );
+ if ( !cfg.preferences.searchInDock ) {
+ translateBox->setNoResults( setMark );
+ }
}
void MainWindow::clipboardChange( QClipboard::Mode m )
{
- if ( !scanPopup ) {
- return;
- }
+ ensureScanPopup();
#if defined( WITH_X11 )
if ( m == QClipboard::Clipboard ) {
@@ -1222,12 +1231,6 @@ void MainWindow::removeGroupComboBoxActionsFromDialog( QDialog * dialog, GroupCo
void MainWindow::commitData()
{
- if ( cfg.preferences.clearNetworkCacheOnExit ) {
- if ( QAbstractNetworkCache * cache = articleNetMgr.cache() ) {
- cache->clear();
- }
- }
-
//if the dictionaries is empty ,large chance that the config has corrupt.
if ( cfg.preferences.removeInvalidIndexOnExit && !dictMap.isEmpty() ) {
const QDir dir( Config::getIndexDir() );
@@ -1433,6 +1436,9 @@ void MainWindow::updateAppearances( const QString & addonStyle,
if ( !css.isEmpty() ) {
setStyleSheet( css );
+ if ( scanPopup ) {
+ scanPopup->setStyleSheet( css );
+ }
}
}
@@ -1493,33 +1499,37 @@ void MainWindow::wheelEvent( QWheelEvent * ev )
void MainWindow::closeEvent( QCloseEvent * ev )
{
- if ( cfg.preferences.enableTrayIcon && cfg.preferences.closeToTray ) {
- if ( !cfg.preferences.searchInDock ) {
- translateBox->setPopupEnabled( false );
- }
+ // If tray icon is disabled or closing to tray is not enabled, quit the application
+ if ( !cfg.preferences.enableTrayIcon || !cfg.preferences.closeToTray ) {
+ ev->accept();
+ quitApp();
+ return;
+ }
+
+ // Hide translation popup if necessary
+ if ( !cfg.preferences.searchInDock ) {
+ translateBox->setPopupEnabled( false );
+ }
#ifdef Q_OS_MACOS
- if ( !ev->spontaneous() || !isVisible() ) {
- return;
- }
+ // On macOS, ignore non-spontaneous events or already hidden windows to avoid redundant logic
+ if ( !ev->spontaneous() || !isVisible() ) {
+ return;
+ }
#endif
+
+ // Handle window hiding based on platform characteristics
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
- // Don't ignore the close event, because doing so cancels session logout if
- // the main window is visible when the user attempts to log out.
- // The main window will be only hidden, because QApplication::quitOnLastWindowClosed
- // property is false and Qt::WA_DeleteOnClose widget is not set.
- Q_ASSERT( !QApplication::quitOnLastWindowClosed() );
- Q_ASSERT( !testAttribute( Qt::WA_DeleteOnClose ) );
+ // On Linux/Unix, do not call ignore() as it blocks session logout.
+ // The window is hidden instead of closed because quitOnLastWindowClosed is false.
+ Q_ASSERT( !QApplication::quitOnLastWindowClosed() );
+ Q_ASSERT( !testAttribute( Qt::WA_DeleteOnClose ) );
#else
- // Ignore the close event because closing the main window breaks global hotkeys on Windows.
- ev->ignore();
- hide();
+ // On Windows and macOS (manual close), ignore the event and hide the window.
+ // This ensures global hotkey hooks remain valid on Windows.
+ ev->ignore();
+ hide();
#endif
- }
- else {
- ev->accept();
- quitApp();
- }
}
void MainWindow::quitApp()
@@ -1575,33 +1585,6 @@ void MainWindow::applyProxySettings()
QNetworkProxy::setApplicationProxy( proxy );
}
-void MainWindow::setupNetworkCache( int maxSize )
-{
- // x << 20 == x * 2^20 converts mebibytes to bytes.
- const qint64 maxCacheSizeInBytes = maxSize <= 0 ? qint64( 0 ) : static_cast< qint64 >( maxSize ) << 20;
-
- if ( QAbstractNetworkCache * abstractCache = articleNetMgr.cache() ) {
- QNetworkDiskCache * const diskCache = qobject_cast< QNetworkDiskCache * >( abstractCache );
- Q_ASSERT_X( diskCache, Q_FUNC_INFO, "Unexpected network cache type." );
- diskCache->setMaximumCacheSize( maxCacheSizeInBytes );
- return;
- }
- if ( maxCacheSizeInBytes == 0 ) {
- return; // There is currently no cache and it is not needed.
- }
-
- QString cacheDirectory = Config::getCacheDir();
- if ( !QDir().mkpath( cacheDirectory ) ) {
- cacheDirectory = QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
- qWarning( "Cannot create a cache directory %s. use default cache path.", cacheDirectory.toUtf8().constData() );
- }
-
- QNetworkDiskCache * const diskCache = new QNetworkDiskCache( this );
- diskCache->setMaximumCacheSize( maxCacheSizeInBytes );
- diskCache->setCacheDirectory( cacheDirectory );
- articleNetMgr.setCache( diskCache );
-}
-
void MainWindow::makeDictionaries()
{
@@ -1839,6 +1822,7 @@ ArticleView * MainWindow::createNewTab( bool switchToIt, const QString & name )
connect( view, &ArticleView::zoomOut, this, &MainWindow::zoomout );
connect( view, &ArticleView::saveBookmarkSignal, this, &MainWindow::addBookmarkToFavorite );
+ connect( view, &ArticleView::translateSelectedText, this, &MainWindow::handleTranslateSelectedText );
connect( ui.searchInPageAction, &QAction::triggered, view, [ this, view ]() {
#ifdef Q_OS_MACOS
@@ -1874,6 +1858,9 @@ ArticleView * MainWindow::createNewTab( bool switchToIt, const QString & name )
void MainWindow::inspectElement( QWebEnginePage * page )
{
+ if ( !inspector ) {
+ inspector.reset( new ArticleInspector( this ) );
+ }
inspector->triggerAction( page );
}
@@ -2247,7 +2234,9 @@ void MainWindow::editDictionaries( unsigned editDictionaryGroup )
}
}
- scanPopup->refresh();
+ if ( scanPopup ) {
+ scanPopup->refresh();
+ }
installHotKeys();
}
@@ -2303,10 +2292,6 @@ void MainWindow::editPreferences()
ui.favoritesPaneWidget->setSaveInterval( p.favoritesStoreInterval );
}
- if ( cfg.preferences.maxNetworkCacheSize != p.maxNetworkCacheSize ) {
- setupNetworkCache( p.maxNetworkCacheSize );
- }
-
bool needReload =
( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.addonStyle != p.addonStyle
|| cfg.preferences.darkReaderMode != p.darkReaderMode
@@ -2316,8 +2301,6 @@ void MainWindow::editPreferences()
|| p.darkReaderMode == Config::Dark::Auto // We cannot know if a reload is needed, just do it regardless.
);
- // This line must be here because the components below require cfg's value to reconfigure
- // After this point, p must not be accessed.
cfg.preferences = p;
// Loop through all tabs and reload pages due to ArticleMaker's change.
@@ -2367,11 +2350,16 @@ void MainWindow::editPreferences()
Config::save( cfg );
}
- scanPopup->refresh();
+ if ( scanPopup ) {
+ scanPopup->refresh();
+ }
installHotKeys();
ftsIndexing.setDictionaries( dictionaries );
- ftsIndexing.doIndexing();
+ // Delay indexing to avoid high IO load during startup
+ QTimer::singleShot( 5000, this, [ this ]() {
+ ftsIndexing.doIndexing();
+ } );
}
void MainWindow::currentGroupChanged( int )
@@ -2475,6 +2463,9 @@ void MainWindow::updateSuggestionList( const QString & newValue )
// Reset the noResults mark if it's on right now
Utils::Widget::setNoResultColor( translateLine, false );
+ if ( !cfg.preferences.searchInDock ) {
+ translateBox->setNoResults( false );
+ }
return;
}
@@ -2816,6 +2807,42 @@ void MainWindow::showDefinitionInNewTab( const QString & word,
createNewTab( !cfg.preferences.newTabsOpenInBackground, word )->showDefinition( word, group, fromArticle, contexts );
}
+void MainWindow::handleTranslateSelectedText( const QString & word, const QUrl & url, const QString & currentArticle )
+{
+ // Initiate translation
+ Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
+ if ( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) { // open in new tab
+ // Create a new tab and show definition there
+ ArticleView * newView = createNewTab( !cfg.preferences.newTabsOpenInBackground, word );
+ auto groupId = newView->getGroup( url );
+ if ( groupId == GroupId::NoGroupId ) {
+ groupId = groupList->getCurrentGroup();
+ }
+ newView->showDefinition( word, groupId, currentArticle, Contexts() );
+ }
+ else {
+ // Get the current active ArticleView
+ ArticleView * currentView = getFirstNonWebSiteArticleView();
+ if ( currentView ) {
+ // Get group ID from the URL or fall back to current group
+ auto groupId = currentView->getGroup( url );
+ if ( groupId == GroupId::NoGroupId || currentView->isInternalPage() ) {
+ groupId = groupList->getCurrentGroup();
+ }
+
+ // If the URL has dictionaries query parameter, use those dictionaries
+ if ( Utils::Url::hasQueryItem( url, "dictionaries" ) ) {
+ QStringList dictsList = Utils::Url::queryItemValue( url, "dictionaries" ).split( ",", Qt::SkipEmptyParts );
+ currentView->showDefinition( word, dictsList, groupId, false );
+ }
+ else {
+ // Otherwise show definition in current tab
+ currentView->showDefinition( word, groupId, currentArticle );
+ }
+ }
+ }
+}
+
void MainWindow::activeArticleChanged( const ArticleView * view, const QString & id )
{
if ( view != getCurrentArticleView() || view->isWebsite() ) {
@@ -2872,8 +2899,6 @@ void MainWindow::mutedDictionariesChanged()
void MainWindow::showHistoryItem( const QString & word )
{
- // qDebug() << "Showing history item" << word;
-
history.enableAdd( false );
setInputLineText( word, WildcardPolicy::EscapeWildcards, DisablePopup );
@@ -2884,6 +2909,8 @@ void MainWindow::showHistoryItem( const QString & word )
void MainWindow::showTranslationFor( const QString & word, unsigned inGroup, const QString & scrollTo )
{
+ GlobalBroadcaster::instance()->is_popup = false;
+
ArticleView * view = getFirstNonWebSiteArticleView();
navPronounce->setEnabled( false );
@@ -2989,7 +3016,7 @@ void MainWindow::toggleMainWindow( bool ensureShow )
void MainWindow::installHotKeys()
{
#if defined( WITH_X11 )
- if ( !qEnvironmentVariableIsEmpty( "GOLDENDICT_FORCE_WAYLAND" ) || Utils::isWayland() ) {
+ if ( QGuiApplication::platformName() != "xcb" ) {
return;
}
#endif
@@ -3028,9 +3055,12 @@ void MainWindow::installHotKeys()
void MainWindow::hotKeyActivated( int hk )
{
if ( !hk ) {
+ GlobalBroadcaster::instance()->is_popup = false;
toggleMainWindow( false );
}
- else if ( scanPopup ) {
+ else {
+ ensureScanPopup();
+ GlobalBroadcaster::instance()->is_popup = true;
#if defined( Q_OS_UNIX ) && !defined( Q_OS_MACOS )
// When the user requests translation with the Ctrl+C+C hotkey in certain apps
// on some GNU/Linux systems, GoldenDict appears to handle Ctrl+C+C before the
@@ -3119,6 +3149,7 @@ void MainWindow::trayIconActivated( QSystemTrayIcon::ActivationReason r )
case QSystemTrayIcon::MiddleClick:
// Middle mouse click on Tray translates selection
// it is functional like as stardict
+ ensureScanPopup();
scanPopup->translateWordFromSelection();
break;
default:
@@ -3207,7 +3238,9 @@ void MainWindow::iconSizeActionTriggered( QAction * /*action*/ )
dictionaryBar.setDictionaryIconSize( getIconSizeLogical() );
- scanPopup->setDictionaryIconSize();
+ if ( scanPopup ) {
+ scanPopup->setDictionaryIconSize();
+ }
}
void MainWindow::toggleMenuBarTriggered( bool announce )
@@ -3256,8 +3289,20 @@ void MainWindow::toggleMenuBarTriggered( bool announce )
void MainWindow::on_clearHistory_triggered()
{
- history.clear();
- history.save();
+ QMessageBox::StandardButton reply;
+ reply = QMessageBox::question( this,
+ tr( "Clear History" ),
+ tr( "Are you sure you want to clear all history items?" ),
+ QMessageBox::Yes | QMessageBox::No );
+ if ( reply == QMessageBox::Yes ) {
+ history.clear();
+ history.save();
+ }
+}
+
+void MainWindow::on_clearFavorites_triggered()
+{
+ ui.favoritesPaneWidget->clearAllItems();
}
void MainWindow::on_newTab_triggered()
@@ -3387,7 +3432,9 @@ void MainWindow::on_rescanFiles_triggered()
updateGroupList();
- scanPopup->refresh();
+ if ( scanPopup ) {
+ scanPopup->refresh();
+ }
installHotKeys();
updateSuggestionList();
@@ -3492,7 +3539,9 @@ void MainWindow::scaleArticlesByCurrentZoomFactor()
view.setZoomFactor( cfg.preferences.zoomFactor );
}
- scanPopup->applyZoomFactor();
+ if ( scanPopup ) {
+ scanPopup->applyZoomFactor();
+ }
}
void MainWindow::messageFromAnotherInstanceReceived( const QString & message )
@@ -3514,7 +3563,8 @@ void MainWindow::messageFromAnotherInstanceReceived( const QString & message )
if ( message.left( 15 ) == "translateWord: " ) {
auto word = message.mid( 15 );
- if ( ( consoleWindowOnce == "popup" ) && scanPopup ) {
+ if ( consoleWindowOnce == "popup" ) {
+ ensureScanPopup();
scanPopup->translateWord( word );
}
else if ( consoleWindowOnce == "main" ) {
@@ -4207,8 +4257,12 @@ void MainWindow::showFTSIndexingName( const QString & name )
}
}
-void MainWindow::openWebsiteInNewTab( QString name, QString url, QString dictId )
+void MainWindow::openWebsiteInNewTab( QString name, QString url, QString dictId, bool isPopup, QString word )
{
+ if ( isPopup ) {
+ return;
+ }
+
auto view = findArticleViewByDictId( dictId );
if ( view == nullptr ) {
view = createNewTab( false, name );
@@ -4217,6 +4271,11 @@ void MainWindow::openWebsiteInNewTab( QString name, QString url, QString dictId
view->setActiveArticleId( dictId );
}
+ // Set the current word for the website view
+ if ( !word.isEmpty() ) {
+ view->setCurrentWord( word );
+ }
+
view->load( url, name );
}
@@ -4330,6 +4389,7 @@ void MainWindow::setGroupByName( const QString & name, bool main_window )
}
}
else {
+ ensureScanPopup();
emit setPopupGroupByName( name );
}
}
diff --git a/src/ui/mainwindow.hh b/src/ui/mainwindow.hh
index 5dc0092904..e44cc0df3a 100644
--- a/src/ui/mainwindow.hh
+++ b/src/ui/mainwindow.hh
@@ -24,7 +24,6 @@
#include "base_type.hh"
#include "hotkey/hotkeywrapper.hh"
#include "resourceschemehandler.hh"
-#include "iframeschemehandler.hh"
#ifdef WITH_X11
#include
#endif
@@ -164,7 +163,6 @@ private:
QIcon starIcon, blueStarIcon;
LocalSchemeHandler * localSchemeHandler;
- IframeSchemeHandler * iframeSchemeHandler;
ResourceSchemeHandler * resourceSchemeHandler;
BaseClipboardListener * clipboardListener;
@@ -174,6 +172,9 @@ private:
// On macOS, this will be just Fusion.
QString defaultInterfaceStyle;
#endif
+ /// Ensures the scan popup is created and connected
+ void ensureScanPopup();
+
/// Applies Qt stylesheets, use Windows dark palette etc....
void updateAppearances( const QString & addonStyle,
const QString & displayStyle,
@@ -192,7 +193,6 @@ private:
void closeEvent( QCloseEvent * );
void applyProxySettings();
- void setupNetworkCache( int maxSize );
void makeDictionaries();
void updateStatusLine();
void updateGroupList( bool reload = true );
@@ -283,7 +283,7 @@ private slots:
void openDictionaryFolder( const QString & id );
void showFTSIndexingName( const QString & name );
- void openWebsiteInNewTab( QString name, QString url, QString dictId );
+ void openWebsiteInNewTab( QString name, QString url, QString dictId, bool isPopup, QString word = QString() );
void handleAddToFavoritesButton();
@@ -396,6 +396,7 @@ private slots:
void toggleMenuBarTriggered( bool announce = true );
void on_clearHistory_triggered();
+ void on_clearFavorites_triggered();
void on_newTab_triggered();
@@ -441,6 +442,9 @@ private slots:
void closeHeadwordsDialog();
+ /// Handle translate selected text from ArticleView
+ void handleTranslateSelectedText( const QString & word, const QUrl & url, const QString & currentArticle );
+
void focusHeadwordsDialog();
void focusArticleView();
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 9565f50b06..4286bac699 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -128,6 +128,8 @@
Ctrl+E
+
+
+ &Clear
+
+
diff --git a/src/ui/preferences.cc b/src/ui/preferences.cc
index 000c11778f..aebf45e323 100644
--- a/src/ui/preferences.cc
+++ b/src/ui/preferences.cc
@@ -168,11 +168,6 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
ui.InterfaceStyle->hide();
#endif
-#ifdef Q_OS_WIN32
- // 1 MB stands for 2^20 bytes on Windows. "MiB" is never used by this OS.
- ui.maxNetworkCacheSize->setSuffix( " MB" );
-#endif
- ui.maxNetworkCacheSize->setToolTip( ui.maxNetworkCacheSize->toolTip().arg( Config::getCacheDir() ) );
ui.newTabsOpenAfterCurrentOne->setChecked( p.newTabsOpenAfterCurrentOne );
ui.newTabsOpenInBackground->setChecked( p.newTabsOpenInBackground );
@@ -365,9 +360,6 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
ui.checkForNewReleases->setChecked( p.checkForNewReleases );
ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
- ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader );
- ui.maxNetworkCacheSize->setValue( p.maxNetworkCacheSize );
- ui.clearNetworkCacheOnExit->setChecked( p.clearNetworkCacheOnExit );
//Misc
ui.removeInvalidIndexOnExit->setChecked( p.removeInvalidIndexOnExit );
@@ -557,9 +549,6 @@ Config::Preferences Preferences::getPreferences()
p.checkForNewReleases = ui.checkForNewReleases->isChecked();
p.disallowContentFromOtherSites = ui.disallowContentFromOtherSites->isChecked();
- p.hideGoldenDictHeader = ui.hideGoldenDictHeader->isChecked();
- p.maxNetworkCacheSize = ui.maxNetworkCacheSize->value();
- p.clearNetworkCacheOnExit = ui.clearNetworkCacheOnExit->isChecked();
p.removeInvalidIndexOnExit = ui.removeInvalidIndexOnExit->isChecked();
p.enableApplicationLog = ui.enableApplicationLog->isChecked();
@@ -673,10 +662,6 @@ void Preferences::customProxyToggled( bool )
ui.customSettingsGroup->setEnabled( ui.customProxy->isChecked() && ui.useProxyServer->isChecked() );
}
-void Preferences::on_maxNetworkCacheSize_valueChanged( int value )
-{
- ui.clearNetworkCacheOnExit->setEnabled( value != 0 );
-}
void Preferences::on_collapseBigArticles_toggled( bool checked )
{
diff --git a/src/ui/preferences.hh b/src/ui/preferences.hh
index 75b66b6952..6dcdf0b95e 100644
--- a/src/ui/preferences.hh
+++ b/src/ui/preferences.hh
@@ -48,7 +48,6 @@ private slots:
void on_useExternalPlayer_toggled( bool enabled );
void customProxyToggled( bool );
- void on_maxNetworkCacheSize_valueChanged( int value );
void on_collapseBigArticles_toggled( bool checked );
void on_limitInputPhraseLength_toggled( bool checked );
diff --git a/src/ui/preferences.ui b/src/ui/preferences.ui
index 58e460d89e..c76a4e3a3b 100644
--- a/src/ui/preferences.ui
+++ b/src/ui/preferences.ui
@@ -1343,70 +1343,6 @@ you are browsing. If some site breaks because of this, try disabling this.
- -
-
-
- Some sites detect GoldenDict via HTTP headers and block the requests.
-Enable this option to workaround the problem.
-
-
- Do not identify GoldenDict in HTTP headers
-
-
-
- -
-
- -
-
-
- Maximum network cache size:
-
-
-
- -
-
-
- Maximum disk space occupied by GoldenDict's network cache in
-%1
-If set to 0 the network disk cache will be disabled.
-
-
- MiB
-
-
- 2000
-
-
- 50
-
-
-
- -
-
-
- When this option is enabled, GoldenDict
-clears its network cache from disk during exit.
-
-
- Clear network cache on exit
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
@@ -1948,7 +1884,7 @@ from Stardict, Babylon and GLS dictionaries
-
- Open website dictionary in seperate tab
+ Open website dictionary in separate tab
diff --git a/src/ui/scanpopup.cc b/src/ui/scanpopup.cc
index 85979b666f..696b9fa2c0 100644
--- a/src/ui/scanpopup.cc
+++ b/src/ui/scanpopup.cc
@@ -58,6 +58,7 @@ ScanPopup::ScanPopup( QWidget * parent,
openSearchAction( this ),
wordFinder( this ),
dictionaryBar( this, configEvents, cfg.preferences.maxDictionaryRefsInContextMenu ),
+ articleNetMgr( articleNetMgr ),
hideTimer( this )
{
// Init UI
@@ -83,7 +84,7 @@ ScanPopup::ScanPopup( QWidget * parent,
foundBar->setAllowedAreas( Qt::LeftToolBarArea | Qt::RightToolBarArea );
// UI style
- searchBar->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Maximum );
+ searchBar->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
searchBar->setMovable( false );
toolBar->setFloatable( false );
dictionaryBar.setFloatable( false );
@@ -107,8 +108,19 @@ ScanPopup::ScanPopup( QWidget * parent,
mainStatusBar = new MainStatusBar( this );
+ tabWidget = new MainTabWidget( this );
+ tabWidget->setTabsClosable( true );
+ tabWidget->setHideSingleTab( true );
+ tabWidget->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
+ connect( tabWidget, &QTabWidget::tabCloseRequested, this, [ this ]( int index ) {
+ if ( index > 0 ) {
+ auto widget = tabWidget->widget( index );
+ tabWidget->removeTab( index );
+ widget->deleteLater();
+ }
+ } );
- definition = new ArticleView( this,
+ definition = new ArticleView( tabWidget,
articleNetMgr,
true,
cfg,
@@ -116,8 +128,22 @@ ScanPopup::ScanPopup( QWidget * parent,
dictionaryBar.toggleViewAction(),
cfg.lastPopupGroupId );
+ tabWidget->addTab( definition, tr( "Definition" ) );
+ tabWidget->tabBar()->setTabButton( 0, QTabBar::RightSide, nullptr );
+ tabWidget->tabBar()->setTabButton( 0, QTabBar::LeftSide, nullptr );
+
resize( 247, 400 );
+ // Set maximum width based on screen size
+ QScreen * screen = QGuiApplication::primaryScreen();
+ if ( screen ) {
+ int maxWidth = screen->availableGeometry().width() * 0.8; // 80% of screen width
+ setMaximumWidth( maxWidth );
+ }
+
+ translateBox->setMaximumWidth( 200 );
+ groupList->setMaximumWidth( 200 );
+
connect( definition, &ArticleView::inspectSignal, this, &ScanPopup::inspectElementWhenPinned );
connect( definition, &ArticleView::forceAddWordToHistory, this, &ScanPopup::forceAddWordToHistory );
connect( this, &ScanPopup::closeMenu, definition, &ArticleView::closePopupMenu );
@@ -142,7 +168,7 @@ ScanPopup::ScanPopup( QWidget * parent,
translateLineDefaultFont = translateBox->font();
groupListDefaultFont = groupList->font();
- setCentralWidget( definition );
+ setCentralWidget( tabWidget );
translateBox->translateLine()->installEventFilter( this );
definition->installEventFilter( this );
@@ -279,6 +305,17 @@ ScanPopup::ScanPopup( QWidget * parent,
connect( definition, &ArticleView::statusBarMessage, this, &ScanPopup::showStatusBarMessage );
connect( definition, &ArticleView::titleChanged, this, &ScanPopup::titleChanged );
+ connect( definition, &ArticleView::activeArticleChanged, this, &ScanPopup::activeArticleChanged );
+ connect( definition, &ArticleView::sendWordToInputLine, this, &ScanPopup::translateWord );
+
+ connect( GlobalBroadcaster::instance(),
+ &GlobalBroadcaster::websiteDictionarySignal,
+ this,
+ &ScanPopup::openWebsiteInNewTab );
+
+ connect( tabWidget, &QTabWidget::currentChanged, this, [ this ]( int ) {
+ updateBackForwardButtons();
+ } );
#ifdef Q_OS_MAC
connect( &MouseOver::instance(), &MouseOver::hovered, this, &ScanPopup::handleInputWord );
@@ -304,18 +341,20 @@ ScanPopup::ScanPopup( QWidget * parent,
#endif
#ifdef WITH_X11
- scanFlag = new ScanFlag( this );
+ if ( QGuiApplication::platformName() == "xcb" ) {
+ scanFlag = new ScanFlag( this );
- connect( scanFlag, &ScanFlag::requestScanPopup, this, [ this ] {
- translateWordFromSelection();
- } );
+ connect( scanFlag, &ScanFlag::requestScanPopup, this, [ this ] {
+ translateWordFromSelection();
+ } );
- // Use delay show to prevent popup from showing up while selection is still in progress
- // Only certain software has this problem (e.g. Chrome)
- selectionDelayTimer.setSingleShot( true );
- selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
+ // Use delay show to prevent popup from showing up while selection is still in progress
+ // Only certain software has this problem (e.g. Chrome)
+ selectionDelayTimer.setSingleShot( true );
+ selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
- connect( &selectionDelayTimer, &QTimer::timeout, this, &ScanPopup::translateWordFromSelection );
+ connect( &selectionDelayTimer, &QTimer::timeout, this, &ScanPopup::translateWordFromSelection );
+ }
#endif
applyZoomFactor();
@@ -327,6 +366,14 @@ void ScanPopup::onActionTriggered()
if ( action != nullptr ) {
auto dictId = action->data().toString();
qDebug() << "Action triggered:" << dictId;
+
+ if ( auto otherView = findArticleViewByDictId( dictId ) ) {
+ tabWidget->setCurrentWidget( otherView );
+ return;
+ }
+
+ tabWidget->setCurrentWidget( definition );
+
definition->jumpToDictionary( dictId, true );
}
}
@@ -402,7 +449,9 @@ void ScanPopup::refresh()
connect( groupList, &GroupComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
#ifdef WITH_X11
- selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
+ if ( scanFlag ) {
+ selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
+ }
#endif
}
@@ -434,7 +483,11 @@ void ScanPopup::inspectElementWhenPinned( QWebEnginePage * page )
void ScanPopup::applyZoomFactor() const
{
- definition->setZoomFactor( cfg.preferences.zoomFactor );
+ for ( int i = 0; i < tabWidget->count(); ++i ) {
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->widget( i ) ) ) {
+ view->setZoomFactor( cfg.preferences.zoomFactor );
+ }
+ }
}
Qt::WindowFlags ScanPopup::unpinnedWindowFlags() const
@@ -459,6 +512,7 @@ void ScanPopup::editGroupRequested()
void ScanPopup::translateWordFromClipboard( QClipboard::Mode m )
{
+ GlobalBroadcaster::instance()->is_popup = true;
QString subtype = QStringLiteral( "plain" );
QString str = QApplication::clipboard()->text( subtype, m );
qDebug( "Translate from clipboard %d -> %s", qToUnderlying( m ), str.toStdString().c_str() );
@@ -608,7 +662,7 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
showTranslationFor( pendingWord );
}
-QString ScanPopup::elideInputWord()
+QString ScanPopup::elideInputWord() const
{
return pendingWord.size() > 32 ? pendingWord.mid( 0, 32 ) + "..." : pendingWord;
}
@@ -669,8 +723,7 @@ void ScanPopup::updateSuggestionList( const QString & text )
if ( !req.size() ) {
// An empty request always results in an empty result
wordFinder.cancel();
-
-
+ translateBox->setNoResults( false );
return;
}
@@ -690,6 +743,8 @@ void ScanPopup::showTranslationFor( const QString & word ) const
unsigned groupId = groupList->getCurrentGroup();
definition->showDefinition( word, groupId );
definition->focus();
+ // definition is the first tab
+ tabWidget->setTabText( 0, elideInputWord() );
}
const vector< sptr< Dictionary::Class > > & ScanPopup::getActiveDicts()
@@ -934,9 +989,7 @@ void ScanPopup::prefixMatchFinished()
}
// Reset the noResults mark if it's on right now
- auto translateLine = translateBox->translateLine();
-
- Utils::Widget::setNoResultColor( translateLine, _results.isEmpty() );
+ translateBox->setNoResults( _results.isEmpty() );
translateBox->setModel( _results );
}
}
@@ -1007,7 +1060,9 @@ void ScanPopup::focusTranslateLine()
void ScanPopup::stopAudio() const
{
- definition->stopSound();
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->currentWidget() ) ) {
+ view->stopSound();
+ }
}
void ScanPopup::dictionaryBar_visibility_changed( bool visible )
@@ -1140,18 +1195,24 @@ void ScanPopup::switchExpandOptionalPartsMode()
void ScanPopup::updateBackForwardButtons() const
{
- ui.goBackButton->setEnabled( definition->canGoBack() );
- ui.goForwardButton->setEnabled( definition->canGoForward() );
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->currentWidget() ) ) {
+ ui.goBackButton->setEnabled( view->canGoBack() );
+ ui.goForwardButton->setEnabled( view->canGoForward() );
+ }
}
void ScanPopup::goBackButton_clicked() const
{
- definition->back();
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->currentWidget() ) ) {
+ view->back();
+ }
}
void ScanPopup::goForwardButton_clicked() const
{
- definition->forward();
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->currentWidget() ) ) {
+ view->forward();
+ }
}
void ScanPopup::setDictionaryIconSize()
@@ -1204,11 +1265,96 @@ void ScanPopup::alwaysOnTopClicked( bool checked )
}
}
-void ScanPopup::titleChanged( ArticleView *, const QString & title ) const
+void ScanPopup::titleChanged( ArticleView * view, const QString & title ) const
{
-
// Set icon for "Add to Favorites" button
ui.sendWordToFavoritesButton->setIcon( isWordPresentedInFavorites( title ) ? blueStarIcon : starIcon );
+
+ if ( view->isWebsite() ) {
+ int index = tabWidget->indexOf( view );
+ if ( index != -1 ) {
+ tabWidget->setTabText( index, title );
+ tabWidget->setTabToolTip( index, title );
+ }
+ }
+}
+
+void ScanPopup::activeArticleChanged( const ArticleView * view, const QString & id )
+{
+ if ( view != tabWidget->currentWidget() || view->isWebsite() ) {
+ return;
+ }
+}
+
+ArticleView * ScanPopup::findArticleViewByDictId( const QString & dictId )
+{
+ if ( cfg.preferences.openWebsiteInNewTab ) {
+ for ( int i = 0; i < tabWidget->count(); i++ ) {
+ auto * view = qobject_cast< ArticleView * >( tabWidget->widget( i ) );
+ if ( view && view->isWebsite() && view->getActiveArticleId() == dictId ) {
+ return view;
+ }
+ }
+ }
+ return nullptr;
+}
+
+void ScanPopup::openWebsiteInNewTab( QString name, QString url, QString dictId, bool isPopup, QString word )
+{
+ if ( !isVisible() ) {
+ return;
+ }
+
+ if ( !isPopup ) {
+ return;
+ }
+
+ // Look for an existing tab with the same dictionary id
+ for ( int i = 0; i < tabWidget->count(); ++i ) {
+ if ( auto view = qobject_cast< ArticleView * >( tabWidget->widget( i ) ) ) {
+ if ( view->isWebsite() && view->getActiveArticleId() == dictId ) {
+ // Set the current word for the existing website view
+ if ( !word.isEmpty() ) {
+ view->setCurrentWord( word );
+ }
+ view->load( url, name );
+ tabWidget->setTabText( i, name );
+ return;
+ }
+ }
+ }
+
+ auto view = new ArticleView( tabWidget,
+ articleNetMgr,
+ true,
+ cfg,
+ translateBox->translateLine(),
+ dictionaryBar.toggleViewAction(),
+ groupList->getCurrentGroup() );
+
+ view->setWebsite( true );
+ view->setWebsiteHost( QUrl( url ).host() );
+ view->setActiveArticleId( dictId );
+ // Set the current word for the new website view
+ if ( !word.isEmpty() ) {
+ view->setCurrentWord( word );
+ }
+
+ // Connect vital signals
+ connect( view, &ArticleView::inspectSignal, this, &ScanPopup::inspectElementWhenPinned );
+ connect( view, &ArticleView::forceAddWordToHistory, this, &ScanPopup::forceAddWordToHistory );
+ connect( this, &ScanPopup::closeMenu, view, &ArticleView::closePopupMenu );
+ connect( view, &ArticleView::sendWordToHistory, this, &ScanPopup::sendWordToHistory );
+ connect( view, &ArticleView::typingEvent, this, &ScanPopup::typingEvent );
+ connect( view, &ArticleView::statusBarMessage, this, &ScanPopup::showStatusBarMessage );
+ connect( view, &ArticleView::pageLoaded, this, &ScanPopup::pageLoaded );
+ connect( view, &ArticleView::titleChanged, this, &ScanPopup::titleChanged );
+ connect( view, &ArticleView::sendWordToInputLine, this, &ScanPopup::translateWord );
+
+ int index = tabWidget->addTab( view, name );
+ tabWidget->setCurrentIndex( index );
+
+ view->load( url, name );
}
bool ScanPopup::isWordPresentedInFavorites( const QString & word ) const
diff --git a/src/ui/scanpopup.hh b/src/ui/scanpopup.hh
index 57ef329371..ebac0b6324 100644
--- a/src/ui/scanpopup.hh
+++ b/src/ui/scanpopup.hh
@@ -17,6 +17,7 @@
#include
#include "groupcombobox.hh"
#include "translatebox.hh"
+#include "maintabwidget.hh"
#ifdef WITH_X11
#include "scanflag.hh"
#endif
@@ -93,6 +94,7 @@ public slots:
void editGroupRequested();
void setGroupByName( const QString & name ) const;
+ void openWebsiteInNewTab( QString name, QString url, QString dictId, bool isPopup, QString word = QString() );
#ifdef WITH_X11
void showEngagePopup();
@@ -138,11 +140,13 @@ private:
QToolBar * foundBar;
QActionGroup * actionGroup = nullptr;
MainStatusBar * mainStatusBar;
+ MainTabWidget * tabWidget;
+ ArticleNetworkAccessManager & articleNetMgr;
/// Fonts saved before words zooming is in effect, so it could be reset back.
QFont wordListDefaultFont, translateLineDefaultFont, groupListDefaultFont;
#ifdef WITH_X11
- ScanFlag * scanFlag;
+ ScanFlag * scanFlag = nullptr;
#endif
bool mouseEnteredOnce = false;
@@ -181,7 +185,7 @@ private:
virtual void moveEvent( QMoveEvent * );
/// Returns inputWord, chopped with appended ... if it's too long/
- QString elideInputWord();
+ QString elideInputWord() const;
void updateBackForwardButtons() const;
@@ -189,6 +193,7 @@ private:
void updateSuggestionList();
void updateSuggestionList( const QString & text );
+ ArticleView * findArticleViewByDictId( const QString & dictId );
private slots:
void currentGroupChanged( int );
void prefixMatchFinished();
@@ -231,6 +236,7 @@ private slots:
void alwaysOnTopClicked( bool checked );
void titleChanged( ArticleView *, const QString & title ) const;
+ void activeArticleChanged( const ArticleView *, const QString & id );
void updateFoundInDictsList();
void onActionTriggered();
};
diff --git a/src/ui/translatebox.cc b/src/ui/translatebox.cc
index 4a9b4aa676..96afc6aadc 100644
--- a/src/ui/translatebox.cc
+++ b/src/ui/translatebox.cc
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
TranslateBox::TranslateBox( QWidget * parent ):
QWidget( parent ),
@@ -18,7 +19,7 @@ TranslateBox::TranslateBox( QWidget * parent ):
{
completer = new QCompleter( words, this );
resize( 200, 90 );
- QSizePolicy sizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+ QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
setSizePolicy( sizePolicy );
setFocusProxy( translate_line );
@@ -32,7 +33,7 @@ TranslateBox::TranslateBox( QWidget * parent ):
layout->setContentsMargins( 0, 0, 0, 0 );
layout->addWidget( translate_line );
- auto dropdown = new QAction( QIcon( ":/icons/1downarrow.svg" ), tr( "Drop-down" ), this );
+ dropdown = new QAction( QIcon( ":/icons/1downarrow.svg" ), tr( "Drop-down" ), this );
connect( dropdown, &QAction::triggered, this, &TranslateBox::rightButtonClicked );
translate_line->addAction( dropdown, QLineEdit::TrailingPosition );
@@ -91,6 +92,22 @@ void TranslateBox::setModel( QStringList & _words )
} );
}
+void TranslateBox::setNoResults( bool noResults )
+{
+ if ( noResults ) {
+ QIcon icon( ":/icons/1downarrow.svg" );
+ QPixmap pixmap = icon.pixmap( 32, 32 );
+ QPainter painter( &pixmap );
+ painter.setCompositionMode( QPainter::CompositionMode_SourceIn );
+ painter.fillRect( pixmap.rect(), QColor( 255, 0, 0, 200 ) );
+ painter.end();
+ dropdown->setIcon( QIcon( pixmap ) );
+ }
+ else {
+ dropdown->setIcon( QIcon( ":/icons/1downarrow.svg" ) );
+ }
+}
+
void TranslateBox::showPopup()
{
if ( m_popupEnabled ) {
diff --git a/src/ui/translatebox.hh b/src/ui/translatebox.hh
index 272d0a8b53..62845a6c8e 100644
--- a/src/ui/translatebox.hh
+++ b/src/ui/translatebox.hh
@@ -22,6 +22,7 @@ public:
void setSizePolicy( QSizePolicy::Policy hor, QSizePolicy::Policy ver );
void setModel( QStringList & _words );
+ void setNoResults( bool noResults );
public slots:
void setPopupEnabled( bool enable );
@@ -35,6 +36,7 @@ private slots:
private:
QLineEdit * translate_line;
+ QAction * dropdown;
bool m_popupEnabled;
QCompleter * completer;
QStringList words;
diff --git a/src/weburlrequestinterceptor.cc b/src/weburlrequestinterceptor.cc
index 86abfbe7c0..eb5e2f7174 100644
--- a/src/weburlrequestinterceptor.cc
+++ b/src/weburlrequestinterceptor.cc
@@ -10,9 +10,6 @@ WebUrlRequestInterceptor::WebUrlRequestInterceptor( QObject * p ):
void WebUrlRequestInterceptor::interceptRequest( QWebEngineUrlRequestInfo & info )
{
auto url = info.requestUrl();
- if ( url.scheme().startsWith( Config::WEBSITE_PROXY_PREFIX ) ) {
- url.setScheme( url.scheme().mid( 7 ) );
- }
// When content is loaded inside GoldenDict's article view, we might face CORS issues.
// Setting Origin and Referer headers can help bypass some CORS restrictions.
@@ -20,15 +17,21 @@ void WebUrlRequestInterceptor::interceptRequest( QWebEngineUrlRequestInfo & info
info.setHttpHeader( "origin", Utils::Url::getSchemeAndHost( url ).toUtf8() );
info.setHttpHeader( "referer", url.url().toUtf8() );
}
+
if ( GlobalBroadcaster::instance()->getPreference()->disallowContentFromOtherSites && Utils::isExternalLink( url ) ) {
// Block file:// links to prevent local file access
if ( url.scheme() == "file" ) {
info.block( true );
return;
}
- auto hostBase = Utils::Url::extractBaseDomain( url.host() );
- if ( GlobalBroadcaster::instance()->existedInWhitelist( hostBase ) ) {
- //whitelist url does not block
+
+ if ( info.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame ) {
+ return;
+ }
+ if ( GlobalBroadcaster::instance()->existedInHostWhitelist( Utils::Url::extractBaseDomain( url.host() ) )
+ || GlobalBroadcaster::instance()->existedInRefererWhitelist(
+ Utils::Url::extractBaseDomain( info.firstPartyUrl().host() ) ) ) {
+ // Target host or referring site is in respective whitelist - do not block
return;
}
if ( info.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeImage
diff --git a/website/docs/manage_sources.md b/website/docs/manage_sources.md
index 8dd3bc0fb7..6e46a87efd 100644
--- a/website/docs/manage_sources.md
+++ b/website/docs/manage_sources.md
@@ -55,6 +55,18 @@ The query word can be inserted into the URL using the following placeholders:
| %GDWORD% | UTF-8 |
+### Open in New Tab
+
+By default, website dictionaries are embedded directly into the article view using an iframe. If you prefer to open a website in a separate tab within GoldenDict-ng:
+
+1. Go to **Preferences -> Interface**.
+2. Enable **Open websites in a new tab**.
+
+When this option is enabled:
+- Websites will load in their own dedicated tabs instead of inside the article definition page.
+- [Website Scripting](./topic_website_scripting.md) can be used to customize these pages.
+- The layout is often cleaner as it bypasses iframe-related styling issues.
+
## DICT servers
Here you can add servers which use the DICT protocol. To add such a server, you should set its URL, name for the dictionaries list, server bases list, search strategies list, and set a mark in the "Enabled" column. If the bases list is empty, GoldenDict will use all server bases. If the search strategies list is empty, GoldenDict will use the "prefix" strategy (comparing the first part of the word).
diff --git a/website/docs/topic_wayland.md b/website/docs/topic_wayland.md
index a15d7615f7..6a4450ceee 100644
--- a/website/docs/topic_wayland.md
+++ b/website/docs/topic_wayland.md
@@ -1,16 +1,53 @@
-Environment variable `GOLDENDICT_FORCE_WAYLAND` can be used to force GD to run in Wayland mode, like `env GOLDENDICT_FORCE_WAYLAND=1 goldendict`.
+# Wayland Support and Configuration
-!!! danger "Don't use unless you know!"
- This flag only guarantees GD to run in wayland mode and won't crash, but nothing more.
+GoldenDict-ng supports running both natively on **Wayland** and via **XWayland (X11)**.
- Enable this will break popup, global hotkeys and probably other things.
+Since version 25.12.0, the application defaults to native Wayland on Wayland sessions to provide the best HiDPI and fractional scaling experience. However, due to Wayland's security design, certain features like global hotkeys and screen-grabbing popups may require switching back to X11 mode.
-## Current reality
+## Mode Selection Hardware
-!!! note "Help wanted"
- Need help to redesign popup for wayland.
+The display mode is determined by environment variables at startup. You can specify your preference using the following flags:
-Popup is implemented with `querying mouse cursor's position` and `setting a window's absolute global position`.
-Wayland does not support both by design and philosophy.
+| Mode | Environment Variable | Best For |
+| :--- | :--- | :--- |
+| **Native Wayland** (Default) | (None) or `GOLDENDICT_FORCE_WAYLAND=1` | HiDPI screens, smooth scaling, security. |
+| **XWayland (X11)** | `GOLDENDICT_FORCE_XCB=1` | Global hotkeys, advanced ScanPopup (ScanFlag). |
-Wayland does not support registering global hotkeys until very recently, but a reasonable wayland desktop environment should provide some way to bind keys to commands globally.
\ No newline at end of file
+### How to Switch
+
+#### 1. Native Wayland (Default)
+By default, the app will try to run as a native Wayland client. If you want to force it explicitly:
+```bash
+env GOLDENDICT_FORCE_WAYLAND=1 goldendict
+```
+
+#### 2. XWayland / X11 Mode (Recommended for Hotkeys)
+If you need global hotkeys (`Ctrl+C+C` etc.) or the "Scan Flag" feature to work across windows, run the app in X11 mode:
+```bash
+env GOLDENDICT_FORCE_XCB=1 goldendict
+```
+
+### Flatpak Configuration
+If you are using the Flatpak version, you can use **Flatseal** or the command line to set these variables:
+```bash
+# Force X11 mode for Flatpak
+flatpak override --env=GOLDENDICT_FORCE_XCB=1 io.github.xiaoyifang.goldendict_ng
+```
+
+---
+
+## Technical Comparison
+
+| Feature | Native Wayland | XWayland (X11) |
+| :--- | :---: | :---: |
+| **HiDPI / Sharp Text** | ⭐ Excellent | ⚠️ May be blurry |
+| **Global Hotkeys** | ❌ Not Supported | ✅ Fully Supported |
+| **Scan Flag (Small Flag)** | ❌ Disabled | ✅ Enabled |
+| **Window Positioning** | ⚠️ Limited by compositor | ✅ Precise |
+| **Input Method (IME)** | ✅ Supported (Qt 6) | ✅ Supported |
+
+!!! danger "Global Hotkeys on Wayland"
+ Native Wayland does not allow applications to listen to keyboard events globally. If you rely on `Ctrl+C+C` to trigger lookups from other apps, you **must** use X11 mode (`GOLDENDICT_FORCE_XCB=1`).
+
+!!! tip "Workaround for Wayland Hotkeys"
+ Users on KDE or GNOME can manually bind a custom system shortcut to a command that sends a word to GoldenDict, for example: `goldendict "selection"`.
\ No newline at end of file
diff --git a/website/docs/topic_website_whitelist.md b/website/docs/topic_website_whitelist.md
new file mode 100644
index 0000000000..7c060217eb
--- /dev/null
+++ b/website/docs/topic_website_whitelist.md
@@ -0,0 +1,33 @@
+# Website Whitelist
+
+GoldenDict-ng by default blocks external content (like cross-domain scripts, IFrames, etc.) from websites loaded in the article view for security reasons. However, some websites require these resources to function correctly (e.g., Google Translate loading fonts or scripts from `gstatic.com`).
+
+The `whitelist` parameter allows you to tell GoldenDict-ng to trust a specific website and allow it to load its sub-resources.
+
+## How it works
+
+When you add the `whitelist` parameter to a website's URL template:
+
+1. GoldenDict-ng adds the website's host to a **Referer Whitelist**.
+2. Any request initiated by this website (where the `Referer` matches the whitelisted host) will be allowed by the internal WebEngine interceptor.
+
+
+## How to enable
+
+Append `whitelist=1` (or any value) to your website URL template in the **Edit | Dictionaries -> Websites** tab.
+
+!!! tip "Display Modes"
+ The `whitelist` feature is particularly useful when websites are **embedded** in the article view (default behavior). In this mode, GoldenDict-ng's security policy is most restrictive. If you encounter blocked resources, the whitelist can resolve them.
+
+ If you use the **Open in New Tab** mode (configured in Preferences), the website has more freedom, but the whitelist still helps GoldenDict-ng identify trusted domains.
+
+### Examples
+
+| Dictionary Name | URL Template |
+|-----------------|------------------------------------------------------------------------------|
+| Google Translate| `https://translate.google.com/?sl=auto&tl=zh-CN&text=%GDWORD%&op=translate&whitelist=1` |
+| Wikipedia | `https://en.wikipedia.org/wiki/%GDWORD%?whitelist=true` |
+
+## Security Note
+
+Only use the `whitelist` parameter for websites you trust. Enabling it allows the website to load third-party scripts and resources that would otherwise be blocked by GoldenDict-ng's security policies.
diff --git a/website/mkdocs.yml b/website/mkdocs.yml
index 4aaec8ab3d..8bdd071f0a 100644
--- a/website/mkdocs.yml
+++ b/website/mkdocs.yml
@@ -41,6 +41,7 @@ nav:
- External Programs as Dict: howto/how to add a program as dictionary.md
- Custom Stylesheet & JavaScript: topic_userstyle.md
- Website Scripting: topic_website_scripting.md
+ - Website Whitelist: topic_website_whitelist.md
- Portable Mode: topic_portablemode.md
- Custom transliteration: topic_transliteration.md
- Customize Dictionary: custom_dictionary.md