diff --git a/README.md b/README.md index 6568daec..07a0665d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This code has been run and tested on Windows 10/11, Ubuntu Linux, Mac OS X. ### External Deps * Make, GCC, Git -* Qt framework. Minimum required version is 5.15 and support the latest QT version 6.2.4 +* Qt framework. Minimum required version is 5.15 and support the latest QT version 6.X * Qt Creator IDE is recommended for development * Various libraries on Linux (png, zlib, etc) * On Mac and Windows all the libraries are already included in the repository @@ -42,7 +42,7 @@ sudo dnf install git pkg-config \ First, clone this repository, e.g.: - git clone https://github.com/goldendict/goldendict.git + git clone https://github.com/xiaoyifang/goldendict.git ### Linux diff --git a/icons/ontop.svg b/icons/ontop.svg new file mode 100644 index 00000000..4ee94d3c --- /dev/null +++ b/icons/ontop.svg @@ -0,0 +1,974 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Go Top + + + go + highest + top + arrow + pointer + > + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + diff --git a/resources.qrc b/resources.qrc index a421a9e4..77ea67e0 100644 --- a/resources.qrc +++ b/resources.qrc @@ -56,7 +56,7 @@ icons/icon32_slob.png icons/icon32_gls.png icons/folder.png - icons/ontop.png + icons/ontop.svg resources/jquery-3.6.0.slim.min.js resources/gd-custom.js resources/gd-builtin.js diff --git a/scanpopup.cc b/scanpopup.cc index 19c36faa..2daf58c4 100644 --- a/scanpopup.cc +++ b/scanpopup.cc @@ -514,13 +514,18 @@ void ScanPopup::delayShow() void ScanPopup::clipboardChanged( QClipboard::Mode m ) { - if( !cfg.preferences.trackClipboardChanges ) + if( cfg.preferences.trackClipboardChanges ) + { + QString subtype = "plain"; + + handleInputWord( QApplication::clipboard()->text( subtype, m ) ); + return; + } + + if( !isScanningEnabled ) return; #ifdef HAVE_X11 - if ( !isScanningEnabled ) - return; - if( cfg.preferences.ignoreOwnClipboardChanges && ownsClipboardMode( m ) ) return; #endif