Skip to content

Custom Prune OptionButton#245

Merged
hebasto merged 8 commits into
bitcoin-core:mainfrom
jarolrod:custom-prune-setting
Mar 6, 2023
Merged

Custom Prune OptionButton#245
hebasto merged 8 commits into
bitcoin-core:mainfrom
jarolrod:custom-prune-setting

Conversation

@jarolrod
Copy link
Copy Markdown
Contributor

@jarolrod jarolrod commented Feb 2, 2023

Based on #257 to not conflict

This introduces a new OptionButton in StorageOptions that represents a custom prune target option. This is shown only when the user has gone into detailed settings and chosen a custom prune target.

Additionally, this moves the logic of setting the default prune value from SettingsStorage into StorageOptions. It is the easy storage option button shown during onboarding that should set this. With the original logic, when onboarding is not shown because the user has already gone through it, the app will set prune to 2 gb again.

light dark
Screen Shot 2023-02-01 at 10 30 36 PM Screen Shot 2023-02-01 at 10 30 16 PM

Windows
Intel macOS
Apple Silicon macOS
ARM64 Android

@jarolrod jarolrod force-pushed the custom-prune-setting branch from 7c3f94d to 7b4085d Compare February 4, 2023 17:56
@jarolrod
Copy link
Copy Markdown
Contributor Author

jarolrod commented Feb 4, 2023

Updated from 7c3f94d to 7b4085d, Compare

Changes: rebased over main

@jarolrod jarolrod mentioned this pull request Feb 5, 2023
Comment thread src/qml/components/StorageSettings.qml Outdated
description: optionsModel.pruneSizeGB
onEditingFinished: optionsModel.pruneSizeGB = parseInt(text)
onEditingFinished: {
root.customStorage = true
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think custom storage should only be true if the values don't match the other two options.

Copy link
Copy Markdown
Collaborator

@johnny9 johnny9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an issue with choosing no prune in the detailed settings and the custom option will be selected and it will show that you want to prune with whatever the prune size was.

Screenshot from 2023-02-14 00-57-43 Screenshot from 2023-02-14 00-57-32

@hebasto
Copy link
Copy Markdown
Member

hebasto commented Feb 14, 2023

based on #243

It has been merged. Rebase?

@jarolrod
Copy link
Copy Markdown
Contributor Author

Updated from 7b4085d to 35e7eb6, compare

changes: rebased over main

@jarolrod
Copy link
Copy Markdown
Contributor Author

@johnny9 will address

@jarolrod jarolrod marked this pull request as draft February 14, 2023 16:46
@jarolrod jarolrod force-pushed the custom-prune-setting branch from 35e7eb6 to c85e334 Compare February 17, 2023 07:53
@jarolrod
Copy link
Copy Markdown
Contributor Author

updated branch from 35e7eb6 to c85e334, compare

changes: rebased to resolve conflicts, still a WIP

@jarolrod
Copy link
Copy Markdown
Contributor Author

Updated from from c85e334 to a8d8b34, compare

Changes: fixed logic for when a prune OptionButton is checked

@jarolrod jarolrod marked this pull request as ready for review February 22, 2023 07:26
@hebasto
Copy link
Copy Markdown
Member

hebasto commented Feb 22, 2023

Based on #271 ...

#271 has just been merged.

@jarolrod jarolrod force-pushed the custom-prune-setting branch from a8d8b34 to e3856c0 Compare February 22, 2023 08:33
@jarolrod
Copy link
Copy Markdown
Contributor Author

Updated from a8d8b34 to e3856c0, compare

Changes: rebased over main

@jarolrod jarolrod force-pushed the custom-prune-setting branch from e3856c0 to 88a38a1 Compare February 28, 2023 04:50
@jarolrod
Copy link
Copy Markdown
Contributor Author

Updated from e3856c0 to 88a38a1, compare

changes: rebased over main and rebased over changes to PR this is based on.

Copy link
Copy Markdown
Collaborator

@johnny9 johnny9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 88a38a1

@hebasto hebasto merged commit aae358f into bitcoin-core:main Mar 6, 2023
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
7968ca9 qml: Introduce Storage OptionButton that represents custom prune target (jarolrod)
61b01e3 qml: expose currently loaded detailItem in InformationPage (jarolrod)
9c6a682 qml: move setting of default prune setting into StorageOptions (jarolrod)
d05ea90 qml: Validate input for dbcache, threads, and prune target settings (jarolrod)
a339e43 qml: Expose minimum and maximum valid dbcache values (Jarol Rodriguez)
a895163 qml: Expose minimum and maximum valid Script Verif Threads values (Jarol Rodriguez)
357a9a5 qml: Allow to show an error text below Setting header text (jarolrod)
390db68 qml: Allow to specify subtext color (jarolrod)

Pull request description:

  Based on bitcoin-core/gui-qml#257 to not conflict

  This introduces a new OptionButton in StorageOptions that represents a custom prune target option. This is shown only when the user has gone into detailed settings and chosen a custom prune target.

  Additionally, this moves the logic of setting the default prune value from SettingsStorage into StorageOptions. It is the easy storage option button shown during onboarding that should set this. With the original logic, when onboarding is not shown because the user has already gone through it, the app will set prune to 2 gb again.

  | light | dark |
  | ----- | ---- |
  | <img width="752" alt="Screen Shot 2023-02-01 at 10 30 36 PM" src="https://user-images.githubusercontent.com/23396902/216224800-6bda5263-2661-4eed-b550-7cdf94731408.png"> | <img width="752" alt="Screen Shot 2023-02-01 at 10 30 16 PM" src="https://user-images.githubusercontent.com/23396902/216224815-8cdc3f36-6493-4d80-afc8-c4c26ddb2b5c.png"> |

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/245)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/245)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/245)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/245)

