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

opt: unify the small large icon actions (#1879)

Browse source 
* opt: unify the small large icon actions
This commit is contained in:
xiaoyifang 2024-10-28 22:02:18 +08:00 committed by GitHub
parent 12dbfb5423
commit 89ba441b35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/ui/mainwindow.cc
View file

@ -144,8 +144,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
switchToNextTabAction( this ),
switchToPrevTabAction( this ),
showDictBarNamesAction( tr( "Show Names in Dictionary &Bar" ), this ),
useSmallIconsInToolbarsAction( tr( "Show Small Icons in &Toolbars" ), this ),
useLargeIconsInToolbarsAction( tr( "Show Large Icons in &Toolbars" ), this ),
useSmallIconsInToolbarsAction( tr( "Show &Small Icons in Toolbars" ), this ),
useLargeIconsInToolbarsAction( tr( "Show &Large Icons in Toolbars" ), this ),
useNormalIconsInToolbarsAction( tr( "Show &Normal Icons in Toolbars" ), this ),
toggleMenuBarAction( tr( "&Menubar" ), this ),
focusHeadwordsDlgAction( this ),
focusArticleViewAction( this ),
@ -500,25 +501,24 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
tabMenu->addAction( &addAllTabToFavoritesAction );
// Dictionary bar names
showDictBarNamesAction.setCheckable( true );
showDictBarNamesAction.setChecked( cfg.showingDictBarNames );
connect( &showDictBarNamesAction, &QAction::triggered, this, &MainWindow::showDictBarNamesTriggered );
// Use small icons in toolbars
useSmallIconsInToolbarsAction.setCheckable( true );
useSmallIconsInToolbarsAction.setChecked( cfg.usingToolbarsIconSize == Config::ToolbarsIconSize::Small );
connect( &useSmallIconsInToolbarsAction, &QAction::triggered, this, &MainWindow::useSmallIconsInToolbarsTriggered );
// Use large icons in toolbars
useLargeIconsInToolbarsAction.setCheckable( true );
useLargeIconsInToolbarsAction.setChecked( cfg.usingToolbarsIconSize == Config::ToolbarsIconSize::Large );
useNormalIconsInToolbarsAction.setCheckable( true );
useNormalIconsInToolbarsAction.setChecked( cfg.usingToolbarsIconSize == Config::ToolbarsIconSize::Normal );
connect( &useLargeIconsInToolbarsAction, &QAction::triggered, this, &MainWindow::useLargeIconsInToolbarsTriggered );
// icon action group,default exclusive option.
smallLargeIconGroup->addAction( &useLargeIconsInToolbarsAction );
smallLargeIconGroup->addAction( &useSmallIconsInToolbarsAction );
smallLargeIconGroup->addAction( &useNormalIconsInToolbarsAction );
connect( smallLargeIconGroup, &QActionGroup::triggered, this, &MainWindow::iconSizeActionTriggered );
// Toggle Menubar
toggleMenuBarAction.setCheckable( true );
@ -528,7 +528,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
connect( &toggleMenuBarAction, &QAction::triggered, this, &MainWindow::toggleMenuBarTriggered );
// Populate 'View' menu
ui.menuView->addAction( &toggleMenuBarAction );
ui.menuView->addSeparator();
ui.menuView->addAction( ui.searchPane->toggleViewAction() );
@ -543,7 +542,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
ui.menuView->addAction( navToolbar->toggleViewAction() );
ui.menuView->addSeparator();
ui.menuView->addAction( &showDictBarNamesAction );
ui.menuView->addSeparator();
ui.menuView->addAction( &useSmallIconsInToolbarsAction );
ui.menuView->addAction( &useNormalIconsInToolbarsAction );
ui.menuView->addAction( &useLargeIconsInToolbarsAction );
ui.menuView->addSeparator();
ui.alwaysOnTop->setChecked( cfg.preferences.alwaysOnTop );
@ -922,9 +923,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
urlRegistry.endGroup();
#endif
useSmallIconsInToolbarsTriggered();
useLargeIconsInToolbarsTriggered();
iconSizeActionTriggered( nullptr );
if ( cfg.preferences.checkForNewReleases ) {
QTimer::singleShot( 0, this, &MainWindow::checkNewRelease );
@ -3112,48 +3111,23 @@ void MainWindow::showDictBarNamesTriggered()
cfg.showingDictBarNames = show;
}
void MainWindow::useSmallIconsInToolbarsTriggered()
{
bool useSmallIcons = useSmallIconsInToolbarsAction.isChecked();
if ( useSmallIcons ) {
cfg.usingToolbarsIconSize = Config::ToolbarsIconSize::Small;
useLargeIconsInToolbarsAction.setChecked( false );
}
else if ( !useLargeIconsInToolbarsAction.isChecked() ) {
cfg.usingToolbarsIconSize = Config::ToolbarsIconSize::Normal;
}
int extent = useSmallIcons ? QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
navToolbar->setIconSize( QSize( extent, extent ) );
// additional fix for #176
menuButton->setIconSize( QSize( extent, extent ) );
updateDictionaryBar();
scanPopup->setDictionaryIconSize();
}
void MainWindow::useLargeIconsInToolbarsTriggered()
void MainWindow::iconSizeActionTriggered( QAction * /*action*/ )
{
bool useLargeIcons = useLargeIconsInToolbarsAction.isChecked();
int extent = QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
if ( useLargeIcons ) {
cfg.usingToolbarsIconSize = Config::ToolbarsIconSize::Large;
useSmallIconsInToolbarsAction.setChecked( false );
extent = QApplication::style()->pixelMetric( QStyle::PM_LargeIconSize );
}
else if ( !useSmallIconsInToolbarsAction.isChecked() ) {
else if ( useSmallIconsInToolbarsAction.isChecked() ) {
cfg.usingToolbarsIconSize = Config::ToolbarsIconSize::Small;
extent = QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize );
}
else {
cfg.usingToolbarsIconSize = Config::ToolbarsIconSize::Normal;
}
int extent = useLargeIcons ? QApplication::style()->pixelMetric( QStyle::PM_LargeIconSize ) :
QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
navToolbar->setIconSize( QSize( extent, extent ) );
menuButton->setIconSize( QSize( extent, extent ) );
updateDictionaryBar();

15
src/ui/mainwindow.hh
View file

@ -29,7 +29,6 @@
#include "dictheadwords.hh"
#include "fulltextsearch.hh"
#include "base_type.hh"
#include "hotkeywrapper.hh"
#include "resourceschemehandler.hh"
#include "iframeschemehandler.hh"
@ -40,6 +39,8 @@
#if defined( Q_OS_MAC )
#include "macos/gd_clipboard.hh"
#endif
//must place the qactiongroup after fixx11h.h, None in QActionGroup conflict with X.h's macro None.
#include <QActionGroup>
using std::string;
using std::vector;
@ -106,9 +107,12 @@ private:
QFont wordListDefaultFont, translateLineDefaultFont, groupListDefaultFont;
QAction escAction, focusTranslateLineAction, addTabAction, closeCurrentTabAction, closeAllTabAction,
closeRestTabAction, switchToNextTabAction, switchToPrevTabAction, showDictBarNamesAction,
useSmallIconsInToolbarsAction, useLargeIconsInToolbarsAction, toggleMenuBarAction, focusHeadwordsDlgAction,
focusArticleViewAction, addAllTabToFavoritesAction;
closeRestTabAction, switchToNextTabAction, switchToPrevTabAction, showDictBarNamesAction, toggleMenuBarAction,
focusHeadwordsDlgAction, focusArticleViewAction, addAllTabToFavoritesAction;
QAction useSmallIconsInToolbarsAction, useLargeIconsInToolbarsAction, useNormalIconsInToolbarsAction;
QActionGroup * smallLargeIconGroup = new QActionGroup( this );
QAction stopAudioAction;
QToolBar * navToolbar;
@ -403,8 +407,7 @@ private slots:
void showAbout();
void showDictBarNamesTriggered();
void useSmallIconsInToolbarsTriggered();
void useLargeIconsInToolbarsTriggered();
void iconSizeActionTriggered( QAction * action );
void toggleMenuBarTriggered( bool announce = true );
void on_clearHistory_triggered();