diff --git a/.bzrignore b/.bzrignore index 081ed9f5ca..5ae1ec3117 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,30 +1,16 @@ *_ui.py moc_*.cpp src/calibre/plugins -src/calibre/gui2/pictureflow/*.so* -src/calibre/gui2/pictureflow/PyQt/.build/ -src/calibre/gui2/pictureflow/Makefile -src/calibre.egg-info/ -src/calibre/resources.py -src/calibre/gui2/images.qrc -src/calibre/gui2/images_rc.py +resources/images.qrc src/calibre/manual/.build/ src/calibre/manual/cli/ build dist docs -resources -nbproject/ -src/calibre/gui2/pictureflow/Makefile.Debug -src/calibre/gui2/pictureflow/Makefile.Release -src/calibre/gui2/pictureflow/debug/ -src/calibre/gui2/pictureflow/pictureflow_resource.rc -src/calibre/gui2/pictureflow/release/ -src/calibre/translations/compiled.py +resources/localization +resources/images.qrc installer/windows/calibre/build.log src/calibre/translations/.errors -src/calibre/plugins/* -src/calibre/gui2/pictureflow/.build src/cssutils/.svn/ src/cssutils/_todo/ src/cssutils/scripts/ diff --git a/src/calibre/gui2/images/add_book.svg b/resources/images/add_book.svg similarity index 100% rename from src/calibre/gui2/images/add_book.svg rename to resources/images/add_book.svg diff --git a/src/calibre/gui2/images/arrow-down.svg b/resources/images/arrow-down.svg similarity index 100% rename from src/calibre/gui2/images/arrow-down.svg rename to resources/images/arrow-down.svg diff --git a/src/calibre/gui2/images/arrow-up.svg b/resources/images/arrow-up.svg similarity index 100% rename from src/calibre/gui2/images/arrow-up.svg rename to resources/images/arrow-up.svg diff --git a/src/calibre/gui2/images/auto_author_sort.svg b/resources/images/auto_author_sort.svg similarity index 100% rename from src/calibre/gui2/images/auto_author_sort.svg rename to resources/images/auto_author_sort.svg diff --git a/src/calibre/gui2/images/back.svg b/resources/images/back.svg similarity index 100% rename from src/calibre/gui2/images/back.svg rename to resources/images/back.svg diff --git a/src/calibre/gui2/images/book.svg b/resources/images/book.svg similarity index 100% rename from src/calibre/gui2/images/book.svg rename to resources/images/book.svg diff --git a/src/calibre/gui2/images/bookmarks.svg b/resources/images/bookmarks.svg similarity index 100% rename from src/calibre/gui2/images/bookmarks.svg rename to resources/images/bookmarks.svg diff --git a/src/calibre/gui2/images/books_in_series.svg b/resources/images/books_in_series.svg similarity index 100% rename from src/calibre/gui2/images/books_in_series.svg rename to resources/images/books_in_series.svg diff --git a/src/calibre/gui2/images/chapters.svg b/resources/images/chapters.svg similarity index 100% rename from src/calibre/gui2/images/chapters.svg rename to resources/images/chapters.svg diff --git a/src/calibre/gui2/images/clear_left.svg b/resources/images/clear_left.svg similarity index 100% rename from src/calibre/gui2/images/clear_left.svg rename to resources/images/clear_left.svg diff --git a/src/calibre/gui2/images/config.svg b/resources/images/config.svg similarity index 100% rename from src/calibre/gui2/images/config.svg rename to resources/images/config.svg diff --git a/src/calibre/gui2/images/convert.svg b/resources/images/convert.svg similarity index 100% rename from src/calibre/gui2/images/convert.svg rename to resources/images/convert.svg diff --git a/src/calibre/gui2/images/cover_flow.svg b/resources/images/cover_flow.svg similarity index 100% rename from src/calibre/gui2/images/cover_flow.svg rename to resources/images/cover_flow.svg diff --git a/src/calibre/gui2/images/debug.svg b/resources/images/debug.svg similarity index 100% rename from src/calibre/gui2/images/debug.svg rename to resources/images/debug.svg diff --git a/src/calibre/gui2/images/dialog_error.svg b/resources/images/dialog_error.svg similarity index 100% rename from src/calibre/gui2/images/dialog_error.svg rename to resources/images/dialog_error.svg diff --git a/src/calibre/gui2/images/dialog_information.svg b/resources/images/dialog_information.svg similarity index 100% rename from src/calibre/gui2/images/dialog_information.svg rename to resources/images/dialog_information.svg diff --git a/src/calibre/gui2/images/dialog_warning.svg b/resources/images/dialog_warning.svg similarity index 100% rename from src/calibre/gui2/images/dialog_warning.svg rename to resources/images/dialog_warning.svg diff --git a/src/calibre/gui2/images/document_open.svg b/resources/images/document_open.svg similarity index 100% rename from src/calibre/gui2/images/document_open.svg rename to resources/images/document_open.svg diff --git a/src/calibre/gui2/images/donate.svg b/resources/images/donate.svg similarity index 100% rename from src/calibre/gui2/images/donate.svg rename to resources/images/donate.svg diff --git a/src/calibre/gui2/images/edit_input.svg b/resources/images/edit_input.svg similarity index 100% rename from src/calibre/gui2/images/edit_input.svg rename to resources/images/edit_input.svg diff --git a/src/calibre/gui2/images/eject.svg b/resources/images/eject.svg similarity index 100% rename from src/calibre/gui2/images/eject.svg rename to resources/images/eject.svg diff --git a/src/calibre/gui2/images/exec.svg b/resources/images/exec.svg similarity index 100% rename from src/calibre/gui2/images/exec.svg rename to resources/images/exec.svg diff --git a/src/calibre/gui2/images/font_size_larger.svg b/resources/images/font_size_larger.svg similarity index 100% rename from src/calibre/gui2/images/font_size_larger.svg rename to resources/images/font_size_larger.svg diff --git a/src/calibre/gui2/images/font_size_smaller.svg b/resources/images/font_size_smaller.svg similarity index 100% rename from src/calibre/gui2/images/font_size_smaller.svg rename to resources/images/font_size_smaller.svg diff --git a/src/calibre/gui2/images/forward.svg b/resources/images/forward.svg similarity index 100% rename from src/calibre/gui2/images/forward.svg rename to resources/images/forward.svg diff --git a/src/calibre/gui2/images/gmail_logo.png b/resources/images/gmail_logo.png similarity index 100% rename from src/calibre/gui2/images/gmail_logo.png rename to resources/images/gmail_logo.png diff --git a/src/calibre/gui2/images/jobs-animated.mng b/resources/images/jobs-animated.mng similarity index 100% rename from src/calibre/gui2/images/jobs-animated.mng rename to resources/images/jobs-animated.mng diff --git a/src/calibre/gui2/images/jobs.svg b/resources/images/jobs.svg similarity index 100% rename from src/calibre/gui2/images/jobs.svg rename to resources/images/jobs.svg diff --git a/src/calibre/gui2/images/library.png b/resources/images/library.png similarity index 100% rename from src/calibre/gui2/images/library.png rename to resources/images/library.png diff --git a/src/calibre/gui2/images/list_remove.svg b/resources/images/list_remove.svg similarity index 100% rename from src/calibre/gui2/images/list_remove.svg rename to resources/images/list_remove.svg diff --git a/src/calibre/gui2/images/lookfeel.svg b/resources/images/lookfeel.svg similarity index 100% rename from src/calibre/gui2/images/lookfeel.svg rename to resources/images/lookfeel.svg diff --git a/src/calibre/gui2/images/mail.svg b/resources/images/mail.svg similarity index 100% rename from src/calibre/gui2/images/mail.svg rename to resources/images/mail.svg diff --git a/src/calibre/gui2/images/metadata.svg b/resources/images/metadata.svg similarity index 100% rename from src/calibre/gui2/images/metadata.svg rename to resources/images/metadata.svg diff --git a/src/calibre/gui2/images/mimetypes/bmp.svg b/resources/images/mimetypes/bmp.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/bmp.svg rename to resources/images/mimetypes/bmp.svg diff --git a/src/calibre/gui2/images/mimetypes/computer.svg b/resources/images/mimetypes/computer.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/computer.svg rename to resources/images/mimetypes/computer.svg diff --git a/src/calibre/gui2/images/mimetypes/dir.svg b/resources/images/mimetypes/dir.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/dir.svg rename to resources/images/mimetypes/dir.svg diff --git a/src/calibre/gui2/images/mimetypes/epub.svg b/resources/images/mimetypes/epub.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/epub.svg rename to resources/images/mimetypes/epub.svg diff --git a/src/calibre/gui2/images/mimetypes/fb2.svg b/resources/images/mimetypes/fb2.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/fb2.svg rename to resources/images/mimetypes/fb2.svg diff --git a/src/calibre/gui2/images/mimetypes/gif.svg b/resources/images/mimetypes/gif.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/gif.svg rename to resources/images/mimetypes/gif.svg diff --git a/src/calibre/gui2/images/mimetypes/html.svg b/resources/images/mimetypes/html.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/html.svg rename to resources/images/mimetypes/html.svg diff --git a/src/calibre/gui2/images/mimetypes/jpeg.svg b/resources/images/mimetypes/jpeg.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/jpeg.svg rename to resources/images/mimetypes/jpeg.svg diff --git a/src/calibre/gui2/images/mimetypes/lit.svg b/resources/images/mimetypes/lit.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/lit.svg rename to resources/images/mimetypes/lit.svg diff --git a/src/calibre/gui2/images/mimetypes/lrf.svg b/resources/images/mimetypes/lrf.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/lrf.svg rename to resources/images/mimetypes/lrf.svg diff --git a/src/calibre/gui2/images/mimetypes/lrx.svg b/resources/images/mimetypes/lrx.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/lrx.svg rename to resources/images/mimetypes/lrx.svg diff --git a/src/calibre/gui2/images/mimetypes/mobi.svg b/resources/images/mimetypes/mobi.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/mobi.svg rename to resources/images/mimetypes/mobi.svg diff --git a/src/calibre/gui2/images/mimetypes/pdf.svg b/resources/images/mimetypes/pdf.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/pdf.svg rename to resources/images/mimetypes/pdf.svg diff --git a/src/calibre/gui2/images/mimetypes/png.svg b/resources/images/mimetypes/png.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/png.svg rename to resources/images/mimetypes/png.svg diff --git a/src/calibre/gui2/images/mimetypes/rar.svg b/resources/images/mimetypes/rar.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/rar.svg rename to resources/images/mimetypes/rar.svg diff --git a/src/calibre/gui2/images/mimetypes/rtf.svg b/resources/images/mimetypes/rtf.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/rtf.svg rename to resources/images/mimetypes/rtf.svg diff --git a/src/calibre/gui2/images/mimetypes/svg.svg b/resources/images/mimetypes/svg.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/svg.svg rename to resources/images/mimetypes/svg.svg diff --git a/src/calibre/gui2/images/mimetypes/txt.svg b/resources/images/mimetypes/txt.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/txt.svg rename to resources/images/mimetypes/txt.svg diff --git a/src/calibre/gui2/images/mimetypes/unknown.svg b/resources/images/mimetypes/unknown.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/unknown.svg rename to resources/images/mimetypes/unknown.svg diff --git a/src/calibre/gui2/images/mimetypes/zero.svg b/resources/images/mimetypes/zero.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/zero.svg rename to resources/images/mimetypes/zero.svg diff --git a/src/calibre/gui2/images/mimetypes/zip.svg b/resources/images/mimetypes/zip.svg similarity index 100% rename from src/calibre/gui2/images/mimetypes/zip.svg rename to resources/images/mimetypes/zip.svg diff --git a/src/calibre/gui2/images/minus.svg b/resources/images/minus.svg similarity index 100% rename from src/calibre/gui2/images/minus.svg rename to resources/images/minus.svg diff --git a/src/calibre/gui2/images/network-server.svg b/resources/images/network-server.svg similarity index 100% rename from src/calibre/gui2/images/network-server.svg rename to resources/images/network-server.svg diff --git a/src/calibre/gui2/images/news.svg b/resources/images/news.svg similarity index 100% rename from src/calibre/gui2/images/news.svg rename to resources/images/news.svg diff --git a/src/calibre/gui2/images/news/24sata.png b/resources/images/news/24sata.png similarity index 100% rename from src/calibre/gui2/images/news/24sata.png rename to resources/images/news/24sata.png diff --git a/src/calibre/gui2/images/news/24sata_rs.png b/resources/images/news/24sata_rs.png similarity index 100% rename from src/calibre/gui2/images/news/24sata_rs.png rename to resources/images/news/24sata_rs.png diff --git a/src/calibre/gui2/images/news/adventuregamers.png b/resources/images/news/adventuregamers.png similarity index 100% rename from src/calibre/gui2/images/news/adventuregamers.png rename to resources/images/news/adventuregamers.png diff --git a/src/calibre/gui2/images/news/ambito.png b/resources/images/news/ambito.png similarity index 100% rename from src/calibre/gui2/images/news/ambito.png rename to resources/images/news/ambito.png diff --git a/src/calibre/gui2/images/news/amspec.png b/resources/images/news/amspec.png similarity index 100% rename from src/calibre/gui2/images/news/amspec.png rename to resources/images/news/amspec.png diff --git a/src/calibre/gui2/images/news/ars_technica.png b/resources/images/news/ars_technica.png similarity index 100% rename from src/calibre/gui2/images/news/ars_technica.png rename to resources/images/news/ars_technica.png diff --git a/src/calibre/gui2/images/news/atlantic.png b/resources/images/news/atlantic.png similarity index 100% rename from src/calibre/gui2/images/news/atlantic.png rename to resources/images/news/atlantic.png diff --git a/src/calibre/gui2/images/news/axxon_news.png b/resources/images/news/axxon_news.png similarity index 100% rename from src/calibre/gui2/images/news/axxon_news.png rename to resources/images/news/axxon_news.png diff --git a/src/calibre/gui2/images/news/azstarnet.png b/resources/images/news/azstarnet.png similarity index 100% rename from src/calibre/gui2/images/news/azstarnet.png rename to resources/images/news/azstarnet.png diff --git a/src/calibre/gui2/images/news/b92.png b/resources/images/news/b92.png similarity index 100% rename from src/calibre/gui2/images/news/b92.png rename to resources/images/news/b92.png diff --git a/src/calibre/gui2/images/news/barrons.png b/resources/images/news/barrons.png similarity index 100% rename from src/calibre/gui2/images/news/barrons.png rename to resources/images/news/barrons.png diff --git a/src/calibre/gui2/images/news/bbc.png b/resources/images/news/bbc.png similarity index 100% rename from src/calibre/gui2/images/news/bbc.png rename to resources/images/news/bbc.png diff --git a/src/calibre/gui2/images/news/beta.png b/resources/images/news/beta.png similarity index 100% rename from src/calibre/gui2/images/news/beta.png rename to resources/images/news/beta.png diff --git a/src/calibre/gui2/images/news/beta_en.png b/resources/images/news/beta_en.png similarity index 100% rename from src/calibre/gui2/images/news/beta_en.png rename to resources/images/news/beta_en.png diff --git a/src/calibre/gui2/images/news/blic.png b/resources/images/news/blic.png similarity index 100% rename from src/calibre/gui2/images/news/blic.png rename to resources/images/news/blic.png diff --git a/src/calibre/gui2/images/news/borba.png b/resources/images/news/borba.png similarity index 100% rename from src/calibre/gui2/images/news/borba.png rename to resources/images/news/borba.png diff --git a/src/calibre/gui2/images/news/carta.png b/resources/images/news/carta.png similarity index 100% rename from src/calibre/gui2/images/news/carta.png rename to resources/images/news/carta.png diff --git a/src/calibre/gui2/images/news/chicago_breaking_news.png b/resources/images/news/chicago_breaking_news.png similarity index 100% rename from src/calibre/gui2/images/news/chicago_breaking_news.png rename to resources/images/news/chicago_breaking_news.png diff --git a/src/calibre/gui2/images/news/chr_mon.png b/resources/images/news/chr_mon.png similarity index 100% rename from src/calibre/gui2/images/news/chr_mon.png rename to resources/images/news/chr_mon.png diff --git a/src/calibre/gui2/images/news/clarin.png b/resources/images/news/clarin.png similarity index 100% rename from src/calibre/gui2/images/news/clarin.png rename to resources/images/news/clarin.png diff --git a/src/calibre/gui2/images/news/cnn.png b/resources/images/news/cnn.png similarity index 100% rename from src/calibre/gui2/images/news/cnn.png rename to resources/images/news/cnn.png diff --git a/src/calibre/gui2/images/news/coding_horror.png b/resources/images/news/coding_horror.png similarity index 100% rename from src/calibre/gui2/images/news/coding_horror.png rename to resources/images/news/coding_horror.png diff --git a/src/calibre/gui2/images/news/corriere_della_sera_en.png b/resources/images/news/corriere_della_sera_en.png similarity index 100% rename from src/calibre/gui2/images/news/corriere_della_sera_en.png rename to resources/images/news/corriere_della_sera_en.png diff --git a/src/calibre/gui2/images/news/corriere_della_sera_it.png b/resources/images/news/corriere_della_sera_it.png similarity index 100% rename from src/calibre/gui2/images/news/corriere_della_sera_it.png rename to resources/images/news/corriere_della_sera_it.png diff --git a/src/calibre/gui2/images/news/criticadigital.png b/resources/images/news/criticadigital.png similarity index 100% rename from src/calibre/gui2/images/news/criticadigital.png rename to resources/images/news/criticadigital.png diff --git a/src/calibre/gui2/images/news/cubadebate.png b/resources/images/news/cubadebate.png similarity index 100% rename from src/calibre/gui2/images/news/cubadebate.png rename to resources/images/news/cubadebate.png diff --git a/src/calibre/gui2/images/news/danas.png b/resources/images/news/danas.png similarity index 100% rename from src/calibre/gui2/images/news/danas.png rename to resources/images/news/danas.png diff --git a/src/calibre/gui2/images/news/darknet.png b/resources/images/news/darknet.png similarity index 100% rename from src/calibre/gui2/images/news/darknet.png rename to resources/images/news/darknet.png diff --git a/src/calibre/gui2/images/news/der_standard.png b/resources/images/news/der_standard.png similarity index 100% rename from src/calibre/gui2/images/news/der_standard.png rename to resources/images/news/der_standard.png diff --git a/src/calibre/gui2/images/news/diepresse.png b/resources/images/news/diepresse.png similarity index 100% rename from src/calibre/gui2/images/news/diepresse.png rename to resources/images/news/diepresse.png diff --git a/src/calibre/gui2/images/news/dnevni_avaz.png b/resources/images/news/dnevni_avaz.png similarity index 100% rename from src/calibre/gui2/images/news/dnevni_avaz.png rename to resources/images/news/dnevni_avaz.png diff --git a/src/calibre/gui2/images/news/e_novine.png b/resources/images/news/e_novine.png similarity index 100% rename from src/calibre/gui2/images/news/e_novine.png rename to resources/images/news/e_novine.png diff --git a/src/calibre/gui2/images/news/economist.png b/resources/images/news/economist.png similarity index 100% rename from src/calibre/gui2/images/news/economist.png rename to resources/images/news/economist.png diff --git a/src/calibre/gui2/images/news/el_mercurio_chile.png b/resources/images/news/el_mercurio_chile.png similarity index 100% rename from src/calibre/gui2/images/news/el_mercurio_chile.png rename to resources/images/news/el_mercurio_chile.png diff --git a/src/calibre/gui2/images/news/el_universal.png b/resources/images/news/el_universal.png similarity index 100% rename from src/calibre/gui2/images/news/el_universal.png rename to resources/images/news/el_universal.png diff --git a/src/calibre/gui2/images/news/elargentino.png b/resources/images/news/elargentino.png similarity index 100% rename from src/calibre/gui2/images/news/elargentino.png rename to resources/images/news/elargentino.png diff --git a/src/calibre/gui2/images/news/elcronista.png b/resources/images/news/elcronista.png similarity index 100% rename from src/calibre/gui2/images/news/elcronista.png rename to resources/images/news/elcronista.png diff --git a/src/calibre/gui2/images/news/elektrolese.png b/resources/images/news/elektrolese.png similarity index 100% rename from src/calibre/gui2/images/news/elektrolese.png rename to resources/images/news/elektrolese.png diff --git a/src/calibre/gui2/images/news/elmundo.png b/resources/images/news/elmundo.png similarity index 100% rename from src/calibre/gui2/images/news/elmundo.png rename to resources/images/news/elmundo.png diff --git a/src/calibre/gui2/images/news/elperiodico_catalan.png b/resources/images/news/elperiodico_catalan.png similarity index 100% rename from src/calibre/gui2/images/news/elperiodico_catalan.png rename to resources/images/news/elperiodico_catalan.png diff --git a/src/calibre/gui2/images/news/elperiodico_spanish.png b/resources/images/news/elperiodico_spanish.png similarity index 100% rename from src/calibre/gui2/images/news/elperiodico_spanish.png rename to resources/images/news/elperiodico_spanish.png diff --git a/src/calibre/gui2/images/news/eltiempo_hn.png b/resources/images/news/eltiempo_hn.png similarity index 100% rename from src/calibre/gui2/images/news/eltiempo_hn.png rename to resources/images/news/eltiempo_hn.png diff --git a/src/calibre/gui2/images/news/endgadget.png b/resources/images/news/endgadget.png similarity index 100% rename from src/calibre/gui2/images/news/endgadget.png rename to resources/images/news/endgadget.png diff --git a/src/calibre/gui2/images/news/espn.png b/resources/images/news/espn.png similarity index 100% rename from src/calibre/gui2/images/news/espn.png rename to resources/images/news/espn.png diff --git a/src/calibre/gui2/images/news/esquire.png b/resources/images/news/esquire.png similarity index 100% rename from src/calibre/gui2/images/news/esquire.png rename to resources/images/news/esquire.png diff --git a/src/calibre/gui2/images/news/estadao.png b/resources/images/news/estadao.png similarity index 100% rename from src/calibre/gui2/images/news/estadao.png rename to resources/images/news/estadao.png diff --git a/src/calibre/gui2/images/news/expansion_spanish.png b/resources/images/news/expansion_spanish.png similarity index 100% rename from src/calibre/gui2/images/news/expansion_spanish.png rename to resources/images/news/expansion_spanish.png diff --git a/src/calibre/gui2/images/news/fastcompany.png b/resources/images/news/fastcompany.png similarity index 100% rename from src/calibre/gui2/images/news/fastcompany.png rename to resources/images/news/fastcompany.png diff --git a/src/calibre/gui2/images/news/faznet.png b/resources/images/news/faznet.png similarity index 100% rename from src/calibre/gui2/images/news/faznet.png rename to resources/images/news/faznet.png diff --git a/src/calibre/gui2/images/news/freakonomics.png b/resources/images/news/freakonomics.png similarity index 100% rename from src/calibre/gui2/images/news/freakonomics.png rename to resources/images/news/freakonomics.png diff --git a/src/calibre/gui2/images/news/ftd.png b/resources/images/news/ftd.png similarity index 100% rename from src/calibre/gui2/images/news/ftd.png rename to resources/images/news/ftd.png diff --git a/src/calibre/gui2/images/news/fudzilla.png b/resources/images/news/fudzilla.png similarity index 100% rename from src/calibre/gui2/images/news/fudzilla.png rename to resources/images/news/fudzilla.png diff --git a/src/calibre/gui2/images/news/glas_srpske.png b/resources/images/news/glas_srpske.png similarity index 100% rename from src/calibre/gui2/images/news/glas_srpske.png rename to resources/images/news/glas_srpske.png diff --git a/src/calibre/gui2/images/news/glasjavnosti.png b/resources/images/news/glasjavnosti.png similarity index 100% rename from src/calibre/gui2/images/news/glasjavnosti.png rename to resources/images/news/glasjavnosti.png diff --git a/src/calibre/gui2/images/news/granma.png b/resources/images/news/granma.png similarity index 100% rename from src/calibre/gui2/images/news/granma.png rename to resources/images/news/granma.png diff --git a/src/calibre/gui2/images/news/gva_be.png b/resources/images/news/gva_be.png similarity index 100% rename from src/calibre/gui2/images/news/gva_be.png rename to resources/images/news/gva_be.png diff --git a/src/calibre/gui2/images/news/heise.png b/resources/images/news/heise.png similarity index 100% rename from src/calibre/gui2/images/news/heise.png rename to resources/images/news/heise.png diff --git a/src/calibre/gui2/images/news/hln.png b/resources/images/news/hln.png similarity index 100% rename from src/calibre/gui2/images/news/hln.png rename to resources/images/news/hln.png diff --git a/src/calibre/gui2/images/news/hln_be.png b/resources/images/news/hln_be.png similarity index 100% rename from src/calibre/gui2/images/news/hln_be.png rename to resources/images/news/hln_be.png diff --git a/src/calibre/gui2/images/news/hna.png b/resources/images/news/hna.png similarity index 100% rename from src/calibre/gui2/images/news/hna.png rename to resources/images/news/hna.png diff --git a/src/calibre/gui2/images/news/hrt.png b/resources/images/news/hrt.png similarity index 100% rename from src/calibre/gui2/images/news/hrt.png rename to resources/images/news/hrt.png diff --git a/src/calibre/gui2/images/news/infobae.png b/resources/images/news/infobae.png similarity index 100% rename from src/calibre/gui2/images/news/infobae.png rename to resources/images/news/infobae.png diff --git a/src/calibre/gui2/images/news/inquirer_net.png b/resources/images/news/inquirer_net.png similarity index 100% rename from src/calibre/gui2/images/news/inquirer_net.png rename to resources/images/news/inquirer_net.png diff --git a/src/calibre/gui2/images/news/instapaper.png b/resources/images/news/instapaper.png similarity index 100% rename from src/calibre/gui2/images/news/instapaper.png rename to resources/images/news/instapaper.png diff --git a/src/calibre/gui2/images/news/jb_online.png b/resources/images/news/jb_online.png similarity index 100% rename from src/calibre/gui2/images/news/jb_online.png rename to resources/images/news/jb_online.png diff --git a/src/calibre/gui2/images/news/joelonsoftware.png b/resources/images/news/joelonsoftware.png similarity index 100% rename from src/calibre/gui2/images/news/joelonsoftware.png rename to resources/images/news/joelonsoftware.png diff --git a/src/calibre/gui2/images/news/jpost.png b/resources/images/news/jpost.png similarity index 100% rename from src/calibre/gui2/images/news/jpost.png rename to resources/images/news/jpost.png diff --git a/src/calibre/gui2/images/news/jutarnji.png b/resources/images/news/jutarnji.png similarity index 100% rename from src/calibre/gui2/images/news/jutarnji.png rename to resources/images/news/jutarnji.png diff --git a/src/calibre/gui2/images/news/krstarica.png b/resources/images/news/krstarica.png similarity index 100% rename from src/calibre/gui2/images/news/krstarica.png rename to resources/images/news/krstarica.png diff --git a/src/calibre/gui2/images/news/krstarica_en.png b/resources/images/news/krstarica_en.png similarity index 100% rename from src/calibre/gui2/images/news/krstarica_en.png rename to resources/images/news/krstarica_en.png diff --git a/src/calibre/gui2/images/news/la_cuarta.png b/resources/images/news/la_cuarta.png similarity index 100% rename from src/calibre/gui2/images/news/la_cuarta.png rename to resources/images/news/la_cuarta.png diff --git a/src/calibre/gui2/images/news/la_tercera.png b/resources/images/news/la_tercera.png similarity index 100% rename from src/calibre/gui2/images/news/la_tercera.png rename to resources/images/news/la_tercera.png diff --git a/src/calibre/gui2/images/news/lanacion.png b/resources/images/news/lanacion.png similarity index 100% rename from src/calibre/gui2/images/news/lanacion.png rename to resources/images/news/lanacion.png diff --git a/src/calibre/gui2/images/news/lanacion_chile.png b/resources/images/news/lanacion_chile.png similarity index 100% rename from src/calibre/gui2/images/news/lanacion_chile.png rename to resources/images/news/lanacion_chile.png diff --git a/src/calibre/gui2/images/news/laprensa_hn.png b/resources/images/news/laprensa_hn.png similarity index 100% rename from src/calibre/gui2/images/news/laprensa_hn.png rename to resources/images/news/laprensa_hn.png diff --git a/src/calibre/gui2/images/news/laprensa_ni.png b/resources/images/news/laprensa_ni.png similarity index 100% rename from src/calibre/gui2/images/news/laprensa_ni.png rename to resources/images/news/laprensa_ni.png diff --git a/src/calibre/gui2/images/news/latribuna.png b/resources/images/news/latribuna.png similarity index 100% rename from src/calibre/gui2/images/news/latribuna.png rename to resources/images/news/latribuna.png diff --git a/src/calibre/gui2/images/news/le_monde.png b/resources/images/news/le_monde.png similarity index 100% rename from src/calibre/gui2/images/news/le_monde.png rename to resources/images/news/le_monde.png diff --git a/src/calibre/gui2/images/news/liberation.png b/resources/images/news/liberation.png similarity index 100% rename from src/calibre/gui2/images/news/liberation.png rename to resources/images/news/liberation.png diff --git a/src/calibre/gui2/images/news/linux_magazine.png b/resources/images/news/linux_magazine.png similarity index 100% rename from src/calibre/gui2/images/news/linux_magazine.png rename to resources/images/news/linux_magazine.png diff --git a/src/calibre/gui2/images/news/linuxdevices.png b/resources/images/news/linuxdevices.png similarity index 100% rename from src/calibre/gui2/images/news/linuxdevices.png rename to resources/images/news/linuxdevices.png diff --git a/src/calibre/gui2/images/news/livemint.png b/resources/images/news/livemint.png similarity index 100% rename from src/calibre/gui2/images/news/livemint.png rename to resources/images/news/livemint.png diff --git a/src/calibre/gui2/images/news/miami_herald.png b/resources/images/news/miami_herald.png similarity index 100% rename from src/calibre/gui2/images/news/miami_herald.png rename to resources/images/news/miami_herald.png diff --git a/src/calibre/gui2/images/news/msdnmag_en.png b/resources/images/news/msdnmag_en.png similarity index 100% rename from src/calibre/gui2/images/news/msdnmag_en.png rename to resources/images/news/msdnmag_en.png diff --git a/src/calibre/gui2/images/news/nacional_cro.png b/resources/images/news/nacional_cro.png similarity index 100% rename from src/calibre/gui2/images/news/nacional_cro.png rename to resources/images/news/nacional_cro.png diff --git a/src/calibre/gui2/images/news/nasa.png b/resources/images/news/nasa.png similarity index 100% rename from src/calibre/gui2/images/news/nasa.png rename to resources/images/news/nasa.png diff --git a/src/calibre/gui2/images/news/new_yorker.png b/resources/images/news/new_yorker.png similarity index 100% rename from src/calibre/gui2/images/news/new_yorker.png rename to resources/images/news/new_yorker.png diff --git a/src/calibre/gui2/images/news/newsweek.png b/resources/images/news/newsweek.png similarity index 100% rename from src/calibre/gui2/images/news/newsweek.png rename to resources/images/news/newsweek.png diff --git a/src/calibre/gui2/images/news/noaa.png b/resources/images/news/noaa.png similarity index 100% rename from src/calibre/gui2/images/news/noaa.png rename to resources/images/news/noaa.png diff --git a/src/calibre/gui2/images/news/novosti.png b/resources/images/news/novosti.png similarity index 100% rename from src/calibre/gui2/images/news/novosti.png rename to resources/images/news/novosti.png diff --git a/src/calibre/gui2/images/news/nspm.png b/resources/images/news/nspm.png similarity index 100% rename from src/calibre/gui2/images/news/nspm.png rename to resources/images/news/nspm.png diff --git a/src/calibre/gui2/images/news/nspm_int.png b/resources/images/news/nspm_int.png similarity index 100% rename from src/calibre/gui2/images/news/nspm_int.png rename to resources/images/news/nspm_int.png diff --git a/src/calibre/gui2/images/news/nytimes.png b/resources/images/news/nytimes.png similarity index 100% rename from src/calibre/gui2/images/news/nytimes.png rename to resources/images/news/nytimes.png diff --git a/src/calibre/gui2/images/news/nytimes_sub.png b/resources/images/news/nytimes_sub.png similarity index 100% rename from src/calibre/gui2/images/news/nytimes_sub.png rename to resources/images/news/nytimes_sub.png diff --git a/src/calibre/gui2/images/news/nzz_ger.png b/resources/images/news/nzz_ger.png similarity index 100% rename from src/calibre/gui2/images/news/nzz_ger.png rename to resources/images/news/nzz_ger.png diff --git a/src/calibre/gui2/images/news/o_globo.png b/resources/images/news/o_globo.png similarity index 100% rename from src/calibre/gui2/images/news/o_globo.png rename to resources/images/news/o_globo.png diff --git a/src/calibre/gui2/images/news/pagina12.png b/resources/images/news/pagina12.png similarity index 100% rename from src/calibre/gui2/images/news/pagina12.png rename to resources/images/news/pagina12.png diff --git a/src/calibre/gui2/images/news/pescanik.png b/resources/images/news/pescanik.png similarity index 100% rename from src/calibre/gui2/images/news/pescanik.png rename to resources/images/news/pescanik.png diff --git a/src/calibre/gui2/images/news/pobjeda.png b/resources/images/news/pobjeda.png similarity index 100% rename from src/calibre/gui2/images/news/pobjeda.png rename to resources/images/news/pobjeda.png diff --git a/src/calibre/gui2/images/news/politico.png b/resources/images/news/politico.png similarity index 100% rename from src/calibre/gui2/images/news/politico.png rename to resources/images/news/politico.png diff --git a/src/calibre/gui2/images/news/politika.png b/resources/images/news/politika.png similarity index 100% rename from src/calibre/gui2/images/news/politika.png rename to resources/images/news/politika.png diff --git a/src/calibre/gui2/images/news/portfolio.png b/resources/images/news/portfolio.png similarity index 100% rename from src/calibre/gui2/images/news/portfolio.png rename to resources/images/news/portfolio.png diff --git a/src/calibre/gui2/images/news/pressonline.png b/resources/images/news/pressonline.png similarity index 100% rename from src/calibre/gui2/images/news/pressonline.png rename to resources/images/news/pressonline.png diff --git a/src/calibre/gui2/images/news/rts.png b/resources/images/news/rts.png similarity index 100% rename from src/calibre/gui2/images/news/rts.png rename to resources/images/news/rts.png diff --git a/src/calibre/gui2/images/news/sciencedaily.png b/resources/images/news/sciencedaily.png similarity index 100% rename from src/calibre/gui2/images/news/sciencedaily.png rename to resources/images/news/sciencedaily.png diff --git a/src/calibre/gui2/images/news/scott_hanselman.png b/resources/images/news/scott_hanselman.png similarity index 100% rename from src/calibre/gui2/images/news/scott_hanselman.png rename to resources/images/news/scott_hanselman.png diff --git a/src/calibre/gui2/images/news/seattle_times.png b/resources/images/news/seattle_times.png similarity index 100% rename from src/calibre/gui2/images/news/seattle_times.png rename to resources/images/news/seattle_times.png diff --git a/src/calibre/gui2/images/news/security_watch.png b/resources/images/news/security_watch.png similarity index 100% rename from src/calibre/gui2/images/news/security_watch.png rename to resources/images/news/security_watch.png diff --git a/src/calibre/gui2/images/news/soldiers.png b/resources/images/news/soldiers.png similarity index 100% rename from src/calibre/gui2/images/news/soldiers.png rename to resources/images/news/soldiers.png diff --git a/src/calibre/gui2/images/news/spiegel_int.png b/resources/images/news/spiegel_int.png similarity index 100% rename from src/calibre/gui2/images/news/spiegel_int.png rename to resources/images/news/spiegel_int.png diff --git a/src/calibre/gui2/images/news/spiegelde.png b/resources/images/news/spiegelde.png similarity index 100% rename from src/calibre/gui2/images/news/spiegelde.png rename to resources/images/news/spiegelde.png diff --git a/src/calibre/gui2/images/news/stackoverflow.png b/resources/images/news/stackoverflow.png similarity index 100% rename from src/calibre/gui2/images/news/stackoverflow.png rename to resources/images/news/stackoverflow.png diff --git a/src/calibre/gui2/images/news/starbulletin.png b/resources/images/news/starbulletin.png similarity index 100% rename from src/calibre/gui2/images/news/starbulletin.png rename to resources/images/news/starbulletin.png diff --git a/src/calibre/gui2/images/news/straitstimes.png b/resources/images/news/straitstimes.png similarity index 100% rename from src/calibre/gui2/images/news/straitstimes.png rename to resources/images/news/straitstimes.png diff --git a/src/calibre/gui2/images/news/sueddeutsche.png b/resources/images/news/sueddeutsche.png similarity index 100% rename from src/calibre/gui2/images/news/sueddeutsche.png rename to resources/images/news/sueddeutsche.png diff --git a/src/calibre/gui2/images/news/tanjug.png b/resources/images/news/tanjug.png similarity index 100% rename from src/calibre/gui2/images/news/tanjug.png rename to resources/images/news/tanjug.png diff --git a/src/calibre/gui2/images/news/telegraph_uk.png b/resources/images/news/telegraph_uk.png similarity index 100% rename from src/calibre/gui2/images/news/telegraph_uk.png rename to resources/images/news/telegraph_uk.png diff --git a/src/calibre/gui2/images/news/telepolis.png b/resources/images/news/telepolis.png similarity index 100% rename from src/calibre/gui2/images/news/telepolis.png rename to resources/images/news/telepolis.png diff --git a/src/calibre/gui2/images/news/telepolis_artikel.png b/resources/images/news/telepolis_artikel.png similarity index 100% rename from src/calibre/gui2/images/news/telepolis_artikel.png rename to resources/images/news/telepolis_artikel.png diff --git a/src/calibre/gui2/images/news/teleread.png b/resources/images/news/teleread.png similarity index 100% rename from src/calibre/gui2/images/news/teleread.png rename to resources/images/news/teleread.png diff --git a/src/calibre/gui2/images/news/the_oz.png b/resources/images/news/the_oz.png similarity index 100% rename from src/calibre/gui2/images/news/the_oz.png rename to resources/images/news/the_oz.png diff --git a/src/calibre/gui2/images/news/theeconomictimes_india.png b/resources/images/news/theeconomictimes_india.png similarity index 100% rename from src/calibre/gui2/images/news/theeconomictimes_india.png rename to resources/images/news/theeconomictimes_india.png diff --git a/src/calibre/gui2/images/news/themarketticker.png b/resources/images/news/themarketticker.png similarity index 100% rename from src/calibre/gui2/images/news/themarketticker.png rename to resources/images/news/themarketticker.png diff --git a/src/calibre/gui2/images/news/theonion.png b/resources/images/news/theonion.png similarity index 100% rename from src/calibre/gui2/images/news/theonion.png rename to resources/images/news/theonion.png diff --git a/src/calibre/gui2/images/news/tijd.png b/resources/images/news/tijd.png similarity index 100% rename from src/calibre/gui2/images/news/tijd.png rename to resources/images/news/tijd.png diff --git a/src/calibre/gui2/images/news/time_magazine.png b/resources/images/news/time_magazine.png similarity index 100% rename from src/calibre/gui2/images/news/time_magazine.png rename to resources/images/news/time_magazine.png diff --git a/src/calibre/gui2/images/news/times_online.png b/resources/images/news/times_online.png similarity index 100% rename from src/calibre/gui2/images/news/times_online.png rename to resources/images/news/times_online.png diff --git a/src/calibre/gui2/images/news/tomshardware.png b/resources/images/news/tomshardware.png similarity index 100% rename from src/calibre/gui2/images/news/tomshardware.png rename to resources/images/news/tomshardware.png diff --git a/src/calibre/gui2/images/news/tomshardware_de.png b/resources/images/news/tomshardware_de.png similarity index 100% rename from src/calibre/gui2/images/news/tomshardware_de.png rename to resources/images/news/tomshardware_de.png diff --git a/src/calibre/gui2/images/news/uncrate.png b/resources/images/news/uncrate.png similarity index 100% rename from src/calibre/gui2/images/news/uncrate.png rename to resources/images/news/uncrate.png diff --git a/src/calibre/gui2/images/news/usnews.png b/resources/images/news/usnews.png similarity index 100% rename from src/calibre/gui2/images/news/usnews.png rename to resources/images/news/usnews.png diff --git a/src/calibre/gui2/images/news/utne.png b/resources/images/news/utne.png similarity index 100% rename from src/calibre/gui2/images/news/utne.png rename to resources/images/news/utne.png diff --git a/src/calibre/gui2/images/news/vecernji_list.png b/resources/images/news/vecernji_list.png similarity index 100% rename from src/calibre/gui2/images/news/vecernji_list.png rename to resources/images/news/vecernji_list.png diff --git a/src/calibre/gui2/images/news/vijesti.png b/resources/images/news/vijesti.png similarity index 100% rename from src/calibre/gui2/images/news/vijesti.png rename to resources/images/news/vijesti.png diff --git a/src/calibre/gui2/images/news/vreme.png b/resources/images/news/vreme.png similarity index 100% rename from src/calibre/gui2/images/news/vreme.png rename to resources/images/news/vreme.png diff --git a/src/calibre/gui2/images/news/wikinews_en.png b/resources/images/news/wikinews_en.png similarity index 100% rename from src/calibre/gui2/images/news/wikinews_en.png rename to resources/images/news/wikinews_en.png diff --git a/src/calibre/gui2/images/news/wired.png b/resources/images/news/wired.png similarity index 100% rename from src/calibre/gui2/images/news/wired.png rename to resources/images/news/wired.png diff --git a/src/calibre/gui2/images/news/wsj.png b/resources/images/news/wsj.png similarity index 100% rename from src/calibre/gui2/images/news/wsj.png rename to resources/images/news/wsj.png diff --git a/src/calibre/gui2/images/news/zdnet.png b/resources/images/news/zdnet.png similarity index 100% rename from src/calibre/gui2/images/news/zdnet.png rename to resources/images/news/zdnet.png diff --git a/src/calibre/gui2/images/news/zeitde.png b/resources/images/news/zeitde.png similarity index 100% rename from src/calibre/gui2/images/news/zeitde.png rename to resources/images/news/zeitde.png diff --git a/src/calibre/gui2/images/next.svg b/resources/images/next.svg similarity index 100% rename from src/calibre/gui2/images/next.svg rename to resources/images/next.svg diff --git a/src/calibre/gui2/images/ok.svg b/resources/images/ok.svg similarity index 100% rename from src/calibre/gui2/images/ok.svg rename to resources/images/ok.svg diff --git a/src/calibre/gui2/images/page.svg b/resources/images/page.svg similarity index 100% rename from src/calibre/gui2/images/page.svg rename to resources/images/page.svg diff --git a/src/calibre/gui2/images/plugins.svg b/resources/images/plugins.svg similarity index 100% rename from src/calibre/gui2/images/plugins.svg rename to resources/images/plugins.svg diff --git a/src/calibre/gui2/images/plus.svg b/resources/images/plus.svg similarity index 100% rename from src/calibre/gui2/images/plus.svg rename to resources/images/plus.svg diff --git a/src/calibre/gui2/images/previous.svg b/resources/images/previous.svg similarity index 100% rename from src/calibre/gui2/images/previous.svg rename to resources/images/previous.svg diff --git a/src/calibre/gui2/images/print-preview.svg b/resources/images/print-preview.svg similarity index 100% rename from src/calibre/gui2/images/print-preview.svg rename to resources/images/print-preview.svg diff --git a/src/calibre/gui2/images/print.svg b/resources/images/print.svg similarity index 100% rename from src/calibre/gui2/images/print.svg rename to resources/images/print.svg diff --git a/src/calibre/gui2/images/publisher.png b/resources/images/publisher.png similarity index 100% rename from src/calibre/gui2/images/publisher.png rename to resources/images/publisher.png diff --git a/src/calibre/gui2/images/reader.svg b/resources/images/reader.svg similarity index 100% rename from src/calibre/gui2/images/reader.svg rename to resources/images/reader.svg diff --git a/src/calibre/gui2/images/save.svg b/resources/images/save.svg similarity index 100% rename from src/calibre/gui2/images/save.svg rename to resources/images/save.svg diff --git a/src/calibre/gui2/images/scheduler.svg b/resources/images/scheduler.svg similarity index 100% rename from src/calibre/gui2/images/scheduler.svg rename to resources/images/scheduler.svg diff --git a/src/calibre/gui2/images/sd.svg b/resources/images/sd.svg similarity index 100% rename from src/calibre/gui2/images/sd.svg rename to resources/images/sd.svg diff --git a/src/calibre/gui2/images/search.svg b/resources/images/search.svg similarity index 100% rename from src/calibre/gui2/images/search.svg rename to resources/images/search.svg diff --git a/src/calibre/gui2/images/series.svg b/resources/images/series.svg similarity index 100% rename from src/calibre/gui2/images/series.svg rename to resources/images/series.svg diff --git a/src/calibre/gui2/images/swap.svg b/resources/images/swap.svg similarity index 100% rename from src/calibre/gui2/images/swap.svg rename to resources/images/swap.svg diff --git a/src/calibre/gui2/images/sync.svg b/resources/images/sync.svg similarity index 100% rename from src/calibre/gui2/images/sync.svg rename to resources/images/sync.svg diff --git a/src/calibre/gui2/images/tags.svg b/resources/images/tags.svg similarity index 100% rename from src/calibre/gui2/images/tags.svg rename to resources/images/tags.svg diff --git a/src/calibre/gui2/images/trash.svg b/resources/images/trash.svg similarity index 100% rename from src/calibre/gui2/images/trash.svg rename to resources/images/trash.svg diff --git a/src/calibre/gui2/images/user_profile.svg b/resources/images/user_profile.svg similarity index 100% rename from src/calibre/gui2/images/user_profile.svg rename to resources/images/user_profile.svg diff --git a/src/calibre/gui2/images/view.svg b/resources/images/view.svg similarity index 100% rename from src/calibre/gui2/images/view.svg rename to resources/images/view.svg diff --git a/src/calibre/gui2/images/viewer.svg b/resources/images/viewer.svg similarity index 100% rename from src/calibre/gui2/images/viewer.svg rename to resources/images/viewer.svg diff --git a/src/calibre/gui2/images/welcome_wizard.svg b/resources/images/welcome_wizard.svg similarity index 100% rename from src/calibre/gui2/images/welcome_wizard.svg rename to resources/images/welcome_wizard.svg diff --git a/src/calibre/gui2/images/window-close.svg b/resources/images/window-close.svg similarity index 100% rename from src/calibre/gui2/images/window-close.svg rename to resources/images/window-close.svg diff --git a/src/calibre/gui2/images/wizard.svg b/resources/images/wizard.svg similarity index 100% rename from src/calibre/gui2/images/wizard.svg rename to resources/images/wizard.svg diff --git a/setup/commands.py b/setup/commands.py index 721caa165c..a05d158e01 100644 --- a/setup/commands.py +++ b/setup/commands.py @@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en' __all__ = [ 'pot', 'translations', 'get_translations', 'iso639', 'build', + 'gui', 'develop', 'clean' ] @@ -28,6 +29,9 @@ build = Build() from setup.install import Develop develop = Develop() +from setup.gui import GUI +gui = GUI() + class Clean(Command): description='''Delete all computer generated files in the source tree''' diff --git a/setup/gui.py b/setup/gui.py new file mode 100644 index 0000000000..5dd53e4cdd --- /dev/null +++ b/setup/gui.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai +from __future__ import with_statement + +__license__ = 'GPL v3' +__copyright__ = '2009, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import os, cStringIO, re + +from setup import Command, __appname__ + +class GUI(Command): + description = 'Compile all GUI forms' + PATH = os.path.join(Command.SRC, __appname__, 'gui2') + QRC = os.path.join(Command.RESOURCES, 'images.qrc') + + @classmethod + def find_forms(cls): + forms = [] + for root, _, files in os.walk(cls.PATH): + for name in files: + if name.endswith('.ui'): + forms.append(os.path.abspath(os.path.join(root, name))) + + return forms + + @classmethod + def form_to_compiled_form(cls, form): + return form.rpartition('.')[0]+'_ui.py' + + def run(self, opts): + self.build_forms() + self.build_images() + + def build_images(self): + cwd = os.getcwd() + try: + os.chdir(self.RESOURCES) + sources, files = [], [] + for root, _, files in os.walk('images'): + for name in files: + sources.append(os.path.join(root, name)) + if self.newer(self.QRC, sources): + self.info('Creating images.qrc') + for s in sources: + files.append('%s'%s) + manifest = '\n\n%s\n\n'%'\n'.join(files) + with open('images.qrc', 'wb') as f: + f.write(manifest) + finally: + os.chdir(cwd) + + + def build_forms(self): + from PyQt4.uic import compileUi + forms = self.find_forms() + for form in forms: + compiled_form = self.form_to_compiled_form(form) + if not os.path.exists(compiled_form) or os.stat(form).st_mtime > os.stat(compiled_form).st_mtime: + print 'Compiling form', form + buf = cStringIO.StringIO() + compileUi(form, buf) + dat = buf.getvalue() + dat = dat.replace('__appname__', __appname__) + dat = dat.replace('import images_rc', 'from calibre.gui2 import images_rc') + dat = dat.replace('from library import', 'from calibre.gui2.library import') + dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import') + dat = dat.replace('from convert.xpath_wizard import', + 'from calibre.gui2.convert.xpath_wizard import') + dat = re.compile(r'QtGui.QApplication.translate\(.+?,\s+"(.+?)(?... - + :/images/document_open.svg:/images/document_open.svg @@ -64,7 +64,7 @@ ... - + :/images/clear_left.svg:/images/clear_left.svg @@ -72,7 +72,7 @@ - + diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui index 9378265d7d..de0001bb3e 100644 --- a/src/calibre/gui2/convert/look_and_feel.ui +++ b/src/calibre/gui2/convert/look_and_feel.ui @@ -153,8 +153,8 @@ - - + + diff --git a/src/calibre/gui2/convert/metadata.ui b/src/calibre/gui2/convert/metadata.ui index b1424b49dc..5d3cc432d7 100644 --- a/src/calibre/gui2/convert/metadata.ui +++ b/src/calibre/gui2/convert/metadata.ui @@ -28,7 +28,7 @@ - :/images/book.svg + :/images/book.svg true @@ -92,7 +92,7 @@ ... - + :/images/document_open.svg:/images/document_open.svg @@ -343,9 +343,9 @@ opt_prefer_metadata_cover - - - + + + diff --git a/src/calibre/gui2/convert/single.ui b/src/calibre/gui2/convert/single.ui index 63c9e5084d..f6da306b2d 100644 --- a/src/calibre/gui2/convert/single.ui +++ b/src/calibre/gui2/convert/single.ui @@ -14,7 +14,7 @@ Dialog - + :/images/convert.svg:/images/convert.svg @@ -161,7 +161,7 @@ - + diff --git a/src/calibre/gui2/convert/xpath_edit.ui b/src/calibre/gui2/convert/xpath_edit.ui index 00f0782c47..0b11e9c071 100644 --- a/src/calibre/gui2/convert/xpath_edit.ui +++ b/src/calibre/gui2/convert/xpath_edit.ui @@ -43,7 +43,7 @@ ... - + :/images/wizard.svg:/images/wizard.svg @@ -57,7 +57,7 @@ - + diff --git a/src/calibre/gui2/device_drivers/configwidget.ui b/src/calibre/gui2/device_drivers/configwidget.ui index 660e4f9925..1a42a5e386 100644 --- a/src/calibre/gui2/device_drivers/configwidget.ui +++ b/src/calibre/gui2/device_drivers/configwidget.ui @@ -40,7 +40,7 @@ ... - + :/images/arrow-up.svg:/images/arrow-up.svg @@ -64,7 +64,7 @@ ... - + :/images/arrow-down.svg:/images/arrow-down.svg @@ -93,7 +93,7 @@ - + diff --git a/src/calibre/gui2/dialogs/book_info.ui b/src/calibre/gui2/dialogs/book_info.ui index 28b27b99b4..27e15f96a1 100644 --- a/src/calibre/gui2/dialogs/book_info.ui +++ b/src/calibre/gui2/dialogs/book_info.ui @@ -61,7 +61,7 @@ &Previous - + :/images/previous.svg:/images/previous.svg @@ -72,7 +72,7 @@ &Next - + :/images/next.svg:/images/next.svg @@ -84,7 +84,7 @@ - + diff --git a/src/calibre/gui2/dialogs/choose_format.ui b/src/calibre/gui2/dialogs/choose_format.ui index 2a4073800f..0ae0fa8b94 100644 --- a/src/calibre/gui2/dialogs/choose_format.ui +++ b/src/calibre/gui2/dialogs/choose_format.ui @@ -13,7 +13,7 @@ Choose Format - :/images/mimetypes/unknown.svg + :/images/mimetypes/unknown.svg @@ -46,7 +46,7 @@ - + diff --git a/src/calibre/gui2/dialogs/comicconf.ui b/src/calibre/gui2/dialogs/comicconf.ui index fd50df8e87..03911b2171 100644 --- a/src/calibre/gui2/dialogs/comicconf.ui +++ b/src/calibre/gui2/dialogs/comicconf.ui @@ -14,7 +14,7 @@ Dialog - + :/images/convert.svg:/images/convert.svg @@ -163,7 +163,7 @@ - + diff --git a/src/calibre/gui2/dialogs/config/config.ui b/src/calibre/gui2/dialogs/config/config.ui index 6e655c3468..dc180edba7 100644 --- a/src/calibre/gui2/dialogs/config/config.ui +++ b/src/calibre/gui2/dialogs/config/config.ui @@ -15,7 +15,7 @@ Preferences - + :/images/config.svg:/images/config.svg @@ -115,7 +115,7 @@ ... - + :/images/mimetypes/dir.svg:/images/mimetypes/dir.svg @@ -245,7 +245,7 @@ ... - + :/images/arrow-up.svg:/images/arrow-up.svg @@ -269,7 +269,7 @@ ... - + :/images/arrow-down.svg:/images/arrow-down.svg @@ -326,7 +326,7 @@ ... - + :/images/plus.svg:/images/plus.svg @@ -353,7 +353,7 @@ ... - + :/images/list_remove.svg:/images/list_remove.svg @@ -530,7 +530,7 @@ ... - + :/images/arrow-up.svg:/images/arrow-up.svg @@ -554,7 +554,7 @@ ... - + :/images/arrow-down.svg:/images/arrow-down.svg @@ -614,7 +614,7 @@ &Add email - + :/images/plus.svg:/images/plus.svg @@ -641,7 +641,7 @@ &Remove email - + :/images/minus.svg:/images/minus.svg @@ -996,7 +996,7 @@ ... - + :/images/document_open.svg:/images/document_open.svg @@ -1063,7 +1063,7 @@ - + diff --git a/src/calibre/gui2/dialogs/confirm_delete.ui b/src/calibre/gui2/dialogs/confirm_delete.ui index 1ee4cb79d9..eee2c9fdfd 100644 --- a/src/calibre/gui2/dialogs/confirm_delete.ui +++ b/src/calibre/gui2/dialogs/confirm_delete.ui @@ -13,7 +13,7 @@ Are you sure? - + :/images/dialog_warning.svg:/images/dialog_warning.svg @@ -22,7 +22,7 @@ - :/images/dialog_warning.svg + :/images/dialog_warning.svg @@ -61,7 +61,7 @@ - + diff --git a/src/calibre/gui2/dialogs/conversion_error.ui b/src/calibre/gui2/dialogs/conversion_error.ui index d3963df860..28272b7c6e 100644 --- a/src/calibre/gui2/dialogs/conversion_error.ui +++ b/src/calibre/gui2/dialogs/conversion_error.ui @@ -13,7 +13,7 @@ ERROR - + :/library:/library @@ -23,7 +23,7 @@ - :/images/dialog_error.svg + :/images/dialog_error.svg @@ -53,7 +53,7 @@ - + diff --git a/src/calibre/gui2/dialogs/fetch_metadata.ui b/src/calibre/gui2/dialogs/fetch_metadata.ui index 653c7005b8..edf4207b45 100644 --- a/src/calibre/gui2/dialogs/fetch_metadata.ui +++ b/src/calibre/gui2/dialogs/fetch_metadata.ui @@ -16,7 +16,7 @@ Fetch metadata - + :/images/metadata.svg:/images/metadata.svg @@ -118,7 +118,7 @@ - + diff --git a/src/calibre/gui2/dialogs/job_view.ui b/src/calibre/gui2/dialogs/job_view.ui index f4b0086497..a66fdd482d 100644 --- a/src/calibre/gui2/dialogs/job_view.ui +++ b/src/calibre/gui2/dialogs/job_view.ui @@ -13,7 +13,7 @@ Details of job - + :/images/view.svg:/images/view.svg @@ -40,7 +40,7 @@ - + diff --git a/src/calibre/gui2/dialogs/jobs.ui b/src/calibre/gui2/dialogs/jobs.ui index 3716c9fbb9..de2d78db73 100644 --- a/src/calibre/gui2/dialogs/jobs.ui +++ b/src/calibre/gui2/dialogs/jobs.ui @@ -14,7 +14,7 @@ Active Jobs - + :/images/jobs.svg:/images/jobs.svg @@ -67,7 +67,7 @@ - + diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 59fdc5d27a..ca6237c41b 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -14,7 +14,7 @@ Edit Meta information - + :/images/edit_input.svg:/images/edit_input.svg @@ -153,7 +153,7 @@ Open Tag Editor - + :/images/chapters.svg:/images/chapters.svg @@ -278,7 +278,7 @@ button_box - + diff --git a/src/calibre/gui2/dialogs/metadata_single.ui b/src/calibre/gui2/dialogs/metadata_single.ui index a20348885d..0108039217 100644 --- a/src/calibre/gui2/dialogs/metadata_single.ui +++ b/src/calibre/gui2/dialogs/metadata_single.ui @@ -20,7 +20,7 @@ Edit Meta Information - + :/images/edit_input.svg:/images/edit_input.svg @@ -102,7 +102,7 @@ ... - + :/images/swap.svg:/images/swap.svg @@ -157,7 +157,7 @@ ... - + :/images/auto_author_sort.svg:/images/auto_author_sort.svg @@ -240,7 +240,7 @@ Open Tag Editor - + :/images/chapters.svg:/images/chapters.svg @@ -302,7 +302,7 @@ ... - + :/images/trash.svg:/images/trash.svg @@ -446,7 +446,7 @@ ... - + :/images/add_book.svg:/images/add_book.svg @@ -466,7 +466,7 @@ ... - + :/images/trash.svg:/images/trash.svg @@ -486,7 +486,7 @@ ... - + :/images/book.svg:/images/book.svg @@ -506,7 +506,7 @@ - + :/images/edit_input.svg:/images/edit_input.svg @@ -547,7 +547,7 @@ - :/images/book.svg + :/images/book.svg true @@ -599,7 +599,7 @@ ... - + :/images/document_open.svg:/images/document_open.svg @@ -613,7 +613,7 @@ ... - + :/images/trash.svg:/images/trash.svg @@ -709,7 +709,7 @@ button_box - + diff --git a/src/calibre/gui2/dialogs/password.ui b/src/calibre/gui2/dialogs/password.ui index 3fc982371e..811e042153 100644 --- a/src/calibre/gui2/dialogs/password.ui +++ b/src/calibre/gui2/dialogs/password.ui @@ -14,7 +14,7 @@ Password needed - + :/images/mimetypes/unknown.svg:/images/mimetypes/unknown.svg @@ -81,7 +81,7 @@ - + diff --git a/src/calibre/gui2/dialogs/progress.ui b/src/calibre/gui2/dialogs/progress.ui index 60488be62d..451b9dfb59 100644 --- a/src/calibre/gui2/dialogs/progress.ui +++ b/src/calibre/gui2/dialogs/progress.ui @@ -13,7 +13,7 @@ Dialog - + :/images/jobs.svg:/images/jobs.svg @@ -66,7 +66,7 @@ - + diff --git a/src/calibre/gui2/dialogs/scheduler.ui b/src/calibre/gui2/dialogs/scheduler.ui index 497b1215dc..b8769ff47f 100644 --- a/src/calibre/gui2/dialogs/scheduler.ui +++ b/src/calibre/gui2/dialogs/scheduler.ui @@ -14,7 +14,7 @@ Schedule news download - + :/images/scheduler.svg:/images/scheduler.svg @@ -314,7 +314,7 @@ - + diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui index b35ca84aca..5c28807bac 100644 --- a/src/calibre/gui2/dialogs/search.ui +++ b/src/calibre/gui2/dialogs/search.ui @@ -13,7 +13,7 @@ Advanced Search - + :/images/search.svg:/images/search.svg @@ -132,7 +132,7 @@ - + diff --git a/src/calibre/gui2/dialogs/tag_editor.ui b/src/calibre/gui2/dialogs/tag_editor.ui index 713ffc7fdf..1db1abb1d3 100644 --- a/src/calibre/gui2/dialogs/tag_editor.ui +++ b/src/calibre/gui2/dialogs/tag_editor.ui @@ -14,7 +14,7 @@ Tag Editor - + :/images/chapters.svg:/images/chapters.svg @@ -58,7 +58,7 @@ ... - + :/images/trash.svg:/images/trash.svg @@ -104,7 +104,7 @@ ... - + :/images/forward.svg:/images/forward.svg @@ -189,7 +189,7 @@ ... - + :/images/list_remove.svg:/images/list_remove.svg @@ -250,7 +250,7 @@ ... - + :/images/plus.svg:/images/plus.svg @@ -290,7 +290,7 @@ - + diff --git a/src/calibre/gui2/dialogs/test_email.ui b/src/calibre/gui2/dialogs/test_email.ui index f1d5568c03..241468793f 100644 --- a/src/calibre/gui2/dialogs/test_email.ui +++ b/src/calibre/gui2/dialogs/test_email.ui @@ -14,7 +14,7 @@ Test email settings - + :/images/config.svg:/images/config.svg @@ -64,7 +64,7 @@ - + diff --git a/src/calibre/gui2/dialogs/user_profiles.ui b/src/calibre/gui2/dialogs/user_profiles.ui index a913275c61..64b6d10123 100644 --- a/src/calibre/gui2/dialogs/user_profiles.ui +++ b/src/calibre/gui2/dialogs/user_profiles.ui @@ -14,7 +14,7 @@ Add custom news source - + :/images/user_profile.svg:/images/user_profile.svg @@ -82,7 +82,7 @@ Add/Update &recipe - + :/images/plus.svg:/images/plus.svg @@ -93,7 +93,7 @@ &Remove recipe - + :/images/list_remove.svg:/images/list_remove.svg @@ -104,7 +104,7 @@ &Share recipe - + :/images/forward.svg:/images/forward.svg @@ -115,7 +115,7 @@ Customize &builtin recipe - + :/images/news.svg:/images/news.svg @@ -126,7 +126,7 @@ &Load recipe from file - + :/images/chapters.svg:/images/chapters.svg @@ -285,7 +285,7 @@ p, li { white-space: pre-wrap; } ... - + :/images/arrow-up.svg:/images/arrow-up.svg @@ -299,7 +299,7 @@ p, li { white-space: pre-wrap; } ... - + :/images/list_remove.svg:/images/list_remove.svg @@ -310,7 +310,7 @@ p, li { white-space: pre-wrap; } ... - + :/images/arrow-down.svg:/images/arrow-down.svg @@ -361,7 +361,7 @@ p, li { white-space: pre-wrap; } &Add feed - + :/images/plus.svg:/images/plus.svg @@ -455,7 +455,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/src/calibre/gui2/lrf_renderer/config.ui b/src/calibre/gui2/lrf_renderer/config.ui index cad538090a..448ee2f9a0 100644 --- a/src/calibre/gui2/lrf_renderer/config.ui +++ b/src/calibre/gui2/lrf_renderer/config.ui @@ -14,7 +14,7 @@ Configure Viewer - + :/images/config.svg:/images/config.svg @@ -67,7 +67,7 @@ - + diff --git a/src/calibre/gui2/lrf_renderer/main.ui b/src/calibre/gui2/lrf_renderer/main.ui index 02e0f60493..2eeb400cc4 100644 --- a/src/calibre/gui2/lrf_renderer/main.ui +++ b/src/calibre/gui2/lrf_renderer/main.ui @@ -19,7 +19,7 @@ LRF Viewer - + :/images/viewer.svg:/images/viewer.svg @@ -173,7 +173,7 @@ - + :/images/next.svg:/images/next.svg @@ -182,7 +182,7 @@ - + :/images/previous.svg:/images/previous.svg @@ -191,7 +191,7 @@ - + :/images/back.svg:/images/back.svg @@ -200,7 +200,7 @@ - + :/images/forward.svg:/images/forward.svg @@ -214,7 +214,7 @@ - + :/images/document_open.svg:/images/document_open.svg @@ -223,7 +223,7 @@ - + :/images/config.svg:/images/config.svg @@ -239,7 +239,7 @@ - + diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui index 0ad69a2f59..6273d275fd 100644 --- a/src/calibre/gui2/main.ui +++ b/src/calibre/gui2/main.ui @@ -24,7 +24,7 @@ __appname__ - + :/library:/library @@ -104,7 +104,7 @@ ... - + :/images/donate.svg:/images/donate.svg @@ -166,7 +166,7 @@ ... - + :/images/search.svg:/images/search.svg @@ -209,7 +209,7 @@ ... - + :/images/clear_left.svg:/images/clear_left.svg @@ -484,7 +484,7 @@ - + :/images/add_book.svg:/images/add_book.svg @@ -499,7 +499,7 @@ - + :/images/trash.svg:/images/trash.svg @@ -514,7 +514,7 @@ - + :/images/edit_input.svg:/images/edit_input.svg @@ -532,7 +532,7 @@ false - + :/images/sync.svg:/images/sync.svg @@ -541,7 +541,7 @@ - + :/images/save.svg:/images/save.svg @@ -553,7 +553,7 @@ - + :/images/news.svg:/images/news.svg @@ -565,7 +565,7 @@ - + :/images/convert.svg:/images/convert.svg @@ -577,7 +577,7 @@ - + :/images/view.svg:/images/view.svg @@ -589,7 +589,7 @@ - + :/images/document_open.svg:/images/document_open.svg @@ -598,7 +598,7 @@ - + :/images/dialog_information.svg:/images/dialog_information.svg @@ -607,7 +607,7 @@ - + :/images/user_profile.svg:/images/user_profile.svg @@ -616,7 +616,7 @@ - + :/images/books_in_series.svg:/images/books_in_series.svg @@ -625,7 +625,7 @@ - + :/images/publisher.png:/images/publisher.png @@ -634,7 +634,7 @@ - + :/images/tags.svg:/images/tags.svg @@ -643,7 +643,7 @@ - + :/images/config.svg:/images/config.svg @@ -685,7 +685,7 @@ - + diff --git a/src/calibre/gui2/viewer/config.ui b/src/calibre/gui2/viewer/config.ui index 7b286f194c..45a6f539c2 100644 --- a/src/calibre/gui2/viewer/config.ui +++ b/src/calibre/gui2/viewer/config.ui @@ -14,7 +14,7 @@ Configure Ebook viewer - + :/images/config.svg:/images/config.svg @@ -240,7 +240,7 @@ buttonBox - + diff --git a/src/calibre/gui2/viewer/main.ui b/src/calibre/gui2/viewer/main.ui index 9161e76491..7028ea3a65 100644 --- a/src/calibre/gui2/viewer/main.ui +++ b/src/calibre/gui2/viewer/main.ui @@ -14,7 +14,7 @@ Ebook Viewer - + :/images/viewer.svg:/images/viewer.svg @@ -104,7 +104,7 @@ - + :/images/back.svg:/images/back.svg @@ -113,7 +113,7 @@ - + :/images/forward.svg:/images/forward.svg @@ -122,7 +122,7 @@ - + :/images/next.svg:/images/next.svg @@ -131,7 +131,7 @@ - + :/images/previous.svg:/images/previous.svg @@ -140,7 +140,7 @@ - + :/images/font_size_larger.svg:/images/font_size_larger.svg @@ -149,7 +149,7 @@ - + :/images/font_size_smaller.svg:/images/font_size_smaller.svg @@ -158,7 +158,7 @@ - + :/images/chapters.svg:/images/chapters.svg @@ -167,7 +167,7 @@ - + :/images/dialog_information.svg:/images/dialog_information.svg @@ -176,7 +176,7 @@ - + :/images/document_open.svg:/images/document_open.svg @@ -185,7 +185,7 @@ - + :/images/arrow-down.svg:/images/arrow-down.svg @@ -194,7 +194,7 @@ - + :/images/convert.svg:/images/convert.svg @@ -203,7 +203,7 @@ - + :/images/config.svg:/images/config.svg @@ -212,7 +212,7 @@ - + :/images/lookfeel.svg:/images/lookfeel.svg @@ -221,7 +221,7 @@ - + :/images/bookmarks.svg:/images/bookmarks.svg @@ -230,7 +230,7 @@ - + :/images/page.svg:/images/page.svg @@ -239,7 +239,7 @@ - + :/images/print.svg:/images/print.svg @@ -255,7 +255,7 @@ - + diff --git a/src/calibre/gui2/wizard/device.ui b/src/calibre/gui2/wizard/device.ui index 27af13b3ed..a422140bb1 100644 --- a/src/calibre/gui2/wizard/device.ui +++ b/src/calibre/gui2/wizard/device.ui @@ -14,7 +14,7 @@ Welcome to calibre - + :/images/wizard.svg:/images/wizard.svg @@ -69,7 +69,7 @@ - + diff --git a/src/calibre/gui2/wizard/send_email.ui b/src/calibre/gui2/wizard/send_email.ui index 3802d7f451..f248b8df89 100644 --- a/src/calibre/gui2/wizard/send_email.ui +++ b/src/calibre/gui2/wizard/send_email.ui @@ -202,7 +202,7 @@ Use Gmail - + :/images/gmail_logo.png:/images/gmail_logo.png @@ -228,7 +228,7 @@ - + diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index cd3b1c75ef..4090605341 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -68,8 +68,11 @@ def set_translators(): if buf is None: buf = open(os.path.join(messages_path(hlang), 'messages.mo'), 'rb') - iso639 = open(os.path.join(messages_path(hlang), - 'iso639.mo'), 'rb') + if hlang == 'nds': + hlang = 'de' + isof = os.path.join(messages_path(hlang), 'iso639.mo') + if os.path.exists(isof): + iso639 = open(isof, 'rb') if buf is not None: t = GNUTranslations(buf)