From 4687711d5e837d4c66099025403ca68f0d2a7632 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 3 Jun 2019 22:12:38 +0200 Subject: [PATCH] Merge #16122: gui: Enable console line edit on setClientModel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/qt/forms/debugwindow.ui | 3 +++ src/qt/rpcconsole.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/qt/forms/debugwindow.ui b/src/qt/forms/debugwindow.ui index adc057e2a0e68..1972e3e4632f8 100644 --- a/src/qt/forms/debugwindow.ui +++ b/src/qt/forms/debugwindow.ui @@ -660,6 +660,9 @@ + + false + diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 7effabae623ca..ad8e4636dbdae 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -715,6 +715,9 @@ void RPCConsole::setClientModel(ClientModel *model) autoCompleter->popup()->setItemDelegate(new QStyledItemDelegate(this)); autoCompleter->popup()->setObjectName("rpcAutoCompleter"); 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.