From e228f3477aebe94f407c99f4125b5e136284e63f Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 9 Jan 2018 17:27:33 +0100 Subject: [PATCH] ui: Fixed layout of QtPathListDialog --- src/lib_gui/qt/element/QtDirectoryListBox.cpp | 3 ++- src/lib_gui/qt/window/QtPathListDialog.cpp | 10 +++++++--- src/lib_gui/qt/window/QtTextEditDialog.cpp | 2 +- .../project_wizzard/QtProjectWizzardContentPaths.cpp | 7 ++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/lib_gui/qt/element/QtDirectoryListBox.cpp b/src/lib_gui/qt/element/QtDirectoryListBox.cpp index 24a54f1f..217d7830 100644 --- a/src/lib_gui/qt/element/QtDirectoryListBox.cpp +++ b/src/lib_gui/qt/element/QtDirectoryListBox.cpp @@ -203,12 +203,13 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent, const QString& listName, setAcceptDrops(true); setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Minimum); setMaximumHeight(200); + setMinimumHeight(100); resize(); } QSize QtDirectoryListBox::sizeHint() const { - return QSize(QFrame::sizeHint().width(), 100); + return QSize(QFrame::sizeHint().width(), minimumHeight()); } void QtDirectoryListBox::clear() diff --git a/src/lib_gui/qt/window/QtPathListDialog.cpp b/src/lib_gui/qt/window/QtPathListDialog.cpp index d9fce73c..05787b13 100644 --- a/src/lib_gui/qt/window/QtPathListDialog.cpp +++ b/src/lib_gui/qt/window/QtPathListDialog.cpp @@ -4,7 +4,7 @@ #include "qt/element/QtDirectoryListBox.h" QtPathListDialog::QtPathListDialog(const QString& title, const QString& description, QWidget* parent) - : QtWindow(parent) + : QtWindow(false, parent) , m_title(title) , m_description(description) { @@ -12,7 +12,7 @@ QtPathListDialog::QtPathListDialog(const QString& title, const QString& descript QSize QtPathListDialog::sizeHint() const { - return QSize(550, 550); + return QSize(550, 350); } void QtPathListDialog::setRelativeRootDirectory(const FilePath& dir) @@ -40,7 +40,11 @@ void QtPathListDialog::populateWindow(QWidget* widget) description->setWordWrap(true); layout->addWidget(description); - m_pathList = new QtDirectoryListBox(this, m_title); + layout->addSpacing(10); + + m_pathList = new QtDirectoryListBox(nullptr, m_title); + m_pathList->setMinimumHeight(150); + m_pathList->setMaximumHeight(1000); layout->addWidget(m_pathList); widget->setLayout(layout); diff --git a/src/lib_gui/qt/window/QtTextEditDialog.cpp b/src/lib_gui/qt/window/QtTextEditDialog.cpp index adb01b7c..9168a5d9 100644 --- a/src/lib_gui/qt/window/QtTextEditDialog.cpp +++ b/src/lib_gui/qt/window/QtTextEditDialog.cpp @@ -4,7 +4,7 @@ #include QtTextEditDialog::QtTextEditDialog(const QString& title, const QString& description, QWidget* parent) - : QtWindow(parent) + : QtWindow(false, parent) , m_title(title) , m_description(description) { diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp index 674fc44d..6b1cefc0 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp @@ -503,9 +503,10 @@ void QtProjectWizzardContentPathsHeaderSearch::detectIncludesButtonClicked() m_pathsDialog = std::make_shared( "Detect Include Paths", - "

Automatically search the paths provided below for additional include paths that " - "can be used to resolve include directives within your source code.

" - "

The indexed paths will be searched by default but you can add further paths if required.

" + "

Automatically search for header files in the paths provided below to find missing include paths for " + "unresolved include directives in your source code.

" + "

The \"Files & Directories to Index\" will be searched by default, but you can add further paths, such " + "as directories of third-party libraries, if required.

" ); m_pathsDialog->setup();