File tree Expand file tree Collapse file tree 7 files changed +14
-2
lines changed Expand file tree Collapse file tree 7 files changed +14
-2
lines changed Original file line number Diff line number Diff line change 18
18
#include < netbase.h>
19
19
#include < txdb.h> // for -dbcache defaults
20
20
#include < util/string.h>
21
+ #include < util/system.h>
21
22
#include < validation.h> // For DEFAULT_SCRIPTCHECK_THREADS
22
23
#include < wallet/wallet.h> // For DEFAULT_SPEND_ZEROCONF_CHANGE
23
24
@@ -640,6 +641,11 @@ bool OptionsModel::isRestartRequired() const
640
641
return settings.value (" fRestartRequired" , false ).toBool ();
641
642
}
642
643
644
+ bool OptionsModel::hasSigner ()
645
+ {
646
+ return gArgs .GetArg (" -signer" , " " ) != " " ;
647
+ }
648
+
643
649
void OptionsModel::checkAndMigrate ()
644
650
{
645
651
// Migration of default values
Original file line number Diff line number Diff line change @@ -98,6 +98,9 @@ class OptionsModel : public QAbstractListModel
98
98
bool getEnablePSBTControls () const { return m_enable_psbt_controls; }
99
99
const QString& getOverriddenByCommandLine () { return strOverriddenByCommandLine; }
100
100
101
+ /* * Whether -signer was set or not */
102
+ bool hasSigner ();
103
+
101
104
/* Explicit setters */
102
105
void SetPruneTargetGB (int prune_target_gb);
103
106
Original file line number Diff line number Diff line change @@ -203,7 +203,7 @@ void SendCoinsDialog::setModel(WalletModel *_model)
203
203
if (model->wallet ().hasExternalSigner ()) {
204
204
// : "device" usually means a hardware wallet.
205
205
ui->sendButton ->setText (tr (" Sign on device" ));
206
- if (gArgs . GetArg ( " -signer " , " " ) != " " ) {
206
+ if (model-> getOptionsModel ()-> hasSigner () ) {
207
207
ui->sendButton ->setEnabled (true );
208
208
ui->sendButton ->setToolTip (tr (" Connect your hardware wallet first." ));
209
209
} else {
Original file line number Diff line number Diff line change 5
5
#include < wallet/dump.h>
6
6
7
7
#include < fs.h>
8
+ #include < util/system.h>
8
9
#include < util/translation.h>
9
10
#include < wallet/wallet.h>
10
11
Original file line number Diff line number Diff line change 6
6
7
7
#include < common/url.h>
8
8
#include < rpc/util.h>
9
+ #include < util/system.h>
9
10
#include < util/translation.h>
10
11
#include < wallet/context.h>
11
12
#include < wallet/wallet.h>
Original file line number Diff line number Diff line change 34
34
#include < util/moneystr.h>
35
35
#include < util/rbf.h>
36
36
#include < util/string.h>
37
+ #include < util/system.h>
37
38
#include < util/translation.h>
38
39
#include < wallet/coincontrol.h>
39
40
#include < wallet/context.h>
Original file line number Diff line number Diff line change 10
10
#include < fs.h>
11
11
#include < interfaces/chain.h>
12
12
#include < interfaces/handler.h>
13
+ #include < logging.h>
13
14
#include < outputtype.h>
14
15
#include < policy/feerate.h>
15
16
#include < psbt.h>
19
20
#include < util/result.h>
20
21
#include < util/strencodings.h>
21
22
#include < util/string.h>
22
- #include < util/system.h>
23
23
#include < util/time.h>
24
24
#include < util/ui_change_type.h>
25
25
#include < validationinterface.h>
You can’t perform that action at this time.
0 commit comments