Browse Source

Remove PNG icons, add koreader.svg

Also move Mac specific resource in platform/mac/.
reviewable/pr7012/r1
poire-z 10 months ago
parent
commit
daefdc96e9
88 changed files with 70 additions and 29 deletions
  1. +1
    -2
      Makefile
  2. +1
    -2
      platform/mac/do_mac_bundle.sh
  3. +0
    -0
      platform/mac/koreader.icns
  4. +1
    -1
      plugins/goodreads.koplugin/goodreadsbook.lua
  5. +0
    -0
      plugins/goodreads.koplugin/goodreadsnophoto.png
  6. +0
    -23
      resources/icons/README.md
  7. BIN
     
  8. BIN
     
  9. BIN
     
  10. BIN
     
  11. BIN
     
  12. BIN
     
  13. BIN
     
  14. BIN
     
  15. BIN
     
  16. BIN
     
  17. BIN
     
  18. BIN
     
  19. BIN
     
  20. BIN
     
  21. BIN
     
  22. BIN
     
  23. BIN
     
  24. BIN
     
  25. BIN
     
  26. BIN
     
  27. BIN
     
  28. BIN
     
  29. BIN
     
  30. BIN
     
  31. BIN
     
  32. BIN
     
  33. BIN
     
  34. BIN
     
  35. BIN
     
  36. BIN
     
  37. BIN
     
  38. BIN
     
  39. BIN
     
  40. BIN
     
  41. BIN
     
  42. BIN
     
  43. BIN
     
  44. BIN
     
  45. BIN
     
  46. BIN
     
  47. BIN
     
  48. BIN
     
  49. BIN
     
  50. BIN
     
  51. BIN
     
  52. BIN
     
  53. BIN
     
  54. BIN
     
  55. BIN
     
  56. BIN
     
  57. BIN
     
  58. BIN
     
  59. BIN
     
  60. BIN
     
  61. BIN
     
  62. BIN
     
  63. BIN
     
  64. BIN
     
  65. BIN
     
  66. BIN
     
  67. BIN
     
  68. BIN
     
  69. BIN
     
  70. BIN
     
  71. BIN
     
  72. BIN
     
  73. BIN
     
  74. BIN
     
  75. BIN
     
  76. BIN
     
  77. BIN
     
  78. BIN
     
  79. BIN
     
  80. BIN
     
  81. BIN
     
  82. BIN
     
  83. BIN
     
  84. BIN
     
  85. +66
    -0
      resources/koreader.svg
  86. +0
    -0
      tools/eink_cmap.gif
  87. +0
    -0
      tools/kobo-touch-probe.png
  88. +1
    -1
      tools/kobo_touch_probe.lua

+ 1
- 2
Makefile View File

@ -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"

+ 1
- 2
platform/mac/do_mac_bundle.sh View File

@ -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.

resources/koreader.icns → platform/mac/koreader.icns View File


+ 1
- 1
plugins/goodreads.koplugin/goodreadsbook.lua View File

@ -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,
})

resources/goodreadsnophoto.png → plugins/goodreads.koplugin/goodreadsnophoto.png View File


+ 0
- 23
resources/icons/README.md View File

@ -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
```

BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


BIN
View File


+ 66
- 0
resources/koreader.svg View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
width="260"
height="260"
viewBox="0 0 195 195.00002"
version="1.2"
id="svg215">
<metadata
id="metadata219">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs94">
<clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath930">
<path
id="path932"
style="fill:#00a89c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999997"
d="m 40.842465,0.60156187 c -12.386709,0 -22.524098,10.13605613 -22.524098,22.52277513 V 171.87568 c 0,12.38673 10.137389,22.52278 22.524098,22.52278 h 5.227715 99.08736 5.22771 c 12.38672,0 22.5241,-10.13605 22.5241,-22.52278 V 23.124337 c 0,-12.386719 -10.13738,-22.52277513 -22.5241,-22.52277513 h -5.22771 -99.08736 z" />
</clipPath>
</defs>
<path
id="path96"
d="M 155.88055,195.00002 H 51.119448 c -12.439515,0 -22.619447,-10.19966 -22.619447,-22.66328 V 22.663266 C 28.500001,10.199649 38.679933,0 51.119448,0 H 155.88055 c 12.43953,0 22.61946,10.199649 22.61946,22.663266 V 172.33674 c 0,12.46362 -10.17993,22.66328 -22.61946,22.66328"
style="fill:#00a89c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1" />
<path
id="path98"
d="M 150.63055,195.00001 H 45.869448 c -12.439514,0 -22.619447,-10.19965 -22.619447,-22.66327 V 22.663266 C 23.250001,10.199649 33.429934,0 45.869448,0 H 150.63055 c 12.43952,0 22.61946,10.199649 22.61946,22.663266 V 172.33674 c 0,12.46362 -10.17994,22.66327 -22.61946,22.66327"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1" />
<path
id="path100"
d="M 145.38055,195.00002 H 40.619448 c -12.439514,0 -22.619447,-10.19966 -22.619447,-22.66328 V 22.663266 C 18.000001,10.199649 28.179934,0 40.619448,0 H 145.38055 c 12.43953,0 22.61946,10.199649 22.61946,22.663266 V 172.33674 c 0,12.46362 -10.17993,22.66328 -22.61946,22.66328"
style="fill:#00a89c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1" />
<g
id="g914"
clip-path="url(#clipPath930)"
transform="matrix(1.004263,0,0,1.0062081,-0.39645745,-0.60529643)"
style="stroke-width:0.994792">
<path
id="path102"
d="m 37.95508,118.15625 13.34375,-11.14453 13.34375,11.14453 V -14.347657 h -26.6875 z m 0,0"
style="clip-rule:nonzero;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.994792" />
<path
id="path108"
d="m 98.11914,138.55078 c -21.97266,0 -39.84766,17.875 -39.84766,39.84766 0,21.97265 17.875,39.84765 39.84766,39.84765 21.97265,0 39.84765,-17.875 39.84765,-39.84765 0,-21.97266 -17.875,-39.84766 -39.84765,-39.84766 m 0,103.69531 c -35.20703,0 -63.84766,-28.64062 -63.84766,-63.84765 0,-35.20704 28.64063,-63.84766 63.84766,-63.84766 35.20703,0 63.84765,28.64062 63.84765,63.84766 0,35.20703 -28.64062,63.84765 -63.84765,63.84765"
style="clip-rule:nonzero;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.994792" />
<path
id="path114"
d="m 165.57617,118.15625 c -9.38281,0.0195 -19.17188,-0.0391 -22.34766,0 -18.47265,0.25 -18.88672,-3.35156 -24.83203,-8.09766 -9.07812,-7.24219 -29.79297,-27.835939 -39.94922,-37.246089 -3.46093,-3.21094 -5.42187,-6.94141 -5.42187,-10.43359 v -2.84375 c 0,-4.64454 1.75,-9.125005 4.89844,-12.542974 l 56.73046,-61.515625 h 34.74219 L 99.87695,59.734371 c 5.93359,6.98047 25.90625,26.39844 51.76953,48.457029 5.42578,4.62891 9.59766,8.125 13.92969,9.96485"
style="clip-rule:nonzero;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.994792" />
</g>
</svg>

resources/icons/eink_cmap.gif → tools/eink_cmap.gif View File


resources/kobo-touch-probe.png → tools/kobo-touch-probe.png View File


+ 1
- 1
tools/kobo_touch_probe.lua View File

@ -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

Loading…
Cancel
Save