Patches for 4.31.19086 #104
Assignees
Labels
firmware release
Category: Updating patches for a new release.
Comments
|
I'm planning to add the beta patch from #93, Also it's midnight here so not much time for me to do any testing tonight. I will have time tomorrow, though. Is there some reason why your firmware page doesn't have a link for the Mark9 fw for the Libra2? |
OK, I'll wait until tomorrow. It'll be in the versions section as soon as I take a quick look at libnickel and extract nickel's resources (probably within the next 30-60 minutes).
It doesn't appear to have been released for the Libra2 to any of the affiliates. |
pgaskin
added a commit
to pgaskin/kobopatch-testdata
that referenced
this issue
Jan 21, 2022
|
Resource extraction: ./qrc2zip --output "nickel.19086.qInitResources_resources.zip" --recursive --verbose "nickel" 1 $((0x12de920 - 0x0010000)) $((0x00271f0 - 0x0010000)) $((0x12de428 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19086.qInitResources_translations.zip" --recursive --verbose "nickel" 1 $((0x1675568 - 0x0010000)) $((0x12ded10 - 0x0010000)) $((0x16752e0 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19086.qInitResources_styles.zip" --recursive --verbose "nickel" 1 $((0x1695328 - 0x0010000)) $((0x1675680 - 0x0010000)) $((0x1692840 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }
./qrc2zip --output "nickel.19086.qInitResources_certificates.zip" --recursive --verbose "nickel" 1 $((0x16bc900 - 0x0010000)) $((0x1695f30 - 0x0010000)) $((0x16bb8b0 - 0x0010000)) || { echo "Error: qrc2zip failed." 1>&2; exit 1; }Output$ git diff --no-index 18838 19086diff --git a/19086/daylight.rcc/images/home/activity.png b/19086/daylight.rcc/images/home/activity.png
new file mode 100644
index 0000000..121ca2d
Binary files /dev/null and b/19086/daylight.rcc/images/home/activity.png differ
diff --git a/19086/daylight.rcc/images/home/activity_active.png b/19086/daylight.rcc/images/home/activity_active.png
new file mode 100644
index 0000000..4b1f182
Binary files /dev/null and b/19086/daylight.rcc/images/home/activity_active.png differ
diff --git a/19086/default.rcc/images/cobranding/fnac_small_sleep.svg b/19086/default.rcc/images/cobranding/fnac_small_sleep.svg
new file mode 100644
index 0000000..7f6779f
--- /dev/null
+++ b/19086/default.rcc/images/cobranding/fnac_small_sleep.svg
@@ -0,0 +1 @@
+<svg width="360" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M207.736 21.65c-2.03.572-2.855 1.398-3.172 1.842v-1.778H193.84c-.318-3.492 3.236-3.365 3.236-3.365 3.49-.127 3.617 2.16 3.617 2.16h3.871c0-4.064-5.585-4.509-5.585-4.509-5.457-.444-7.36 1.397-7.36 1.397-1.714 1.46-1.65 3.81-1.65 4.317h-3.363v2.667h3.363v10.476h3.871V24.381h6.789v10.476h3.871v-7.365c.19-1.27 1.015-2.984 4.061-3.238 0 0 4.379-.698 4.95 3.238v7.302h3.871v-8.826c-.825-6.285-9.646-4.317-9.646-4.317Zm39.787 8.89c-.571 1.27-1.777 1.968-3.934 1.905 0 0-4.823.317-4.95-4.064v-.127c.19-4.38 4.95-4.063 4.95-4.063 2.157 0 3.299.698 3.934 1.904h4.188c-.127-.634-.698-1.587-.698-1.587-.952-1.524-3.173-3.238-8.376-2.92-1.396.063-2.538.253-3.49.57-1.714.636-4.569 2.477-4.506 5.906v.444c-.063 3.492 2.792 5.27 4.506 5.905.952.317 2.094.508 3.49.571 3.49.19 5.647-.508 6.916-1.397 0 0 1.904-1.396 2.221-3.047h-4.251Zm-17.958-8.826c-4.252-.698-6.726 0-6.79 0-4.188.953-4.188 4.318-4.188 4.318h3.998s.063-2.603 4.251-2.286c0 0 3.046.127 3.237 1.524 0 0 1.015 1.65-3.237 1.905-4.251.254-9.328.19-8.82 4.127 0 0-.127 3.81 6.853 3.682 0 0 3.744.127 5.267-1.778v.064l.127 1.46h3.871l-.127-7.81c.317-4.57-4.442-5.206-4.442-5.206Zm.063 9.588c-.951 1.206-2.157 1.524-3.49 1.587-1.205.063-3.807.254-3.807-1.714-.063-1.841 3.109-1.778 5.203-1.905 0 0 2.094 0 2.539-.571 0 0 0-.064.063 0 0 .063.317 1.523-.508 2.603Zm-54.444 3.492h-.952V29.65h.952v1.777c.254-.38.698-.698 1.332-.698 1.143 0 2.094.889 2.094 2.095a2.072 2.072 0 0 1-2.094 2.095c-.634 0-1.078-.38-1.332-.761v.635Zm1.269-.762c.698 0 1.206-.572 1.206-1.207 0-.635-.571-1.206-1.206-1.206-.698 0-1.206.571-1.206 1.206-.063.699.508 1.207 1.206 1.207ZM180.958 36h-1.016l.508-1.27-1.523-3.873h1.015l1.016 2.667 1.015-2.667h1.015L180.958 36Zm-27.856-9.143c0-5.143 2.411-8.19 6.916-8.19 4.506 0 6.917 3.047 6.917 8.19 0 5.143-2.411 8.19-6.917 8.19-4.505 0-6.916-3.047-6.916-8.19Zm6.916 5.651c2.602 0 3.046-2.667 3.046-5.65 0-2.922-.381-5.652-3.046-5.652-2.601 0-3.046 2.667-3.046 5.651 0 2.92.381 5.651 3.046 5.651ZM109 12h3.68v13.016l5.077-5.968h4.378l-5.774 6.793 6.345 8.89h-4.378l-5.584-7.937h-.064v7.873H109V12Z" fill="#000"/><path d="M122.262 26.857c0-5.143 2.411-8.19 6.917-8.19 4.505 0 6.916 3.047 6.916 8.19 0 5.143-2.411 8.19-6.916 8.19-4.506 0-6.917-3.047-6.917-8.19Zm6.917 5.651c2.601 0 3.045-2.667 3.045-5.65 0-2.922-.38-5.652-3.045-5.652s-3.046 2.667-3.046 5.651c.063 2.92.444 5.651 3.046 5.651Zm12.627-11.619c.508-.762 1.65-2.222 4.062-2.222 3.743 0 5.393 3.174 5.393 8.19 0 4.381-1.523 8.19-6.599 8.19-4.125 0-6.536-2.349-6.536-6.983V12h3.68v8.889Zm2.856 11.619c2.348 0 2.728-3.048 2.728-5.65 0-2.858-.317-5.842-2.728-5.842-2.221 0-2.919 3.238-2.919 5.841 0 3.937.571 5.65 2.919 5.65Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/19086/dragon.rcc/images/home/activity.png b/19086/dragon.rcc/images/home/activity.png
new file mode 100644
index 0000000..fada7cd
Binary files /dev/null and b/19086/dragon.rcc/images/home/activity.png differ
diff --git a/19086/dragon.rcc/images/home/activity_active.png b/19086/dragon.rcc/images/home/activity_active.png
new file mode 100644
index 0000000..22dde17
Binary files /dev/null and b/19086/dragon.rcc/images/home/activity_active.png differ
diff --git a/19086/phoenix.rcc/images/home/activity.png b/19086/phoenix.rcc/images/home/activity.png
new file mode 100644
index 0000000..5ce3722
Binary files /dev/null and b/19086/phoenix.rcc/images/home/activity.png differ
diff --git a/19086/phoenix.rcc/images/home/activity_active.png b/19086/phoenix.rcc/images/home/activity_active.png
new file mode 100644
index 0000000..e71d8e5
Binary files /dev/null and b/19086/phoenix.rcc/images/home/activity_active.png differ
diff --git a/18838/qss/InlineDictionaryView.qss b/19086/qss/InlineDictionaryView.qss
index 43a35a5..d86aede 100644
--- a/18838/qss/InlineDictionaryView.qss
+++ b/19086/qss/InlineDictionaryView.qss
@@ -454,6 +454,28 @@ MenuTextItem #menuTextItemLabel:disabled {
#language[qApp_deviceIsDaylight=true] {
max-height: 104px;
}
+#label[isSimplifiedChinese=true] {
+ font-family: Sans-SerifZH-Simplified;
+}
+#label[isSimplifiedChinese=false] {
+ font-family: Georgia;
+}
+#label[isSimplifiedChinese=false][localeName="ja"] {
+ font-family: Sans-SerifJP, sans-serif;
+ font-style: normal;
+}
+#label[isSimplifiedChinese=false][localeName="zh"] {
+ font-family: Sans-SerifZH-Simplified, sans-serif;
+ font-style: normal;
+}
+#label[isSimplifiedChinese=false][localeName="zh-HK"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
+#label[isSimplifiedChinese=false][localeName="zh-TW"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
#mainContainer {
margin: 14px;
}
diff --git a/18838/qss/ManageDictionariesWidget.qss b/19086/qss/ManageDictionariesWidget.qss
index 3ebf1fd..161bfa8 100644
--- a/18838/qss/ManageDictionariesWidget.qss
+++ b/19086/qss/ManageDictionariesWidget.qss
@@ -22,6 +22,9 @@
#saveChangesLayout[qApp_deviceIsDaylight=true] {
qproperty-rightMargin: 26;
}
+#title[isSimplifiedChinese=true] {
+ font-family: Sans-SerifZH-Simplified;
+}
QCheckBox {
qproperty-highQualityInvert: true;
}
diff --git a/18838/qss/N3SettingsDeveloperOptionsView.qss b/19086/qss/N3SettingsDeveloperOptionsView.qss
index 0d4101b..e58e5d3 100644
--- a/18838/qss/N3SettingsDeveloperOptionsView.qss
+++ b/19086/qss/N3SettingsDeveloperOptionsView.qss
@@ -8,7 +8,8 @@
#physicalKeyActionContainer,
#cpu1Container,
#cpu2Container,
-#cpu3Container {
+#cpu3Container,
+#stylusEnabledContainer {
border-bottom: 1px solid black;
}
#iinkLoggingContainer {
diff --git a/19086/qss/SkipWifiSetupDialog.qss b/19086/qss/SkipWifiSetupDialog.qss
new file mode 100644
index 0000000..b0ad2be
--- /dev/null
+++ b/19086/qss/SkipWifiSetupDialog.qss
@@ -0,0 +1,138 @@
+SkipWifiSetupDialog {
+ background-color: transparent;
+}
+HeaderMediumLabel {
+ padding: 0px;
+ font-family: Georgia;
+ font-style: normal;
+}
+HeaderMediumLabel[localeName="ja"] {
+ font-family: Sans-SerifJP, sans-serif;
+ font-style: normal;
+}
+HeaderMediumLabel[localeName="zh"] {
+ font-family: Sans-SerifZH-Simplified, sans-serif;
+ font-style: normal;
+}
+HeaderMediumLabel[localeName="zh-HK"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
+HeaderMediumLabel[localeName="zh-TW"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
+HeaderMediumLabel[localeName="ja"] {
+ qproperty-leading: 5;
+}
+HeaderMediumLabel[qApp_deviceIsTrilogy=true] {
+ padding-bottom: 12px;
+}
+HeaderMediumLabel[qApp_deviceIsPhoenix=true] {
+ padding-bottom: 16px;
+}
+HeaderMediumLabel[qApp_deviceIsDragon=true] {
+ padding-bottom: 22px;
+}
+HeaderMediumLabel[qApp_deviceIsDaylight=true] {
+ padding-bottom: 28px;
+}
+HeaderMediumLabel[qApp_deviceIsStorm=true] {
+ padding-bottom: 25px;
+}
+GenericContainerWidget[qApp_deviceIsTrilogy=true] {
+ qproperty-bottomMargin: 24px;
+}
+GenericContainerWidget[qApp_deviceIsPhoenix=true] {
+ qproperty-bottomMargin: 32px;
+}
+GenericContainerWidget[qApp_deviceIsDragon=true] {
+ qproperty-bottomMargin: 44px;
+}
+GenericContainerWidget[qApp_deviceIsDaylight=true] {
+ qproperty-bottomMargin: 56px;
+}
+GenericContainerWidget[qApp_deviceIsStorm=true] {
+ qproperty-bottomMargin: 50px;
+}
+N3ButtonLabel {
+ qproperty-primaryButton: true;
+}
+#header,
+#title,
+#text {
+ padding: 0px;
+ font-family: Georgia;
+ font-style: normal;
+}
+#header[localeName="ja"],
+#title[localeName="ja"],
+#text[localeName="ja"] {
+ font-family: Sans-SerifJP, sans-serif;
+ font-style: normal;
+}
+#header[localeName="zh"],
+#title[localeName="zh"],
+#text[localeName="zh"] {
+ font-family: Sans-SerifZH-Simplified, sans-serif;
+ font-style: normal;
+}
+#header[localeName="zh-HK"],
+#title[localeName="zh-HK"],
+#text[localeName="zh-HK"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
+#header[localeName="zh-TW"],
+#title[localeName="zh-TW"],
+#text[localeName="zh-TW"] {
+ font-family: Sans-SerifZH-Traditional, sans-serif;
+ font-style: normal;
+}
+#header[localeName="ja"],
+#title[localeName="ja"],
+#text[localeName="ja"] {
+ qproperty-leading: 5;
+}
+#title[qApp_deviceIsTrilogy=true] {
+ margin-bottom: 15px;
+}
+#title[qApp_deviceIsPhoenix=true] {
+ margin-bottom: 20px;
+}
+#title[qApp_deviceIsDragon=true] {
+ margin-bottom: 28px;
+}
+#title[qApp_deviceIsDaylight=true] {
+ margin-bottom: 36px;
+}
+#frame[qApp_deviceIsTrilogy=true] {
+ spacing: 12px;
+}
+#frame[qApp_deviceIsPhoenix=true] {
+ spacing: 16px;
+}
+#frame[qApp_deviceIsDragon=true] {
+ spacing: 22px;
+}
+#frame[qApp_deviceIsDaylight=true] {
+ spacing: 28px;
+}
+#frame[qApp_deviceIsStorm=true] {
+ spacing: 25px;
+}
+#frame[qApp_deviceIsTrilogy=true] {
+ padding: 30px;
+}
+#frame[qApp_deviceIsPhoenix=true] {
+ padding: 40px;
+}
+#frame[qApp_deviceIsDragon=true] {
+ padding: 50px;
+}
+#frame[qApp_deviceIsStorm=true] {
+ padding: 58px;
+}
+#frame[qApp_deviceIsDaylight=true] {
+ padding: 65px;
+}
diff --git a/18838/qss/SyncMenuView.qss b/19086/qss/SyncMenuView.qss
index d23d792..fc8b2af 100644
--- a/18838/qss/SyncMenuView.qss
+++ b/19086/qss/SyncMenuView.qss
@@ -7,36 +7,26 @@ QLabel {
#SyncMenuView[qApp_deviceIsTrilogy=true] {
max-width: 342px;
min-width: 342px;
- max-height: 227px;
- min-height: 227px;
qproperty-minScreenPadding: 10;
}
#SyncMenuView[qApp_deviceIsPhoenix=true] {
max-width: 428px;
min-width: 428px;
- max-height: 286px;
- min-height: 286px;
qproperty-minScreenPadding: 20;
}
#SyncMenuView[qApp_deviceIsDragon=true] {
max-width: 536px;
min-width: 536px;
- max-height: 358px;
- min-height: 358px;
qproperty-minScreenPadding: 30;
}
#SyncMenuView[qApp_deviceIsStorm=true] {
max-width: 625px;
min-width: 625px;
- max-height: 418px;
- min-height: 418px;
qproperty-minScreenPadding: 35;
}
#SyncMenuView[qApp_deviceIsDaylight=true] {
max-width: 697px;
min-width: 697px;
- max-height: 458px;
- min-height: 458px;
qproperty-minScreenPadding: 42;
}
#SyncMenuView[qApp_isFontScaleLarge=true][qApp_deviceIsTrilogy=true] {
@@ -59,6 +49,46 @@ QLabel {
max-height: 572px;
min-height: 572px;
}
+#SyncMenuView[isDescriptionSingleLine=true][qApp_deviceIsTrilogy=true] {
+ max-height: 227px;
+ min-height: 227px;
+}
+#SyncMenuView[isDescriptionSingleLine=true][qApp_deviceIsPhoenix=true] {
+ max-height: 286px;
+ min-height: 286px;
+}
+#SyncMenuView[isDescriptionSingleLine=true][qApp_deviceIsDragon=true] {
+ max-height: 358px;
+ min-height: 358px;
+}
+#SyncMenuView[isDescriptionSingleLine=true][qApp_deviceIsStorm=true] {
+ max-height: 418px;
+ min-height: 418px;
+}
+#SyncMenuView[isDescriptionSingleLine=true][qApp_deviceIsDaylight=true] {
+ max-height: 458px;
+ min-height: 458px;
+}
+#SyncMenuView[isDescriptionSingleLine=false][qApp_deviceIsTrilogy=true] {
+ max-height: 294px;
+ min-height: 294px;
+}
+#SyncMenuView[isDescriptionSingleLine=false][qApp_deviceIsPhoenix=true] {
+ max-height: 370px;
+ min-height: 370px;
+}
+#SyncMenuView[isDescriptionSingleLine=false][qApp_deviceIsDragon=true] {
+ max-height: 456px;
+ min-height: 456px;
+}
+#SyncMenuView[isDescriptionSingleLine=false][qApp_deviceIsStorm=true] {
+ max-height: 520px;
+ min-height: 520px;
+}
+#SyncMenuView[isDescriptionSingleLine=false][qApp_deviceIsDaylight=true] {
+ max-height: 593px;
+ min-height: 593px;
+}
#contentContainer[qApp_deviceIsTrilogy=true] {
qproperty-spacing: 12;
qproperty-topMargin: 20;
@@ -196,7 +226,8 @@ QLabel {
background-color: #000000;
}
#cancelButton,
-#syncButton {
+#syncButton,
+#signInButton {
background-color: #D9D9D9;
qproperty-alignment: AlignCenter;
}
diff --git a/19086/storm.rcc/images/home/activity.png b/19086/storm.rcc/images/home/activity.png
new file mode 100644
index 0000000..f8c1455
Binary files /dev/null and b/19086/storm.rcc/images/home/activity.png differ
diff --git a/19086/storm.rcc/images/home/activity_active.png b/19086/storm.rcc/images/home/activity_active.png
new file mode 100644
index 0000000..f1ad66b
Binary files /dev/null and b/19086/storm.rcc/images/home/activity_active.png differ
...https://gist.github.com/pgaskin/ff94754a86f330daaa6624e4b9ff7693 https://krc.storage.pgaskin.net/nickel.19086.qInitResources_certificates.zip |
The usual, but also |
pgaskin
added a commit
that referenced
this issue
Jan 21, 2022
- Customize ComfortLight settings will need to be looked at more closely and updated later.
pgaskin
added a commit
that referenced
this issue
Jan 21, 2022
|
@jackiew, I've pushed most of the patches. I may need to rewrite |
|
@pgaskin, I've added the new patch From your Error report it doesn't look like any of my patches need changing so I'll leave it to you to decide when to do the release, with or without |
|
Thanks for taking the time to get this done tonight, @jackiew1. I will most likely do the release tonight after I deal with the NickelMenu regression and backport your patch updates from November. I will also update the ComfortLight patch for the release too as long as the logic is mostly the same. |
|
Released: |
$ git diff --no-index src/versions/{4.30.18838,4.31.19086}diff --git a/src/versions/4.30.18838/libadobe.so.yaml/pgaskin.yaml b/src/versions/4.31.19086/libadobe.so.yaml/pgaskin.yaml
index 78af60a..81032e6 100644
--- a/src/versions/4.30.18838/libadobe.so.yaml/pgaskin.yaml
+++ b/src/versions/4.31.19086/libadobe.so.yaml/pgaskin.yaml
@@ -6,5 +6,5 @@ Remove PDF map widget shown during panning:
- BaseAddress: {Sym: "N3AdobeReader::showMapWidget()"}
# tail: N3AdobeReader::updatePanningMap() -> N3AdobeReader::hideMapWidget()
# TODO: figure out what broke the plt parsing in kobopatch for libadobe in 18730+
- - ReplaceBytes: {Offset: 80, FindInstBW: 0x1BD1C, ReplaceInstBW: 0x1B08C}
- - ReplaceBytes: {Offset: 192, FindInstBW: 0x1BD1C, ReplaceInstBW: 0x1B08C}
+ - ReplaceBytes: {Offset: 80, FindInstBW: 0x1BDE8, ReplaceInstBW: 0x1B11C}
+ - ReplaceBytes: {Offset: 192, FindInstBW: 0x1BDE8, ReplaceInstBW: 0x1B11C}
diff --git a/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/jackie_w.yaml b/src/versions/4.31.19086/libnickel.so.1.0.0.yaml/jackie_w.yaml
index 2e9858d..876338b 100644
--- a/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/jackie_w.yaml
+++ b/src/versions/4.31.19086/libnickel.so.1.0.0.yaml/jackie_w.yaml
@@ -121,3 +121,25 @@ KePub stylesheet additions - optimizeSpeed:
# *** Don't change anything in the 4 ReplaceString lines above ***
#
- FindReplaceString: {Find: "/*********************************/", Replace: "body{text-rendering:optimizeSpeed }", MustMatchLength: yes}
+
+KePub stylesheet additions - optimizeLegibility:
+ - Enabled: no
+ - PatchGroup: KePub stylesheet additions alternatives
+ - Description: |
+ Enables ligatures/kerning in KePubs, but may cause some additional
+ rendering problems for fully justified text.
+ N.B. May have unexpected side effects when highlighting text in languages
+ which display vertical text, e.g. Chinese/Japanese
+ - FindBaseAddressString: ".KBSearchResult, .KBAnnotation, .KBHighlighting {"
+ # *** Don't change anything in the 4 ReplaceString lines below ***
+ # Create some room to add the extra CSS
+ - ReplaceString: {Find: ".KBSearchResult, .KBAnnotation, .KBHighlighting { font-size: 100% !important; -webkit-text-combine: inherit !important; }\n", Replace: ".KBSearchResult,.KBAnnotation,.KBHighlighting{font-size:100%!important;-webkit-text-combine:inherit!important}.KBAnnotatio", MustMatchLength: yes}
+ - ReplaceString: {Offset: 122, Find: ".KBAnnotation[writingMode=\"horizontal-tb\"] { border-bottom: 2px solid black !important; }\n", Replace: "n[writingMode=\"horizontal-tb\"]{border-bottom:2px solid #000!important}.KBAnnotation[writin", MustMatchLength: yes}
+ - ReplaceString: {Offset: 212, Find: ".KBAnnotation[writingMode=\"vertical-rl\"] { border-right: 2px solid black !important; }\n", Replace: "gMode=\"vertical-rl\"]{border-right:2px solid #000!important}.KBAnnotation[writingMode=\"v", MustMatchLength: yes}
+ - ReplaceString: {Offset: 299, Find: ".KBAnnotation[writingMode=\"vertical-lr\"] { border-left: 2px solid black !important; }", Replace: "ertical-lr\"]{border-left:2px solid #000}/*******************************************/", MustMatchLength: yes}
+ # *** Don't change anything in the 4 ReplaceString lines above ***
+ #
+ - FindReplaceString:
+ Find: "/*******************************************/"
+ Replace: "body{text-rendering:optimizeLegibility }"
+ MustMatchLength: yes
diff --git a/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/pgaskin.yaml b/src/versions/4.31.19086/libnickel.so.1.0.0.yaml/pgaskin.yaml
index 6e08421..facaeff 100644
--- a/src/versions/4.30.18838/libnickel.so.1.0.0.yaml/pgaskin.yaml
+++ b/src/versions/4.31.19086/libnickel.so.1.0.0.yaml/pgaskin.yaml
@@ -13,7 +13,7 @@ Both page turn sides go next:
- Enabled: no
- Description: Make both page turn sides go next in the reader.
# In ReadingView::processTap(TapGesture*) where the page direction is checked:
- - BaseAddress: {Sym: "ReadingView::processTap(TapGesture*)", Rel: 652}
+ - BaseAddress: {Sym: "ReadingView::processTap(TapGesture*)", Rel: 560}
- ReplaceBytes: {Offset: 0, FindInstBLX: {SymPLT: "ReadingView::leftToRightPageProgressDirection() const"}, CheckOnly: true}
# nop the branch for checking if left-to-right (so it always runs the swap of back/forward)
- ReplaceBytes: {Offset: 4, FindH: 18 B9, ReplaceInstNOP: true}
@@ -41,7 +41,7 @@ Replace adobe page numbers toggle with invert screen:
See https://github.com/pgaskin/NickelMenu/issues/111 for more information.
# Settings page
- BaseAddress: "N3SettingsReadingView::N3SettingsReadingView(QWidget*)"
- - ReplaceBytes: {Offset: 914, FindInstBLX: {SymPLT: "ReadingSettings::getShowAdobePageNumbers()"}, ReplaceInstBLX: {SymPLT: "FeatureSettings::invertScreen()"}}
+ - ReplaceBytes: {Offset: 900, FindInstBLX: {SymPLT: "ReadingSettings::getShowAdobePageNumbers()"}, ReplaceInstBLX: {SymPLT: "FeatureSettings::invertScreen()"}}
# Settings page controller
- BaseAddress: {Sym: "N3SettingsReadingController::showAdobePageNumbersToggled()"}
- ReplaceBytes: {Offset: 74, FindInstBLX: {SymPLT: "ReadingSettings::getShowAdobePageNumbers()"}, ReplaceInstBLX: {SymPLT: "FeatureSettings::invertScreen()"}}
@@ -542,7 +542,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: 0xC104A0 # find the base of the unnamed subroutine with the x-ref to _ZN5QTimeC1Eiiii
+ - BaseAddress: 0xCB22A4 # 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):
@@ -571,21 +571,21 @@ Customize ComfortLight settings:
# Change the sunset time (the transition to a warmer temperature starts here
# and transitions until the bedtime chosen) (this should be 1-3 hours before
# the minimum bedtime from the first replacement above) (mov r1, #18):
- - ReplaceInt: {Offset: 158, Find: 18, Replace: 16} # 18:00 (9PM-3=6PM) -> 16:00 (5PM-1=4PM)
+ - ReplaceInt: {Offset: 228, Find: 18, Replace: 16} # 18:00 (9PM-3=6PM) -> 16:00 (5PM-1=4PM)
#
# Change the time for the sunset timer to fire at (this is passed to a QTime
# constructor which is passed to PowerTime::fireAt) (mov r1, #18):
- - ReplaceInt: {Offset: 438, Find: 18, Replace: 16} # should match the sunset time above
+ - ReplaceInt: {Offset: 508, Find: 18, Replace: 16} # should match the sunset time above
#
# Optional: Change the sunrise start time (the transition back to a cooler
# temperature starts here) (this should be sometime after the last bedtime,
# but before the sunset time) (mov r1, #5):
- - ReplaceInt: {Offset: 192, Find: 5, Replace: 5} # 5AM
+ - ReplaceInt: {Offset: 262, Find: 5, Replace: 5} # 5AM
#
# Optional: Change the sunrise end time (the transition back to a cooler
# temperature ends here) (this should be 1-3 hours after the sunrise start but
# before the sunset time or bad things will happen with negative values) (mov r1, #7):
- - ReplaceInt: {Offset: 138, Find: 7, Replace: 7} # 5AM+2=7AM
+ - ReplaceInt: {Offset: 208, Find: 7, Replace: 7} # 5AM+2=7AM
# The following patches allow you to enable a config file option with a patch.
diff --git a/src/versions/4.30.18838/nickel.yaml/pgaskin.yaml b/src/versions/4.31.19086/nickel.yaml/pgaskin.yaml
index d24eaec..21b58fd 100644
--- a/src/versions/4.30.18838/nickel.yaml/pgaskin.yaml
+++ b/src/versions/4.31.19086/nickel.yaml/pgaskin.yaml
@@ -15,7 +15,7 @@ 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: 0x1683BDA # qss/PinCodeInputDialog.qss
+ - BaseAddress: 0x1673B62 # qss/PinCodeInputDialog.qss
- ReplaceZlib:
Find: "#lblForgotPin[qApp_deviceIsDragon=true],\n#lblSignOut[qApp_deviceIsDragon=true] {\n font-size: 26px;\n}"
Replace: "#lblForgotPin,#lblSignOut{qproperty-visible:false;}"
@@ -23,7 +23,7 @@ Remove forgot pin button from lock screen:
Increase size of kepub chapter progress chart:
- Enabled: no
- Description: Originally by oren64, rewritten for 4.16.13337 by pgaskin (geek1011).
- - BaseAddress: 0x167D310 # qss/ReadingMenuStatsView.qss
+ - BaseAddress: 0x1667475 # qss/ReadingMenuStatsView.qss
- ReplaceZlibGroup:
Replacements:
# Top padding is already set to 15px, 25px, 33px, vertical aligned to middle. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Customize ComfortLight settings(@shermp)KePub stylesheet additions - optimizeLegibility(@jackiew1)The text was updated successfully, but these errors were encountered: