hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-18 03:14:06 +00:00
Code Issues Actions 2 Projects Releases Wiki Activity

high dpi:change icon reference in code from png to svg.

Browse source
This commit is contained in:
xiaoyifang 2022-01-24 22:23:38 +08:00
parent d9faf6633b
commit 9cf5ee8443
23 changed files with 100 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
articleview.cc
View file

@ -1723,7 +1723,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
if ( !popupView ) if ( !popupView )
{ {
followLinkNewTab = new QAction( QIcon( ":/icons/addtab.png" ), followLinkNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
tr( "Open Link in New &Tab" ), &menu ); tr( "Open Link in New &Tab" ), &menu );
menu.addAction( followLinkNewTab ); menu.addAction( followLinkNewTab );
} }
@ -1777,7 +1777,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
if ( !popupView ) if ( !popupView )
{ {
lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.png" ), lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
tr( "Look up \"%1\" in &New Tab" ). tr( "Look up \"%1\" in &New Tab" ).
arg( text ), arg( text ),
&menu ); &menu );
@ -1810,7 +1810,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
if ( !popupView ) if ( !popupView )
{ {
lookupSelectionNewTabGr = new QAction( QIcon( ":/icons/addtab.png" ), lookupSelectionNewTabGr = new QAction( QIcon( ":/icons/addtab.svg" ),
tr( "Look up \"%1\" in %2 in &New Tab" ). tr( "Look up \"%1\" in %2 in &New Tab" ).
arg( text ). arg( text ).
arg( altGroup->name ), &menu ); arg( altGroup->name ), &menu );

10
articleview.ui
View file

@ -72,7 +72,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/previous.png</normaloff>:/icons/previous.png</iconset> <normaloff>:/icons/previous.svg</normaloff>:/icons/previous.svg</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -86,7 +86,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset> <normaloff>:/icons/next.svg</normaloff>:/icons/next.svg</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -143,7 +143,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/closetab.png</normaloff>:/icons/closetab.png</iconset> <normaloff>:/icons/closetab.svg</normaloff>:/icons/closetab.svg</iconset>
</property> </property>
<property name="autoRaise"> <property name="autoRaise">
<bool>true</bool> <bool>true</bool>
@ -161,7 +161,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/previous.png</normaloff>:/icons/previous.png</iconset> <normaloff>:/icons/previous.svg</normaloff>:/icons/previous.svg</iconset>
</property> </property>
<property name="toolButtonStyle"> <property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum> <enum>Qt::ToolButtonTextBesideIcon</enum>
@ -178,7 +178,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset> <normaloff>:/icons/next.svg</normaloff>:/icons/next.svg</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+G</string> <string>Ctrl+G</string>

2
dictgroupwidget.ui
View file

@ -60,7 +60,7 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="resources.qrc">:/icons/hotkeys.png</pixmap> <pixmap resource="resources.qrc">:/icons/hotkeys.svg</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>

2
dictionarybar.cc
View file

@ -109,7 +109,7 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
QMenu menu( this ); QMenu menu( this );
QAction * editAction = QAction * editAction =
menu.addAction( QIcon( ":/icons/bookcase.png" ), tr( "Edit this group" ) ); menu.addAction( QIcon( ":/icons/bookcase.svg" ), tr( "Edit this group" ) );
QAction * infoAction = NULL; QAction * infoAction = NULL;
QAction * headwordsAction = NULL; QAction * headwordsAction = NULL;

2
dictserver.cc
View file

@ -257,7 +257,7 @@ void DictServerDictionary::loadIcon() throw()
loadIconFromFile( fInfo.absoluteFilePath(), true ); loadIconFromFile( fInfo.absoluteFilePath(), true );
} }
if( dictionaryIcon.isNull() ) if( dictionaryIcon.isNull() )
dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.png"); dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.svg");
dictionaryIconLoaded = true; dictionaryIconLoaded = true;
} }

12
editdictionaries.cc
View file

