Patch release v68 (fw 4.24.15676)

Removed "Allow searches on Extra dictionaries" (see [pgaskin/dictutil#14 @ Github](https://github.com/pgaskin/dictutil/issues/14) )
master
Jay Logan 2020-09-25 04:22:13 -05:00
parent 23280562f6
commit 3bb1ee3c4d
3 changed files with 89 additions and 94 deletions

View File

@ -1,5 +1,5 @@
## Sixthhokage1's kobopatch config
version: 4.23.15548
version: 4.24.15676
in: src/latest.zip
out: out/KoboRoot.tgz
log: out/log.txt
@ -21,7 +21,6 @@ overrides:
src/libnickel.so.1.0.0.yaml:
Always show confirmation dialog before upgrading: yes
Allow showing info panel on random screensaver: yes
Allow searches on Extra dictionaries: yes
Don't uppercase header/footer text: yes
Enable advanced settings for all fonts: yes
Shorten dictionary entry not found message: yes

View File

@ -317,8 +317,8 @@ Set KePub hyphenation:
will always be turned on, regardless of justification button setting.
(The publisher can still turn hyphenation off/on in the book's stylesheet.)
- ReplaceBytes: {Offset: 0xB8FB8E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
# - ReplaceBytes: {Offset: 0xB8FB8E, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 00 20 00 20} # Alternative 2: Never turn KePub hyphenation on
- ReplaceBytes: {Offset: 0xB911A2, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 01 20 01 20} # Alternative 1: Always turn KePub hyphenation on
# - ReplaceBytes: {Offset: 0xB911A2, FindInstBLX: {SymPLT: "QString::operator==(QLatin1String) const"}, ReplaceH: 00 20 00 20} # Alternative 2: Never turn KePub hyphenation on
Force user line spacing in KePubs:
- Enabled: no
@ -499,12 +499,6 @@ KePub stylesheet additions:
# 1.5 times the font size of KePubs by default. With this enabled they match.
# - FindReplaceString: {Find: "/******************************************/", Replace: "#book-inner{font-size:1.5em }", MustMatchLength: yes}
Allow searches on Extra dictionaries:
- Enabled: no
# See https://pgaskin.net/dictutil/dicthtml/install
- FindBaseAddressString: "\0Extra:\x20"
- ReplaceString: {Offset: 7, Find: "\x20", Replace: "_"}
Ignore .otf fonts:
- Enabled: no
- Description:
@ -534,8 +528,8 @@ Set font scale factor:
# Original value X=14, so original scale factor is (font size slider) / 46.
# Allowed replacement values for X: 0-15 (smaller X --> larger scale factor)
# Note: vmov.f32 s1, #15.0 before getReadingFontSizeScaleFactor
- ReplaceInt: {Offset: 0x5874AC, Find: 14, Replace: 4} # ePub
- ReplaceInt: {Offset: 0xB8F764, Find: 14, Replace: 4} # KePub
- ReplaceInt: {Offset: 0x589544, Find: 14, Replace: 4} # ePub
- ReplaceInt: {Offset: 0xB90D74, Find: 14, Replace: 4} # KePub
# The following patch(es) were made by jackie_w
Dictionary text font-family/font-size/line-height:
@ -545,7 +539,9 @@ Dictionary text font-family/font-size/line-height:
in the pop-up and full-screen dictionary widgets.
4.17.13651: improved to also reduce the blank lines displayed in many
sideloaded custom dictionaries which contain <blockquote>.
.
4.24.15672: enforced update to accommodate Kobo changes related to new
dictionaries being released Oct 1st 2020
#
See https://www.mobileread.com/forums/showpost.php?p=3521137&postcount=48
for screenshots
.
@ -553,58 +549,69 @@ Dictionary text font-family/font-size/line-height:
- font-family
- font-size
- line-height
.
#
These are the Kobo defaults
Glo - Georgia 23px 1.4em
H2O - Georgia 29px 1.4em
GloHD - Georgia 32px 1.4em
AuraONE - Georgia 42px 1.4em
#
# Stage 1: Change DictionaryView to remove %variables
# from:
# * { font: %1px %2; line-height: 1.4em; }
# div.descriptionFont { font-family: %3; }
# ol { font-size: %1px; font-weight: bold; margin-left: %4em; margin-top: 0px; }
# ol p { font-size: %1px; font-weight:normal; }
# body { font: %1px %2; line-height: 1.4em; }
# span.word { font-weight: bold; font-size: 130%; margin-left: -%5px; }
# div.descriptionFont { font-family: %3; }
# ol { font-size: %1px; margin-left: %4em; margin-top: 0px; }
# ol p { font-size: %1px; }
# i, i * { font-style: italic; }
# b, b * { font-weight: bold; }
# .sc, .sc * { font-variant: small-caps; }
# .block, .border { border-radius: 3px; padding: 0em .2em; font-size: 90%; }
# to:
# * { font-size: %1px; line-height: 1.40em;font-family: Georgia ;}
# ol {margin-left:1em; margin-top:0}
# blockquote {margin:0.3em 0 0.3em 1em} blockquote>blockquote {margin:-0.3em 0 0 2em}
#
# body {font-size:%1px; line-height:1.40em; font-family:Georgia ;}
# ol {margin-left:.5em; margin-top:0}
# blockquote {margin:.3em 0 .3em 1em}
# blockquote>blockquote {margin:-.3em 0 0 2em}
# span.word {font-weight:bold; font-size:130%; margin-left:-.5em}
# i, i * {font-style:italic}
# b, b * {font-weight:bold}
# .sc, .sc * {font-variant:small-caps}
# .block, .border {border-radius:3px; padding:0 .2em; font-size:90%}
# ##### N.B. Do not change the next 4 lines #####
- FindReplaceString:
Find: "* { font: %1px %2; line-height: 1.4em; }\ndiv.descriptionFont { font-family: %3; }\nol { font-size: %1px; font-weight: bold; margin-left: %4em; margin-top: 0px; }\nol p { font-size: %1px; font-weight:normal; }\n"
Replace: "* { font-size: %1px; line-height: 1.40em;font-family: Georgia ;}\n\nol {margin-left:1em; margin-top:0}\nblockquote {margin:0.3em 0 0.3em 1em} blockquote>blockquote {margin:-0.3em 0 0 2em}\n"
Find: "body { font: %1px %2; line-height: 1.4em; }\nspan.word { font-weight: bold; font-size: 130%; margin-left: -%5px; }\ndiv.descriptionFont { font-family: %3; }\nol { font-size: %1px; margin-left: %4em; margin-top: 0px; }\nol p { font-size: %1px; }\ni, i * { font-style: italic; }\nb, b * { font-weight: bold; }\n.sc, .sc * { font-variant: small-caps; }\n.block, .border { border-radius: 3px; padding: 0em .2em; font-size: 90%; }\n"
Replace: "body {font-size:%1px; line-height:1.40em; font-family:Georgia ;}\nol {margin-left:1em; margin-top:0}\nblockquote {margin:.3em 0 .3em 1em}\nblockquote>blockquote {margin:-.3em 0 0 2em}\nspan.word {font-weight:bold; font-size:130%; margin-left:-1em}\ni, i * {font-style:italic}\nb, b * {font-weight:bold}\n.sc, .sc * {font-variant:small-caps}\n.block, .border {border-radius:3px; padding:0 .2em; font-size:90%}\n"
MustMatchLength: yes
# ##### N.B. Do not change anything above this line #####
#
# Stage 2: N.B. You MUST keep old and new strings EXACTLY the same length
#
# Notes for changing font-family:
# 1. Pad the shorter of the old/new strings with spaces to
# keep same length for both strings (see examples below)
#
# 2. If the new font-family name (max. 29 chars) contains any spaces it
# 2. If the new font-family name (max. 25 chars) contains any spaces it
# should be wrapped in 'single quotes' (see examples 2, 3)
#
# 3. To change from Georgia to the Kobo default sans-serif font, Avenir,
# use either one of the following to achieve the same result:
# - sans-serif
# - 'Avenir Next Medium'
#
# Un-comment ONE ONLY of the following ReplaceString examples
# to change dictionary font-family from default Georgia:
# - to a different built-in font
# - to one of your sideloaded custom fonts
#
#- ReplaceString: {Offset: 54, Find: "Georgia ", Replace: "sans-serif", MustMatchLength: yes}
#- ReplaceString: {Offset: 54, Find: "Georgia ", Replace: "'Gill Sans'", MustMatchLength: yes}
#- ReplaceString: {Offset: 54, Find: "Georgia ", Replace: "'Kobo Nickel'", MustMatchLength: yes}
#- ReplaceString: {Offset: 54, Find: "Georgia ", Replace: "Bookerly", MustMatchLength: yes}
#
# Un-comment and edit next line to change font-size
#- ReplaceString: {Offset: 15, Find: "%1px", Replace: "32px", MustMatchLength: yes}
#
#- ReplaceString: {Offset: 16, Find: "%1px", Replace: "32px", MustMatchLength: yes}
# Un-comment and edit next line to change line spacing
#- ReplaceString: {Offset: 34, Find: "1.40em", Replace: "1.30em", MustMatchLength: yes}
@ -848,14 +855,6 @@ Both page turn sides go next:
# This patch could have also been done later on where the tap point is checked against different
# QRects, but that's a lot more complicated due to the use of QHash s of pointers to functions.
Increase page navigation history:
- Enabled: no
- Description: Increases the number of dots marking navigation history on the scrubber.
# Replace the immediate value for the cmp r1, #2 before the bgt to the inlined
# QVector::removeFirst() (i e. QVector::erase(start, start+1)):
- BaseAddress: "BookmarkHistoryMixin::pushBookmark(Bookmark const&)"
- ReplaceInt: {Offset: 18, Find: 2, Replace: 4} # note: you can set thr replacement to whatever you want, but it MUST be > 1 or bad things will happen
Replace adobe page numbers toggle with invert screen:
- Enabled: no
- Description: |
@ -1143,37 +1142,16 @@ Never show Kobo Plus, wishlist, and points SmartLinks:
###
Increase TOC level indentation:
- Enabled: no
- PatchGroup: TOC Indentation
- Description: |
The space indented Table of Contents levels are quite hard to see, as the
difference is almost too small to easily notice.
- ReplaceBytes:
Base: {Sym: "N3TableOfContentsWidget::setContent(Shortcover const&)"}
Offset: 198
FindH: 42 00 # left shift by 1 (i.e. multiply by 2) (LSLS r2, r0, #1)
ReplaceH: 82 00 # left shift by 2 (i.e. multiply by 4) (LSLS r2, r0, #2)
Increase TOC level indentation and fix extra indentation bug:
- Enabled: no
- PatchGroup: TOC Indentation
- Description: |
The space indented Table of Contents levels are quite hard to see, as the
difference is almost too small to easily notice. In addition, this fixes
the bug where all TOC entries are indented by 1 level extra.
- BaseAddress: {Sym: "N3TableOfContentsWidget::setContent(Shortcover const&)", Rel: 194}
# Clear out existing instructions with NOPs
- ReplaceBytes: {Offset: 0, FindH: 07 F1 0C 0B, ReplaceH: 00 20 00 20} # put string address in fp
- ReplaceBytes: {Offset: 4, FindH: 42 00, ReplaceH: 00 20} # shift level by 1 (multiply by 2) into r2
- ReplaceBytes: {Offset: 6, FindH: 4F F0 20 01, ReplaceH: 00 20 00 20} # set r1 to 0x20 (space char)
- ReplaceBytes: {Offset: 10, FindH: 58 46, ReplaceH: 00 20} # put fp in r0
# Put new instructions
- ReplaceBytes: {Offset: 0, FindH: 00 20, ReplaceH: 40 1E} # decrease level by 1
- ReplaceBytes: {Offset: 2, FindH: 00 20, ReplaceH: 82 00} # shift level by 2 (multiply by 4) into r2
- ReplaceBytes: {Offset: 4, FindH: 00 20, ReplaceH: 20 21} # set r1 to 0x20 (space char)
- ReplaceBytes: {Offset: 6, FindH: 00 20 00 20, ReplaceH: 07 F1 0C 0B} # put string address into fp
- ReplaceBytes: {Offset: 10, FindH: 00 20, ReplaceH: 58 46} # put fp in r0
# Note: The "Increase TOC level indentation" and "Increase TOC level indentation
# and fix extra indentation bug" patches are not necessary anymore in firmware
# 4.24.15672+ and have been removed since the fixes have been integrated into
# the original firmware. The default indentation is now around 3x larger than it
# was before (and it scales for each device), and the firmware will always
# subtract 1 from the depth before applying the indentation (since it's indexed
# from 1+ rather than 0+).
#
# If you are not happy with the new defaults, see the new "Change TOC level
# indentation" patch in nickel.yaml.
Allow showing info panel on random screensaver:
- Enabled: no
@ -1270,17 +1248,17 @@ Allow rotation on all devices:
- Description: |
Enables rotation on all devices. This shows a rotation icon in the status
bar, which shows a menu allowing you to choose between portrait and landscape
when pressed. This icon is only shown on rotateable views (like the reader).
when pressed. This icon is only shown on rotatable views (like the reader).
Unlike only the DeveloperSettings ForceAllowLandscape option, this patch
also makes the rotation icon show on the new reader as well.
# Always return true for ForceAllowLandscape:
- ReplaceBytes: {Offset: 0x77887E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
- ReplaceBytes: {Offset: 0x77B5EE, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
# In ReadingMenuView::ReadingMenuView, replace the value of Device::hasOrientationSensor,
# which is passed to a function to hide/show the rotate icon:
- ReplaceBytes: {Offset: 0xBA6B2C, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
- ReplaceBytes: {Offset: 0xBA8564, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
# Also fix sizing of popup by doing the same in RotatePopup::RotatePopup, but
# note that this will make the Automatic option show too (and do nothing):
- ReplaceBytes: {Offset: 0xBC340E, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
- ReplaceBytes: {Offset: 0xBC5726, FindInstBLX: {SymPLT: "Device::hasOrientationSensor() const"}, ReplaceH: 4F F0 01 00}
Don't uppercase header/footer text:
- Enabled: no
@ -1404,7 +1382,7 @@ Customize ComfortLight settings:
# In an unnamed subroutine two layers into FrontLightPopupController::loadView
# (find it by going back from QTime::addSecs), the times for the dropdown are
# generated into a QVector<QPair<QString, QTime>> with a simple loop.
- BaseAddress: 0xAEA5C0 # find the base of the unnamed subroutine with the x-ref to _ZN5QTimeC1Eiiii
- BaseAddress: 0xAEC260 # find the base of the unnamed subroutine with the x-ref to _ZN5QTimeC1Eiiii
#
# Change the initial hour / first bedtime dropdown item passed to the QTime
# constructor (mov r1, #21):
@ -1479,7 +1457,7 @@ FeatureSettings - ExportHighlights:
DeveloperSettings - AutoUsbGadget:
- Enabled: no
- Description: Automatically enable USB Storage mode when connected.
- ReplaceBytes: {Offset: 0x77891E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
- ReplaceBytes: {Offset: 0x77B68E, FindInstBLX: {SymPLT: "QVariant::toBool() const"}, ReplaceH: 4F F0 01 00}
PowerSettings - UnlockEnabled:
- Enabled: no

View File

@ -187,24 +187,25 @@ Increase library cover size:
Increase the cover thumbnail size in My Books main book list
See screenshots - https://www.mobileread.com/forums/showpost.php?p=3241532&postcount=82
fw 4.17 - rewritten by jackie_w to replace oren64's patch
fw 4.24 - updated patch "width" values to maintain aspect ratio of original value
- FindZlib: "#coverPixmapView"
- ReplaceZlibGroup:
Replacements:
# coverPixmapView increase cover thumbnail width/height:
# Touch/Mini (Trilogy)
- {Find: "width: 60px;", Replace: "width: 85px;"}
- {Find: "width: 60px;", Replace: "width: 66px;"}
- {Find: "height: 90px;", Replace: "height: 100px;"}
# Glo/Aura/Aura2 (Phoenix)
- {Find: "width: 70px;", Replace: "width: 100px;"}
- {Find: "width: 70px;", Replace: "width: 82px;"}
- {Find: "height: 110px;", Replace: "height: 130px;"}
# AuraHD/H2O/H2O2/GloHD/ClaraHD (Dragon)
- {Find: "width: 108px;", Replace: "width: 140px;"}
- {Find: "width: 108px;", Replace: "width: 122px;"}
- {Find: "height: 168px;", Replace: "height: 190px;"}
# AuraOne/Forma (Daylight)
- {Find: "width: 140px;", Replace: "width: 190px;"}
- {Find: "width: 140px;", Replace: "width: 164px;"}
- {Find: "height: 218px;", Replace: "height: 255px;"}
# LibraH2O (Storm)
- {Find: "width: 126px;", Replace: "width: 165px;"}
- {Find: "width: 126px;", Replace: "width: 144px;"}
- {Find: "height: 196px;", Replace: "height: 225px;"}
Custom collection/author header title font:
@ -443,7 +444,8 @@ Customise Header back button:
Series list increase cover thumbnails:
- Enabled: no
- Description: |
Series list view (not Series cover view). Increase cover thumbnail size.
Series list view (not Series cover view). Increase cover thumbnail size.
fw 4.24 - updated patch "width" values to maintain aspect ratio of original value
- FindZlib: "#seriesCoverPack"
- ReplaceZlibGroup:
Replacements:
@ -468,19 +470,19 @@ Series list increase cover thumbnails:
#
# Part 2: #seriesCoverPack - Increase cover thumbnail size
# Touch/Mini
- {Find: "width: 60px;", Replace: "width: 85px;"}
- {Find: "width: 60px;", Replace: "width: 65px;"}
- {Find: "height: 94px;", Replace: "height: 102px;"}
# Glo/Aura6"/Aurav2
- {Find: "width: 70px;", Replace: "width: 100px;"}
- {Find: "width: 70px;", Replace: "width: 83px;"}
- {Find: "height: 115px;", Replace: "height: 137px;"}
# AuraHD/H2O/H2Ov2/GloHD/ClaraHD
- {Find: "width: 108px;", Replace: "width: 141px;"}
- {Find: "width: 108px;", Replace: "width: 120px;"}
- {Find: "height: 175px;", Replace: "height: 195px;"}
# AuraOne/Forma
- {Find: "width: 140px;", Replace: "width: 190px;"}
- {Find: "width: 140px;", Replace: "width: 164px;"}
- {Find: "height: 222px;", Replace: "height: 260px;"}
# LibraH2O
- {Find: "width: 126px;", Replace: "width: 165px;"}
- {Find: "width: 126px;", Replace: "width: 141px;"}
- {Find: "height: 205px;", Replace: "height: 229px;"}
#
# Part 3: All models: #hBooks - Move bookcount up & away from horizontal gridline
@ -517,7 +519,7 @@ New home screen subtitle custom font:
- Description: |
Increase subtitle font size, font color black. Works best when used
with with patch `New home screen increasing cover size`
- BaseAddress: 0x14BA095 # FindZlib: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}"
- BaseAddress: 0x14BB79B # FindZlib: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}"
- ReplaceZlib: {Find: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}", Replace: "MetaDataLabel {\n color: #000000;\n qproperty-indent: 0;\n}"}
- ReplaceZlib:
Find: "MetaDataLabel[qApp_deviceIsTrilogy=true] {\n font-size: 13px;\n}"
@ -532,7 +534,7 @@ New home screen subtitle custom font:
Find: "MetaDataLabel[qApp_deviceIsDaylight=true] {\n font-size: 31px;\n}"
Replace: "MetaDataLabel[qApp_deviceIsDaylight=true] {\n font-size: 34px;\n}"
# duplicate
- BaseAddress: 0x14C3975
- BaseAddress: 0x14BE7DD
- ReplaceZlib: {Find: "MetaDataLabel {\n color: #666666;\n qproperty-indent: 0;\n}", Replace: "MetaDataLabel {\n color: #000000;\n qproperty-indent: 0;\n}"}
- ReplaceZlib:
Find: "MetaDataLabel[qApp_deviceIsTrilogy=true] {\n font-size: 13px;\n}"
@ -590,11 +592,11 @@ Remove forgot pin button from lock screen:
Removes the Forgot PIN -> Sign Out button from the lock screen.
If this is enabled and you forget your pin, you will need to
hard reset your Kobo.
- BaseAddress: 0x14AE879
- BaseAddress: 0x14B4879
- ReplaceZlib:
Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n font-size: 26px;\n}"
Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"
- BaseAddress: 0x14B5543
- BaseAddress: 0x14AB23F
- ReplaceZlib:
Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n font-size: 26px;\n}"
Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"
@ -605,7 +607,7 @@ Increase size of kepub chapter progress chart:
- FindZlib: "#chapterSizes"
- ReplaceZlibGroup:
Replacements:
# Top padding is aready set to 15px, 25px, 33px, vertical aligned to middle.
# Top padding is already set to 15px, 25px, 33px, vertical aligned to middle.
# Progress chart bar sizes:
- Find: "#chapterSizes[qApp_deviceIsTrilogy=true] {\n max-height: 56px;\n min-height: 56px;\n}"
Replace: "#chapterSizes[qApp_deviceIsTrilogy=true] {\n max-height: 90px;\n min-height: 90px;\n min-width: 385px;\n max-width: 385px;\n}"
@ -615,3 +617,19 @@ Increase size of kepub chapter progress chart:
Replace: "#chapterSizes[qApp_deviceIsDragon=true] {\n max-height: 170px;\n min-height: 170px;\n min-width: 678px;\n max-width: 678px;\n}"
- Find: "#chapterSizes[qApp_deviceIsDaylight=true] {\n max-height: 130px;\n min-height: 130px;\n}"
Replace: "#chapterSizes[qApp_deviceIsDaylight=true] {\n max-height: 215px;\n min-height: 215px;\n min-width: 865px;\n max-width: 865px;\n}"
Change TOC level indentation:
- Enabled: no
- Description: |
Changes the size of indentation for each level in the TOC. This patch
replaces the old "Increase TOC level indentation" patch from firmware
versions before 4.24.15672 (see the note in libnickel.so.1.0.0.yaml).
- FindZlib: "qproperty-indentUnit"
- ReplaceZlibGroup:
Replacements:
# Change the replacement values to your desired width (I've made it half the default width as an example).
- {Find: "qproperty-indentUnit: 30;", Replace: "qproperty-indentUnit: 15;"} # trilogy
- {Find: "qproperty-indentUnit: 38;", Replace: "qproperty-indentUnit: 19;"} # phoenix
- {Find: "qproperty-indentUnit: 58;", Replace: "qproperty-indentUnit: 29;"} # dragon
- {Find: "qproperty-indentUnit: 72;", Replace: "qproperty-indentUnit: 36;"} # storm
- {Find: "qproperty-indentUnit: 76;", Replace: "qproperty-indentUnit: 38;"} # daylight