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

Rename QAction * enableScanPopup

Browse source 
There is a var named exactly the same used in the same file!
This commit is contained in:
shenleban tongying 2022-11-19 09:02:48 -05:00
parent dc29111e88
commit 92bdec7119
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mainwindow.cc
View file

@ -232,18 +232,18 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup ); beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
navToolbar->widgetForAction( beforeScanPopupSeparator )->setObjectName( "beforeScanPopupSeparator" ); navToolbar->widgetForAction( beforeScanPopupSeparator )->setObjectName( "beforeScanPopupSeparator" );
enableScanPopup = navToolbar->addAction( QIcon( ":/icons/wizard.svg" ), tr( "Scan Popup" ) ); enableScanPopupAction = navToolbar->addAction( QIcon( ":/icons/wizard.svg" ), tr( "Scan Popup" ) );
enableScanPopup->setCheckable( true ); enableScanPopupAction->setCheckable( true );
enableScanPopup->setVisible( cfg.preferences.enableScanPopup ); enableScanPopupAction->setVisible( cfg.preferences.enableScanPopup );
navToolbar->widgetForAction( enableScanPopup )->setObjectName( "scanPopupButton" ); navToolbar->widgetForAction( enableScanPopupAction )->setObjectName( "scanPopupButton" );
if( cfg.preferences.enableScanPopup && cfg.preferences.startWithScanPopupOn ) if( cfg.preferences.enableScanPopup && cfg.preferences.startWithScanPopupOn )
{ {
enableScanPopup->setIcon( QIcon( ":/icons/wizard-selected.svg" ) ); enableScanPopupAction->setIcon( QIcon( ":/icons/wizard-selected.svg" ) );
enableScanPopup->setChecked( true ); enableScanPopupAction->setChecked( true );
} }
connect( enableScanPopup, SIGNAL( toggled( bool ) ), connect( enableScanPopupAction, SIGNAL( toggled( bool ) ),
this, SLOT( scanEnableToggled( bool ) ) ); this, SLOT( scanEnableToggled( bool ) ) );
afterScanPopupSeparator = navToolbar->addSeparator(); afterScanPopupSeparator = navToolbar->addSeparator();
@ -410,7 +410,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
// tray icon // tray icon
connect( trayIconMenu.addAction( tr( "Show &Main Window" ) ), SIGNAL( triggered() ), connect( trayIconMenu.addAction( tr( "Show &Main Window" ) ), SIGNAL( triggered() ),
this, SLOT( showMainWindow() ) ); this, SLOT( showMainWindow() ) );
trayIconMenu.addAction( enableScanPopup ); trayIconMenu.addAction( enableScanPopupAction );
actTrackingClipboard = trayIconMenu.addAction( tr( "Tracking Clipboard" ) ); actTrackingClipboard = trayIconMenu.addAction( tr( "Tracking Clipboard" ) );
actTrackingClipboard->setCheckable(true); actTrackingClipboard->setCheckable(true);
actTrackingClipboard->setChecked(cfg.preferences.trackClipboardChanges); actTrackingClipboard->setChecked(cfg.preferences.trackClipboardChanges);
@ -1198,7 +1198,7 @@ void MainWindow::updateTrayIcon()
if ( trayIcon ) if ( trayIcon )
{ {
// Update the icon to reflect the scanning mode // Update the icon to reflect the scanning mode
trayIcon->setIcon( enableScanPopup->isChecked() ? trayIcon->setIcon( enableScanPopupAction->isChecked() ?
QIcon::fromTheme("goldendict-scan-tray", QIcon( ":/icons/programicon_scan.png" )) : QIcon::fromTheme("goldendict-scan-tray", QIcon( ":/icons/programicon_scan.png" )) :
QIcon::fromTheme("goldendict-tray", QIcon( ":/icons/programicon_old.png" )) ); QIcon::fromTheme("goldendict-tray", QIcon( ":/icons/programicon_old.png" )) );
@ -1498,7 +1498,7 @@ void MainWindow::makeScanPopup()
scanPopup->setStyleSheet( styleSheet() ); scanPopup->setStyleSheet( styleSheet() );
if ( cfg.preferences.enableScanPopup && enableScanPopup->isChecked() ) if ( cfg.preferences.enableScanPopup && enableScanPopupAction->isChecked() )
scanPopup->enableScanning(); scanPopup->enableScanning();
connect( scanPopup.get(), SIGNAL(editGroupRequested( unsigned ) ), connect( scanPopup.get(), SIGNAL(editGroupRequested( unsigned ) ),
@ -2254,11 +2254,11 @@ void MainWindow::editPreferences()
audioPlayerFactory.setPreferences( cfg.preferences ); audioPlayerFactory.setPreferences( cfg.preferences );
beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup ); beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
enableScanPopup->setVisible( cfg.preferences.enableScanPopup ); enableScanPopupAction->setVisible( cfg.preferences.enableScanPopup );
afterScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup ); afterScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
if ( !cfg.preferences.enableScanPopup ) if ( !cfg.preferences.enableScanPopup )
enableScanPopup->setChecked( false ); enableScanPopupAction->setChecked( false );
updateTrayIcon(); updateTrayIcon();
applyProxySettings(); applyProxySettings();
@ -3186,12 +3186,12 @@ void MainWindow::scanEnableToggled( bool on )
mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000, mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
QPixmap( ":/icons/error.svg" ) ); QPixmap( ":/icons/error.svg" ) );
#endif #endif
enableScanPopup->setIcon(QIcon(":/icons/wizard-selected.svg")); enableScanPopupAction->setIcon(QIcon(":/icons/wizard-selected.svg"));
} }
else else
{ {
scanPopup->disableScanning(); scanPopup->disableScanning();
enableScanPopup->setIcon(QIcon(":/icons/wizard.svg")); enableScanPopupAction->setIcon(QIcon(":/icons/wizard.svg"));
} }
} }

2
mainwindow.hh
View file

@ -116,7 +116,7 @@ private:
addAllTabToFavoritesAction; addAllTabToFavoritesAction;
QToolBar * navToolbar; QToolBar * navToolbar;
MainStatusBar * mainStatusBar; MainStatusBar * mainStatusBar;
QAction * navBack, * navForward, * navPronounce, * enableScanPopup; QAction * navBack, * navForward, * navPronounce, * enableScanPopupAction;
QAction * actTrackingClipboard; QAction * actTrackingClipboard;
QAction * beforeScanPopupSeparator, * afterScanPopupSeparator, * beforeOptionsSeparator; QAction * beforeScanPopupSeparator, * afterScanPopupSeparator, * beforeOptionsSeparator;
QAction * zoomIn, * zoomOut, * zoomBase; QAction * zoomIn, * zoomOut, * zoomBase;