diff --git a/Makefile b/Makefile index 453757efc..195b5c2e2 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,6 @@ androidupdate: all -xr!*NOTES.txt$ \ -xr!*NOTICE$ \ -xr!*README.md$ \ - -xr!*koreader.icns$ \ -xr'!.*' # make the android APK @@ -427,7 +426,7 @@ macosupdate: all $(INSTALL_DIR)/bundle/Contents/MacOS \ $(INSTALL_DIR)/bundle/Contents/Resources - cp resources/koreader.icns $(INSTALL_DIR)/bundle/Contents/Resources/icon.icns + cp -pv $(MACOS_DIR)/koreader.icns $(INSTALL_DIR)/bundle/Contents/Resources/icon.icns cp -LR $(INSTALL_DIR)/koreader $(INSTALL_DIR)/bundle/Contents cp -pRv $(MACOS_DIR)/menu.xml $(INSTALL_DIR)/bundle/Contents/MainMenu.xib ibtool --compile "$(INSTALL_DIR)/bundle/Contents/Resources/Base.lproj/MainMenu.nib" "$(INSTALL_DIR)/bundle/Contents/MainMenu.xib" diff --git a/platform/mac/do_mac_bundle.sh b/platform/mac/do_mac_bundle.sh index 02fcb4007..933ab349d 100755 --- a/platform/mac/do_mac_bundle.sh +++ b/platform/mac/do_mac_bundle.sh @@ -160,8 +160,7 @@ rm -rf cache clipboard history ota \ l10n/.git l10n/.tx l10n/templates l10n/LICENSE l10n/Makefile l10n/README.md \ plugins/SSH.koplugin plugins/hello.koplugin plugins/timesync.koplugin \ plugins/autofrontlight.koplugin resources/fonts resources/icons/src \ - resources/kobo-touch-probe.png resources/koreader.icns rocks/bin \ - rocks/lib/luarocks screenshots spec tools + rocks/bin rocks/lib/luarocks screenshots spec tools # adjust reader.lua a bit. diff --git a/resources/koreader.icns b/platform/mac/koreader.icns similarity index 100% rename from resources/koreader.icns rename to platform/mac/koreader.icns diff --git a/plugins/goodreads.koplugin/goodreadsbook.lua b/plugins/goodreads.koplugin/goodreadsbook.lua index 337d212d4..d42f61db8 100644 --- a/plugins/goodreads.koplugin/goodreadsbook.lua +++ b/plugins/goodreads.koplugin/goodreadsbook.lua @@ -202,7 +202,7 @@ function GoodreadsBook:genBookInfoGroup() }) else table.insert(book_info_group, ImageWidget:new{ - file = "resources/goodreadsnophoto.png", + file = "plugins/goodreads.koplugin/goodreadsnophoto.png", width = img_width, height = img_height, }) diff --git a/resources/goodreadsnophoto.png b/plugins/goodreads.koplugin/goodreadsnophoto.png similarity index 100% rename from resources/goodreadsnophoto.png rename to plugins/goodreads.koplugin/goodreadsnophoto.png diff --git a/resources/icons/README.md b/resources/icons/README.md deleted file mode 100644 index ae9545937..000000000 --- a/resources/icons/README.md +++ /dev/null @@ -1,23 +0,0 @@ -menu-icon.png is post-processed with: - -```bash -convert menu-icon.png -grayscale Rec709Luma -dither Riemersma -remap eink_cmap.gif -quality 75 png:menu-icon-grayscale.png -``` - -The intent being to grayscale, dither down to the 16c eInk palette, and save as a 16c paletted grayscale PNG. -Start from an RGB copy of the image if you end up with a 256c or sRGB PNG (check via IM's identify tool). - -See https://www.mobileread.com/forums/showpost.php?p=3728291&postcount=17 for more details ;). - - -Zoom direction icons are generated from direction.LRBT.png with: - -```bash -convert direction.LRBT.png -rotate 90 direction.TBLR.png -convert direction.LRBT.png -rotate 180 direction.RLTB.png -convert direction.LRBT.png -rotate -90 direction.BTRL.png -convert direction.BTRL.png -flop direction.BTLR.png -convert direction.LRBT.png -flop direction.RLBT.png -convert direction.RLTB.png -flop direction.LRTB.png -convert direction.TBLR.png -flop direction.TBRL.png -``` diff --git a/resources/icons/appbar.align.auto.png b/resources/icons/appbar.align.auto.png deleted file mode 100644 index 3386c8413..000000000 Binary files a/resources/icons/appbar.align.auto.png and /dev/null differ diff --git a/resources/icons/appbar.align.center.png b/resources/icons/appbar.align.center.png deleted file mode 100644 index ded8f0722..000000000 Binary files a/resources/icons/appbar.align.center.png and /dev/null differ diff --git a/resources/icons/appbar.align.justify.png b/resources/icons/appbar.align.justify.png deleted file mode 100644 index 3b864e68a..000000000 Binary files a/resources/icons/appbar.align.justify.png and /dev/null differ diff --git a/resources/icons/appbar.align.left.png b/resources/icons/appbar.align.left.png deleted file mode 100644 index c4c1527a8..000000000 Binary files a/resources/icons/appbar.align.left.png and /dev/null differ diff --git a/resources/icons/appbar.align.right.png b/resources/icons/appbar.align.right.png deleted file mode 100644 index e477c624c..000000000 Binary files a/resources/icons/appbar.align.right.png and /dev/null differ diff --git a/resources/icons/appbar.arrow.enter.png b/resources/icons/appbar.arrow.enter.png deleted file mode 100644 index cde63eb9b..000000000 Binary files a/resources/icons/appbar.arrow.enter.png and /dev/null differ diff --git a/resources/icons/appbar.arrow.left.up.png b/resources/icons/appbar.arrow.left.up.png deleted file mode 100644 index e42008a3c..000000000 Binary files a/resources/icons/appbar.arrow.left.up.png and /dev/null differ diff --git a/resources/icons/appbar.arrow.shift.png b/resources/icons/appbar.arrow.shift.png deleted file mode 100644 index 6608dafe1..000000000 Binary files a/resources/icons/appbar.arrow.shift.png and /dev/null differ diff --git a/resources/icons/appbar.book.open.png b/resources/icons/appbar.book.open.png deleted file mode 100644 index 8fcb93047..000000000 Binary files a/resources/icons/appbar.book.open.png and /dev/null differ diff --git a/resources/icons/appbar.cabinet.files.png b/resources/icons/appbar.cabinet.files.png deleted file mode 100644 index a70f8ae2f..000000000 Binary files a/resources/icons/appbar.cabinet.files.png and /dev/null differ diff --git a/resources/icons/appbar.checkmark.thick.png b/resources/icons/appbar.checkmark.thick.png deleted file mode 100644 index 1daf67824..000000000 Binary files a/resources/icons/appbar.checkmark.thick.png and /dev/null differ diff --git a/resources/icons/appbar.checkmark.thick.unchecked.png b/resources/icons/appbar.checkmark.thick.unchecked.png deleted file mode 100644 index c64f9c862..000000000 Binary files a/resources/icons/appbar.checkmark.thick.unchecked.png and /dev/null differ diff --git a/resources/icons/appbar.chevron.first.png b/resources/icons/appbar.chevron.first.png deleted file mode 100644 index c449f93a6..000000000 Binary files a/resources/icons/appbar.chevron.first.png and /dev/null differ diff --git a/resources/icons/appbar.chevron.last.png b/resources/icons/appbar.chevron.last.png deleted file mode 100644 index 82407a865..000000000 Binary files a/resources/icons/appbar.chevron.last.png and /dev/null differ diff --git a/resources/icons/appbar.chevron.left.png b/resources/icons/appbar.chevron.left.png deleted file mode 100644 index b77f06389..000000000 Binary files a/resources/icons/appbar.chevron.left.png and /dev/null differ diff --git a/resources/icons/appbar.chevron.right.png b/resources/icons/appbar.chevron.right.png deleted file mode 100644 index 671942875..000000000 Binary files a/resources/icons/appbar.chevron.right.png and /dev/null differ diff --git a/resources/icons/appbar.chevron.up.png b/resources/icons/appbar.chevron.up.png deleted file mode 100644 index 17de58b1f..000000000 Binary files a/resources/icons/appbar.chevron.up.png and /dev/null differ diff --git a/resources/icons/appbar.clear.reflect.horizontal.png b/resources/icons/appbar.clear.reflect.horizontal.png deleted file mode 100644 index 6185c7c57..000000000 Binary files a/resources/icons/appbar.clear.reflect.horizontal.png and /dev/null differ diff --git a/resources/icons/appbar.column.one.png b/resources/icons/appbar.column.one.png deleted file mode 100644 index 219ababd2..000000000 Binary files a/resources/icons/appbar.column.one.png and /dev/null differ diff --git a/resources/icons/appbar.column.three.png b/resources/icons/appbar.column.three.png deleted file mode 100644 index 60571c3e3..000000000 Binary files a/resources/icons/appbar.column.three.png and /dev/null differ diff --git a/resources/icons/appbar.column.two.large.png b/resources/icons/appbar.column.two.large.png deleted file mode 100644 index 852a703e9..000000000 Binary files a/resources/icons/appbar.column.two.large.png and /dev/null differ diff --git a/resources/icons/appbar.column.two.png b/resources/icons/appbar.column.two.png deleted file mode 100644 index af329a488..000000000 Binary files a/resources/icons/appbar.column.two.png and /dev/null differ diff --git a/resources/icons/appbar.control.collapse.png b/resources/icons/appbar.control.collapse.png deleted file mode 100644 index 2ce0730a0..000000000 Binary files a/resources/icons/appbar.control.collapse.png and /dev/null differ diff --git a/resources/icons/appbar.control.expand.png b/resources/icons/appbar.control.expand.png deleted file mode 100644 index bc81e433b..000000000 Binary files a/resources/icons/appbar.control.expand.png and /dev/null differ diff --git a/resources/icons/appbar.crop.large.png b/resources/icons/appbar.crop.large.png deleted file mode 100644 index e8585f7be..000000000 Binary files a/resources/icons/appbar.crop.large.png and /dev/null differ diff --git a/resources/icons/appbar.globe.wire.png b/resources/icons/appbar.globe.wire.png deleted file mode 100644 index e74ccefb4..000000000 Binary files a/resources/icons/appbar.globe.wire.png and /dev/null differ diff --git a/resources/icons/appbar.grade.b.large.png b/resources/icons/appbar.grade.b.large.png deleted file mode 100644 index 43b3db214..000000000 Binary files a/resources/icons/appbar.grade.b.large.png and /dev/null differ diff --git a/resources/icons/appbar.home.png b/resources/icons/appbar.home.png deleted file mode 100644 index b11092845..000000000 Binary files a/resources/icons/appbar.home.png and /dev/null differ diff --git a/resources/icons/appbar.magnify.browse.png b/resources/icons/appbar.magnify.browse.png deleted file mode 100644 index 92c7bcd8b..000000000 Binary files a/resources/icons/appbar.magnify.browse.png and /dev/null differ diff --git a/resources/icons/appbar.magnify.zoom.png b/resources/icons/appbar.magnify.zoom.png deleted file mode 100644 index adb9c2276..000000000 Binary files a/resources/icons/appbar.magnify.zoom.png and /dev/null differ diff --git a/resources/icons/appbar.page.corner.bookmark.png b/resources/icons/appbar.page.corner.bookmark.png deleted file mode 100644 index e9b91c6a3..000000000 Binary files a/resources/icons/appbar.page.corner.bookmark.png and /dev/null differ diff --git a/resources/icons/appbar.page.fit.png b/resources/icons/appbar.page.fit.png deleted file mode 100644 index 7928194d4..000000000 Binary files a/resources/icons/appbar.page.fit.png and /dev/null differ diff --git a/resources/icons/appbar.page.text.png b/resources/icons/appbar.page.text.png deleted file mode 100644 index 7fe3b0a52..000000000 Binary files a/resources/icons/appbar.page.text.png and /dev/null differ diff --git a/resources/icons/appbar.plus.png b/resources/icons/appbar.plus.png deleted file mode 100644 index dde1ccc9e..000000000 Binary files a/resources/icons/appbar.plus.png and /dev/null differ diff --git a/resources/icons/appbar.pokeball.png b/resources/icons/appbar.pokeball.png deleted file mode 100644 index eb53063a3..000000000 Binary files a/resources/icons/appbar.pokeball.png and /dev/null differ diff --git a/resources/icons/appbar.settings.large.png b/resources/icons/appbar.settings.large.png deleted file mode 100644 index 294e69178..000000000 Binary files a/resources/icons/appbar.settings.large.png and /dev/null differ diff --git a/resources/icons/appbar.settings.png b/resources/icons/appbar.settings.png deleted file mode 100644 index ed5267e4f..000000000 Binary files a/resources/icons/appbar.settings.png and /dev/null differ diff --git a/resources/icons/appbar.spacer.png b/resources/icons/appbar.spacer.png deleted file mode 100644 index f1a83efdb..000000000 Binary files a/resources/icons/appbar.spacer.png and /dev/null differ diff --git a/resources/icons/appbar.text.size.large.png b/resources/icons/appbar.text.size.large.png deleted file mode 100644 index 5818b2bee..000000000 Binary files a/resources/icons/appbar.text.size.large.png and /dev/null differ diff --git a/resources/icons/appbar.tools.png b/resources/icons/appbar.tools.png deleted file mode 100644 index f3d3ae27e..000000000 Binary files a/resources/icons/appbar.tools.png and /dev/null differ diff --git a/resources/icons/appbar.transform.rotate.right.large.png b/resources/icons/appbar.transform.rotate.right.large.png deleted file mode 100644 index 357a0b377..000000000 Binary files a/resources/icons/appbar.transform.rotate.right.large.png and /dev/null differ diff --git a/resources/icons/appbar.wifi.png b/resources/icons/appbar.wifi.png deleted file mode 100644 index bbdd8a071..000000000 Binary files a/resources/icons/appbar.wifi.png and /dev/null differ diff --git a/resources/icons/direction.BTLR.png b/resources/icons/direction.BTLR.png deleted file mode 100644 index 9c77d3a5a..000000000 Binary files a/resources/icons/direction.BTLR.png and /dev/null differ diff --git a/resources/icons/direction.BTRL.png b/resources/icons/direction.BTRL.png deleted file mode 100644 index 356acec96..000000000 Binary files a/resources/icons/direction.BTRL.png and /dev/null differ diff --git a/resources/icons/direction.LRBT.png b/resources/icons/direction.LRBT.png deleted file mode 100644 index 6d0fca75b..000000000 Binary files a/resources/icons/direction.LRBT.png and /dev/null differ diff --git a/resources/icons/direction.LRTB.png b/resources/icons/direction.LRTB.png deleted file mode 100644 index a9f6ba59a..000000000 Binary files a/resources/icons/direction.LRTB.png and /dev/null differ diff --git a/resources/icons/direction.RLBT.png b/resources/icons/direction.RLBT.png deleted file mode 100644 index da9938b3d..000000000 Binary files a/resources/icons/direction.RLBT.png and /dev/null differ diff --git a/resources/icons/direction.RLTB.png b/resources/icons/direction.RLTB.png deleted file mode 100644 index 149a3c09e..000000000 Binary files a/resources/icons/direction.RLTB.png and /dev/null differ diff --git a/resources/icons/direction.TBLR.png b/resources/icons/direction.TBLR.png deleted file mode 100644 index 466f45fb1..000000000 Binary files a/resources/icons/direction.TBLR.png and /dev/null differ diff --git a/resources/icons/direction.TBRL.png b/resources/icons/direction.TBRL.png deleted file mode 100644 index 989851d9b..000000000 Binary files a/resources/icons/direction.TBRL.png and /dev/null differ diff --git a/resources/icons/dogear.png b/resources/icons/dogear.png deleted file mode 100644 index b725d4869..000000000 Binary files a/resources/icons/dogear.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.open.0.medium.png b/resources/icons/koicon.wifi.open.0.medium.png deleted file mode 100644 index aa72a3a63..000000000 Binary files a/resources/icons/koicon.wifi.open.0.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.open.100.medium.png b/resources/icons/koicon.wifi.open.100.medium.png deleted file mode 100644 index e3f76eb69..000000000 Binary files a/resources/icons/koicon.wifi.open.100.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.open.25.medium.png b/resources/icons/koicon.wifi.open.25.medium.png deleted file mode 100644 index cbf4866e5..000000000 Binary files a/resources/icons/koicon.wifi.open.25.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.open.50.medium.png b/resources/icons/koicon.wifi.open.50.medium.png deleted file mode 100644 index 8669026d9..000000000 Binary files a/resources/icons/koicon.wifi.open.50.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.open.75.medium.png b/resources/icons/koicon.wifi.open.75.medium.png deleted file mode 100644 index 4ae6bdef8..000000000 Binary files a/resources/icons/koicon.wifi.open.75.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.secure.0.medium.png b/resources/icons/koicon.wifi.secure.0.medium.png deleted file mode 100644 index cf79ecd91..000000000 Binary files a/resources/icons/koicon.wifi.secure.0.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.secure.100.medium.png b/resources/icons/koicon.wifi.secure.100.medium.png deleted file mode 100644 index d3dbe59c1..000000000 Binary files a/resources/icons/koicon.wifi.secure.100.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.secure.25.medium.png b/resources/icons/koicon.wifi.secure.25.medium.png deleted file mode 100644 index 71531fb8d..000000000 Binary files a/resources/icons/koicon.wifi.secure.25.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.secure.50.medium.png b/resources/icons/koicon.wifi.secure.50.medium.png deleted file mode 100644 index b0feb26cf..000000000 Binary files a/resources/icons/koicon.wifi.secure.50.medium.png and /dev/null differ diff --git a/resources/icons/koicon.wifi.secure.75.medium.png b/resources/icons/koicon.wifi.secure.75.medium.png deleted file mode 100644 index bff1e135d..000000000 Binary files a/resources/icons/koicon.wifi.secure.75.medium.png and /dev/null differ diff --git a/resources/icons/menu-icon.png b/resources/icons/menu-icon.png deleted file mode 100644 index e1d5ccb75..000000000 Binary files a/resources/icons/menu-icon.png and /dev/null differ diff --git a/resources/icons/stats.star.empty.png b/resources/icons/stats.star.empty.png deleted file mode 100644 index dd3338c28..000000000 Binary files a/resources/icons/stats.star.empty.png and /dev/null differ diff --git a/resources/icons/stats.star.full.png b/resources/icons/stats.star.full.png deleted file mode 100644 index 0dafca112..000000000 Binary files a/resources/icons/stats.star.full.png and /dev/null differ diff --git a/resources/icons/zoom.content.png b/resources/icons/zoom.content.png deleted file mode 100644 index 4cf2c303b..000000000 Binary files a/resources/icons/zoom.content.png and /dev/null differ diff --git a/resources/icons/zoom.direction.column.png b/resources/icons/zoom.direction.column.png deleted file mode 100644 index 9d9d3eab2..000000000 Binary files a/resources/icons/zoom.direction.column.png and /dev/null differ diff --git a/resources/icons/zoom.direction.row.png b/resources/icons/zoom.direction.row.png deleted file mode 100644 index 3da7263fe..000000000 Binary files a/resources/icons/zoom.direction.row.png and /dev/null differ diff --git a/resources/icons/zoom.manual.png b/resources/icons/zoom.manual.png deleted file mode 100644 index 5a8dd30b6..000000000 Binary files a/resources/icons/zoom.manual.png and /dev/null differ diff --git a/resources/icons/zoom.page.png b/resources/icons/zoom.page.png deleted file mode 100644 index 5b6249348..000000000 Binary files a/resources/icons/zoom.page.png and /dev/null differ diff --git a/resources/info-aux.png b/resources/info-aux.png deleted file mode 100644 index ff1f96c91..000000000 Binary files a/resources/info-aux.png and /dev/null differ diff --git a/resources/info-bug.png b/resources/info-bug.png deleted file mode 100644 index 5a2e3b485..000000000 Binary files a/resources/info-bug.png and /dev/null differ diff --git a/resources/info-confirm.png b/resources/info-confirm.png deleted file mode 100644 index 7a6176019..000000000 Binary files a/resources/info-confirm.png and /dev/null differ diff --git a/resources/info-error.png b/resources/info-error.png deleted file mode 100644 index 3529915e5..000000000 Binary files a/resources/info-error.png and /dev/null differ diff --git a/resources/info-i.png b/resources/info-i.png deleted file mode 100644 index fc0e57da0..000000000 Binary files a/resources/info-i.png and /dev/null differ diff --git a/resources/info-warn.png b/resources/info-warn.png deleted file mode 100644 index 68d80a426..000000000 Binary files a/resources/info-warn.png and /dev/null differ diff --git a/resources/jpeg.png b/resources/jpeg.png deleted file mode 100644 index e74028348..000000000 Binary files a/resources/jpeg.png and /dev/null differ diff --git a/resources/jpg.png b/resources/jpg.png deleted file mode 100644 index 9a4e91231..000000000 Binary files a/resources/jpg.png and /dev/null differ diff --git a/resources/ko-icon.png b/resources/ko-icon.png deleted file mode 100755 index f965af310..000000000 Binary files a/resources/ko-icon.png and /dev/null differ diff --git a/resources/koreader.svg b/resources/koreader.svg new file mode 100644 index 000000000..a345a9979 --- /dev/null +++ b/resources/koreader.svg @@ -0,0 +1,66 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/eink_cmap.gif b/tools/eink_cmap.gif similarity index 100% rename from resources/icons/eink_cmap.gif rename to tools/eink_cmap.gif diff --git a/resources/kobo-touch-probe.png b/tools/kobo-touch-probe.png similarity index 100% rename from resources/kobo-touch-probe.png rename to tools/kobo-touch-probe.png diff --git a/tools/kobo_touch_probe.lua b/tools/kobo_touch_probe.lua index 7e2cf6759..673ec778d 100755 --- a/tools/kobo_touch_probe.lua +++ b/tools/kobo_touch_probe.lua @@ -51,7 +51,7 @@ function TouchProbe:init() }, } self.image_widget = ImageWidget:new{ - file = "resources/kobo-touch-probe.png", + file = "tools/kobo-touch-probe.png", } local screen_w, screen_h = Screen:getWidth(), Screen:getHeight() local img_w, img_h = self.image_widget:getSize().w, self.image_widget:getSize().h