hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Remove enableScanPopup: Respect navBar toggling more

Browse source 
* Always construct Scan Popup object regardless of the setting
This commit is contained in:
shenleban tongying 2022-11-19 09:30:58 -05:00
parent edbc4d32cd
commit eb5806503a
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mainwindow.cc
View file

@ -1484,8 +1484,8 @@ void MainWindow::makeScanPopup()
{
scanPopup.reset();
if ( !cfg.preferences.enableScanPopup &&
!cfg.preferences.enableClipboardHotkey && !cfg.preferences.trackClipboardChanges )
// Later this will be remove, we want singluar way to toggling ScanPopup
if ( !cfg.preferences.enableClipboardHotkey && !cfg.preferences.trackClipboardChanges )
return;
scanPopup = new ScanPopup( 0, cfg, articleNetMgr, audioPlayerFactory.player(),
@ -1493,7 +1493,7 @@ void MainWindow::makeScanPopup()
scanPopup->setStyleSheet( styleSheet() );
if ( cfg.preferences.enableScanPopup && enableScanPopupAction->isChecked() )
if ( enableScanPopupAction->isChecked() )
scanPopup->enableScanning();
connect( scanPopup.get(), SIGNAL(editGroupRequested( unsigned ) ),
@ -3161,8 +3161,6 @@ void MainWindow::trayIconActivated( QSystemTrayIcon::ActivationReason r )
void MainWindow::scanEnableToggled( bool on )
{
if ( !cfg.preferences.enableScanPopup )
return;
if ( scanPopup )
{