ACKs for top commit:
  johnny9:
    ACK 7968ca9

Tree-SHA512: 931f79d4950476e74ebd24d5c9389f364e84ef199e4407e225f11792422be7b0acf4c0abd3cf3feb4f0b03d9a6b9c96af947dc6709249bc4857f7c3da66e7b80
tx-signer450 added a commit to tx-signer450/gui-qml that referenced this pull request Oct 20, 2025
7968ca99b4489a0d55203b4e3ed36122dbf89fa9 qml: Introduce Storage OptionButton that represents custom prune target (jarolrod)
61b01e31c4810f8ef62997b3aeb1d717dad333ca qml: expose currently loaded detailItem in InformationPage (jarolrod)
9c6a682325ab2e04f54a74e1ffbd23dbf9152e7e qml: move setting of default prune setting into StorageOptions (jarolrod)
d05ea90ae6994da08c911167778a8f487b9ca6ac qml: Validate input for dbcache, threads, and prune target settings (jarolrod)
a339e4316193a1c7df017aec73565d4d4d2c29b1 qml: Expose minimum and maximum valid dbcache values (Jarol Rodriguez)
a895163aaaaa6290f6387cded39c00980403acef qml: Expose minimum and maximum valid Script Verif Threads values (Jarol Rodriguez)
357a9a569b7551791d4320bffb27cd4d4b3266b0 qml: Allow to show an error text below Setting header text (jarolrod)
390db68fa5f496717f5e542d93ee4dc203c30891 qml: Allow to specify subtext color (jarolrod)

Pull request description:

  Based on bitcoin-core/gui-qml#257 to not conflict

  This introduces a new OptionButton in StorageOptions that represents a custom prune target option. This is shown only when the user has gone into detailed settings and chosen a custom prune target.

  Additionally, this moves the logic of setting the default prune value from SettingsStorage into StorageOptions. It is the easy storage option button shown during onboarding that should set this. With the original logic, when onboarding is not shown because the user has already gone through it, the app will set prune to 2 gb again.

  | light | dark |
  | ----- | ---- |
  | <img width="752" alt="Screen Shot 2023-02-01 at 10 30 36 PM" src="https://user-images.githubusercontent.com/23396902/216224800-6bda5263-2661-4eed-b550-7cdf94731408.png"> | <img width="752" alt="Screen Shot 2023-02-01 at 10 30 16 PM" src="https://user-images.githubusercontent.com/23396902/216224815-8cdc3f36-6493-4d80-afc8-c4c26ddb2b5c.png"> |

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/245)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/245)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/245)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/245)

ACKs for top commit:
  johnny9:
    ACK 7968ca99b4489a0d55203b4e3ed36122dbf89fa9

Tree-SHA512: 931f79d4950476e74ebd24d5c9389f364e84ef199e4407e225f11792422be7b0acf4c0abd3cf3feb4f0b03d9a6b9c96af947dc6709249bc4857f7c3da66e7b80
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants