diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-03 22:12:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-06-03 22:20:44 +0200 |
| commit | c3723c80dad264f081e54b4895e3c806673b5ce9 (patch) | |
| tree | 30a8482b950254c74259d3df4bc041cc4f1b4730 | |
| parent | 38523721ac39b083b4560d7970cb1699d10b8db2 (diff) | |
| parent | 2d8ad2f99710a8981e33fe2d6ce834b0076c4e80 (diff) | |
Merge #16122: gui: Enable console line edit on setClientModel
2d8ad2f99710a8981e33fe2d6ce834b0076c4e80 gui: Enable console line edit on setClientModel (João Barbosa)
Pull request description:
Make console line edit disable by default, and only enable once `RPCConsole::setClientModel` is called.
Fixes #16119.
ACKs for commit 2d8ad2:
fanquake:
tACK https://github.com/bitcoin/bitcoin/pull/16122/commits/2d8ad2f99710a8981e33fe2d6ce834b0076c4e80 on macOS.
Tree-SHA512: 1418ce3c120c08e5ec3e7a7a063572a24402ce0ec541bd4adc21f61d60c4e86b711e82e940ebf5f0445ab861f89c146c2a2e7990fb52bed2c65fc199a1981f71
| -rw-r--r-- | src/qt/forms/debugwindow.ui | 3 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index f0b976001e..70ad32752a 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -636,6 +636,9 @@ <property name="placeholderText"> <string/> </property> + <property name="enabled"> + <bool>false</bool> + </property> </widget> </item> </layout> diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 8b6dcf0445..071a197c3c 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -677,6 +677,9 @@ void RPCConsole::setClientModel(ClientModel *model) wordList.sort(); autoCompleter = new QCompleter(wordList, this); autoCompleter->setModelSorting(QCompleter::CaseSensitivelySortedModel); + // ui->lineEdit is initially disabled because running commands is only + // possible from now on. + ui->lineEdit->setEnabled(true); ui->lineEdit->setCompleter(autoCompleter); autoCompleter->popup()->installEventFilter(this); // Start thread to execute RPC commands. |