From 9cf5ee8443f304d27205de6b3ca72e6581d743ee Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Mon, 24 Jan 2022 22:23:38 +0800 Subject: [PATCH] high dpi:change icon reference in code from png to svg. --- articleview.cc | 6 +++--- articleview.ui | 10 +++++----- dictgroupwidget.ui | 2 +- dictionarybar.cc | 2 +- dictserver.cc | 2 +- editdictionaries.cc | 12 ++++++------ favoritespanewidget.cc | 2 +- flags.qrc | 1 + groups.cc | 2 +- groups_widgets.cc | 4 ++-- helpwindow.cc | 12 ++++++------ main.cc | 1 + mainwindow.cc | 22 +++++++++++----------- mainwindow.ui | 10 +++++----- preferences.ui | 14 +++++++------- programs.cc | 2 +- resources.qrc | 31 +++++++++++++++++++++++++++++++ scanpopup.cc | 8 ++++---- scanpopup.ui | 8 ++++---- sources.cc | 2 +- sources.ui | 10 +++++----- translatebox.cc | 2 +- website.cc | 2 +- 23 files changed, 100 insertions(+), 67 deletions(-) diff --git a/articleview.cc b/articleview.cc index d6d97c0d..b8b453cb 100644 --- a/articleview.cc +++ b/articleview.cc @@ -1723,7 +1723,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos ) if ( !popupView ) { - followLinkNewTab = new QAction( QIcon( ":/icons/addtab.png" ), + followLinkNewTab = new QAction( QIcon( ":/icons/addtab.svg" ), tr( "Open Link in New &Tab" ), &menu ); menu.addAction( followLinkNewTab ); } @@ -1777,7 +1777,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos ) if ( !popupView ) { - lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.png" ), + lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.svg" ), tr( "Look up \"%1\" in &New Tab" ). arg( text ), &menu ); @@ -1810,7 +1810,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos ) 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" ). arg( text ). arg( altGroup->name ), &menu ); diff --git a/articleview.ui b/articleview.ui index bfb8b988..7ee535eb 100644 --- a/articleview.ui +++ b/articleview.ui @@ -72,7 +72,7 @@ - :/icons/previous.png:/icons/previous.png + :/icons/previous.svg:/icons/previous.svg Qt::ToolButtonTextBesideIcon @@ -86,7 +86,7 @@ - :/icons/next.png:/icons/next.png + :/icons/next.svg:/icons/next.svg Qt::ToolButtonTextBesideIcon @@ -143,7 +143,7 @@ - :/icons/closetab.png:/icons/closetab.png + :/icons/closetab.svg:/icons/closetab.svg true @@ -161,7 +161,7 @@ - :/icons/previous.png:/icons/previous.png + :/icons/previous.svg:/icons/previous.svg Qt::ToolButtonTextBesideIcon @@ -178,7 +178,7 @@ - :/icons/next.png:/icons/next.png + :/icons/next.svg:/icons/next.svg Ctrl+G diff --git a/dictgroupwidget.ui b/dictgroupwidget.ui index 370255db..3a576329 100644 --- a/dictgroupwidget.ui +++ b/dictgroupwidget.ui @@ -60,7 +60,7 @@ - :/icons/hotkeys.png + :/icons/hotkeys.svg true diff --git a/dictionarybar.cc b/dictionarybar.cc index 08469280..f149dac3 100644 --- a/dictionarybar.cc +++ b/dictionarybar.cc @@ -109,7 +109,7 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended ) QMenu menu( this ); 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 * headwordsAction = NULL; diff --git a/dictserver.cc b/dictserver.cc index 151c32df..fdc464e5 100644 --- a/dictserver.cc +++ b/dictserver.cc @@ -257,7 +257,7 @@ void DictServerDictionary::loadIcon() throw() loadIconFromFile( fInfo.absoluteFilePath(), true ); } if( dictionaryIcon.isNull() ) - dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.png"); + dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.svg"); dictionaryIconLoaded = true; } diff --git a/editdictionaries.cc b/editdictionaries.cc index f2987883..2ceea384 100644 --- a/editdictionaries.cc +++ b/editdictionaries.cc @@ -39,13 +39,13 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_, ui.setupUi( this ); - setWindowIcon( QIcon(":/icons/book.png") ); + setWindowIcon( QIcon(":/icons/bookcase.svg") ); ui.tabs->clear(); - ui.tabs->addTab( &sources, QIcon(":/icons/reload.png"), tr( "&Sources" ) ); - ui.tabs->addTab( orderAndProps.get(), QIcon(":/icons/book.png"), tr( "&Dictionaries" ) ); - ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) ); + ui.tabs->addTab( &sources, QIcon(":/icons/folders.svg"), tr( "&Sources" ) ); + ui.tabs->addTab( orderAndProps.get(), QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) ); + ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) ); connect( ui.buttons, SIGNAL( clicked( QAbstractButton * ) ), this, SLOT( buttonBoxClicked( QAbstractButton * ) ) ); @@ -241,10 +241,10 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups ) if ( rebuildGroups ) { 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() ); - 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 ); diff --git a/favoritespanewidget.cc b/favoritespanewidget.cc index 0ac47c34..392b4156 100644 --- a/favoritespanewidget.cc +++ b/favoritespanewidget.cc @@ -593,7 +593,7 @@ QVariant FavoritesModel::data( QModelIndex const & index, int role ) const if( role == Qt::DecorationRole ) { if( item->type() == TreeItem::Folder || item->type() == TreeItem::Root ) - return QIcon( ":/icons/folder.png" ); + return QIcon( ":/icons/folder.svg" ); return QVariant(); } diff --git a/flags.qrc b/flags.qrc index 1d322768..c89abbd0 100644 --- a/flags.qrc +++ b/flags.qrc @@ -256,5 +256,6 @@ flags/eo.png flags/jb.png flags/other.png + flags/folder.svg diff --git a/groups.cc b/groups.cc index 432a5d28..d9514bd0 100644 --- a/groups.cc +++ b/groups.cc @@ -30,7 +30,7 @@ Groups::Groups( QWidget * parent, groupsListButton = new QToolButton( ui.groups ); groupsListButton->setAutoRaise( true ); - groupsListButton->setIcon( QIcon( ":/icons/windows-list.png" ) ); + groupsListButton->setIcon( QIcon( ":/icons/windows-list.svg" ) ); groupsListButton->setMenu( groupsListMenu ); groupsListButton->setToolTip( tr( "Open groups list" ) ); groupsListButton->setPopupMode( QToolButton::InstantPopup ); diff --git a/groups_widgets.cc b/groups_widgets.cc index 5775aba3..7edbae3d 100644 --- a/groups_widgets.cc +++ b/groups_widgets.cc @@ -1027,12 +1027,12 @@ QuickFilterLine::QuickFilterLine( QWidget * parent ): ExtLineEdit( parent ), m_f connect( &m_focusAction, SIGNAL( triggered() ), 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)); setButtonToolTip(ExtLineEdit::Left, tr("Quick Search")); setButtonVisible(ExtLineEdit::Left, true); - QPixmap right(":/icons/clear.png"); + QPixmap right(":/icons/clear.svg"); setButtonPixmap(ExtLineEdit::Right, right); setButtonToolTip(ExtLineEdit::Right, tr("Clear Search")); setButtonVisible(ExtLineEdit::Right, true); diff --git a/helpwindow.cc b/helpwindow.cc index cdacc769..beec1ea2 100644 --- a/helpwindow.cc +++ b/helpwindow.cc @@ -68,20 +68,20 @@ HelpWindow::HelpWindow( QWidget * parent, Config::Class & cfg_ ) : setLayout( mainLayout ); 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" ); - navBack = navToolBar->addAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) ); + navBack = navToolBar->addAction( QIcon( ":/icons/previous.svg" ), tr( "Back" ) ); 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->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" ); - 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" ); - 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" ); navForward->setEnabled( false ); diff --git a/main.cc b/main.cc index c8df81ab..26440d6f 100644 --- a/main.cc +++ b/main.cc @@ -279,6 +279,7 @@ int main( int argc, char ** argv ) //high dpi screen support QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); diff --git a/mainwindow.cc b/mainwindow.cc index 1a8ec80f..0058e042 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -132,8 +132,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ): , ftsIndexing( dictionaries ) , ftsDlg( 0 ) , helpWindow( 0 ) -, starIcon( ":/icons/star.png" ) -, blueStarIcon( ":/icons/star_blue.png" ) +, starIcon( ":/icons/star.svg" ) +, blueStarIcon( ":/icons/star_blue.svg" ) #ifdef Q_OS_WIN32 , gdAskMessage( 0xFFFFFFFF ) #endif @@ -180,9 +180,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ): navToolbar = addToolBar( tr( "&Navigation" ) ); 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" ); - navForward = navToolbar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) ); + navForward = navToolbar->addAction( QIcon( ":/icons/next.svg" ), tr( "Forward" ) ); navToolbar->widgetForAction( navForward )->setObjectName( "forwardButton" ); QWidget * translateBoxWidget = new QWidget( this ); @@ -207,7 +207,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup ); 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->setVisible( cfg.preferences.enableScanPopup ); navToolbar->widgetForAction( enableScanPopup )->setObjectName( "scanPopupButton" ); @@ -418,7 +418,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut ); closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) ); closeCurrentTabAction.setText( tr("Close current tab") ); - closeCurrentTabAction.setIcon( QIcon(":/icons/closetab.png") ); + closeCurrentTabAction.setIcon( QIcon(":/icons/closetab.svg") ); connect( &closeCurrentTabAction, SIGNAL( triggered() ), this, SLOT( closeCurrentTab() ) ); @@ -624,7 +624,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ): addTab.setAutoRaise( true ); addTab.setToolTip( tr( "New Tab" ) ); addTab.setFocusPolicy( Qt::NoFocus ); - addTab.setIcon( QIcon( ":/icons/addtab.png" ) ); + addTab.setIcon( QIcon( ":/icons/addtab.svg" ) ); ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab); ui.tabWidget->clear(); @@ -895,8 +895,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ): if( layoutDirection() == Qt::RightToLeft ) { // Adjust button icons for Right-To-Left layout - navBack->setIcon( QIcon( ":/icons/next.png" ) ); - navForward->setIcon( QIcon( ":/icons/previous.png" ) ); + navBack->setIcon( QIcon( ":/icons/next.svg" ) ); + navForward->setIcon( QIcon( ":/icons/previous.svg" ) ); } } @@ -1405,7 +1405,7 @@ void MainWindow::updateGroupList() g.name = tr( "All" ); g.id = Instances::Group::AllGroupId; - g.icon = "folder.png"; + g.icon = "folder.svg"; groupInstances.push_back( g ); } @@ -1559,7 +1559,7 @@ vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts() 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(triggered(QAction*)), this, SLOT(switchToWindow(QAction*))); diff --git a/mainwindow.ui b/mainwindow.ui index 25ac51da..a50c5f07 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -371,7 +371,7 @@ - :/icons/book.png:/icons/book.png + :/icons/book.svg:/icons/book.svg &Dictionaries... @@ -386,7 +386,7 @@ - :/icons/configure.png:/icons/configure.png + :/icons/configure.svg:/icons/configure.svg &Preferences... @@ -456,7 +456,7 @@ - :/icons/filesave.png:/icons/filesave.png + :/icons/filesave.svg:/icons/filesave.svg &Save Article @@ -474,7 +474,7 @@ - :/icons/print.png:/icons/print.png + :/icons/print.svg:/icons/print.svg &Print @@ -524,7 +524,7 @@ - :/icons/addtab.png:/icons/addtab.png + :/icons/addtab.svg:/icons/addtab.svg &New Tab diff --git a/preferences.ui b/preferences.ui index 073fad17..c063c532 100644 --- a/preferences.ui +++ b/preferences.ui @@ -15,7 +15,7 @@ - :/icons/configure.png:/icons/configure.png + :/icons/configure.svg:/icons/configure.svg true @@ -41,7 +41,7 @@ - :/icons/interface.png:/icons/interface.png + :/icons/interface.svg:/icons/interface.svg &Interface @@ -374,7 +374,7 @@ be the last ones. - :/icons/wizard.png:/icons/wizard.png + :/icons/wizard.svg:/icons/wizard.svg &Scan Popup @@ -720,7 +720,7 @@ seconds, which is specified here. - :/icons/hotkeys.png:/icons/hotkeys.png + :/icons/hotkeys.svg:/icons/hotkeys.svg Hotkeys @@ -865,7 +865,7 @@ p, li { white-space: pre-wrap; } - :/icons/playsound_color.png:/icons/playsound_color.png + :/icons/playsound_color.svg:/icons/playsound_color.svg &Audio @@ -971,7 +971,7 @@ p, li { white-space: pre-wrap; } - :/icons/network.png:/icons/network.png + :/icons/network.svg:/icons/network.svg &Network @@ -1253,7 +1253,7 @@ download page. - :/icons/system-search.png:/icons/system-search.png + :/icons/system-search.svg:/icons/system-search.svg Full-text search diff --git a/programs.cc b/programs.cc index 3b8c7aef..2078b86e 100644 --- a/programs.cc +++ b/programs.cc @@ -130,7 +130,7 @@ void ProgramsDictionary::loadIcon() throw() loadIconFromFile( fInfo.absoluteFilePath(), true ); } if( dictionaryIcon.isNull() ) - dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/programs.png"); + dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/programs.svg"); dictionaryIconLoaded = true; } diff --git a/resources.qrc b/resources.qrc index d0818980..28c9413d 100644 --- a/resources.qrc +++ b/resources.qrc @@ -87,5 +87,36 @@ resources/jquery-3.6.0.slim.min.js resources/gd-custom.js resources/gd-builtin.js + icons/addtab.svg + icons/book.svg + icons/bookcase.svg + icons/clear.svg + icons/closetab.svg + icons/configure.svg + icons/error.svg + icons/fileopen.svg + icons/filesave.svg + icons/folder.svg + icons/folders.svg + icons/home.svg + icons/hotkeys.svg + icons/icon.svg + icons/icon32_zoombase.svg + icons/icon32_zoomin.svg + icons/icon32_zoomout.svg + icons/interface.svg + icons/internet.svg + icons/network.svg + icons/next.svg + icons/playsound_color.svg + icons/previous.svg + icons/print.svg + icons/programs.svg + icons/reload.svg + icons/star.svg + icons/star_blue.svg + icons/system-search.svg + icons/windows-list.svg + icons/wizard.svg diff --git a/scanpopup.cc b/scanpopup.cc index c833461e..81929c95 100644 --- a/scanpopup.cc +++ b/scanpopup.cc @@ -84,8 +84,8 @@ ScanPopup::ScanPopup( QWidget * parent, mouseEnteredOnce( false ), mouseIntercepted( false ), hideTimer( this ), - starIcon( ":/icons/star.png" ), - blueStarIcon( ":/icons/star_blue.png" ) + starIcon( ":/icons/star.svg" ), + blueStarIcon( ":/icons/star_blue.svg" ) { ui.setupUi( this ); @@ -94,8 +94,8 @@ ScanPopup::ScanPopup( QWidget * parent, if( layoutDirection() == Qt::RightToLeft ) { // Adjust button icons for Right-To-Left layout - ui.goBackButton->setIcon( QIcon( ":/icons/next.png" ) ); - ui.goForwardButton->setIcon( QIcon( ":/icons/previous.png" ) ); + ui.goBackButton->setIcon( QIcon( ":/icons/next.svg" ) ); + ui.goForwardButton->setIcon( QIcon( ":/icons/previous.svg" ) ); } mainStatusBar = new MainStatusBar( this ); diff --git a/scanpopup.ui b/scanpopup.ui index 13b17d34..e47fdd69 100644 --- a/scanpopup.ui +++ b/scanpopup.ui @@ -117,7 +117,7 @@ - :/icons/previous.png:/icons/previous.png + :/icons/previous.svg:/icons/previous.svg @@ -131,7 +131,7 @@ - :/icons/next.png:/icons/next.png + :/icons/next.svg:/icons/next.svg @@ -182,7 +182,7 @@ - :/icons/star.png:/icons/star.png + :/icons/star.svg:/icons/star.svg Ctrl+E @@ -212,7 +212,7 @@ - :/icons/bookcase.png:/icons/bookcase.png + :/icons/bookcase.svg:/icons/bookcase.svg true diff --git a/sources.cc b/sources.cc index 8f1387e9..fec30ef0 100644 --- a/sources.cc +++ b/sources.cc @@ -121,7 +121,7 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg): // Text to speech #if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC ) 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 if ( Config::isPortableVersion() ) diff --git a/sources.ui b/sources.ui index e7ce83db..649a6a64 100644 --- a/sources.ui +++ b/sources.ui @@ -31,7 +31,7 @@ - :/icons/filesave.png:/icons/filesave.png + :/icons/folders.svg:/icons/folders.svg Files @@ -94,7 +94,7 @@ - :/icons/fileopen.png:/icons/fileopen.png + :/icons/fileopen.svg:/icons/fileopen.svg Sound Dirs @@ -277,7 +277,7 @@ of the appropriate groups to use them. - :/icons/internet.png:/icons/internet.png + :/icons/internet.svg:/icons/internet.svg Websites @@ -341,7 +341,7 @@ of the appropriate groups to use them. - :/icons/network.png:/icons/network.png + :/icons/network.svg:/icons/network.svg DICT servers @@ -397,7 +397,7 @@ of the appropriate groups to use them. - :/icons/programs.png:/icons/programs.png + :/icons/programs.svg:/icons/programs.svg Programs diff --git a/translatebox.cc b/translatebox.cc index cc73762f..83b1fc82 100644 --- a/translatebox.cc +++ b/translatebox.cc @@ -110,7 +110,7 @@ TranslateBox::TranslateBox(QWidget *parent) : QWidget(parent), layout->setMargin(0); 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->setButtonToolTip(ExtLineEdit::Left, tr("Options")); translate_line->setButtonVisible(ExtLineEdit::Left, true); diff --git a/website.cc b/website.cc index 93355bf5..942aedb6 100644 --- a/website.cc +++ b/website.cc @@ -528,7 +528,7 @@ void WebSiteDictionary::loadIcon() throw() loadIconFromFile( fInfo.absoluteFilePath(), true ); } if( dictionaryIcon.isNull() ) - dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/internet.png"); + dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/internet.svg"); dictionaryIconLoaded = true; }