diff --git a/editdictionaries.cc b/editdictionaries.cc index 70b19663..2c8bdf96 100644 --- a/editdictionaries.cc +++ b/editdictionaries.cc @@ -43,7 +43,7 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_, ui.tabs->clear(); - ui.tabs->addTab( &sources, QIcon(":/icons/reload.svg"), tr( "&Sources" ) ); + ui.tabs->addTab( &sources, QIcon(":/icons/reload.png"), tr( "&Sources" ) ); ui.tabs->addTab( orderAndProps, QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) ); ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) ); diff --git a/helpwindow.cc b/helpwindow.cc index 040e766d..ba6dce3e 100644 --- a/helpwindow.cc +++ b/helpwindow.cc @@ -80,11 +80,11 @@ HelpWindow::HelpWindow( QWidget * parent, Config::Class & cfg_ ) : navToolBar->addSeparator(); - zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), 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.svg" ), 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.svg" ), 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/icons/advanced.png b/icons/advanced.png new file mode 100644 index 00000000..c143c1dd Binary files /dev/null and b/icons/advanced.png differ diff --git a/icons/advanced.svg b/icons/advanced.svg deleted file mode 100644 index 4fd4e67c..00000000 --- a/icons/advanced.svg +++ /dev/null @@ -1,1029 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Konqueror Application - - - Andreas Nilsson - - - http://tango-project.org - - - konqueror - browser - web - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/icon32_zoombase.png b/icons/icon32_zoombase.png new file mode 100644 index 00000000..5f3b66e2 Binary files /dev/null and b/icons/icon32_zoombase.png differ diff --git a/icons/icon32_zoombase.svg b/icons/icon32_zoombase.svg deleted file mode 100644 index 8783ba9d..00000000 --- a/icons/icon32_zoombase.svg +++ /dev/null @@ -1,298 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/icon32_zoomin.png b/icons/icon32_zoomin.png new file mode 100644 index 00000000..d2705956 Binary files /dev/null and b/icons/icon32_zoomin.png differ diff --git a/icons/icon32_zoomin.svg b/icons/icon32_zoomin.svg deleted file mode 100644 index 3baa9766..00000000 --- a/icons/icon32_zoomin.svg +++ /dev/null @@ -1,1186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Martin Ruskov - - - http://commons.wikimedia.org/wiki/Tango_icon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/icon32_zoomout.png b/icons/icon32_zoomout.png new file mode 100644 index 00000000..c3d7ef18 Binary files /dev/null and b/icons/icon32_zoomout.png differ diff --git a/icons/icon32_zoomout.svg b/icons/icon32_zoomout.svg deleted file mode 100644 index 469a4ab6..00000000 --- a/icons/icon32_zoomout.svg +++ /dev/null @@ -1,1188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Martin Ruskov - - - http://commons.wikimedia.org/wiki/Tango_icon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/readme.txt b/icons/readme.txt index 6ac0d7b9..117572d7 100644 --- a/icons/readme.txt +++ b/icons/readme.txt @@ -18,9 +18,6 @@ error star.svg star_blue.svg network.svg -icon32_zoomin -icon32_zoomout -icon32_zoombase hotkeys previous next @@ -57,4 +54,14 @@ lists: these two icons from sertoli @ https://forum.freemdict.com/u/sertoli/summary playsound.png -playsound_full.png \ No newline at end of file +playsound_full.png + + +LGPL +icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png +icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png +icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png +reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html +advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png + + diff --git a/icons/reload.png b/icons/reload.png index f9f388f2..b38aa154 100644 Binary files a/icons/reload.png and b/icons/reload.png differ diff --git a/icons/reload.svg b/icons/reload.svg deleted file mode 100644 index 69e59776..00000000 --- a/icons/reload.svg +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Internet Category - - - Jakub Steiner - - - - - Tuomas Kuosmanen - - - - http://jimmac.musichall.cz - - - internet - tools - applications - category - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mainwindow.cc b/mainwindow.cc index 6307fc78..743af1a0 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -260,17 +260,17 @@ MainWindow::MainWindow( Config::Class & cfg_ ): // named separator (to be able to hide it via CSS) navToolbar->widgetForAction( navToolbar->addSeparator() )->setObjectName( "separatorBeforeZoom" ); - zoomIn = navToolbar->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), tr( "Zoom In" ) ); + zoomIn = navToolbar->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Zoom In" ) ); zoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence::ZoomIn << QKeySequence( "Ctrl+=" ) ); navToolbar->widgetForAction( zoomIn )->setObjectName( "zoomInButton" ); - zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.svg" ), tr( "Zoom Out" ) ); + zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) ); zoomOut->setShortcut( QKeySequence::ZoomOut ); navToolbar->widgetForAction( zoomOut )->setObjectName( "zoomOutButton" ); - zoomBase = navToolbar->addAction( QIcon( ":/icons/icon32_zoombase.svg" ), tr( "Normal Size" ) ); + zoomBase = navToolbar->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Normal Size" ) ); zoomBase->setShortcut( QKeySequence( "Ctrl+0" ) ); navToolbar->widgetForAction( zoomBase )->setObjectName( "zoomBaseButton" ); @@ -391,13 +391,13 @@ MainWindow::MainWindow( Config::Class & cfg_ ): ui.menuZoom->addSeparator(); - wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), tr( "Words Zoom In" ) ); + wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Words Zoom In" ) ); wordsZoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence( "Alt++" ) << QKeySequence( "Alt+=" ) ); - wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.svg" ), tr( "Words Zoom Out" ) ); + wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Words Zoom Out" ) ); wordsZoomOut->setShortcut( QKeySequence( "Alt+-" ) ); - wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.svg" ), tr( "Words Normal Size" ) ); + wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Words Normal Size" ) ); wordsZoomBase->setShortcut( QKeySequence( "Alt+0" ) ); connect( wordsZoomIn, SIGNAL(triggered()), this, SLOT(doWordsZoomIn()) ); diff --git a/preferences.ui b/preferences.ui index 7a43c656..a9e9c159 100644 --- a/preferences.ui +++ b/preferences.ui @@ -1411,7 +1411,7 @@ download page. - :/icons/advanced.svg:/icons/advanced.svg + :/icons/advanced.png:/icons/advanced.png Ad&vanced diff --git a/resources.qrc b/resources.qrc index 5c7160d6..6f86bf89 100644 --- a/resources.qrc +++ b/resources.qrc @@ -71,9 +71,9 @@ icons/home.svg icons/hotkeys.svg icons/icon.svg - icons/icon32_zoombase.svg - icons/icon32_zoomin.svg - icons/icon32_zoomout.svg + icons/icon32_zoombase.png + icons/icon32_zoomin.png + icons/icon32_zoomout.png icons/interface.svg icons/internet.svg icons/network.svg @@ -82,14 +82,14 @@ icons/previous.svg icons/print.svg icons/programs.svg - icons/reload.svg + icons/reload.png icons/star.svg icons/star_blue.svg icons/system-search.svg icons/windows-list.svg icons/wizard.svg icons/dictionary.svg - icons/advanced.svg + icons/advanced.png icons/webdict.svg icons/transliteration.png icons/pushpin.svg