diff --git a/editdictionaries.cc b/editdictionaries.cc index af9a401d..239dca5b 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/folders.svg"), tr( "&Sources" ) ); + ui.tabs->addTab( &sources, QIcon(":/icons/reload.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" ) ); diff --git a/helpwindow.cc b/helpwindow.cc index beec1ea2..9652fb7f 100644 --- a/helpwindow.cc +++ b/helpwindow.cc @@ -77,11 +77,11 @@ HelpWindow::HelpWindow( QWidget * parent, Config::Class & cfg_ ) : navToolBar->addSeparator(); - zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Zoom In" ) ); + zoomInAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), tr( "Zoom In" ) ); navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomInButton" ); - zoomOutAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) ); + zoomOutAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoomout.svg" ), tr( "Zoom Out" ) ); navToolBar->widgetForAction( zoomInAction )->setObjectName( "zoomOutButton" ); - zoomBaseAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Normal Size" ) ); + zoomBaseAction = navToolBar->addAction( QIcon( ":/icons/icon32_zoombase.svg" ), tr( "Normal Size" ) ); navToolBar->widgetForAction( zoomBaseAction )->setObjectName( "zoomBaseButton" ); navForward->setEnabled( false ); diff --git a/icons/1downarrow.svg b/icons/1downarrow.svg new file mode 100644 index 00000000..da84dac0 --- /dev/null +++ b/icons/1downarrow.svg @@ -0,0 +1,65 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/icons/advanced.svg b/icons/advanced.svg new file mode 100644 index 00000000..7aca1999 --- /dev/null +++ b/icons/advanced.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + System Run + + + + run + launch + exec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/closetab-hover.svg b/icons/closetab-hover.svg new file mode 100644 index 00000000..df16c628 --- /dev/null +++ b/icons/closetab-hover.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Stop Process + December 2006 + + + Jakub Steiner + + + + + Andreas Nilsson + + + + + + stop + halt + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/closetab.svg b/icons/closetab.svg index df16c628..4d4d088c 100644 --- a/icons/closetab.svg +++ b/icons/closetab.svg @@ -1,39 +1,40 @@ + + version="1.0" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> - + + + + - - - - - @@ -91,6 +69,17 @@ offset="1" style="stop-color:#c00;stop-opacity:1;" /> + + height="48px" + inkscape:pagecheckerboard="0" + inkscape:window-maximized="1" /> @@ -122,7 +113,6 @@ image/svg+xml - Stop Process December 2006 @@ -169,45 +159,30 @@ id="g7001" transform="matrix(1.4566048,0,0,1.4455352,0.4112881,1.2324709)"> - - + sodipodi:type="arc" + sodipodi:ry="9.25" + sodipodi:rx="9.25" + sodipodi:cy="9.625" + sodipodi:cx="10" /> + d="m 11.045351,10.499838 10.29792,10.438794" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#f0464d;stroke-width:2.07362;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + diff --git a/icons/folder-sound.svg b/icons/folder-sound.svg new file mode 100644 index 00000000..e68af0e3 --- /dev/null +++ b/icons/folder-sound.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/fulltext.svg b/icons/fulltext.svg new file mode 100644 index 00000000..8c0ded33 --- /dev/null +++ b/icons/fulltext.svg @@ -0,0 +1,704 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/pushpin.svg b/icons/pushpin.svg new file mode 100644 index 00000000..b9a25f81 --- /dev/null +++ b/icons/pushpin.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Pushpin 2 + 2010-03-23T19:37:10 + I noticed that I couldn't find any good pushpins when I needed one for a project, so I made one. \n \nThis is an updated version of my pushpin. I noticed that the old one didn't have enough contrast to look enough like a push pin when it was made small. I also increased the angle of the pushpin. + http://openclipart.org/detail/33601/thumbtack/pushpin-2-by-randoogle + + + randoogle + + + + + clip art + clipart + image + media + office + pin + png + public domain + pushpin + red + svg + tack + thumbtack + + + + + + + + + + + diff --git a/icons/sound-dir.svg b/icons/sound-dir.svg new file mode 100644 index 00000000..e68af0e3 --- /dev/null +++ b/icons/sound-dir.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/text2speech.svg b/icons/text2speech.svg new file mode 100644 index 00000000..7df08652 --- /dev/null +++ b/icons/text2speech.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icons/transliteration.svg b/icons/transliteration.svg new file mode 100644 index 00000000..03939b47 --- /dev/null +++ b/icons/transliteration.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/webdict.svg b/icons/webdict.svg new file mode 100644 index 00000000..7288a5b7 --- /dev/null +++ b/icons/webdict.svg @@ -0,0 +1,1217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Web Browser + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/wizard-selected.svg b/icons/wizard-selected.svg new file mode 100644 index 00000000..f5e40e91 --- /dev/null +++ b/icons/wizard-selected.svg @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mainwindow.cc b/mainwindow.cc index 0058e042..dbfef2fb 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -234,17 +234,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.png" ), tr( "Zoom In" ) ); + zoomIn = navToolbar->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), tr( "Zoom In" ) ); zoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence::ZoomIn << QKeySequence( "Ctrl+=" ) ); navToolbar->widgetForAction( zoomIn )->setObjectName( "zoomInButton" ); - zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) ); + zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.svg" ), tr( "Zoom Out" ) ); zoomOut->setShortcut( QKeySequence::ZoomOut ); navToolbar->widgetForAction( zoomOut )->setObjectName( "zoomOutButton" ); - zoomBase = navToolbar->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Normal Size" ) ); + zoomBase = navToolbar->addAction( QIcon( ":/icons/icon32_zoombase.svg" ), tr( "Normal Size" ) ); zoomBase->setShortcut( QKeySequence( "Ctrl+0" ) ); navToolbar->widgetForAction( zoomBase )->setObjectName( "zoomBaseButton" ); @@ -365,13 +365,13 @@ MainWindow::MainWindow( Config::Class & cfg_ ): ui.menuZoom->addSeparator(); - wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Words Zoom In" ) ); + wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.svg" ), tr( "Words Zoom In" ) ); wordsZoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence( "Alt++" ) << QKeySequence( "Alt+=" ) ); - wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Words Zoom Out" ) ); + wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.svg" ), tr( "Words Zoom Out" ) ); wordsZoomOut->setShortcut( QKeySequence( "Alt+-" ) ); - wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Words Normal Size" ) ); + wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.svg" ), tr( "Words Normal Size" ) ); wordsZoomBase->setShortcut( QKeySequence( "Alt+0" ) ); connect( wordsZoomIn, SIGNAL(triggered()), this, SLOT(doWordsZoomIn()) ); @@ -3228,9 +3228,13 @@ void MainWindow::scanEnableToggled( bool on ) mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000, QPixmap( ":/icons/error.png" ) ); #endif + enableScanPopup->setIcon(QIcon(":/icons/wizard-selected.svg")); } else + { scanPopup->disableScanning(); + enableScanPopup->setIcon(QIcon(":/icons/wizard.svg")); + } } updateTrayIcon(); diff --git a/preferences.ui b/preferences.ui index c063c532..54ff1fc2 100644 --- a/preferences.ui +++ b/preferences.ui @@ -865,7 +865,7 @@ p, li { white-space: pre-wrap; } - :/icons/playsound_color.svg:/icons/playsound_color.svg + :/icons/text2speech.svg:/icons/text2speech.svg &Audio @@ -1253,7 +1253,7 @@ download page. - :/icons/system-search.svg:/icons/system-search.svg + :/icons/fulltext.svg:/icons/fulltext.svg Full-text search @@ -1428,6 +1428,10 @@ download page. + + + :/icons/advanced.svg:/icons/advanced.svg + Ad&vanced diff --git a/qt-style.css b/qt-style.css index ea1120b6..353857b0 100644 --- a/qt-style.css +++ b/qt-style.css @@ -54,7 +54,7 @@ ScanPopup #translateLine[noResults="true"] } #navToolbar GroupComboBox::down-arrow { - image: url(:/icons/1downarrow.png); + image: url(:/icons/1downarrow.svg); } #navToolbar GroupComboBox::down-arrow:on { /* shift the arrow when popup is open */ @@ -62,6 +62,14 @@ ScanPopup #translateLine[noResults="true"] left: 1px; } +QTabBar::close-button { + image: url(:/icons/closetab.svg) +} +QTabBar::close-button:hover { + image: url(:/icons/closetab-hover.svg) +} + + ArticleView #searchText[noResults="true"] { background: #febb7d; @@ -125,7 +133,7 @@ ScanPopup GroupComboBox::drop-down { } ScanPopup GroupComboBox::down-arrow { - image: url(:/icons/1downarrow.png); + image: url(:/icons/1downarrow.svg); } ScanPopup GroupComboBox::down-arrow:on { /* shift the arrow when popup is open */ diff --git a/resources.qrc b/resources.qrc index 97f77dd6..fea0883e 100644 --- a/resources.qrc +++ b/resources.qrc @@ -120,5 +120,14 @@ icons/windows-list.svg icons/wizard.svg icons/dictionary.svg + icons/advanced.svg + icons/webdict.svg + icons/transliteration.svg + icons/pushpin.svg + icons/fulltext.svg + icons/text2speech.svg + icons/closetab-hover.svg + icons/1downarrow.svg + icons/wizard-selected.svg diff --git a/scanpopup.ui b/scanpopup.ui index e47fdd69..cce78cd3 100644 --- a/scanpopup.ui +++ b/scanpopup.ui @@ -256,7 +256,7 @@ could be resized or managed in other ways. - :/icons/pushpin.png:/icons/pushpin.png + :/icons/pushpin.svg:/icons/pushpin.svg true diff --git a/sources.cc b/sources.cc index fec30ef0..60558408 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.svg"), tr( "Text to Speech" ) ); + ui.tabWidget->addTab( textToSpeechSource, QIcon(":/icons/text2speech.svg"), tr( "Text to Speech" ) ); #endif if ( Config::isPortableVersion() ) diff --git a/sources.ui b/sources.ui index 307cd02d..21ddd1ce 100644 --- a/sources.ui +++ b/sources.ui @@ -630,6 +630,10 @@ in the future, or register on the site to get your own key. + + + :/icons/transliteration.svg:/icons/transliteration.svg + Transliteration diff --git a/website.cc b/website.cc index 942aedb6..ecc7912e 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.svg"); + dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/webdict.svg"); dictionaryIconLoaded = true; }