Commit graph

244 commits

Author SHA1 Message Date
Andrew Poelstra
9fdb7c094a Merge 69a6f1ad1f into merged_master (Bitcoin PR #17513) 2020-11-09 23:10:14 +00:00
Andrew Poelstra
1265558273 Merge 7d6f63cc2c into merged_master (Bitcoin PR #16720) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
018326915c Merge f5db3f2128 into merged_master (Bitcoin PR #16758) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
9f37eba7d1 Merge d20d171f26 into merged_master (Bitcoin PR #16701) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
051964ddf5 Merge e5abb59a9a into merged_master (Bitcoin PR #16379) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
7436b9cfea Merge 29082e8f40 into merged_master (Bitcoin PR #16380) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
64152fdf34 Merge 6520330087 into merged_master (Bitcoin PR #16044) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
8b992e207a Merge 3a0d6da098 into merged_master (Bitcoin PR #15371) 2020-10-28 23:29:43 +00:00
Andrew Poelstra
0ee60cdfa3 Merge e9e777e21b into merged_master (Bitcoin PR #15874) 2020-10-28 22:18:02 +00:00
Hennadii Stepanov
567cb44eb9
refactor: Nuke guiutil circular dependency
Co-authored-by: Gregory Sanders <gsanders87@gmail.com>
2019-11-19 17:07:18 +02:00
Hennadii Stepanov
73b5505cfe
refactor: Move SendCoinsRecipient in own header
Co-authored-by: Gregory Sanders <gsanders87@gmail.com>
2019-11-19 17:05:35 +02:00
Jorge Timón
052c54ecb0
Testchains: Generic selection with -chain=<str> in addition of -testnet and -regtest 2019-09-06 22:05:33 +02:00
fanquake
7d6f63cc2c
Merge #16720: qt: Replace objc_msgSend() function calls with the native Objective-C syntax
0bb33b5348 qt: Replace objc_msgSend with native syntax (Hennadii Stepanov)

Pull request description:

  Changes in Xcode 11 Objective-C Runtime cause an error (#16387) during building on MacOS 10.15 Catalina.

  This PR fixes this issue by replacing `objc_msgSend()` function calls with the native Objective-C syntax.

  Refs:
  - [changes in `objc_msgSend` function](https://developer.apple.com/documentation/objectivec/1456712-objc_msgsend?changes=latest_minor&language=objc)
  - [`OBJC_OLD_DISPATCH_PROTOTYPES` macro](https://developer.apple.com/documentation/objectivec/objc_old_dispatch_prototypes?language=objc)

ACKs for top commit:
  l2a5b1:
    ACK 0bb33b5 - Diff looks good. Sending messages via native Objective-C code feels more robust and is more readable than casting all the `objc_msgSend` function calls to the appropriate function signature (which would also have fixed the issue).
  jonasschnelli:
    utACK 0bb33b5348 - Confirmed that the called macOS framework function is available on our build targets.
  fanquake:
    ACK 0bb33b5348 - Still works as expected.

Tree-SHA512: c09cb684d06bd1da053a17c182b7bb1642e45bb347d26c76e1c5d835c320567caee366d85e34bb7f2be38e63ed041e0d06a56c2a9d89f7e5bece9b19cc5c6772
2019-09-01 16:20:26 +08:00
Hennadii Stepanov
0bb33b5348
qt: Replace objc_msgSend with native syntax 2019-08-31 12:25:34 +03:00
Hennadii Stepanov
8b6f5aabb9
qt: Replace QFontMetrics::width() with TextWidth() 2019-08-29 19:13:19 +03:00
Hennadii Stepanov
c6dd32da69
qt: Replace obsolete functions of QDesktopWidget 2019-08-25 08:46:32 +03:00
Hennadii Stepanov
1260ecd812
qt: Add TextWidth() wrapper
In Qt 5.12 and before the QFontMetrics::width() is used and it is
deprecated since Qt 13.0.
In Qt 5.11 the QFontMetrics::horizontalAdvance() was introduced.
2019-08-23 21:27:50 +03:00
Wladimir J. van der Laan
e5abb59a9a
Merge #16379: Fix autostart filenames on Linux for testnet/regtest
ae311bc036 Fix autostart filenames on Linux (Hennadii Stepanov)

Pull request description:

  Currently, on master the `bitcoin-test.lnk` and `bitcoin-regtest.lnk` files do not work as autostart application `.desktop` files.

  This PR fixes it.

  Refs:
  - #7045
  - [Autostart Of Applications During Startup](https://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html)

ACKs for top commit:
  promag:
    utACK ae311bc, weird why extension `.lnk` was used in #7045.
  laanwj:
    Code review ACK ae311bc036

Tree-SHA512: 210cc346600d52b0a262c81ed5f258365a3cea2e5522f4b5f4798fd3b54f45ed82aba68eefae59a6b6f1d8e4d00221476c23bdffc038f16f2f45c1acc837f522
2019-07-18 14:27:25 +02:00
MarcoFalke
fa0d0ff6e1
Remove unused bits from the service flags enum 2019-07-12 14:14:54 -04:00
Hennadii Stepanov
ae311bc036
Fix autostart filenames on Linux 2019-07-12 19:01:05 +03:00
shannon1916
6e6494b3fb qt: fix opening bitcoin.conf via Preferences on macOS; see #15409 2019-06-03 10:32:15 +08:00
Steven Roose
52f6f6905b
WIP: Fix compilation after merge 2019-05-20 16:22:05 +01:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
Jonas Schnelli
3a0d6da098
Merge #15371: gui: Uppercase bech32 addresses in qr codes
3407b446c gui: Uppercase bech32 addresses in qr codes (Ben Carman)

Pull request description:

  Closes #12191

ACKs for commit 3407b4:
  meshcollider:
    utACK https://github.com/bitcoin/bitcoin/pull/15371/commits/3407b446cc5ec0725c0505e3b933f43d86286ad5
  jonasschnelli:
    Re utACK 3407b446cc

Tree-SHA512: d63ecf8e9805c46c9f554cc929661a37837bc3ba9b7b931331c2a5c2b81468742e1819c9add73966083011709cc15ae1870a454348af8591b3d75d3765dca568
2019-04-29 09:04:40 +02:00
251
fa1c8e2978 Resolve the qt/guiutil <-> qt/optionsmodal CD
This pull request attempts to resolve the `qt/guiutil` <-> `qt/optionsmodel`
circular dependency.

The circular dependency is resolved by moving the `Intro::getDefaultDataDirectory`
member function to `GUIUtil::getDefaultDataDirectory`.
2019-04-23 13:26:06 +02:00
Gregory Sanders
93e26608c2 QT: dummy address needs fully valid pubkey 2019-04-17 15:35:27 -04:00
Gregory Sanders
8adf591590 QT include linting 2019-04-10 12:59:03 -04:00
Gregory Sanders
dbac2afd0f QT: Enter a s/Bitcoin/Liquid/ address 2019-04-10 12:11:36 -04:00
Luke Dashjr
d522775b80 Bugfix: GUI: Ensure negative symbol is before whole number in GUIUtil::formatAssetAmount
Fixes: https://github.com/greenaddress/elements/issues/5
2019-04-10 10:09:17 -04:00
Luke Dashjr
25600f90dd GUI: Receive: Remove URI-specific parameters for now 2019-04-09 15:26:55 -04:00
Luke Dashjr
d4d45b6f0a GUI: Use CT address for examples 2019-04-09 14:51:08 -04:00
Luke Dashjr
79e0cb74ff GUI: Support for sending assets 2019-04-09 13:06:59 -04:00
Luke Dashjr
a1a8848555 GUI: GUIUtil::parseAssetAmount abstraction 2019-04-09 11:19:05 -04:00
Luke Dashjr
047799cb12 CAsset: GetIdentifier to get label or hex id 2019-04-09 11:13:26 -04:00
Luke Dashjr
2953613489 GUI: Option to remove asset name for GUIUtil::formatAssetAmount 2019-04-09 11:10:42 -04:00
Luke Dashjr
f027ca0c64 GUI: Always include bitcoins in formatMultiAssetAmount 2019-04-09 10:33:59 -04:00
Luke Dashjr
6342d80d7f GUI: Add GUIUtil::formatMultiAssetAmount to handle a CAmountMap 2019-04-09 10:19:33 -04:00
Luke Dashjr
988ed5effc GUI: Abstract asset+amount formatting into new GUIUtil::formatAssetAmount 2019-04-09 10:07:17 -04:00
Steven Roose
5f9f578ee6
[BROKEN] Unbreak Qt code after CA 2019-03-20 12:05:59 +00:00
Ben Carman
3407b446cc
gui: Uppercase bech32 addresses in qr codes 2019-02-09 12:33:26 -06:00
Gregory Sanders
c62fab2d69 UPSTREAM MERGE BROKEN: Merge commit '3832c25f17' into merge_14225 2019-01-28 18:14:25 +00:00
Gregory Sanders
c5a93c008f UPSTREAM MERGE BROKEN: Merge commit '8aa9badf5e' into e17 2019-01-23 16:48:22 -05:00
Chun Kuan Lee
1bd9ffdd44 windows: Set _WIN32_WINNT to 0x0601 (Windows 7)
Also remove all defines in many places and define it in configure stage to keep consistency.
2019-01-23 16:28:27 +08:00
Jonas Schnelli
da6011826a
Fix macOS launch-at-startup memory issue 2019-01-21 22:43:03 -10:00
Jonas Schnelli
516437a1b7
Qt: remove macOS launch-at-startup option when compiled with > macOS 10.11 2019-01-21 22:42:51 -10:00
Hennadii Stepanov
7c572c488d
Add workaround for QProgressDialog bug on macOS
See: QTBUG-65750, QTBUG-70357.
2019-01-15 01:28:00 +02:00
Luke Dashjr
d0cccad9d4 Recognise temporary REPLACE_BY_FEE service bit 2018-12-18 16:08:18 -05:00
Hennadii Stepanov
0b4a5786bb
Use window() instead of obsolete topLevelWidget() 2018-11-25 11:32:59 +02:00
Hennadii Stepanov
2bc3f114d0
Bump the minimum Qt version to 5.2 2018-11-14 01:32:51 +02:00