@ -39,13 +39,13 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_,
ui.setupUi( this ); ui.setupUi( this );
setWindowIcon( QIcon(":/icons/book.png") ); setWindowIcon( QIcon(":/icons/bookcase.svg") );
ui.tabs->clear(); ui.tabs->clear();
ui.tabs->addTab( &sources, QIcon(":/icons/reload.png"), tr( "&Sources" ) ); ui.tabs->addTab( &sources, QIcon(":/icons/folders.svg"), tr( "&Sources" ) );
ui.tabs->addTab( orderAndProps.get(), QIcon(":/icons/book.png"), tr( "&Dictionaries" ) ); ui.tabs->addTab( orderAndProps.get(), QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) );
ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) ); ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) );
connect( ui.buttons, SIGNAL( clicked( QAbstractButton * ) ), connect( ui.buttons, SIGNAL( clicked( QAbstractButton * ) ),
this, SLOT( buttonBoxClicked( QAbstractButton * ) ) ); this, SLOT( buttonBoxClicked( QAbstractButton * ) ) );
@ -241,10 +241,10 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
if ( rebuildGroups ) if ( rebuildGroups )
{ {
orderAndProps = new OrderAndProps( this, savedOrder, savedInactive, dictionaries ); orderAndProps = new OrderAndProps( this, savedOrder, savedInactive, dictionaries );
ui.tabs->insertTab( 1, orderAndProps.get(), QIcon(":/icons/book.png"), tr( "&Dictionaries" ) ); ui.tabs->insertTab( 1, orderAndProps.get(), QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) );
groups = new Groups( this, dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() ); groups = new Groups( this, dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
ui.tabs->insertTab( 2, groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) ); ui.tabs->insertTab( 2, groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) );
ui.tabs->setUpdatesEnabled( true ); ui.tabs->setUpdatesEnabled( true );

2
favoritespanewidget.cc
View file

@ -593,7 +593,7 @@ QVariant FavoritesModel::data( QModelIndex const & index, int role ) const
if( role == Qt::DecorationRole ) if( role == Qt::DecorationRole )
{ {
if( item->type() == TreeItem::Folder || item->type() == TreeItem::Root ) if( item->type() == TreeItem::Folder || item->type() == TreeItem::Root )
return QIcon( ":/icons/folder.png" ); return QIcon( ":/icons/folder.svg" );
return QVariant(); return QVariant();
} }

1
flags.qrc
View file

@ -256,5 +256,6 @@
<file>flags/eo.png</file> <file>flags/eo.png</file>
<file>flags/jb.png</file> <file>flags/jb.png</file>
<file>flags/other.png</file> <file>flags/other.png</file>
<file>flags/folder.svg</file>
</qresource> </qresource>
</RCC> </RCC>

2
groups.cc
View file

@ -30,7 +30,7 @@ Groups::Groups( QWidget * parent,
groupsListButton = new QToolButton( ui.groups ); groupsListButton = new QToolButton( ui.groups );
groupsListButton->setAutoRaise( true ); groupsListButton->setAutoRaise( true );
groupsListButton->setIcon( QIcon( ":/icons/windows-list.png" ) ); groupsListButton->setIcon( QIcon( ":/icons/windows-list.svg" ) );
groupsListButton->setMenu( groupsListMenu ); groupsListButton->setMenu( groupsListMenu );
groupsListButton->setToolTip( tr( "Open groups list" ) ); groupsListButton->setToolTip( tr( "Open groups list" ) );
groupsListButton->setPopupMode( QToolButton::InstantPopup ); groupsListButton->setPopupMode( QToolButton::InstantPopup );

4
groups_widgets.cc
View file

@ -1027,12 +1027,12 @@ QuickFilterLine::QuickFilterLine( QWidget * parent ): ExtLineEdit( parent ), m_f
connect( &m_focusAction, SIGNAL( triggered() ), connect( &m_focusAction, SIGNAL( triggered() ),
this, SLOT( focusFilterLine() ) ); this, SLOT( focusFilterLine() ) );
QPixmap image(":/icons/system-search.png"); QPixmap image(":/icons/system-search.svg");
setButtonPixmap(ExtLineEdit::Left, image.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation)); setButtonPixmap(ExtLineEdit::Left, image.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation));
setButtonToolTip(ExtLineEdit::Left, tr("Quick Search")); setButtonToolTip(ExtLineEdit::Left, tr("Quick Search"));
setButtonVisible(ExtLineEdit::Left, true); setButtonVisible(ExtLineEdit::Left, true);
QPixmap right(":/icons/clear.png"); QPixmap right(":/icons/clear.svg");
setButtonPixmap(ExtLineEdit::Right, right); setButtonPixmap(ExtLineEdit::Right, right);
setButtonToolTip(ExtLineEdit::Right, tr("Clear Search")); setButtonToolTip(ExtLineEdit::Right, tr("Clear Search"));
setButtonVisible(ExtLineEdit::Right, true); setButtonVisible(ExtLineEdit::Right, true);

