From bfe7f720daf2459ca67b72085c1381a4ff8bccda Mon Sep 17 00:00:00 2001 From: ars_goldendict Date: Sat, 2 May 2009 21:46:43 +0000 Subject: [PATCH] a bit more icons --- src/editdictionaries.cc | 24 ++++++++------- src/icons/book.png | Bin 0 -> 1054 bytes src/icons/bookcase.png | Bin 0 -> 2175 bytes src/icons/configure.png | Bin 0 -> 1665 bytes src/icons/hotkeys.png | Bin 0 -> 2230 bytes src/icons/interface.png | Bin 0 -> 1927 bytes src/icons/network.png | Bin 0 -> 2324 bytes src/mainwindow.cc | 12 +++++--- src/mainwindow.ui | 22 ++++++++++---- src/preferences.ui | 32 +++++++++++++++++-- src/resources.qrc | 66 ++++++++++++++++++++++------------------ 11 files changed, 101 insertions(+), 55 deletions(-) create mode 100644 src/icons/book.png create mode 100644 src/icons/bookcase.png create mode 100644 src/icons/configure.png create mode 100644 src/icons/hotkeys.png create mode 100644 src/icons/interface.png create mode 100644 src/icons/network.png diff --git a/src/editdictionaries.cc b/src/editdictionaries.cc index 9890bd12..581c8ca6 100644 --- a/src/editdictionaries.cc +++ b/src/editdictionaries.cc @@ -21,19 +21,21 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_, { ui.setupUi( this ); + setWindowIcon( QIcon(":/icons/book.png") ); + ui.tabs->clear(); - - ui.tabs->addTab( &sources, tr( "&Sources" ) ); - ui.tabs->addTab( groups.get(), tr( "&Groups" ) ); + + ui.tabs->addTab( &sources, QIcon(":/icons/book.png"), tr( "&Sources" ) ); + ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.png"), tr( "&Groups" ) ); } void EditDictionaries::accept() { acceptChangedSources(); - + Config::Groups newGroups = groups->getGroups(); - + if ( origCfg.groups != newGroups ) { groupsChanged = true; @@ -56,15 +58,15 @@ void EditDictionaries::on_tabs_currentChanged( int index ) if ( isSourcesChanged() ) { ui.tabs->setCurrentIndex( 0 ); - + QMessageBox question( QMessageBox::Question, tr( "Sources changed" ), tr( "Some sources were changed. Would you like to accept the changes?" ), QMessageBox::NoButton, this ); QPushButton * accept = question.addButton( tr( "Accept" ), QMessageBox::AcceptRole ); - + question.addButton( tr( "Cancel" ), QMessageBox::RejectRole ); - + question.exec(); if ( question.clickedButton() == accept ) @@ -72,7 +74,7 @@ void EditDictionaries::on_tabs_currentChanged( int index ) acceptChangedSources(); // Rebuild groups from scratch - + Config::Groups savedGroups = groups->getGroups(); ui.tabs->setUpdatesEnabled( false ); @@ -81,7 +83,7 @@ void EditDictionaries::on_tabs_currentChanged( int index ) groups = new Groups( this, dictionaries, savedGroups ); ui.tabs->insertTab( 1, groups.get(), tr( "&Groups" ) ); ui.tabs->setUpdatesEnabled( true ); - + lastCurrentTab = index; ui.tabs->setCurrentIndex( index ); } @@ -110,7 +112,7 @@ void EditDictionaries::acceptChangedSources() if ( isSourcesChanged() ) { dictionariesChanged = true; - + cfg.paths = sources.getPaths(); cfg.soundDirs = sources.getSoundDirs(); cfg.hunspell = sources.getHunspell(); diff --git a/src/icons/book.png b/src/icons/book.png new file mode 100644 index 0000000000000000000000000000000000000000..3a6d4619a565ec5fe2bf6a61deba9697cb36db56 GIT binary patch literal 1054 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 LNkvXXu0mjfaKikH literal 0 HcmV?d00001 diff --git a/src/icons/hotkeys.png b/src/icons/hotkeys.png new file mode 100644 index 0000000000000000000000000000000000000000..18b172fc0675fca9e6a545074afbcd306dfb1b97 GIT binary patch literal 2230 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 N002ovPDHLkV1nFLq!a)E literal 0 HcmV?d00001 diff --git a/src/icons/network.png b/src/icons/network.png new file mode 100644 index 0000000000000000000000000000000000000000..50303c7e02c7766508ed7fa965338afb71576380 GIT binary patch literal 2324 zcmV+v3G4QWP)#FNJTMJoK zs^Ryl_*@cW5tEdW=H#UWT_>k`XaCv0@l$W?X5{&2uu{?g4ZxtYv^4MOhqg91-+NOj z4aEWl=o_{0Yk~r=Koa0lKnRFgaBR@#4}TeA-%D?vik*Az38F_1{C5D+_`SSqvu@I0a3vOKEBYgkOCHpeQ zuFG9d8t51HGEWloB}t&C%j#$@zc`O$AGpygTp*Ya^&0iqA*MBj9nL*LiAFf$d)o|!oF9nK4b-9Q9 zfQltV_O0UvBr-5Il_nB1$=DKc-6mxUl7_|9jKO3iO-ff-K$4-!%dEfat`-V!c?`(= z+@B#yy`iP0>h5$VN^oqHDY=!nDNwDsa~88UheJss;Up3wYntMckz|>4%0!lAEZgK@ z&naGb=Li$w7~8+TmCBae?+hM%`$fqp5WRz+psFfkqode>5E6 zh{Zvb1(GC#H=l~y1_myEgraHKrio=3tlD%NZEMG@EDB$?vK}duXfSI!oOiYe_AQUe}#U)6p8&&htaD6jvt5@RF1OhNjNT!+X z2|7;Ts?j`o*pfy`c{MB6uBJ3!rN}39q4yHIcmI{1qvr_@O@ba81>!jYIQQ~_!4W;N zw7H&?p|EmgEB9>sG8H9${0bC$pg@Cw8}gmXb3tQM4aH?u6qlCKv0)_*wM7`wB(jxp zGEju(&7-ocnA1I{by9tOKsa|Fm_FWf;=~6BAKbQKb6steHLDu%$$$$yGNf(D%r&Je zk|mYRw|AhqB#In5*@p4y8J5%*vSZs?GDeCEeKGobUb_g!`@nQ=fJ7*hJidG9v87F& zookl3$3`Nww|Y<|$e56}z_MoxKmbC(b$$=BAX}OYE1F8PJ)^V`E{`ZY`Nu!SncCk4 zoC4Ch0RTd8zuU8~^*2@J-}}*)j?%2{Vn5KoX$flsxM|VE`_V zTl{3_yY#;P(<7w&UIY#S8D^DZAQ1wtNOE6C-F-i6yW^o9KloO=+*B>|anMH3SlPM2 z>ju*yQ5Aval-mU!ZPul?4u|>e@7~A^ANbW_Qm0=4UI#{UOhh>V0EFZvukAkX@&}&i zxOvl;>g&ppBsYOZFuW2On zcszVsx~}7_5lHSBFV{2^T9$RyqW1RoEI?IN70xEQqNoFx1_lPI z{KoRl?G;-MT_8q|ii1}4BVbQ`ef?xbMMd_3E|-hS%1Xw^$Nvog_+kK{&~f1&kH_n) ztE;z!5M+?;r8O0)M=HDTYzX}r({}MlV~9Y9y!zGXSH82brabC!OMq~sI!8F}yvVCS z?)`91r-#z;B%YU8%_5tR#J23azagIbnkW7kM09!(isidZK)Zre;1e_Wm zHf|D&+6Y^KJ-gO4CFefFXIW+~pk5PzEX$t`p?TuO;bdRmxqxY!Hb7c&ksli4vC_Ch z)eX7}tT3bfR>i(XeeaddAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) ); navForward = navToolbar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) ); + navToolbar->addSeparator(); navToolbar->addAction( ui.print ); navToolbar->addAction( ui.saveArticle ); + navToolbar->addSeparator(); enableScanPopup = navToolbar->addAction( QIcon( ":/icons/wizard.png" ), tr( "Scan Popup" ) ); enableScanPopup->setCheckable( true ); enableScanPopup->setVisible( cfg.preferences.enableScanPopup ); @@ -1241,9 +1243,9 @@ void MainWindow::on_printPreview_activated() void MainWindow::on_print_activated() { QPrintDialog dialog( &printer, this ); - + dialog.setWindowTitle( tr( "Print Article") ); - + if ( dialog.exec() != QDialog::Accepted ) return; @@ -1266,15 +1268,15 @@ void MainWindow::on_saveArticle_activated() QFileDialog fileDialog( this, tr( "Save Article As" ), QString(), tr( "Html files (*.html *.htm)" ) ); fileDialog.setAcceptMode( QFileDialog::AcceptSave ); - + fileDialog.setDefaultSuffix( "html" ); - + fileDialog.selectFile( view.getTitle() + ".html" ); if ( fileDialog.exec() && fileDialog.selectedFiles().size() == 1 ) { QString fileName = fileDialog.selectedFiles().front(); - + QFile file( fileName ); if ( !file.open( QIODevice::WriteOnly ) ) diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 72fef3ba..4ea7ebe6 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -58,7 +58,7 @@ 0 0 653 - 26 + 22 @@ -223,6 +223,10 @@ + + + :/icons/book.png:/icons/book.png + &Dictionaries... @@ -231,6 +235,10 @@ + + + :/icons/playsound.png:/icons/playsound.png + &Groups... @@ -239,6 +247,10 @@ + + + :/icons/configure.png:/icons/configure.png + &Preferences... @@ -291,7 +303,7 @@ - + :/icons/filesave.png:/icons/filesave.png @@ -306,7 +318,7 @@ - + :/icons/print.png:/icons/print.png @@ -339,8 +351,6 @@ translateLine tabWidget - - - + diff --git a/src/preferences.ui b/src/preferences.ui index 5ec17380..f6e0159c 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -6,13 +6,17 @@ 0 0 - 435 + 472 325 Preferences + + + :/icons/configure.png:/icons/configure.png + true @@ -20,9 +24,13 @@ - 0 + 1 + + + :/icons/interface.png:/icons/interface.png + &Interface @@ -198,6 +206,10 @@ the application. + + + :/icons/hotkeys.png:/icons/hotkeys.png + Hotkeys @@ -319,6 +331,10 @@ the application. + + + :/icons/wizard.png:/icons/wizard.png + &Scan Popup @@ -613,6 +629,10 @@ seconds, which is specified here. + + + :/icons/playsound.png:/icons/playsound.png + &Audio @@ -674,6 +694,10 @@ seconds, which is specified here. + + + :/icons/network.png:/icons/network.png + &Network @@ -880,7 +904,9 @@ download page. proxyPassword enableScanPopup - + + + buttonBox diff --git a/src/resources.qrc b/src/resources.qrc index 32df5431..4d7d8300 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,32 +1,38 @@ - - icons/print.png - icons/arrow.png - icons/prefix.png - icons/pushpin.png - icons/playsound.png - icons/closetab.png - icons/addtab.png - icons/next.png - icons/previous.png - icons/programicon.png - icons/programicon_scan.png - icons/wizard.png - icons/warning.png - article-style.css - article-style-print.css - qt-style.css - icons/icon32_dsl.png - icons/icon32_stardict.png - icons/icon32_xdxf.png - icons/icon32_bgl.png - icons/icon32_dictd.png - icons/icon32_hunspell.png - icons/fileopen.png - icons/filesave.png - icons/icon32_wiki.png - icons/icon32_zoombase.png - icons/icon32_zoomin.png - icons/icon32_zoomout.png - + + icons/print.png + icons/arrow.png + icons/prefix.png + icons/pushpin.png + icons/playsound.png + icons/closetab.png + icons/addtab.png + icons/next.png + icons/previous.png + icons/programicon.png + icons/programicon_scan.png + icons/wizard.png + icons/warning.png + article-style.css + article-style-print.css + qt-style.css + icons/icon32_dsl.png + icons/icon32_stardict.png + icons/icon32_xdxf.png + icons/icon32_bgl.png + icons/icon32_dictd.png + icons/icon32_hunspell.png + icons/fileopen.png + icons/filesave.png + icons/icon32_wiki.png + icons/icon32_zoombase.png + icons/icon32_zoomin.png + icons/icon32_zoomout.png + icons/network.png + icons/hotkeys.png + icons/interface.png + icons/configure.png + icons/book.png + icons/bookcase.png +