Skip to content

Conversation

JeremyRand
Copy link
Member

New version of #160. Fixes merge conflicts, and fixes nsis-header.bmp.

@domob1812
Copy link

ACK 824ee3e. Please remove the executable attribute from bitcoin.ico, then feel free to merge. Thanks!

…to rebrand-nsis-images

Conflicts:
	share/pixmaps/nsis-header.bmp
	share/pixmaps/nsis-wizard.bmp
@JeremyRand JeremyRand merged commit 994b197 into namecoin:master Jan 19, 2018
JeremyRand added a commit that referenced this pull request Jan 19, 2018
c657e23 Rebrand NSIS images (fsb4000)

Pull request description:

  New version of #160.  Fixes merge conflicts, and fixes `nsis-header.bmp`.

Tree-SHA512: 78509a2c33d32f73720428310ddc64d3f2e54d7e5c51b3032ee1abc0287ec918cdb06b5ee00eb2a91541994742cb4232ffa54c3e49c16645ce16379bcc0e819e
JeremyRand added a commit that referenced this pull request Jan 21, 2018
a84de15 Rebrand logo for macOS deploy. (JeremyRand)

Pull request description:

  ~~Depends on #204 (it will be ready for review once that PR is merged).~~  Refs #167 .

  Note that I haven't actually tested this icon on a macOS machine, so it might be broken.

Tree-SHA512: c507587d2d141fe3604c3eeb4b4c06edc65eb6f93ebc53e31955cd0a99d6eb08ea5a77526817bfb8f7a6e2833184fae3206a6e2142870d564ca5a77a97323778
domob1812 pushed a commit that referenced this pull request Mar 1, 2021
…questsView tables column sizes

964885d qt: Save/restore recentRequestsView table column sizes (Hennadii Stepanov)
f5c8093 qt: Move recentRequestsView properties settings to constructor (Hennadii Stepanov)
9c5f4f2 qt: Save/restore TransactionView table column sizes (Hennadii Stepanov)
788205c qt: Move transactionView properties settings to constructor (Hennadii Stepanov)
ecdbaf7 qt, refactor: Drop intermediate assignment (Hennadii Stepanov)

Pull request description:

  Save/restore TransactionView and recentRequestsView tables column sizes.
  Sorting order is not saved/restored intentionally.

  Based on #204 (the first commit).

ACKs for top commit:
  jarolrod:
    ACK 964885d, tested on macOS 11.1 Qt 5.15.2
  Talkless:
    tACK 964885d, tested on Debian Sid, saving/restoring and resetting (with `-resetguisettings`) works as expected.

Tree-SHA512: c24e41bf4d95bb33dce16e9a0b952ffd0912e95f4d2a1bc5292fcf5a27100e70fea73433c4ff246d05b174fc23a7b6de1790a2e8b990a9089e4deca79a00dedc
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