12
helpwindow.cc
View file

@ -68,20 +68,20 @@ HelpWindow::HelpWindow( QWidget * parent, Config::Class & cfg_ ) :
setLayout( mainLayout ); setLayout( mainLayout );
navToolBar = new QToolBar( this ); navToolBar = new QToolBar( this );
navHome = navToolBar->addAction( QIcon( ":/icons/home.png" ), tr( "Home" ) ); navHome = navToolBar->addAction( QIcon( ":/icons/home.svg" ), tr( "Home" ) );
navToolBar->widgetForAction( navHome )->setObjectName( "helpHomeButton" ); navToolBar->widgetForAction( navHome )->setObjectName( "helpHomeButton" );
navBack = navToolBar->addAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) ); navBack = navToolBar->addAction( QIcon( ":/icons/previous.svg" ), tr( "Back" ) );
navToolBar->widgetForAction( navBack )->setObjectName( "helpBackButton" ); navToolBar->widgetForAction( navBack )->setObjectName( "helpBackButton" );
navForward = navToolBar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) ); navForward = navToolBar->addAction( QIcon( ":/icons/next.svg" ), tr( "Forward" ) );
navToolBar->widgetForAction( navForward )->setObjectName( "helpForwardButton" ); navToolBar->widgetForAction( navForward )->setObjectName( "helpForwardButton" );
navToolBar->addSeparator(); navToolBar->addSeparator();
zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin" ), tr( "Zoom In" ) ); zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Zoom In" ) );
navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomInButton" ); navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomInButton" );
zoomOutAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomout" ), tr( "Zoom Out" ) ); zoomOutAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) );
navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomOutButton" ); navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomOutButton" );
zoomBaseAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoombase" ), tr( "Normal Size" ) ); zoomBaseAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Normal Size" ) );
navToolBar->widgetForAction( zoomBaseAction )->setObjectName( "zoomBaseButton" ); navToolBar->widgetForAction( zoomBaseAction )->setObjectName( "zoomBaseButton" );
navForward->setEnabled( false ); navForward->setEnabled( false );

1
main.cc
View file

@ -279,6 +279,7 @@ int main( int argc, char ** argv )
//high dpi screen support //high dpi screen support
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);

22
mainwindow.cc
View file

@ -132,8 +132,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
, ftsIndexing( dictionaries ) , ftsIndexing( dictionaries )
, ftsDlg( 0 ) , ftsDlg( 0 )
, helpWindow( 0 ) , helpWindow( 0 )
, starIcon( ":/icons/star.png" ) , starIcon( ":/icons/star.svg" )
, blueStarIcon( ":/icons/star_blue.png" ) , blueStarIcon( ":/icons/star_blue.svg" )
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
, gdAskMessage( 0xFFFFFFFF ) , gdAskMessage( 0xFFFFFFFF )
#endif #endif
@ -180,9 +180,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
navToolbar = addToolBar( tr( "&Navigation" ) ); navToolbar = addToolBar( tr( "&Navigation" ) );
navToolbar->setObjectName( "navToolbar" ); navToolbar->setObjectName( "navToolbar" );
navBack = navToolbar->addAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) ); navBack = navToolbar->addAction( QIcon( ":/icons/previous.svg" ), tr( "Back" ) );
navToolbar->widgetForAction( navBack )->setObjectName( "backButton" ); navToolbar->widgetForAction( navBack )->setObjectName( "backButton" );
navForward = navToolbar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) ); navForward = navToolbar->addAction( QIcon( ":/icons/next.svg" ), tr( "Forward" ) );
navToolbar->widgetForAction( navForward )->setObjectName( "forwardButton" ); navToolbar->widgetForAction( navForward )->setObjectName( "forwardButton" );
QWidget * translateBoxWidget = new QWidget( this ); QWidget * translateBoxWidget = new QWidget( this );
@ -207,7 +207,7 @@ 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.png" ), tr( "Scan Popup" ) ); enableScanPopup = navToolbar->addAction( QIcon( ":/icons/wizard.svg" ), tr( "Scan Popup" ) );
enableScanPopup->setCheckable( true ); enableScanPopup->setCheckable( true );
enableScanPopup->setVisible( cfg.preferences.enableScanPopup ); enableScanPopup->setVisible( cfg.preferences.enableScanPopup );
navToolbar->widgetForAction( enableScanPopup )->setObjectName( "scanPopupButton" ); navToolbar->widgetForAction( enableScanPopup )->setObjectName( "scanPopupButton" );
@ -418,7 +418,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut ); closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) ); closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) );
closeCurrentTabAction.setText( tr("Close current tab") ); closeCurrentTabAction.setText( tr("Close current tab") );
closeCurrentTabAction.setIcon( QIcon(":/icons/closetab.png") ); closeCurrentTabAction.setIcon( QIcon(":/icons/closetab.svg") );
connect( &closeCurrentTabAction, SIGNAL( triggered() ), connect( &closeCurrentTabAction, SIGNAL( triggered() ),
this, SLOT( closeCurrentTab() ) ); this, SLOT( closeCurrentTab() ) );
@ -624,7 +624,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
addTab.setAutoRaise( true ); addTab.setAutoRaise( true );
addTab.setToolTip( tr( "New Tab" ) ); addTab.setToolTip( tr( "New Tab" ) );
addTab.setFocusPolicy( Qt::NoFocus ); addTab.setFocusPolicy( Qt::NoFocus );
addTab.setIcon( QIcon( ":/icons/addtab.png" ) ); addTab.setIcon( QIcon( ":/icons/addtab.svg" ) );
ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab); ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);
ui.tabWidget->clear(); ui.tabWidget->clear();
@ -895,8 +895,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
if( layoutDirection() == Qt::RightToLeft ) if( layoutDirection() == Qt::RightToLeft )
{ {
// Adjust button icons for Right-To-Left layout // Adjust button icons for Right-To-Left layout
navBack->setIcon( QIcon( ":/icons/next.png" ) ); navBack->setIcon( QIcon( ":/icons/next.svg" ) );
navForward->setIcon( QIcon( ":/icons/previous.png" ) ); navForward->setIcon( QIcon( ":/icons/previous.svg" ) );
} }
} }
@ -1405,7 +1405,7 @@ void MainWindow::updateGroupList()
g.name = tr( "All" ); g.name = tr( "All" );
g.id = Instances::Group::AllGroupId; g.id = Instances::Group::AllGroupId;
g.icon = "folder.png"; g.icon = "folder.svg";
groupInstances.push_back( g ); groupInstances.push_back( g );
} }
@ -1559,7 +1559,7 @@ vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts()
void MainWindow::createTabList() void MainWindow::createTabList()
{ {
tabListMenu->setIcon(QIcon(":/icons/windows-list.png")); tabListMenu->setIcon(QIcon(":/icons/windows-list.svg"));
connect(tabListMenu, SIGNAL(aboutToShow()), this, SLOT(fillWindowsMenu())); connect(tabListMenu, SIGNAL(aboutToShow()), this, SLOT(fillWindowsMenu()));
connect(tabListMenu, SIGNAL(triggered(QAction*)), this, SLOT(switchToWindow(QAction*))); connect(tabListMenu, SIGNAL(triggered(QAction*)), this, SLOT(switchToWindow(QAction*)));

10
mainwindow.ui
View file

@ -371,7 +371,7 @@
<action name="dictionaries"> <action name="dictionaries">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/book.png</normaloff>:/icons/book.png</iconset> <normaloff>:/icons/book.svg</normaloff>:/icons/book.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Dictionaries...</string> <string>&amp;Dictionaries...</string>
@ -386,7 +386,7 @@
<action name="preferences"> <action name="preferences">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset> <normaloff>:/icons/configure.svg</normaloff>:/icons/configure.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Preferences...</string> <string>&amp;Preferences...</string>
@ -456,7 +456,7 @@
<action name="saveArticle"> <action name="saveArticle">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/filesave.png</normaloff>:/icons/filesave.png</iconset> <normalon>:/icons/filesave.svg</normalon>:/icons/filesave.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Save Article</string> <string>&amp;Save Article</string>
@ -474,7 +474,7 @@
<action name="print"> <action name="print">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/print.png</normaloff>:/icons/print.png</iconset> <normaloff>:/icons/print.svg</normaloff>:/icons/print.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Print</string> <string>&amp;Print</string>
@ -524,7 +524,7 @@
<action name="newTab"> <action name="newTab">
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/addtab.png</normaloff>:/icons/addtab.png</iconset> <normaloff>:/icons/addtab.svg</normaloff>:/icons/addtab.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;New Tab</string> <string>&amp;New Tab</string>

14
preferences.ui
View file

@ -15,7 +15,7 @@
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset> <normaloff>:/icons/configure.svg</normaloff>:/icons/configure.svg</iconset>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
@ -41,7 +41,7 @@
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/interface.png</normaloff>:/icons/interface.png</iconset> <normaloff>:/icons/interface.svg</normaloff>:/icons/interface.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>&amp;Interface</string> <string>&amp;Interface</string>
@ -374,7 +374,7 @@ be the last ones.</string>
<widget class="QWidget" name="tab_4"> <widget class="QWidget" name="tab_4">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/wizard.png</normaloff>:/icons/wizard.png</iconset> <normaloff>:/icons/wizard.svg</normaloff>:/icons/wizard.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>&amp;Scan Popup</string> <string>&amp;Scan Popup</string>
@ -720,7 +720,7 @@ seconds, which is specified here.</string>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/hotkeys.png</normaloff>:/icons/hotkeys.png</iconset> <normaloff>:/icons/hotkeys.svg</normaloff>:/icons/hotkeys.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Hotkeys</string> <string>Hotkeys</string>
@ -865,7 +865,7 @@ p, li { white-space: pre-wrap; }
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/playsound_color.png</normaloff>:/icons/playsound_color.png</iconset> <normaloff>:/icons/playsound_color.svg</normaloff>:/icons/playsound_color.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>&amp;Audio</string> <string>&amp;Audio</string>
@ -971,7 +971,7 @@ p, li { white-space: pre-wrap; }
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="tab_3">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/network.png</normaloff>:/icons/network.png</iconset> <normaloff>:/icons/network.svg</normaloff>:/icons/network.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>&amp;Network</string> <string>&amp;Network</string>
@ -1253,7 +1253,7 @@ download page.</string>
<widget class="QWidget" name="tab_FTS"> <widget class="QWidget" name="tab_FTS">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset> <normaloff>:/icons/system-search.svg</normaloff>:/icons/system-search.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Full-text search</string> <string>Full-text search</string>

2
programs.cc
View file

@ -130,7 +130,7 @@ void ProgramsDictionary::loadIcon() throw()
loadIconFromFile( fInfo.absoluteFilePath(), true ); loadIconFromFile( fInfo.absoluteFilePath(), true );
} }
if( dictionaryIcon.isNull() ) if( dictionaryIcon.isNull() )
dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/programs.png"); dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/programs.svg");
dictionaryIconLoaded = true; dictionaryIconLoaded = true;
} }

