mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 19:24:08 +00:00
Linux-specific: Hide scan flag window when popup window is shown (by Ctrl+C+C)
This commit is contained in:
parent
5890a55c4d
commit
0999c86038
|
@ -272,11 +272,14 @@ ScanPopup::ScanPopup( QWidget * parent,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
scanFlag = new ScanFlag( 0 );
|
scanFlag = new ScanFlag( this );
|
||||||
|
|
||||||
connect( this, SIGNAL( showScanFlag( bool ) ),
|
connect( this, SIGNAL( showScanFlag( bool ) ),
|
||||||
scanFlag, SLOT( showScanFlag() ) );
|
scanFlag, SLOT( showScanFlag() ) );
|
||||||
|
|
||||||
|
connect( this, SIGNAL( hideScanFlag() ),
|
||||||
|
scanFlag, SLOT( hideWindow() ) );
|
||||||
|
|
||||||
connect( scanFlag, SIGNAL( showScanPopup() ),
|
connect( scanFlag, SIGNAL( showScanPopup() ),
|
||||||
this, SLOT( showEngagePopup() ) );
|
this, SLOT( showEngagePopup() ) );
|
||||||
#endif
|
#endif
|
||||||
|
@ -357,6 +360,10 @@ void ScanPopup::translateWord( QString const & word )
|
||||||
altModePollingTimer.stop();
|
altModePollingTimer.stop();
|
||||||
altModeExpirationTimer.stop();
|
altModeExpirationTimer.stop();
|
||||||
|
|
||||||
|
#ifdef HAVE_X11
|
||||||
|
emit hideScanFlag();
|
||||||
|
#endif
|
||||||
|
|
||||||
inputWord = str;
|
inputWord = str;
|
||||||
engagePopup( false,
|
engagePopup( false,
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
|
|
|
@ -74,7 +74,9 @@ signals:
|
||||||
void sendWordToFavorites( QString const & word, unsigned groupId );
|
void sendWordToFavorites( QString const & word, unsigned groupId );
|
||||||
|
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
|
/// Interaction with scan flag window
|
||||||
void showScanFlag( bool forcePopup );
|
void showScanFlag( bool forcePopup );
|
||||||
|
void hideScanFlag();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
#ifdef Q_OS_WIN32
|
||||||
|
|
Loading…
Reference in a new issue