From 4c1efb94d5fdec06619714cad6bc69a429e2c1f5 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 18 Dec 2018 09:19:54 +0100 Subject: [PATCH] Preferences: Add scroll area to external tool details That is nicer than scrolling the whole widget including the tools tree. Also make the field for standard input extend. Change-Id: Ia2690015b6014e595c3ba441cd3110389aac6dde Reviewed-by: Alessandro Portale --- .../coreplugin/dialogs/externaltoolconfig.cpp | 2 + .../coreplugin/dialogs/externaltoolconfig.ui | 407 ++++++++++-------- 2 files changed, 232 insertions(+), 177 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 3e5255ea598..9b17d200032 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -402,6 +402,8 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) : m_model(new ExternalToolModel(this)) { ui->setupUi(this); + ui->scrollArea->viewport()->setAutoFillBackground(false); + ui->scrollAreaWidgetContents->setAutoFillBackground(false); ui->toolTree->setModel(m_model); ui->toolTree->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::EditKeyPressed); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui index 24a75872ba1..651ae0fbb6f 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui @@ -28,7 +28,7 @@ false - 0 + 21 @@ -82,196 +82,249 @@ - + - + 10 0 - - - QFormLayout::ExpandingFieldsGrow + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + true + + + + + 0 + 0 + 396 + 444 + - - 0 - - - - - Description: - - - - - - - - - - Executable: - - - - - - - Utils::PathChooser::Command - - - - - - - Arguments: - - - - - - - - - - Working directory: - - - - - - - Utils::PathChooser::Directory - - - - - - - <html><head/><body> + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 10 + 0 + + + + + QFormLayout::ExpandingFieldsGrow + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Description: + + + + + + + + + + Executable: + + + + + + + + + + Arguments: + + + + + + + + + + Working directory: + + + + + + + + + + <html><head/><body> <p>What to do with the executable's standard output. <ul><li>Ignore: Do nothing with it.</li><li>Show in pane: Show it in the general output pane.</li><li>Replace selection: Replace the current selection in the current document with it.</li></ul></p></body></html> - - - Output: - - - - - - - - Ignore - - - - - Show in Pane - - - - - Replace Selection - - - - - - - - <html><head><body> + + + Output: + + + + + + + + Ignore + + + + + Show in Pane + + + + + Replace Selection + + + + + + + + <html><head><body> <p >What to do with the executable's standard error output.</p> <ul><li>Ignore: Do nothing with it.</li> <li>Show in pane: Show it in the general output pane.</li> <li>Replace selection: Replace the current selection in the current document with it.</li> </ul></body></html> - - - Error output: - - - - - - - - Ignore - - - - - Show in Pane - - - - - Replace Selection - - - - - - - - Environment: - - - - - - - 0 - - - - - - 0 - 0 - - - - No changes to apply. - - - - - - - Change... - - - - - - - - - If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished. - - - Modifies current document - - - - - - - Text to pass to the executable via standard input. Leave empty if the executable should not receive any input. - - - Input: - - - - - - - QPlainTextEdit::NoWrap - - - - + + + Error output: + + + + + + + + Ignore + + + + + Show in Pane + + + + + Replace Selection + + + + + + + + Environment: + + + + + + + 0 + + + + + + 0 + 0 + + + + No changes to apply. + + + + + + + Change... + + + + + + + + + If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished. + + + Modifies current document + + + + + + + Text to pass to the executable via standard input. Leave empty if the executable should not receive any input. + + + Input: + + + + + + + + 0 + 10 + + + + QPlainTextEdit::NoWrap + + + + + + + +