31
resources.qrc
View file

@ -87,5 +87,36 @@
<file>resources/jquery-3.6.0.slim.min.js</file> <file>resources/jquery-3.6.0.slim.min.js</file>
<file>resources/gd-custom.js</file> <file>resources/gd-custom.js</file>
<file>resources/gd-builtin.js</file> <file>resources/gd-builtin.js</file>
<file>icons/addtab.svg</file>
<file>icons/book.svg</file>
<file>icons/bookcase.svg</file>
<file>icons/clear.svg</file>
<file>icons/closetab.svg</file>
<file>icons/configure.svg</file>
<file>icons/error.svg</file>
<file>icons/fileopen.svg</file>
<file>icons/filesave.svg</file>
<file>icons/folder.svg</file>
<file>icons/folders.svg</file>
<file>icons/home.svg</file>
<file>icons/hotkeys.svg</file>
<file>icons/icon.svg</file>
<file>icons/icon32_zoombase.svg</file>
<file>icons/icon32_zoomin.svg</file>
<file>icons/icon32_zoomout.svg</file>
<file>icons/interface.svg</file>
<file>icons/internet.svg</file>
<file>icons/network.svg</file>
<file>icons/next.svg</file>
<file>icons/playsound_color.svg</file>
<file>icons/previous.svg</file>
<file>icons/print.svg</file>
<file>icons/programs.svg</file>
<file>icons/reload.svg</file>
<file>icons/star.svg</file>
<file>icons/star_blue.svg</file>
<file>icons/system-search.svg</file>
<file>icons/windows-list.svg</file>
<file>icons/wizard.svg</file>
</qresource> </qresource>
</RCC> </RCC>

