From 17b259df9cb6b28779d4881b2b6c805ee2e48eea Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Jun 2024 23:30:05 +0900 Subject: [PATCH] Rename to tde-ebook-reader Signed-off-by: Michele Calgaro --- fbreader/data/formats/fb2/FBReaderVersion.ent | 1 - {fbreader => reader}/LICENSE | 0 .../data/default/config.desktop.xml | 0 .../data/default/external.desktop.xml | 0 .../default/fullscreen_toolbar.desktop.xml | 0 .../data/default/keymap.desktop.xml | 0 {fbreader => reader}/data/default/menubar.xml | 0 .../data/default/styles.desktop.xml | 0 .../data/default/toolbar.desktop.xml | 0 .../data/default/toolbar.full.xml | 0 .../data/default/toolbar.short.xml | 0 reader/data/formats/fb2/ReaderVersion.ent | 1 + .../data/formats/fb2/fb2genres.xml | 0 .../data/formats/html/html.ent | 0 .../data/help/MiniHelp.desktop.bg.fb2 | 18 +- .../data/help/MiniHelp.desktop.cs.fb2 | 16 +- .../data/help/MiniHelp.desktop.de.fb2 | 16 +- .../data/help/MiniHelp.desktop.en.fb2 | 16 +- .../data/help/MiniHelp.desktop.es.fb2 | 16 +- .../data/help/MiniHelp.desktop.fi.fb2 | 16 +- .../data/help/MiniHelp.desktop.fr.fb2 | 18 +- .../data/help/MiniHelp.desktop.he.fb2 | 18 +- .../data/help/MiniHelp.desktop.hu.fb2 | 16 +- .../data/help/MiniHelp.desktop.id.fb2 | 16 +- .../data/help/MiniHelp.desktop.it.fb2 | 16 +- .../data/help/MiniHelp.desktop.lt.fb2 | 22 +- .../data/help/MiniHelp.desktop.nl.fb2 | 16 +- .../data/help/MiniHelp.desktop.ru.fb2 | 16 +- .../data/help/MiniHelp.desktop.sv.fb2 | 16 +- .../data/help/MiniHelp.desktop.uk.fb2 | 16 +- .../data/help/MiniHelp.desktop.vi.fb2 | 18 +- .../data/help/MiniHelp.desktop.zh.fb2 | 18 +- .../data/icons/application/16x16.png | Bin .../data/icons/application/26x26.png | Bin .../data/icons/application/32x24.png | Bin .../data/icons/application/32x32.png | Bin .../data/icons/application/48x48.png | Bin .../data/icons/application/64x43.png | Bin .../data/icons/application/64x64.png | Bin .../data/icons/application/Reader.icns | Bin .../data/icons/application/desktop.png | 0 .../data/icons/back_button.png | Bin .../data/icons/back_button_disabled.png | Bin .../22x22-transparent-png/tree-authorinfo.png | Bin .../22x22-transparent-png/tree-bookinfo.png | Bin .../tree-download-demo.png | Bin .../tree-download-epub.png | Bin .../tree-download-fb2.png | Bin .../tree-download-mobi.png | Bin .../22x22-transparent-png/tree-local-demo.png | Bin .../22x22-transparent-png/tree-local-epub.png | Bin .../22x22-transparent-png/tree-local-fb2.png | Bin .../22x22-transparent-png/tree-local-mobi.png | Bin .../tree-open-in-browser.png | Bin .../tree-order-series.png | Bin .../22x22-transparent-png/tree-purchase.png | Bin .../22x22-transparent-png/tree-removebook.png | Bin .../22x22-transparent-png/tree-removetag.png | Bin .../22x22-transparent-png/tree-strut.png | Bin .../22x22-transparent-png/tree-taginfo.png | Bin .../28x28-transparent-png/tree-authorinfo.png | Bin .../28x28-transparent-png/tree-bookinfo.png | Bin .../tree-download-epub.png | Bin .../tree-download-fb2.png | Bin .../tree-download-mobi.png | Bin .../28x28-transparent-png/tree-local-epub.png | Bin .../28x28-transparent-png/tree-local-fb2.png | Bin .../28x28-transparent-png/tree-local-mobi.png | Bin .../tree-open-in-browser.png | Bin .../tree-orderseries.png | Bin .../28x28-transparent-png/tree-removebook.png | Bin .../28x28-transparent-png/tree-removetag.png | Bin .../28x28-transparent-png/tree-strut.png | Bin .../28x28-transparent-png/tree-taginfo.png | Bin .../data/icons/booktree/desktop | 0 .../icons/booktree/new/booktree-author.png | Bin .../data/icons/booktree/new/booktree-book.png | Bin .../icons/booktree/new/booktree-catalog.png | Bin .../data/icons/booktree/new/booktree-tag.png | Bin .../data/icons/booktree/new/searchresult.png | Bin .../data/icons/filetree/12x12-png/fb2.png | Bin .../data/icons/filetree/12x12-png/folder.png | Bin .../data/icons/filetree/12x12-png/html.png | Bin .../icons/filetree/12x12-png/mobipocket.png | Bin .../data/icons/filetree/12x12-png/oeb.png | Bin .../icons/filetree/12x12-png/openreader.png | Bin .../data/icons/filetree/12x12-png/palm.png | Bin .../data/icons/filetree/12x12-png/plucker.png | Bin .../data/icons/filetree/12x12-png/rtf.png | Bin .../data/icons/filetree/12x12-png/tcr.png | Bin .../data/icons/filetree/12x12-png/unknown.png | Bin .../icons/filetree/12x12-png/upfolder.png | Bin .../data/icons/filetree/12x12-png/weasel.png | Bin .../icons/filetree/12x12-png/zipfolder.png | Bin .../filetree/22x22-transparent-ico/fb2.ico | Bin .../filetree/22x22-transparent-ico/folder.ico | Bin .../filetree/22x22-transparent-ico/html.ico | Bin .../22x22-transparent-ico/mobipocket.ico | Bin .../filetree/22x22-transparent-ico/oeb.ico | Bin .../22x22-transparent-ico/openreader.ico | Bin .../filetree/22x22-transparent-ico/palm.ico | Bin .../22x22-transparent-ico/plucker.ico | Bin .../filetree/22x22-transparent-ico/rtf.ico | Bin .../filetree/22x22-transparent-ico/tcr.ico | Bin .../22x22-transparent-ico/unknown.ico | Bin .../22x22-transparent-ico/upfolder.ico | Bin .../filetree/22x22-transparent-ico/weasel.ico | Bin .../22x22-transparent-ico/zipfolder.ico | Bin .../filetree/22x22-transparent-png/fb2.png | Bin .../filetree/22x22-transparent-png/folder.png | Bin .../filetree/22x22-transparent-png/html.png | Bin .../22x22-transparent-png/mobipocket.png | Bin .../filetree/22x22-transparent-png/oeb.png | Bin .../22x22-transparent-png/openreader.png | Bin .../filetree/22x22-transparent-png/palm.png | Bin .../22x22-transparent-png/plucker.png | Bin .../filetree/22x22-transparent-png/rtf.png | Bin .../filetree/22x22-transparent-png/tcr.png | Bin .../22x22-transparent-png/unknown.png | Bin .../22x22-transparent-png/upfolder.png | Bin .../filetree/22x22-transparent-png/weasel.png | Bin .../22x22-transparent-png/zipfolder.png | Bin .../filetree/32x32-transparent-png/fb2.png | Bin .../filetree/32x32-transparent-png/folder.png | Bin .../filetree/32x32-transparent-png/html.png | Bin .../32x32-transparent-png/mobipocket.png | Bin .../filetree/32x32-transparent-png/oeb.png | Bin .../32x32-transparent-png/openreader.png | Bin .../filetree/32x32-transparent-png/palm.png | Bin .../32x32-transparent-png/plucker.png | Bin .../filetree/32x32-transparent-png/rtf.png | Bin .../filetree/32x32-transparent-png/tcr.png | Bin .../32x32-transparent-png/unknown.png | Bin .../32x32-transparent-png/upfolder.png | Bin .../filetree/32x32-transparent-png/weasel.png | Bin .../32x32-transparent-png/zipfolder.png | Bin .../data/icons/filetree/desktop | 0 .../data/icons/forward_button.png | Bin .../data/icons/forward_button_disabled.png | Bin .../data/icons/refresh-icon-1.png | Bin .../data/icons/refresh-icon-2.png | Bin .../data/icons/refresh-icon.svg | 0 .../data/icons/search_icon.png | Bin {fbreader => reader}/data/icons/spinner.gif | Bin .../data/icons/toolbar/14x15-png/addBook.png | Bin .../data/icons/toolbar/14x15-png/bookInfo.png | Bin .../data/icons/toolbar/14x15-png/findNext.png | Bin .../icons/toolbar/14x15-png/findPrevious.png | Bin .../data/icons/toolbar/14x15-png/gotoHome.png | Bin .../icons/toolbar/14x15-png/preferences.png | Bin .../data/icons/toolbar/14x15-png/redo.png | Bin .../data/icons/toolbar/14x15-png/rotate.png | Bin .../data/icons/toolbar/14x15-png/search.png | Bin .../icons/toolbar/14x15-png/showLibrary.png | Bin .../icons/toolbar/14x15-png/showReading.png | Bin .../icons/toolbar/14x15-png/showRecent.png | Bin .../data/icons/toolbar/14x15-png/toc.png | Bin .../data/icons/toolbar/14x15-png/undo.png | Bin .../data/icons/toolbar/22x18-png/addBook.png | Bin .../data/icons/toolbar/22x18-png/bookInfo.png | Bin .../data/icons/toolbar/22x18-png/findNext.png | Bin .../icons/toolbar/22x18-png/findPrevious.png | Bin .../data/icons/toolbar/22x18-png/gotoHome.png | Bin .../icons/toolbar/22x18-png/preferences.png | Bin .../data/icons/toolbar/22x18-png/redo.png | Bin .../data/icons/toolbar/22x18-png/rotate.png | Bin .../data/icons/toolbar/22x18-png/search.png | Bin .../icons/toolbar/22x18-png/showLibrary.png | Bin .../icons/toolbar/22x18-png/showReading.png | Bin .../icons/toolbar/22x18-png/showRecent.png | Bin .../data/icons/toolbar/22x18-png/toc.png | Bin .../data/icons/toolbar/22x18-png/undo.png | Bin .../toolbar/32x32-transparent-ico/addBook.ico | Bin .../advancedSearchOnNetwork.ico | Bin .../32x32-transparent-ico/bookInfo.ico | Bin .../32x32-transparent-ico/byAuthor.ico | Bin .../toolbar/32x32-transparent-ico/byTag.ico | Bin .../32x32-transparent-ico/findNext.ico | Bin .../32x32-transparent-ico/findPrevious.ico | Bin .../32x32-transparent-ico/gotoHome.ico | Bin .../32x32-transparent-ico/preferences.ico | Bin .../toolbar/32x32-transparent-ico/redo.ico | Bin .../toolbar/32x32-transparent-ico/rotate.ico | Bin .../toolbar/32x32-transparent-ico/search.ico | Bin .../32x32-transparent-ico/showHelp.ico | Bin .../32x32-transparent-ico/showLibrary.ico | Bin .../32x32-transparent-ico/showNetLibrary.ico | Bin .../32x32-transparent-ico/showReading.ico | Bin .../32x32-transparent-ico/showRecent.ico | Bin .../toolbar/32x32-transparent-ico/toc.ico | Bin .../toolbar/32x32-transparent-ico/undo.ico | Bin .../toolbar/32x32-transparent-png/addBook.png | Bin .../advancedSearchOnNetwork.png | Bin .../32x32-transparent-png/bookInfo.png | Bin .../32x32-transparent-png/byAuthor.png | Bin .../toolbar/32x32-transparent-png/byTag.png | Bin .../32x32-transparent-png/findNext.png | Bin .../32x32-transparent-png/findPrevious.png | Bin .../32x32-transparent-png/gotoHome.png | Bin .../32x32-transparent-png/preferences.png | Bin .../toolbar/32x32-transparent-png/redo.png | Bin .../toolbar/32x32-transparent-png/rotate.png | Bin .../toolbar/32x32-transparent-png/search.png | Bin .../32x32-transparent-png/showHelp.png | Bin .../32x32-transparent-png/showLibrary.png | Bin .../32x32-transparent-png/showNetLibrary.png | Bin .../showNetworkLibrary.png | 0 .../32x32-transparent-png/showReading.png | Bin .../32x32-transparent-png/showRecent.png | Bin .../toolbar/32x32-transparent-png/toc.png | Bin .../toolbar/32x32-transparent-png/undo.png | Bin .../data/icons/toolbar/desktop | 0 {fbreader => reader}/data/resources/RIGHTS | 0 {fbreader => reader}/data/resources/ar.xml | 12 +- {fbreader => reader}/data/resources/bg.xml | 20 +- {fbreader => reader}/data/resources/cs.xml | 22 +- {fbreader => reader}/data/resources/de.xml | 22 +- {fbreader => reader}/data/resources/en.xml | 20 +- {fbreader => reader}/data/resources/eo.xml | 22 +- {fbreader => reader}/data/resources/es.xml | 22 +- {fbreader => reader}/data/resources/fi.xml | 22 +- {fbreader => reader}/data/resources/fr.xml | 22 +- {fbreader => reader}/data/resources/he.xml | 20 +- {fbreader => reader}/data/resources/hu.xml | 22 +- {fbreader => reader}/data/resources/id.xml | 22 +- {fbreader => reader}/data/resources/it.xml | 22 +- {fbreader => reader}/data/resources/lt.xml | 22 +- {fbreader => reader}/data/resources/nl.xml | 22 +- {fbreader => reader}/data/resources/pl.xml | 22 +- {fbreader => reader}/data/resources/ru.xml | 18 +- {fbreader => reader}/data/resources/sv.xml | 22 +- {fbreader => reader}/data/resources/uk.xml | 20 +- {fbreader => reader}/data/resources/vi.xml | 22 +- {fbreader => reader}/data/resources/zh.xml | 24 +- {fbreader => reader}/desktop/desktop | 20 +- .../desktop/tde-ebook-reader.1 | 18 +- .../src/blockTree/ReaderNode.cpp | 62 ++--- .../src/blockTree/ReaderNode.h | 12 +- .../src/bookmodel/BookModel.cpp | 0 .../src/bookmodel/BookModel.h | 0 .../src/bookmodel/BookReader.cpp | 0 .../src/bookmodel/BookReader.h | 0 .../src/bookmodel/FBHyperlinkType.h | 0 .../src/bookmodel/FBTextKind.h | 0 .../src/database/booksdb/BooksDB.cpp | 0 .../src/database/booksdb/BooksDB.h | 2 +- .../src/database/booksdb/BooksDBQuery.cpp | 0 .../src/database/booksdb/BooksDBQuery.h | 0 .../src/database/booksdb/BooksDBUtil.cpp | 0 .../src/database/booksdb/BooksDBUtil.h | 0 .../database/booksdb/BooksDB_BookAuthor.cpp | 0 .../database/booksdb/BooksDB_BookSeries.cpp | 0 .../src/database/booksdb/BooksDB_BookTag.cpp | 0 .../src/database/booksdb/DBRunnables.h | 2 +- .../runnables/ClearBooksDBRunnable.cpp | 0 .../booksdb/runnables/DeleteBookRunnable.cpp | 0 .../runnables/DeleteFileEntriesRunnable.cpp | 0 .../booksdb/runnables/FindFileIdRunnable.cpp | 0 .../booksdb/runnables/InitBooksDBRunnable.cpp | 0 .../runnables/LoadFileEntriesRunnable.cpp | 0 .../runnables/LoadRecentBooksRunnable.cpp | 0 .../booksdb/runnables/SaveAuthorsRunnable.cpp | 0 .../booksdb/runnables/SaveBookRunnable.cpp | 0 .../runnables/SaveBookStateStackRunnable.cpp | 0 .../runnables/SaveRecentBooksRunnable.cpp | 0 .../booksdb/runnables/SaveSeriesRunnable.cpp | 0 .../runnables/SaveTableBookRunnable.cpp | 0 .../src/database/networkdb/DBRunnables.h | 0 .../src/database/networkdb/NetworkDB.cpp | 0 .../src/database/networkdb/NetworkDB.h | 0 .../src/database/networkdb/NetworkDBQuery.cpp | 0 .../src/database/networkdb/NetworkDBQuery.h | 0 .../runnables/ClearNetworkDBRunnable.cpp | 0 .../runnables/InitNetworkDBRunnable.cpp | 0 .../runnables/SaveNetworkLinkRunnable.cpp | 0 .../src/database/sqldb/DBCommand.cpp | 0 .../src/database/sqldb/DBCommand.h | 0 .../src/database/sqldb/DBCommandParameter.cpp | 0 .../src/database/sqldb/DBCommandParameter.h | 0 .../src/database/sqldb/DBConnection.cpp | 0 .../src/database/sqldb/DBConnection.h | 0 .../src/database/sqldb/DBDataReader.cpp | 0 .../src/database/sqldb/DBDataReader.h | 0 .../src/database/sqldb/DBIntValue.cpp | 0 .../src/database/sqldb/DBNullValue.cpp | 0 .../src/database/sqldb/DBRealValue.cpp | 0 .../src/database/sqldb/DBRunnable.h | 0 .../src/database/sqldb/DBTextValue.cpp | 0 .../src/database/sqldb/DBValue.cpp | 0 .../src/database/sqldb/DBValues.h | 0 .../src/database/sqldb/DataBase.cpp | 0 .../src/database/sqldb/DataBase.h | 0 .../sqldb/implsqlite/SQLiteCommand.cpp | 0 .../database/sqldb/implsqlite/SQLiteCommand.h | 0 .../sqldb/implsqlite/SQLiteConnection.cpp | 0 .../sqldb/implsqlite/SQLiteConnection.h | 0 .../sqldb/implsqlite/SQLiteDataBase.cpp | 0 .../sqldb/implsqlite/SQLiteDataBase.h | 0 .../sqldb/implsqlite/SQLiteDataReader.cpp | 0 .../sqldb/implsqlite/SQLiteDataReader.h | 0 .../sqldb/implsqlite/SQLiteFactory.cpp | 0 .../database/sqldb/implsqlite/SQLiteFactory.h | 0 .../encodingOption/EncodingOptionEntry.cpp | 0 .../src/encodingOption/EncodingOptionEntry.h | 0 .../src/external/ProgramCollection.cpp | 0 .../src/external/ProgramCollection.h | 0 .../src/formats/EncodedTextReader.cpp | 0 .../src/formats/EncodedTextReader.h | 0 .../src/formats/FormatPlugin.cpp | 0 .../src/formats/FormatPlugin.h | 0 .../src/formats/PluginCollection.cpp | 0 .../src/formats/chm/BitStream.cpp | 0 .../src/formats/chm/BitStream.h | 0 .../src/formats/chm/CHMFile.cpp | 0 .../src/formats/chm/CHMFile.h | 0 .../src/formats/chm/CHMFileImage.cpp | 0 .../src/formats/chm/CHMFileImage.h | 0 .../src/formats/chm/CHMPlugin.cpp | 0 .../src/formats/chm/CHMPlugin.h | 0 .../formats/chm/CHMReferenceCollection.cpp | 0 .../src/formats/chm/CHMReferenceCollection.h | 0 .../src/formats/chm/E8Decoder.cpp | 0 .../src/formats/chm/HHCReader.cpp | 0 .../src/formats/chm/HHCReader.h | 0 .../src/formats/chm/HHCReferenceCollector.cpp | 0 .../src/formats/chm/HHCReferenceCollector.h | 0 .../src/formats/chm/HtmlSectionReader.cpp | 0 .../src/formats/chm/HtmlSectionReader.h | 0 .../src/formats/chm/HuffmanDecoder.cpp | 0 .../src/formats/chm/HuffmanDecoder.h | 0 .../src/formats/chm/LZXDecompressor.cpp | 0 .../src/formats/chm/LZXDecompressor.h | 0 .../src/formats/css/StyleSheetParser.cpp | 0 .../src/formats/css/StyleSheetParser.h | 0 .../src/formats/css/StyleSheetTable.cpp | 0 .../src/formats/css/StyleSheetTable.h | 0 .../src/formats/doc/DocBookReader.cpp | 0 .../src/formats/doc/DocBookReader.h | 0 .../src/formats/doc/DocFloatImageReader.cpp | 0 .../src/formats/doc/DocFloatImageReader.h | 0 .../src/formats/doc/DocInlineImageReader.cpp | 0 .../src/formats/doc/DocInlineImageReader.h | 0 .../src/formats/doc/DocMetaInfoReader.cpp | 0 .../src/formats/doc/DocMetaInfoReader.h | 0 .../src/formats/doc/DocPlugin.cpp | 0 .../src/formats/doc/DocPlugin.h | 0 .../src/formats/doc/DocStreams.cpp | 0 .../src/formats/doc/DocStreams.h | 0 .../src/formats/doc/OleMainStream.cpp | 0 .../src/formats/doc/OleMainStream.h | 0 .../src/formats/doc/OleStorage.cpp | 0 .../src/formats/doc/OleStorage.h | 0 .../src/formats/doc/OleStream.cpp | 0 .../src/formats/doc/OleStream.h | 0 .../src/formats/doc/OleStreamParser.cpp | 0 .../src/formats/doc/OleStreamParser.h | 0 .../src/formats/doc/OleStreamReader.cpp | 0 .../src/formats/doc/OleStreamReader.h | 0 .../src/formats/doc/OleUtil.cpp | 0 .../src/formats/doc/OleUtil.h | 0 .../src/formats/docbook/DocBookBookReader.cpp | 0 .../src/formats/docbook/DocBookBookReader.h | 0 .../docbook/DocBookDescriptionReader.cpp | 0 .../docbook/DocBookDescriptionReader.h | 0 .../src/formats/docbook/DocBookPlugin.cpp | 0 .../src/formats/docbook/DocBookPlugin.h | 0 .../src/formats/docbook/DocBookReader.cpp | 0 .../src/formats/docbook/DocBookReader.h | 0 .../src/formats/dummy/DummyBookReader.cpp | 0 .../src/formats/dummy/DummyBookReader.h | 0 .../src/formats/dummy/DummyMetaInfoReader.cpp | 0 .../src/formats/dummy/DummyMetaInfoReader.h | 0 .../src/formats/dummy/DummyPlugin.cpp | 0 .../src/formats/dummy/DummyPlugin.h | 0 .../src/formats/dummy/createPlugin.sh | 0 .../src/formats/fb2/FB2BookReader.cpp | 0 .../src/formats/fb2/FB2BookReader.h | 0 .../src/formats/fb2/FB2CoverReader.cpp | 0 .../src/formats/fb2/FB2CoverReader.h | 0 .../src/formats/fb2/FB2MetaInfoReader.cpp | 0 .../src/formats/fb2/FB2MetaInfoReader.h | 0 .../src/formats/fb2/FB2Plugin.cpp | 0 .../src/formats/fb2/FB2Plugin.h | 0 .../src/formats/fb2/FB2Reader.cpp | 0 .../src/formats/fb2/FB2Reader.h | 0 .../src/formats/fb2/FB2TagManager.cpp | 0 .../src/formats/fb2/FB2TagManager.h | 0 .../src/formats/html/HtmlBookReader.cpp | 0 .../src/formats/html/HtmlBookReader.h | 0 .../formats/html/HtmlDescriptionReader.cpp | 0 .../src/formats/html/HtmlDescriptionReader.h | 0 .../src/formats/html/HtmlEntityCollection.cpp | 0 .../src/formats/html/HtmlEntityCollection.h | 0 .../src/formats/html/HtmlPlugin.cpp | 0 .../src/formats/html/HtmlPlugin.h | 0 .../src/formats/html/HtmlReader.cpp | 0 .../src/formats/html/HtmlReader.h | 0 .../src/formats/html/HtmlReaderStream.cpp | 0 .../src/formats/html/HtmlReaderStream.h | 0 .../src/formats/html/HtmlTagActions.h | 0 .../src/formats/oeb/NCXReader.cpp | 0 .../src/formats/oeb/NCXReader.h | 0 .../src/formats/oeb/OEBBookReader.cpp | 0 .../src/formats/oeb/OEBBookReader.h | 0 .../src/formats/oeb/OEBCoverReader.cpp | 0 .../src/formats/oeb/OEBCoverReader.h | 0 .../src/formats/oeb/OEBMetaInfoReader.cpp | 0 .../src/formats/oeb/OEBMetaInfoReader.h | 0 .../src/formats/oeb/OEBPlugin.cpp | 0 .../src/formats/oeb/OEBPlugin.h | 0 .../src/formats/oeb/OEBTextStream.cpp | 0 .../src/formats/oeb/OEBTextStream.h | 0 .../src/formats/oeb/XHTMLImageFinder.cpp | 0 .../src/formats/oeb/XHTMLImageFinder.h | 0 .../src/formats/openreader/ORBookReader.cpp | 0 .../src/formats/openreader/ORBookReader.h | 0 .../openreader/ORDescriptionReader.cpp | 0 .../formats/openreader/ORDescriptionReader.h | 0 .../formats/openreader/OpenReaderPlugin.cpp | 0 .../src/formats/openreader/OpenReaderPlugin.h | 0 .../src/formats/pdb/BitReader.cpp | 0 .../src/formats/pdb/BitReader.h | 0 .../src/formats/pdb/DocDecompressor.cpp | 0 .../src/formats/pdb/DocDecompressor.h | 0 .../src/formats/pdb/EReaderPlugin.cpp | 0 .../src/formats/pdb/EReaderStream.cpp | 0 .../src/formats/pdb/EReaderStream.h | 0 .../src/formats/pdb/HtmlMetainfoReader.cpp | 0 .../src/formats/pdb/HtmlMetainfoReader.h | 0 .../src/formats/pdb/HuffDecompressor.cpp | 0 .../src/formats/pdb/HuffDecompressor.h | 0 .../formats/pdb/MobipocketHtmlBookReader.cpp | 0 .../formats/pdb/MobipocketHtmlBookReader.h | 0 .../src/formats/pdb/MobipocketPlugin.cpp | 0 .../src/formats/pdb/PalmDocLikePlugin.cpp | 0 .../src/formats/pdb/PalmDocLikeStream.cpp | 0 .../src/formats/pdb/PalmDocLikeStream.h | 0 .../src/formats/pdb/PalmDocPlugin.cpp | 0 .../src/formats/pdb/PalmDocStream.cpp | 0 .../src/formats/pdb/PalmDocStream.h | 0 .../src/formats/pdb/PdbPlugin.cpp | 0 .../src/formats/pdb/PdbPlugin.h | 0 .../src/formats/pdb/PdbReader.cpp | 0 .../src/formats/pdb/PdbReader.h | 0 .../src/formats/pdb/PdbStream.cpp | 0 .../src/formats/pdb/PdbStream.h | 0 .../src/formats/pdb/PluckerBookReader.cpp | 0 .../src/formats/pdb/PluckerBookReader.h | 0 .../src/formats/pdb/PluckerImages.cpp | 0 .../src/formats/pdb/PluckerImages.h | 0 .../src/formats/pdb/PluckerPlugin.cpp | 0 .../src/formats/pdb/PluckerTextStream.cpp | 0 .../src/formats/pdb/PluckerTextStream.h | 0 .../src/formats/pdb/PmlBookReader.cpp | 0 .../src/formats/pdb/PmlBookReader.h | 0 .../src/formats/pdb/PmlReader.cpp | 0 .../src/formats/pdb/PmlReader.h | 0 .../src/formats/pdb/SimplePdbPlugin.cpp | 0 .../src/formats/pdb/ZTXTPlugin.cpp | 0 .../src/formats/pdb/ZTXTStream.cpp | 0 .../src/formats/pdb/ZTXTStream.h | 0 .../src/formats/pdf/PdfBookReader.cpp | 0 .../src/formats/pdf/PdfBookReader.h | 0 .../src/formats/pdf/PdfDescriptionReader.cpp | 0 .../src/formats/pdf/PdfDescriptionReader.h | 0 .../src/formats/pdf/PdfObject.cpp | 0 .../src/formats/pdf/PdfObject.h | 0 .../src/formats/pdf/PdfPlugin.cpp | 0 .../src/formats/pdf/PdfPlugin.h | 0 .../src/formats/pdf/StringStream.cpp | 0 .../src/formats/pdf/StringStream.h | 0 .../src/formats/rtf/RtfBookReader.cpp | 0 .../src/formats/rtf/RtfBookReader.h | 0 .../src/formats/rtf/RtfDescriptionReader.cpp | 0 .../src/formats/rtf/RtfDescriptionReader.h | 0 .../src/formats/rtf/RtfPlugin.cpp | 0 .../src/formats/rtf/RtfPlugin.h | 0 .../src/formats/rtf/RtfReader.cpp | 0 .../src/formats/rtf/RtfReader.h | 0 .../src/formats/rtf/RtfReaderStream.cpp | 0 .../src/formats/rtf/RtfReaderStream.h | 0 .../src/formats/tcr/PPLBookReader.cpp | 0 .../src/formats/tcr/PPLBookReader.h | 0 .../src/formats/tcr/TcrPlugin.cpp | 0 .../src/formats/tcr/TcrPlugin.h | 0 .../src/formats/tcr/TcrStream.cpp | 0 .../src/formats/tcr/TcrStream.h | 0 .../src/formats/txt/PlainTextFormat.cpp | 0 .../src/formats/txt/PlainTextFormat.h | 0 .../src/formats/txt/TxtBookReader.cpp | 0 .../src/formats/txt/TxtBookReader.h | 0 .../src/formats/txt/TxtPlugin.cpp | 0 .../src/formats/txt/TxtPlugin.h | 0 .../src/formats/txt/TxtReader.cpp | 0 .../src/formats/txt/TxtReader.h | 0 .../src/formats/util/EntityFilesCollector.cpp | 0 .../src/formats/util/EntityFilesCollector.h | 0 .../src/formats/util/MergedStream.cpp | 0 .../src/formats/util/MergedStream.h | 0 .../src/formats/util/MiscUtil.cpp | 0 .../src/formats/util/MiscUtil.h | 0 .../src/formats/util/TextFormatDetector.cpp | 0 .../src/formats/util/TextFormatDetector.h | 0 .../src/formats/util/XMLTextStream.cpp | 0 .../src/formats/util/XMLTextStream.h | 0 .../src/formats/xhtml/XHTMLReader.cpp | 0 .../src/formats/xhtml/XHTMLReader.h | 0 {fbreader => reader}/src/library/Author.cpp | 0 {fbreader => reader}/src/library/Author.h | 0 {fbreader => reader}/src/library/Book.cpp | 0 {fbreader => reader}/src/library/Book.h | 0 .../src/library/Comparators.cpp | 0 {fbreader => reader}/src/library/Library.cpp | 0 {fbreader => reader}/src/library/Library.h | 0 {fbreader => reader}/src/library/Lists.h | 0 {fbreader => reader}/src/library/Number.cpp | 0 {fbreader => reader}/src/library/Number.h | 0 {fbreader => reader}/src/library/Tag.cpp | 0 {fbreader => reader}/src/library/Tag.h | 0 .../src/libraryActions/AuthorInfoDialog.cpp | 0 .../src/libraryActions/AuthorInfoDialog.h | 0 .../src/libraryActions/BooksUtil.cpp | 4 +- .../src/libraryActions/BooksUtil.h | 0 .../libraryActions/LibraryAuthorActions.cpp | 4 +- .../src/libraryActions/LibraryAuthorActions.h | 0 .../src/libraryActions/LibraryBookActions.cpp | 12 +- .../src/libraryActions/LibraryBookActions.h | 0 .../src/libraryActions/LibraryTagActions.cpp | 0 .../src/libraryActions/LibraryTagActions.h | 0 .../src/libraryTree/AuthorNode.cpp | 4 +- .../src/libraryTree/BookNode.cpp | 16 +- .../src/libraryTree/LibraryByAuthorView.cpp | 8 +- .../src/libraryTree/LibraryByTagView.cpp | 0 .../src/libraryTree/LibraryNodes.h | 10 +- .../src/libraryTree/LibraryView.cpp | 0 .../src/libraryTree/LibraryView.h | 0 .../src/libraryTree/SeriesNode.cpp | 6 +- .../src/libraryTree/TagNode.cpp | 6 +- .../src/migration/BookInfo.cpp | 0 {fbreader => reader}/src/migration/BookInfo.h | 0 .../src/migration/FB2MigrationReader.cpp | 0 .../src/migration/FB2MigrationReader.h | 0 .../src/migration/HtmlDCTagsReader.cpp | 0 .../src/migration/HtmlDCTagsReader.h | 0 .../src/migration/Migration.cpp | 2 +- .../src/migration/Migration.h | 0 .../src/migration/Migration_0_10_4.cpp | 0 .../src/migration/Migration_0_11_0.cpp | 2 +- .../src/migration/Migration_0_8_11.cpp | 2 +- .../src/migration/Migration_0_8_13.cpp | 0 .../src/migration/Migration_0_8_16.cpp | 0 .../src/migration/Migration_0_99_0.cpp | 0 .../src/migration/Migration_0_99_1.cpp | 2 +- .../src/migration/OEBMigrationReader.cpp | 0 .../src/migration/OEBMigrationReader.h | 0 .../src/migration/migrate.cpp | 2 +- {fbreader => reader}/src/migration/migrate.h | 0 .../src/network/BookReference.cpp | 0 .../src/network/BookReference.h | 0 .../src/network/NetworkBookCollection.cpp | 0 .../src/network/NetworkBookCollection.h | 0 .../src/network/NetworkBookItem.cpp | 0 .../src/network/NetworkCatalogItem.cpp | 0 .../src/network/NetworkComparators.cpp | 0 .../src/network/NetworkComparators.h | 0 .../src/network/NetworkErrors.cpp | 0 .../src/network/NetworkErrors.h | 0 .../src/network/NetworkItem.cpp | 0 .../src/network/NetworkItems.h | 0 .../src/network/NetworkLink.cpp | 0 .../src/network/NetworkLink.h | 0 .../src/network/NetworkLinkCollection.cpp | 8 +- .../src/network/NetworkLinkCollection.h | 0 .../src/network/NetworkOperationData.cpp | 0 .../src/network/NetworkOperationData.h | 0 .../src/network/SearchResult.cpp | 0 .../src/network/SearchResult.h | 0 {fbreader => reader}/src/network/UserList.cpp | 0 {fbreader => reader}/src/network/UserList.h | 0 .../src/network/atom/ATOMConstructs.cpp | 0 .../src/network/atom/ATOMConstructs.h | 0 .../src/network/atom/ATOMContainers.cpp | 0 .../src/network/atom/ATOMContainers.h | 0 .../src/network/atom/ATOMMetadata.cpp | 0 .../src/network/atom/ATOMMetadata.h | 0 .../NetworkAuthenticationManager.cpp | 0 .../NetworkAuthenticationManager.h | 0 .../litres/LitResAuthenticationDataParser.cpp | 0 .../litres/LitResAuthenticationDataParser.h | 0 .../litres/LitResAuthenticationManager.cpp | 0 .../litres/LitResAuthenticationManager.h | 0 .../src/network/litres/LitResAuthorsItem.cpp | 0 .../src/network/litres/LitResAuthorsItem.h | 0 .../network/litres/LitResAuthorsParser.cpp | 0 .../src/network/litres/LitResAuthorsParser.h | 0 .../src/network/litres/LitResBookItem.cpp | 0 .../src/network/litres/LitResBookItem.h | 0 .../network/litres/LitResBooksFeedItem.cpp | 0 .../src/network/litres/LitResBooksFeedItem.h | 0 .../network/litres/LitResBooksFeedParser.cpp | 2 +- .../network/litres/LitResBooksFeedParser.h | 0 .../network/litres/LitResBookshelfItem.cpp | 0 .../src/network/litres/LitResBookshelfItem.h | 0 .../src/network/litres/LitResByGenresItem.cpp | 0 .../src/network/litres/LitResByGenresItem.h | 0 .../src/network/litres/LitResGenre.cpp | 0 .../src/network/litres/LitResGenre.h | 0 .../src/network/litres/LitResGenresParser.cpp | 0 .../src/network/litres/LitResGenresParser.h | 0 .../litres/LitResRecommendationsItem.cpp | 0 .../litres/LitResRecommendationsItem.h | 0 .../src/network/litres/LitResUtil.cpp | 0 .../src/network/litres/LitResUtil.h | 0 .../src/network/litres/SortedCatalogItem.cpp | 0 .../src/network/litres/SortedCatalogItem.h | 0 .../network/opds/NetworkOPDSFeedReader.cpp | 0 .../src/network/opds/NetworkOPDSFeedReader.h | 0 .../src/network/opds/OPDSBookItem.cpp | 0 .../src/network/opds/OPDSBookItem.h | 0 .../src/network/opds/OPDSCatalogItem.cpp | 0 .../src/network/opds/OPDSCatalogItem.h | 0 .../src/network/opds/OPDSFeedReader.h | 0 .../src/network/opds/OPDSLink.cpp | 0 .../src/network/opds/OPDSLink.h | 0 .../network/opds/OPDSLink_AdvancedSearch.h | 0 .../opds/OPDSLink_GenericFeedReader.cpp | 0 .../network/opds/OPDSLink_GenericFeedReader.h | 0 .../opds/OPDSLink_GenericXMLParser.cpp | 18 +- .../network/opds/OPDSLink_GenericXMLParser.h | 0 .../src/network/opds/OPDSMetadata.cpp | 0 .../src/network/opds/OPDSMetadata.h | 0 .../src/network/opds/OPDSXMLParser.cpp | 8 +- .../src/network/opds/OPDSXMLParser.h | 0 .../src/network/opds/OpenSearchXMLReader.cpp | 0 .../src/network/opds/OpenSearchXMLReader.h | 0 .../src/network/opds/URLRewritingRule.cpp | 0 .../src/network/opds/URLRewritingRule.h | 0 .../src/network/tree/NetworkAuthorTree.cpp | 0 .../src/network/tree/NetworkBookTree.cpp | 0 .../network/tree/NetworkCatalogRootTree.cpp | 8 +- .../src/network/tree/NetworkCatalogTree.cpp | 0 .../src/network/tree/NetworkCatalogUtil.cpp | 0 .../src/network/tree/NetworkCatalogUtil.h | 0 .../src/network/tree/NetworkLibrary.cpp | 0 .../src/network/tree/NetworkLibrary.h | 0 .../src/network/tree/NetworkSearcher.cpp | 0 .../src/network/tree/NetworkSearcher.h | 0 .../src/network/tree/NetworkSeriesTree.cpp | 0 .../src/network/tree/NetworkTree.cpp | 0 .../src/network/tree/NetworkTreeFactory.cpp | 0 .../src/network/tree/NetworkTreeFactory.h | 0 .../src/network/tree/NetworkTreeNodes.h | 0 .../src/network/tree/RootTree.cpp | 0 .../src/network/tree/SearchCatalogTree.cpp | 0 .../networkActions/AuthenticationDialog.cpp | 0 .../src/networkActions/AuthenticationDialog.h | 0 .../AuthenticationDialogManager.cpp | 0 .../AuthenticationDialogManager.h | 0 .../src/networkActions/NetworkActions.cpp | 28 +-- .../src/networkActions/NetworkActions.h | 0 .../NetworkOperationRunnable.cpp | 0 .../networkActions/NetworkOperationRunnable.h | 0 .../networkActions/PasswordRecoveryDialog.cpp | 2 +- .../networkActions/PasswordRecoveryDialog.h | 0 .../src/networkActions/RegisterUserDialog.cpp | 2 +- .../src/networkActions/RegisterUserDialog.h | 0 .../src/options/FBCategoryKey.cpp | 0 .../src/options/FBCategoryKey.h | 0 .../src/options/FBOptions.cpp | 0 {fbreader => reader}/src/options/FBOptions.h | 0 .../src/options/FBTextStyle.cpp | 0 .../src/options/FBTextStyle.h | 0 .../optionsDialog/AbstractOptionsDialog.cpp | 10 +- .../src/optionsDialog/AbstractOptionsDialog.h | 0 .../src/optionsDialog/IntegrationTab.cpp | 0 .../optionsDialog/bookInfo/BookInfoDialog.cpp | 0 .../optionsDialog/bookInfo/BookInfoDialog.h | 0 .../library/LibraryOptionsDialog.cpp | 2 +- .../library/LibraryOptionsDialog.h | 0 .../lookAndFeel/FormatOptionsPage.cpp | 0 .../lookAndFeel/FormatOptionsPage.h | 0 .../lookAndFeel/LookAndFeelOptionsDialog.cpp | 8 +- .../lookAndFeel/LookAndFeelOptionsDialog.h | 0 .../optionsDialog/lookAndFeel/OptionsPage.cpp | 0 .../optionsDialog/lookAndFeel/OptionsPage.h | 0 .../lookAndFeel/StyleOptionsPage.cpp | 0 .../lookAndFeel/StyleOptionsPage.h | 0 .../network/NetworkOptionsDialog.cpp | 8 +- .../network/NetworkOptionsDialog.h | 0 .../optionsDialog/reading/IndicatorTab.cpp | 8 +- .../optionsDialog/reading/KeyBindingsTab.cpp | 24 +- .../reading/ReadingOptionsDialog.cpp | 18 +- .../reading/ReadingOptionsDialog.h | 0 .../system/SystemOptionsDialog.cpp | 14 +- .../system/SystemOptionsDialog.h | 0 .../src/reader}/AddBookAction.cpp | 6 +- .../src/reader}/BookTextView.cpp | 32 +-- .../src/reader}/BookTextView.h | 0 .../src/reader}/BooksOrderAction.cpp | 8 +- .../src/reader}/ContentsView.cpp | 16 +- .../src/reader}/ContentsView.h | 0 .../src/reader}/FootnoteView.h | 0 .../src/reader}/PreferencesPopupData.cpp | 8 +- .../src/reader}/PreferencesPopupData.h | 0 .../src/reader/Reader.cpp | 94 ++++---- .../FBReader.h => reader/src/reader/Reader.h | 14 +- .../src/reader/ReaderActionCode.cpp | 2 +- .../src/reader/ReaderActions.cpp | 222 +++++++++--------- .../src/reader/ReaderActions.h | 12 +- .../src/reader}/ReadingState.h | 0 .../src/reader}/RecentBooksPopupData.cpp | 10 +- .../src/reader}/RecentBooksPopupData.h | 0 .../src/reader}/ScrollingAction.cpp | 24 +- .../src/reader}/ScrollingAction.h | 0 .../src/reader}/SearchActions.cpp | 16 +- .../src/reader}/SearchOnNetworkAction.cpp | 10 +- .../src/reader}/TimeUpdater.cpp | 0 .../src/reader}/TimeUpdater.h | 0 .../FBView.cpp => reader/src/reader/View.cpp | 14 +- .../FBView.h => reader/src/reader/View.h | 0 .../fbreader => reader/src/reader}/main.cpp | 4 +- {fbreader => reader}/src/tree/FBTree.cpp | 0 {fbreader => reader}/src/tree/FBTree.h | 0 zlibrary/core/data/resources/ar.xml | 2 +- zlibrary/core/data/resources/he.xml | 2 +- zlibrary/core/data/resources/zh.xml | 2 +- zlibrary/core/include/ZLXMLNamespace.h | 2 +- .../core/src/constants/ZLXMLNamespace.cpp | 2 +- 728 files changed, 807 insertions(+), 807 deletions(-) delete mode 100644 fbreader/data/formats/fb2/FBReaderVersion.ent rename {fbreader => reader}/LICENSE (100%) rename {fbreader => reader}/data/default/config.desktop.xml (100%) rename {fbreader => reader}/data/default/external.desktop.xml (100%) rename {fbreader => reader}/data/default/fullscreen_toolbar.desktop.xml (100%) rename {fbreader => reader}/data/default/keymap.desktop.xml (100%) rename {fbreader => reader}/data/default/menubar.xml (100%) rename {fbreader => reader}/data/default/styles.desktop.xml (100%) rename {fbreader => reader}/data/default/toolbar.desktop.xml (100%) rename {fbreader => reader}/data/default/toolbar.full.xml (100%) rename {fbreader => reader}/data/default/toolbar.short.xml (100%) create mode 100644 reader/data/formats/fb2/ReaderVersion.ent rename {fbreader => reader}/data/formats/fb2/fb2genres.xml (100%) rename {fbreader => reader}/data/formats/html/html.ent (100%) rename {fbreader => reader}/data/help/MiniHelp.desktop.bg.fb2 (85%) rename {fbreader => reader}/data/help/MiniHelp.desktop.cs.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.de.fb2 (87%) rename {fbreader => reader}/data/help/MiniHelp.desktop.en.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.es.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.fi.fb2 (87%) rename {fbreader => reader}/data/help/MiniHelp.desktop.fr.fb2 (87%) rename {fbreader => reader}/data/help/MiniHelp.desktop.he.fb2 (91%) rename {fbreader => reader}/data/help/MiniHelp.desktop.hu.fb2 (86%) rename {fbreader => reader}/data/help/MiniHelp.desktop.id.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.it.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.lt.fb2 (82%) rename {fbreader => reader}/data/help/MiniHelp.desktop.nl.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.ru.fb2 (83%) rename {fbreader => reader}/data/help/MiniHelp.desktop.sv.fb2 (88%) rename {fbreader => reader}/data/help/MiniHelp.desktop.uk.fb2 (84%) rename {fbreader => reader}/data/help/MiniHelp.desktop.vi.fb2 (93%) rename {fbreader => reader}/data/help/MiniHelp.desktop.zh.fb2 (89%) rename {fbreader => reader}/data/icons/application/16x16.png (100%) rename {fbreader => reader}/data/icons/application/26x26.png (100%) rename {fbreader => reader}/data/icons/application/32x24.png (100%) rename {fbreader => reader}/data/icons/application/32x32.png (100%) rename {fbreader => reader}/data/icons/application/48x48.png (100%) rename {fbreader => reader}/data/icons/application/64x43.png (100%) rename {fbreader => reader}/data/icons/application/64x64.png (100%) rename fbreader/data/icons/application/FBReader.icns => reader/data/icons/application/Reader.icns (100%) rename {fbreader => reader}/data/icons/application/desktop.png (100%) rename {fbreader => reader}/data/icons/back_button.png (100%) rename {fbreader => reader}/data/icons/back_button_disabled.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-download-demo.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-download-epub.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-local-demo.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-local-epub.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-order-series.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-purchase.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-removebook.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-removetag.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-strut.png (100%) rename {fbreader => reader}/data/icons/booktree/22x22-transparent-png/tree-taginfo.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-download-epub.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-local-epub.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-orderseries.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-removebook.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-removetag.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-strut.png (100%) rename {fbreader => reader}/data/icons/booktree/28x28-transparent-png/tree-taginfo.png (100%) rename {fbreader => reader}/data/icons/booktree/desktop (100%) rename {fbreader => reader}/data/icons/booktree/new/booktree-author.png (100%) rename {fbreader => reader}/data/icons/booktree/new/booktree-book.png (100%) rename {fbreader => reader}/data/icons/booktree/new/booktree-catalog.png (100%) rename {fbreader => reader}/data/icons/booktree/new/booktree-tag.png (100%) rename {fbreader => reader}/data/icons/booktree/new/searchresult.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/fb2.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/folder.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/html.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/mobipocket.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/oeb.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/openreader.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/palm.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/plucker.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/rtf.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/tcr.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/unknown.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/upfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/weasel.png (100%) rename {fbreader => reader}/data/icons/filetree/12x12-png/zipfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/fb2.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/folder.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/html.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/mobipocket.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/oeb.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/openreader.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/palm.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/plucker.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/rtf.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/tcr.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/unknown.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/upfolder.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/weasel.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-ico/zipfolder.ico (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/fb2.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/folder.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/html.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/mobipocket.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/oeb.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/openreader.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/palm.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/plucker.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/rtf.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/tcr.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/unknown.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/upfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/weasel.png (100%) rename {fbreader => reader}/data/icons/filetree/22x22-transparent-png/zipfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/fb2.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/folder.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/html.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/mobipocket.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/oeb.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/openreader.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/palm.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/plucker.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/rtf.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/tcr.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/unknown.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/upfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/weasel.png (100%) rename {fbreader => reader}/data/icons/filetree/32x32-transparent-png/zipfolder.png (100%) rename {fbreader => reader}/data/icons/filetree/desktop (100%) rename {fbreader => reader}/data/icons/forward_button.png (100%) rename {fbreader => reader}/data/icons/forward_button_disabled.png (100%) rename {fbreader => reader}/data/icons/refresh-icon-1.png (100%) rename {fbreader => reader}/data/icons/refresh-icon-2.png (100%) rename {fbreader => reader}/data/icons/refresh-icon.svg (100%) rename {fbreader => reader}/data/icons/search_icon.png (100%) rename {fbreader => reader}/data/icons/spinner.gif (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/addBook.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/bookInfo.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/findNext.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/findPrevious.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/gotoHome.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/preferences.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/redo.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/rotate.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/search.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/showLibrary.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/showReading.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/showRecent.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/toc.png (100%) rename {fbreader => reader}/data/icons/toolbar/14x15-png/undo.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/addBook.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/bookInfo.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/findNext.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/findPrevious.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/gotoHome.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/preferences.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/redo.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/rotate.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/search.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/showLibrary.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/showReading.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/showRecent.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/toc.png (100%) rename {fbreader => reader}/data/icons/toolbar/22x18-png/undo.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/addBook.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/byTag.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/findNext.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/preferences.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/redo.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/rotate.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/search.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/showHelp.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/showReading.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/showRecent.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/toc.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-ico/undo.ico (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/addBook.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/bookInfo.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/byAuthor.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/byTag.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/findNext.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/findPrevious.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/gotoHome.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/preferences.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/redo.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/rotate.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/search.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showHelp.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showLibrary.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showReading.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/showRecent.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/toc.png (100%) rename {fbreader => reader}/data/icons/toolbar/32x32-transparent-png/undo.png (100%) rename {fbreader => reader}/data/icons/toolbar/desktop (100%) rename {fbreader => reader}/data/resources/RIGHTS (100%) rename {fbreader => reader}/data/resources/ar.xml (98%) rename {fbreader => reader}/data/resources/bg.xml (97%) rename {fbreader => reader}/data/resources/cs.xml (97%) rename {fbreader => reader}/data/resources/de.xml (97%) rename {fbreader => reader}/data/resources/en.xml (97%) rename {fbreader => reader}/data/resources/eo.xml (97%) rename {fbreader => reader}/data/resources/es.xml (97%) rename {fbreader => reader}/data/resources/fi.xml (97%) rename {fbreader => reader}/data/resources/fr.xml (97%) rename {fbreader => reader}/data/resources/he.xml (97%) rename {fbreader => reader}/data/resources/hu.xml (97%) rename {fbreader => reader}/data/resources/id.xml (97%) rename {fbreader => reader}/data/resources/it.xml (97%) rename {fbreader => reader}/data/resources/lt.xml (97%) rename {fbreader => reader}/data/resources/nl.xml (97%) rename {fbreader => reader}/data/resources/pl.xml (97%) rename {fbreader => reader}/data/resources/ru.xml (97%) rename {fbreader => reader}/data/resources/sv.xml (97%) rename {fbreader => reader}/data/resources/uk.xml (97%) rename {fbreader => reader}/data/resources/vi.xml (97%) rename {fbreader => reader}/data/resources/zh.xml (96%) rename {fbreader => reader}/desktop/desktop (51%) rename fbreader/desktop/FBReader.1 => reader/desktop/tde-ebook-reader.1 (61%) rename fbreader/src/blockTree/FBReaderNode.cpp => reader/src/blockTree/ReaderNode.cpp (77%) rename fbreader/src/blockTree/FBReaderNode.h => reader/src/blockTree/ReaderNode.h (91%) rename {fbreader => reader}/src/bookmodel/BookModel.cpp (100%) rename {fbreader => reader}/src/bookmodel/BookModel.h (100%) rename {fbreader => reader}/src/bookmodel/BookReader.cpp (100%) rename {fbreader => reader}/src/bookmodel/BookReader.h (100%) rename {fbreader => reader}/src/bookmodel/FBHyperlinkType.h (100%) rename {fbreader => reader}/src/bookmodel/FBTextKind.h (100%) rename {fbreader => reader}/src/database/booksdb/BooksDB.cpp (100%) rename {fbreader => reader}/src/database/booksdb/BooksDB.h (99%) rename {fbreader => reader}/src/database/booksdb/BooksDBQuery.cpp (100%) rename {fbreader => reader}/src/database/booksdb/BooksDBQuery.h (100%) rename {fbreader => reader}/src/database/booksdb/BooksDBUtil.cpp (100%) rename {fbreader => reader}/src/database/booksdb/BooksDBUtil.h (100%) rename {fbreader => reader}/src/database/booksdb/BooksDB_BookAuthor.cpp (100%) rename {fbreader => reader}/src/database/booksdb/BooksDB_BookSeries.cpp (100%) rename {fbreader => reader}/src/database/booksdb/BooksDB_BookTag.cpp (100%) rename {fbreader => reader}/src/database/booksdb/DBRunnables.h (99%) rename {fbreader => reader}/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/DeleteBookRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/FindFileIdRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/InitBooksDBRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveBookRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveSeriesRunnable.cpp (100%) rename {fbreader => reader}/src/database/booksdb/runnables/SaveTableBookRunnable.cpp (100%) rename {fbreader => reader}/src/database/networkdb/DBRunnables.h (100%) rename {fbreader => reader}/src/database/networkdb/NetworkDB.cpp (100%) rename {fbreader => reader}/src/database/networkdb/NetworkDB.h (100%) rename {fbreader => reader}/src/database/networkdb/NetworkDBQuery.cpp (100%) rename {fbreader => reader}/src/database/networkdb/NetworkDBQuery.h (100%) rename {fbreader => reader}/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp (100%) rename {fbreader => reader}/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp (100%) rename {fbreader => reader}/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBCommand.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBCommand.h (100%) rename {fbreader => reader}/src/database/sqldb/DBCommandParameter.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBCommandParameter.h (100%) rename {fbreader => reader}/src/database/sqldb/DBConnection.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBConnection.h (100%) rename {fbreader => reader}/src/database/sqldb/DBDataReader.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBDataReader.h (100%) rename {fbreader => reader}/src/database/sqldb/DBIntValue.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBNullValue.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBRealValue.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBRunnable.h (100%) rename {fbreader => reader}/src/database/sqldb/DBTextValue.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBValue.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DBValues.h (100%) rename {fbreader => reader}/src/database/sqldb/DataBase.cpp (100%) rename {fbreader => reader}/src/database/sqldb/DataBase.h (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteCommand.cpp (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteCommand.h (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteConnection.cpp (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteConnection.h (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteDataBase.cpp (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteDataBase.h (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteDataReader.cpp (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteDataReader.h (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteFactory.cpp (100%) rename {fbreader => reader}/src/database/sqldb/implsqlite/SQLiteFactory.h (100%) rename {fbreader => reader}/src/encodingOption/EncodingOptionEntry.cpp (100%) rename {fbreader => reader}/src/encodingOption/EncodingOptionEntry.h (100%) rename {fbreader => reader}/src/external/ProgramCollection.cpp (100%) rename {fbreader => reader}/src/external/ProgramCollection.h (100%) rename {fbreader => reader}/src/formats/EncodedTextReader.cpp (100%) rename {fbreader => reader}/src/formats/EncodedTextReader.h (100%) rename {fbreader => reader}/src/formats/FormatPlugin.cpp (100%) rename {fbreader => reader}/src/formats/FormatPlugin.h (100%) rename {fbreader => reader}/src/formats/PluginCollection.cpp (100%) rename {fbreader => reader}/src/formats/chm/BitStream.cpp (100%) rename {fbreader => reader}/src/formats/chm/BitStream.h (100%) rename {fbreader => reader}/src/formats/chm/CHMFile.cpp (100%) rename {fbreader => reader}/src/formats/chm/CHMFile.h (100%) rename {fbreader => reader}/src/formats/chm/CHMFileImage.cpp (100%) rename {fbreader => reader}/src/formats/chm/CHMFileImage.h (100%) rename {fbreader => reader}/src/formats/chm/CHMPlugin.cpp (100%) rename {fbreader => reader}/src/formats/chm/CHMPlugin.h (100%) rename {fbreader => reader}/src/formats/chm/CHMReferenceCollection.cpp (100%) rename {fbreader => reader}/src/formats/chm/CHMReferenceCollection.h (100%) rename {fbreader => reader}/src/formats/chm/E8Decoder.cpp (100%) rename {fbreader => reader}/src/formats/chm/HHCReader.cpp (100%) rename {fbreader => reader}/src/formats/chm/HHCReader.h (100%) rename {fbreader => reader}/src/formats/chm/HHCReferenceCollector.cpp (100%) rename {fbreader => reader}/src/formats/chm/HHCReferenceCollector.h (100%) rename {fbreader => reader}/src/formats/chm/HtmlSectionReader.cpp (100%) rename {fbreader => reader}/src/formats/chm/HtmlSectionReader.h (100%) rename {fbreader => reader}/src/formats/chm/HuffmanDecoder.cpp (100%) rename {fbreader => reader}/src/formats/chm/HuffmanDecoder.h (100%) rename {fbreader => reader}/src/formats/chm/LZXDecompressor.cpp (100%) rename {fbreader => reader}/src/formats/chm/LZXDecompressor.h (100%) rename {fbreader => reader}/src/formats/css/StyleSheetParser.cpp (100%) rename {fbreader => reader}/src/formats/css/StyleSheetParser.h (100%) rename {fbreader => reader}/src/formats/css/StyleSheetTable.cpp (100%) rename {fbreader => reader}/src/formats/css/StyleSheetTable.h (100%) rename {fbreader => reader}/src/formats/doc/DocBookReader.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocBookReader.h (100%) rename {fbreader => reader}/src/formats/doc/DocFloatImageReader.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocFloatImageReader.h (100%) rename {fbreader => reader}/src/formats/doc/DocInlineImageReader.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocInlineImageReader.h (100%) rename {fbreader => reader}/src/formats/doc/DocMetaInfoReader.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocMetaInfoReader.h (100%) rename {fbreader => reader}/src/formats/doc/DocPlugin.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocPlugin.h (100%) rename {fbreader => reader}/src/formats/doc/DocStreams.cpp (100%) rename {fbreader => reader}/src/formats/doc/DocStreams.h (100%) rename {fbreader => reader}/src/formats/doc/OleMainStream.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleMainStream.h (100%) rename {fbreader => reader}/src/formats/doc/OleStorage.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleStorage.h (100%) rename {fbreader => reader}/src/formats/doc/OleStream.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleStream.h (100%) rename {fbreader => reader}/src/formats/doc/OleStreamParser.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleStreamParser.h (100%) rename {fbreader => reader}/src/formats/doc/OleStreamReader.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleStreamReader.h (100%) rename {fbreader => reader}/src/formats/doc/OleUtil.cpp (100%) rename {fbreader => reader}/src/formats/doc/OleUtil.h (100%) rename {fbreader => reader}/src/formats/docbook/DocBookBookReader.cpp (100%) rename {fbreader => reader}/src/formats/docbook/DocBookBookReader.h (100%) rename {fbreader => reader}/src/formats/docbook/DocBookDescriptionReader.cpp (100%) rename {fbreader => reader}/src/formats/docbook/DocBookDescriptionReader.h (100%) rename {fbreader => reader}/src/formats/docbook/DocBookPlugin.cpp (100%) rename {fbreader => reader}/src/formats/docbook/DocBookPlugin.h (100%) rename {fbreader => reader}/src/formats/docbook/DocBookReader.cpp (100%) rename {fbreader => reader}/src/formats/docbook/DocBookReader.h (100%) rename {fbreader => reader}/src/formats/dummy/DummyBookReader.cpp (100%) rename {fbreader => reader}/src/formats/dummy/DummyBookReader.h (100%) rename {fbreader => reader}/src/formats/dummy/DummyMetaInfoReader.cpp (100%) rename {fbreader => reader}/src/formats/dummy/DummyMetaInfoReader.h (100%) rename {fbreader => reader}/src/formats/dummy/DummyPlugin.cpp (100%) rename {fbreader => reader}/src/formats/dummy/DummyPlugin.h (100%) rename {fbreader => reader}/src/formats/dummy/createPlugin.sh (100%) rename {fbreader => reader}/src/formats/fb2/FB2BookReader.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2BookReader.h (100%) rename {fbreader => reader}/src/formats/fb2/FB2CoverReader.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2CoverReader.h (100%) rename {fbreader => reader}/src/formats/fb2/FB2MetaInfoReader.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2MetaInfoReader.h (100%) rename {fbreader => reader}/src/formats/fb2/FB2Plugin.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2Plugin.h (100%) rename {fbreader => reader}/src/formats/fb2/FB2Reader.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2Reader.h (100%) rename {fbreader => reader}/src/formats/fb2/FB2TagManager.cpp (100%) rename {fbreader => reader}/src/formats/fb2/FB2TagManager.h (100%) rename {fbreader => reader}/src/formats/html/HtmlBookReader.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlBookReader.h (100%) rename {fbreader => reader}/src/formats/html/HtmlDescriptionReader.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlDescriptionReader.h (100%) rename {fbreader => reader}/src/formats/html/HtmlEntityCollection.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlEntityCollection.h (100%) rename {fbreader => reader}/src/formats/html/HtmlPlugin.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlPlugin.h (100%) rename {fbreader => reader}/src/formats/html/HtmlReader.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlReader.h (100%) rename {fbreader => reader}/src/formats/html/HtmlReaderStream.cpp (100%) rename {fbreader => reader}/src/formats/html/HtmlReaderStream.h (100%) rename {fbreader => reader}/src/formats/html/HtmlTagActions.h (100%) rename {fbreader => reader}/src/formats/oeb/NCXReader.cpp (100%) rename {fbreader => reader}/src/formats/oeb/NCXReader.h (100%) rename {fbreader => reader}/src/formats/oeb/OEBBookReader.cpp (100%) rename {fbreader => reader}/src/formats/oeb/OEBBookReader.h (100%) rename {fbreader => reader}/src/formats/oeb/OEBCoverReader.cpp (100%) rename {fbreader => reader}/src/formats/oeb/OEBCoverReader.h (100%) rename {fbreader => reader}/src/formats/oeb/OEBMetaInfoReader.cpp (100%) rename {fbreader => reader}/src/formats/oeb/OEBMetaInfoReader.h (100%) rename {fbreader => reader}/src/formats/oeb/OEBPlugin.cpp (100%) rename {fbreader => reader}/src/formats/oeb/OEBPlugin.h (100%) rename {fbreader => reader}/src/formats/oeb/OEBTextStream.cpp (100%) rename {fbreader => reader}/src/formats/oeb/OEBTextStream.h (100%) rename {fbreader => reader}/src/formats/oeb/XHTMLImageFinder.cpp (100%) rename {fbreader => reader}/src/formats/oeb/XHTMLImageFinder.h (100%) rename {fbreader => reader}/src/formats/openreader/ORBookReader.cpp (100%) rename {fbreader => reader}/src/formats/openreader/ORBookReader.h (100%) rename {fbreader => reader}/src/formats/openreader/ORDescriptionReader.cpp (100%) rename {fbreader => reader}/src/formats/openreader/ORDescriptionReader.h (100%) rename {fbreader => reader}/src/formats/openreader/OpenReaderPlugin.cpp (100%) rename {fbreader => reader}/src/formats/openreader/OpenReaderPlugin.h (100%) rename {fbreader => reader}/src/formats/pdb/BitReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/BitReader.h (100%) rename {fbreader => reader}/src/formats/pdb/DocDecompressor.cpp (100%) rename {fbreader => reader}/src/formats/pdb/DocDecompressor.h (100%) rename {fbreader => reader}/src/formats/pdb/EReaderPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/EReaderStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/EReaderStream.h (100%) rename {fbreader => reader}/src/formats/pdb/HtmlMetainfoReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/HtmlMetainfoReader.h (100%) rename {fbreader => reader}/src/formats/pdb/HuffDecompressor.cpp (100%) rename {fbreader => reader}/src/formats/pdb/HuffDecompressor.h (100%) rename {fbreader => reader}/src/formats/pdb/MobipocketHtmlBookReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/MobipocketHtmlBookReader.h (100%) rename {fbreader => reader}/src/formats/pdb/MobipocketPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocLikePlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocLikeStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocLikeStream.h (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PalmDocStream.h (100%) rename {fbreader => reader}/src/formats/pdb/PdbPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PdbPlugin.h (100%) rename {fbreader => reader}/src/formats/pdb/PdbReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PdbReader.h (100%) rename {fbreader => reader}/src/formats/pdb/PdbStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PdbStream.h (100%) rename {fbreader => reader}/src/formats/pdb/PluckerBookReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PluckerBookReader.h (100%) rename {fbreader => reader}/src/formats/pdb/PluckerImages.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PluckerImages.h (100%) rename {fbreader => reader}/src/formats/pdb/PluckerPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PluckerTextStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PluckerTextStream.h (100%) rename {fbreader => reader}/src/formats/pdb/PmlBookReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PmlBookReader.h (100%) rename {fbreader => reader}/src/formats/pdb/PmlReader.cpp (100%) rename {fbreader => reader}/src/formats/pdb/PmlReader.h (100%) rename {fbreader => reader}/src/formats/pdb/SimplePdbPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/ZTXTPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdb/ZTXTStream.cpp (100%) rename {fbreader => reader}/src/formats/pdb/ZTXTStream.h (100%) rename {fbreader => reader}/src/formats/pdf/PdfBookReader.cpp (100%) rename {fbreader => reader}/src/formats/pdf/PdfBookReader.h (100%) rename {fbreader => reader}/src/formats/pdf/PdfDescriptionReader.cpp (100%) rename {fbreader => reader}/src/formats/pdf/PdfDescriptionReader.h (100%) rename {fbreader => reader}/src/formats/pdf/PdfObject.cpp (100%) rename {fbreader => reader}/src/formats/pdf/PdfObject.h (100%) rename {fbreader => reader}/src/formats/pdf/PdfPlugin.cpp (100%) rename {fbreader => reader}/src/formats/pdf/PdfPlugin.h (100%) rename {fbreader => reader}/src/formats/pdf/StringStream.cpp (100%) rename {fbreader => reader}/src/formats/pdf/StringStream.h (100%) rename {fbreader => reader}/src/formats/rtf/RtfBookReader.cpp (100%) rename {fbreader => reader}/src/formats/rtf/RtfBookReader.h (100%) rename {fbreader => reader}/src/formats/rtf/RtfDescriptionReader.cpp (100%) rename {fbreader => reader}/src/formats/rtf/RtfDescriptionReader.h (100%) rename {fbreader => reader}/src/formats/rtf/RtfPlugin.cpp (100%) rename {fbreader => reader}/src/formats/rtf/RtfPlugin.h (100%) rename {fbreader => reader}/src/formats/rtf/RtfReader.cpp (100%) rename {fbreader => reader}/src/formats/rtf/RtfReader.h (100%) rename {fbreader => reader}/src/formats/rtf/RtfReaderStream.cpp (100%) rename {fbreader => reader}/src/formats/rtf/RtfReaderStream.h (100%) rename {fbreader => reader}/src/formats/tcr/PPLBookReader.cpp (100%) rename {fbreader => reader}/src/formats/tcr/PPLBookReader.h (100%) rename {fbreader => reader}/src/formats/tcr/TcrPlugin.cpp (100%) rename {fbreader => reader}/src/formats/tcr/TcrPlugin.h (100%) rename {fbreader => reader}/src/formats/tcr/TcrStream.cpp (100%) rename {fbreader => reader}/src/formats/tcr/TcrStream.h (100%) rename {fbreader => reader}/src/formats/txt/PlainTextFormat.cpp (100%) rename {fbreader => reader}/src/formats/txt/PlainTextFormat.h (100%) rename {fbreader => reader}/src/formats/txt/TxtBookReader.cpp (100%) rename {fbreader => reader}/src/formats/txt/TxtBookReader.h (100%) rename {fbreader => reader}/src/formats/txt/TxtPlugin.cpp (100%) rename {fbreader => reader}/src/formats/txt/TxtPlugin.h (100%) rename {fbreader => reader}/src/formats/txt/TxtReader.cpp (100%) rename {fbreader => reader}/src/formats/txt/TxtReader.h (100%) rename {fbreader => reader}/src/formats/util/EntityFilesCollector.cpp (100%) rename {fbreader => reader}/src/formats/util/EntityFilesCollector.h (100%) rename {fbreader => reader}/src/formats/util/MergedStream.cpp (100%) rename {fbreader => reader}/src/formats/util/MergedStream.h (100%) rename {fbreader => reader}/src/formats/util/MiscUtil.cpp (100%) rename {fbreader => reader}/src/formats/util/MiscUtil.h (100%) rename {fbreader => reader}/src/formats/util/TextFormatDetector.cpp (100%) rename {fbreader => reader}/src/formats/util/TextFormatDetector.h (100%) rename {fbreader => reader}/src/formats/util/XMLTextStream.cpp (100%) rename {fbreader => reader}/src/formats/util/XMLTextStream.h (100%) rename {fbreader => reader}/src/formats/xhtml/XHTMLReader.cpp (100%) rename {fbreader => reader}/src/formats/xhtml/XHTMLReader.h (100%) rename {fbreader => reader}/src/library/Author.cpp (100%) rename {fbreader => reader}/src/library/Author.h (100%) rename {fbreader => reader}/src/library/Book.cpp (100%) rename {fbreader => reader}/src/library/Book.h (100%) rename {fbreader => reader}/src/library/Comparators.cpp (100%) rename {fbreader => reader}/src/library/Library.cpp (100%) rename {fbreader => reader}/src/library/Library.h (100%) rename {fbreader => reader}/src/library/Lists.h (100%) rename {fbreader => reader}/src/library/Number.cpp (100%) rename {fbreader => reader}/src/library/Number.h (100%) rename {fbreader => reader}/src/library/Tag.cpp (100%) rename {fbreader => reader}/src/library/Tag.h (100%) rename {fbreader => reader}/src/libraryActions/AuthorInfoDialog.cpp (100%) rename {fbreader => reader}/src/libraryActions/AuthorInfoDialog.h (100%) rename {fbreader => reader}/src/libraryActions/BooksUtil.cpp (97%) rename {fbreader => reader}/src/libraryActions/BooksUtil.h (100%) rename {fbreader => reader}/src/libraryActions/LibraryAuthorActions.cpp (94%) rename {fbreader => reader}/src/libraryActions/LibraryAuthorActions.h (100%) rename {fbreader => reader}/src/libraryActions/LibraryBookActions.cpp (94%) rename {fbreader => reader}/src/libraryActions/LibraryBookActions.h (100%) rename {fbreader => reader}/src/libraryActions/LibraryTagActions.cpp (100%) rename {fbreader => reader}/src/libraryActions/LibraryTagActions.h (100%) rename {fbreader => reader}/src/libraryTree/AuthorNode.cpp (91%) rename {fbreader => reader}/src/libraryTree/BookNode.cpp (88%) rename {fbreader => reader}/src/libraryTree/LibraryByAuthorView.cpp (96%) rename {fbreader => reader}/src/libraryTree/LibraryByTagView.cpp (100%) rename {fbreader => reader}/src/libraryTree/LibraryNodes.h (93%) rename {fbreader => reader}/src/libraryTree/LibraryView.cpp (100%) rename {fbreader => reader}/src/libraryTree/LibraryView.h (100%) rename {fbreader => reader}/src/libraryTree/SeriesNode.cpp (88%) rename {fbreader => reader}/src/libraryTree/TagNode.cpp (89%) rename {fbreader => reader}/src/migration/BookInfo.cpp (100%) rename {fbreader => reader}/src/migration/BookInfo.h (100%) rename {fbreader => reader}/src/migration/FB2MigrationReader.cpp (100%) rename {fbreader => reader}/src/migration/FB2MigrationReader.h (100%) rename {fbreader => reader}/src/migration/HtmlDCTagsReader.cpp (100%) rename {fbreader => reader}/src/migration/HtmlDCTagsReader.h (100%) rename {fbreader => reader}/src/migration/Migration.cpp (98%) rename {fbreader => reader}/src/migration/Migration.h (100%) rename {fbreader => reader}/src/migration/Migration_0_10_4.cpp (100%) rename {fbreader => reader}/src/migration/Migration_0_11_0.cpp (99%) rename {fbreader => reader}/src/migration/Migration_0_8_11.cpp (99%) rename {fbreader => reader}/src/migration/Migration_0_8_13.cpp (100%) rename {fbreader => reader}/src/migration/Migration_0_8_16.cpp (100%) rename {fbreader => reader}/src/migration/Migration_0_99_0.cpp (100%) rename {fbreader => reader}/src/migration/Migration_0_99_1.cpp (96%) rename {fbreader => reader}/src/migration/OEBMigrationReader.cpp (100%) rename {fbreader => reader}/src/migration/OEBMigrationReader.h (100%) rename {fbreader => reader}/src/migration/migrate.cpp (94%) rename {fbreader => reader}/src/migration/migrate.h (100%) rename {fbreader => reader}/src/network/BookReference.cpp (100%) rename {fbreader => reader}/src/network/BookReference.h (100%) rename {fbreader => reader}/src/network/NetworkBookCollection.cpp (100%) rename {fbreader => reader}/src/network/NetworkBookCollection.h (100%) rename {fbreader => reader}/src/network/NetworkBookItem.cpp (100%) rename {fbreader => reader}/src/network/NetworkCatalogItem.cpp (100%) rename {fbreader => reader}/src/network/NetworkComparators.cpp (100%) rename {fbreader => reader}/src/network/NetworkComparators.h (100%) rename {fbreader => reader}/src/network/NetworkErrors.cpp (100%) rename {fbreader => reader}/src/network/NetworkErrors.h (100%) rename {fbreader => reader}/src/network/NetworkItem.cpp (100%) rename {fbreader => reader}/src/network/NetworkItems.h (100%) rename {fbreader => reader}/src/network/NetworkLink.cpp (100%) rename {fbreader => reader}/src/network/NetworkLink.h (100%) rename {fbreader => reader}/src/network/NetworkLinkCollection.cpp (99%) rename {fbreader => reader}/src/network/NetworkLinkCollection.h (100%) rename {fbreader => reader}/src/network/NetworkOperationData.cpp (100%) rename {fbreader => reader}/src/network/NetworkOperationData.h (100%) rename {fbreader => reader}/src/network/SearchResult.cpp (100%) rename {fbreader => reader}/src/network/SearchResult.h (100%) rename {fbreader => reader}/src/network/UserList.cpp (100%) rename {fbreader => reader}/src/network/UserList.h (100%) rename {fbreader => reader}/src/network/atom/ATOMConstructs.cpp (100%) rename {fbreader => reader}/src/network/atom/ATOMConstructs.h (100%) rename {fbreader => reader}/src/network/atom/ATOMContainers.cpp (100%) rename {fbreader => reader}/src/network/atom/ATOMContainers.h (100%) rename {fbreader => reader}/src/network/atom/ATOMMetadata.cpp (100%) rename {fbreader => reader}/src/network/atom/ATOMMetadata.h (100%) rename {fbreader => reader}/src/network/authentication/NetworkAuthenticationManager.cpp (100%) rename {fbreader => reader}/src/network/authentication/NetworkAuthenticationManager.h (100%) rename {fbreader => reader}/src/network/authentication/litres/LitResAuthenticationDataParser.cpp (100%) rename {fbreader => reader}/src/network/authentication/litres/LitResAuthenticationDataParser.h (100%) rename {fbreader => reader}/src/network/authentication/litres/LitResAuthenticationManager.cpp (100%) rename {fbreader => reader}/src/network/authentication/litres/LitResAuthenticationManager.h (100%) rename {fbreader => reader}/src/network/litres/LitResAuthorsItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResAuthorsItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResAuthorsParser.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResAuthorsParser.h (100%) rename {fbreader => reader}/src/network/litres/LitResBookItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResBookItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResBooksFeedItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResBooksFeedItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResBooksFeedParser.cpp (99%) rename {fbreader => reader}/src/network/litres/LitResBooksFeedParser.h (100%) rename {fbreader => reader}/src/network/litres/LitResBookshelfItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResBookshelfItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResByGenresItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResByGenresItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResGenre.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResGenre.h (100%) rename {fbreader => reader}/src/network/litres/LitResGenresParser.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResGenresParser.h (100%) rename {fbreader => reader}/src/network/litres/LitResRecommendationsItem.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResRecommendationsItem.h (100%) rename {fbreader => reader}/src/network/litres/LitResUtil.cpp (100%) rename {fbreader => reader}/src/network/litres/LitResUtil.h (100%) rename {fbreader => reader}/src/network/litres/SortedCatalogItem.cpp (100%) rename {fbreader => reader}/src/network/litres/SortedCatalogItem.h (100%) rename {fbreader => reader}/src/network/opds/NetworkOPDSFeedReader.cpp (100%) rename {fbreader => reader}/src/network/opds/NetworkOPDSFeedReader.h (100%) rename {fbreader => reader}/src/network/opds/OPDSBookItem.cpp (100%) rename {fbreader => reader}/src/network/opds/OPDSBookItem.h (100%) rename {fbreader => reader}/src/network/opds/OPDSCatalogItem.cpp (100%) rename {fbreader => reader}/src/network/opds/OPDSCatalogItem.h (100%) rename {fbreader => reader}/src/network/opds/OPDSFeedReader.h (100%) rename {fbreader => reader}/src/network/opds/OPDSLink.cpp (100%) rename {fbreader => reader}/src/network/opds/OPDSLink.h (100%) rename {fbreader => reader}/src/network/opds/OPDSLink_AdvancedSearch.h (100%) rename {fbreader => reader}/src/network/opds/OPDSLink_GenericFeedReader.cpp (100%) rename {fbreader => reader}/src/network/opds/OPDSLink_GenericFeedReader.h (100%) rename {fbreader => reader}/src/network/opds/OPDSLink_GenericXMLParser.cpp (83%) rename {fbreader => reader}/src/network/opds/OPDSLink_GenericXMLParser.h (100%) rename {fbreader => reader}/src/network/opds/OPDSMetadata.cpp (100%) rename {fbreader => reader}/src/network/opds/OPDSMetadata.h (100%) rename {fbreader => reader}/src/network/opds/OPDSXMLParser.cpp (98%) rename {fbreader => reader}/src/network/opds/OPDSXMLParser.h (100%) rename {fbreader => reader}/src/network/opds/OpenSearchXMLReader.cpp (100%) rename {fbreader => reader}/src/network/opds/OpenSearchXMLReader.h (100%) rename {fbreader => reader}/src/network/opds/URLRewritingRule.cpp (100%) rename {fbreader => reader}/src/network/opds/URLRewritingRule.h (100%) rename {fbreader => reader}/src/network/tree/NetworkAuthorTree.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkBookTree.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkCatalogRootTree.cpp (97%) rename {fbreader => reader}/src/network/tree/NetworkCatalogTree.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkCatalogUtil.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkCatalogUtil.h (100%) rename {fbreader => reader}/src/network/tree/NetworkLibrary.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkLibrary.h (100%) rename {fbreader => reader}/src/network/tree/NetworkSearcher.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkSearcher.h (100%) rename {fbreader => reader}/src/network/tree/NetworkSeriesTree.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkTree.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkTreeFactory.cpp (100%) rename {fbreader => reader}/src/network/tree/NetworkTreeFactory.h (100%) rename {fbreader => reader}/src/network/tree/NetworkTreeNodes.h (100%) rename {fbreader => reader}/src/network/tree/RootTree.cpp (100%) rename {fbreader => reader}/src/network/tree/SearchCatalogTree.cpp (100%) rename {fbreader => reader}/src/networkActions/AuthenticationDialog.cpp (100%) rename {fbreader => reader}/src/networkActions/AuthenticationDialog.h (100%) rename {fbreader => reader}/src/networkActions/AuthenticationDialogManager.cpp (100%) rename {fbreader => reader}/src/networkActions/AuthenticationDialogManager.h (100%) rename {fbreader => reader}/src/networkActions/NetworkActions.cpp (94%) rename {fbreader => reader}/src/networkActions/NetworkActions.h (100%) rename {fbreader => reader}/src/networkActions/NetworkOperationRunnable.cpp (100%) rename {fbreader => reader}/src/networkActions/NetworkOperationRunnable.h (100%) rename {fbreader => reader}/src/networkActions/PasswordRecoveryDialog.cpp (98%) rename {fbreader => reader}/src/networkActions/PasswordRecoveryDialog.h (100%) rename {fbreader => reader}/src/networkActions/RegisterUserDialog.cpp (99%) rename {fbreader => reader}/src/networkActions/RegisterUserDialog.h (100%) rename {fbreader => reader}/src/options/FBCategoryKey.cpp (100%) rename {fbreader => reader}/src/options/FBCategoryKey.h (100%) rename {fbreader => reader}/src/options/FBOptions.cpp (100%) rename {fbreader => reader}/src/options/FBOptions.h (100%) rename {fbreader => reader}/src/options/FBTextStyle.cpp (100%) rename {fbreader => reader}/src/options/FBTextStyle.h (100%) rename {fbreader => reader}/src/optionsDialog/AbstractOptionsDialog.cpp (87%) rename {fbreader => reader}/src/optionsDialog/AbstractOptionsDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/IntegrationTab.cpp (100%) rename {fbreader => reader}/src/optionsDialog/bookInfo/BookInfoDialog.cpp (100%) rename {fbreader => reader}/src/optionsDialog/bookInfo/BookInfoDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/library/LibraryOptionsDialog.cpp (97%) rename {fbreader => reader}/src/optionsDialog/library/LibraryOptionsDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/FormatOptionsPage.h (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp (95%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/OptionsPage.cpp (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/OptionsPage.h (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp (100%) rename {fbreader => reader}/src/optionsDialog/lookAndFeel/StyleOptionsPage.h (100%) rename {fbreader => reader}/src/optionsDialog/network/NetworkOptionsDialog.cpp (94%) rename {fbreader => reader}/src/optionsDialog/network/NetworkOptionsDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/reading/IndicatorTab.cpp (96%) rename {fbreader => reader}/src/optionsDialog/reading/KeyBindingsTab.cpp (92%) rename {fbreader => reader}/src/optionsDialog/reading/ReadingOptionsDialog.cpp (89%) rename {fbreader => reader}/src/optionsDialog/reading/ReadingOptionsDialog.h (100%) rename {fbreader => reader}/src/optionsDialog/system/SystemOptionsDialog.cpp (86%) rename {fbreader => reader}/src/optionsDialog/system/SystemOptionsDialog.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/AddBookAction.cpp (94%) rename {fbreader/src/fbreader => reader/src/reader}/BookTextView.cpp (94%) rename {fbreader/src/fbreader => reader/src/reader}/BookTextView.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/BooksOrderAction.cpp (82%) rename {fbreader/src/fbreader => reader/src/reader}/ContentsView.cpp (88%) rename {fbreader/src/fbreader => reader/src/reader}/ContentsView.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/FootnoteView.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/PreferencesPopupData.cpp (91%) rename {fbreader/src/fbreader => reader/src/reader}/PreferencesPopupData.h (100%) rename fbreader/src/fbreader/FBReader.cpp => reader/src/reader/Reader.cpp (85%) rename fbreader/src/fbreader/FBReader.h => reader/src/reader/Reader.h (96%) rename fbreader/src/fbreader/FBReaderActionCode.cpp => reader/src/reader/ReaderActionCode.cpp (99%) rename fbreader/src/fbreader/FBReaderActions.cpp => reader/src/reader/ReaderActions.cpp (60%) rename fbreader/src/fbreader/FBReaderActions.h => reader/src/reader/ReaderActions.h (97%) rename {fbreader/src/fbreader => reader/src/reader}/ReadingState.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/RecentBooksPopupData.cpp (91%) rename {fbreader/src/fbreader => reader/src/reader}/RecentBooksPopupData.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/ScrollingAction.cpp (81%) rename {fbreader/src/fbreader => reader/src/reader}/ScrollingAction.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/SearchActions.cpp (91%) rename {fbreader/src/fbreader => reader/src/reader}/SearchOnNetworkAction.cpp (96%) rename {fbreader/src/fbreader => reader/src/reader}/TimeUpdater.cpp (100%) rename {fbreader/src/fbreader => reader/src/reader}/TimeUpdater.h (100%) rename fbreader/src/fbreader/FBView.cpp => reader/src/reader/View.cpp (95%) rename fbreader/src/fbreader/FBView.h => reader/src/reader/View.h (100%) rename {fbreader/src/fbreader => reader/src/reader}/main.cpp (91%) rename {fbreader => reader}/src/tree/FBTree.cpp (100%) rename {fbreader => reader}/src/tree/FBTree.h (100%) diff --git a/fbreader/data/formats/fb2/FBReaderVersion.ent b/fbreader/data/formats/fb2/FBReaderVersion.ent deleted file mode 100644 index c4b13fc..0000000 --- a/fbreader/data/formats/fb2/FBReaderVersion.ent +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fbreader/LICENSE b/reader/LICENSE similarity index 100% rename from fbreader/LICENSE rename to reader/LICENSE diff --git a/fbreader/data/default/config.desktop.xml b/reader/data/default/config.desktop.xml similarity index 100% rename from fbreader/data/default/config.desktop.xml rename to reader/data/default/config.desktop.xml diff --git a/fbreader/data/default/external.desktop.xml b/reader/data/default/external.desktop.xml similarity index 100% rename from fbreader/data/default/external.desktop.xml rename to reader/data/default/external.desktop.xml diff --git a/fbreader/data/default/fullscreen_toolbar.desktop.xml b/reader/data/default/fullscreen_toolbar.desktop.xml similarity index 100% rename from fbreader/data/default/fullscreen_toolbar.desktop.xml rename to reader/data/default/fullscreen_toolbar.desktop.xml diff --git a/fbreader/data/default/keymap.desktop.xml b/reader/data/default/keymap.desktop.xml similarity index 100% rename from fbreader/data/default/keymap.desktop.xml rename to reader/data/default/keymap.desktop.xml diff --git a/fbreader/data/default/menubar.xml b/reader/data/default/menubar.xml similarity index 100% rename from fbreader/data/default/menubar.xml rename to reader/data/default/menubar.xml diff --git a/fbreader/data/default/styles.desktop.xml b/reader/data/default/styles.desktop.xml similarity index 100% rename from fbreader/data/default/styles.desktop.xml rename to reader/data/default/styles.desktop.xml diff --git a/fbreader/data/default/toolbar.desktop.xml b/reader/data/default/toolbar.desktop.xml similarity index 100% rename from fbreader/data/default/toolbar.desktop.xml rename to reader/data/default/toolbar.desktop.xml diff --git a/fbreader/data/default/toolbar.full.xml b/reader/data/default/toolbar.full.xml similarity index 100% rename from fbreader/data/default/toolbar.full.xml rename to reader/data/default/toolbar.full.xml diff --git a/fbreader/data/default/toolbar.short.xml b/reader/data/default/toolbar.short.xml similarity index 100% rename from fbreader/data/default/toolbar.short.xml rename to reader/data/default/toolbar.short.xml diff --git a/reader/data/formats/fb2/ReaderVersion.ent b/reader/data/formats/fb2/ReaderVersion.ent new file mode 100644 index 0000000..5475a8e --- /dev/null +++ b/reader/data/formats/fb2/ReaderVersion.ent @@ -0,0 +1 @@ + diff --git a/fbreader/data/formats/fb2/fb2genres.xml b/reader/data/formats/fb2/fb2genres.xml similarity index 100% rename from fbreader/data/formats/fb2/fb2genres.xml rename to reader/data/formats/fb2/fb2genres.xml diff --git a/fbreader/data/formats/html/html.ent b/reader/data/formats/html/html.ent similarity index 100% rename from fbreader/data/formats/html/html.ent rename to reader/data/formats/html/html.ent diff --git a/fbreader/data/help/MiniHelp.desktop.bg.fb2 b/reader/data/help/MiniHelp.desktop.bg.fb2 similarity index 85% rename from fbreader/data/help/MiniHelp.desktop.bg.fb2 rename to reader/data/help/MiniHelp.desktop.bg.fb2 index 52dcfa8..12d046c 100644 --- a/fbreader/data/help/MiniHelp.desktop.bg.fb2 +++ b/reader/data/help/MiniHelp.desktop.bg.fb2 @@ -1,20 +1,20 @@ -FBReader Относно FBReader bg +Reader Относно Reader bg -<p>Относно FBReader &FBReaderVersion;</p> -

FBReader е програма за четене на електронни книги на PDA/UMPC/PC и операционни системи Linux и Windows XP. FBReader поддържа няколко формата за електронни книги: ePub, fb2, chm, rtf, plucker, и други. Поддържа също и директно четене от следните архиви: zip, tar, gzip и bzip2.

-

FBReader се разпространява свободно под лицензa GNU GPL.

+<p>Относно Reader &ReaderVersion;</p> +

Reader е програма за четене на електронни книги на PDA/UMPC/PC и операционни системи Linux и Windows XP. Reader поддържа няколко формата за електронни книги: ePub, fb2, chm, rtf, plucker, и други. Поддържа също и директно четене от следните архиви: zip, tar, gzip и bzip2.

+

Reader се разпространява свободно под лицензa GNU GPL.

Ако харесвате програмата и бихте желали да подкрепите нейното развитие, моля направете дарение.

Как да започнете

 -

FBReader следи за книги във формат ePub, fb2 и OpenReader в папките, зададени в настойките на Папка за съхранение на книгите. Първо трябва да настроите тези папки. Отворете настройките (просто кликнете на в лентата с инструменти) и променете пътя в настройката Папка за съхранение на книгите в раздела Библиотека. Тази настройка съдържа списъка с папки съдржащи *.epub, *.fb2, *.orb или файлове архиви. Папките в списъка са разделени с двоеточия.

+

Reader следи за книги във формат ePub, fb2 и OpenReader в папките, зададени в настойките на Папка за съхранение на книгите. Първо трябва да настроите тези папки. Отворете настройките (просто кликнете на в лентата с инструменти) и променете пътя в настройката Папка за съхранение на книгите в раздела Библиотека. Тази настройка съдържа списъка с папки съдржащи *.epub, *.fb2, *.orb или файлове архиви. Папките в списъка са разделени с двоеточия.

Отворете Библиотека (кликнете на ), изберете книга от списъка и започнете да четете.

За да четете файл в друг формат, трябва го добавите в библиотеката. Кликнете на Добавяне на файл в библиотеката (), изберете файл и редактирайте информацията на файла. Следващия път може да отворите този файл използвайки Библиотека ().

Свързани сайтове

 -

Повече информация за тази програма може да намерите на домашната страница на FBReader.

-

Ако желаете да бъдете уведомявани за нови версии, моля абонирайте се на проекта FBReader на freshmeat.

-

Ако имате някакви въпроси или предложения, моля използвайте групата на FBReader в googlegroups.

+

Повече информация за тази програма може да намерите на домашната страница на Reader.

+

Ако желаете да бъдете уведомявани за нови версии, моля абонирайте се на проекта Reader на freshmeat.

+

Ако имате някакви въпроси или предложения, моля използвайте групата на Reader в googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ @@ -193,4 +193,4 @@ jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit QmCC ==== - \ No newline at end of file + diff --git a/fbreader/data/help/MiniHelp.desktop.cs.fb2 b/reader/data/help/MiniHelp.desktop.cs.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.cs.fb2 rename to reader/data/help/MiniHelp.desktop.cs.fb2 index 78a3256..ab246e2 100644 --- a/fbreader/data/help/MiniHelp.desktop.cs.fb2 +++ b/reader/data/help/MiniHelp.desktop.cs.fb2 @@ -1,21 +1,21 @@ -FBReader About programu FBReader cs +Reader About programu Reader cs -<p>O programu FBReader &FBReaderVersion;</p> -

FBReader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. FBReader podporuje následující formáty: ePub, fb2, chm, rtf, plucker, atd. Zvládne též přímé čtení archivů zip, tar, gzip and bzip2.

-

FBReader je šířen pod licencí GNU GPL.

+<p>O programu Reader &ReaderVersion;</p> +

Reader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. Reader podporuje následující formáty: ePub, fb2, chm, rtf, plucker, atd. Zvládne též přímé čtení archivů zip, tar, gzip and bzip2.

+

Reader je šířen pod licencí GNU GPL.

Máte-li zájem o tento program a chcete-li podpořit jeho vývoj, navštivte prosím stránku příspěvků.

Jak začít

 -

FBReader hledá knihy ve formátech ePub, fb2 a OpenReader v cestě zadaných v parametru Složka s knihami. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku v panelu nástrojů) a změňte hodnotu parametru Složka s knihami v záložce Knihovna. Uvedený parametr obsahuje seznam adresářů se soubory *.epub, *.fb2, *.orb nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.

+

Reader hledá knihy ve formátech ePub, fb2 a OpenReader v cestě zadaných v parametru Složka s knihami. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku v panelu nástrojů) a změňte hodnotu parametru Složka s knihami v záložce Knihovna. Uvedený parametr obsahuje seznam adresářů se soubory *.epub, *.fb2, *.orb nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.

Otevřete knihovnu (kliknutím na ), vyberte knihu, kterou chcete číst ze seznamu.

Pro čtení souboru v jiném formátu je nezbytné jeho zařazení do knihovny. Začněte vložením knihy do knihovny. (). Vyberte soubor s knihou a založte informace (metadata), které ji charakterizují. Po zařazení už soubor otevírejte výhradně pomocí knihovny ().

Odkazy

 -

Více informací o programu najdete na Domovské stránce programu FBReader.

-

Pro upozornění na nové verze se prosím přihlaste FBReader projekt na freshmeatu.

-

Pro vaše otázky a návrhy použijte prosím skupinu věnovanou programu FBReader na googlegroups.

+

Více informací o programu najdete na Domovské stránce programu Reader.

+

Pro upozornění na nové verze se prosím přihlaste Reader projekt na freshmeatu.

+

Pro vaše otázky a návrhy použijte prosím skupinu věnovanou programu Reader na googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.de.fb2 b/reader/data/help/MiniHelp.desktop.de.fb2 similarity index 87% rename from fbreader/data/help/MiniHelp.desktop.de.fb2 rename to reader/data/help/MiniHelp.desktop.de.fb2 index e881c90..07852f1 100644 --- a/fbreader/data/help/MiniHelp.desktop.de.fb2 +++ b/reader/data/help/MiniHelp.desktop.de.fb2 @@ -1,20 +1,20 @@ -FBReader Über FBReader de +Reader Über Reader de -<p>Über FBReader &FBReaderVersion;</p> -

FBReader ist ein Leseprogramm für E-Books für Linux/Windows XP bzw PDA/UMPC/Desktop Computer. FBReader unterstützt verschiedene Formate: ePub, fb2, chm, rtf, plucker, usw. Er kann diese auch direkt aus zip, tar, gzip und bzip2 - Archiven lesen.

-

FBReader wird unter den Bedingungen der GNU GPL vertrieben.

+<p>Über Reader &ReaderVersion;</p> +

Reader ist ein Leseprogramm für E-Books für Linux/Windows XP bzw PDA/UMPC/Desktop Computer. Reader unterstützt verschiedene Formate: ePub, fb2, chm, rtf, plucker, usw. Er kann diese auch direkt aus zip, tar, gzip und bzip2 - Archiven lesen.

+

Reader wird unter den Bedingungen der GNU GPL vertrieben.

Wenn Sie das Programm mögen und die Weiterentwicklung unterstützen wollen, besuchen Sie bitte die Make Donation - Seite.

Die ersten Schritte

 -

FBReader sucht im E-Book Verzeichnis nach ePub, fb2 und OpenReader Büchern. Zuerst müssen Sie daher diesen Pfad setzen. Öffnen Sie dazu die Einstellungen (einfach auf in der Symbolleiste klicken) und ändern Sie den Inhalt der Option E-Book Verzeichnis, die sich im Reiter Bibliothek befindet. Es können mehrere Verzeichnisse eingetragen werden, die *.epub, *.fb2, *.orb oder Archivdateien enthalten, getrennt durch Colons.

+

Reader sucht im E-Book Verzeichnis nach ePub, fb2 und OpenReader Büchern. Zuerst müssen Sie daher diesen Pfad setzen. Öffnen Sie dazu die Einstellungen (einfach auf in der Symbolleiste klicken) und ändern Sie den Inhalt der Option E-Book Verzeichnis, die sich im Reiter Bibliothek befindet. Es können mehrere Verzeichnisse eingetragen werden, die *.epub, *.fb2, *.orb oder Archivdateien enthalten, getrennt durch Colons.

Öffnen Sie nun die Bibliothek (auf klicken), wählen Sie ein Buch aus der Liste aus und schon können Sie es lesen.

Um eine Datei in einem anderen Format zu lesen, müssen Sie diese der Bibliothek hinzufügen. Öffnen Sie Datei zur Bibliothek hinzufügen (), wählen Sie eine Datei aus und editieren Sie die Datei-Informationen. Beim nächsten Mal können Sie diese Datei einfach in der Bibliothek () öffnen.

Verwandte Internetseiten

 -

Weitere Informationen über dieses Programm finden Sie auf der FBReader Homepage.

-

Wenn Sie über neue Releases informiert werden wollen, tragen Sie sich bitte bei FBReader project at freshmeat ein.

-

Falls Sie Fragen oder Anregungen haben, benutzen Sie bitte die FBReader group at googlegroups.

+

Weitere Informationen über dieses Programm finden Sie auf der Reader Homepage.

+

Wenn Sie über neue Releases informiert werden wollen, tragen Sie sich bitte bei Reader project at freshmeat ein.

+

Falls Sie Fragen oder Anregungen haben, benutzen Sie bitte die Reader group at googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.en.fb2 b/reader/data/help/MiniHelp.desktop.en.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.en.fb2 rename to reader/data/help/MiniHelp.desktop.en.fb2 index 902a662..841ed12 100644 --- a/fbreader/data/help/MiniHelp.desktop.en.fb2 +++ b/reader/data/help/MiniHelp.desktop.en.fb2 @@ -1,20 +1,20 @@ -FBReader About FBReader en +Reader About Reader en -<p>About FBReader &FBReaderVersion;</p> -

FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: ePub, fb2, chm, rtf, plucker, etc. Direct reading from zip, tar, gzip and bzip2 archives is also supported.

-

FBReader is distributed under the terms of the GNU GPL.

+<p>About Reader &ReaderVersion;</p> +

Reader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. Reader supports several e-book formats: ePub, fb2, chm, rtf, plucker, etc. Direct reading from zip, tar, gzip and bzip2 archives is also supported.

+

Reader is distributed under the terms of the GNU GPL.

If you like the program and would like to support its development, please visit make donation page.

How To Start

 -

FBReader looks for ePub, fb2 and OpenReader books in directories listed in the Book Path option. First of all you need to set this path. Open the options dialog (just click on in the toolbar) and change the value of Book Path option in the Library tab. This option contains the list of directories containing *.epub, *.fb2, *.orb or archive files. Directories in the list are separated by colons.

+

Reader looks for ePub, fb2 and OpenReader books in directories listed in the Book Path option. First of all you need to set this path. Open the options dialog (just click on in the toolbar) and change the value of Book Path option in the Library tab. This option contains the list of directories containing *.epub, *.fb2, *.orb or archive files. Directories in the list are separated by colons.

Open library (click on ), select a book from the list and read it.

To read a file in another format, you need to add it to the library. Start add to library dialog (), select a file and edit the file information. Next time you can open this file using library ().

Related sites

 -

More information about this program can be found at FBReader homepage.

-

If you want to be notified about new releases, please subscribe to FBReader project at freshmeat.

-

If you have any questions or suggestions, please use FBReader group at googlegroups.

+

More information about this program can be found at Reader homepage.

+

If you want to be notified about new releases, please subscribe to Reader project at freshmeat.

+

If you have any questions or suggestions, please use Reader group at googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.es.fb2 b/reader/data/help/MiniHelp.desktop.es.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.es.fb2 rename to reader/data/help/MiniHelp.desktop.es.fb2 index e9129a1..b1f5046 100644 --- a/fbreader/data/help/MiniHelp.desktop.es.fb2 +++ b/reader/data/help/MiniHelp.desktop.es.fb2 @@ -1,20 +1,20 @@ -FBReader Acerca de FBReader es +Reader Acerca de Reader es -<p>Acerca de FBReader &FBReaderVersion;</p> -

FBReader es un lector de libros electrónicos para Linux/Windows PDA/UMPC/PC. FBReader soporta varios formatos: ePub, fb2, chm, rtf, plucker, etc. También puede leer directamente archivos comprimidos en formato zip, tar, gzip y bzip2 .

-

FBReader es distribuido bajo los términos de la Licencia Pública General de GNU.

+<p>Acerca de Reader &ReaderVersion;</p> +

Reader es un lector de libros electrónicos para Linux/Windows PDA/UMPC/PC. Reader soporta varios formatos: ePub, fb2, chm, rtf, plucker, etc. También puede leer directamente archivos comprimidos en formato zip, tar, gzip y bzip2 .

+

Reader es distribuido bajo los términos de la Licencia Pública General de GNU.

Si le gusta el programa y desea apoyar su desarrollo, por favor visite nuestra página de donaciones.

Cómo empezar

 -

FBReader reconoce automáticamente los archivos ePub, fb2 y OpenReader que estén en los Directorios de Libros. La ubicación de estos Directorios se puede modificar en el diálogo de Preferencias. (Haciendo click en , en la barra de herramientas). Allí hay que dirigirse a la solapa Biblioteca e indicar la ubicación de los Directorios. Esta opción debe tener la lista de Directorios (separados por punto y coma) que contienen los archivos *.epub, *.fb2, *.orb etc.

+

Reader reconoce automáticamente los archivos ePub, fb2 y OpenReader que estén en los Directorios de Libros. La ubicación de estos Directorios se puede modificar en el diálogo de Preferencias. (Haciendo click en , en la barra de herramientas). Allí hay que dirigirse a la solapa Biblioteca e indicar la ubicación de los Directorios. Esta opción debe tener la lista de Directorios (separados por punto y coma) que contienen los archivos *.epub, *.fb2, *.orb etc.

Luego puede abrir la Biblioteca (haciendo click en ) y seleccionar el Libro de su preferencia.

Para leer un archivo de otro formato, primero es necesario agregarlo a la Biblioteca. Hay que entrar en la opción Añadir Libro a la Biblioteca (), seleccionar el archivo e ingresar la información del Libro. La próxima vez que inicie el programa puede leerlo directamente desde la Biblioteca ().

Sitios relacionados

 -

Para mayor información sobre este programa puede dirigirse a la Página principal de FBReader.

-

Si desea ser notificado sobre los nuevos lanzamientos, puede suscribirse al Proyecto de FBReader en freshmeat.

-

Si quiere realizar cualquier pregunta o sugerencia, por favor use el Grupo de FBReader en Googlegroups.

+

Para mayor información sobre este programa puede dirigirse a la Página principal de Reader.

+

Si desea ser notificado sobre los nuevos lanzamientos, puede suscribirse al Proyecto de Reader en freshmeat.

+

Si quiere realizar cualquier pregunta o sugerencia, por favor use el Grupo de Reader en Googlegroups.

diff --git a/fbreader/data/help/MiniHelp.desktop.fi.fb2 b/reader/data/help/MiniHelp.desktop.fi.fb2 similarity index 87% rename from fbreader/data/help/MiniHelp.desktop.fi.fb2 rename to reader/data/help/MiniHelp.desktop.fi.fb2 index 83dd226..706f91f 100644 --- a/fbreader/data/help/MiniHelp.desktop.fi.fb2 +++ b/reader/data/help/MiniHelp.desktop.fi.fb2 @@ -1,19 +1,19 @@ -FBReader Tietoja FBReaderista fi +Reader Tietoja Readerista fi -<p>Tietoja FBReaderista &FBReaderVersion;</p> -

FBReader on sähköisten kirjojen (e-kirja) lukemiseen tarkoitettu ohjelmisto Linux, Windows XP, PDA ja UMPC -tietokoneille. FBReader tukee mm. seuraavia e-kirjojen tiedostomuotoja: ePub, fb2, chm, rtf, plucker. Kirjojen lukeminen onnistuu suoraan myös zip, tar, gzip ja bzip2-muotoihin pakatuista tiedostoista.

-

FBReader ohjelmistoa levitetään GNU GPL-lisenssin mukaisilla ehdoilla.

+<p>Tietoja Readerista &ReaderVersion;</p> +

Reader on sähköisten kirjojen (e-kirja) lukemiseen tarkoitettu ohjelmisto Linux, Windows XP, PDA ja UMPC -tietokoneille. Reader tukee mm. seuraavia e-kirjojen tiedostomuotoja: ePub, fb2, chm, rtf, plucker. Kirjojen lukeminen onnistuu suoraan myös zip, tar, gzip ja bzip2-muotoihin pakatuista tiedostoista.

+

Reader ohjelmistoa levitetään GNU GPL-lisenssin mukaisilla ehdoilla.

Aloitusohje

 -

FBReader etsii ePub, fb2 ja OpenReader-muodossa olevia kirjoja asetusten Kirjaston hakemisto-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin -kuvakkeesta) ja muuta Kirjasto-välilehdellä olevaa Kirjaston hakemisto-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät *.epub, *.fb2, *.orb tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.

+

Reader etsii ePub, fb2 ja OpenReader-muodossa olevia kirjoja asetusten Kirjaston hakemisto-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin -kuvakkeesta) ja muuta Kirjasto-välilehdellä olevaa Kirjaston hakemisto-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät *.epub, *.fb2, *.orb tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.

Avaa kirjasto (työkalupalkin -kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.

Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa lisää kirja kirjastoon-valintaikkuna (työkalupalkin -kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin kirjasto-kuvakkeen () listauksesta.

Liittyvät sivustot

 -

Tästä ohjelmasta löytyy englanniksi lisätietoja FBReaderin kotisivulta.

-

Jos haluat tiedon uusien versioiden julkaisuista, tilaa FBReader-projekti freshmeat palvelussa.

-

Jos sinulla on kysymyksiä tai ehdotuksia, käytä FBReader-ryhmää googlegroups palvelussa.

+

Tästä ohjelmasta löytyy englanniksi lisätietoja Readerin kotisivulta.

+

Jos haluat tiedon uusien versioiden julkaisuista, tilaa Reader-projekti freshmeat palvelussa.

+

Jos sinulla on kysymyksiä tai ehdotuksia, käytä Reader-ryhmää googlegroups palvelussa.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.fr.fb2 b/reader/data/help/MiniHelp.desktop.fr.fb2 similarity index 87% rename from fbreader/data/help/MiniHelp.desktop.fr.fb2 rename to reader/data/help/MiniHelp.desktop.fr.fb2 index 2f3e758..92d6395 100644 --- a/fbreader/data/help/MiniHelp.desktop.fr.fb2 +++ b/reader/data/help/MiniHelp.desktop.fr.fb2 @@ -1,19 +1,19 @@ -FBReader À propos de FBReader fr +Reader À propos de Reader fr -<p>À propos de FBReader &FBReaderVersion;</p> -

FBReader est un lecteur de livres électroniques (e-books) pour PDA, ordinateur de bureau et UMPC sous Linux ou Windows XP. FBReader supporte plusieurs formats de livres électroniques : ePub, fb2, chm, rtf, plucker, etc. La lecture directe à partir d'archives zip, tar, gzip et bzip2 est également supportée.

-

FBReader est distribué selon les termes de la licence GNU GPL.

+<p>À propos de Reader &ReaderVersion;</p> +

Reader est un lecteur de livres électroniques (e-books) pour PDA, ordinateur de bureau et UMPC sous Linux ou Windows XP. Reader supporte plusieurs formats de livres électroniques : ePub, fb2, chm, rtf, plucker, etc. La lecture directe à partir d'archives zip, tar, gzip et bzip2 est également supportée.

+

Reader est distribué selon les termes de la licence GNU GPL.

-

Débuts avec FBReader

 -

FBReader cherche des livres aux formats ePub, fb2 et OpenReader dans les répertoires indiqués dans l'option Chemin des livres. La première chose à faire est de remplir ce chemin. Ouvrez la boîte de dialogue d'options (il suffit de cliquer sur dans la barre d'outils) et changez la valeur de l'option Chemin des livres dans l'onglet Bibliothèque. Cette option contient la liste des répertoires contenant des fichiers *.epub, *.fb2, *.orb ou des fichiers archives. Les répertoires de cette liste sont séparés par des caractères deux-points.

+

Débuts avec Reader

 +

Reader cherche des livres aux formats ePub, fb2 et OpenReader dans les répertoires indiqués dans l'option Chemin des livres. La première chose à faire est de remplir ce chemin. Ouvrez la boîte de dialogue d'options (il suffit de cliquer sur dans la barre d'outils) et changez la valeur de l'option Chemin des livres dans l'onglet Bibliothèque. Cette option contient la liste des répertoires contenant des fichiers *.epub, *.fb2, *.orb ou des fichiers archives. Les répertoires de cette liste sont séparés par des caractères deux-points.

Ouvrez la bibliothèque (cliques sur ) et sélectionnez un livre de la liste afin de le lire.

Pour lire un fichier dans un autre format, vous devez l'ajouter à la bibliothèque. Ouvrez le dialogue Ajouter un livre (), sélectionnez un fichier et éditez les informations correspondantes. Dans l'avenir, vous pourrez ouvrir ce livre directement depuis la bibliothèque ().

Informations complémentaires

 -

Davantage d'informations sur ce programme se trouvent sur la page Web de FBReader.

-

Si vous souhaitez être prévenu des nouvelles versions, veuillez vous inscrire au projet FBReader de freshmeat.

-

Si vous avez des questions ou des suggestions, veuillez utiliser le groupe FBReader de googlegroups.

+

Davantage d'informations sur ce programme se trouvent sur la page Web de Reader.

+

Si vous souhaitez être prévenu des nouvelles versions, veuillez vous inscrire au projet Reader de freshmeat.

+

Si vous avez des questions ou des suggestions, veuillez utiliser le groupe Reader de googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.he.fb2 b/reader/data/help/MiniHelp.desktop.he.fb2 similarity index 91% rename from fbreader/data/help/MiniHelp.desktop.he.fb2 rename to reader/data/help/MiniHelp.desktop.he.fb2 index cb3be26..130bfc3 100644 --- a/fbreader/data/help/MiniHelp.desktop.he.fb2 +++ b/reader/data/help/MiniHelp.desktop.he.fb2 @@ -1,15 +1,15 @@ - + -FBReaderאודות FBReaderhe +Readerאודות Readerhe - <p>אודות FBReader &FBReaderVersion;</p> -

FBReader הינו תוכנה המאפשרת קריאת ספרים אלקטרוניים, ועובדת תחת מערכות הפעלה Linux, FreeBSD, Windows XP.

-

FBReader מאשפר קריאת ספרים בפורמטים רבים: ePub , fb2 , chm , rtf , plucker וכו' . ניתן לפתוח ספרים מתוך קבצי ארכיון כגון zip , tar , gzip ו-bzip2 .

+ <p>אודות Reader &ReaderVersion;</p> +

Reader הינו תוכנה המאפשרת קריאת ספרים אלקטרוניים, ועובדת תחת מערכות הפעלה Linux, FreeBSD, Windows XP.

+

Reader מאשפר קריאת ספרים בפורמטים רבים: ePub , fb2 , chm , rtf , plucker וכו' . ניתן לפתוח ספרים מתוך קבצי ארכיון כגון zip , tar , gzip ו-bzip2 .

אם אהבת את התוכנה ובא לך לתמוך בפיתוח שלה, בקר בדף תרומה ע" מ לתרום.

כיצד מתחילים

 -

FBReader אוטומטית מצרף לספריה ספרים בפורמטים ePub , fb2 ו-OpenReader אשר נמצאים בתיקיה מוגדרת בתוך שדה «נתיב הספריה» בתוך הגדרות.

+

Reader אוטומטית מצרף לספריה ספרים בפורמטים ePub , fb2 ו-OpenReader אשר נמצאים בתיקיה מוגדרת בתוך שדה «נתיב הספריה» בתוך הגדרות.

לכן לפני שמתחילים צריך להגדיר שדה זה. פתח הגדרות ( ע"י לחיצת כפתור ) וערוך שדה «נתיב הספריה» תחת «ספריה».

תיקיות בשדה הנ"ל צריכות להיות מופרדות ע"י נקודה ופסיק ולכלול קבצים עם סיומות epub ,fb2 ,orb או קבצי ארכיון עם קבצים אלה.

כעת ניתן לפתוח את הספריה (ע"י לחיצה על ), לבחור ספר ולהתחיל לקרוא.

@@ -17,9 +17,9 @@

בפעם הבאה ניתן לפתוח את הספר ע"י ספריה ().

קישורים

 -

פרטים נוספים על תוכנית זו ניתן למצוא בדף הבית של FBReader .

-

לקבלת עדכונים על גרסאות חדשות הירשם לפרוייקט FBReader on-freshmeat .

-

ליצירת קשר עם יוצרי התוכנה אנא השתמש בקבוצת FBReader on-googlegroups .

+

פרטים נוספים על תוכנית זו ניתן למצוא בדף הבית של Reader .

+

לקבלת עדכונים על גרסאות חדשות הירשם לפרוייקט Reader on-freshmeat .

+

ליצירת קשר עם יוצרי התוכנה אנא השתמש בקבוצת Reader on-googlegroups .

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.hu.fb2 b/reader/data/help/MiniHelp.desktop.hu.fb2 similarity index 86% rename from fbreader/data/help/MiniHelp.desktop.hu.fb2 rename to reader/data/help/MiniHelp.desktop.hu.fb2 index 84e7f49..d1517c2 100644 --- a/fbreader/data/help/MiniHelp.desktop.hu.fb2 +++ b/reader/data/help/MiniHelp.desktop.hu.fb2 @@ -1,20 +1,20 @@ -FBReader About FBReader hu +Reader About Reader hu -<p>Az FBReader &FBReaderVersion;</p> -

Az FBReader egy elektronikus könyv (e-book) olvasó program, Linux/Windows XP operációsrendszerekre, PDA/UMPC/PC számítógépekre. Az FBReader többféle e-book formátumot képes kezelni: ePub, fb2, chm, rtf, plucker, stb. Közvetlenül olvas a zip, tar, gzip and bzip2 formátumú tömörített fájlokból.

-

Az FBReader a GNU GPL hatálya alatt terjesztett program.

+<p>Az Reader &ReaderVersion;</p> +

Az Reader egy elektronikus könyv (e-book) olvasó program, Linux/Windows XP operációsrendszerekre, PDA/UMPC/PC számítógépekre. Az Reader többféle e-book formátumot képes kezelni: ePub, fb2, chm, rtf, plucker, stb. Közvetlenül olvas a zip, tar, gzip and bzip2 formátumú tömörített fájlokból.

+

Az Reader a GNU GPL hatálya alatt terjesztett program.

Ha tetszik a program és támogatnád a fejlesztést, látogass el az adományozó oldalra.

Kezdő lépések

 -

Az FBReader azokat az ePub, fb2 és OpenReader köteteket kezeli, amelyek „A könyvek helye” beállításban felsorolt könyvtárakban találhatók. Először ezt az opciót kell beállítani. Nyisd meg a „Beállítások módosítása” menüt (egy kattintás a ikonon, az eszkösávon) és töltsd ki az „A könyvek helye” sort a „Könyvtár” fülön. Ez tartalmazza azon könyvtárak listáját, amelyekben megtalálhatók a *.epub, *.fb2, *.orb fájlok, vagy az ezeket tartalmazó tömörített állományok. A könyvtárakat kettősponttal (:) kell elválasztani egymástól.

+

Az Reader azokat az ePub, fb2 és OpenReader köteteket kezeli, amelyek „A könyvek helye” beállításban felsorolt könyvtárakban találhatók. Először ezt az opciót kell beállítani. Nyisd meg a „Beállítások módosítása” menüt (egy kattintás a ikonon, az eszkösávon) és töltsd ki az „A könyvek helye” sort a „Könyvtár” fülön. Ez tartalmazza azon könyvtárak listáját, amelyekben megtalálhatók a *.epub, *.fb2, *.orb fájlok, vagy az ezeket tartalmazó tömörített állományok. A könyvtárakat kettősponttal (:) kell elválasztani egymástól.

Nyisd meg a „Könyvtár”-at (egy kattintás a ikonon), válaszd ki a kötetet és azonnal olvashatod.

A felsoroltaktól eltérő formátumú köteteket először hozzá kell adni a könyvtárhoz. Indítsd el a „Fájl hozzáadása a könyvtárhoz” () menüt, válaszd ki a fájlt és add meg a szükséges információkat. A továbbiakban a könyv elérhető a „Könyvtár” () megnyitásával.

Fontos Internetoldalak

 -

A programról további információk olvashatók az FBReader oldalon.

-

Ha értesítést szeretnél a változásokról, iratkozz fel a FBReader projectre a freshmeat-en.

-

Ha kérdéseid vagy ötleteid vannak, használd az FBReader csoportot a googlegroups-on.

+

A programról további információk olvashatók az Reader oldalon.

+

Ha értesítést szeretnél a változásokról, iratkozz fel a Reader projectre a freshmeat-en.

+

Ha kérdéseid vagy ötleteid vannak, használd az Reader csoportot a googlegroups-on.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.id.fb2 b/reader/data/help/MiniHelp.desktop.id.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.id.fb2 rename to reader/data/help/MiniHelp.desktop.id.fb2 index 51be6b1..527406d 100644 --- a/fbreader/data/help/MiniHelp.desktop.id.fb2 +++ b/reader/data/help/MiniHelp.desktop.id.fb2 @@ -1,20 +1,20 @@ -FBReader Mengenai FBReader id +Reader Mengenai Reader id -<p>Mengenai FBReader &FBReaderVersion;</p> -

FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: ePub, fb2, chm, rtf, plucker, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format zip, tar, gzip dan bzip2.

-

FBReader didistribusikan di bawah lisensi GNU GPL.

+<p>Mengenai Reader &ReaderVersion;</p> +

Reader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. Reader mendukung beberapa format buku elektronik: ePub, fb2, chm, rtf, plucker, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format zip, tar, gzip dan bzip2.

+

Reader didistribusikan di bawah lisensi GNU GPL.

Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman pemberian donasi.

Bagaimana Memulainya

 -

FBReader mencari buku format ePub, fb2 dan OpenReader dalam direktori yang tercantum dalam pengaturan Lokasi Buku. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon di toolbar) dan ubah pengaturan Lokasi Buku pada halaman Pustaka. Pengaturan ini berisi daftar direktori yang terdapat berkas *.epub, *.fb2, *.orb atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.

+

Reader mencari buku format ePub, fb2 dan OpenReader dalam direktori yang tercantum dalam pengaturan Lokasi Buku. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon di toolbar) dan ubah pengaturan Lokasi Buku pada halaman Pustaka. Pengaturan ini berisi daftar direktori yang terdapat berkas *.epub, *.fb2, *.orb atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.

Buka pustaka (klik pada ikon ), pilih sebuah buku dari daftar dan Anda bisa mulai membaca.

Untuk membaca berkas dalam format lain, Anda perlu menambahkannya ke pustaka. Mulailah dialog tambah ke pustaka (), pilih sebuah berkas dan ubah informasi berkasnya jika perlu. Di lain waktu Anda dapat membuka berkas ini menggunakan pustaka ().

Alamat yang berkaitan

 -

Informasi tambahan mengenai aplikasi ini dapat ditemukan di situs FBReader.

-

Jika ingin menerima informasi mengenai rilis baru aplikasi ini, silakan daftarkan diri ke proyek FBReader di freshmeat.

-

Jika Anda memiliki pertanyaan atau masukan, silakan gunakan grup FBReader di googlegroups.

+

Informasi tambahan mengenai aplikasi ini dapat ditemukan di situs Reader.

+

Jika ingin menerima informasi mengenai rilis baru aplikasi ini, silakan daftarkan diri ke proyek Reader di freshmeat.

+

Jika Anda memiliki pertanyaan atau masukan, silakan gunakan grup Reader di googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.it.fb2 b/reader/data/help/MiniHelp.desktop.it.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.it.fb2 rename to reader/data/help/MiniHelp.desktop.it.fb2 index 2c9d418..f80a992 100644 --- a/fbreader/data/help/MiniHelp.desktop.it.fb2 +++ b/reader/data/help/MiniHelp.desktop.it.fb2 @@ -1,19 +1,19 @@ -FBReader Informazioni su FBReader it +Reader Informazioni su Reader it -<p>Informazioni su FBReader &FBReaderVersion;</p> -

FBReader è un lettore di e-book per PDA/UMPC/computer Linux/Windows. FBReader supporta diversi formati di e-book: ePub, fb2, chm, rtf, plucker, etc. E' anche supportata la lettura diretta da archivi zip, tar, gzip e bzip2.

-

FBReader è distribuito nei termini is della licenza GNU GPL.

+<p>Informazioni su Reader &ReaderVersion;</p> +

Reader è un lettore di e-book per PDA/UMPC/computer Linux/Windows. Reader supporta diversi formati di e-book: ePub, fb2, chm, rtf, plucker, etc. E' anche supportata la lettura diretta da archivi zip, tar, gzip e bzip2.

+

Reader è distribuito nei termini is della licenza GNU GPL.

Come Iniziare

 -

FBReader cerca i libri ePub, fb2 e OpenReader nelle cartelle elencate nell'opzione Percorso Libri. Prima di tutto occorre impostare questo percorso. Apri la finestra Opzioni (basta fare clic su nella barra degli strumenti) and cambiare il valore dell'opzione Percorso Libri nella scheda Biblioteca. Questa opzione contiene l'elenco delle cartelle contenenti file *.epub, *.fb2, *.orb o archivi. Le cartelle dell'elenco sono separate da due punti.

+

Reader cerca i libri ePub, fb2 e OpenReader nelle cartelle elencate nell'opzione Percorso Libri. Prima di tutto occorre impostare questo percorso. Apri la finestra Opzioni (basta fare clic su nella barra degli strumenti) and cambiare il valore dell'opzione Percorso Libri nella scheda Biblioteca. Questa opzione contiene l'elenco delle cartelle contenenti file *.epub, *.fb2, *.orb o archivi. Le cartelle dell'elenco sono separate da due punti.

Apri biblioteca (fare clic su ), seleziona un libro dall'elenco e leggi.

Per leggere un file in un altro formato, devi aggiungerlo alla biblioteca. Apri la finestra aggiungi alla biblioteca (), seleziona un file e modifica le informazioni sul file. La prossima volta puoi aprire questo file usando la biblioteca ().

Siti correlati

 -

Ulteriori informazioni su questo programma possono essere trovate alla homepage di FBReader.

-

Se vuoi essere informato sull'uscita di nuove versioni, per favore iscriviti al progetto FBReader su freshmeat.

-

Se hai domande o suggerimenti, per favore usa il gruppo di FBReader su google gruppi.

+

Ulteriori informazioni su questo programma possono essere trovate alla homepage di Reader.

+

Se vuoi essere informato sull'uscita di nuove versioni, per favore iscriviti al progetto Reader su freshmeat.

+

Se hai domande o suggerimenti, per favore usa il gruppo di Reader su google gruppi.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.lt.fb2 b/reader/data/help/MiniHelp.desktop.lt.fb2 similarity index 82% rename from fbreader/data/help/MiniHelp.desktop.lt.fb2 rename to reader/data/help/MiniHelp.desktop.lt.fb2 index 7b02dda..77ec399 100644 --- a/fbreader/data/help/MiniHelp.desktop.lt.fb2 +++ b/reader/data/help/MiniHelp.desktop.lt.fb2 @@ -3,11 +3,11 @@ -FBReader +Reader -Apie FBReader 0.12.0 +Apie Reader 0.12.0 lt en @@ -21,22 +21,22 @@ -<p>Apie programą FBReader &FBReaderVersion;</p> -

Programa FBReader skirta elektroninių knygų skaitymui kompiuteriuose, kuriuose yra įdiegtos Linux arba Windows operacinės sistemos. FBReader palaiko daugumą elektroninių knygų formatų: ePub, fb2, chm, rtf, plucker, ir t.t. Programa taip pat sugeba atidaryti elektronines knygas tiesiogiai iš archyvų zip, tar, gzip ir bzip2.

-

Programa FBReader yra platinama pagal GNU Bendros Viešosios Licenzijos (GNU BVL) sąlygas.

+<p>Apie programą Reader &ReaderVersion;</p> +

Programa Reader skirta elektroninių knygų skaitymui kompiuteriuose, kuriuose yra įdiegtos Linux arba Windows operacinės sistemos. Reader palaiko daugumą elektroninių knygų formatų: ePub, fb2, chm, rtf, plucker, ir t.t. Programa taip pat sugeba atidaryti elektronines knygas tiesiogiai iš archyvų zip, tar, gzip ir bzip2.

+

Programa Reader yra platinama pagal GNU Bendros Viešosios Licenzijos (GNU BVL) sąlygas.

Jeigu jums patinka programa ir jūs norite paremti jos vystymąsi – aplankykite paramos puslapį.

Kaip pradėti naudotis programa

 -

Programa FBReader ieško ePub, fb2 ir OpenReader knygų kataloguose (directory) išvardintuose kortelės Biblioteka nustatymuose. Jeigu norite, kad FBReader žinotų kur jūsų kompiuteryje yra laikomos knygos, turite nurodyti programai kelią iki knygų katalogo. Tam tikslui atidarykite nustatymų langą paspausdami programos įrankių juostoje ir kortelės Biblioteka laukuose “Kelias prie knygos (knygų)” ir “Atsisiųstų knygų saugojimo vieta” įrašykite kelią prie knygų saugojimo vietos, pavyzdžiui:

+

Programa Reader ieško ePub, fb2 ir OpenReader knygų kataloguose (directory) išvardintuose kortelės Biblioteka nustatymuose. Jeigu norite, kad Reader žinotų kur jūsų kompiuteryje yra laikomos knygos, turite nurodyti programai kelią iki knygų katalogo. Tam tikslui atidarykite nustatymų langą paspausdami programos įrankių juostoje ir kortelės Biblioteka laukuose “Kelias prie knygos (knygų)” ir “Atsisiųstų knygų saugojimo vieta” įrašykite kelią prie knygų saugojimo vietos, pavyzdžiui:

~/Books:/media/disk1/Books

Skirtingos knygų laikymo vietos atskiriamos dvitaškiu: “:”

-

Tam, kad atidaryti FBReader biblioteką – paspauskite ženkliuką – čia galėsite išsirinkti knygą skaitymui.

-

Norint pridėti knygą prie FBReader bibliotekos, paspauskite – atsidarys knygos paieškos langas. Langas rodo paskutinės į FBReader biblioteką įkeltos knygos buvimo vietą. Nurodykite knygos, kurią norite skaityti FBReader programoje, saugojimo vietą jūsų kompiuteryje, pažymėkite knygą ir paspauskite mygtuką "Patvirtinti". Knyga bus prijungta prie FBReader bibliotekos ir sekantį kartą galėsite ją pasiekti spausdami FBReader bibliotekos ženkliuką .

+

Tam, kad atidaryti Reader biblioteką – paspauskite ženkliuką – čia galėsite išsirinkti knygą skaitymui.

+

Norint pridėti knygą prie Reader bibliotekos, paspauskite – atsidarys knygos paieškos langas. Langas rodo paskutinės į Reader biblioteką įkeltos knygos buvimo vietą. Nurodykite knygos, kurią norite skaityti Reader programoje, saugojimo vietą jūsų kompiuteryje, pažymėkite knygą ir paspauskite mygtuką "Patvirtinti". Knyga bus prijungta prie Reader bibliotekos ir sekantį kartą galėsite ją pasiekti spausdami Reader bibliotekos ženkliuką .

Susieti tinklalapiai

 -

Atnaujintą informaciją apie programą rasite FBReader svetainėje.

-

Jeigu jūs norite gauti informaciją apie FBReader atnaujinimus elektroniniu paštu – užsiprenumeruokite programos naujienas svetainėje Freshmeat.

-

Jeigu turite klausimų ar pasiūlymų – susisiekite su FBReader bendruomene googlegroups.

+

Atnaujintą informaciją apie programą rasite Reader svetainėje.

+

Jeigu jūs norite gauti informaciją apie Reader atnaujinimus elektroniniu paštu – užsiprenumeruokite programos naujienas svetainėje Freshmeat.

+

Jeigu turite klausimų ar pasiūlymų – susisiekite su Reader bendruomene googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.nl.fb2 b/reader/data/help/MiniHelp.desktop.nl.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.nl.fb2 rename to reader/data/help/MiniHelp.desktop.nl.fb2 index 78f10a4..b505843 100755 --- a/fbreader/data/help/MiniHelp.desktop.nl.fb2 +++ b/reader/data/help/MiniHelp.desktop.nl.fb2 @@ -1,20 +1,20 @@ -FBReader Over FBReader nl +Reader Over Reader nl -<p>Over FBReader &FBReaderVersion;</p> -

FBReader is een e-book reader voor Linux/Windows/FreeBSD en verschillende mobiele platformen. FBReader ondersteunt verschillende e-book bestanden: ePub, fb2, chm, rtf, plucker, etc. Het direct lezen van zip, tar, gzip en bzip2 gecomprimeerde bestanden wordt ook ondersteund.

-

FBReader wordt distribueerd onder de voorwaarden van de GNU GPL.

+<p>Over Reader &ReaderVersion;</p> +

Reader is een e-book reader voor Linux/Windows/FreeBSD en verschillende mobiele platformen. Reader ondersteunt verschillende e-book bestanden: ePub, fb2, chm, rtf, plucker, etc. Het direct lezen van zip, tar, gzip en bzip2 gecomprimeerde bestanden wordt ook ondersteund.

+

Reader wordt distribueerd onder de voorwaarden van de GNU GPL.

Indien U dit programma op prijs stelt en U aan de ontwikkeling ervan wilt bijdragen, bezoek dan de donatie pagina.

Configuratie

 -

FBReader zoekt naar ePub, fb2 en OpenReader boeken in de mappen die als Boek Locaties zijn gespecificeerd. Om te beginnen kiest u deze mappen. Open het configuratiescherm (Selecteer in de menubalk) en kies Uw Boek Locaties op de pagina met het Bibliotheek label. Deze pagina bevat een lijst van mappen met *.epub, *.fb2, *.orb of gecomprimeerde bestanden. Mappen in deze lijst worden van elkaar gescheiden door een dubbele punt (:).

+

Reader zoekt naar ePub, fb2 en OpenReader boeken in de mappen die als Boek Locaties zijn gespecificeerd. Om te beginnen kiest u deze mappen. Open het configuratiescherm (Selecteer in de menubalk) en kies Uw Boek Locaties op de pagina met het Bibliotheek label. Deze pagina bevat een lijst van mappen met *.epub, *.fb2, *.orb of gecomprimeerde bestanden. Mappen in deze lijst worden van elkaar gescheiden door een dubbele punt (:).

Open de bibliotheek () en selecteer een boek uit de lijst om het te lezen.

Om andere e-book bestanden te lezen dient U deze aan de bibliotheek toe te voegen. Open het aan bibliotheek toevoegen () keuzescherm, selecteer een bestand en bewerk eventueel de informatie. U kunt dit bestand in het vervolg vanuit de bibliotheek () openen.

Gerelateerde sites

 -

Meer informatie over dit programma kunt U op de FBReader homepage vinden.

-

Om op de hoogte gehouden te worden van nieuwe versies kunt U zich abonneren op het FBReader project op Freshmeat.

-

Voor vragen of suggesties kunt U de FBReader group van googlegroups bezoeken.

+

Meer informatie over dit programma kunt U op de Reader homepage vinden.

+

Om op de hoogte gehouden te worden van nieuwe versies kunt U zich abonneren op het Reader project op Freshmeat.

+

Voor vragen of suggesties kunt U de Reader group van googlegroups bezoeken.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.ru.fb2 b/reader/data/help/MiniHelp.desktop.ru.fb2 similarity index 83% rename from fbreader/data/help/MiniHelp.desktop.ru.fb2 rename to reader/data/help/MiniHelp.desktop.ru.fb2 index 4e96613..dec9df7 100644 --- a/fbreader/data/help/MiniHelp.desktop.ru.fb2 +++ b/reader/data/help/MiniHelp.desktop.ru.fb2 @@ -1,19 +1,19 @@ -FBReader О программе FBReader ru +Reader О программе Reader ru -<p>О программе FBReader &FBReaderVersion;</p> -

FBReader – программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. FBReader позволяет читать книги во многих форматах: ePub, fb2, chm, rtf, plucker, и т. д. Файлы можно читать напрямую из архивов zip, tar, gzip и bzip2.

-

FBReader распространяется свободно, включая исходные тексты, под лицензией GNU GPL.

+<p>О программе Reader &ReaderVersion;</p> +

Reader – программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. Reader позволяет читать книги во многих форматах: ePub, fb2, chm, rtf, plucker, и т. д. Файлы можно читать напрямую из архивов zip, tar, gzip и bzip2.

+

Reader распространяется свободно, включая исходные тексты, под лицензией GNU GPL.

С чего начать

 -

FBReader автоматически собирает в библиотеку файлы форматов ePub, fb2 и OpenReader, лежащие в каталогах, заданных параметром «Каталоги с книгами». Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку ) и отредактруйте «каталоги с книгами» в разделе «Библиотека». Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями epub, fb2 или orb, или содержащие их архивы.

+

Reader автоматически собирает в библиотеку файлы форматов ePub, fb2 и OpenReader, лежащие в каталогах, заданных параметром «Каталоги с книгами». Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку ) и отредактруйте «каталоги с книгами» в разделе «Библиотека». Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями epub, fb2 или orb, или содержащие их архивы.

Теперь откройте библиотеку (нажмите на ), выберите книгу, и приступайте к чтению.

Чтобы читать книгу в другом формате, ее нужно вручную добавить в библиотеку. Запустите диалог добавления книги (), выберите файл и отредактируйте информацию о книге. В следующий раз вы сможете открыть эту книгу уже с помощью библиотеки ().

Ссылки

 -

Информацию об FBReader'е и свежую версию программы можно найти на сайте FBReader'а.

-

Если вы хотите получать сообщения о новых версиях, подпишитесь на проект FBReader на freshmeat.

-

Чтобы связаться с авторами программы, воспользуйтесь группой FBReader на googlegroups.

+

Информацию об Reader'е и свежую версию программы можно найти на сайте Reader'а.

+

Если вы хотите получать сообщения о новых версиях, подпишитесь на проект Reader на freshmeat.

+

Чтобы связаться с авторами программы, воспользуйтесь группой Reader на googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.sv.fb2 b/reader/data/help/MiniHelp.desktop.sv.fb2 similarity index 88% rename from fbreader/data/help/MiniHelp.desktop.sv.fb2 rename to reader/data/help/MiniHelp.desktop.sv.fb2 index d6f0023..730a27a 100644 --- a/fbreader/data/help/MiniHelp.desktop.sv.fb2 +++ b/reader/data/help/MiniHelp.desktop.sv.fb2 @@ -1,19 +1,19 @@ -FBReader Om FBReader sv +Reader Om Reader sv -<p>Om FBReader &FBReaderVersion;</p> -

FBReader är en e-boksläsare för Linux/Windows XP PDA/UMPC/skrivbordsdator. FBReader har stöd för flera e-boksformat: ePub, fb2, chm, rtf, plucker, etc. Direktläsning från arkivformaten zip, tar, gzip och bzip2 stöds också.

-

FBReader distribueras under villkoren för GNU GPL.

+<p>Om Reader &ReaderVersion;</p> +

Reader är en e-boksläsare för Linux/Windows XP PDA/UMPC/skrivbordsdator. Reader har stöd för flera e-boksformat: ePub, fb2, chm, rtf, plucker, etc. Direktläsning från arkivformaten zip, tar, gzip och bzip2 stöds också.

+

Reader distribueras under villkoren för GNU GPL.

Hur man kommer igång

 -

FBReader letar efter böcker i formaten ePub, fb2 och OpenReader i kataloger som listas i alternativet Boksökväg. Först måste du ange denna sökväg. Öppna alternativdialogrutan (klicka helt enkelt på i verktygsraden) och ändra värdet för alternativet Boksökväg under fliken Bibliotek. Detta alternativ innehåller listan över kataloger som innehåller *.epub, *.fb2, *.orb eller arkivfiler. Kataloger i listan separeras med kolon.

+

Reader letar efter böcker i formaten ePub, fb2 och OpenReader i kataloger som listas i alternativet Boksökväg. Först måste du ange denna sökväg. Öppna alternativdialogrutan (klicka helt enkelt på i verktygsraden) och ändra värdet för alternativet Boksökväg under fliken Bibliotek. Detta alternativ innehåller listan över kataloger som innehåller *.epub, *.fb2, *.orb eller arkivfiler. Kataloger i listan separeras med kolon.

Öppna biblioteket (klicka på ), välj en bok från listan och läs den.

För att läsa en fil i ett annat format måste du lägga till den till biblioteket. Starta Lägg till i biblioteket (), välj en fil och redigera filinformationen. Nästa gång så kan du öppna denna fil med biblioteket ().

Relaterade webbplatser

 -

Mer information om det här programmet kan hittas på FBReaders webbplats.

-

Om du vill bli informerad om nya utgåvor kan du prenumerera på FBReaders projektsida på Freshmeat.

-

Om du har några frågor eller förslag kan du använda FBReaders grupp hos Google Groups.

+

Mer information om det här programmet kan hittas på Readers webbplats.

+

Om du vill bli informerad om nya utgåvor kan du prenumerera på Readers projektsida på Freshmeat.

+

Om du har några frågor eller förslag kan du använda Readers grupp hos Google Groups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.uk.fb2 b/reader/data/help/MiniHelp.desktop.uk.fb2 similarity index 84% rename from fbreader/data/help/MiniHelp.desktop.uk.fb2 rename to reader/data/help/MiniHelp.desktop.uk.fb2 index c4cd7c4..754a000 100644 --- a/fbreader/data/help/MiniHelp.desktop.uk.fb2 +++ b/reader/data/help/MiniHelp.desktop.uk.fb2 @@ -1,19 +1,19 @@ -FBReader Про програму FBReader uk +Reader Про програму Reader uk -<p>Про програму FBReader &FBReaderVersion;</p> -

FBReader – програма для читання електронних книг, яка працює під операційними системами Linux, FreeBSD, Windows XP. FBReader дозволяє читати книги у багатьох форматах: ePub, fb2, chm, rtf, plucker, і т. д. Файли можна читати напряму з архівів zip, tar, gzip та bzip2.

-

FBReader поширюється вільно, разом з джерельними текстами, під лицензією GNU GPL.

+<p>Про програму Reader &ReaderVersion;</p> +

Reader – програма для читання електронних книг, яка працює під операційними системами Linux, FreeBSD, Windows XP. Reader дозволяє читати книги у багатьох форматах: ePub, fb2, chm, rtf, plucker, і т. д. Файли можна читати напряму з архівів zip, tar, gzip та bzip2.

+

Reader поширюється вільно, разом з джерельними текстами, під лицензією GNU GPL.

З чого почати

 -

FBReader автоматично збирає у бібліотеку файли форматів ePub, fb2 та OpenReader, що лежать у каталогах, які задані параметром “Каталоги з книгами”. Тому передусім треба визначити цей параметр. Відкрийте діалог налаштувань (натисніть на кнопку ) і відредагуйте “каталоги з книгами” у розділі “Бібліотека”. Каталоги перелічуються через двокрапку i повинні містити файли з розширеннями epub, fb2 або orb, чи архіви, що їх містять.

+

Reader автоматично збирає у бібліотеку файли форматів ePub, fb2 та OpenReader, що лежать у каталогах, які задані параметром “Каталоги з книгами”. Тому передусім треба визначити цей параметр. Відкрийте діалог налаштувань (натисніть на кнопку ) і відредагуйте “каталоги з книгами” у розділі “Бібліотека”. Каталоги перелічуються через двокрапку i повинні містити файли з розширеннями epub, fb2 або orb, чи архіви, що їх містять.

Тепер відкрийте бібліотеку (натисніть на ), виберіть книгу і починайте читати.

Щоб читати книгу у іншому форматі, її потрібно вручну додати у бібліотеку. Запустіть діалог додавання книги (), виберіть файл і відредагуйте інформацію про книгу. Наступного разу ви зможете відкрити цю книгу вже за допомогою бібліотеки ().

Посилання

 -

Інформацію про FBReader та нову версію програми можна знайти на сайтi FBReader'у.

-

Якщо ви бажаєте отримувати повідомлення про нові версії, підпишіться на проект FBReader на freshmeat.

-

Для зв'язку з авторами програми скористуйтесь групою FBReader на googlegroups.

+

Інформацію про Reader та нову версію програми можна знайти на сайтi Reader'у.

+

Якщо ви бажаєте отримувати повідомлення про нові версії, підпишіться на проект Reader на freshmeat.

+

Для зв'язку з авторами програми скористуйтесь групою Reader на googlegroups.

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/help/MiniHelp.desktop.vi.fb2 b/reader/data/help/MiniHelp.desktop.vi.fb2 similarity index 93% rename from fbreader/data/help/MiniHelp.desktop.vi.fb2 rename to reader/data/help/MiniHelp.desktop.vi.fb2 index 7206485..2d00abe 100644 --- a/fbreader/data/help/MiniHelp.desktop.vi.fb2 +++ b/reader/data/help/MiniHelp.desktop.vi.fb2 @@ -1,24 +1,24 @@  -FBReader About FBReader vi +Reader About Reader vi -<p>Về FBreader &FBReaderVersion;</p>

(Dịch sang Tiếng Việt bởi Phạm Văn Hùng_Firestork (Có thể không chính xác +<p>Về FBreader &ReaderVersion;</p>

(Dịch sang Tiếng Việt bởi Phạm Văn Hùng_Firestork (Có thể không chính xác 100% do trình độ người dịch có hạn. Nếu muốn hiểu kĩ làm ơn đọc bản tiếng Nga hoặc tiếng Anh))

-

FBReader là một chương trình đọc sách điện tử dành cho máy tính để bàn -Linux/Windows XP PDA/UMPC. FBReader hỗ trợ nhiều định dạng sách điện tử: +

Reader là một chương trình đọc sách điện tử dành cho máy tính để bàn +Linux/Windows XP PDA/UMPC. Reader hỗ trợ nhiều định dạng sách điện tử: ePub, fb2, chm, rtf, plucker, v...v. Việc đọc trực tiếp từ các định dạng nén zip, tar, gzip và bzip2 cũng được hỗ trợ.

-

FBReader được phân phối dưới điều khoản của giấy phép Reader được phân phối dưới điều khoản của giấy phép GNU GPL.

Nếu bạn thích chương trình này và mong muốn hỗ trợ sự phát triển của nó, làm ơn ghé thăm trang hỗ trợ tài chính .

Bắt đầu như thế nào?

 -

FBReader tìm kiếm các sách định dạng ePub, fb2 và +

Reader tìm kiếm các sách định dạng ePub, fb2 và OpenReader trong các thư mục được lên danh sách tại tùy chọn Đường dẫn Sách. Đầu tiên bạn cần đặt đường dẫn này. Mở hộp tùy chỉnh (click vào trên thanh công @@ -35,12 +35,12 @@ viện () để mở tập tin n

Những trang Web liên quan

Bạn có thể tìm thêm thông tin về chương trình này tại trang chủ của FBReader .

+l:href="http://www.fbreader.org"> trang chủ của Reader .

Nếu bạn muốn được thông báo về những bản phát hành mới, vui lòng đăng kí tại -dự án FBReader tại +dự án Reader tại freshmeat.

Nếu bạn có bất kỳ câu hỏi hay lời đề nghị nào, vui lòng sử dụng FBReader group tại +l:href="http://groups.google.com/group/fbreader">Reader group tại googlegroups.

diff --git a/fbreader/data/help/MiniHelp.desktop.zh.fb2 b/reader/data/help/MiniHelp.desktop.zh.fb2 similarity index 89% rename from fbreader/data/help/MiniHelp.desktop.zh.fb2 rename to reader/data/help/MiniHelp.desktop.zh.fb2 index 9ccfdab..6795b77 100644 --- a/fbreader/data/help/MiniHelp.desktop.zh.fb2 +++ b/reader/data/help/MiniHelp.desktop.zh.fb2 @@ -1,21 +1,21 @@  -FBReader 关于 FBReader zh +Reader 关于 Reader zh -<p>关于 FBReader &FBReaderVersion;</p> -

FBReader是一款基于Linux/Windows XP PDA/UMPC/台式电脑的电子书阅读软件，它支持多种电子书格式，如ePub，fb2，chm， rtf，plucker等，也支持直接阅读zip， tar， gzip，bzip2存档格式的文件。

-

FBReader采用GNU GPL条款发布。

-

如果你喜欢FBReader并愿意支持它的发展，请访问“捐赠页面”。

+<p>关于 Reader &ReaderVersion;</p> +

Reader是一款基于Linux/Windows XP PDA/UMPC/台式电脑的电子书阅读软件，它支持多种电子书格式，如ePub，fb2，chm， rtf，plucker等，也支持直接阅读zip， tar， gzip，bzip2存档格式的文件。

+

Reader采用GNU GPL条款发布。

+

如果你喜欢Reader并愿意支持它的发展，请访问“捐赠页面”。

怎么使用

 -

FBReader会自动在 图书路径 设置选项中的目录里面寻找 ePub、fb2和OpenReader格式的书。

+

Reader会自动在 图书路径 设置选项中的目录里面寻找 ePub、fb2和OpenReader格式的书。

因此，你要做的第一件事情是设置这个 图书路径。打开设置选项对话框（点击工具栏上按钮），修改书库选项卡下的图书路径。它可以包含多个含有*.epub， *.fb2，*.orb等格式文件的目录，列表中的目录用分号隔开。

打开书库（单击），从书目列表中选择一本书阅读。

要阅读其他格式的电子书，你需要单独把它添加到书库中。打开添加到书库的对话框（），选择一个文件，编辑文件信息。下次你就可以使用书库来打开此文件了（）。

相关网站

 -

更多有关FBReader的信息可以在FBReader网站查阅到。

-

如果您想知道FBReader的最新版本信息，请订阅FBReader project at freshmeat。

-

如果您有任何的问题或建议，请使用googlegroups中的“FBReader group”。

+

更多有关Reader的信息可以在Reader网站查阅到。

+

如果您想知道Reader的最新版本信息，请订阅Reader project at freshmeat。

+

如果您有任何的问题或建议，请使用googlegroups中的“Reader group”。

iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/ diff --git a/fbreader/data/icons/application/16x16.png b/reader/data/icons/application/16x16.png similarity index 100% rename from fbreader/data/icons/application/16x16.png rename to reader/data/icons/application/16x16.png diff --git a/fbreader/data/icons/application/26x26.png b/reader/data/icons/application/26x26.png similarity index 100% rename from fbreader/data/icons/application/26x26.png rename to reader/data/icons/application/26x26.png diff --git a/fbreader/data/icons/application/32x24.png b/reader/data/icons/application/32x24.png similarity index 100% rename from fbreader/data/icons/application/32x24.png rename to reader/data/icons/application/32x24.png diff --git a/fbreader/data/icons/application/32x32.png b/reader/data/icons/application/32x32.png similarity index 100% rename from fbreader/data/icons/application/32x32.png rename to reader/data/icons/application/32x32.png diff --git a/fbreader/data/icons/application/48x48.png b/reader/data/icons/application/48x48.png similarity index 100% rename from fbreader/data/icons/application/48x48.png rename to reader/data/icons/application/48x48.png diff --git a/fbreader/data/icons/application/64x43.png b/reader/data/icons/application/64x43.png similarity index 100% rename from fbreader/data/icons/application/64x43.png rename to reader/data/icons/application/64x43.png diff --git a/fbreader/data/icons/application/64x64.png b/reader/data/icons/application/64x64.png similarity index 100% rename from fbreader/data/icons/application/64x64.png rename to reader/data/icons/application/64x64.png diff --git a/fbreader/data/icons/application/FBReader.icns b/reader/data/icons/application/Reader.icns similarity index 100% rename from fbreader/data/icons/application/FBReader.icns rename to reader/data/icons/application/Reader.icns diff --git a/fbreader/data/icons/application/desktop.png b/reader/data/icons/application/desktop.png similarity index 100% rename from fbreader/data/icons/application/desktop.png rename to reader/data/icons/application/desktop.png diff --git a/fbreader/data/icons/back_button.png b/reader/data/icons/back_button.png similarity index 100% rename from fbreader/data/icons/back_button.png rename to reader/data/icons/back_button.png diff --git a/fbreader/data/icons/back_button_disabled.png b/reader/data/icons/back_button_disabled.png similarity index 100% rename from fbreader/data/icons/back_button_disabled.png rename to reader/data/icons/back_button_disabled.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-download-demo.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png b/reader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-local-demo.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png b/reader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png b/reader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png b/reader/data/icons/booktree/22x22-transparent-png/tree-order-series.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-order-series.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-purchase.png b/reader/data/icons/booktree/22x22-transparent-png/tree-purchase.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-purchase.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-purchase.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png b/reader/data/icons/booktree/22x22-transparent-png/tree-removebook.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-removebook.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png b/reader/data/icons/booktree/22x22-transparent-png/tree-removetag.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-removetag.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png b/reader/data/icons/booktree/22x22-transparent-png/tree-strut.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-strut.png diff --git a/fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png b/reader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png similarity index 100% rename from fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png rename to reader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png b/reader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png b/reader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png b/reader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png b/reader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png b/reader/data/icons/booktree/28x28-transparent-png/tree-removebook.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-removebook.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png b/reader/data/icons/booktree/28x28-transparent-png/tree-removetag.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-removetag.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png b/reader/data/icons/booktree/28x28-transparent-png/tree-strut.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-strut.png diff --git a/fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png b/reader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png similarity index 100% rename from fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png rename to reader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png diff --git a/fbreader/data/icons/booktree/desktop b/reader/data/icons/booktree/desktop similarity index 100% rename from fbreader/data/icons/booktree/desktop rename to reader/data/icons/booktree/desktop diff --git a/fbreader/data/icons/booktree/new/booktree-author.png b/reader/data/icons/booktree/new/booktree-author.png similarity index 100% rename from fbreader/data/icons/booktree/new/booktree-author.png rename to reader/data/icons/booktree/new/booktree-author.png diff --git a/fbreader/data/icons/booktree/new/booktree-book.png b/reader/data/icons/booktree/new/booktree-book.png similarity index 100% rename from fbreader/data/icons/booktree/new/booktree-book.png rename to reader/data/icons/booktree/new/booktree-book.png diff --git a/fbreader/data/icons/booktree/new/booktree-catalog.png b/reader/data/icons/booktree/new/booktree-catalog.png similarity index 100% rename from fbreader/data/icons/booktree/new/booktree-catalog.png rename to reader/data/icons/booktree/new/booktree-catalog.png diff --git a/fbreader/data/icons/booktree/new/booktree-tag.png b/reader/data/icons/booktree/new/booktree-tag.png similarity index 100% rename from fbreader/data/icons/booktree/new/booktree-tag.png rename to reader/data/icons/booktree/new/booktree-tag.png diff --git a/fbreader/data/icons/booktree/new/searchresult.png b/reader/data/icons/booktree/new/searchresult.png similarity index 100% rename from fbreader/data/icons/booktree/new/searchresult.png rename to reader/data/icons/booktree/new/searchresult.png diff --git a/fbreader/data/icons/filetree/12x12-png/fb2.png b/reader/data/icons/filetree/12x12-png/fb2.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/fb2.png rename to reader/data/icons/filetree/12x12-png/fb2.png diff --git a/fbreader/data/icons/filetree/12x12-png/folder.png b/reader/data/icons/filetree/12x12-png/folder.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/folder.png rename to reader/data/icons/filetree/12x12-png/folder.png diff --git a/fbreader/data/icons/filetree/12x12-png/html.png b/reader/data/icons/filetree/12x12-png/html.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/html.png rename to reader/data/icons/filetree/12x12-png/html.png diff --git a/fbreader/data/icons/filetree/12x12-png/mobipocket.png b/reader/data/icons/filetree/12x12-png/mobipocket.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/mobipocket.png rename to reader/data/icons/filetree/12x12-png/mobipocket.png diff --git a/fbreader/data/icons/filetree/12x12-png/oeb.png b/reader/data/icons/filetree/12x12-png/oeb.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/oeb.png rename to reader/data/icons/filetree/12x12-png/oeb.png diff --git a/fbreader/data/icons/filetree/12x12-png/openreader.png b/reader/data/icons/filetree/12x12-png/openreader.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/openreader.png rename to reader/data/icons/filetree/12x12-png/openreader.png diff --git a/fbreader/data/icons/filetree/12x12-png/palm.png b/reader/data/icons/filetree/12x12-png/palm.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/palm.png rename to reader/data/icons/filetree/12x12-png/palm.png diff --git a/fbreader/data/icons/filetree/12x12-png/plucker.png b/reader/data/icons/filetree/12x12-png/plucker.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/plucker.png rename to reader/data/icons/filetree/12x12-png/plucker.png diff --git a/fbreader/data/icons/filetree/12x12-png/rtf.png b/reader/data/icons/filetree/12x12-png/rtf.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/rtf.png rename to reader/data/icons/filetree/12x12-png/rtf.png diff --git a/fbreader/data/icons/filetree/12x12-png/tcr.png b/reader/data/icons/filetree/12x12-png/tcr.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/tcr.png rename to reader/data/icons/filetree/12x12-png/tcr.png diff --git a/fbreader/data/icons/filetree/12x12-png/unknown.png b/reader/data/icons/filetree/12x12-png/unknown.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/unknown.png rename to reader/data/icons/filetree/12x12-png/unknown.png diff --git a/fbreader/data/icons/filetree/12x12-png/upfolder.png b/reader/data/icons/filetree/12x12-png/upfolder.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/upfolder.png rename to reader/data/icons/filetree/12x12-png/upfolder.png diff --git a/fbreader/data/icons/filetree/12x12-png/weasel.png b/reader/data/icons/filetree/12x12-png/weasel.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/weasel.png rename to reader/data/icons/filetree/12x12-png/weasel.png diff --git a/fbreader/data/icons/filetree/12x12-png/zipfolder.png b/reader/data/icons/filetree/12x12-png/zipfolder.png similarity index 100% rename from fbreader/data/icons/filetree/12x12-png/zipfolder.png rename to reader/data/icons/filetree/12x12-png/zipfolder.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/fb2.ico b/reader/data/icons/filetree/22x22-transparent-ico/fb2.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/fb2.ico rename to reader/data/icons/filetree/22x22-transparent-ico/fb2.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/folder.ico b/reader/data/icons/filetree/22x22-transparent-ico/folder.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/folder.ico rename to reader/data/icons/filetree/22x22-transparent-ico/folder.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/html.ico b/reader/data/icons/filetree/22x22-transparent-ico/html.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/html.ico rename to reader/data/icons/filetree/22x22-transparent-ico/html.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico b/reader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico rename to reader/data/icons/filetree/22x22-transparent-ico/mobipocket.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/oeb.ico b/reader/data/icons/filetree/22x22-transparent-ico/oeb.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/oeb.ico rename to reader/data/icons/filetree/22x22-transparent-ico/oeb.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/openreader.ico b/reader/data/icons/filetree/22x22-transparent-ico/openreader.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/openreader.ico rename to reader/data/icons/filetree/22x22-transparent-ico/openreader.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/palm.ico b/reader/data/icons/filetree/22x22-transparent-ico/palm.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/palm.ico rename to reader/data/icons/filetree/22x22-transparent-ico/palm.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/plucker.ico b/reader/data/icons/filetree/22x22-transparent-ico/plucker.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/plucker.ico rename to reader/data/icons/filetree/22x22-transparent-ico/plucker.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/rtf.ico b/reader/data/icons/filetree/22x22-transparent-ico/rtf.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/rtf.ico rename to reader/data/icons/filetree/22x22-transparent-ico/rtf.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/tcr.ico b/reader/data/icons/filetree/22x22-transparent-ico/tcr.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/tcr.ico rename to reader/data/icons/filetree/22x22-transparent-ico/tcr.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/unknown.ico b/reader/data/icons/filetree/22x22-transparent-ico/unknown.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/unknown.ico rename to reader/data/icons/filetree/22x22-transparent-ico/unknown.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/upfolder.ico b/reader/data/icons/filetree/22x22-transparent-ico/upfolder.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/upfolder.ico rename to reader/data/icons/filetree/22x22-transparent-ico/upfolder.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/weasel.ico b/reader/data/icons/filetree/22x22-transparent-ico/weasel.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/weasel.ico rename to reader/data/icons/filetree/22x22-transparent-ico/weasel.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico b/reader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico rename to reader/data/icons/filetree/22x22-transparent-ico/zipfolder.ico diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/fb2.png b/reader/data/icons/filetree/22x22-transparent-png/fb2.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/fb2.png rename to reader/data/icons/filetree/22x22-transparent-png/fb2.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/folder.png b/reader/data/icons/filetree/22x22-transparent-png/folder.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/folder.png rename to reader/data/icons/filetree/22x22-transparent-png/folder.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/html.png b/reader/data/icons/filetree/22x22-transparent-png/html.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/html.png rename to reader/data/icons/filetree/22x22-transparent-png/html.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/mobipocket.png b/reader/data/icons/filetree/22x22-transparent-png/mobipocket.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/mobipocket.png rename to reader/data/icons/filetree/22x22-transparent-png/mobipocket.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/oeb.png b/reader/data/icons/filetree/22x22-transparent-png/oeb.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/oeb.png rename to reader/data/icons/filetree/22x22-transparent-png/oeb.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/openreader.png b/reader/data/icons/filetree/22x22-transparent-png/openreader.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/openreader.png rename to reader/data/icons/filetree/22x22-transparent-png/openreader.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/palm.png b/reader/data/icons/filetree/22x22-transparent-png/palm.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/palm.png rename to reader/data/icons/filetree/22x22-transparent-png/palm.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/plucker.png b/reader/data/icons/filetree/22x22-transparent-png/plucker.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/plucker.png rename to reader/data/icons/filetree/22x22-transparent-png/plucker.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/rtf.png b/reader/data/icons/filetree/22x22-transparent-png/rtf.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/rtf.png rename to reader/data/icons/filetree/22x22-transparent-png/rtf.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/tcr.png b/reader/data/icons/filetree/22x22-transparent-png/tcr.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/tcr.png rename to reader/data/icons/filetree/22x22-transparent-png/tcr.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/unknown.png b/reader/data/icons/filetree/22x22-transparent-png/unknown.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/unknown.png rename to reader/data/icons/filetree/22x22-transparent-png/unknown.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/upfolder.png b/reader/data/icons/filetree/22x22-transparent-png/upfolder.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/upfolder.png rename to reader/data/icons/filetree/22x22-transparent-png/upfolder.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/weasel.png b/reader/data/icons/filetree/22x22-transparent-png/weasel.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/weasel.png rename to reader/data/icons/filetree/22x22-transparent-png/weasel.png diff --git a/fbreader/data/icons/filetree/22x22-transparent-png/zipfolder.png b/reader/data/icons/filetree/22x22-transparent-png/zipfolder.png similarity index 100% rename from fbreader/data/icons/filetree/22x22-transparent-png/zipfolder.png rename to reader/data/icons/filetree/22x22-transparent-png/zipfolder.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/fb2.png b/reader/data/icons/filetree/32x32-transparent-png/fb2.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/fb2.png rename to reader/data/icons/filetree/32x32-transparent-png/fb2.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/folder.png b/reader/data/icons/filetree/32x32-transparent-png/folder.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/folder.png rename to reader/data/icons/filetree/32x32-transparent-png/folder.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/html.png b/reader/data/icons/filetree/32x32-transparent-png/html.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/html.png rename to reader/data/icons/filetree/32x32-transparent-png/html.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/mobipocket.png b/reader/data/icons/filetree/32x32-transparent-png/mobipocket.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/mobipocket.png rename to reader/data/icons/filetree/32x32-transparent-png/mobipocket.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/oeb.png b/reader/data/icons/filetree/32x32-transparent-png/oeb.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/oeb.png rename to reader/data/icons/filetree/32x32-transparent-png/oeb.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/openreader.png b/reader/data/icons/filetree/32x32-transparent-png/openreader.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/openreader.png rename to reader/data/icons/filetree/32x32-transparent-png/openreader.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/palm.png b/reader/data/icons/filetree/32x32-transparent-png/palm.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/palm.png rename to reader/data/icons/filetree/32x32-transparent-png/palm.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/plucker.png b/reader/data/icons/filetree/32x32-transparent-png/plucker.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/plucker.png rename to reader/data/icons/filetree/32x32-transparent-png/plucker.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/rtf.png b/reader/data/icons/filetree/32x32-transparent-png/rtf.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/rtf.png rename to reader/data/icons/filetree/32x32-transparent-png/rtf.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/tcr.png b/reader/data/icons/filetree/32x32-transparent-png/tcr.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/tcr.png rename to reader/data/icons/filetree/32x32-transparent-png/tcr.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/unknown.png b/reader/data/icons/filetree/32x32-transparent-png/unknown.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/unknown.png rename to reader/data/icons/filetree/32x32-transparent-png/unknown.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/upfolder.png b/reader/data/icons/filetree/32x32-transparent-png/upfolder.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/upfolder.png rename to reader/data/icons/filetree/32x32-transparent-png/upfolder.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/weasel.png b/reader/data/icons/filetree/32x32-transparent-png/weasel.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/weasel.png rename to reader/data/icons/filetree/32x32-transparent-png/weasel.png diff --git a/fbreader/data/icons/filetree/32x32-transparent-png/zipfolder.png b/reader/data/icons/filetree/32x32-transparent-png/zipfolder.png similarity index 100% rename from fbreader/data/icons/filetree/32x32-transparent-png/zipfolder.png rename to reader/data/icons/filetree/32x32-transparent-png/zipfolder.png diff --git a/fbreader/data/icons/filetree/desktop b/reader/data/icons/filetree/desktop similarity index 100% rename from fbreader/data/icons/filetree/desktop rename to reader/data/icons/filetree/desktop diff --git a/fbreader/data/icons/forward_button.png b/reader/data/icons/forward_button.png similarity index 100% rename from fbreader/data/icons/forward_button.png rename to reader/data/icons/forward_button.png diff --git a/fbreader/data/icons/forward_button_disabled.png b/reader/data/icons/forward_button_disabled.png similarity index 100% rename from fbreader/data/icons/forward_button_disabled.png rename to reader/data/icons/forward_button_disabled.png diff --git a/fbreader/data/icons/refresh-icon-1.png b/reader/data/icons/refresh-icon-1.png similarity index 100% rename from fbreader/data/icons/refresh-icon-1.png rename to reader/data/icons/refresh-icon-1.png diff --git a/fbreader/data/icons/refresh-icon-2.png b/reader/data/icons/refresh-icon-2.png similarity index 100% rename from fbreader/data/icons/refresh-icon-2.png rename to reader/data/icons/refresh-icon-2.png diff --git a/fbreader/data/icons/refresh-icon.svg b/reader/data/icons/refresh-icon.svg similarity index 100% rename from fbreader/data/icons/refresh-icon.svg rename to reader/data/icons/refresh-icon.svg diff --git a/fbreader/data/icons/search_icon.png b/reader/data/icons/search_icon.png similarity index 100% rename from fbreader/data/icons/search_icon.png rename to reader/data/icons/search_icon.png diff --git a/fbreader/data/icons/spinner.gif b/reader/data/icons/spinner.gif similarity index 100% rename from fbreader/data/icons/spinner.gif rename to reader/data/icons/spinner.gif diff --git a/fbreader/data/icons/toolbar/14x15-png/addBook.png b/reader/data/icons/toolbar/14x15-png/addBook.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/addBook.png rename to reader/data/icons/toolbar/14x15-png/addBook.png diff --git a/fbreader/data/icons/toolbar/14x15-png/bookInfo.png b/reader/data/icons/toolbar/14x15-png/bookInfo.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/bookInfo.png rename to reader/data/icons/toolbar/14x15-png/bookInfo.png diff --git a/fbreader/data/icons/toolbar/14x15-png/findNext.png b/reader/data/icons/toolbar/14x15-png/findNext.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/findNext.png rename to reader/data/icons/toolbar/14x15-png/findNext.png diff --git a/fbreader/data/icons/toolbar/14x15-png/findPrevious.png b/reader/data/icons/toolbar/14x15-png/findPrevious.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/findPrevious.png rename to reader/data/icons/toolbar/14x15-png/findPrevious.png diff --git a/fbreader/data/icons/toolbar/14x15-png/gotoHome.png b/reader/data/icons/toolbar/14x15-png/gotoHome.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/gotoHome.png rename to reader/data/icons/toolbar/14x15-png/gotoHome.png diff --git a/fbreader/data/icons/toolbar/14x15-png/preferences.png b/reader/data/icons/toolbar/14x15-png/preferences.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/preferences.png rename to reader/data/icons/toolbar/14x15-png/preferences.png diff --git a/fbreader/data/icons/toolbar/14x15-png/redo.png b/reader/data/icons/toolbar/14x15-png/redo.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/redo.png rename to reader/data/icons/toolbar/14x15-png/redo.png diff --git a/fbreader/data/icons/toolbar/14x15-png/rotate.png b/reader/data/icons/toolbar/14x15-png/rotate.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/rotate.png rename to reader/data/icons/toolbar/14x15-png/rotate.png diff --git a/fbreader/data/icons/toolbar/14x15-png/search.png b/reader/data/icons/toolbar/14x15-png/search.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/search.png rename to reader/data/icons/toolbar/14x15-png/search.png diff --git a/fbreader/data/icons/toolbar/14x15-png/showLibrary.png b/reader/data/icons/toolbar/14x15-png/showLibrary.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/showLibrary.png rename to reader/data/icons/toolbar/14x15-png/showLibrary.png diff --git a/fbreader/data/icons/toolbar/14x15-png/showReading.png b/reader/data/icons/toolbar/14x15-png/showReading.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/showReading.png rename to reader/data/icons/toolbar/14x15-png/showReading.png diff --git a/fbreader/data/icons/toolbar/14x15-png/showRecent.png b/reader/data/icons/toolbar/14x15-png/showRecent.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/showRecent.png rename to reader/data/icons/toolbar/14x15-png/showRecent.png diff --git a/fbreader/data/icons/toolbar/14x15-png/toc.png b/reader/data/icons/toolbar/14x15-png/toc.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/toc.png rename to reader/data/icons/toolbar/14x15-png/toc.png diff --git a/fbreader/data/icons/toolbar/14x15-png/undo.png b/reader/data/icons/toolbar/14x15-png/undo.png similarity index 100% rename from fbreader/data/icons/toolbar/14x15-png/undo.png rename to reader/data/icons/toolbar/14x15-png/undo.png diff --git a/fbreader/data/icons/toolbar/22x18-png/addBook.png b/reader/data/icons/toolbar/22x18-png/addBook.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/addBook.png rename to reader/data/icons/toolbar/22x18-png/addBook.png diff --git a/fbreader/data/icons/toolbar/22x18-png/bookInfo.png b/reader/data/icons/toolbar/22x18-png/bookInfo.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/bookInfo.png rename to reader/data/icons/toolbar/22x18-png/bookInfo.png diff --git a/fbreader/data/icons/toolbar/22x18-png/findNext.png b/reader/data/icons/toolbar/22x18-png/findNext.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/findNext.png rename to reader/data/icons/toolbar/22x18-png/findNext.png diff --git a/fbreader/data/icons/toolbar/22x18-png/findPrevious.png b/reader/data/icons/toolbar/22x18-png/findPrevious.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/findPrevious.png rename to reader/data/icons/toolbar/22x18-png/findPrevious.png diff --git a/fbreader/data/icons/toolbar/22x18-png/gotoHome.png b/reader/data/icons/toolbar/22x18-png/gotoHome.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/gotoHome.png rename to reader/data/icons/toolbar/22x18-png/gotoHome.png diff --git a/fbreader/data/icons/toolbar/22x18-png/preferences.png b/reader/data/icons/toolbar/22x18-png/preferences.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/preferences.png rename to reader/data/icons/toolbar/22x18-png/preferences.png diff --git a/fbreader/data/icons/toolbar/22x18-png/redo.png b/reader/data/icons/toolbar/22x18-png/redo.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/redo.png rename to reader/data/icons/toolbar/22x18-png/redo.png diff --git a/fbreader/data/icons/toolbar/22x18-png/rotate.png b/reader/data/icons/toolbar/22x18-png/rotate.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/rotate.png rename to reader/data/icons/toolbar/22x18-png/rotate.png diff --git a/fbreader/data/icons/toolbar/22x18-png/search.png b/reader/data/icons/toolbar/22x18-png/search.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/search.png rename to reader/data/icons/toolbar/22x18-png/search.png diff --git a/fbreader/data/icons/toolbar/22x18-png/showLibrary.png b/reader/data/icons/toolbar/22x18-png/showLibrary.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/showLibrary.png rename to reader/data/icons/toolbar/22x18-png/showLibrary.png diff --git a/fbreader/data/icons/toolbar/22x18-png/showReading.png b/reader/data/icons/toolbar/22x18-png/showReading.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/showReading.png rename to reader/data/icons/toolbar/22x18-png/showReading.png diff --git a/fbreader/data/icons/toolbar/22x18-png/showRecent.png b/reader/data/icons/toolbar/22x18-png/showRecent.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/showRecent.png rename to reader/data/icons/toolbar/22x18-png/showRecent.png diff --git a/fbreader/data/icons/toolbar/22x18-png/toc.png b/reader/data/icons/toolbar/22x18-png/toc.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/toc.png rename to reader/data/icons/toolbar/22x18-png/toc.png diff --git a/fbreader/data/icons/toolbar/22x18-png/undo.png b/reader/data/icons/toolbar/22x18-png/undo.png similarity index 100% rename from fbreader/data/icons/toolbar/22x18-png/undo.png rename to reader/data/icons/toolbar/22x18-png/undo.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico b/reader/data/icons/toolbar/32x32-transparent-ico/addBook.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/addBook.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico b/reader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico b/reader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico b/reader/data/icons/toolbar/32x32-transparent-ico/byTag.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/byTag.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico b/reader/data/icons/toolbar/32x32-transparent-ico/findNext.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/findNext.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico b/reader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico b/reader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico b/reader/data/icons/toolbar/32x32-transparent-ico/preferences.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/preferences.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/redo.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/redo.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico b/reader/data/icons/toolbar/32x32-transparent-ico/rotate.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/rotate.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico b/reader/data/icons/toolbar/32x32-transparent-ico/search.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/search.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showReading.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/showReading.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico b/reader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico b/reader/data/icons/toolbar/32x32-transparent-ico/toc.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/toc.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico b/reader/data/icons/toolbar/32x32-transparent-ico/undo.ico similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico rename to reader/data/icons/toolbar/32x32-transparent-ico/undo.ico diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png b/reader/data/icons/toolbar/32x32-transparent-png/addBook.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png rename to reader/data/icons/toolbar/32x32-transparent-png/addBook.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png b/reader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png rename to reader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png b/reader/data/icons/toolbar/32x32-transparent-png/bookInfo.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png rename to reader/data/icons/toolbar/32x32-transparent-png/bookInfo.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png b/reader/data/icons/toolbar/32x32-transparent-png/byAuthor.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png rename to reader/data/icons/toolbar/32x32-transparent-png/byAuthor.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png b/reader/data/icons/toolbar/32x32-transparent-png/byTag.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png rename to reader/data/icons/toolbar/32x32-transparent-png/byTag.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png b/reader/data/icons/toolbar/32x32-transparent-png/findNext.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png rename to reader/data/icons/toolbar/32x32-transparent-png/findNext.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png b/reader/data/icons/toolbar/32x32-transparent-png/findPrevious.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png rename to reader/data/icons/toolbar/32x32-transparent-png/findPrevious.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png b/reader/data/icons/toolbar/32x32-transparent-png/gotoHome.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png rename to reader/data/icons/toolbar/32x32-transparent-png/gotoHome.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png b/reader/data/icons/toolbar/32x32-transparent-png/preferences.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png rename to reader/data/icons/toolbar/32x32-transparent-png/preferences.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/redo.png b/reader/data/icons/toolbar/32x32-transparent-png/redo.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/redo.png rename to reader/data/icons/toolbar/32x32-transparent-png/redo.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png b/reader/data/icons/toolbar/32x32-transparent-png/rotate.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png rename to reader/data/icons/toolbar/32x32-transparent-png/rotate.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/search.png b/reader/data/icons/toolbar/32x32-transparent-png/search.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/search.png rename to reader/data/icons/toolbar/32x32-transparent-png/search.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png b/reader/data/icons/toolbar/32x32-transparent-png/showHelp.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png rename to reader/data/icons/toolbar/32x32-transparent-png/showHelp.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showLibrary.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png rename to reader/data/icons/toolbar/32x32-transparent-png/showLibrary.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png rename to reader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png b/reader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png rename to reader/data/icons/toolbar/32x32-transparent-png/showNetworkLibrary.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png b/reader/data/icons/toolbar/32x32-transparent-png/showReading.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png rename to reader/data/icons/toolbar/32x32-transparent-png/showReading.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png b/reader/data/icons/toolbar/32x32-transparent-png/showRecent.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png rename to reader/data/icons/toolbar/32x32-transparent-png/showRecent.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/toc.png b/reader/data/icons/toolbar/32x32-transparent-png/toc.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/toc.png rename to reader/data/icons/toolbar/32x32-transparent-png/toc.png diff --git a/fbreader/data/icons/toolbar/32x32-transparent-png/undo.png b/reader/data/icons/toolbar/32x32-transparent-png/undo.png similarity index 100% rename from fbreader/data/icons/toolbar/32x32-transparent-png/undo.png rename to reader/data/icons/toolbar/32x32-transparent-png/undo.png diff --git a/fbreader/data/icons/toolbar/desktop b/reader/data/icons/toolbar/desktop similarity index 100% rename from fbreader/data/icons/toolbar/desktop rename to reader/data/icons/toolbar/desktop diff --git a/fbreader/data/resources/RIGHTS b/reader/data/resources/RIGHTS similarity index 100% rename from fbreader/data/resources/RIGHTS rename to reader/data/resources/RIGHTS diff --git a/fbreader/data/resources/ar.xml b/reader/data/resources/ar.xml similarity index 98% rename from fbreader/data/resources/ar.xml rename to reader/data/resources/ar.xml index 362a580..273341a 100644 --- a/fbreader/data/resources/ar.xml +++ b/reader/data/resources/ar.xml @@ -1,5 +1,5 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + diff --git a/fbreader/data/resources/bg.xml b/reader/data/resources/bg.xml similarity index 97% rename from fbreader/data/resources/bg.xml rename to reader/data/resources/bg.xml index 9ccafc5..5bed7fb 100644 --- a/fbreader/data/resources/bg.xml +++ b/reader/data/resources/bg.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/cs.xml b/reader/data/resources/cs.xml similarity index 97% rename from fbreader/data/resources/cs.xml rename to reader/data/resources/cs.xml index 134d6df..807d137 100644 --- a/fbreader/data/resources/cs.xml +++ b/reader/data/resources/cs.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/de.xml b/reader/data/resources/de.xml similarity index 97% rename from fbreader/data/resources/de.xml rename to reader/data/resources/de.xml index f050576..7245ccd 100644 --- a/fbreader/data/resources/de.xml +++ b/reader/data/resources/de.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/en.xml b/reader/data/resources/en.xml similarity index 97% rename from fbreader/data/resources/en.xml rename to reader/data/resources/en.xml index 9652cb3..4ea1887 100644 --- a/fbreader/data/resources/en.xml +++ b/reader/data/resources/en.xml @@ -124,7 +124,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -340,7 +340,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -482,7 +482,7 @@ - + @@ -516,12 +516,12 @@ - + - + diff --git a/fbreader/data/resources/eo.xml b/reader/data/resources/eo.xml similarity index 97% rename from fbreader/data/resources/eo.xml rename to reader/data/resources/eo.xml index 4a1d77d..380826a 100644 --- a/fbreader/data/resources/eo.xml +++ b/reader/data/resources/eo.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/es.xml b/reader/data/resources/es.xml similarity index 97% rename from fbreader/data/resources/es.xml rename to reader/data/resources/es.xml index fe62d42..1d02f77 100644 --- a/fbreader/data/resources/es.xml +++ b/reader/data/resources/es.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/fi.xml b/reader/data/resources/fi.xml similarity index 97% rename from fbreader/data/resources/fi.xml rename to reader/data/resources/fi.xml index addb51c..afe9b49 100644 --- a/fbreader/data/resources/fi.xml +++ b/reader/data/resources/fi.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/fr.xml b/reader/data/resources/fr.xml similarity index 97% rename from fbreader/data/resources/fr.xml rename to reader/data/resources/fr.xml index ae45970..922580d 100644 --- a/fbreader/data/resources/fr.xml +++ b/reader/data/resources/fr.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/he.xml b/reader/data/resources/he.xml similarity index 97% rename from fbreader/data/resources/he.xml rename to reader/data/resources/he.xml index 00bf8bb..17f9f9c 100644 --- a/fbreader/data/resources/he.xml +++ b/reader/data/resources/he.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/hu.xml b/reader/data/resources/hu.xml similarity index 97% rename from fbreader/data/resources/hu.xml rename to reader/data/resources/hu.xml index ff2367f..90d7fe4 100644 --- a/fbreader/data/resources/hu.xml +++ b/reader/data/resources/hu.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/id.xml b/reader/data/resources/id.xml similarity index 97% rename from fbreader/data/resources/id.xml rename to reader/data/resources/id.xml index 86b975b..036f583 100644 --- a/fbreader/data/resources/id.xml +++ b/reader/data/resources/id.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/it.xml b/reader/data/resources/it.xml similarity index 97% rename from fbreader/data/resources/it.xml rename to reader/data/resources/it.xml index 7f9f3f9..df2d10c 100644 --- a/fbreader/data/resources/it.xml +++ b/reader/data/resources/it.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/lt.xml b/reader/data/resources/lt.xml similarity index 97% rename from fbreader/data/resources/lt.xml rename to reader/data/resources/lt.xml index 255064e..6c5fbda 100644 --- a/fbreader/data/resources/lt.xml +++ b/reader/data/resources/lt.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/nl.xml b/reader/data/resources/nl.xml similarity index 97% rename from fbreader/data/resources/nl.xml rename to reader/data/resources/nl.xml index 1acc211..65f7c53 100644 --- a/fbreader/data/resources/nl.xml +++ b/reader/data/resources/nl.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/pl.xml b/reader/data/resources/pl.xml similarity index 97% rename from fbreader/data/resources/pl.xml rename to reader/data/resources/pl.xml index 1a25a3c..c47405f 100644 --- a/fbreader/data/resources/pl.xml +++ b/reader/data/resources/pl.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/ru.xml b/reader/data/resources/ru.xml similarity index 97% rename from fbreader/data/resources/ru.xml rename to reader/data/resources/ru.xml index 61c813e..113bfca 100644 --- a/fbreader/data/resources/ru.xml +++ b/reader/data/resources/ru.xml @@ -127,7 +127,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -519,12 +519,12 @@ - + - + diff --git a/fbreader/data/resources/sv.xml b/reader/data/resources/sv.xml similarity index 97% rename from fbreader/data/resources/sv.xml rename to reader/data/resources/sv.xml index f588efd..59ad7bf 100644 --- a/fbreader/data/resources/sv.xml +++ b/reader/data/resources/sv.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/uk.xml b/reader/data/resources/uk.xml similarity index 97% rename from fbreader/data/resources/uk.xml rename to reader/data/resources/uk.xml index 9fae704..019ca78 100644 --- a/fbreader/data/resources/uk.xml +++ b/reader/data/resources/uk.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/vi.xml b/reader/data/resources/vi.xml similarity index 97% rename from fbreader/data/resources/vi.xml rename to reader/data/resources/vi.xml index 8b20a18..dc92878 100644 --- a/fbreader/data/resources/vi.xml +++ b/reader/data/resources/vi.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/data/resources/zh.xml b/reader/data/resources/zh.xml similarity index 96% rename from fbreader/data/resources/zh.xml rename to reader/data/resources/zh.xml index 0aca79d..4ba293d 100644 --- a/fbreader/data/resources/zh.xml +++ b/reader/data/resources/zh.xml @@ -1,5 +1,5 @@ - + @@ -91,7 +91,7 @@ - + @@ -202,8 +202,8 @@ - - + + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -483,12 +483,12 @@ - + - + diff --git a/fbreader/desktop/desktop b/reader/desktop/desktop similarity index 51% rename from fbreader/desktop/desktop rename to reader/desktop/desktop index 5d45cfd..8bdf367 100644 --- a/fbreader/desktop/desktop +++ b/reader/desktop/desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=FBReader +Name=TDE Ebook Reader GenericName=E-book reader GenericName[ar]=قارئ الكتب الإلكترونية GenericName[es]=Lector de Libros @@ -7,18 +7,18 @@ GenericName[hu]=E-könyv olvasó GenericName[pl]=Czytnik e-książek GenericName[ru]=Чтение электронных книг GenericName[zh_CN]=电子书阅读 -Comment=FBReader E-book reader +Comment=TDE Ebook Reader Comment[ar]=قارئ الكتب الإلكترونية -Comment[es]=FBReader Lector de Libros Elecrónicos -Comment[hu]=FBReader, E-könyv olvasó program -Comment[pl]=FBReader, czytnik książek elektronicznych -Comment[ru]=FBReader, программа для чтения электронных книг -Comment[zh_CN]=FBReader 电子书阅读器 -TryExec=FBReader -Exec=FBReader %F +Comment[es]=TDE Ebook Reader Lector de Libros Elecrónicos +Comment[hu]=TDE Ebook Reader, E-könyv olvasó program +Comment[pl]=TDE Ebook Reader, czytnik książek elektronicznych +Comment[ru]=TDE Ebook Reader, программа для чтения электронных книг +Comment[zh_CN]=TDE Ebook Reader 电子书阅读器 +TryExec=tde-ebook-reader +Exec=tde-ebook-reader %F StartupNotify=true Terminal=false Type=Application -Icon=FBReader +Icon=TDEEbookReader Categories=Office;Viewer;Literature; MimeType=application/epub+zip; diff --git a/fbreader/desktop/FBReader.1 b/reader/desktop/tde-ebook-reader.1 similarity index 61% rename from fbreader/desktop/FBReader.1 rename to reader/desktop/tde-ebook-reader.1 index d500bca..e6c7fe8 100644 --- a/fbreader/desktop/FBReader.1 +++ b/reader/desktop/tde-ebook-reader.1 @@ -1,18 +1,18 @@ -.TH FBREADER 1 +.TH TDE EBOOK READER 1 .SH NAME -FBReader \- e-book reader +TDE e-book reader .SH SYNOPSIS -.B FBReader [\fB\-lang \fIlanguage\fP] [\fIe-book\fP] +.B tde-ebook-reader [\fB\-lang \fIlanguage\fP] [\fIe-book\fP] .SH DESCRIPTION -FBReader is an e-book reader. It supports most open e-book formats, and can +tde-ebook-reader is an e-book reader. It supports most open e-book formats, and can read compressed e-book archives. .PP -For more information on using the program, see the "About FBReader" button +For more information on using the program, see the "About TDE Ebook Reader" button on its toolbar. .SH OPTIONS .TP \fB-lang \fIlanguage\fP -Language for user interface. Current version (0.12.0) of fbreader supports +Language for user interface. Current version (0.12.0) of tde-ebook-reader supports Arabic (specify \fB\-lang ar\fP option), Chinese (\fB\-lang zh\fP), Czech (\fB\-lang cs\fP), @@ -31,9 +31,9 @@ Swedish (\fB\-lang sv\fP) and Ukrainian (\fB\-lang uk\fP). .TP \fIe-book\fP -Name of file to open. If this parameter is missing or if FBReader cannot open -the specified file, the last opened file will be reopened. If you start FBReader -for the first time or the last opened file is missing, "About FBReader" text +Name of file to open. If this parameter is missing or if tde-ebook-reader cannot open +the specified file, the last opened file will be reopened. If you start tde-ebook-reader +for the first time or the last opened file is missing, "About TDE Ebook Reader" text will be opened. .SH AUTHOR This man page was written by Joey Hess and Nikolay Pultsin diff --git a/fbreader/src/blockTree/FBReaderNode.cpp b/reader/src/blockTree/ReaderNode.cpp similarity index 77% rename from fbreader/src/blockTree/FBReaderNode.cpp rename to reader/src/blockTree/ReaderNode.cpp index dc72d1e..cdca140 100644 --- a/fbreader/src/blockTree/FBReaderNode.cpp +++ b/reader/src/blockTree/ReaderNode.cpp @@ -21,45 +21,45 @@ #include #include -#include "FBReaderNode.h" +#include "ReaderNode.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" #include "../options/FBOptions.h" #include "../options/FBTextStyle.h" -const ZLTypeId FBReaderNode::TYPE_ID(ZLBlockTreeNode::TYPE_ID); +const ZLTypeId ReaderNode::TYPE_ID(ZLBlockTreeNode::TYPE_ID); -class FBReaderNode::ExpandTreeAction : public ZLRunnableWithKey { +class ReaderNode::ExpandTreeAction : public ZLRunnableWithKey { public: - ExpandTreeAction(FBReaderNode &node); + ExpandTreeAction(ReaderNode &node); void run(); ZLResourceKey key() const; private: - FBReaderNode &myNode; + ReaderNode &myNode; }; -std::map > FBReaderNode::ourDefaultCovers; +std::map > ReaderNode::ourDefaultCovers; -FBReaderNode::FBReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition) : ZLBlockTreeNode(parent, atPosition), myCoverImageIsStored(false), myIsInitialized(false) { +ReaderNode::ReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition) : ZLBlockTreeNode(parent, atPosition), myCoverImageIsStored(false), myIsInitialized(false) { } -void FBReaderNode::init() { +void ReaderNode::init() { } -bool FBReaderNode::highlighted() const { +bool ReaderNode::highlighted() const { return false; } -FBReaderNode::~FBReaderNode() { +ReaderNode::~ReaderNode() { } -const ZLTypeId &FBReaderNode::typeId() const { +const ZLTypeId &ReaderNode::typeId() const { return TYPE_ID; } -shared_ptr FBReaderNode::coverImage() const { +shared_ptr ReaderNode::coverImage() const { if (!myCoverImageIsStored) { myCoverImageIsStored = true; myStoredCoverImage = extractCoverImage(); @@ -67,11 +67,11 @@ shared_ptr FBReaderNode::coverImage() const { return myStoredCoverImage; } -void FBReaderNode::drawCover(ZLPaintContext &context, int vOffset) { +void ReaderNode::drawCover(ZLPaintContext &context, int vOffset) { drawCoverReal(context, vOffset); } -void FBReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) { +void ReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) { shared_ptr cover = coverImage(); if (cover.isNull()) { return; @@ -107,7 +107,7 @@ void FBReaderNode::drawCoverReal(ZLPaintContext &context, int vOffset) { context.drawImage(hOffset + (w - width) / 2, vOffset + (h + height) / 2, *coverData, width, height, ZLPaintContext::SCALE_FIT_TO_SIZE); } -void FBReaderNode::drawTitle(ZLPaintContext &context, int vOffset) { +void ReaderNode::drawTitle(ZLPaintContext &context, int vOffset) { const FBTextStyle &style = FBTextStyle::Instance(); const int unit = unitSize(context, style); const int hOffset = level() * unit * 3 + unit * 2; @@ -121,7 +121,7 @@ void FBReaderNode::drawTitle(ZLPaintContext &context, int vOffset) { context.drawString(hOffset, vOffset + 2 * unit, text.data(), text.size(), false); } -void FBReaderNode::drawSummary(ZLPaintContext &context, int vOffset) { +void ReaderNode::drawSummary(ZLPaintContext &context, int vOffset) { const std::string text = summary(); if (text.empty()) { return; @@ -139,7 +139,7 @@ void FBReaderNode::drawSummary(ZLPaintContext &context, int vOffset) { context.drawString(hOffset, vOffset + 13 * unit / 4, text.data(), text.size(), false); } -void FBReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOffset, shared_ptr action, bool auxiliary) { +void ReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOffset, shared_ptr action, bool auxiliary) { // auxiliary makes font size and hSkip to be 70% of their normal sizes if (action.isNull() || !action->makesSense()) { return; @@ -166,19 +166,19 @@ void FBReaderNode::drawHyperlink(ZLPaintContext &context, int &hOffset, int &vOf hOffset += stringW + 4 * context.spaceWidth(); } -FBReaderNode::ExpandTreeAction::ExpandTreeAction(FBReaderNode &node) : myNode(node) { +ReaderNode::ExpandTreeAction::ExpandTreeAction(ReaderNode &node) : myNode(node) { } -void FBReaderNode::ExpandTreeAction::run() { +void ReaderNode::ExpandTreeAction::run() { myNode.expandOrCollapseSubtree(); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } -ZLResourceKey FBReaderNode::ExpandTreeAction::key() const { +ZLResourceKey ReaderNode::ExpandTreeAction::key() const { return ZLResourceKey(myNode.isOpen() ? "collapseTree" : "expandTree"); } -void FBReaderNode::expandOrCollapseSubtree() { +void ReaderNode::expandOrCollapseSubtree() { if (isOpen()) { open(false); } else if (!children().empty()) { @@ -193,17 +193,17 @@ void FBReaderNode::expandOrCollapseSubtree() { } } -void FBReaderNode::registerAction(shared_ptr action, bool auxiliary) { +void ReaderNode::registerAction(shared_ptr action, bool auxiliary) { if (!action.isNull()) { myActions.push_back(std::make_pair(action, auxiliary)); } } -void FBReaderNode::registerExpandTreeAction() { +void ReaderNode::registerExpandTreeAction() { registerAction(new ExpandTreeAction(*this)); } -shared_ptr FBReaderNode::defaultCoverImage(const std::string &id) { +shared_ptr ReaderNode::defaultCoverImage(const std::string &id) { shared_ptr cover = ourDefaultCovers[id]; if (cover.isNull()) { cover = new ZLFileImage( @@ -214,7 +214,7 @@ shared_ptr FBReaderNode::defaultCoverImage(const std::string &id) return cover; } -int FBReaderNode::height(ZLPaintContext &context) const { +int ReaderNode::height(ZLPaintContext &context) const { bool hasAuxHyperlink = false; for (std::vector,bool> >::const_iterator it = myActions.begin(); it != myActions.end(); ++it) { if (it->second && it->first->makesSense()) { @@ -227,12 +227,12 @@ int FBReaderNode::height(ZLPaintContext &context) const { (hasAuxHyperlink ? 13 : 11) / 2; } -int FBReaderNode::unitSize(ZLPaintContext &context, const FBTextStyle &style) const { +int ReaderNode::unitSize(ZLPaintContext &context, const FBTextStyle &style) const { context.setFont(style.fontFamily(), style.fontSize(), style.bold(), style.italic()); return (context.stringHeight() * 2 + 2) / 3; } -std::string FBReaderNode::summary() const { +std::string ReaderNode::summary() const { std::string result; int count = 0; const ZLBlockTreeNode::List &subNodes = children(); @@ -241,7 +241,7 @@ std::string FBReaderNode::summary() const { if (count > 0) { result += ", "; } - result += ((const FBReaderNode*)*it)->title(); + result += ((const ReaderNode*)*it)->title(); } if (it != subNodes.end()) { result += ", ..."; @@ -249,7 +249,7 @@ std::string FBReaderNode::summary() const { return result; } -void FBReaderNode::paint(ZLPaintContext &context, int vOffset) { +void ReaderNode::paint(ZLPaintContext &context, int vOffset) { if (!myIsInitialized) { init(); myIsInitialized = true; diff --git a/fbreader/src/blockTree/FBReaderNode.h b/reader/src/blockTree/ReaderNode.h similarity index 91% rename from fbreader/src/blockTree/FBReaderNode.h rename to reader/src/blockTree/ReaderNode.h index b38126f..8abb7a1 100644 --- a/fbreader/src/blockTree/FBReaderNode.h +++ b/reader/src/blockTree/ReaderNode.h @@ -17,8 +17,8 @@ * 02110-1301, USA. */ -#ifndef __FBREADERNODE_H__ -#define __FBREADERNODE_H__ +#ifndef __READERNODE_H__ +#define __READERNODE_H__ #include #include @@ -29,7 +29,7 @@ class ZLImage; class ZLResource; class FBTextStyle; -class FBReaderNode : public ZLBlockTreeNode { +class ReaderNode : public ZLBlockTreeNode { protected: static shared_ptr defaultCoverImage(const std::string &id); @@ -44,13 +44,13 @@ public: static const ZLTypeId TYPE_ID; protected: - FBReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition = (std::size_t)-1); + ReaderNode(ZLBlockTreeNode *parent, std::size_t atPosition = (std::size_t)-1); virtual void init(); virtual const ZLResource &resource() const = 0; virtual bool highlighted() const; public: - ~FBReaderNode(); + ~ReaderNode(); void drawCoverReal(ZLPaintContext &context, int vOffset); @@ -89,4 +89,4 @@ private: bool myIsInitialized; }; -#endif /* __FBREADERNODE_H__ */ +#endif /* __READERNODE_H__ */ diff --git a/fbreader/src/bookmodel/BookModel.cpp b/reader/src/bookmodel/BookModel.cpp similarity index 100% rename from fbreader/src/bookmodel/BookModel.cpp rename to reader/src/bookmodel/BookModel.cpp diff --git a/fbreader/src/bookmodel/BookModel.h b/reader/src/bookmodel/BookModel.h similarity index 100% rename from fbreader/src/bookmodel/BookModel.h rename to reader/src/bookmodel/BookModel.h diff --git a/fbreader/src/bookmodel/BookReader.cpp b/reader/src/bookmodel/BookReader.cpp similarity index 100% rename from fbreader/src/bookmodel/BookReader.cpp rename to reader/src/bookmodel/BookReader.cpp diff --git a/fbreader/src/bookmodel/BookReader.h b/reader/src/bookmodel/BookReader.h similarity index 100% rename from fbreader/src/bookmodel/BookReader.h rename to reader/src/bookmodel/BookReader.h diff --git a/fbreader/src/bookmodel/FBHyperlinkType.h b/reader/src/bookmodel/FBHyperlinkType.h similarity index 100% rename from fbreader/src/bookmodel/FBHyperlinkType.h rename to reader/src/bookmodel/FBHyperlinkType.h diff --git a/fbreader/src/bookmodel/FBTextKind.h b/reader/src/bookmodel/FBTextKind.h similarity index 100% rename from fbreader/src/bookmodel/FBTextKind.h rename to reader/src/bookmodel/FBTextKind.h diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/reader/src/database/booksdb/BooksDB.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDB.cpp rename to reader/src/database/booksdb/BooksDB.cpp diff --git a/fbreader/src/database/booksdb/BooksDB.h b/reader/src/database/booksdb/BooksDB.h similarity index 99% rename from fbreader/src/database/booksdb/BooksDB.h rename to reader/src/database/booksdb/BooksDB.h index 634b31b..282a0aa 100644 --- a/fbreader/src/database/booksdb/BooksDB.h +++ b/reader/src/database/booksdb/BooksDB.h @@ -27,7 +27,7 @@ #include "../sqldb/implsqlite/SQLiteDataBase.h" #include "DBRunnables.h" -#include "../../fbreader/ReadingState.h" +#include "../../reader/ReadingState.h" class Book; diff --git a/fbreader/src/database/booksdb/BooksDBQuery.cpp b/reader/src/database/booksdb/BooksDBQuery.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDBQuery.cpp rename to reader/src/database/booksdb/BooksDBQuery.cpp diff --git a/fbreader/src/database/booksdb/BooksDBQuery.h b/reader/src/database/booksdb/BooksDBQuery.h similarity index 100% rename from fbreader/src/database/booksdb/BooksDBQuery.h rename to reader/src/database/booksdb/BooksDBQuery.h diff --git a/fbreader/src/database/booksdb/BooksDBUtil.cpp b/reader/src/database/booksdb/BooksDBUtil.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDBUtil.cpp rename to reader/src/database/booksdb/BooksDBUtil.cpp diff --git a/fbreader/src/database/booksdb/BooksDBUtil.h b/reader/src/database/booksdb/BooksDBUtil.h similarity index 100% rename from fbreader/src/database/booksdb/BooksDBUtil.h rename to reader/src/database/booksdb/BooksDBUtil.h diff --git a/fbreader/src/database/booksdb/BooksDB_BookAuthor.cpp b/reader/src/database/booksdb/BooksDB_BookAuthor.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDB_BookAuthor.cpp rename to reader/src/database/booksdb/BooksDB_BookAuthor.cpp diff --git a/fbreader/src/database/booksdb/BooksDB_BookSeries.cpp b/reader/src/database/booksdb/BooksDB_BookSeries.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDB_BookSeries.cpp rename to reader/src/database/booksdb/BooksDB_BookSeries.cpp diff --git a/fbreader/src/database/booksdb/BooksDB_BookTag.cpp b/reader/src/database/booksdb/BooksDB_BookTag.cpp similarity index 100% rename from fbreader/src/database/booksdb/BooksDB_BookTag.cpp rename to reader/src/database/booksdb/BooksDB_BookTag.cpp diff --git a/fbreader/src/database/booksdb/DBRunnables.h b/reader/src/database/booksdb/DBRunnables.h similarity index 99% rename from fbreader/src/database/booksdb/DBRunnables.h rename to reader/src/database/booksdb/DBRunnables.h index 4baee65..dcbe438 100644 --- a/fbreader/src/database/booksdb/DBRunnables.h +++ b/reader/src/database/booksdb/DBRunnables.h @@ -23,7 +23,7 @@ #include #include -#include "../../fbreader/ReadingState.h" +#include "../../reader/ReadingState.h" #include "../sqldb/DBConnection.h" #include "../sqldb/DBCommand.h" diff --git a/fbreader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp b/reader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp rename to reader/src/database/booksdb/runnables/ClearBooksDBRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/DeleteBookRunnable.cpp b/reader/src/database/booksdb/runnables/DeleteBookRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/DeleteBookRunnable.cpp rename to reader/src/database/booksdb/runnables/DeleteBookRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp b/reader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp rename to reader/src/database/booksdb/runnables/DeleteFileEntriesRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/FindFileIdRunnable.cpp b/reader/src/database/booksdb/runnables/FindFileIdRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/FindFileIdRunnable.cpp rename to reader/src/database/booksdb/runnables/FindFileIdRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp b/reader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp rename to reader/src/database/booksdb/runnables/InitBooksDBRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp b/reader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp rename to reader/src/database/booksdb/runnables/LoadFileEntriesRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp b/reader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp rename to reader/src/database/booksdb/runnables/LoadRecentBooksRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp b/reader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveAuthorsRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveBookRunnable.cpp b/reader/src/database/booksdb/runnables/SaveBookRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveBookRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveBookRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp b/reader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveBookStateStackRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp b/reader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveRecentBooksRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp b/reader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveSeriesRunnable.cpp diff --git a/fbreader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp b/reader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp similarity index 100% rename from fbreader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp rename to reader/src/database/booksdb/runnables/SaveTableBookRunnable.cpp diff --git a/fbreader/src/database/networkdb/DBRunnables.h b/reader/src/database/networkdb/DBRunnables.h similarity index 100% rename from fbreader/src/database/networkdb/DBRunnables.h rename to reader/src/database/networkdb/DBRunnables.h diff --git a/fbreader/src/database/networkdb/NetworkDB.cpp b/reader/src/database/networkdb/NetworkDB.cpp similarity index 100% rename from fbreader/src/database/networkdb/NetworkDB.cpp rename to reader/src/database/networkdb/NetworkDB.cpp diff --git a/fbreader/src/database/networkdb/NetworkDB.h b/reader/src/database/networkdb/NetworkDB.h similarity index 100% rename from fbreader/src/database/networkdb/NetworkDB.h rename to reader/src/database/networkdb/NetworkDB.h diff --git a/fbreader/src/database/networkdb/NetworkDBQuery.cpp b/reader/src/database/networkdb/NetworkDBQuery.cpp similarity index 100% rename from fbreader/src/database/networkdb/NetworkDBQuery.cpp rename to reader/src/database/networkdb/NetworkDBQuery.cpp diff --git a/fbreader/src/database/networkdb/NetworkDBQuery.h b/reader/src/database/networkdb/NetworkDBQuery.h similarity index 100% rename from fbreader/src/database/networkdb/NetworkDBQuery.h rename to reader/src/database/networkdb/NetworkDBQuery.h diff --git a/fbreader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp b/reader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp similarity index 100% rename from fbreader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp rename to reader/src/database/networkdb/runnables/ClearNetworkDBRunnable.cpp diff --git a/fbreader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp b/reader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp similarity index 100% rename from fbreader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp rename to reader/src/database/networkdb/runnables/InitNetworkDBRunnable.cpp diff --git a/fbreader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp b/reader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp similarity index 100% rename from fbreader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp rename to reader/src/database/networkdb/runnables/SaveNetworkLinkRunnable.cpp diff --git a/fbreader/src/database/sqldb/DBCommand.cpp b/reader/src/database/sqldb/DBCommand.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBCommand.cpp rename to reader/src/database/sqldb/DBCommand.cpp diff --git a/fbreader/src/database/sqldb/DBCommand.h b/reader/src/database/sqldb/DBCommand.h similarity index 100% rename from fbreader/src/database/sqldb/DBCommand.h rename to reader/src/database/sqldb/DBCommand.h diff --git a/fbreader/src/database/sqldb/DBCommandParameter.cpp b/reader/src/database/sqldb/DBCommandParameter.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBCommandParameter.cpp rename to reader/src/database/sqldb/DBCommandParameter.cpp diff --git a/fbreader/src/database/sqldb/DBCommandParameter.h b/reader/src/database/sqldb/DBCommandParameter.h similarity index 100% rename from fbreader/src/database/sqldb/DBCommandParameter.h rename to reader/src/database/sqldb/DBCommandParameter.h diff --git a/fbreader/src/database/sqldb/DBConnection.cpp b/reader/src/database/sqldb/DBConnection.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBConnection.cpp rename to reader/src/database/sqldb/DBConnection.cpp diff --git a/fbreader/src/database/sqldb/DBConnection.h b/reader/src/database/sqldb/DBConnection.h similarity index 100% rename from fbreader/src/database/sqldb/DBConnection.h rename to reader/src/database/sqldb/DBConnection.h diff --git a/fbreader/src/database/sqldb/DBDataReader.cpp b/reader/src/database/sqldb/DBDataReader.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBDataReader.cpp rename to reader/src/database/sqldb/DBDataReader.cpp diff --git a/fbreader/src/database/sqldb/DBDataReader.h b/reader/src/database/sqldb/DBDataReader.h similarity index 100% rename from fbreader/src/database/sqldb/DBDataReader.h rename to reader/src/database/sqldb/DBDataReader.h diff --git a/fbreader/src/database/sqldb/DBIntValue.cpp b/reader/src/database/sqldb/DBIntValue.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBIntValue.cpp rename to reader/src/database/sqldb/DBIntValue.cpp diff --git a/fbreader/src/database/sqldb/DBNullValue.cpp b/reader/src/database/sqldb/DBNullValue.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBNullValue.cpp rename to reader/src/database/sqldb/DBNullValue.cpp diff --git a/fbreader/src/database/sqldb/DBRealValue.cpp b/reader/src/database/sqldb/DBRealValue.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBRealValue.cpp rename to reader/src/database/sqldb/DBRealValue.cpp diff --git a/fbreader/src/database/sqldb/DBRunnable.h b/reader/src/database/sqldb/DBRunnable.h similarity index 100% rename from fbreader/src/database/sqldb/DBRunnable.h rename to reader/src/database/sqldb/DBRunnable.h diff --git a/fbreader/src/database/sqldb/DBTextValue.cpp b/reader/src/database/sqldb/DBTextValue.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBTextValue.cpp rename to reader/src/database/sqldb/DBTextValue.cpp diff --git a/fbreader/src/database/sqldb/DBValue.cpp b/reader/src/database/sqldb/DBValue.cpp similarity index 100% rename from fbreader/src/database/sqldb/DBValue.cpp rename to reader/src/database/sqldb/DBValue.cpp diff --git a/fbreader/src/database/sqldb/DBValues.h b/reader/src/database/sqldb/DBValues.h similarity index 100% rename from fbreader/src/database/sqldb/DBValues.h rename to reader/src/database/sqldb/DBValues.h diff --git a/fbreader/src/database/sqldb/DataBase.cpp b/reader/src/database/sqldb/DataBase.cpp similarity index 100% rename from fbreader/src/database/sqldb/DataBase.cpp rename to reader/src/database/sqldb/DataBase.cpp diff --git a/fbreader/src/database/sqldb/DataBase.h b/reader/src/database/sqldb/DataBase.h similarity index 100% rename from fbreader/src/database/sqldb/DataBase.h rename to reader/src/database/sqldb/DataBase.h diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.cpp b/reader/src/database/sqldb/implsqlite/SQLiteCommand.cpp similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteCommand.cpp rename to reader/src/database/sqldb/implsqlite/SQLiteCommand.cpp diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteCommand.h b/reader/src/database/sqldb/implsqlite/SQLiteCommand.h similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteCommand.h rename to reader/src/database/sqldb/implsqlite/SQLiteCommand.h diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.cpp b/reader/src/database/sqldb/implsqlite/SQLiteConnection.cpp similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteConnection.cpp rename to reader/src/database/sqldb/implsqlite/SQLiteConnection.cpp diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteConnection.h b/reader/src/database/sqldb/implsqlite/SQLiteConnection.h similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteConnection.h rename to reader/src/database/sqldb/implsqlite/SQLiteConnection.h diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp rename to reader/src/database/sqldb/implsqlite/SQLiteDataBase.cpp diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.h b/reader/src/database/sqldb/implsqlite/SQLiteDataBase.h similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteDataBase.h rename to reader/src/database/sqldb/implsqlite/SQLiteDataBase.h diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp rename to reader/src/database/sqldb/implsqlite/SQLiteDataReader.cpp diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.h b/reader/src/database/sqldb/implsqlite/SQLiteDataReader.h similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteDataReader.h rename to reader/src/database/sqldb/implsqlite/SQLiteDataReader.h diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.cpp b/reader/src/database/sqldb/implsqlite/SQLiteFactory.cpp similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteFactory.cpp rename to reader/src/database/sqldb/implsqlite/SQLiteFactory.cpp diff --git a/fbreader/src/database/sqldb/implsqlite/SQLiteFactory.h b/reader/src/database/sqldb/implsqlite/SQLiteFactory.h similarity index 100% rename from fbreader/src/database/sqldb/implsqlite/SQLiteFactory.h rename to reader/src/database/sqldb/implsqlite/SQLiteFactory.h diff --git a/fbreader/src/encodingOption/EncodingOptionEntry.cpp b/reader/src/encodingOption/EncodingOptionEntry.cpp similarity index 100% rename from fbreader/src/encodingOption/EncodingOptionEntry.cpp rename to reader/src/encodingOption/EncodingOptionEntry.cpp diff --git a/fbreader/src/encodingOption/EncodingOptionEntry.h b/reader/src/encodingOption/EncodingOptionEntry.h similarity index 100% rename from fbreader/src/encodingOption/EncodingOptionEntry.h rename to reader/src/encodingOption/EncodingOptionEntry.h diff --git a/fbreader/src/external/ProgramCollection.cpp b/reader/src/external/ProgramCollection.cpp similarity index 100% rename from fbreader/src/external/ProgramCollection.cpp rename to reader/src/external/ProgramCollection.cpp diff --git a/fbreader/src/external/ProgramCollection.h b/reader/src/external/ProgramCollection.h similarity index 100% rename from fbreader/src/external/ProgramCollection.h rename to reader/src/external/ProgramCollection.h diff --git a/fbreader/src/formats/EncodedTextReader.cpp b/reader/src/formats/EncodedTextReader.cpp similarity index 100% rename from fbreader/src/formats/EncodedTextReader.cpp rename to reader/src/formats/EncodedTextReader.cpp diff --git a/fbreader/src/formats/EncodedTextReader.h b/reader/src/formats/EncodedTextReader.h similarity index 100% rename from fbreader/src/formats/EncodedTextReader.h rename to reader/src/formats/EncodedTextReader.h diff --git a/fbreader/src/formats/FormatPlugin.cpp b/reader/src/formats/FormatPlugin.cpp similarity index 100% rename from fbreader/src/formats/FormatPlugin.cpp rename to reader/src/formats/FormatPlugin.cpp diff --git a/fbreader/src/formats/FormatPlugin.h b/reader/src/formats/FormatPlugin.h similarity index 100% rename from fbreader/src/formats/FormatPlugin.h rename to reader/src/formats/FormatPlugin.h diff --git a/fbreader/src/formats/PluginCollection.cpp b/reader/src/formats/PluginCollection.cpp similarity index 100% rename from fbreader/src/formats/PluginCollection.cpp rename to reader/src/formats/PluginCollection.cpp diff --git a/fbreader/src/formats/chm/BitStream.cpp b/reader/src/formats/chm/BitStream.cpp similarity index 100% rename from fbreader/src/formats/chm/BitStream.cpp rename to reader/src/formats/chm/BitStream.cpp diff --git a/fbreader/src/formats/chm/BitStream.h b/reader/src/formats/chm/BitStream.h similarity index 100% rename from fbreader/src/formats/chm/BitStream.h rename to reader/src/formats/chm/BitStream.h diff --git a/fbreader/src/formats/chm/CHMFile.cpp b/reader/src/formats/chm/CHMFile.cpp similarity index 100% rename from fbreader/src/formats/chm/CHMFile.cpp rename to reader/src/formats/chm/CHMFile.cpp diff --git a/fbreader/src/formats/chm/CHMFile.h b/reader/src/formats/chm/CHMFile.h similarity index 100% rename from fbreader/src/formats/chm/CHMFile.h rename to reader/src/formats/chm/CHMFile.h diff --git a/fbreader/src/formats/chm/CHMFileImage.cpp b/reader/src/formats/chm/CHMFileImage.cpp similarity index 100% rename from fbreader/src/formats/chm/CHMFileImage.cpp rename to reader/src/formats/chm/CHMFileImage.cpp diff --git a/fbreader/src/formats/chm/CHMFileImage.h b/reader/src/formats/chm/CHMFileImage.h similarity index 100% rename from fbreader/src/formats/chm/CHMFileImage.h rename to reader/src/formats/chm/CHMFileImage.h diff --git a/fbreader/src/formats/chm/CHMPlugin.cpp b/reader/src/formats/chm/CHMPlugin.cpp similarity index 100% rename from fbreader/src/formats/chm/CHMPlugin.cpp rename to reader/src/formats/chm/CHMPlugin.cpp diff --git a/fbreader/src/formats/chm/CHMPlugin.h b/reader/src/formats/chm/CHMPlugin.h similarity index 100% rename from fbreader/src/formats/chm/CHMPlugin.h rename to reader/src/formats/chm/CHMPlugin.h diff --git a/fbreader/src/formats/chm/CHMReferenceCollection.cpp b/reader/src/formats/chm/CHMReferenceCollection.cpp similarity index 100% rename from fbreader/src/formats/chm/CHMReferenceCollection.cpp rename to reader/src/formats/chm/CHMReferenceCollection.cpp diff --git a/fbreader/src/formats/chm/CHMReferenceCollection.h b/reader/src/formats/chm/CHMReferenceCollection.h similarity index 100% rename from fbreader/src/formats/chm/CHMReferenceCollection.h rename to reader/src/formats/chm/CHMReferenceCollection.h diff --git a/fbreader/src/formats/chm/E8Decoder.cpp b/reader/src/formats/chm/E8Decoder.cpp similarity index 100% rename from fbreader/src/formats/chm/E8Decoder.cpp rename to reader/src/formats/chm/E8Decoder.cpp diff --git a/fbreader/src/formats/chm/HHCReader.cpp b/reader/src/formats/chm/HHCReader.cpp similarity index 100% rename from fbreader/src/formats/chm/HHCReader.cpp rename to reader/src/formats/chm/HHCReader.cpp diff --git a/fbreader/src/formats/chm/HHCReader.h b/reader/src/formats/chm/HHCReader.h similarity index 100% rename from fbreader/src/formats/chm/HHCReader.h rename to reader/src/formats/chm/HHCReader.h diff --git a/fbreader/src/formats/chm/HHCReferenceCollector.cpp b/reader/src/formats/chm/HHCReferenceCollector.cpp similarity index 100% rename from fbreader/src/formats/chm/HHCReferenceCollector.cpp rename to reader/src/formats/chm/HHCReferenceCollector.cpp diff --git a/fbreader/src/formats/chm/HHCReferenceCollector.h b/reader/src/formats/chm/HHCReferenceCollector.h similarity index 100% rename from fbreader/src/formats/chm/HHCReferenceCollector.h rename to reader/src/formats/chm/HHCReferenceCollector.h diff --git a/fbreader/src/formats/chm/HtmlSectionReader.cpp b/reader/src/formats/chm/HtmlSectionReader.cpp similarity index 100% rename from fbreader/src/formats/chm/HtmlSectionReader.cpp rename to reader/src/formats/chm/HtmlSectionReader.cpp diff --git a/fbreader/src/formats/chm/HtmlSectionReader.h b/reader/src/formats/chm/HtmlSectionReader.h similarity index 100% rename from fbreader/src/formats/chm/HtmlSectionReader.h rename to reader/src/formats/chm/HtmlSectionReader.h diff --git a/fbreader/src/formats/chm/HuffmanDecoder.cpp b/reader/src/formats/chm/HuffmanDecoder.cpp similarity index 100% rename from fbreader/src/formats/chm/HuffmanDecoder.cpp rename to reader/src/formats/chm/HuffmanDecoder.cpp diff --git a/fbreader/src/formats/chm/HuffmanDecoder.h b/reader/src/formats/chm/HuffmanDecoder.h similarity index 100% rename from fbreader/src/formats/chm/HuffmanDecoder.h rename to reader/src/formats/chm/HuffmanDecoder.h diff --git a/fbreader/src/formats/chm/LZXDecompressor.cpp b/reader/src/formats/chm/LZXDecompressor.cpp similarity index 100% rename from fbreader/src/formats/chm/LZXDecompressor.cpp rename to reader/src/formats/chm/LZXDecompressor.cpp diff --git a/fbreader/src/formats/chm/LZXDecompressor.h b/reader/src/formats/chm/LZXDecompressor.h similarity index 100% rename from fbreader/src/formats/chm/LZXDecompressor.h rename to reader/src/formats/chm/LZXDecompressor.h diff --git a/fbreader/src/formats/css/StyleSheetParser.cpp b/reader/src/formats/css/StyleSheetParser.cpp similarity index 100% rename from fbreader/src/formats/css/StyleSheetParser.cpp rename to reader/src/formats/css/StyleSheetParser.cpp diff --git a/fbreader/src/formats/css/StyleSheetParser.h b/reader/src/formats/css/StyleSheetParser.h similarity index 100% rename from fbreader/src/formats/css/StyleSheetParser.h rename to reader/src/formats/css/StyleSheetParser.h diff --git a/fbreader/src/formats/css/StyleSheetTable.cpp b/reader/src/formats/css/StyleSheetTable.cpp similarity index 100% rename from fbreader/src/formats/css/StyleSheetTable.cpp rename to reader/src/formats/css/StyleSheetTable.cpp diff --git a/fbreader/src/formats/css/StyleSheetTable.h b/reader/src/formats/css/StyleSheetTable.h similarity index 100% rename from fbreader/src/formats/css/StyleSheetTable.h rename to reader/src/formats/css/StyleSheetTable.h diff --git a/fbreader/src/formats/doc/DocBookReader.cpp b/reader/src/formats/doc/DocBookReader.cpp similarity index 100% rename from fbreader/src/formats/doc/DocBookReader.cpp rename to reader/src/formats/doc/DocBookReader.cpp diff --git a/fbreader/src/formats/doc/DocBookReader.h b/reader/src/formats/doc/DocBookReader.h similarity index 100% rename from fbreader/src/formats/doc/DocBookReader.h rename to reader/src/formats/doc/DocBookReader.h diff --git a/fbreader/src/formats/doc/DocFloatImageReader.cpp b/reader/src/formats/doc/DocFloatImageReader.cpp similarity index 100% rename from fbreader/src/formats/doc/DocFloatImageReader.cpp rename to reader/src/formats/doc/DocFloatImageReader.cpp diff --git a/fbreader/src/formats/doc/DocFloatImageReader.h b/reader/src/formats/doc/DocFloatImageReader.h similarity index 100% rename from fbreader/src/formats/doc/DocFloatImageReader.h rename to reader/src/formats/doc/DocFloatImageReader.h diff --git a/fbreader/src/formats/doc/DocInlineImageReader.cpp b/reader/src/formats/doc/DocInlineImageReader.cpp similarity index 100% rename from fbreader/src/formats/doc/DocInlineImageReader.cpp rename to reader/src/formats/doc/DocInlineImageReader.cpp diff --git a/fbreader/src/formats/doc/DocInlineImageReader.h b/reader/src/formats/doc/DocInlineImageReader.h similarity index 100% rename from fbreader/src/formats/doc/DocInlineImageReader.h rename to reader/src/formats/doc/DocInlineImageReader.h diff --git a/fbreader/src/formats/doc/DocMetaInfoReader.cpp b/reader/src/formats/doc/DocMetaInfoReader.cpp similarity index 100% rename from fbreader/src/formats/doc/DocMetaInfoReader.cpp rename to reader/src/formats/doc/DocMetaInfoReader.cpp diff --git a/fbreader/src/formats/doc/DocMetaInfoReader.h b/reader/src/formats/doc/DocMetaInfoReader.h similarity index 100% rename from fbreader/src/formats/doc/DocMetaInfoReader.h rename to reader/src/formats/doc/DocMetaInfoReader.h diff --git a/fbreader/src/formats/doc/DocPlugin.cpp b/reader/src/formats/doc/DocPlugin.cpp similarity index 100% rename from fbreader/src/formats/doc/DocPlugin.cpp rename to reader/src/formats/doc/DocPlugin.cpp diff --git a/fbreader/src/formats/doc/DocPlugin.h b/reader/src/formats/doc/DocPlugin.h similarity index 100% rename from fbreader/src/formats/doc/DocPlugin.h rename to reader/src/formats/doc/DocPlugin.h diff --git a/fbreader/src/formats/doc/DocStreams.cpp b/reader/src/formats/doc/DocStreams.cpp similarity index 100% rename from fbreader/src/formats/doc/DocStreams.cpp rename to reader/src/formats/doc/DocStreams.cpp diff --git a/fbreader/src/formats/doc/DocStreams.h b/reader/src/formats/doc/DocStreams.h similarity index 100% rename from fbreader/src/formats/doc/DocStreams.h rename to reader/src/formats/doc/DocStreams.h diff --git a/fbreader/src/formats/doc/OleMainStream.cpp b/reader/src/formats/doc/OleMainStream.cpp similarity index 100% rename from fbreader/src/formats/doc/OleMainStream.cpp rename to reader/src/formats/doc/OleMainStream.cpp diff --git a/fbreader/src/formats/doc/OleMainStream.h b/reader/src/formats/doc/OleMainStream.h similarity index 100% rename from fbreader/src/formats/doc/OleMainStream.h rename to reader/src/formats/doc/OleMainStream.h diff --git a/fbreader/src/formats/doc/OleStorage.cpp b/reader/src/formats/doc/OleStorage.cpp similarity index 100% rename from fbreader/src/formats/doc/OleStorage.cpp rename to reader/src/formats/doc/OleStorage.cpp diff --git a/fbreader/src/formats/doc/OleStorage.h b/reader/src/formats/doc/OleStorage.h similarity index 100% rename from fbreader/src/formats/doc/OleStorage.h rename to reader/src/formats/doc/OleStorage.h diff --git a/fbreader/src/formats/doc/OleStream.cpp b/reader/src/formats/doc/OleStream.cpp similarity index 100% rename from fbreader/src/formats/doc/OleStream.cpp rename to reader/src/formats/doc/OleStream.cpp diff --git a/fbreader/src/formats/doc/OleStream.h b/reader/src/formats/doc/OleStream.h similarity index 100% rename from fbreader/src/formats/doc/OleStream.h rename to reader/src/formats/doc/OleStream.h diff --git a/fbreader/src/formats/doc/OleStreamParser.cpp b/reader/src/formats/doc/OleStreamParser.cpp similarity index 100% rename from fbreader/src/formats/doc/OleStreamParser.cpp rename to reader/src/formats/doc/OleStreamParser.cpp diff --git a/fbreader/src/formats/doc/OleStreamParser.h b/reader/src/formats/doc/OleStreamParser.h similarity index 100% rename from fbreader/src/formats/doc/OleStreamParser.h rename to reader/src/formats/doc/OleStreamParser.h diff --git a/fbreader/src/formats/doc/OleStreamReader.cpp b/reader/src/formats/doc/OleStreamReader.cpp similarity index 100% rename from fbreader/src/formats/doc/OleStreamReader.cpp rename to reader/src/formats/doc/OleStreamReader.cpp diff --git a/fbreader/src/formats/doc/OleStreamReader.h b/reader/src/formats/doc/OleStreamReader.h similarity index 100% rename from fbreader/src/formats/doc/OleStreamReader.h rename to reader/src/formats/doc/OleStreamReader.h diff --git a/fbreader/src/formats/doc/OleUtil.cpp b/reader/src/formats/doc/OleUtil.cpp similarity index 100% rename from fbreader/src/formats/doc/OleUtil.cpp rename to reader/src/formats/doc/OleUtil.cpp diff --git a/fbreader/src/formats/doc/OleUtil.h b/reader/src/formats/doc/OleUtil.h similarity index 100% rename from fbreader/src/formats/doc/OleUtil.h rename to reader/src/formats/doc/OleUtil.h diff --git a/fbreader/src/formats/docbook/DocBookBookReader.cpp b/reader/src/formats/docbook/DocBookBookReader.cpp similarity index 100% rename from fbreader/src/formats/docbook/DocBookBookReader.cpp rename to reader/src/formats/docbook/DocBookBookReader.cpp diff --git a/fbreader/src/formats/docbook/DocBookBookReader.h b/reader/src/formats/docbook/DocBookBookReader.h similarity index 100% rename from fbreader/src/formats/docbook/DocBookBookReader.h rename to reader/src/formats/docbook/DocBookBookReader.h diff --git a/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp b/reader/src/formats/docbook/DocBookDescriptionReader.cpp similarity index 100% rename from fbreader/src/formats/docbook/DocBookDescriptionReader.cpp rename to reader/src/formats/docbook/DocBookDescriptionReader.cpp diff --git a/fbreader/src/formats/docbook/DocBookDescriptionReader.h b/reader/src/formats/docbook/DocBookDescriptionReader.h similarity index 100% rename from fbreader/src/formats/docbook/DocBookDescriptionReader.h rename to reader/src/formats/docbook/DocBookDescriptionReader.h diff --git a/fbreader/src/formats/docbook/DocBookPlugin.cpp b/reader/src/formats/docbook/DocBookPlugin.cpp similarity index 100% rename from fbreader/src/formats/docbook/DocBookPlugin.cpp rename to reader/src/formats/docbook/DocBookPlugin.cpp diff --git a/fbreader/src/formats/docbook/DocBookPlugin.h b/reader/src/formats/docbook/DocBookPlugin.h similarity index 100% rename from fbreader/src/formats/docbook/DocBookPlugin.h rename to reader/src/formats/docbook/DocBookPlugin.h diff --git a/fbreader/src/formats/docbook/DocBookReader.cpp b/reader/src/formats/docbook/DocBookReader.cpp similarity index 100% rename from fbreader/src/formats/docbook/DocBookReader.cpp rename to reader/src/formats/docbook/DocBookReader.cpp diff --git a/fbreader/src/formats/docbook/DocBookReader.h b/reader/src/formats/docbook/DocBookReader.h similarity index 100% rename from fbreader/src/formats/docbook/DocBookReader.h rename to reader/src/formats/docbook/DocBookReader.h diff --git a/fbreader/src/formats/dummy/DummyBookReader.cpp b/reader/src/formats/dummy/DummyBookReader.cpp similarity index 100% rename from fbreader/src/formats/dummy/DummyBookReader.cpp rename to reader/src/formats/dummy/DummyBookReader.cpp diff --git a/fbreader/src/formats/dummy/DummyBookReader.h b/reader/src/formats/dummy/DummyBookReader.h similarity index 100% rename from fbreader/src/formats/dummy/DummyBookReader.h rename to reader/src/formats/dummy/DummyBookReader.h diff --git a/fbreader/src/formats/dummy/DummyMetaInfoReader.cpp b/reader/src/formats/dummy/DummyMetaInfoReader.cpp similarity index 100% rename from fbreader/src/formats/dummy/DummyMetaInfoReader.cpp rename to reader/src/formats/dummy/DummyMetaInfoReader.cpp diff --git a/fbreader/src/formats/dummy/DummyMetaInfoReader.h b/reader/src/formats/dummy/DummyMetaInfoReader.h similarity index 100% rename from fbreader/src/formats/dummy/DummyMetaInfoReader.h rename to reader/src/formats/dummy/DummyMetaInfoReader.h diff --git a/fbreader/src/formats/dummy/DummyPlugin.cpp b/reader/src/formats/dummy/DummyPlugin.cpp similarity index 100% rename from fbreader/src/formats/dummy/DummyPlugin.cpp rename to reader/src/formats/dummy/DummyPlugin.cpp diff --git a/fbreader/src/formats/dummy/DummyPlugin.h b/reader/src/formats/dummy/DummyPlugin.h similarity index 100% rename from fbreader/src/formats/dummy/DummyPlugin.h rename to reader/src/formats/dummy/DummyPlugin.h diff --git a/fbreader/src/formats/dummy/createPlugin.sh b/reader/src/formats/dummy/createPlugin.sh similarity index 100% rename from fbreader/src/formats/dummy/createPlugin.sh rename to reader/src/formats/dummy/createPlugin.sh diff --git a/fbreader/src/formats/fb2/FB2BookReader.cpp b/reader/src/formats/fb2/FB2BookReader.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2BookReader.cpp rename to reader/src/formats/fb2/FB2BookReader.cpp diff --git a/fbreader/src/formats/fb2/FB2BookReader.h b/reader/src/formats/fb2/FB2BookReader.h similarity index 100% rename from fbreader/src/formats/fb2/FB2BookReader.h rename to reader/src/formats/fb2/FB2BookReader.h diff --git a/fbreader/src/formats/fb2/FB2CoverReader.cpp b/reader/src/formats/fb2/FB2CoverReader.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2CoverReader.cpp rename to reader/src/formats/fb2/FB2CoverReader.cpp diff --git a/fbreader/src/formats/fb2/FB2CoverReader.h b/reader/src/formats/fb2/FB2CoverReader.h similarity index 100% rename from fbreader/src/formats/fb2/FB2CoverReader.h rename to reader/src/formats/fb2/FB2CoverReader.h diff --git a/fbreader/src/formats/fb2/FB2MetaInfoReader.cpp b/reader/src/formats/fb2/FB2MetaInfoReader.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2MetaInfoReader.cpp rename to reader/src/formats/fb2/FB2MetaInfoReader.cpp diff --git a/fbreader/src/formats/fb2/FB2MetaInfoReader.h b/reader/src/formats/fb2/FB2MetaInfoReader.h similarity index 100% rename from fbreader/src/formats/fb2/FB2MetaInfoReader.h rename to reader/src/formats/fb2/FB2MetaInfoReader.h diff --git a/fbreader/src/formats/fb2/FB2Plugin.cpp b/reader/src/formats/fb2/FB2Plugin.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2Plugin.cpp rename to reader/src/formats/fb2/FB2Plugin.cpp diff --git a/fbreader/src/formats/fb2/FB2Plugin.h b/reader/src/formats/fb2/FB2Plugin.h similarity index 100% rename from fbreader/src/formats/fb2/FB2Plugin.h rename to reader/src/formats/fb2/FB2Plugin.h diff --git a/fbreader/src/formats/fb2/FB2Reader.cpp b/reader/src/formats/fb2/FB2Reader.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2Reader.cpp rename to reader/src/formats/fb2/FB2Reader.cpp diff --git a/fbreader/src/formats/fb2/FB2Reader.h b/reader/src/formats/fb2/FB2Reader.h similarity index 100% rename from fbreader/src/formats/fb2/FB2Reader.h rename to reader/src/formats/fb2/FB2Reader.h diff --git a/fbreader/src/formats/fb2/FB2TagManager.cpp b/reader/src/formats/fb2/FB2TagManager.cpp similarity index 100% rename from fbreader/src/formats/fb2/FB2TagManager.cpp rename to reader/src/formats/fb2/FB2TagManager.cpp diff --git a/fbreader/src/formats/fb2/FB2TagManager.h b/reader/src/formats/fb2/FB2TagManager.h similarity index 100% rename from fbreader/src/formats/fb2/FB2TagManager.h rename to reader/src/formats/fb2/FB2TagManager.h diff --git a/fbreader/src/formats/html/HtmlBookReader.cpp b/reader/src/formats/html/HtmlBookReader.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlBookReader.cpp rename to reader/src/formats/html/HtmlBookReader.cpp diff --git a/fbreader/src/formats/html/HtmlBookReader.h b/reader/src/formats/html/HtmlBookReader.h similarity index 100% rename from fbreader/src/formats/html/HtmlBookReader.h rename to reader/src/formats/html/HtmlBookReader.h diff --git a/fbreader/src/formats/html/HtmlDescriptionReader.cpp b/reader/src/formats/html/HtmlDescriptionReader.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlDescriptionReader.cpp rename to reader/src/formats/html/HtmlDescriptionReader.cpp diff --git a/fbreader/src/formats/html/HtmlDescriptionReader.h b/reader/src/formats/html/HtmlDescriptionReader.h similarity index 100% rename from fbreader/src/formats/html/HtmlDescriptionReader.h rename to reader/src/formats/html/HtmlDescriptionReader.h diff --git a/fbreader/src/formats/html/HtmlEntityCollection.cpp b/reader/src/formats/html/HtmlEntityCollection.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlEntityCollection.cpp rename to reader/src/formats/html/HtmlEntityCollection.cpp diff --git a/fbreader/src/formats/html/HtmlEntityCollection.h b/reader/src/formats/html/HtmlEntityCollection.h similarity index 100% rename from fbreader/src/formats/html/HtmlEntityCollection.h rename to reader/src/formats/html/HtmlEntityCollection.h diff --git a/fbreader/src/formats/html/HtmlPlugin.cpp b/reader/src/formats/html/HtmlPlugin.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlPlugin.cpp rename to reader/src/formats/html/HtmlPlugin.cpp diff --git a/fbreader/src/formats/html/HtmlPlugin.h b/reader/src/formats/html/HtmlPlugin.h similarity index 100% rename from fbreader/src/formats/html/HtmlPlugin.h rename to reader/src/formats/html/HtmlPlugin.h diff --git a/fbreader/src/formats/html/HtmlReader.cpp b/reader/src/formats/html/HtmlReader.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlReader.cpp rename to reader/src/formats/html/HtmlReader.cpp diff --git a/fbreader/src/formats/html/HtmlReader.h b/reader/src/formats/html/HtmlReader.h similarity index 100% rename from fbreader/src/formats/html/HtmlReader.h rename to reader/src/formats/html/HtmlReader.h diff --git a/fbreader/src/formats/html/HtmlReaderStream.cpp b/reader/src/formats/html/HtmlReaderStream.cpp similarity index 100% rename from fbreader/src/formats/html/HtmlReaderStream.cpp rename to reader/src/formats/html/HtmlReaderStream.cpp diff --git a/fbreader/src/formats/html/HtmlReaderStream.h b/reader/src/formats/html/HtmlReaderStream.h similarity index 100% rename from fbreader/src/formats/html/HtmlReaderStream.h rename to reader/src/formats/html/HtmlReaderStream.h diff --git a/fbreader/src/formats/html/HtmlTagActions.h b/reader/src/formats/html/HtmlTagActions.h similarity index 100% rename from fbreader/src/formats/html/HtmlTagActions.h rename to reader/src/formats/html/HtmlTagActions.h diff --git a/fbreader/src/formats/oeb/NCXReader.cpp b/reader/src/formats/oeb/NCXReader.cpp similarity index 100% rename from fbreader/src/formats/oeb/NCXReader.cpp rename to reader/src/formats/oeb/NCXReader.cpp diff --git a/fbreader/src/formats/oeb/NCXReader.h b/reader/src/formats/oeb/NCXReader.h similarity index 100% rename from fbreader/src/formats/oeb/NCXReader.h rename to reader/src/formats/oeb/NCXReader.h diff --git a/fbreader/src/formats/oeb/OEBBookReader.cpp b/reader/src/formats/oeb/OEBBookReader.cpp similarity index 100% rename from fbreader/src/formats/oeb/OEBBookReader.cpp rename to reader/src/formats/oeb/OEBBookReader.cpp diff --git a/fbreader/src/formats/oeb/OEBBookReader.h b/reader/src/formats/oeb/OEBBookReader.h similarity index 100% rename from fbreader/src/formats/oeb/OEBBookReader.h rename to reader/src/formats/oeb/OEBBookReader.h diff --git a/fbreader/src/formats/oeb/OEBCoverReader.cpp b/reader/src/formats/oeb/OEBCoverReader.cpp similarity index 100% rename from fbreader/src/formats/oeb/OEBCoverReader.cpp rename to reader/src/formats/oeb/OEBCoverReader.cpp diff --git a/fbreader/src/formats/oeb/OEBCoverReader.h b/reader/src/formats/oeb/OEBCoverReader.h similarity index 100% rename from fbreader/src/formats/oeb/OEBCoverReader.h rename to reader/src/formats/oeb/OEBCoverReader.h diff --git a/fbreader/src/formats/oeb/OEBMetaInfoReader.cpp b/reader/src/formats/oeb/OEBMetaInfoReader.cpp similarity index 100% rename from fbreader/src/formats/oeb/OEBMetaInfoReader.cpp rename to reader/src/formats/oeb/OEBMetaInfoReader.cpp diff --git a/fbreader/src/formats/oeb/OEBMetaInfoReader.h b/reader/src/formats/oeb/OEBMetaInfoReader.h similarity index 100% rename from fbreader/src/formats/oeb/OEBMetaInfoReader.h rename to reader/src/formats/oeb/OEBMetaInfoReader.h diff --git a/fbreader/src/formats/oeb/OEBPlugin.cpp b/reader/src/formats/oeb/OEBPlugin.cpp similarity index 100% rename from fbreader/src/formats/oeb/OEBPlugin.cpp rename to reader/src/formats/oeb/OEBPlugin.cpp diff --git a/fbreader/src/formats/oeb/OEBPlugin.h b/reader/src/formats/oeb/OEBPlugin.h similarity index 100% rename from fbreader/src/formats/oeb/OEBPlugin.h rename to reader/src/formats/oeb/OEBPlugin.h diff --git a/fbreader/src/formats/oeb/OEBTextStream.cpp b/reader/src/formats/oeb/OEBTextStream.cpp similarity index 100% rename from fbreader/src/formats/oeb/OEBTextStream.cpp rename to reader/src/formats/oeb/OEBTextStream.cpp diff --git a/fbreader/src/formats/oeb/OEBTextStream.h b/reader/src/formats/oeb/OEBTextStream.h similarity index 100% rename from fbreader/src/formats/oeb/OEBTextStream.h rename to reader/src/formats/oeb/OEBTextStream.h diff --git a/fbreader/src/formats/oeb/XHTMLImageFinder.cpp b/reader/src/formats/oeb/XHTMLImageFinder.cpp similarity index 100% rename from fbreader/src/formats/oeb/XHTMLImageFinder.cpp rename to reader/src/formats/oeb/XHTMLImageFinder.cpp diff --git a/fbreader/src/formats/oeb/XHTMLImageFinder.h b/reader/src/formats/oeb/XHTMLImageFinder.h similarity index 100% rename from fbreader/src/formats/oeb/XHTMLImageFinder.h rename to reader/src/formats/oeb/XHTMLImageFinder.h diff --git a/fbreader/src/formats/openreader/ORBookReader.cpp b/reader/src/formats/openreader/ORBookReader.cpp similarity index 100% rename from fbreader/src/formats/openreader/ORBookReader.cpp rename to reader/src/formats/openreader/ORBookReader.cpp diff --git a/fbreader/src/formats/openreader/ORBookReader.h b/reader/src/formats/openreader/ORBookReader.h similarity index 100% rename from fbreader/src/formats/openreader/ORBookReader.h rename to reader/src/formats/openreader/ORBookReader.h diff --git a/fbreader/src/formats/openreader/ORDescriptionReader.cpp b/reader/src/formats/openreader/ORDescriptionReader.cpp similarity index 100% rename from fbreader/src/formats/openreader/ORDescriptionReader.cpp rename to reader/src/formats/openreader/ORDescriptionReader.cpp diff --git a/fbreader/src/formats/openreader/ORDescriptionReader.h b/reader/src/formats/openreader/ORDescriptionReader.h similarity index 100% rename from fbreader/src/formats/openreader/ORDescriptionReader.h rename to reader/src/formats/openreader/ORDescriptionReader.h diff --git a/fbreader/src/formats/openreader/OpenReaderPlugin.cpp b/reader/src/formats/openreader/OpenReaderPlugin.cpp similarity index 100% rename from fbreader/src/formats/openreader/OpenReaderPlugin.cpp rename to reader/src/formats/openreader/OpenReaderPlugin.cpp diff --git a/fbreader/src/formats/openreader/OpenReaderPlugin.h b/reader/src/formats/openreader/OpenReaderPlugin.h similarity index 100% rename from fbreader/src/formats/openreader/OpenReaderPlugin.h rename to reader/src/formats/openreader/OpenReaderPlugin.h diff --git a/fbreader/src/formats/pdb/BitReader.cpp b/reader/src/formats/pdb/BitReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/BitReader.cpp rename to reader/src/formats/pdb/BitReader.cpp diff --git a/fbreader/src/formats/pdb/BitReader.h b/reader/src/formats/pdb/BitReader.h similarity index 100% rename from fbreader/src/formats/pdb/BitReader.h rename to reader/src/formats/pdb/BitReader.h diff --git a/fbreader/src/formats/pdb/DocDecompressor.cpp b/reader/src/formats/pdb/DocDecompressor.cpp similarity index 100% rename from fbreader/src/formats/pdb/DocDecompressor.cpp rename to reader/src/formats/pdb/DocDecompressor.cpp diff --git a/fbreader/src/formats/pdb/DocDecompressor.h b/reader/src/formats/pdb/DocDecompressor.h similarity index 100% rename from fbreader/src/formats/pdb/DocDecompressor.h rename to reader/src/formats/pdb/DocDecompressor.h diff --git a/fbreader/src/formats/pdb/EReaderPlugin.cpp b/reader/src/formats/pdb/EReaderPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/EReaderPlugin.cpp rename to reader/src/formats/pdb/EReaderPlugin.cpp diff --git a/fbreader/src/formats/pdb/EReaderStream.cpp b/reader/src/formats/pdb/EReaderStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/EReaderStream.cpp rename to reader/src/formats/pdb/EReaderStream.cpp diff --git a/fbreader/src/formats/pdb/EReaderStream.h b/reader/src/formats/pdb/EReaderStream.h similarity index 100% rename from fbreader/src/formats/pdb/EReaderStream.h rename to reader/src/formats/pdb/EReaderStream.h diff --git a/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp b/reader/src/formats/pdb/HtmlMetainfoReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/HtmlMetainfoReader.cpp rename to reader/src/formats/pdb/HtmlMetainfoReader.cpp diff --git a/fbreader/src/formats/pdb/HtmlMetainfoReader.h b/reader/src/formats/pdb/HtmlMetainfoReader.h similarity index 100% rename from fbreader/src/formats/pdb/HtmlMetainfoReader.h rename to reader/src/formats/pdb/HtmlMetainfoReader.h diff --git a/fbreader/src/formats/pdb/HuffDecompressor.cpp b/reader/src/formats/pdb/HuffDecompressor.cpp similarity index 100% rename from fbreader/src/formats/pdb/HuffDecompressor.cpp rename to reader/src/formats/pdb/HuffDecompressor.cpp diff --git a/fbreader/src/formats/pdb/HuffDecompressor.h b/reader/src/formats/pdb/HuffDecompressor.h similarity index 100% rename from fbreader/src/formats/pdb/HuffDecompressor.h rename to reader/src/formats/pdb/HuffDecompressor.h diff --git a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp b/reader/src/formats/pdb/MobipocketHtmlBookReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp rename to reader/src/formats/pdb/MobipocketHtmlBookReader.cpp diff --git a/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h b/reader/src/formats/pdb/MobipocketHtmlBookReader.h similarity index 100% rename from fbreader/src/formats/pdb/MobipocketHtmlBookReader.h rename to reader/src/formats/pdb/MobipocketHtmlBookReader.h diff --git a/fbreader/src/formats/pdb/MobipocketPlugin.cpp b/reader/src/formats/pdb/MobipocketPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/MobipocketPlugin.cpp rename to reader/src/formats/pdb/MobipocketPlugin.cpp diff --git a/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp b/reader/src/formats/pdb/PalmDocLikePlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/PalmDocLikePlugin.cpp rename to reader/src/formats/pdb/PalmDocLikePlugin.cpp diff --git a/fbreader/src/formats/pdb/PalmDocLikeStream.cpp b/reader/src/formats/pdb/PalmDocLikeStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/PalmDocLikeStream.cpp rename to reader/src/formats/pdb/PalmDocLikeStream.cpp diff --git a/fbreader/src/formats/pdb/PalmDocLikeStream.h b/reader/src/formats/pdb/PalmDocLikeStream.h similarity index 100% rename from fbreader/src/formats/pdb/PalmDocLikeStream.h rename to reader/src/formats/pdb/PalmDocLikeStream.h diff --git a/fbreader/src/formats/pdb/PalmDocPlugin.cpp b/reader/src/formats/pdb/PalmDocPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/PalmDocPlugin.cpp rename to reader/src/formats/pdb/PalmDocPlugin.cpp diff --git a/fbreader/src/formats/pdb/PalmDocStream.cpp b/reader/src/formats/pdb/PalmDocStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/PalmDocStream.cpp rename to reader/src/formats/pdb/PalmDocStream.cpp diff --git a/fbreader/src/formats/pdb/PalmDocStream.h b/reader/src/formats/pdb/PalmDocStream.h similarity index 100% rename from fbreader/src/formats/pdb/PalmDocStream.h rename to reader/src/formats/pdb/PalmDocStream.h diff --git a/fbreader/src/formats/pdb/PdbPlugin.cpp b/reader/src/formats/pdb/PdbPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/PdbPlugin.cpp rename to reader/src/formats/pdb/PdbPlugin.cpp diff --git a/fbreader/src/formats/pdb/PdbPlugin.h b/reader/src/formats/pdb/PdbPlugin.h similarity index 100% rename from fbreader/src/formats/pdb/PdbPlugin.h rename to reader/src/formats/pdb/PdbPlugin.h diff --git a/fbreader/src/formats/pdb/PdbReader.cpp b/reader/src/formats/pdb/PdbReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/PdbReader.cpp rename to reader/src/formats/pdb/PdbReader.cpp diff --git a/fbreader/src/formats/pdb/PdbReader.h b/reader/src/formats/pdb/PdbReader.h similarity index 100% rename from fbreader/src/formats/pdb/PdbReader.h rename to reader/src/formats/pdb/PdbReader.h diff --git a/fbreader/src/formats/pdb/PdbStream.cpp b/reader/src/formats/pdb/PdbStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/PdbStream.cpp rename to reader/src/formats/pdb/PdbStream.cpp diff --git a/fbreader/src/formats/pdb/PdbStream.h b/reader/src/formats/pdb/PdbStream.h similarity index 100% rename from fbreader/src/formats/pdb/PdbStream.h rename to reader/src/formats/pdb/PdbStream.h diff --git a/fbreader/src/formats/pdb/PluckerBookReader.cpp b/reader/src/formats/pdb/PluckerBookReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/PluckerBookReader.cpp rename to reader/src/formats/pdb/PluckerBookReader.cpp diff --git a/fbreader/src/formats/pdb/PluckerBookReader.h b/reader/src/formats/pdb/PluckerBookReader.h similarity index 100% rename from fbreader/src/formats/pdb/PluckerBookReader.h rename to reader/src/formats/pdb/PluckerBookReader.h diff --git a/fbreader/src/formats/pdb/PluckerImages.cpp b/reader/src/formats/pdb/PluckerImages.cpp similarity index 100% rename from fbreader/src/formats/pdb/PluckerImages.cpp rename to reader/src/formats/pdb/PluckerImages.cpp diff --git a/fbreader/src/formats/pdb/PluckerImages.h b/reader/src/formats/pdb/PluckerImages.h similarity index 100% rename from fbreader/src/formats/pdb/PluckerImages.h rename to reader/src/formats/pdb/PluckerImages.h diff --git a/fbreader/src/formats/pdb/PluckerPlugin.cpp b/reader/src/formats/pdb/PluckerPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/PluckerPlugin.cpp rename to reader/src/formats/pdb/PluckerPlugin.cpp diff --git a/fbreader/src/formats/pdb/PluckerTextStream.cpp b/reader/src/formats/pdb/PluckerTextStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/PluckerTextStream.cpp rename to reader/src/formats/pdb/PluckerTextStream.cpp diff --git a/fbreader/src/formats/pdb/PluckerTextStream.h b/reader/src/formats/pdb/PluckerTextStream.h similarity index 100% rename from fbreader/src/formats/pdb/PluckerTextStream.h rename to reader/src/formats/pdb/PluckerTextStream.h diff --git a/fbreader/src/formats/pdb/PmlBookReader.cpp b/reader/src/formats/pdb/PmlBookReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/PmlBookReader.cpp rename to reader/src/formats/pdb/PmlBookReader.cpp diff --git a/fbreader/src/formats/pdb/PmlBookReader.h b/reader/src/formats/pdb/PmlBookReader.h similarity index 100% rename from fbreader/src/formats/pdb/PmlBookReader.h rename to reader/src/formats/pdb/PmlBookReader.h diff --git a/fbreader/src/formats/pdb/PmlReader.cpp b/reader/src/formats/pdb/PmlReader.cpp similarity index 100% rename from fbreader/src/formats/pdb/PmlReader.cpp rename to reader/src/formats/pdb/PmlReader.cpp diff --git a/fbreader/src/formats/pdb/PmlReader.h b/reader/src/formats/pdb/PmlReader.h similarity index 100% rename from fbreader/src/formats/pdb/PmlReader.h rename to reader/src/formats/pdb/PmlReader.h diff --git a/fbreader/src/formats/pdb/SimplePdbPlugin.cpp b/reader/src/formats/pdb/SimplePdbPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/SimplePdbPlugin.cpp rename to reader/src/formats/pdb/SimplePdbPlugin.cpp diff --git a/fbreader/src/formats/pdb/ZTXTPlugin.cpp b/reader/src/formats/pdb/ZTXTPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdb/ZTXTPlugin.cpp rename to reader/src/formats/pdb/ZTXTPlugin.cpp diff --git a/fbreader/src/formats/pdb/ZTXTStream.cpp b/reader/src/formats/pdb/ZTXTStream.cpp similarity index 100% rename from fbreader/src/formats/pdb/ZTXTStream.cpp rename to reader/src/formats/pdb/ZTXTStream.cpp diff --git a/fbreader/src/formats/pdb/ZTXTStream.h b/reader/src/formats/pdb/ZTXTStream.h similarity index 100% rename from fbreader/src/formats/pdb/ZTXTStream.h rename to reader/src/formats/pdb/ZTXTStream.h diff --git a/fbreader/src/formats/pdf/PdfBookReader.cpp b/reader/src/formats/pdf/PdfBookReader.cpp similarity index 100% rename from fbreader/src/formats/pdf/PdfBookReader.cpp rename to reader/src/formats/pdf/PdfBookReader.cpp diff --git a/fbreader/src/formats/pdf/PdfBookReader.h b/reader/src/formats/pdf/PdfBookReader.h similarity index 100% rename from fbreader/src/formats/pdf/PdfBookReader.h rename to reader/src/formats/pdf/PdfBookReader.h diff --git a/fbreader/src/formats/pdf/PdfDescriptionReader.cpp b/reader/src/formats/pdf/PdfDescriptionReader.cpp similarity index 100% rename from fbreader/src/formats/pdf/PdfDescriptionReader.cpp rename to reader/src/formats/pdf/PdfDescriptionReader.cpp diff --git a/fbreader/src/formats/pdf/PdfDescriptionReader.h b/reader/src/formats/pdf/PdfDescriptionReader.h similarity index 100% rename from fbreader/src/formats/pdf/PdfDescriptionReader.h rename to reader/src/formats/pdf/PdfDescriptionReader.h diff --git a/fbreader/src/formats/pdf/PdfObject.cpp b/reader/src/formats/pdf/PdfObject.cpp similarity index 100% rename from fbreader/src/formats/pdf/PdfObject.cpp rename to reader/src/formats/pdf/PdfObject.cpp diff --git a/fbreader/src/formats/pdf/PdfObject.h b/reader/src/formats/pdf/PdfObject.h similarity index 100% rename from fbreader/src/formats/pdf/PdfObject.h rename to reader/src/formats/pdf/PdfObject.h diff --git a/fbreader/src/formats/pdf/PdfPlugin.cpp b/reader/src/formats/pdf/PdfPlugin.cpp similarity index 100% rename from fbreader/src/formats/pdf/PdfPlugin.cpp rename to reader/src/formats/pdf/PdfPlugin.cpp diff --git a/fbreader/src/formats/pdf/PdfPlugin.h b/reader/src/formats/pdf/PdfPlugin.h similarity index 100% rename from fbreader/src/formats/pdf/PdfPlugin.h rename to reader/src/formats/pdf/PdfPlugin.h diff --git a/fbreader/src/formats/pdf/StringStream.cpp b/reader/src/formats/pdf/StringStream.cpp similarity index 100% rename from fbreader/src/formats/pdf/StringStream.cpp rename to reader/src/formats/pdf/StringStream.cpp diff --git a/fbreader/src/formats/pdf/StringStream.h b/reader/src/formats/pdf/StringStream.h similarity index 100% rename from fbreader/src/formats/pdf/StringStream.h rename to reader/src/formats/pdf/StringStream.h diff --git a/fbreader/src/formats/rtf/RtfBookReader.cpp b/reader/src/formats/rtf/RtfBookReader.cpp similarity index 100% rename from fbreader/src/formats/rtf/RtfBookReader.cpp rename to reader/src/formats/rtf/RtfBookReader.cpp diff --git a/fbreader/src/formats/rtf/RtfBookReader.h b/reader/src/formats/rtf/RtfBookReader.h similarity index 100% rename from fbreader/src/formats/rtf/RtfBookReader.h rename to reader/src/formats/rtf/RtfBookReader.h diff --git a/fbreader/src/formats/rtf/RtfDescriptionReader.cpp b/reader/src/formats/rtf/RtfDescriptionReader.cpp similarity index 100% rename from fbreader/src/formats/rtf/RtfDescriptionReader.cpp rename to reader/src/formats/rtf/RtfDescriptionReader.cpp diff --git a/fbreader/src/formats/rtf/RtfDescriptionReader.h b/reader/src/formats/rtf/RtfDescriptionReader.h similarity index 100% rename from fbreader/src/formats/rtf/RtfDescriptionReader.h rename to reader/src/formats/rtf/RtfDescriptionReader.h diff --git a/fbreader/src/formats/rtf/RtfPlugin.cpp b/reader/src/formats/rtf/RtfPlugin.cpp similarity index 100% rename from fbreader/src/formats/rtf/RtfPlugin.cpp rename to reader/src/formats/rtf/RtfPlugin.cpp diff --git a/fbreader/src/formats/rtf/RtfPlugin.h b/reader/src/formats/rtf/RtfPlugin.h similarity index 100% rename from fbreader/src/formats/rtf/RtfPlugin.h rename to reader/src/formats/rtf/RtfPlugin.h diff --git a/fbreader/src/formats/rtf/RtfReader.cpp b/reader/src/formats/rtf/RtfReader.cpp similarity index 100% rename from fbreader/src/formats/rtf/RtfReader.cpp rename to reader/src/formats/rtf/RtfReader.cpp diff --git a/fbreader/src/formats/rtf/RtfReader.h b/reader/src/formats/rtf/RtfReader.h similarity index 100% rename from fbreader/src/formats/rtf/RtfReader.h rename to reader/src/formats/rtf/RtfReader.h diff --git a/fbreader/src/formats/rtf/RtfReaderStream.cpp b/reader/src/formats/rtf/RtfReaderStream.cpp similarity index 100% rename from fbreader/src/formats/rtf/RtfReaderStream.cpp rename to reader/src/formats/rtf/RtfReaderStream.cpp diff --git a/fbreader/src/formats/rtf/RtfReaderStream.h b/reader/src/formats/rtf/RtfReaderStream.h similarity index 100% rename from fbreader/src/formats/rtf/RtfReaderStream.h rename to reader/src/formats/rtf/RtfReaderStream.h diff --git a/fbreader/src/formats/tcr/PPLBookReader.cpp b/reader/src/formats/tcr/PPLBookReader.cpp similarity index 100% rename from fbreader/src/formats/tcr/PPLBookReader.cpp rename to reader/src/formats/tcr/PPLBookReader.cpp diff --git a/fbreader/src/formats/tcr/PPLBookReader.h b/reader/src/formats/tcr/PPLBookReader.h similarity index 100% rename from fbreader/src/formats/tcr/PPLBookReader.h rename to reader/src/formats/tcr/PPLBookReader.h diff --git a/fbreader/src/formats/tcr/TcrPlugin.cpp b/reader/src/formats/tcr/TcrPlugin.cpp similarity index 100% rename from fbreader/src/formats/tcr/TcrPlugin.cpp rename to reader/src/formats/tcr/TcrPlugin.cpp diff --git a/fbreader/src/formats/tcr/TcrPlugin.h b/reader/src/formats/tcr/TcrPlugin.h similarity index 100% rename from fbreader/src/formats/tcr/TcrPlugin.h rename to reader/src/formats/tcr/TcrPlugin.h diff --git a/fbreader/src/formats/tcr/TcrStream.cpp b/reader/src/formats/tcr/TcrStream.cpp similarity index 100% rename from fbreader/src/formats/tcr/TcrStream.cpp rename to reader/src/formats/tcr/TcrStream.cpp diff --git a/fbreader/src/formats/tcr/TcrStream.h b/reader/src/formats/tcr/TcrStream.h similarity index 100% rename from fbreader/src/formats/tcr/TcrStream.h rename to reader/src/formats/tcr/TcrStream.h diff --git a/fbreader/src/formats/txt/PlainTextFormat.cpp b/reader/src/formats/txt/PlainTextFormat.cpp similarity index 100% rename from fbreader/src/formats/txt/PlainTextFormat.cpp rename to reader/src/formats/txt/PlainTextFormat.cpp diff --git a/fbreader/src/formats/txt/PlainTextFormat.h b/reader/src/formats/txt/PlainTextFormat.h similarity index 100% rename from fbreader/src/formats/txt/PlainTextFormat.h rename to reader/src/formats/txt/PlainTextFormat.h diff --git a/fbreader/src/formats/txt/TxtBookReader.cpp b/reader/src/formats/txt/TxtBookReader.cpp similarity index 100% rename from fbreader/src/formats/txt/TxtBookReader.cpp rename to reader/src/formats/txt/TxtBookReader.cpp diff --git a/fbreader/src/formats/txt/TxtBookReader.h b/reader/src/formats/txt/TxtBookReader.h similarity index 100% rename from fbreader/src/formats/txt/TxtBookReader.h rename to reader/src/formats/txt/TxtBookReader.h diff --git a/fbreader/src/formats/txt/TxtPlugin.cpp b/reader/src/formats/txt/TxtPlugin.cpp similarity index 100% rename from fbreader/src/formats/txt/TxtPlugin.cpp rename to reader/src/formats/txt/TxtPlugin.cpp diff --git a/fbreader/src/formats/txt/TxtPlugin.h b/reader/src/formats/txt/TxtPlugin.h similarity index 100% rename from fbreader/src/formats/txt/TxtPlugin.h rename to reader/src/formats/txt/TxtPlugin.h diff --git a/fbreader/src/formats/txt/TxtReader.cpp b/reader/src/formats/txt/TxtReader.cpp similarity index 100% rename from fbreader/src/formats/txt/TxtReader.cpp rename to reader/src/formats/txt/TxtReader.cpp diff --git a/fbreader/src/formats/txt/TxtReader.h b/reader/src/formats/txt/TxtReader.h similarity index 100% rename from fbreader/src/formats/txt/TxtReader.h rename to reader/src/formats/txt/TxtReader.h diff --git a/fbreader/src/formats/util/EntityFilesCollector.cpp b/reader/src/formats/util/EntityFilesCollector.cpp similarity index 100% rename from fbreader/src/formats/util/EntityFilesCollector.cpp rename to reader/src/formats/util/EntityFilesCollector.cpp diff --git a/fbreader/src/formats/util/EntityFilesCollector.h b/reader/src/formats/util/EntityFilesCollector.h similarity index 100% rename from fbreader/src/formats/util/EntityFilesCollector.h rename to reader/src/formats/util/EntityFilesCollector.h diff --git a/fbreader/src/formats/util/MergedStream.cpp b/reader/src/formats/util/MergedStream.cpp similarity index 100% rename from fbreader/src/formats/util/MergedStream.cpp rename to reader/src/formats/util/MergedStream.cpp diff --git a/fbreader/src/formats/util/MergedStream.h b/reader/src/formats/util/MergedStream.h similarity index 100% rename from fbreader/src/formats/util/MergedStream.h rename to reader/src/formats/util/MergedStream.h diff --git a/fbreader/src/formats/util/MiscUtil.cpp b/reader/src/formats/util/MiscUtil.cpp similarity index 100% rename from fbreader/src/formats/util/MiscUtil.cpp rename to reader/src/formats/util/MiscUtil.cpp diff --git a/fbreader/src/formats/util/MiscUtil.h b/reader/src/formats/util/MiscUtil.h similarity index 100% rename from fbreader/src/formats/util/MiscUtil.h rename to reader/src/formats/util/MiscUtil.h diff --git a/fbreader/src/formats/util/TextFormatDetector.cpp b/reader/src/formats/util/TextFormatDetector.cpp similarity index 100% rename from fbreader/src/formats/util/TextFormatDetector.cpp rename to reader/src/formats/util/TextFormatDetector.cpp diff --git a/fbreader/src/formats/util/TextFormatDetector.h b/reader/src/formats/util/TextFormatDetector.h similarity index 100% rename from fbreader/src/formats/util/TextFormatDetector.h rename to reader/src/formats/util/TextFormatDetector.h diff --git a/fbreader/src/formats/util/XMLTextStream.cpp b/reader/src/formats/util/XMLTextStream.cpp similarity index 100% rename from fbreader/src/formats/util/XMLTextStream.cpp rename to reader/src/formats/util/XMLTextStream.cpp diff --git a/fbreader/src/formats/util/XMLTextStream.h b/reader/src/formats/util/XMLTextStream.h similarity index 100% rename from fbreader/src/formats/util/XMLTextStream.h rename to reader/src/formats/util/XMLTextStream.h diff --git a/fbreader/src/formats/xhtml/XHTMLReader.cpp b/reader/src/formats/xhtml/XHTMLReader.cpp similarity index 100% rename from fbreader/src/formats/xhtml/XHTMLReader.cpp rename to reader/src/formats/xhtml/XHTMLReader.cpp diff --git a/fbreader/src/formats/xhtml/XHTMLReader.h b/reader/src/formats/xhtml/XHTMLReader.h similarity index 100% rename from fbreader/src/formats/xhtml/XHTMLReader.h rename to reader/src/formats/xhtml/XHTMLReader.h diff --git a/fbreader/src/library/Author.cpp b/reader/src/library/Author.cpp similarity index 100% rename from fbreader/src/library/Author.cpp rename to reader/src/library/Author.cpp diff --git a/fbreader/src/library/Author.h b/reader/src/library/Author.h similarity index 100% rename from fbreader/src/library/Author.h rename to reader/src/library/Author.h diff --git a/fbreader/src/library/Book.cpp b/reader/src/library/Book.cpp similarity index 100% rename from fbreader/src/library/Book.cpp rename to reader/src/library/Book.cpp diff --git a/fbreader/src/library/Book.h b/reader/src/library/Book.h similarity index 100% rename from fbreader/src/library/Book.h rename to reader/src/library/Book.h diff --git a/fbreader/src/library/Comparators.cpp b/reader/src/library/Comparators.cpp similarity index 100% rename from fbreader/src/library/Comparators.cpp rename to reader/src/library/Comparators.cpp diff --git a/fbreader/src/library/Library.cpp b/reader/src/library/Library.cpp similarity index 100% rename from fbreader/src/library/Library.cpp rename to reader/src/library/Library.cpp diff --git a/fbreader/src/library/Library.h b/reader/src/library/Library.h similarity index 100% rename from fbreader/src/library/Library.h rename to reader/src/library/Library.h diff --git a/fbreader/src/library/Lists.h b/reader/src/library/Lists.h similarity index 100% rename from fbreader/src/library/Lists.h rename to reader/src/library/Lists.h diff --git a/fbreader/src/library/Number.cpp b/reader/src/library/Number.cpp similarity index 100% rename from fbreader/src/library/Number.cpp rename to reader/src/library/Number.cpp diff --git a/fbreader/src/library/Number.h b/reader/src/library/Number.h similarity index 100% rename from fbreader/src/library/Number.h rename to reader/src/library/Number.h diff --git a/fbreader/src/library/Tag.cpp b/reader/src/library/Tag.cpp similarity index 100% rename from fbreader/src/library/Tag.cpp rename to reader/src/library/Tag.cpp diff --git a/fbreader/src/library/Tag.h b/reader/src/library/Tag.h similarity index 100% rename from fbreader/src/library/Tag.h rename to reader/src/library/Tag.h diff --git a/fbreader/src/libraryActions/AuthorInfoDialog.cpp b/reader/src/libraryActions/AuthorInfoDialog.cpp similarity index 100% rename from fbreader/src/libraryActions/AuthorInfoDialog.cpp rename to reader/src/libraryActions/AuthorInfoDialog.cpp diff --git a/fbreader/src/libraryActions/AuthorInfoDialog.h b/reader/src/libraryActions/AuthorInfoDialog.h similarity index 100% rename from fbreader/src/libraryActions/AuthorInfoDialog.h rename to reader/src/libraryActions/AuthorInfoDialog.h diff --git a/fbreader/src/libraryActions/BooksUtil.cpp b/reader/src/libraryActions/BooksUtil.cpp similarity index 97% rename from fbreader/src/libraryActions/BooksUtil.cpp rename to reader/src/libraryActions/BooksUtil.cpp index ee831bd..93f9f06 100644 --- a/fbreader/src/libraryActions/BooksUtil.cpp +++ b/reader/src/libraryActions/BooksUtil.cpp @@ -24,7 +24,7 @@ #include "../library/Library.h" #include "../library/Tag.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" void BooksUtil::removeTag(shared_ptr tag) { ZLResourceKey boxKey("removeTagBox"); @@ -62,7 +62,7 @@ void BooksUtil::removeTag(shared_ptr tag) { if (code != DONT_REMOVE) { library.removeTag(tag, code == REMOVE_SUBTREE); // TODO: select current node (?) again - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } diff --git a/fbreader/src/libraryActions/BooksUtil.h b/reader/src/libraryActions/BooksUtil.h similarity index 100% rename from fbreader/src/libraryActions/BooksUtil.h rename to reader/src/libraryActions/BooksUtil.h diff --git a/fbreader/src/libraryActions/LibraryAuthorActions.cpp b/reader/src/libraryActions/LibraryAuthorActions.cpp similarity index 94% rename from fbreader/src/libraryActions/LibraryAuthorActions.cpp rename to reader/src/libraryActions/LibraryAuthorActions.cpp index d0c87b2..5f4363d 100644 --- a/fbreader/src/libraryActions/LibraryAuthorActions.cpp +++ b/reader/src/libraryActions/LibraryAuthorActions.cpp @@ -21,7 +21,7 @@ #include "AuthorInfoDialog.h" #include "../library/Author.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" AuthorEditInfoAction::AuthorEditInfoAction(shared_ptr author) : myAuthor(author) { } @@ -32,7 +32,7 @@ AuthorEditInfoAction::~AuthorEditInfoAction() { void AuthorEditInfoAction::run() { if (AuthorInfoDialog::run(myAuthor)) { // TODO: select current node (?) again - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } diff --git a/fbreader/src/libraryActions/LibraryAuthorActions.h b/reader/src/libraryActions/LibraryAuthorActions.h similarity index 100% rename from fbreader/src/libraryActions/LibraryAuthorActions.h rename to reader/src/libraryActions/LibraryAuthorActions.h diff --git a/fbreader/src/libraryActions/LibraryBookActions.cpp b/reader/src/libraryActions/LibraryBookActions.cpp similarity index 94% rename from fbreader/src/libraryActions/LibraryBookActions.cpp rename to reader/src/libraryActions/LibraryBookActions.cpp index 6e72411..0c490c4 100644 --- a/fbreader/src/libraryActions/LibraryBookActions.cpp +++ b/reader/src/libraryActions/LibraryBookActions.cpp @@ -25,16 +25,16 @@ #include "LibraryBookActions.h" #include "../library/Book.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" #include "../optionsDialog/bookInfo/BookInfoDialog.h" BookReadAction::BookReadAction(shared_ptr book) : myBook(book) { } void BookReadAction::run() { - FBReader &fbreader = FBReader::Instance(); - fbreader.openBook(myBook); - fbreader.showBookTextView(); + Reader &reader = Reader::Instance(); + reader.openBook(myBook); + reader.showBookTextView(); } ZLResourceKey BookReadAction::key() const { @@ -60,7 +60,7 @@ void BookRemoveAction::run() { // yes, we go through this label case Library::REMOVE_FROM_LIBRARY: Library::Instance().removeBook(myBook); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); case Library::REMOVE_DONT_REMOVE: break; } @@ -123,7 +123,7 @@ BookEditInfoAction::BookEditInfoAction(shared_ptr book) : myBook(book) { void BookEditInfoAction::run() { if (BookInfoDialog(myBook).dialog().run()) { // TODO: select current node (?) again - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } diff --git a/fbreader/src/libraryActions/LibraryBookActions.h b/reader/src/libraryActions/LibraryBookActions.h similarity index 100% rename from fbreader/src/libraryActions/LibraryBookActions.h rename to reader/src/libraryActions/LibraryBookActions.h diff --git a/fbreader/src/libraryActions/LibraryTagActions.cpp b/reader/src/libraryActions/LibraryTagActions.cpp similarity index 100% rename from fbreader/src/libraryActions/LibraryTagActions.cpp rename to reader/src/libraryActions/LibraryTagActions.cpp diff --git a/fbreader/src/libraryActions/LibraryTagActions.h b/reader/src/libraryActions/LibraryTagActions.h similarity index 100% rename from fbreader/src/libraryActions/LibraryTagActions.h rename to reader/src/libraryActions/LibraryTagActions.h diff --git a/fbreader/src/libraryTree/AuthorNode.cpp b/reader/src/libraryTree/AuthorNode.cpp similarity index 91% rename from fbreader/src/libraryTree/AuthorNode.cpp rename to reader/src/libraryTree/AuthorNode.cpp index a250c1a..a22970f 100644 --- a/fbreader/src/libraryTree/AuthorNode.cpp +++ b/reader/src/libraryTree/AuthorNode.cpp @@ -26,7 +26,7 @@ #include "../library/Author.h" #include "../libraryActions/LibraryAuthorActions.h" -const ZLTypeId AuthorNode::TYPE_ID(FBReaderNode::TYPE_ID); +const ZLTypeId AuthorNode::TYPE_ID(ReaderNode::TYPE_ID); const ZLResource &AuthorNode::resource() const { return ZLResource::resource("libraryView")["authorNode"]; @@ -36,7 +36,7 @@ const ZLTypeId &AuthorNode::typeId() const { return TYPE_ID; } -AuthorNode::AuthorNode(ZLBlockTreeView::RootNode *parent, std::size_t atPosition, shared_ptr author) : FBReaderNode(parent, atPosition), myAuthor(author) { +AuthorNode::AuthorNode(ZLBlockTreeView::RootNode *parent, std::size_t atPosition, shared_ptr author) : ReaderNode(parent, atPosition), myAuthor(author) { } void AuthorNode::init() { diff --git a/fbreader/src/libraryTree/BookNode.cpp b/reader/src/libraryTree/BookNode.cpp similarity index 88% rename from fbreader/src/libraryTree/BookNode.cpp rename to reader/src/libraryTree/BookNode.cpp index 0df43e5..8ef323d 100644 --- a/fbreader/src/libraryTree/BookNode.cpp +++ b/reader/src/libraryTree/BookNode.cpp @@ -27,10 +27,10 @@ #include "../library/Tag.h" #include "../libraryActions/LibraryBookActions.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" #include "../formats/FormatPlugin.h" -const ZLTypeId BookNode::TYPE_ID(FBReaderNode::TYPE_ID); +const ZLTypeId BookNode::TYPE_ID(ReaderNode::TYPE_ID); const ZLTypeId &BookNode::typeId() const { return TYPE_ID; @@ -40,13 +40,13 @@ const ZLResource &BookNode::resource() const { return ZLResource::resource("libraryView")["bookNode"]; } -BookNode::BookNode(AuthorNode *parent, shared_ptr book) : FBReaderNode(parent), myBook(book) { +BookNode::BookNode(AuthorNode *parent, shared_ptr book) : ReaderNode(parent), myBook(book) { } -BookNode::BookNode(SeriesNode *parent, shared_ptr book) : FBReaderNode(parent), myBook(book) { +BookNode::BookNode(SeriesNode *parent, shared_ptr book) : ReaderNode(parent), myBook(book) { } -BookNode::BookNode(TagNode *parent, std::size_t atPosition, shared_ptr book) : FBReaderNode(parent, atPosition), myBook(book) { +BookNode::BookNode(TagNode *parent, std::size_t atPosition, shared_ptr book) : ReaderNode(parent, atPosition), myBook(book) { } void BookNode::init() { @@ -64,10 +64,10 @@ std::string BookNode::title() const { } std::string BookNode::summary() const { - FBReaderNode *parent = (FBReaderNode*)this->parent(); + ReaderNode *parent = (ReaderNode*)this->parent(); while (!parent->isInstanceOf(AuthorNode::TYPE_ID) && !parent->isInstanceOf(TagNode::TYPE_ID)) { - parent = (FBReaderNode*)parent->parent(); + parent = (ReaderNode*)parent->parent(); } if (parent->isInstanceOf(AuthorNode::TYPE_ID)) { const TagList &tags = myBook->tags(); @@ -101,7 +101,7 @@ std::string BookNode::summary() const { } bool BookNode::highlighted() const { - return myBook->file() == FBReader::Instance().currentBook()->file(); + return myBook->file() == Reader::Instance().currentBook()->file(); } shared_ptr BookNode::extractCoverImage() const { diff --git a/fbreader/src/libraryTree/LibraryByAuthorView.cpp b/reader/src/libraryTree/LibraryByAuthorView.cpp similarity index 96% rename from fbreader/src/libraryTree/LibraryByAuthorView.cpp rename to reader/src/libraryTree/LibraryByAuthorView.cpp index 68a13f4..4b0bb56 100644 --- a/fbreader/src/libraryTree/LibraryByAuthorView.cpp +++ b/reader/src/libraryTree/LibraryByAuthorView.cpp @@ -66,7 +66,7 @@ bool LibraryByAuthorView::isSubtreeUpToDate(AuthorNode *authorNode) { const ZLBlockTreeNode::List &nodes = authorNode->children(); for (ZLBlockTreeNode::List::const_iterator nIt = nodes.begin(); nIt != nodes.end(); ++nIt) { - FBReaderNode &node = *(FBReaderNode*)*nIt; + ReaderNode &node = *(ReaderNode*)*nIt; if (node.isInstanceOf(BookNode::TYPE_ID)) { shared_ptr book = ((BookNode&)node).book(); if (it == books.end() || *it != book || !book->seriesTitle().empty()) { @@ -92,7 +92,7 @@ void LibraryByAuthorView::updateAuthorSubtree(AuthorNode *authorNode) { const ZLBlockTreeNode::List &nodes = authorNode->children(); for (ZLBlockTreeNode::List::const_iterator nIt = nodes.begin(); nIt != nodes.end(); ++nIt) { - FBReaderNode &node = *(FBReaderNode*)*nIt; + ReaderNode &node = *(ReaderNode*)*nIt; if (node.isInstanceOf(BookNode::TYPE_ID)) { visibleBooks.insert(((BookNode&)node).book()); } else if (node.isOpen()) { @@ -111,9 +111,9 @@ void LibraryByAuthorView::makeUpToDate() { ZLBlockTreeNode *topNode = firstVisibleNode(); AuthorNode *topAuthorNode = 0; if (topNode != &rootNode()) { - FBReaderNode *lNode = (FBReaderNode*)topNode; + ReaderNode *lNode = (ReaderNode*)topNode; while (!lNode->isInstanceOf(AuthorNode::TYPE_ID)) { - lNode = (FBReaderNode*)lNode->parent(); + lNode = (ReaderNode*)lNode->parent(); } topAuthorNode = (AuthorNode*)lNode; } diff --git a/fbreader/src/libraryTree/LibraryByTagView.cpp b/reader/src/libraryTree/LibraryByTagView.cpp similarity index 100% rename from fbreader/src/libraryTree/LibraryByTagView.cpp rename to reader/src/libraryTree/LibraryByTagView.cpp diff --git a/fbreader/src/libraryTree/LibraryNodes.h b/reader/src/libraryTree/LibraryNodes.h similarity index 93% rename from fbreader/src/libraryTree/LibraryNodes.h rename to reader/src/libraryTree/LibraryNodes.h index 5f1eab9..fbd9fa3 100644 --- a/fbreader/src/libraryTree/LibraryNodes.h +++ b/reader/src/libraryTree/LibraryNodes.h @@ -20,7 +20,7 @@ #ifndef __LIBRARYNODES_H__ #define __LIBRARYNODES_H__ -#include "../blockTree/FBReaderNode.h" +#include "../blockTree/ReaderNode.h" class ZLImage; @@ -28,7 +28,7 @@ class Author; class Book; class Tag; -class AuthorNode : public FBReaderNode { +class AuthorNode : public ReaderNode { public: static const ZLTypeId TYPE_ID; @@ -49,7 +49,7 @@ private: shared_ptr myAuthor; }; -class SeriesNode : public FBReaderNode { +class SeriesNode : public ReaderNode { public: static const ZLTypeId TYPE_ID; @@ -67,7 +67,7 @@ private: std::string title() const; }; -class TagNode : public FBReaderNode { +class TagNode : public ReaderNode { public: static const ZLTypeId TYPE_ID; @@ -92,7 +92,7 @@ private: const shared_ptr myTag; }; -class BookNode : public FBReaderNode { +class BookNode : public ReaderNode { public: static const ZLTypeId TYPE_ID; diff --git a/fbreader/src/libraryTree/LibraryView.cpp b/reader/src/libraryTree/LibraryView.cpp similarity index 100% rename from fbreader/src/libraryTree/LibraryView.cpp rename to reader/src/libraryTree/LibraryView.cpp diff --git a/fbreader/src/libraryTree/LibraryView.h b/reader/src/libraryTree/LibraryView.h similarity index 100% rename from fbreader/src/libraryTree/LibraryView.h rename to reader/src/libraryTree/LibraryView.h diff --git a/fbreader/src/libraryTree/SeriesNode.cpp b/reader/src/libraryTree/SeriesNode.cpp similarity index 88% rename from fbreader/src/libraryTree/SeriesNode.cpp rename to reader/src/libraryTree/SeriesNode.cpp index 6d4aafa..8646aac 100644 --- a/fbreader/src/libraryTree/SeriesNode.cpp +++ b/reader/src/libraryTree/SeriesNode.cpp @@ -24,7 +24,7 @@ #include "../library/Book.h" -const ZLTypeId SeriesNode::TYPE_ID(FBReaderNode::TYPE_ID); +const ZLTypeId SeriesNode::TYPE_ID(ReaderNode::TYPE_ID); const ZLResource &SeriesNode::resource() const { return ZLResource::resource("libraryView")["seriesNode"]; @@ -34,7 +34,7 @@ const ZLTypeId &SeriesNode::typeId() const { return TYPE_ID; } -SeriesNode::SeriesNode(AuthorNode *parent) : FBReaderNode(parent) { +SeriesNode::SeriesNode(AuthorNode *parent) : ReaderNode(parent) { } void SeriesNode::init() { @@ -52,7 +52,7 @@ std::string SeriesNode::title() const { shared_ptr SeriesNode::extractCoverImage() const { const std::vector &books = children(); for (std::vector::const_iterator it = books.begin(); it != books.end(); ++it) { - shared_ptr bookCover = ((FBReaderNode*)*it)->coverImage(); + shared_ptr bookCover = ((ReaderNode*)*it)->coverImage(); if (!bookCover.isNull()) { return bookCover; } diff --git a/fbreader/src/libraryTree/TagNode.cpp b/reader/src/libraryTree/TagNode.cpp similarity index 89% rename from fbreader/src/libraryTree/TagNode.cpp rename to reader/src/libraryTree/TagNode.cpp index 7ccd3ac..a873ea5 100644 --- a/fbreader/src/libraryTree/TagNode.cpp +++ b/reader/src/libraryTree/TagNode.cpp @@ -25,7 +25,7 @@ #include "../library/Tag.h" #include "../libraryActions/LibraryTagActions.h" -const ZLTypeId TagNode::TYPE_ID(FBReaderNode::TYPE_ID); +const ZLTypeId TagNode::TYPE_ID(ReaderNode::TYPE_ID); const ZLTypeId &TagNode::typeId() const { return TYPE_ID; @@ -47,10 +47,10 @@ std::size_t TagNode::positionToInsert(ZLBlockTreeNode *parent, shared_ptr t return children.rend() - it; } -TagNode::TagNode(ZLBlockTreeView::RootNode *parent, shared_ptr tag) : FBReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) { +TagNode::TagNode(ZLBlockTreeView::RootNode *parent, shared_ptr tag) : ReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) { } -TagNode::TagNode(TagNode *parent, shared_ptr tag) : FBReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) { +TagNode::TagNode(TagNode *parent, shared_ptr tag) : ReaderNode(parent, positionToInsert(parent, tag)), myTag(tag) { } void TagNode::init() { diff --git a/fbreader/src/migration/BookInfo.cpp b/reader/src/migration/BookInfo.cpp similarity index 100% rename from fbreader/src/migration/BookInfo.cpp rename to reader/src/migration/BookInfo.cpp diff --git a/fbreader/src/migration/BookInfo.h b/reader/src/migration/BookInfo.h similarity index 100% rename from fbreader/src/migration/BookInfo.h rename to reader/src/migration/BookInfo.h diff --git a/fbreader/src/migration/FB2MigrationReader.cpp b/reader/src/migration/FB2MigrationReader.cpp similarity index 100% rename from fbreader/src/migration/FB2MigrationReader.cpp rename to reader/src/migration/FB2MigrationReader.cpp diff --git a/fbreader/src/migration/FB2MigrationReader.h b/reader/src/migration/FB2MigrationReader.h similarity index 100% rename from fbreader/src/migration/FB2MigrationReader.h rename to reader/src/migration/FB2MigrationReader.h diff --git a/fbreader/src/migration/HtmlDCTagsReader.cpp b/reader/src/migration/HtmlDCTagsReader.cpp similarity index 100% rename from fbreader/src/migration/HtmlDCTagsReader.cpp rename to reader/src/migration/HtmlDCTagsReader.cpp diff --git a/fbreader/src/migration/HtmlDCTagsReader.h b/reader/src/migration/HtmlDCTagsReader.h similarity index 100% rename from fbreader/src/migration/HtmlDCTagsReader.h rename to reader/src/migration/HtmlDCTagsReader.h diff --git a/fbreader/src/migration/Migration.cpp b/reader/src/migration/Migration.cpp similarity index 98% rename from fbreader/src/migration/Migration.cpp rename to reader/src/migration/Migration.cpp index 172209d..4226c62 100644 --- a/fbreader/src/migration/Migration.cpp +++ b/reader/src/migration/Migration.cpp @@ -69,7 +69,7 @@ int Migration::extractVersionInformation(const std::string &name) { } void Migration::doMigration() { - ZLStringOption versionOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0"); + ZLStringOption versionOption(FBCategoryKey::SYSTEM, "Version", "ReaderVersion", "0"); if (extractVersionInformation(versionOption.value()) < extractVersionInformation(myVersion)) { doMigrationInternal(); diff --git a/fbreader/src/migration/Migration.h b/reader/src/migration/Migration.h similarity index 100% rename from fbreader/src/migration/Migration.h rename to reader/src/migration/Migration.h diff --git a/fbreader/src/migration/Migration_0_10_4.cpp b/reader/src/migration/Migration_0_10_4.cpp similarity index 100% rename from fbreader/src/migration/Migration_0_10_4.cpp rename to reader/src/migration/Migration_0_10_4.cpp diff --git a/fbreader/src/migration/Migration_0_11_0.cpp b/reader/src/migration/Migration_0_11_0.cpp similarity index 99% rename from fbreader/src/migration/Migration_0_11_0.cpp rename to reader/src/migration/Migration_0_11_0.cpp index 144245e..0c2a509 100644 --- a/fbreader/src/migration/Migration_0_11_0.cpp +++ b/reader/src/migration/Migration_0_11_0.cpp @@ -511,7 +511,7 @@ bool Migration_0_11_0_Runnable::migrateBookLastState(const std::string &fileName bool Migration_0_11_0_Runnable::migrateNetwork() { bool res = true; -// FBReader desktop 0.99.1 deprecates NetFiles table, so don't fill it +// TDE-Ebook-Reader desktop 0.99.1 deprecates NetFiles table, so don't fill it // std::vector urls; // ZLOption::listOptionNames(NET_FILES_GROUP, urls); // for (std::vector::const_iterator it = urls.begin(); it != urls.end(); ++it) { diff --git a/fbreader/src/migration/Migration_0_8_11.cpp b/reader/src/migration/Migration_0_8_11.cpp similarity index 99% rename from fbreader/src/migration/Migration_0_8_11.cpp rename to reader/src/migration/Migration_0_8_11.cpp index d4fd2f3..bf21004 100644 --- a/fbreader/src/migration/Migration_0_8_11.cpp +++ b/reader/src/migration/Migration_0_8_11.cpp @@ -22,7 +22,7 @@ #include #include "Migration.h" -#include "../fbreader/FBReaderActions.h" +#include "../reader/ReaderActions.h" static void changeActionNames(const std::map map, const std::string &group) { const int length = ZLIntegerOption(ZLCategoryKey::CONFIG, group, "Number", 0).value(); diff --git a/fbreader/src/migration/Migration_0_8_13.cpp b/reader/src/migration/Migration_0_8_13.cpp similarity index 100% rename from fbreader/src/migration/Migration_0_8_13.cpp rename to reader/src/migration/Migration_0_8_13.cpp diff --git a/fbreader/src/migration/Migration_0_8_16.cpp b/reader/src/migration/Migration_0_8_16.cpp similarity index 100% rename from fbreader/src/migration/Migration_0_8_16.cpp rename to reader/src/migration/Migration_0_8_16.cpp diff --git a/fbreader/src/migration/Migration_0_99_0.cpp b/reader/src/migration/Migration_0_99_0.cpp similarity index 100% rename from fbreader/src/migration/Migration_0_99_0.cpp rename to reader/src/migration/Migration_0_99_0.cpp diff --git a/fbreader/src/migration/Migration_0_99_1.cpp b/reader/src/migration/Migration_0_99_1.cpp similarity index 96% rename from fbreader/src/migration/Migration_0_99_1.cpp rename to reader/src/migration/Migration_0_99_1.cpp index 970f4fc..985d743 100644 --- a/fbreader/src/migration/Migration_0_99_1.cpp +++ b/reader/src/migration/Migration_0_99_1.cpp @@ -22,7 +22,7 @@ #include #include "Migration.h" -#include "../fbreader/FBReaderActions.h" +#include "../reader/ReaderActions.h" #include "../database/networkdb/NetworkDB.h" Migration_0_99_1::Migration_0_99_1() : Migration("0.99.1") { diff --git a/fbreader/src/migration/OEBMigrationReader.cpp b/reader/src/migration/OEBMigrationReader.cpp similarity index 100% rename from fbreader/src/migration/OEBMigrationReader.cpp rename to reader/src/migration/OEBMigrationReader.cpp diff --git a/fbreader/src/migration/OEBMigrationReader.h b/reader/src/migration/OEBMigrationReader.h similarity index 100% rename from fbreader/src/migration/OEBMigrationReader.h rename to reader/src/migration/OEBMigrationReader.h diff --git a/fbreader/src/migration/migrate.cpp b/reader/src/migration/migrate.cpp similarity index 94% rename from fbreader/src/migration/migrate.cpp rename to reader/src/migration/migrate.cpp index 4fefbf7..af411f0 100644 --- a/fbreader/src/migration/migrate.cpp +++ b/reader/src/migration/migrate.cpp @@ -23,7 +23,7 @@ #include "migrate.h" MigrationRunnable::MigrationRunnable() : - myVersionOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0") { + myVersionOption(FBCategoryKey::SYSTEM, "Version", "ReaderVersion", "0") { } bool MigrationRunnable::shouldMigrate() const { diff --git a/fbreader/src/migration/migrate.h b/reader/src/migration/migrate.h similarity index 100% rename from fbreader/src/migration/migrate.h rename to reader/src/migration/migrate.h diff --git a/fbreader/src/network/BookReference.cpp b/reader/src/network/BookReference.cpp similarity index 100% rename from fbreader/src/network/BookReference.cpp rename to reader/src/network/BookReference.cpp diff --git a/fbreader/src/network/BookReference.h b/reader/src/network/BookReference.h similarity index 100% rename from fbreader/src/network/BookReference.h rename to reader/src/network/BookReference.h diff --git a/fbreader/src/network/NetworkBookCollection.cpp b/reader/src/network/NetworkBookCollection.cpp similarity index 100% rename from fbreader/src/network/NetworkBookCollection.cpp rename to reader/src/network/NetworkBookCollection.cpp diff --git a/fbreader/src/network/NetworkBookCollection.h b/reader/src/network/NetworkBookCollection.h similarity index 100% rename from fbreader/src/network/NetworkBookCollection.h rename to reader/src/network/NetworkBookCollection.h diff --git a/fbreader/src/network/NetworkBookItem.cpp b/reader/src/network/NetworkBookItem.cpp similarity index 100% rename from fbreader/src/network/NetworkBookItem.cpp rename to reader/src/network/NetworkBookItem.cpp diff --git a/fbreader/src/network/NetworkCatalogItem.cpp b/reader/src/network/NetworkCatalogItem.cpp similarity index 100% rename from fbreader/src/network/NetworkCatalogItem.cpp rename to reader/src/network/NetworkCatalogItem.cpp diff --git a/fbreader/src/network/NetworkComparators.cpp b/reader/src/network/NetworkComparators.cpp similarity index 100% rename from fbreader/src/network/NetworkComparators.cpp rename to reader/src/network/NetworkComparators.cpp diff --git a/fbreader/src/network/NetworkComparators.h b/reader/src/network/NetworkComparators.h similarity index 100% rename from fbreader/src/network/NetworkComparators.h rename to reader/src/network/NetworkComparators.h diff --git a/fbreader/src/network/NetworkErrors.cpp b/reader/src/network/NetworkErrors.cpp similarity index 100% rename from fbreader/src/network/NetworkErrors.cpp rename to reader/src/network/NetworkErrors.cpp diff --git a/fbreader/src/network/NetworkErrors.h b/reader/src/network/NetworkErrors.h similarity index 100% rename from fbreader/src/network/NetworkErrors.h rename to reader/src/network/NetworkErrors.h diff --git a/fbreader/src/network/NetworkItem.cpp b/reader/src/network/NetworkItem.cpp similarity index 100% rename from fbreader/src/network/NetworkItem.cpp rename to reader/src/network/NetworkItem.cpp diff --git a/fbreader/src/network/NetworkItems.h b/reader/src/network/NetworkItems.h similarity index 100% rename from fbreader/src/network/NetworkItems.h rename to reader/src/network/NetworkItems.h diff --git a/fbreader/src/network/NetworkLink.cpp b/reader/src/network/NetworkLink.cpp similarity index 100% rename from fbreader/src/network/NetworkLink.cpp rename to reader/src/network/NetworkLink.cpp diff --git a/fbreader/src/network/NetworkLink.h b/reader/src/network/NetworkLink.h similarity index 100% rename from fbreader/src/network/NetworkLink.h rename to reader/src/network/NetworkLink.h diff --git a/fbreader/src/network/NetworkLinkCollection.cpp b/reader/src/network/NetworkLinkCollection.cpp similarity index 99% rename from fbreader/src/network/NetworkLinkCollection.cpp rename to reader/src/network/NetworkLinkCollection.cpp index 0b530b0..323605e 100644 --- a/fbreader/src/network/NetworkLinkCollection.cpp +++ b/reader/src/network/NetworkLinkCollection.cpp @@ -32,7 +32,7 @@ #include #include #include -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" #include "../networkActions/NetworkOperationRunnable.h" #include "NetworkLinkCollection.h" @@ -105,12 +105,12 @@ bool NetworkLinkCollection::Comparator::operator() ( // break; // } // } -// FBReader::Instance().refreshWindow(); +// Reader::Instance().refreshWindow(); //} //void NetworkLinkCollection::saveLink(NetworkLink& link, bool isAuto) { // saveLinkWithoutRefreshing(link, isAuto); -// FBReader::Instance().refreshWindow(); +// Reader::Instance().refreshWindow(); //} void NetworkLinkCollection::addOrUpdateLink(shared_ptr link) { @@ -136,7 +136,7 @@ void NetworkLinkCollection::addOrUpdateLink(shared_ptr link) { } if (updated) { NetworkDB::Instance().saveNetworkLink(link); - //FBReader::Instance().sendRefresh(); + //Reader::Instance().sendRefresh(); } } diff --git a/fbreader/src/network/NetworkLinkCollection.h b/reader/src/network/NetworkLinkCollection.h similarity index 100% rename from fbreader/src/network/NetworkLinkCollection.h rename to reader/src/network/NetworkLinkCollection.h diff --git a/fbreader/src/network/NetworkOperationData.cpp b/reader/src/network/NetworkOperationData.cpp similarity index 100% rename from fbreader/src/network/NetworkOperationData.cpp rename to reader/src/network/NetworkOperationData.cpp diff --git a/fbreader/src/network/NetworkOperationData.h b/reader/src/network/NetworkOperationData.h similarity index 100% rename from fbreader/src/network/NetworkOperationData.h rename to reader/src/network/NetworkOperationData.h diff --git a/fbreader/src/network/SearchResult.cpp b/reader/src/network/SearchResult.cpp similarity index 100% rename from fbreader/src/network/SearchResult.cpp rename to reader/src/network/SearchResult.cpp diff --git a/fbreader/src/network/SearchResult.h b/reader/src/network/SearchResult.h similarity index 100% rename from fbreader/src/network/SearchResult.h rename to reader/src/network/SearchResult.h diff --git a/fbreader/src/network/UserList.cpp b/reader/src/network/UserList.cpp similarity index 100% rename from fbreader/src/network/UserList.cpp rename to reader/src/network/UserList.cpp diff --git a/fbreader/src/network/UserList.h b/reader/src/network/UserList.h similarity index 100% rename from fbreader/src/network/UserList.h rename to reader/src/network/UserList.h diff --git a/fbreader/src/network/atom/ATOMConstructs.cpp b/reader/src/network/atom/ATOMConstructs.cpp similarity index 100% rename from fbreader/src/network/atom/ATOMConstructs.cpp rename to reader/src/network/atom/ATOMConstructs.cpp diff --git a/fbreader/src/network/atom/ATOMConstructs.h b/reader/src/network/atom/ATOMConstructs.h similarity index 100% rename from fbreader/src/network/atom/ATOMConstructs.h rename to reader/src/network/atom/ATOMConstructs.h diff --git a/fbreader/src/network/atom/ATOMContainers.cpp b/reader/src/network/atom/ATOMContainers.cpp similarity index 100% rename from fbreader/src/network/atom/ATOMContainers.cpp rename to reader/src/network/atom/ATOMContainers.cpp diff --git a/fbreader/src/network/atom/ATOMContainers.h b/reader/src/network/atom/ATOMContainers.h similarity index 100% rename from fbreader/src/network/atom/ATOMContainers.h rename to reader/src/network/atom/ATOMContainers.h diff --git a/fbreader/src/network/atom/ATOMMetadata.cpp b/reader/src/network/atom/ATOMMetadata.cpp similarity index 100% rename from fbreader/src/network/atom/ATOMMetadata.cpp rename to reader/src/network/atom/ATOMMetadata.cpp diff --git a/fbreader/src/network/atom/ATOMMetadata.h b/reader/src/network/atom/ATOMMetadata.h similarity index 100% rename from fbreader/src/network/atom/ATOMMetadata.h rename to reader/src/network/atom/ATOMMetadata.h diff --git a/fbreader/src/network/authentication/NetworkAuthenticationManager.cpp b/reader/src/network/authentication/NetworkAuthenticationManager.cpp similarity index 100% rename from fbreader/src/network/authentication/NetworkAuthenticationManager.cpp rename to reader/src/network/authentication/NetworkAuthenticationManager.cpp diff --git a/fbreader/src/network/authentication/NetworkAuthenticationManager.h b/reader/src/network/authentication/NetworkAuthenticationManager.h similarity index 100% rename from fbreader/src/network/authentication/NetworkAuthenticationManager.h rename to reader/src/network/authentication/NetworkAuthenticationManager.h diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp similarity index 100% rename from fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp rename to reader/src/network/authentication/litres/LitResAuthenticationDataParser.cpp diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.h b/reader/src/network/authentication/litres/LitResAuthenticationDataParser.h similarity index 100% rename from fbreader/src/network/authentication/litres/LitResAuthenticationDataParser.h rename to reader/src/network/authentication/litres/LitResAuthenticationDataParser.h diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.cpp b/reader/src/network/authentication/litres/LitResAuthenticationManager.cpp similarity index 100% rename from fbreader/src/network/authentication/litres/LitResAuthenticationManager.cpp rename to reader/src/network/authentication/litres/LitResAuthenticationManager.cpp diff --git a/fbreader/src/network/authentication/litres/LitResAuthenticationManager.h b/reader/src/network/authentication/litres/LitResAuthenticationManager.h similarity index 100% rename from fbreader/src/network/authentication/litres/LitResAuthenticationManager.h rename to reader/src/network/authentication/litres/LitResAuthenticationManager.h diff --git a/fbreader/src/network/litres/LitResAuthorsItem.cpp b/reader/src/network/litres/LitResAuthorsItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResAuthorsItem.cpp rename to reader/src/network/litres/LitResAuthorsItem.cpp diff --git a/fbreader/src/network/litres/LitResAuthorsItem.h b/reader/src/network/litres/LitResAuthorsItem.h similarity index 100% rename from fbreader/src/network/litres/LitResAuthorsItem.h rename to reader/src/network/litres/LitResAuthorsItem.h diff --git a/fbreader/src/network/litres/LitResAuthorsParser.cpp b/reader/src/network/litres/LitResAuthorsParser.cpp similarity index 100% rename from fbreader/src/network/litres/LitResAuthorsParser.cpp rename to reader/src/network/litres/LitResAuthorsParser.cpp diff --git a/fbreader/src/network/litres/LitResAuthorsParser.h b/reader/src/network/litres/LitResAuthorsParser.h similarity index 100% rename from fbreader/src/network/litres/LitResAuthorsParser.h rename to reader/src/network/litres/LitResAuthorsParser.h diff --git a/fbreader/src/network/litres/LitResBookItem.cpp b/reader/src/network/litres/LitResBookItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResBookItem.cpp rename to reader/src/network/litres/LitResBookItem.cpp diff --git a/fbreader/src/network/litres/LitResBookItem.h b/reader/src/network/litres/LitResBookItem.h similarity index 100% rename from fbreader/src/network/litres/LitResBookItem.h rename to reader/src/network/litres/LitResBookItem.h diff --git a/fbreader/src/network/litres/LitResBooksFeedItem.cpp b/reader/src/network/litres/LitResBooksFeedItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResBooksFeedItem.cpp rename to reader/src/network/litres/LitResBooksFeedItem.cpp diff --git a/fbreader/src/network/litres/LitResBooksFeedItem.h b/reader/src/network/litres/LitResBooksFeedItem.h similarity index 100% rename from fbreader/src/network/litres/LitResBooksFeedItem.h rename to reader/src/network/litres/LitResBooksFeedItem.h diff --git a/fbreader/src/network/litres/LitResBooksFeedParser.cpp b/reader/src/network/litres/LitResBooksFeedParser.cpp similarity index 99% rename from fbreader/src/network/litres/LitResBooksFeedParser.cpp rename to reader/src/network/litres/LitResBooksFeedParser.cpp index 970a8eb..4d2fe93 100644 --- a/fbreader/src/network/litres/LitResBooksFeedParser.cpp +++ b/reader/src/network/litres/LitResBooksFeedParser.cpp @@ -97,7 +97,7 @@ void LitResBooksFeedParser::processState(const std::string &tag, bool closed, co std::string url = stringAttributeValue(attributes, "url"); if (!url.empty()) { - myLink.rewriteUrl(url, true); // This code duplicates code in FBReader::openInBrowser and is not required + myLink.rewriteUrl(url, true); // This code duplicates code in Reader::openInBrowser and is not required myURLByType[NetworkItem::URL_HTML_PAGE] = url; } diff --git a/fbreader/src/network/litres/LitResBooksFeedParser.h b/reader/src/network/litres/LitResBooksFeedParser.h similarity index 100% rename from fbreader/src/network/litres/LitResBooksFeedParser.h rename to reader/src/network/litres/LitResBooksFeedParser.h diff --git a/fbreader/src/network/litres/LitResBookshelfItem.cpp b/reader/src/network/litres/LitResBookshelfItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResBookshelfItem.cpp rename to reader/src/network/litres/LitResBookshelfItem.cpp diff --git a/fbreader/src/network/litres/LitResBookshelfItem.h b/reader/src/network/litres/LitResBookshelfItem.h similarity index 100% rename from fbreader/src/network/litres/LitResBookshelfItem.h rename to reader/src/network/litres/LitResBookshelfItem.h diff --git a/fbreader/src/network/litres/LitResByGenresItem.cpp b/reader/src/network/litres/LitResByGenresItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResByGenresItem.cpp rename to reader/src/network/litres/LitResByGenresItem.cpp diff --git a/fbreader/src/network/litres/LitResByGenresItem.h b/reader/src/network/litres/LitResByGenresItem.h similarity index 100% rename from fbreader/src/network/litres/LitResByGenresItem.h rename to reader/src/network/litres/LitResByGenresItem.h diff --git a/fbreader/src/network/litres/LitResGenre.cpp b/reader/src/network/litres/LitResGenre.cpp similarity index 100% rename from fbreader/src/network/litres/LitResGenre.cpp rename to reader/src/network/litres/LitResGenre.cpp diff --git a/fbreader/src/network/litres/LitResGenre.h b/reader/src/network/litres/LitResGenre.h similarity index 100% rename from fbreader/src/network/litres/LitResGenre.h rename to reader/src/network/litres/LitResGenre.h diff --git a/fbreader/src/network/litres/LitResGenresParser.cpp b/reader/src/network/litres/LitResGenresParser.cpp similarity index 100% rename from fbreader/src/network/litres/LitResGenresParser.cpp rename to reader/src/network/litres/LitResGenresParser.cpp diff --git a/fbreader/src/network/litres/LitResGenresParser.h b/reader/src/network/litres/LitResGenresParser.h similarity index 100% rename from fbreader/src/network/litres/LitResGenresParser.h rename to reader/src/network/litres/LitResGenresParser.h diff --git a/fbreader/src/network/litres/LitResRecommendationsItem.cpp b/reader/src/network/litres/LitResRecommendationsItem.cpp similarity index 100% rename from fbreader/src/network/litres/LitResRecommendationsItem.cpp rename to reader/src/network/litres/LitResRecommendationsItem.cpp diff --git a/fbreader/src/network/litres/LitResRecommendationsItem.h b/reader/src/network/litres/LitResRecommendationsItem.h similarity index 100% rename from fbreader/src/network/litres/LitResRecommendationsItem.h rename to reader/src/network/litres/LitResRecommendationsItem.h diff --git a/fbreader/src/network/litres/LitResUtil.cpp b/reader/src/network/litres/LitResUtil.cpp similarity index 100% rename from fbreader/src/network/litres/LitResUtil.cpp rename to reader/src/network/litres/LitResUtil.cpp diff --git a/fbreader/src/network/litres/LitResUtil.h b/reader/src/network/litres/LitResUtil.h similarity index 100% rename from fbreader/src/network/litres/LitResUtil.h rename to reader/src/network/litres/LitResUtil.h diff --git a/fbreader/src/network/litres/SortedCatalogItem.cpp b/reader/src/network/litres/SortedCatalogItem.cpp similarity index 100% rename from fbreader/src/network/litres/SortedCatalogItem.cpp rename to reader/src/network/litres/SortedCatalogItem.cpp diff --git a/fbreader/src/network/litres/SortedCatalogItem.h b/reader/src/network/litres/SortedCatalogItem.h similarity index 100% rename from fbreader/src/network/litres/SortedCatalogItem.h rename to reader/src/network/litres/SortedCatalogItem.h diff --git a/fbreader/src/network/opds/NetworkOPDSFeedReader.cpp b/reader/src/network/opds/NetworkOPDSFeedReader.cpp similarity index 100% rename from fbreader/src/network/opds/NetworkOPDSFeedReader.cpp rename to reader/src/network/opds/NetworkOPDSFeedReader.cpp diff --git a/fbreader/src/network/opds/NetworkOPDSFeedReader.h b/reader/src/network/opds/NetworkOPDSFeedReader.h similarity index 100% rename from fbreader/src/network/opds/NetworkOPDSFeedReader.h rename to reader/src/network/opds/NetworkOPDSFeedReader.h diff --git a/fbreader/src/network/opds/OPDSBookItem.cpp b/reader/src/network/opds/OPDSBookItem.cpp similarity index 100% rename from fbreader/src/network/opds/OPDSBookItem.cpp rename to reader/src/network/opds/OPDSBookItem.cpp diff --git a/fbreader/src/network/opds/OPDSBookItem.h b/reader/src/network/opds/OPDSBookItem.h similarity index 100% rename from fbreader/src/network/opds/OPDSBookItem.h rename to reader/src/network/opds/OPDSBookItem.h diff --git a/fbreader/src/network/opds/OPDSCatalogItem.cpp b/reader/src/network/opds/OPDSCatalogItem.cpp similarity index 100% rename from fbreader/src/network/opds/OPDSCatalogItem.cpp rename to reader/src/network/opds/OPDSCatalogItem.cpp diff --git a/fbreader/src/network/opds/OPDSCatalogItem.h b/reader/src/network/opds/OPDSCatalogItem.h similarity index 100% rename from fbreader/src/network/opds/OPDSCatalogItem.h rename to reader/src/network/opds/OPDSCatalogItem.h diff --git a/fbreader/src/network/opds/OPDSFeedReader.h b/reader/src/network/opds/OPDSFeedReader.h similarity index 100% rename from fbreader/src/network/opds/OPDSFeedReader.h rename to reader/src/network/opds/OPDSFeedReader.h diff --git a/fbreader/src/network/opds/OPDSLink.cpp b/reader/src/network/opds/OPDSLink.cpp similarity index 100% rename from fbreader/src/network/opds/OPDSLink.cpp rename to reader/src/network/opds/OPDSLink.cpp diff --git a/fbreader/src/network/opds/OPDSLink.h b/reader/src/network/opds/OPDSLink.h similarity index 100% rename from fbreader/src/network/opds/OPDSLink.h rename to reader/src/network/opds/OPDSLink.h diff --git a/fbreader/src/network/opds/OPDSLink_AdvancedSearch.h b/reader/src/network/opds/OPDSLink_AdvancedSearch.h similarity index 100% rename from fbreader/src/network/opds/OPDSLink_AdvancedSearch.h rename to reader/src/network/opds/OPDSLink_AdvancedSearch.h diff --git a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.cpp b/reader/src/network/opds/OPDSLink_GenericFeedReader.cpp similarity index 100% rename from fbreader/src/network/opds/OPDSLink_GenericFeedReader.cpp rename to reader/src/network/opds/OPDSLink_GenericFeedReader.cpp diff --git a/fbreader/src/network/opds/OPDSLink_GenericFeedReader.h b/reader/src/network/opds/OPDSLink_GenericFeedReader.h similarity index 100% rename from fbreader/src/network/opds/OPDSLink_GenericFeedReader.h rename to reader/src/network/opds/OPDSLink_GenericFeedReader.h diff --git a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.cpp b/reader/src/network/opds/OPDSLink_GenericXMLParser.cpp similarity index 83% rename from fbreader/src/network/opds/OPDSLink_GenericXMLParser.cpp rename to reader/src/network/opds/OPDSLink_GenericXMLParser.cpp index ef67116..af5d866 100644 --- a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.cpp +++ b/reader/src/network/opds/OPDSLink_GenericXMLParser.cpp @@ -24,11 +24,11 @@ #include "OPDSLink_AdvancedSearch.h" static const std::string TAG_ENTRY = "entry"; -static const std::string FBREADER_ADVANCED_SEARCH = "advancedSearch"; -static const std::string FBREADER_AUTHENTICATION = "authentication"; -static const std::string FBREADER_REWRITING_RULE = "urlRewritingRule"; -static const std::string FBREADER_RELATION_ALIAS = "relationAlias"; -static const std::string FBREADER_EXTRA = "extra"; +static const std::string READER_ADVANCED_SEARCH = "advancedSearch"; +static const std::string READER_AUTHENTICATION = "authentication"; +static const std::string READER_REWRITING_RULE = "urlRewritingRule"; +static const std::string READER_RELATION_ALIAS = "relationAlias"; +static const std::string READER_EXTRA = "extra"; OPDSLink::GenericXMLParser::GenericXMLParser(shared_ptr feedReader) : OPDSXMLParser(feedReader) { @@ -46,7 +46,7 @@ void OPDSLink::GenericXMLParser::startElementHandler(const char *tag, const char } break; case F_ENTRY: - if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_ADVANCED_SEARCH, tag)) { + if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_ADVANCED_SEARCH, tag)) { const char *style = attributeValue(attributes, "style"); const char *author = attributeValue(attributes, "author"); const char *titleOrSeries = attributeValue(attributes, "titleOrSeries"); @@ -56,20 +56,20 @@ void OPDSLink::GenericXMLParser::startElementHandler(const char *tag, const char getFeedReader().setAdvancedSearch(new OPDSLink::AdvancedSearch(style, titleOrSeries, author, tag, annotation)); } return; - } else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_AUTHENTICATION, tag)) { + } else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_AUTHENTICATION, tag)) { const char *type = attributeValue(attributes, "type"); if (type != 0) { getFeedReader().setAuthenticationType(type); } return; - } else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_RELATION_ALIAS, tag)) { + } else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_RELATION_ALIAS, tag)) { const char *name = attributeValue(attributes, "name"); const char *type = attributeValue(attributes, "type"); const char *alias = attributeValue(attributes, "alias"); if (name != 0 && alias != 0) { getFeedReader().addRelationAlias(OPDSLink::RelationAlias(alias, (type != 0) ? type : std::string()), name); } - } else if (testTag(ZLXMLNamespace::FBReaderCatalogMetadata, FBREADER_REWRITING_RULE, tag)) { + } else if (testTag(ZLXMLNamespace::ReaderCatalogMetadata, READER_REWRITING_RULE, tag)) { getFeedReader().addUrlRewritingRule(new URLRewritingRule(getAttributesMap(attributes))); diff --git a/fbreader/src/network/opds/OPDSLink_GenericXMLParser.h b/reader/src/network/opds/OPDSLink_GenericXMLParser.h similarity index 100% rename from fbreader/src/network/opds/OPDSLink_GenericXMLParser.h rename to reader/src/network/opds/OPDSLink_GenericXMLParser.h diff --git a/fbreader/src/network/opds/OPDSMetadata.cpp b/reader/src/network/opds/OPDSMetadata.cpp similarity index 100% rename from fbreader/src/network/opds/OPDSMetadata.cpp rename to reader/src/network/opds/OPDSMetadata.cpp diff --git a/fbreader/src/network/opds/OPDSMetadata.h b/reader/src/network/opds/OPDSMetadata.h similarity index 100% rename from fbreader/src/network/opds/OPDSMetadata.h rename to reader/src/network/opds/OPDSMetadata.h diff --git a/fbreader/src/network/opds/OPDSXMLParser.cpp b/reader/src/network/opds/OPDSXMLParser.cpp similarity index 98% rename from fbreader/src/network/opds/OPDSXMLParser.cpp rename to reader/src/network/opds/OPDSXMLParser.cpp index a1a1dd9..2b9fb4c 100644 --- a/fbreader/src/network/opds/OPDSXMLParser.cpp +++ b/reader/src/network/opds/OPDSXMLParser.cpp @@ -60,10 +60,10 @@ const std::string OPDSXMLParser::KEY_PRICE = "price"; const std::string OPDSXMLParser::KEY_CURRENCY = "currency"; const std::string OPDSXMLParser::KEY_FORMAT = "format"; -static const std::string TAG_SEARCH_DESCRIPTION = "fbreader:advancedSearch"; -static const std::string TAG_AUTHENTICATION = "fbreader:authentication"; -static const std::string TAG_URL_REWRITING_RULES = "fbreader:urlRewritingRule"; -static const std::string TAG_RELATION_ALIASES = "fbreader:relationAlias"; +static const std::string TAG_SEARCH_DESCRIPTION = "reader:advancedSearch"; +static const std::string TAG_AUTHENTICATION = "reader:authentication"; +static const std::string TAG_URL_REWRITING_RULES = "reader:urlRewritingRule"; +static const std::string TAG_RELATION_ALIASES = "reader:relationAlias"; OPDSXMLParser::OPDSXMLParser(shared_ptr feedReader, bool readEntryNotFeed) : myFeedReader(feedReader) { myState = readEntryNotFeed ? FEED : START; diff --git a/fbreader/src/network/opds/OPDSXMLParser.h b/reader/src/network/opds/OPDSXMLParser.h similarity index 100% rename from fbreader/src/network/opds/OPDSXMLParser.h rename to reader/src/network/opds/OPDSXMLParser.h diff --git a/fbreader/src/network/opds/OpenSearchXMLReader.cpp b/reader/src/network/opds/OpenSearchXMLReader.cpp similarity index 100% rename from fbreader/src/network/opds/OpenSearchXMLReader.cpp rename to reader/src/network/opds/OpenSearchXMLReader.cpp diff --git a/fbreader/src/network/opds/OpenSearchXMLReader.h b/reader/src/network/opds/OpenSearchXMLReader.h similarity index 100% rename from fbreader/src/network/opds/OpenSearchXMLReader.h rename to reader/src/network/opds/OpenSearchXMLReader.h diff --git a/fbreader/src/network/opds/URLRewritingRule.cpp b/reader/src/network/opds/URLRewritingRule.cpp similarity index 100% rename from fbreader/src/network/opds/URLRewritingRule.cpp rename to reader/src/network/opds/URLRewritingRule.cpp diff --git a/fbreader/src/network/opds/URLRewritingRule.h b/reader/src/network/opds/URLRewritingRule.h similarity index 100% rename from fbreader/src/network/opds/URLRewritingRule.h rename to reader/src/network/opds/URLRewritingRule.h diff --git a/fbreader/src/network/tree/NetworkAuthorTree.cpp b/reader/src/network/tree/NetworkAuthorTree.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkAuthorTree.cpp rename to reader/src/network/tree/NetworkAuthorTree.cpp diff --git a/fbreader/src/network/tree/NetworkBookTree.cpp b/reader/src/network/tree/NetworkBookTree.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkBookTree.cpp rename to reader/src/network/tree/NetworkBookTree.cpp diff --git a/fbreader/src/network/tree/NetworkCatalogRootTree.cpp b/reader/src/network/tree/NetworkCatalogRootTree.cpp similarity index 97% rename from fbreader/src/network/tree/NetworkCatalogRootTree.cpp rename to reader/src/network/tree/NetworkCatalogRootTree.cpp index 50a78f5..27ac665 100644 --- a/fbreader/src/network/tree/NetworkCatalogRootTree.cpp +++ b/reader/src/network/tree/NetworkCatalogRootTree.cpp @@ -20,7 +20,7 @@ #include #include -#include "../../fbreader/FBReader.h" +#include "../../reader/Reader.h" #include "../authentication/NetworkAuthenticationManager.h" #include "../../networkActions/NetworkOperationRunnable.h" @@ -222,7 +222,7 @@ std::string NetworkCatalogRootTree::TopupAccountAction::text(const ZLResource &r } void NetworkCatalogRootTree::TopupAccountAction::run() { - FBReader::Instance().openLinkInBrowser(myManager.topupAccountLink()); + Reader::Instance().openLinkInBrowser(myManager.topupAccountLink()); NetworkLibrary::Instance().refresh(); } @@ -243,7 +243,7 @@ void NetworkCatalogRootTree::PasswordRecoveryAction::run() { } PasswordRecoveryDialog::run(myManager); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); NetworkLibrary::Instance().refresh(); } @@ -260,6 +260,6 @@ void NetworkCatalogRootTree::RegisterUserAction::run() { } RegisterUserDialog::run(myManager); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); NetworkLibrary::Instance().refresh(); } diff --git a/fbreader/src/network/tree/NetworkCatalogTree.cpp b/reader/src/network/tree/NetworkCatalogTree.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkCatalogTree.cpp rename to reader/src/network/tree/NetworkCatalogTree.cpp diff --git a/fbreader/src/network/tree/NetworkCatalogUtil.cpp b/reader/src/network/tree/NetworkCatalogUtil.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkCatalogUtil.cpp rename to reader/src/network/tree/NetworkCatalogUtil.cpp diff --git a/fbreader/src/network/tree/NetworkCatalogUtil.h b/reader/src/network/tree/NetworkCatalogUtil.h similarity index 100% rename from fbreader/src/network/tree/NetworkCatalogUtil.h rename to reader/src/network/tree/NetworkCatalogUtil.h diff --git a/fbreader/src/network/tree/NetworkLibrary.cpp b/reader/src/network/tree/NetworkLibrary.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkLibrary.cpp rename to reader/src/network/tree/NetworkLibrary.cpp diff --git a/fbreader/src/network/tree/NetworkLibrary.h b/reader/src/network/tree/NetworkLibrary.h similarity index 100% rename from fbreader/src/network/tree/NetworkLibrary.h rename to reader/src/network/tree/NetworkLibrary.h diff --git a/fbreader/src/network/tree/NetworkSearcher.cpp b/reader/src/network/tree/NetworkSearcher.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkSearcher.cpp rename to reader/src/network/tree/NetworkSearcher.cpp diff --git a/fbreader/src/network/tree/NetworkSearcher.h b/reader/src/network/tree/NetworkSearcher.h similarity index 100% rename from fbreader/src/network/tree/NetworkSearcher.h rename to reader/src/network/tree/NetworkSearcher.h diff --git a/fbreader/src/network/tree/NetworkSeriesTree.cpp b/reader/src/network/tree/NetworkSeriesTree.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkSeriesTree.cpp rename to reader/src/network/tree/NetworkSeriesTree.cpp diff --git a/fbreader/src/network/tree/NetworkTree.cpp b/reader/src/network/tree/NetworkTree.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkTree.cpp rename to reader/src/network/tree/NetworkTree.cpp diff --git a/fbreader/src/network/tree/NetworkTreeFactory.cpp b/reader/src/network/tree/NetworkTreeFactory.cpp similarity index 100% rename from fbreader/src/network/tree/NetworkTreeFactory.cpp rename to reader/src/network/tree/NetworkTreeFactory.cpp diff --git a/fbreader/src/network/tree/NetworkTreeFactory.h b/reader/src/network/tree/NetworkTreeFactory.h similarity index 100% rename from fbreader/src/network/tree/NetworkTreeFactory.h rename to reader/src/network/tree/NetworkTreeFactory.h diff --git a/fbreader/src/network/tree/NetworkTreeNodes.h b/reader/src/network/tree/NetworkTreeNodes.h similarity index 100% rename from fbreader/src/network/tree/NetworkTreeNodes.h rename to reader/src/network/tree/NetworkTreeNodes.h diff --git a/fbreader/src/network/tree/RootTree.cpp b/reader/src/network/tree/RootTree.cpp similarity index 100% rename from fbreader/src/network/tree/RootTree.cpp rename to reader/src/network/tree/RootTree.cpp diff --git a/fbreader/src/network/tree/SearchCatalogTree.cpp b/reader/src/network/tree/SearchCatalogTree.cpp similarity index 100% rename from fbreader/src/network/tree/SearchCatalogTree.cpp rename to reader/src/network/tree/SearchCatalogTree.cpp diff --git a/fbreader/src/networkActions/AuthenticationDialog.cpp b/reader/src/networkActions/AuthenticationDialog.cpp similarity index 100% rename from fbreader/src/networkActions/AuthenticationDialog.cpp rename to reader/src/networkActions/AuthenticationDialog.cpp diff --git a/fbreader/src/networkActions/AuthenticationDialog.h b/reader/src/networkActions/AuthenticationDialog.h similarity index 100% rename from fbreader/src/networkActions/AuthenticationDialog.h rename to reader/src/networkActions/AuthenticationDialog.h diff --git a/fbreader/src/networkActions/AuthenticationDialogManager.cpp b/reader/src/networkActions/AuthenticationDialogManager.cpp similarity index 100% rename from fbreader/src/networkActions/AuthenticationDialogManager.cpp rename to reader/src/networkActions/AuthenticationDialogManager.cpp diff --git a/fbreader/src/networkActions/AuthenticationDialogManager.h b/reader/src/networkActions/AuthenticationDialogManager.h similarity index 100% rename from fbreader/src/networkActions/AuthenticationDialogManager.h rename to reader/src/networkActions/AuthenticationDialogManager.h diff --git a/fbreader/src/networkActions/NetworkActions.cpp b/reader/src/networkActions/NetworkActions.cpp similarity index 94% rename from fbreader/src/networkActions/NetworkActions.cpp rename to reader/src/networkActions/NetworkActions.cpp index 90a9725..4f2f2c6 100644 --- a/fbreader/src/networkActions/NetworkActions.cpp +++ b/reader/src/networkActions/NetworkActions.cpp @@ -35,7 +35,7 @@ #include "../network/authentication/NetworkAuthenticationManager.h" #include "../library/Book.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" NetworkBookReadAction::NetworkBookReadAction(const NetworkBookItem &book, bool demo) : myBook(book), myDemo(demo) { } @@ -70,13 +70,13 @@ void NetworkBookReadAction::run() { fileName = myBook.localCopyFileName(); } if (!fileName.empty()) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); shared_ptr bookPtr; - fbreader.createBook(ZLFile(fileName), bookPtr); + reader.createBook(ZLFile(fileName), bookPtr); if (!bookPtr.isNull()) { - fbreader.openBook(bookPtr); - fbreader.setMode(FBReader::BOOK_TEXT_MODE); - fbreader.refreshWindow(); + reader.openBook(bookPtr); + reader.setMode(Reader::BOOK_TEXT_MODE); + reader.refreshWindow(); NetworkLibrary::Instance().refresh(); } } @@ -143,15 +143,15 @@ void NetworkBookDownloadAction::onBookDownloaded(const std::string &error) { if (!error.empty()) { NetworkErrors::showErrorMessage(error); } - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); shared_ptr downloaderBook; - fbreader.createBook(ZLFile(myFileName), downloaderBook); + reader.createBook(ZLFile(myFileName), downloaderBook); if (downloaderBook.isNull()) { ZLFile(myFileName).remove(); ZLResourceKey boxKey("cantOpenDownloadedFile"); const std::string message = ZLStringUtil::printf(ZLDialogManager::dialogMessage(boxKey), myBook.Title); ZLDialogManager::Instance().errorBox(boxKey, message); - fbreader.refreshWindow(); + reader.refreshWindow(); NetworkLibrary::Instance().refresh(); return; } @@ -174,9 +174,9 @@ void NetworkBookDownloadAction::onBookDownloaded(const std::string &error) { } Library::Instance().addBook(downloaderBook); - fbreader.openBook(downloaderBook); - fbreader.setMode(FBReader::BOOK_TEXT_MODE); - fbreader.refreshWindow(); + reader.openBook(downloaderBook); + reader.setMode(Reader::BOOK_TEXT_MODE); + reader.refreshWindow(); NetworkLibrary::Instance().refresh(); } @@ -328,7 +328,7 @@ std::string NetworkBookBuyInBrowserAction::text(const ZLResource &resource) cons void NetworkBookBuyInBrowserAction::run() { shared_ptr reference = myBook.reference(BookReference::BUY_IN_BROWSER); if (!reference.isNull()) { - FBReader::Instance().openLinkInBrowser(reference->URL); + Reader::Instance().openLinkInBrowser(reference->URL); } NetworkLibrary::Instance().refresh(); } @@ -352,6 +352,6 @@ void NetworkBookDeleteAction::run() { } myBook.removeLocalFiles(); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); NetworkLibrary::Instance().refresh(); } diff --git a/fbreader/src/networkActions/NetworkActions.h b/reader/src/networkActions/NetworkActions.h similarity index 100% rename from fbreader/src/networkActions/NetworkActions.h rename to reader/src/networkActions/NetworkActions.h diff --git a/fbreader/src/networkActions/NetworkOperationRunnable.cpp b/reader/src/networkActions/NetworkOperationRunnable.cpp similarity index 100% rename from fbreader/src/networkActions/NetworkOperationRunnable.cpp rename to reader/src/networkActions/NetworkOperationRunnable.cpp diff --git a/fbreader/src/networkActions/NetworkOperationRunnable.h b/reader/src/networkActions/NetworkOperationRunnable.h similarity index 100% rename from fbreader/src/networkActions/NetworkOperationRunnable.h rename to reader/src/networkActions/NetworkOperationRunnable.h diff --git a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp b/reader/src/networkActions/PasswordRecoveryDialog.cpp similarity index 98% rename from fbreader/src/networkActions/PasswordRecoveryDialog.cpp rename to reader/src/networkActions/PasswordRecoveryDialog.cpp index c02fa15..70d6c61 100644 --- a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp +++ b/reader/src/networkActions/PasswordRecoveryDialog.cpp @@ -32,7 +32,7 @@ #include "../network/authentication/NetworkAuthenticationManager.h" #include "../network/NetworkErrors.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" PasswordRecoveryDialog::PasswordRecoveryDialog(std::string &email, const std::string &errorMessage) { myDialog = ZLDialogManager::Instance().createDialog(ZLResourceKey("PasswordRecoveryDialog")); diff --git a/fbreader/src/networkActions/PasswordRecoveryDialog.h b/reader/src/networkActions/PasswordRecoveryDialog.h similarity index 100% rename from fbreader/src/networkActions/PasswordRecoveryDialog.h rename to reader/src/networkActions/PasswordRecoveryDialog.h diff --git a/fbreader/src/networkActions/RegisterUserDialog.cpp b/reader/src/networkActions/RegisterUserDialog.cpp similarity index 99% rename from fbreader/src/networkActions/RegisterUserDialog.cpp rename to reader/src/networkActions/RegisterUserDialog.cpp index 4d93d8c..589aae6 100644 --- a/fbreader/src/networkActions/RegisterUserDialog.cpp +++ b/reader/src/networkActions/RegisterUserDialog.cpp @@ -32,7 +32,7 @@ #include "../network/authentication/NetworkAuthenticationManager.h" #include "../network/NetworkErrors.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" class HiddenValueEntry : public ZLPasswordOptionEntry { diff --git a/fbreader/src/networkActions/RegisterUserDialog.h b/reader/src/networkActions/RegisterUserDialog.h similarity index 100% rename from fbreader/src/networkActions/RegisterUserDialog.h rename to reader/src/networkActions/RegisterUserDialog.h diff --git a/fbreader/src/options/FBCategoryKey.cpp b/reader/src/options/FBCategoryKey.cpp similarity index 100% rename from fbreader/src/options/FBCategoryKey.cpp rename to reader/src/options/FBCategoryKey.cpp diff --git a/fbreader/src/options/FBCategoryKey.h b/reader/src/options/FBCategoryKey.h similarity index 100% rename from fbreader/src/options/FBCategoryKey.h rename to reader/src/options/FBCategoryKey.h diff --git a/fbreader/src/options/FBOptions.cpp b/reader/src/options/FBOptions.cpp similarity index 100% rename from fbreader/src/options/FBOptions.cpp rename to reader/src/options/FBOptions.cpp diff --git a/fbreader/src/options/FBOptions.h b/reader/src/options/FBOptions.h similarity index 100% rename from fbreader/src/options/FBOptions.h rename to reader/src/options/FBOptions.h diff --git a/fbreader/src/options/FBTextStyle.cpp b/reader/src/options/FBTextStyle.cpp similarity index 100% rename from fbreader/src/options/FBTextStyle.cpp rename to reader/src/options/FBTextStyle.cpp diff --git a/fbreader/src/options/FBTextStyle.h b/reader/src/options/FBTextStyle.h similarity index 100% rename from fbreader/src/options/FBTextStyle.h rename to reader/src/options/FBTextStyle.h diff --git a/fbreader/src/optionsDialog/AbstractOptionsDialog.cpp b/reader/src/optionsDialog/AbstractOptionsDialog.cpp similarity index 87% rename from fbreader/src/optionsDialog/AbstractOptionsDialog.cpp rename to reader/src/optionsDialog/AbstractOptionsDialog.cpp index eb687b8..b49596d 100644 --- a/fbreader/src/optionsDialog/AbstractOptionsDialog.cpp +++ b/reader/src/optionsDialog/AbstractOptionsDialog.cpp @@ -22,7 +22,7 @@ #include "AbstractOptionsDialog.h" -#include "../fbreader/FBReader.h" +#include "../reader/Reader.h" class OptionsApplyRunnable : public ZLRunnable { @@ -32,10 +32,10 @@ public: }; void OptionsApplyRunnable::run() { - FBReader &fbreader = FBReader::Instance(); - fbreader.grabAllKeys(fbreader.KeyboardControlOption.value()); - fbreader.clearTextCaches(); - fbreader.refreshWindow(); + Reader &reader = Reader::Instance(); + reader.grabAllKeys(reader.KeyboardControlOption.value()); + reader.clearTextCaches(); + reader.refreshWindow(); } diff --git a/fbreader/src/optionsDialog/AbstractOptionsDialog.h b/reader/src/optionsDialog/AbstractOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/AbstractOptionsDialog.h rename to reader/src/optionsDialog/AbstractOptionsDialog.h diff --git a/fbreader/src/optionsDialog/IntegrationTab.cpp b/reader/src/optionsDialog/IntegrationTab.cpp similarity index 100% rename from fbreader/src/optionsDialog/IntegrationTab.cpp rename to reader/src/optionsDialog/IntegrationTab.cpp diff --git a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp b/reader/src/optionsDialog/bookInfo/BookInfoDialog.cpp similarity index 100% rename from fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp rename to reader/src/optionsDialog/bookInfo/BookInfoDialog.cpp diff --git a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.h b/reader/src/optionsDialog/bookInfo/BookInfoDialog.h similarity index 100% rename from fbreader/src/optionsDialog/bookInfo/BookInfoDialog.h rename to reader/src/optionsDialog/bookInfo/BookInfoDialog.h diff --git a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.cpp b/reader/src/optionsDialog/library/LibraryOptionsDialog.cpp similarity index 97% rename from fbreader/src/optionsDialog/library/LibraryOptionsDialog.cpp rename to reader/src/optionsDialog/library/LibraryOptionsDialog.cpp index 1c4608a..b2168d3 100644 --- a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.cpp +++ b/reader/src/optionsDialog/library/LibraryOptionsDialog.cpp @@ -22,7 +22,7 @@ #include #include -#include "../../fbreader/FBReader.h" +#include "../../reader/Reader.h" #include "../../network/NetworkLinkCollection.h" diff --git a/fbreader/src/optionsDialog/library/LibraryOptionsDialog.h b/reader/src/optionsDialog/library/LibraryOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/library/LibraryOptionsDialog.h rename to reader/src/optionsDialog/library/LibraryOptionsDialog.h diff --git a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp rename to reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp diff --git a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h b/reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h rename to reader/src/optionsDialog/lookAndFeel/FormatOptionsPage.h diff --git a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp similarity index 95% rename from fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp rename to reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp index b3c20ce..ca740c6 100644 --- a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp +++ b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp @@ -31,13 +31,13 @@ #include "FormatOptionsPage.h" #include "StyleOptionsPage.h" -#include "../../fbreader/FBReader.h" -#include "../../fbreader/FBView.h" +#include "../../reader/Reader.h" +#include "../../reader/FBView.h" #include "../../options/FBOptions.h" LookAndFeelOptionsDialog::LookAndFeelOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("LookAndFeelOptionsDialog"), true) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); FBOptions &options = FBOptions::Instance(); ZLOptionsDialog &dialog = this->dialog(); @@ -56,7 +56,7 @@ LookAndFeelOptionsDialog::LookAndFeelOptionsDialog() : AbstractOptionsDialog(ZLR ); myFormatPage = new FormatOptionsPage(dialog.createTab(ZLResourceKey("Format"))); - myStylePage = new StyleOptionsPage(dialog.createTab(ZLResourceKey("Styles")), *fbreader.context()); + myStylePage = new StyleOptionsPage(dialog.createTab(ZLResourceKey("Styles")), *reader.context()); ZLDialogContent &colorsTab = dialog.createTab(ZLResourceKey("Colors")); ZLResourceKey colorKey("colorFor"); diff --git a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h b/reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h rename to reader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.h diff --git a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/OptionsPage.cpp similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/OptionsPage.cpp rename to reader/src/optionsDialog/lookAndFeel/OptionsPage.cpp diff --git a/fbreader/src/optionsDialog/lookAndFeel/OptionsPage.h b/reader/src/optionsDialog/lookAndFeel/OptionsPage.h similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/OptionsPage.h rename to reader/src/optionsDialog/lookAndFeel/OptionsPage.h diff --git a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp rename to reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp diff --git a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h b/reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h similarity index 100% rename from fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h rename to reader/src/optionsDialog/lookAndFeel/StyleOptionsPage.h diff --git a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp b/reader/src/optionsDialog/network/NetworkOptionsDialog.cpp similarity index 94% rename from fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp rename to reader/src/optionsDialog/network/NetworkOptionsDialog.cpp index c7c4b10..5c39131 100644 --- a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp +++ b/reader/src/optionsDialog/network/NetworkOptionsDialog.cpp @@ -29,7 +29,7 @@ #include #include -#include "../../fbreader/FBReader.h" +#include "../../reader/Reader.h" //#include "../../network/NetworkLinkCollection.h" //#include "../../network/NetworkLink.h" @@ -58,14 +58,14 @@ void NetworkLinkBooleanOptionEntry::onAccept(bool state) { bool oldState = myOption.value(); myOption.setValue(state); if (state != oldState) { -// FBReader::Instance().invalidateNetworkView(); +// Reader::Instance().invalidateNetworkView(); } } NetworkOptionsDialog::NetworkOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("NetworkOptionsDialog"), true) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); ZLDialogContent &connectionTab = dialog().createTab(ZLResourceKey("Connection")); @@ -100,5 +100,5 @@ NetworkOptionsDialog::NetworkOptionsDialog() : AbstractOptionsDialog(ZLResourceK // } std::vector > additional; - createIntegrationTab(fbreader.webBrowserCollection(), ZLResourceKey("Web"), additional); + createIntegrationTab(reader.webBrowserCollection(), ZLResourceKey("Web"), additional); } diff --git a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.h b/reader/src/optionsDialog/network/NetworkOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/network/NetworkOptionsDialog.h rename to reader/src/optionsDialog/network/NetworkOptionsDialog.h diff --git a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp b/reader/src/optionsDialog/reading/IndicatorTab.cpp similarity index 96% rename from fbreader/src/optionsDialog/reading/IndicatorTab.cpp rename to reader/src/optionsDialog/reading/IndicatorTab.cpp index 2049b16..6d288c6 100644 --- a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp +++ b/reader/src/optionsDialog/reading/IndicatorTab.cpp @@ -25,9 +25,9 @@ #include "ReadingOptionsDialog.h" -#include "../../fbreader/FBReader.h" -#include "../../fbreader/FBView.h" -#include "../../fbreader/BookTextView.h" +#include "../../reader/Reader.h" +#include "../../reader/FBView.h" +#include "../../reader/BookTextView.h" class StateOptionEntry : public ZLToggleBooleanOptionEntry { @@ -156,7 +156,7 @@ void ReadingOptionsDialog::createIndicatorTab() { showTimeEntry->addDependentEntry(fontSizeEntry); ZLOptionEntry *tocMarksEntry = - new ZLSimpleBooleanOptionEntry(FBReader::Instance().bookTextView().ShowTOCMarksOption); + new ZLSimpleBooleanOptionEntry(Reader::Instance().bookTextView().ShowTOCMarksOption); indicatorTab.addOption(ZLResourceKey("tocMarks"), tocMarksEntry); indicatorTypeEntry->addDependentEntry(tocMarksEntry); diff --git a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp b/reader/src/optionsDialog/reading/KeyBindingsTab.cpp similarity index 92% rename from fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp rename to reader/src/optionsDialog/reading/KeyBindingsTab.cpp index b522578..f72023b 100644 --- a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp +++ b/reader/src/optionsDialog/reading/KeyBindingsTab.cpp @@ -26,8 +26,8 @@ #include "ReadingOptionsDialog.h" -#include "../../fbreader/FBReader.h" -#include "../../fbreader/FBReaderActions.h" +#include "../../reader/Reader.h" +#include "../../reader/ReaderActions.h" class KeyboardControlEntry : public ZLSimpleBooleanOptionEntry { @@ -36,12 +36,12 @@ public: void onStateChanged(bool state); }; -KeyboardControlEntry::KeyboardControlEntry() : ZLSimpleBooleanOptionEntry(FBReader::Instance().KeyboardControlOption) { +KeyboardControlEntry::KeyboardControlEntry() : ZLSimpleBooleanOptionEntry(Reader::Instance().KeyboardControlOption) { } void KeyboardControlEntry::onStateChanged(bool state) { ZLSimpleBooleanOptionEntry::onStateChanged(state); - FBReader::Instance().grabAllKeys(state); + Reader::Instance().grabAllKeys(state); } class SingleKeyOptionEntry : public ZLSimpleKeyOptionEntry { @@ -96,10 +96,10 @@ void MultiKeyOptionEntry::addAction(const std::string &actionId) { MultiKeyOptionEntry::MultiKeyOptionEntry(const ZLResource &resource) : ZLKeyOptionEntry(), myResource(resource), - myEntry0(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES0)), - myEntry90(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES90)), - myEntry180(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES180)), - myEntry270(myBimap, *FBReader::Instance().keyBindings(ZLView::DEGREES270)), + myEntry0(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES0)), + myEntry90(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES90)), + myEntry180(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES180)), + myEntry270(myBimap, *Reader::Instance().keyBindings(ZLView::DEGREES270)), myCurrentEntry(&myEntry0), myExitOnCancelEntry(0) { addAction(ZLApplication::NoAction); @@ -251,7 +251,7 @@ private: OrientationEntry &myOrientationEntry; }; -UseSeparateOptionsEntry::UseSeparateOptionsEntry(ZLOptionEntry &keyEntry, OrientationEntry &orientationEntry) : ZLSimpleBooleanOptionEntry(FBReader::Instance().UseSeparateBindingsOption), myKeyEntry(keyEntry), myOrientationEntry(orientationEntry) { +UseSeparateOptionsEntry::UseSeparateOptionsEntry(ZLOptionEntry &keyEntry, OrientationEntry &orientationEntry) : ZLSimpleBooleanOptionEntry(Reader::Instance().UseSeparateBindingsOption), myKeyEntry(keyEntry), myOrientationEntry(orientationEntry) { } void UseSeparateOptionsEntry::onStateChanged(bool state) { @@ -263,7 +263,7 @@ void UseSeparateOptionsEntry::onStateChanged(bool state) { void ReadingOptionsDialog::createKeyBindingsTab() { ZLDialogContent &dialogTab = dialog().createTab(ZLResourceKey("Keys")); - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); if (ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FULL_KEYBOARD_CONTROL, false).value()) { dialogTab.addOption(ZLResourceKey("grabSystemKeys"), new KeyboardControlEntry()); } @@ -276,10 +276,10 @@ void ReadingOptionsDialog::createKeyBindingsTab() { dialogTab.addOption(separateKey, useSeparateBindingsEntry); dialogTab.addOption(orientationKey, orientationEntry); dialogTab.addOption("", "", keyEntry); - ZLOptionEntry *exitOnCancelEntry = new ZLSimpleBooleanOptionEntry(fbreader.QuitOnCancelOption); + ZLOptionEntry *exitOnCancelEntry = new ZLSimpleBooleanOptionEntry(reader.QuitOnCancelOption); keyEntry->setExitOnCancelEntry(exitOnCancelEntry); dialogTab.addOption(ZLResourceKey("quitOnCancel"), exitOnCancelEntry); exitOnCancelEntry->setVisible(false); useSeparateBindingsEntry->onStateChanged(useSeparateBindingsEntry->initialState()); - dialogTab.addOption(ZLResourceKey("keyDelay"), new ZLSimpleSpinOptionEntry(fbreader.KeyDelayOption, 50)); + dialogTab.addOption(ZLResourceKey("keyDelay"), new ZLSimpleSpinOptionEntry(reader.KeyDelayOption, 50)); } diff --git a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp b/reader/src/optionsDialog/reading/ReadingOptionsDialog.cpp similarity index 89% rename from fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp rename to reader/src/optionsDialog/reading/ReadingOptionsDialog.cpp index 98c079f..29528c6 100644 --- a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp +++ b/reader/src/optionsDialog/reading/ReadingOptionsDialog.cpp @@ -25,8 +25,8 @@ #include "ReadingOptionsDialog.h" -#include "../../fbreader/FBReader.h" -#include "../../fbreader/FBView.h" +#include "../../reader/Reader.h" +#include "../../reader/FBView.h" class RotationTypeEntry : public ZLComboOptionEntry { @@ -87,25 +87,25 @@ void RotationTypeEntry::onAccept(const std::string &value) { ReadingOptionsDialog::ReadingOptionsDialog() : AbstractOptionsDialog(ZLResourceKey("ReadingOptionsDialog"), true) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); ZLOptionsDialog &dialog = this->dialog(); ZLDialogContent &scrollingTab = dialog.createTab(ZLResourceKey("Scrolling")); - scrollingTab.addOption(ZLResourceKey("keyLinesToScroll"), new ZLSimpleSpinOptionEntry(fbreader.LinesToScrollOption, 1)); - scrollingTab.addOption(ZLResourceKey("keyLinesToKeep"), new ZLSimpleSpinOptionEntry(fbreader.LinesToKeepOption, 1)); - scrollingTab.addOption(ZLResourceKey("keyScrollDelay"), new ZLSimpleSpinOptionEntry(fbreader.KeyScrollingDelayOption, 50)); + scrollingTab.addOption(ZLResourceKey("keyLinesToScroll"), new ZLSimpleSpinOptionEntry(reader.LinesToScrollOption, 1)); + scrollingTab.addOption(ZLResourceKey("keyLinesToKeep"), new ZLSimpleSpinOptionEntry(reader.LinesToKeepOption, 1)); + scrollingTab.addOption(ZLResourceKey("keyScrollDelay"), new ZLSimpleSpinOptionEntry(reader.KeyScrollingDelayOption, 50)); const bool hasTouchScreen = ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::TOUCHSCREEN_PRESENTED, false).value(); if (hasTouchScreen) { ZLToggleBooleanOptionEntry *enableTapScrollingEntry = - new ZLToggleBooleanOptionEntry(fbreader.EnableTapScrollingOption); + new ZLToggleBooleanOptionEntry(reader.EnableTapScrollingOption); scrollingTab.addOption(ZLResourceKey("enableTapScrolling"), enableTapScrollingEntry); const bool isFingerTapDetectionSupported = ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FINGER_TAP_DETECTABLE, false).value(); if (isFingerTapDetectionSupported) { ZLOptionEntry *fingerOnlyEntry = - new ZLSimpleBooleanOptionEntry(fbreader.TapScrollingOnFingerOnlyOption); + new ZLSimpleBooleanOptionEntry(reader.TapScrollingOnFingerOnlyOption); scrollingTab.addOption(ZLResourceKey("fingerOnly"), fingerOnlyEntry); enableTapScrollingEntry->addDependentEntry(fingerOnlyEntry); enableTapScrollingEntry->onStateChanged(enableTapScrollingEntry->initialState()); @@ -119,7 +119,7 @@ ReadingOptionsDialog::ReadingOptionsDialog() : AbstractOptionsDialog(ZLResourceK ZLDialogContent &rotationTab = dialog.createTab(ZLResourceKey("Rotation")); ZLResourceKey directionKey("direction"); - rotationTab.addOption(directionKey, new RotationTypeEntry(rotationTab.resource(directionKey), fbreader.RotationAngleOption)); + rotationTab.addOption(directionKey, new RotationTypeEntry(rotationTab.resource(directionKey), reader.RotationAngleOption)); createKeyBindingsTab(); } diff --git a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.h b/reader/src/optionsDialog/reading/ReadingOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/reading/ReadingOptionsDialog.h rename to reader/src/optionsDialog/reading/ReadingOptionsDialog.h diff --git a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp b/reader/src/optionsDialog/system/SystemOptionsDialog.cpp similarity index 86% rename from fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp rename to reader/src/optionsDialog/system/SystemOptionsDialog.cpp index aadc669..1c649df 100644 --- a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp +++ b/reader/src/optionsDialog/system/SystemOptionsDialog.cpp @@ -28,7 +28,7 @@ #include "SystemOptionsDialog.h" -#include "../../fbreader/FBReader.h" +#include "../../reader/Reader.h" #include "../../formats/FormatPlugin.h" #include "../../encodingOption/EncodingOptionEntry.h" @@ -62,25 +62,25 @@ SystemOptionsDialog::SystemOptionsDialog() : AbstractOptionsDialog(ZLResourceKey if (ZLOption::isAutoSavingSupported()) { ZLDialogContent &configTab = dialog.createTab(ZLResourceKey("Config")); - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); ZLToggleBooleanOptionEntry *enableEntry = - new ZLToggleBooleanOptionEntry(fbreader.ConfigAutoSavingOption); + new ZLToggleBooleanOptionEntry(reader.ConfigAutoSavingOption); configTab.addOption(ZLResourceKey("autoSave"), enableEntry); - ZLOptionEntry *timeoutEntry = new TimeoutEntry(fbreader.ConfigAutoSaveTimeoutOption); + ZLOptionEntry *timeoutEntry = new TimeoutEntry(reader.ConfigAutoSaveTimeoutOption); enableEntry->addDependentEntry(timeoutEntry); configTab.addOption(ZLResourceKey("timeout"), timeoutEntry); enableEntry->onStateChanged(enableEntry->initialState()); } - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); std::vector > additional; ZLOptionEntry *entry = - new ZLSimpleBooleanOptionEntry(fbreader.EnableSingleClickDictionaryOption); + new ZLSimpleBooleanOptionEntry(reader.EnableSingleClickDictionaryOption); additional.push_back(std::make_pair(ZLResourceKey("singleClickOpen"), entry)); - createIntegrationTab(fbreader.dictionaryCollection(), ZLResourceKey("Dictionary"), additional); + createIntegrationTab(reader.dictionaryCollection(), ZLResourceKey("Dictionary"), additional); dialog.createPlatformDependentTabs(); } diff --git a/fbreader/src/optionsDialog/system/SystemOptionsDialog.h b/reader/src/optionsDialog/system/SystemOptionsDialog.h similarity index 100% rename from fbreader/src/optionsDialog/system/SystemOptionsDialog.h rename to reader/src/optionsDialog/system/SystemOptionsDialog.h diff --git a/fbreader/src/fbreader/AddBookAction.cpp b/reader/src/reader/AddBookAction.cpp similarity index 94% rename from fbreader/src/fbreader/AddBookAction.cpp rename to reader/src/reader/AddBookAction.cpp index 5d339d3..a37af1e 100644 --- a/fbreader/src/fbreader/AddBookAction.cpp +++ b/reader/src/reader/AddBookAction.cpp @@ -21,8 +21,8 @@ #include #include -#include "FBReaderActions.h" -#include "FBReader.h" +#include "ReaderActions.h" +#include "Reader.h" #include "../library/Book.h" #include "../formats/FormatPlugin.h" @@ -53,6 +53,6 @@ void AddBookAction::run() { DirectoryOption.setValue(dialog->directoryPath()); FileOption.setValue(dialog->filePath()); if (code) { - FBReader::Instance().openFile(ZLFile(dialog->filePath())); + Reader::Instance().openFile(ZLFile(dialog->filePath())); } } diff --git a/fbreader/src/fbreader/BookTextView.cpp b/reader/src/reader/BookTextView.cpp similarity index 94% rename from fbreader/src/fbreader/BookTextView.cpp rename to reader/src/reader/BookTextView.cpp index 89cbea3..c506a85 100644 --- a/fbreader/src/fbreader/BookTextView.cpp +++ b/reader/src/reader/BookTextView.cpp @@ -28,7 +28,7 @@ #include #include "BookTextView.h" -#include "FBReader.h" +#include "Reader.h" #include "../bookmodel/FBTextKind.h" #include "../bookmodel/BookModel.h" @@ -245,7 +245,7 @@ void BookTextView::undoPageMove() { gotoPosition(pos.Paragraph, pos.Word, pos.Character); myLockUndoStackChanges = false; - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } @@ -268,7 +268,7 @@ void BookTextView::redoPageMove() { myStackChanged = true; } - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } @@ -304,21 +304,21 @@ bool BookTextView::_onStylusPress(int x, int y) { } bool BookTextView::onStylusClick(int x, int y, int count) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); const ZLTextElementRectangle *rectangle = textArea().elementByCoordinates(x, y); if (rectangle != 0) { std::string id; ZLHyperlinkType type; if (getHyperlinkInfo(*rectangle, id, type)) { - fbreader.tryShowFootnoteView(id, type); + reader.tryShowFootnoteView(id, type); return true; } - if (fbreader.isDictionarySupported() && - fbreader.EnableSingleClickDictionaryOption.value()) { + if (reader.isDictionarySupported() && + reader.EnableSingleClickDictionaryOption.value()) { const std::string txt = word(*rectangle); if (!txt.empty()) { - fbreader.openInDictionary(txt); + reader.openInDictionary(txt); return true; } } @@ -328,7 +328,7 @@ bool BookTextView::onStylusClick(int x, int y, int count) { } bool BookTextView::_onStylusRelease(int x, int y) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); if (!isReleasedWithoutMotion()) { return false; } @@ -338,15 +338,15 @@ bool BookTextView::_onStylusRelease(int x, int y) { std::string id; ZLHyperlinkType type; if (getHyperlinkInfo(*rectangle, id, type)) { - fbreader.tryShowFootnoteView(id, type); + reader.tryShowFootnoteView(id, type); return true; } - if (fbreader.isDictionarySupported() && - fbreader.EnableSingleClickDictionaryOption.value()) { + if (reader.isDictionarySupported() && + reader.EnableSingleClickDictionaryOption.value()) { const std::string txt = word(*rectangle); if (!txt.empty()) { - fbreader.openInDictionary(txt); + reader.openInDictionary(txt); return true; } } @@ -359,7 +359,7 @@ bool BookTextView::_onStylusMove(int x, int y) { const ZLTextElementRectangle *rectangle = textArea().elementByCoordinates(x, y); std::string id; ZLHyperlinkType type; - FBReader::Instance().setHyperlinkCursor((rectangle != 0) && getHyperlinkInfo(*rectangle, id, type)); + Reader::Instance().setHyperlinkCursor((rectangle != 0) && getHyperlinkInfo(*rectangle, id, type)); return true; } @@ -408,12 +408,12 @@ void BookTextView::scrollToHome() { } gotoParagraph(0, false); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } void BookTextView::paint() { FBView::paint(); std::string pn; ZLStringUtil::appendNumber(pn, pageIndex()); - FBReader::Instance().setVisualParameter(FBReader::PageIndexParameter, pn); + Reader::Instance().setVisualParameter(Reader::PageIndexParameter, pn); } diff --git a/fbreader/src/fbreader/BookTextView.h b/reader/src/reader/BookTextView.h similarity index 100% rename from fbreader/src/fbreader/BookTextView.h rename to reader/src/reader/BookTextView.h diff --git a/fbreader/src/fbreader/BooksOrderAction.cpp b/reader/src/reader/BooksOrderAction.cpp similarity index 82% rename from fbreader/src/fbreader/BooksOrderAction.cpp rename to reader/src/reader/BooksOrderAction.cpp index 91d5c76..45193ea 100644 --- a/fbreader/src/fbreader/BooksOrderAction.cpp +++ b/reader/src/reader/BooksOrderAction.cpp @@ -17,12 +17,12 @@ * 02110-1301, USA. */ -#include "FBReader.h" -#include "FBReaderActions.h" +#include "Reader.h" +#include "ReaderActions.h" -BooksOrderAction::BooksOrderAction() : ModeDependentAction(FBReader::LIBRARY_MODE) { +BooksOrderAction::BooksOrderAction() : ModeDependentAction(Reader::LIBRARY_MODE) { } void BooksOrderAction::run() { - FBReader::Instance().showLibraryView(); + Reader::Instance().showLibraryView(); } diff --git a/fbreader/src/fbreader/ContentsView.cpp b/reader/src/reader/ContentsView.cpp similarity index 88% rename from fbreader/src/fbreader/ContentsView.cpp rename to reader/src/reader/ContentsView.cpp index e3d24ef..bb42aec 100644 --- a/fbreader/src/fbreader/ContentsView.cpp +++ b/reader/src/reader/ContentsView.cpp @@ -21,7 +21,7 @@ #include "ContentsView.h" #include "BookTextView.h" -#include "FBReader.h" +#include "Reader.h" #include "../bookmodel/BookModel.h" @@ -32,23 +32,23 @@ ContentsView::~ContentsView() { } bool ContentsView::_onStylusMove(int x, int y) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); int index = textArea().paragraphIndexByCoordinates(x, y); if ((index < 0) || ((int)textArea().model()->paragraphsNumber() <= index)) { - fbreader.setHyperlinkCursor(false); + reader.setHyperlinkCursor(false); return true; } const ContentsModel &contentsModel = (const ContentsModel&)*textArea().model(); const ZLTextTreeParagraph *paragraph = (const ZLTextTreeParagraph*)contentsModel[index]; - fbreader.setHyperlinkCursor(contentsModel.reference(paragraph) >= 0); + reader.setHyperlinkCursor(contentsModel.reference(paragraph) >= 0); return true; } bool ContentsView::_onStylusPress(int x, int y) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); const ContentsModel &contentsModel = (const ContentsModel&)*textArea().model(); int index = textArea().paragraphIndexByCoordinates(x, y); @@ -61,8 +61,8 @@ bool ContentsView::_onStylusPress(int x, int y) { int reference = contentsModel.reference(paragraph); if (reference >= 0) { - fbreader.bookTextView().gotoParagraph(reference); - fbreader.showBookTextView(); + reader.bookTextView().gotoParagraph(reference); + reader.showBookTextView(); } return true; @@ -74,7 +74,7 @@ bool ContentsView::isEmpty() const { } std::size_t ContentsView::currentTextViewParagraph(bool includeStart) const { - const ZLTextWordCursor &cursor = FBReader::Instance().bookTextView().textArea().startCursor(); + const ZLTextWordCursor &cursor = Reader::Instance().bookTextView().textArea().startCursor(); if (!cursor.isNull()) { long reference = cursor.paragraphCursor().index(); bool startOfParagraph = cursor.elementIndex() == 0; diff --git a/fbreader/src/fbreader/ContentsView.h b/reader/src/reader/ContentsView.h similarity index 100% rename from fbreader/src/fbreader/ContentsView.h rename to reader/src/reader/ContentsView.h diff --git a/fbreader/src/fbreader/FootnoteView.h b/reader/src/reader/FootnoteView.h similarity index 100% rename from fbreader/src/fbreader/FootnoteView.h rename to reader/src/reader/FootnoteView.h diff --git a/fbreader/src/fbreader/PreferencesPopupData.cpp b/reader/src/reader/PreferencesPopupData.cpp similarity index 91% rename from fbreader/src/fbreader/PreferencesPopupData.cpp rename to reader/src/reader/PreferencesPopupData.cpp index 7b7cf92..ccc1edb 100644 --- a/fbreader/src/fbreader/PreferencesPopupData.cpp +++ b/reader/src/reader/PreferencesPopupData.cpp @@ -21,7 +21,7 @@ #include -#include "FBReaderActions.h" +#include "ReaderActions.h" PreferencesPopupData::PreferencesPopupData() { myActionIds.push_back(ActionCode::SHOW_BOOK_INFO_DIALOG); @@ -45,11 +45,11 @@ std::size_t PreferencesPopupData::count() const { if (myInvalidated) { myInvalidated = false; myVisibleActionIds.clear(); - const FBReader& fbreader = FBReader::Instance(); + const Reader& reader = Reader::Instance(); const std::size_t size = myActionIds.size(); for (std::size_t i = 0; i < size; ++i) { const std::string &actionId = myActionIds[i]; - if (fbreader.action(actionId)->isVisible()) { + if (reader.action(actionId)->isVisible()) { myVisibleActionIds.push_back(actionId); } } @@ -69,5 +69,5 @@ void PreferencesPopupData::run(std::size_t index) { if (index >= myVisibleActionIds.size()) { return; } - FBReader::Instance().doAction(myVisibleActionIds[index]); + Reader::Instance().doAction(myVisibleActionIds[index]); } diff --git a/fbreader/src/fbreader/PreferencesPopupData.h b/reader/src/reader/PreferencesPopupData.h similarity index 100% rename from fbreader/src/fbreader/PreferencesPopupData.h rename to reader/src/reader/PreferencesPopupData.h diff --git a/fbreader/src/fbreader/FBReader.cpp b/reader/src/reader/Reader.cpp similarity index 85% rename from fbreader/src/fbreader/FBReader.cpp rename to reader/src/reader/Reader.cpp index f4825b0..7f42623 100644 --- a/fbreader/src/fbreader/FBReader.cpp +++ b/reader/src/reader/Reader.cpp @@ -34,8 +34,8 @@ #include #include -#include "FBReader.h" -#include "FBReaderActions.h" +#include "Reader.h" +#include "ReaderActions.h" #include "ScrollingAction.h" #include "BookTextView.h" #include "FootnoteView.h" @@ -63,27 +63,27 @@ static const std::string OPTIONS = "Options"; -const std::string FBReader::PageIndexParameter = "pageIndex"; +const std::string Reader::PageIndexParameter = "pageIndex"; class OpenFileHandler : public ZLMessageHandler { public: void onMessageReceived(const std::vector &arguments) { if (arguments.size() == 1) { - FBReader &fbreader = FBReader::Instance(); - fbreader.myBookAlreadyOpen = true; - fbreader.presentWindow(); - fbreader.openFile(ZLFile(arguments[0])); + Reader &reader = Reader::Instance(); + reader.myBookAlreadyOpen = true; + reader.presentWindow(); + reader.openFile(ZLFile(arguments[0])); } } }; -FBReader &FBReader::Instance() { - return (FBReader&)ZLApplication::Instance(); +Reader &Reader::Instance() { + return (Reader&)ZLApplication::Instance(); } -FBReader::FBReader(const std::string &bookToOpen) : - ZLApplication("FBReader"), +Reader::Reader(const std::string &bookToOpen) : + ZLApplication("Reader"), QuitOnCancelOption(ZLCategoryKey::CONFIG, OPTIONS, "QuitOnCancel", false), KeyScrollingDelayOption(ZLCategoryKey::CONFIG, "Scrollings", "Delay", 0, 2000, 100), LinesToScrollOption(ZLCategoryKey::CONFIG, "SmallScrolling", "LinesToScroll", 1, 20, 1), @@ -113,8 +113,8 @@ FBReader::FBReader(const std::string &bookToOpen) : myPreviousMode = BOOK_TEXT_MODE; setMode(BOOK_TEXT_MODE); - addAction(ActionCode::SHOW_READING, new UndoAction(FBReader::ALL_MODES & ~FBReader::BOOK_TEXT_MODE)); - addAction(ActionCode::SHOW_LIBRARY, new SetModeAction(FBReader::LIBRARY_MODE, FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE)); + addAction(ActionCode::SHOW_READING, new UndoAction(Reader::ALL_MODES & ~Reader::BOOK_TEXT_MODE)); + addAction(ActionCode::SHOW_LIBRARY, new SetModeAction(Reader::LIBRARY_MODE, Reader::BOOK_TEXT_MODE | Reader::CONTENTS_MODE)); addAction(ActionCode::SHOW_NETWORK_LIBRARY, new ShowNetworkTreeLibraryAction()); registerPopupData(ActionCode::SHOW_LIBRARY, myRecentBooksPopupData); addAction(ActionCode::SHOW_OPTIONS_DIALOG, new ShowOptionsDialogAction()); @@ -125,8 +125,8 @@ FBReader::FBReader(const std::string &bookToOpen) : addAction(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG, new ShowSystemOptionsDialogAction()); addAction(ActionCode::SHOW_READING_OPTIONS_DIALOG, new ShowReadingOptionsDialogAction()); addAction(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG, new ShowLookAndFeelOptionsDialogAction()); - addAction(ActionCode::ADD_BOOK, new AddBookAction(FBReader::BOOK_TEXT_MODE | FBReader::LIBRARY_MODE | FBReader::CONTENTS_MODE)); - addAction(ActionCode::UNDO, new UndoAction(FBReader::BOOK_TEXT_MODE)); + addAction(ActionCode::ADD_BOOK, new AddBookAction(Reader::BOOK_TEXT_MODE | Reader::LIBRARY_MODE | Reader::CONTENTS_MODE)); + addAction(ActionCode::UNDO, new UndoAction(Reader::BOOK_TEXT_MODE)); addAction(ActionCode::REDO, new RedoAction()); addAction(ActionCode::SEARCH, new SearchPatternAction()); addAction(ActionCode::FIND_NEXT, new FindNextAction()); @@ -170,16 +170,16 @@ FBReader::FBReader(const std::string &bookToOpen) : myOpenFileHandler = new OpenFileHandler(); ZLCommunicationManager::Instance().registerHandler("openFile", myOpenFileHandler); - ZLNetworkManager::Instance().setUserAgent(std::string("FBReader/") + VERSION); + ZLNetworkManager::Instance().setUserAgent(std::string("Reader/") + VERSION); } -FBReader::~FBReader() { +Reader::~Reader() { ZLTextStyleCollection::deleteInstance(); PluginCollection::deleteInstance(); ZLTextHyphenator::deleteInstance(); } -void FBReader::initWindow() { +void Reader::initWindow() { ZLApplication::initWindow(); trackStylus(true); @@ -212,13 +212,13 @@ void FBReader::initWindow() { ZLTimeManager::Instance().addTask(new TimeUpdater(), 1000); } -void FBReader::refreshWindow() { +void Reader::refreshWindow() { ZLApplication::refreshWindow(); ((RecentBooksPopupData&)*myRecentBooksPopupData).updateId(); ((PreferencesPopupData&)*myPreferencesPopupData).updateId(); } -bool FBReader::createBook(const ZLFile &bookFile, shared_ptr &book) { +bool Reader::createBook(const ZLFile &bookFile, shared_ptr &book) { shared_ptr plugin = PluginCollection::Instance().plugin(bookFile, false); if (!plugin.isNull()) { @@ -273,13 +273,13 @@ class OpenBookRunnable : public ZLRunnable { public: OpenBookRunnable(shared_ptr book) : myBook(book) {} - void run() { FBReader::Instance().openBookInternal(myBook); } + void run() { Reader::Instance().openBookInternal(myBook); } private: shared_ptr myBook; }; -void FBReader::openBook(shared_ptr book) { +void Reader::openBook(shared_ptr book) { OpenBookRunnable runnable(book); ZLDialogManager::Instance().wait(ZLResourceKey("loadingBook"), runnable); if (!book.isNull()) { @@ -288,7 +288,7 @@ void FBReader::openBook(shared_ptr book) { resetWindowCaption(); } -void FBReader::openBookInternal(shared_ptr book) { +void Reader::openBookInternal(shared_ptr book) { if (!book.isNull()) { BookTextView &bookTextView = (BookTextView&)*myBookTextView; ContentsView &contentsView = (ContentsView&)*myContentsView; @@ -315,7 +315,7 @@ void FBReader::openBookInternal(shared_ptr book) { } } -void FBReader::openLinkInBrowser(const std::string &url) const { +void Reader::openLinkInBrowser(const std::string &url) const { if (url.empty()) { return; } @@ -333,7 +333,7 @@ void FBReader::openLinkInBrowser(const std::string &url) const { program->run("openLink", copy); } -void FBReader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type) { +void Reader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type) { switch (type) { case HYPERLINK_EXTERNAL: openLinkInBrowser(id); @@ -373,15 +373,15 @@ void FBReader::tryShowFootnoteView(const std::string &id, ZLHyperlinkType type) } } -FBReader::ViewMode FBReader::mode() const { +Reader::ViewMode Reader::mode() const { return myMode; } -bool FBReader::isViewFinal() const { +bool Reader::isViewFinal() const { return myMode == BOOK_TEXT_MODE; } -void FBReader::showLibraryView() { +void Reader::showLibraryView() { if (ZLStringOption(ZLCategoryKey::LOOK_AND_FEEL, "ToggleButtonGroup", "booksOrder", "").value() == ActionCode::ORGANIZE_BOOKS_BY_TAG) { setView(myLibraryByTagView); } else { @@ -389,7 +389,7 @@ void FBReader::showLibraryView() { } } -void FBReader::setMode(ViewMode mode) { +void Reader::setMode(ViewMode mode) { //TODO remove code for old network library view if (mode == myMode) { return; @@ -432,20 +432,20 @@ void FBReader::setMode(ViewMode mode) { refreshWindow(); } -BookTextView &FBReader::bookTextView() const { +BookTextView &Reader::bookTextView() const { return (BookTextView&)*myBookTextView; } -void FBReader::showBookTextView() { +void Reader::showBookTextView() { setMode(BOOK_TEXT_MODE); } -void FBReader::restorePreviousMode() { +void Reader::restorePreviousMode() { setMode(myPreviousMode); myPreviousMode = BOOK_TEXT_MODE; } -bool FBReader::closeView() { +bool Reader::closeView() { if (myMode == BOOK_TEXT_MODE) { quit(); return true; @@ -455,11 +455,11 @@ bool FBReader::closeView() { } } -std::string FBReader::helpFileName(const std::string &language) const { +std::string Reader::helpFileName(const std::string &language) const { return ZLibrary::ApplicationDirectory() + ZLibrary::FileNameDelimiter + "help" + ZLibrary::FileNameDelimiter + "MiniHelp." + language + ".fb2"; } -void FBReader::openFile(const ZLFile &file) { +void Reader::openFile(const ZLFile &file) { shared_ptr book; createBook(file, book); if (!book.isNull()) { @@ -468,7 +468,7 @@ void FBReader::openFile(const ZLFile &file) { } } -bool FBReader::canDragFiles(const std::vector &filePaths) const { +bool Reader::canDragFiles(const std::vector &filePaths) const { switch (myMode) { case BOOK_TEXT_MODE: case FOOTNOTE_MODE: @@ -480,7 +480,7 @@ bool FBReader::canDragFiles(const std::vector &filePaths) const { } } -void FBReader::dragFiles(const std::vector &filePaths) { +void Reader::dragFiles(const std::vector &filePaths) { switch (myMode) { case BOOK_TEXT_MODE: case FOOTNOTE_MODE: @@ -499,18 +499,18 @@ void FBReader::dragFiles(const std::vector &filePaths) { } } -void FBReader::clearTextCaches() { +void Reader::clearTextCaches() { ((ZLTextView&)*myBookTextView).clearCaches(); ((ZLTextView&)*myFootnoteView).clearCaches(); ((ZLTextView&)*myContentsView).clearCaches(); } -shared_ptr FBReader::keyBindings() { +shared_ptr Reader::keyBindings() { return UseSeparateBindingsOption.value() ? keyBindings(rotation()) : myBindings0; } -shared_ptr FBReader::keyBindings(ZLView::Angle angle) { +shared_ptr Reader::keyBindings(ZLView::Angle angle) { switch (angle) { case ZLView::DEGREES0: return myBindings0; @@ -524,35 +524,35 @@ shared_ptr FBReader::keyBindings(ZLView::Angle angle) { return 0; } -shared_ptr FBReader::dictionaryCollection() const { +shared_ptr Reader::dictionaryCollection() const { return myProgramCollectionMap.collection("Dictionary"); } -bool FBReader::isDictionarySupported() const { +bool Reader::isDictionarySupported() const { shared_ptr collection = dictionaryCollection(); return !collection.isNull() && !collection->currentProgram().isNull(); } -void FBReader::openInDictionary(const std::string &word) { +void Reader::openInDictionary(const std::string &word) { shared_ptr dictionary = dictionaryCollection()->currentProgram(); dictionary->run("present", ZLibrary::ApplicationName()); dictionary->run("showWord", word); } -shared_ptr FBReader::webBrowserCollection() const { +shared_ptr Reader::webBrowserCollection() const { return myProgramCollectionMap.collection("Web Browser"); } -shared_ptr FBReader::currentBook() const { +shared_ptr Reader::currentBook() const { return myModel->book(); } -bool FBReader::showAuthDialog(const std::string &siteName, std::string &userName, std::string &password, const ZLResourceKey &errorKey) { +bool Reader::showAuthDialog(const std::string &siteName, std::string &userName, std::string &password, const ZLResourceKey &errorKey) { std::string message = errorKey.Name.empty() ? std::string() : NetworkErrors::errorMessage(errorKey.Name); return AuthenticationDialog::run(siteName, userName, password, message); } -void FBReader::saveUserName(const std::string &siteName, std::string &userName) { +void Reader::saveUserName(const std::string &siteName, std::string &userName) { UserList userList(siteName); userList.saveUser(userName); } diff --git a/fbreader/src/fbreader/FBReader.h b/reader/src/reader/Reader.h similarity index 96% rename from fbreader/src/fbreader/FBReader.h rename to reader/src/reader/Reader.h index e42395a..7d9668b 100644 --- a/fbreader/src/fbreader/FBReader.h +++ b/reader/src/reader/Reader.h @@ -17,8 +17,8 @@ * 02110-1301, USA. */ -#ifndef __FBREADER_H__ -#define __FBREADER_H__ +#ifndef __READER_H__ +#define __READER_H__ #include #include @@ -40,10 +40,10 @@ class Book; class BookModel; class BookTextView; -class FBReader : public ZLApplication { +class Reader : public ZLApplication { public: - static FBReader &Instance(); + static Reader &Instance(); public: // returns true if description was found or error message was shown @@ -78,8 +78,8 @@ public: ZLStringOption LastOpenedPreferencesDialog; public: - FBReader(const std::string &bookToOpen); - ~FBReader(); + Reader(const std::string &bookToOpen); + ~Reader(); void setMode(ViewMode mode); ViewMode mode() const; @@ -204,4 +204,4 @@ friend class BooksOrderAction; friend class LogOutAction; }; -#endif /* __FBREADER_H__ */ +#endif /* __READER_H__ */ diff --git a/fbreader/src/fbreader/FBReaderActionCode.cpp b/reader/src/reader/ReaderActionCode.cpp similarity index 99% rename from fbreader/src/fbreader/FBReaderActionCode.cpp rename to reader/src/reader/ReaderActionCode.cpp index a5551e8..3e88e76 100644 --- a/fbreader/src/fbreader/FBReaderActionCode.cpp +++ b/reader/src/reader/ReaderActionCode.cpp @@ -17,7 +17,7 @@ * 02110-1301, USA. */ -#include "FBReaderActions.h" +#include "ReaderActions.h" const std::string ActionCode::SHOW_READING = "showReading"; const std::string ActionCode::SHOW_LIBRARY = "showLibrary"; diff --git a/fbreader/src/fbreader/FBReaderActions.cpp b/reader/src/reader/ReaderActions.cpp similarity index 60% rename from fbreader/src/fbreader/FBReaderActions.cpp rename to reader/src/reader/ReaderActions.cpp index 9ca36cf..d7cd843 100644 --- a/fbreader/src/fbreader/FBReaderActions.cpp +++ b/reader/src/reader/ReaderActions.cpp @@ -30,8 +30,8 @@ #include #include -#include "FBReader.h" -#include "FBReaderActions.h" +#include "Reader.h" +#include "ReaderActions.h" #include "BookTextView.h" #include "ContentsView.h" #include "../optionsDialog/bookInfo/BookInfoDialog.h" @@ -54,126 +54,126 @@ ModeDependentAction::ModeDependentAction(int visibleInModes) : myVisibleInModes( } bool ModeDependentAction::isVisible() const { - return (FBReader::Instance().mode() & myVisibleInModes) != 0; + return (Reader::Instance().mode() & myVisibleInModes) != 0; } -SetModeAction::SetModeAction(FBReader::ViewMode modeToSet, int visibleInModes) : ModeDependentAction(visibleInModes), myModeToSet(modeToSet) { +SetModeAction::SetModeAction(Reader::ViewMode modeToSet, int visibleInModes) : ModeDependentAction(visibleInModes), myModeToSet(modeToSet) { } void SetModeAction::run() { - FBReader::Instance().setMode(myModeToSet); + Reader::Instance().setMode(myModeToSet); } void ShowHelpAction::run() { - FBReader &fbreader = FBReader::Instance(); - shared_ptr book = BooksDBUtil::getBook(fbreader.helpFileName(ZLibrary::Language())); + Reader &reader = Reader::Instance(); + shared_ptr book = BooksDBUtil::getBook(reader.helpFileName(ZLibrary::Language())); if (book.isNull()) { - book = BooksDBUtil::getBook(fbreader.helpFileName("en")); + book = BooksDBUtil::getBook(reader.helpFileName("en")); } if (!book.isNull()) { - fbreader.openBook(book); - fbreader.setMode(FBReader::BOOK_TEXT_MODE); - fbreader.refreshWindow(); + reader.openBook(book); + reader.setMode(Reader::BOOK_TEXT_MODE); + reader.refreshWindow(); } else { ZLDialogManager::Instance().errorBox(ZLResourceKey("noHelpBox")); } } void ShowOptionsDialogAction::run() { - std::string actionId = FBReader::Instance().LastOpenedPreferencesDialog.value(); + std::string actionId = Reader::Instance().LastOpenedPreferencesDialog.value(); if (actionId.empty()) { return; } - FBReader::Instance().doAction(actionId); + Reader::Instance().doAction(actionId); } void ShowLibraryOptionsDialogAction::run() { - FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LIBRARY_OPTIONS_DIALOG); + Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LIBRARY_OPTIONS_DIALOG); LibraryOptionsDialog().dialog().run(); } void ShowNetworkOptionsDialogAction::run() { - FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_NETWORK_OPTIONS_DIALOG); + Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_NETWORK_OPTIONS_DIALOG); NetworkOptionsDialog().dialog().run(); } void ShowSystemOptionsDialogAction::run() { - FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG); + Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_SYSTEM_OPTIONS_DIALOG); SystemOptionsDialog().dialog().run(); } void ShowReadingOptionsDialogAction::run() { - FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_READING_OPTIONS_DIALOG); + Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_READING_OPTIONS_DIALOG); ReadingOptionsDialog().dialog().run(); } void ShowLookAndFeelOptionsDialogAction::run() { - FBReader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG); + Reader::Instance().LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_LOOKANDFEEL_OPTIONS_DIALOG); LookAndFeelOptionsDialog().dialog().run(); } -ShowContentsAction::ShowContentsAction() : SetModeAction(FBReader::CONTENTS_MODE, FBReader::BOOK_TEXT_MODE) { +ShowContentsAction::ShowContentsAction() : SetModeAction(Reader::CONTENTS_MODE, Reader::BOOK_TEXT_MODE) { } bool ShowContentsAction::isVisible() const { - return ModeDependentAction::isVisible() && !((ContentsView&)*FBReader::Instance().myContentsView).isEmpty(); + return ModeDependentAction::isVisible() && !((ContentsView&)*Reader::Instance().myContentsView).isEmpty(); } -ScrollToHomeAction::ScrollToHomeAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) { +ScrollToHomeAction::ScrollToHomeAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) { } bool ScrollToHomeAction::isEnabled() const { if (!isVisible()) { return false; } - ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().startCursor(); + ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().startCursor(); return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst(); } void ScrollToHomeAction::run() { - FBReader::Instance().bookTextView().scrollToHome(); + Reader::Instance().bookTextView().scrollToHome(); } -ScrollToStartOfTextAction::ScrollToStartOfTextAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) { +ScrollToStartOfTextAction::ScrollToStartOfTextAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) { } bool ScrollToStartOfTextAction::isEnabled() const { if (!isVisible()) { return false; } - ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().startCursor(); + ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().startCursor(); return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst(); } void ScrollToStartOfTextAction::run() { - FBReader::Instance().bookTextView().scrollToStartOfText(); + Reader::Instance().bookTextView().scrollToStartOfText(); } -ScrollToEndOfTextAction::ScrollToEndOfTextAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) { +ScrollToEndOfTextAction::ScrollToEndOfTextAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) { } bool ScrollToEndOfTextAction::isEnabled() const { if (!isVisible()) { return false; } - ZLTextWordCursor cursor = FBReader::Instance().bookTextView().textArea().endCursor(); + ZLTextWordCursor cursor = Reader::Instance().bookTextView().textArea().endCursor(); return cursor.isNull() || !cursor.isEndOfParagraph() || !cursor.paragraphCursor().isLast(); } void ScrollToEndOfTextAction::run() { - FBReader::Instance().bookTextView().scrollToEndOfText(); + Reader::Instance().bookTextView().scrollToEndOfText(); } -ShowBookInfoAction::ShowBookInfoAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE | FBReader::FOOTNOTE_MODE) { +ShowBookInfoAction::ShowBookInfoAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE | Reader::CONTENTS_MODE | Reader::FOOTNOTE_MODE) { } void ShowBookInfoAction::run() { - FBReader &fbreader = FBReader::Instance(); - fbreader.LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_BOOK_INFO_DIALOG); - shared_ptr book = fbreader.myModel->book(); + Reader &reader = Reader::Instance(); + reader.LastOpenedPreferencesDialog.setValue(ActionCode::SHOW_BOOK_INFO_DIALOG); + shared_ptr book = reader.myModel->book(); if (BookInfoDialog(book).dialog().run()) { - fbreader.openBook(book); - fbreader.refreshWindow(); + reader.openBook(book); + reader.refreshWindow(); } } @@ -181,29 +181,29 @@ UndoAction::UndoAction(int visibleInModes) : ModeDependentAction(visibleInModes) } bool UndoAction::isEnabled() const { - FBReader &fbreader = FBReader::Instance(); - return (fbreader.mode() != FBReader::BOOK_TEXT_MODE) || - fbreader.bookTextView().canUndoPageMove(); + Reader &reader = Reader::Instance(); + return (reader.mode() != Reader::BOOK_TEXT_MODE) || + reader.bookTextView().canUndoPageMove(); } void UndoAction::run() { - FBReader &fbreader = FBReader::Instance(); - if (fbreader.mode() == FBReader::BOOK_TEXT_MODE) { - fbreader.bookTextView().undoPageMove(); + Reader &reader = Reader::Instance(); + if (reader.mode() == Reader::BOOK_TEXT_MODE) { + reader.bookTextView().undoPageMove(); } else { - fbreader.restorePreviousMode(); + reader.restorePreviousMode(); } } -RedoAction::RedoAction() : ModeDependentAction(FBReader::BOOK_TEXT_MODE) { +RedoAction::RedoAction() : ModeDependentAction(Reader::BOOK_TEXT_MODE) { } bool RedoAction::isEnabled() const { - return isVisible() && FBReader::Instance().bookTextView().canRedoPageMove(); + return isVisible() && Reader::Instance().bookTextView().canRedoPageMove(); } void RedoAction::run() { - FBReader::Instance().bookTextView().redoPageMove(); + Reader::Instance().bookTextView().redoPageMove(); } ChangeFontSizeAction::ChangeFontSizeAction(int delta) : myDelta(delta) { @@ -219,54 +219,54 @@ bool ChangeFontSizeAction::isEnabled() const { } void ChangeFontSizeAction::run() { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); ZLIntegerRangeOption &option = FBTextStyle::Instance().FontSizeOption; option.setValue(option.value() + myDelta); - fbreader.clearTextCaches(); - fbreader.refreshWindow(); + reader.clearTextCaches(); + reader.refreshWindow(); } bool OpenPreviousBookAction::isVisible() const { - const FBReader &fbreader = FBReader::Instance(); - if ((fbreader.mode() != FBReader::BOOK_TEXT_MODE) && - (fbreader.mode() != FBReader::CONTENTS_MODE)) { + const Reader &reader = Reader::Instance(); + if ((reader.mode() != Reader::BOOK_TEXT_MODE) && + (reader.mode() != Reader::CONTENTS_MODE)) { return false; } return Library::Instance().recentBooks().size() > 1; } void OpenPreviousBookAction::run() { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); const BookList &books = Library::Instance().recentBooks(); - fbreader.openBook(books[1]); - fbreader.refreshWindow(); - fbreader.resetWindowCaption(); + reader.openBook(books[1]); + reader.refreshWindow(); + reader.resetWindowCaption(); } void CancelAction::run() { - FBReader &fbreader = FBReader::Instance(); - switch (fbreader.myActionOnCancel) { - case FBReader::UNFULLSCREEN: - if (fbreader.isFullscreen()) { - fbreader.setFullscreen(false); + Reader &reader = Reader::Instance(); + switch (reader.myActionOnCancel) { + case Reader::UNFULLSCREEN: + if (reader.isFullscreen()) { + reader.setFullscreen(false); return; - } else if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) { - fbreader.restorePreviousMode(); + } else if (reader.mode() != Reader::BOOK_TEXT_MODE) { + reader.restorePreviousMode(); return; } break; - case FBReader::RETURN_TO_TEXT_MODE: - if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) { - fbreader.restorePreviousMode(); + case Reader::RETURN_TO_TEXT_MODE: + if (reader.mode() != Reader::BOOK_TEXT_MODE) { + reader.restorePreviousMode(); return; - } else if (fbreader.isFullscreen()) { - fbreader.setFullscreen(false); + } else if (reader.isFullscreen()) { + reader.setFullscreen(false); return; } break; } - if (fbreader.QuitOnCancelOption.value()) { - fbreader.quit(); + if (reader.QuitOnCancelOption.value()) { + reader.quit(); } } @@ -287,65 +287,65 @@ void ToggleIndicatorAction::run() { break; case FBIndicatorStyle::FB_INDICATOR: option.setValue(FBIndicatorStyle::NONE); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); break; case FBIndicatorStyle::NONE: option.setValue(FBIndicatorStyle::FB_INDICATOR); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); break; } } void QuitAction::run() { - FBReader::Instance().closeView(); + Reader::Instance().closeView(); } void ForceQuitAction::run() { - FBReader::Instance().quit(); + Reader::Instance().quit(); } bool GotoNextTOCSectionAction::isVisible() const { - FBReader &fbreader = FBReader::Instance(); - if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) { + Reader &reader = Reader::Instance(); + if (reader.mode() != Reader::BOOK_TEXT_MODE) { return false; } - const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView; + const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView; shared_ptr model = contentsView.textArea().model(); return !model.isNull() && (model->paragraphsNumber() > 1); } bool GotoNextTOCSectionAction::isEnabled() const { - FBReader &fbreader = FBReader::Instance(); - const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView; + Reader &reader = Reader::Instance(); + const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView; shared_ptr model = contentsView.textArea().model(); return !model.isNull() && ((int)contentsView.currentTextViewParagraph() < (int)model->paragraphsNumber() - 1); } void GotoNextTOCSectionAction::run() { - FBReader &fbreader = FBReader::Instance(); - ContentsView &contentsView = (ContentsView&)*fbreader.myContentsView; + Reader &reader = Reader::Instance(); + ContentsView &contentsView = (ContentsView&)*reader.myContentsView; std::size_t current = contentsView.currentTextViewParagraph(); const ContentsModel &contentsModel = (const ContentsModel&)*contentsView.textArea().model(); int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current + 1])); if (reference != -1) { - ((ZLTextView&)*fbreader.myBookTextView).gotoParagraph(reference); - fbreader.refreshWindow(); + ((ZLTextView&)*reader.myBookTextView).gotoParagraph(reference); + reader.refreshWindow(); } } bool GotoPreviousTOCSectionAction::isVisible() const { - const FBReader &fbreader = FBReader::Instance(); - if (fbreader.mode() != FBReader::BOOK_TEXT_MODE) { + const Reader &reader = Reader::Instance(); + if (reader.mode() != Reader::BOOK_TEXT_MODE) { return false; } - const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView; + const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView; shared_ptr model = contentsView.textArea().model(); return !model.isNull() && (model->paragraphsNumber() > 1); } bool GotoPreviousTOCSectionAction::isEnabled() const { - const FBReader &fbreader = FBReader::Instance(); - const ContentsView &contentsView = (const ContentsView&)*fbreader.myContentsView; + const Reader &reader = Reader::Instance(); + const ContentsView &contentsView = (const ContentsView&)*reader.myContentsView; shared_ptr model = contentsView.textArea().model(); if (model.isNull()) { return false; @@ -356,7 +356,7 @@ bool GotoPreviousTOCSectionAction::isEnabled() const { return true; } if (tocIndex == 0) { - const ZLTextWordCursor &cursor = fbreader.bookTextView().textArea().startCursor(); + const ZLTextWordCursor &cursor = reader.bookTextView().textArea().startCursor(); if (cursor.isNull()) { return false; } @@ -371,20 +371,20 @@ bool GotoPreviousTOCSectionAction::isEnabled() const { } void GotoPreviousTOCSectionAction::run() { - FBReader &fbreader = FBReader::Instance(); - ContentsView &contentsView = (ContentsView&)*fbreader.myContentsView; + Reader &reader = Reader::Instance(); + ContentsView &contentsView = (ContentsView&)*reader.myContentsView; std::size_t current = contentsView.currentTextViewParagraph(false); const ContentsModel &contentsModel = (const ContentsModel&)*contentsView.textArea().model(); int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current])); - const ZLTextWordCursor &cursor = fbreader.bookTextView().textArea().startCursor(); + const ZLTextWordCursor &cursor = reader.bookTextView().textArea().startCursor(); if (!cursor.isNull() && (cursor.elementIndex() == 0)) { int paragraphIndex = cursor.paragraphCursor().index(); if (reference == paragraphIndex) { reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1])); } else if (reference == paragraphIndex - 1) { - const ZLTextModel &textModel = *fbreader.bookTextView().textArea().model(); + const ZLTextModel &textModel = *reader.bookTextView().textArea().model(); const ZLTextParagraph *para = textModel[paragraphIndex]; if ((para != 0) && (para->kind() == ZLTextParagraph::END_OF_SECTION_PARAGRAPH)) { reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1])); @@ -392,31 +392,31 @@ void GotoPreviousTOCSectionAction::run() { } } if (reference != -1) { - ((ZLTextView&)*fbreader.myBookTextView).gotoParagraph(reference); - fbreader.refreshWindow(); + ((ZLTextView&)*reader.myBookTextView).gotoParagraph(reference); + reader.refreshWindow(); } } -GotoPageNumberAction::GotoPageNumberAction(const std::string ¶meter) : ModeDependentAction(FBReader::BOOK_TEXT_MODE), myParameter(parameter) { +GotoPageNumberAction::GotoPageNumberAction(const std::string ¶meter) : ModeDependentAction(Reader::BOOK_TEXT_MODE), myParameter(parameter) { } bool GotoPageNumberAction::isVisible() const { return ModeDependentAction::isVisible() && - !FBReader::Instance().bookTextView().hasMultiSectionModel(); + !Reader::Instance().bookTextView().hasMultiSectionModel(); } bool GotoPageNumberAction::isEnabled() const { - return ModeDependentAction::isEnabled() && (FBReader::Instance().bookTextView().pageNumber() > 1); + return ModeDependentAction::isEnabled() && (Reader::Instance().bookTextView().pageNumber() > 1); } void GotoPageNumberAction::run() { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); int pageIndex = 0; - const int pageNumber = fbreader.bookTextView().pageNumber(); + const int pageNumber = reader.bookTextView().pageNumber(); if (!myParameter.empty()) { - const std::string value = fbreader.visualParameter(myParameter); + const std::string value = reader.visualParameter(myParameter); if (value.empty()) { return; } @@ -436,12 +436,12 @@ void GotoPageNumberAction::run() { } } - fbreader.bookTextView().gotoPage(std::max(1, std::min(pageIndex, pageNumber))); - fbreader.refreshWindow(); + reader.bookTextView().gotoPage(std::max(1, std::min(pageIndex, pageNumber))); + reader.refreshWindow(); } bool SelectionAction::isVisible() const { - shared_ptr view = FBReader::Instance().currentView(); + shared_ptr view = Reader::Instance().currentView(); return !view.isNull() && view->isInstanceOf(ZLTextView::TYPE_ID); } @@ -454,7 +454,7 @@ bool SelectionAction::isEnabled() const { } ZLTextView &SelectionAction::textView() const { - return (ZLTextView&)*FBReader::Instance().currentView(); + return (ZLTextView&)*Reader::Instance().currentView(); } bool CopySelectedTextAction::isVisible() const { @@ -466,27 +466,27 @@ void CopySelectedTextAction::run() { } bool OpenSelectedTextInDictionaryAction::isVisible() const { - return SelectionAction::isVisible() && FBReader::Instance().isDictionarySupported(); + return SelectionAction::isVisible() && Reader::Instance().isDictionarySupported(); } void OpenSelectedTextInDictionaryAction::run() { - FBReader::Instance().openInDictionary(textView().selectionModel().text()); + Reader::Instance().openInDictionary(textView().selectionModel().text()); } void ClearSelectionAction::run() { textView().selectionModel().clear(); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } void FBFullscreenAction::run() { - FBReader &fbreader = FBReader::Instance(); - if (!fbreader.isFullscreen()) { - fbreader.myActionOnCancel = FBReader::UNFULLSCREEN; + Reader &reader = Reader::Instance(); + if (!reader.isFullscreen()) { + reader.myActionOnCancel = Reader::UNFULLSCREEN; } FullscreenAction::run(); } -FilterLibraryAction::FilterLibraryAction() : ModeDependentAction(FBReader::LIBRARY_MODE) { +FilterLibraryAction::FilterLibraryAction() : ModeDependentAction(Reader::LIBRARY_MODE) { } void FilterLibraryAction::run() { diff --git a/fbreader/src/fbreader/FBReaderActions.h b/reader/src/reader/ReaderActions.h similarity index 97% rename from fbreader/src/fbreader/FBReaderActions.h rename to reader/src/reader/ReaderActions.h index a91dda7..18407ac 100644 --- a/fbreader/src/fbreader/FBReaderActions.h +++ b/reader/src/reader/ReaderActions.h @@ -17,12 +17,12 @@ * 02110-1301, USA. */ -#ifndef __FBREADERACTIONS_H__ -#define __FBREADERACTIONS_H__ +#ifndef __READERACTIONS_H__ +#define __READERACTIONS_H__ #include -#include "FBReader.h" +#include "Reader.h" class ZLTextView; @@ -98,11 +98,11 @@ private: class SetModeAction : public ModeDependentAction { public: - SetModeAction(FBReader::ViewMode modeToSet, int visibleInModes); + SetModeAction(Reader::ViewMode modeToSet, int visibleInModes); void run(); private: - FBReader::ViewMode myModeToSet; + Reader::ViewMode myModeToSet; }; class ShowHelpAction : public ZLApplication::Action { @@ -406,4 +406,4 @@ public: void run(); }; -#endif /* __FBREADERACTIONS_H__ */ +#endif /* __READERACTIONS_H__ */ diff --git a/fbreader/src/fbreader/ReadingState.h b/reader/src/reader/ReadingState.h similarity index 100% rename from fbreader/src/fbreader/ReadingState.h rename to reader/src/reader/ReadingState.h diff --git a/fbreader/src/fbreader/RecentBooksPopupData.cpp b/reader/src/reader/RecentBooksPopupData.cpp similarity index 91% rename from fbreader/src/fbreader/RecentBooksPopupData.cpp rename to reader/src/reader/RecentBooksPopupData.cpp index 3b17339..cc0dcc4 100644 --- a/fbreader/src/fbreader/RecentBooksPopupData.cpp +++ b/reader/src/reader/RecentBooksPopupData.cpp @@ -18,7 +18,7 @@ */ #include "RecentBooksPopupData.h" -#include "FBReader.h" +#include "Reader.h" #include "../library/Book.h" #include "../library/Author.h" @@ -53,12 +53,12 @@ const std::string RecentBooksPopupData::text(std::size_t index) { } void RecentBooksPopupData::run(std::size_t index) { - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); const BookList &books = Library::Instance().recentBooks(); if (index >= books.size()) { return; } - fbreader.openBook(books[index]); - fbreader.showBookTextView(); - fbreader.refreshWindow(); + reader.openBook(books[index]); + reader.showBookTextView(); + reader.refreshWindow(); } diff --git a/fbreader/src/fbreader/RecentBooksPopupData.h b/reader/src/reader/RecentBooksPopupData.h similarity index 100% rename from fbreader/src/fbreader/RecentBooksPopupData.h rename to reader/src/reader/RecentBooksPopupData.h diff --git a/fbreader/src/fbreader/ScrollingAction.cpp b/reader/src/reader/ScrollingAction.cpp similarity index 81% rename from fbreader/src/fbreader/ScrollingAction.cpp rename to reader/src/reader/ScrollingAction.cpp index fd3c1fa..29c92e0 100644 --- a/fbreader/src/fbreader/ScrollingAction.cpp +++ b/reader/src/reader/ScrollingAction.cpp @@ -20,7 +20,7 @@ #include #include -#include "FBReader.h" +#include "Reader.h" #include "ScrollingAction.h" ScrollingAction::ScrollingAction( @@ -43,9 +43,9 @@ bool ScrollingAction::useKeyDelay() const { } void ScrollingAction::run() { - FBReader &fbreader = FBReader::Instance(); - shared_ptr view = fbreader.currentView(); - int delay = fbreader.myLastScrollingTime.millisecondsTo(ZLTime()); + Reader &reader = Reader::Instance(); + shared_ptr view = reader.currentView(); + int delay = reader.myLastScrollingTime.millisecondsTo(ZLTime()); if (view.isNull() || (delay >= 0 && delay < scrollingDelay())) { return; @@ -53,33 +53,33 @@ void ScrollingAction::run() { if (view->isInstanceOf(ZLTextView::TYPE_ID)) { ((ZLTextView&)*view).scrollPage(myForward, myTextScrollingMode, textOptionValue()); - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } else if (view->isInstanceOf(ZLBlockTreeView::TYPE_ID)) { ((ZLBlockTreeView&)*view).scroll(myBlockScrollingMode, !myForward); } - fbreader.myLastScrollingTime = ZLTime(); + reader.myLastScrollingTime = ZLTime(); } LineScrollingAction::LineScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::SCROLL_LINES, ZLBlockTreeView::ITEM, forward) { } int LineScrollingAction::scrollingDelay() const { - return FBReader::Instance().KeyScrollingDelayOption.value(); + return Reader::Instance().KeyScrollingDelayOption.value(); } std::size_t LineScrollingAction::textOptionValue() const { - return FBReader::Instance().LinesToScrollOption.value(); + return Reader::Instance().LinesToScrollOption.value(); } PageScrollingAction::PageScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::KEEP_LINES, ZLBlockTreeView::PAGE, forward) { } int PageScrollingAction::scrollingDelay() const { - return FBReader::Instance().KeyScrollingDelayOption.value(); + return Reader::Instance().KeyScrollingDelayOption.value(); } std::size_t PageScrollingAction::textOptionValue() const { - return FBReader::Instance().LinesToKeepOption.value(); + return Reader::Instance().LinesToKeepOption.value(); } MouseWheelScrollingAction::MouseWheelScrollingAction(bool forward) : ScrollingAction(ZLTextAreaController::SCROLL_LINES, ZLBlockTreeView::ITEM, forward) { @@ -93,9 +93,9 @@ TapScrollingAction::TapScrollingAction(bool forward) : ScrollingAction(ZLTextAre } std::size_t TapScrollingAction::textOptionValue() const { - return FBReader::Instance().LinesToKeepOption.value(); + return Reader::Instance().LinesToKeepOption.value(); } bool TapScrollingAction::isEnabled() const { - return FBReader::Instance().EnableTapScrollingOption.value(); + return Reader::Instance().EnableTapScrollingOption.value(); } diff --git a/fbreader/src/fbreader/ScrollingAction.h b/reader/src/reader/ScrollingAction.h similarity index 100% rename from fbreader/src/fbreader/ScrollingAction.h rename to reader/src/reader/ScrollingAction.h diff --git a/fbreader/src/fbreader/SearchActions.cpp b/reader/src/reader/SearchActions.cpp similarity index 91% rename from fbreader/src/fbreader/SearchActions.cpp rename to reader/src/reader/SearchActions.cpp index b06b8e7..ab80705 100644 --- a/fbreader/src/fbreader/SearchActions.cpp +++ b/reader/src/reader/SearchActions.cpp @@ -24,9 +24,9 @@ #include -#include "FBReader.h" +#include "Reader.h" #include "FBView.h" -#include "FBReaderActions.h" +#include "ReaderActions.h" #include "../options/FBCategoryKey.h" #include @@ -87,7 +87,7 @@ void SearchPatternEntry::onAccept(const std::string &value) { } bool SearchAction::isVisible() const { - shared_ptr view = FBReader::Instance().currentView(); + shared_ptr view = Reader::Instance().currentView(); return !view.isNull() && view->isInstanceOf(ZLTextView::TYPE_ID) && @@ -103,7 +103,7 @@ SearchPatternAction::SearchPatternAction() : } void SearchPatternAction::run() { - ZLTextView &textView = (ZLTextView&)*FBReader::Instance().currentView(); + ZLTextView &textView = (ZLTextView&)*Reader::Instance().currentView(); shared_ptr searchDialog = ZLDialogManager::Instance().createDialog(ZLResourceKey("textSearchDialog")); @@ -130,7 +130,7 @@ void SearchPatternAction::run() { } bool FindNextAction::isEnabled() const { - shared_ptr view = FBReader::Instance().currentView(); + shared_ptr view = Reader::Instance().currentView(); return !view.isNull() && view->isInstanceOf(ZLTextView::TYPE_ID) && @@ -139,11 +139,11 @@ bool FindNextAction::isEnabled() const { } void FindNextAction::run() { - ((ZLTextView&)*FBReader::Instance().currentView()).findNext(); + ((ZLTextView&)*Reader::Instance().currentView()).findNext(); } bool FindPreviousAction::isEnabled() const { - shared_ptr view = FBReader::Instance().currentView(); + shared_ptr view = Reader::Instance().currentView(); return !view.isNull() && view->isInstanceOf(ZLTextView::TYPE_ID) && @@ -151,5 +151,5 @@ bool FindPreviousAction::isEnabled() const { } void FindPreviousAction::run() { - ((ZLTextView&)*FBReader::Instance().currentView()).findPrevious(); + ((ZLTextView&)*Reader::Instance().currentView()).findPrevious(); } diff --git a/fbreader/src/fbreader/SearchOnNetworkAction.cpp b/reader/src/reader/SearchOnNetworkAction.cpp similarity index 96% rename from fbreader/src/fbreader/SearchOnNetworkAction.cpp rename to reader/src/reader/SearchOnNetworkAction.cpp index 1a1c238..2adda6f 100644 --- a/fbreader/src/fbreader/SearchOnNetworkAction.cpp +++ b/reader/src/reader/SearchOnNetworkAction.cpp @@ -25,7 +25,7 @@ #include "../options/FBCategoryKey.h" -#include "FBReaderActions.h" +#include "ReaderActions.h" #include "../network/NetworkLink.h" #include "../network/NetworkLinkCollection.h" @@ -71,8 +71,8 @@ void SearchOnNetworkAction::run() { void SimpleSearchOnNetworkAction::doSearch() { - FBReader &fbreader = FBReader::Instance(); - const std::string pattern = fbreader.visualParameter(SEARCH_PARAMETER_ID); + Reader &reader = Reader::Instance(); + const std::string pattern = reader.visualParameter(SEARCH_PARAMETER_ID); if (pattern.empty()) { return; } @@ -91,7 +91,7 @@ void SimpleSearchOnNetworkAction::doSearch() { SearchResult::setLastSearchResult(summary, result); } - fbreader.refreshWindow(); + reader.refreshWindow(); } void AdvancedSearchOnNetworkAction::doSearch() { @@ -144,7 +144,7 @@ void AdvancedSearchOnNetworkAction::doSearch() { SearchResult::setLastSearchResult(summary, result); } - FBReader::Instance().refreshWindow(); + Reader::Instance().refreshWindow(); } } } diff --git a/fbreader/src/fbreader/TimeUpdater.cpp b/reader/src/reader/TimeUpdater.cpp similarity index 100% rename from fbreader/src/fbreader/TimeUpdater.cpp rename to reader/src/reader/TimeUpdater.cpp diff --git a/fbreader/src/fbreader/TimeUpdater.h b/reader/src/reader/TimeUpdater.h similarity index 100% rename from fbreader/src/fbreader/TimeUpdater.h rename to reader/src/reader/TimeUpdater.h diff --git a/fbreader/src/fbreader/FBView.cpp b/reader/src/reader/View.cpp similarity index 95% rename from fbreader/src/fbreader/FBView.cpp rename to reader/src/reader/View.cpp index d85ef8e..8296a72 100644 --- a/fbreader/src/fbreader/FBView.cpp +++ b/reader/src/reader/View.cpp @@ -25,8 +25,8 @@ #include #include "FBView.h" -#include "FBReader.h" -#include "FBReaderActions.h" +#include "Reader.h" +#include "ReaderActions.h" #include "../options/FBOptions.h" #include "../options/FBTextStyle.h" @@ -97,9 +97,9 @@ shared_ptr FBView::indicatorInfo() const { void FBView::doTapScrolling(int y) { if (2 * y < context().height()) { - FBReader::Instance().doAction(ActionCode::TAP_SCROLL_BACKWARD); + Reader::Instance().doAction(ActionCode::TAP_SCROLL_BACKWARD); } else { - FBReader::Instance().doAction(ActionCode::TAP_SCROLL_FORWARD); + Reader::Instance().doAction(ActionCode::TAP_SCROLL_FORWARD); } } @@ -182,13 +182,13 @@ bool FBView::onStylusRelease(int x, int y) { return true; } - FBReader &fbreader = FBReader::Instance(); + Reader &reader = Reader::Instance(); myIsReleasedWithoutMotion = myIsReleasedWithoutMotion && std::abs(x - pressedX()) <= 5 && std::abs(y - pressedY()) <= 5; if (!hadSelection && isReleasedWithoutMotion() && - fbreader.EnableTapScrollingOption.value() && + reader.EnableTapScrollingOption.value() && (!ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FINGER_TAP_DETECTABLE, false).value() || - !fbreader.TapScrollingOnFingerOnlyOption.value())) { + !reader.TapScrollingOnFingerOnlyOption.value())) { myTapScroller = new TapScroller(*this, y); ZLTimeManager::Instance().addAutoRemovableTask(myTapScroller, doubleClickDelay()); return true; diff --git a/fbreader/src/fbreader/FBView.h b/reader/src/reader/View.h similarity index 100% rename from fbreader/src/fbreader/FBView.h rename to reader/src/reader/View.h diff --git a/fbreader/src/fbreader/main.cpp b/reader/src/reader/main.cpp similarity index 91% rename from fbreader/src/fbreader/main.cpp rename to reader/src/reader/main.cpp index 3ead3f0..967c068 100644 --- a/fbreader/src/fbreader/main.cpp +++ b/reader/src/reader/main.cpp @@ -19,13 +19,13 @@ #include -#include "FBReader.h" +#include "Reader.h" int main(int argc, char **argv) { if (!ZLibrary::init(argc, argv)) { return 1; } - ZLibrary::run(new FBReader(argc == 1 ? std::string() : argv[1])); + ZLibrary::run(new Reader(argc == 1 ? std::string() : argv[1])); ZLibrary::shutdown(); return 0; } diff --git a/fbreader/src/tree/FBTree.cpp b/reader/src/tree/FBTree.cpp similarity index 100% rename from fbreader/src/tree/FBTree.cpp rename to reader/src/tree/FBTree.cpp diff --git a/fbreader/src/tree/FBTree.h b/reader/src/tree/FBTree.h similarity index 100% rename from fbreader/src/tree/FBTree.h rename to reader/src/tree/FBTree.h diff --git a/zlibrary/core/data/resources/ar.xml b/zlibrary/core/data/resources/ar.xml index 55b6106..dc71156 100644 --- a/zlibrary/core/data/resources/ar.xml +++ b/zlibrary/core/data/resources/ar.xml @@ -1,5 +1,5 @@ - + diff --git a/zlibrary/core/data/resources/he.xml b/zlibrary/core/data/resources/he.xml index fd8299d..12a7494 100644 --- a/zlibrary/core/data/resources/he.xml +++ b/zlibrary/core/data/resources/he.xml @@ -1,5 +1,5 @@ - + diff --git a/zlibrary/core/data/resources/zh.xml b/zlibrary/core/data/resources/zh.xml index 85b8a7a..e9e71c6 100644 --- a/zlibrary/core/data/resources/zh.xml +++ b/zlibrary/core/data/resources/zh.xml @@ -1,5 +1,5 @@ - + diff --git a/zlibrary/core/include/ZLXMLNamespace.h b/zlibrary/core/include/ZLXMLNamespace.h index e4c57d2..b9b39b0 100644 --- a/zlibrary/core/include/ZLXMLNamespace.h +++ b/zlibrary/core/include/ZLXMLNamespace.h @@ -40,7 +40,7 @@ public: static const std::string CalibreMetadata; static const std::string Opds; static const std::string DaisyNCX; - static const std::string FBReaderCatalogMetadata; + static const std::string ReaderCatalogMetadata; }; #endif /* __ZLXMLNAMESPACE_H__ */ diff --git a/zlibrary/core/src/constants/ZLXMLNamespace.cpp b/zlibrary/core/src/constants/ZLXMLNamespace.cpp index 5a7ce1d..826a858 100644 --- a/zlibrary/core/src/constants/ZLXMLNamespace.cpp +++ b/zlibrary/core/src/constants/ZLXMLNamespace.cpp @@ -29,4 +29,4 @@ const std::string ZLXMLNamespace::OpenSearch = "http://a9.com/-/spec/opensearch/ const std::string ZLXMLNamespace::CalibreMetadata = "http://calibre.kovidgoyal.net/2009/metadata"; const std::string ZLXMLNamespace::Opds = "http://opds-spec.org/2010/catalog"; const std::string ZLXMLNamespace::DaisyNCX = "http://www.daisy.org/z3986/2005/ncx/"; -const std::string ZLXMLNamespace::FBReaderCatalogMetadata = "http://data.fbreader.org/catalog/metadata/"; +const std::string ZLXMLNamespace::ReaderCatalogMetadata = "http://data.fbreader.org/catalog/metadata/";