8
scanpopup.cc
View file

@ -84,8 +84,8 @@ ScanPopup::ScanPopup( QWidget * parent,
mouseEnteredOnce( false ), mouseEnteredOnce( false ),
mouseIntercepted( false ), mouseIntercepted( false ),
hideTimer( this ), hideTimer( this ),
starIcon( ":/icons/star.png" ), starIcon( ":/icons/star.svg" ),
blueStarIcon( ":/icons/star_blue.png" ) blueStarIcon( ":/icons/star_blue.svg" )
{ {
ui.setupUi( this ); ui.setupUi( this );
@ -94,8 +94,8 @@ ScanPopup::ScanPopup( QWidget * parent,
if( layoutDirection() == Qt::RightToLeft ) if( layoutDirection() == Qt::RightToLeft )
{ {
// Adjust button icons for Right-To-Left layout // Adjust button icons for Right-To-Left layout
ui.goBackButton->setIcon( QIcon( ":/icons/next.png" ) ); ui.goBackButton->setIcon( QIcon( ":/icons/next.svg" ) );
ui.goForwardButton->setIcon( QIcon( ":/icons/previous.png" ) ); ui.goForwardButton->setIcon( QIcon( ":/icons/previous.svg" ) );
} }
mainStatusBar = new MainStatusBar( this ); mainStatusBar = new MainStatusBar( this );

8
scanpopup.ui
View file

@ -117,7 +117,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/previous.png</normaloff>:/icons/previous.png</iconset> <normaloff>:/icons/previous.svg</normaloff>:/icons/previous.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -131,7 +131,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/next.png</normaloff>:/icons/next.png</iconset> <normaloff>:/icons/next.svg</normaloff>:/icons/next.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -182,7 +182,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/star.png</normaloff>:/icons/star.png</iconset> <normaloff>:/icons/star.svg</normaloff>:/icons/star.svg</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string notr="true">Ctrl+E</string> <string notr="true">Ctrl+E</string>
@ -212,7 +212,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/bookcase.png</normaloff>:/icons/bookcase.png</iconset> <normaloff>:/icons/bookcase.svg</normaloff>:/icons/bookcase.svg</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>

2
sources.cc
View file

@ -121,7 +121,7 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg):
// Text to speech // Text to speech
#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC ) #if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
textToSpeechSource = new TextToSpeechSource( this, cfg.voiceEngines ); textToSpeechSource = new TextToSpeechSource( this, cfg.voiceEngines );
ui.tabWidget->addTab( textToSpeechSource, QIcon(":/icons/playsound_color.png"), tr( "Text to Speech" ) ); ui.tabWidget->addTab( textToSpeechSource, QIcon(":/icons/playsound_color.svg"), tr( "Text to Speech" ) );
#endif #endif
if ( Config::isPortableVersion() ) if ( Config::isPortableVersion() )

10
sources.ui
View file

@ -31,7 +31,7 @@
<widget class="QWidget" name="filesTab"> <widget class="QWidget" name="filesTab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/filesave.png</normaloff>:/icons/filesave.png</iconset> <normaloff>:/icons/folders.svg</normaloff>:/icons/folders.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Files</string> <string>Files</string>
@ -94,7 +94,7 @@
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/fileopen.png</normaloff>:/icons/fileopen.png</iconset> <normaloff>:/icons/fileopen.svg</normaloff>:/icons/fileopen.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Sound Dirs</string> <string>Sound Dirs</string>
@ -277,7 +277,7 @@ of the appropriate groups to use them.</string>
<widget class="QWidget" name="tab_4"> <widget class="QWidget" name="tab_4">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/internet.png</normaloff>:/icons/internet.png</iconset> <normaloff>:/icons/internet.svg</normaloff>:/icons/internet.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Websites</string> <string>Websites</string>
@ -341,7 +341,7 @@ of the appropriate groups to use them.</string>
<widget class="QWidget" name="dictdTab"> <widget class="QWidget" name="dictdTab">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/network.png</normaloff>:/icons/network.png</iconset> <normaloff>:/icons/network.svg</normaloff>:/icons/network.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>DICT servers</string> <string>DICT servers</string>
@ -397,7 +397,7 @@ of the appropriate groups to use them.</string>
<widget class="QWidget" name="tab_6"> <widget class="QWidget" name="tab_6">
<attribute name="icon"> <attribute name="icon">
<iconset resource="resources.qrc"> <iconset resource="resources.qrc">
<normaloff>:/icons/programs.png</normaloff>:/icons/programs.png</iconset> <normaloff>:/icons/programs.svg</normaloff>:/icons/programs.svg</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Programs</string> <string>Programs</string>

2
translatebox.cc
View file

@ -110,7 +110,7 @@ TranslateBox::TranslateBox(QWidget *parent) : QWidget(parent),
layout->setMargin(0); layout->setMargin(0);
layout->addWidget(translate_line); layout->addWidget(translate_line);
QPixmap image(":/icons/system-search.png"); QPixmap image(":/icons/system-search.svg");
translate_line->setButtonPixmap(ExtLineEdit::Left, image.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation)); translate_line->setButtonPixmap(ExtLineEdit::Left, image.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation));
// translate_line->setButtonToolTip(ExtLineEdit::Left, tr("Options")); // translate_line->setButtonToolTip(ExtLineEdit::Left, tr("Options"));
translate_line->setButtonVisible(ExtLineEdit::Left, true); translate_line->setButtonVisible(ExtLineEdit::Left, true);

2
website.cc
View file

@ -528,7 +528,7 @@ void WebSiteDictionary::loadIcon() throw()
loadIconFromFile( fInfo.absoluteFilePath(), true ); loadIconFromFile( fInfo.absoluteFilePath(), true );
} }
if( dictionaryIcon.isNull() ) if( dictionaryIcon.isNull() )
dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/internet.png"); dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/internet.svg");
dictionaryIconLoaded = true; dictionaryIconLoaded = true;
} }