ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Use flow layout in source group selection window

Browse Source
This commit is contained in:
Eberhard Graether
2018-06-05 16:24:13 +02:00
parent 2584a1f4e2
commit ce0a8a6444
7 changed files with 250 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/QtWindow.cpp
-1
View File
@@ -197,7 +197,6 @@ void QtWindow::moveToCenter()
else
{
move(
parentWidget()->pos().x() + parentWidget()->width() / 2 - sizeHint().width() / 2,
parentWidget()->pos().y() + parentWidget()->height() / 2 - sizeHint().height() / 2
);
src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+2 -1
View File
@@ -676,10 +676,11 @@ void QtProjectWizzard::newSourceGroup()
QtProjectWizzardWindow* window = createWindowWithContent(
[](QtProjectWizzardWindow* window)
{
window->setPreferredSize(QSize(570, 380));
window->setPreferredSize(QSize(680, 400));
return new QtProjectWizzardContentSelect(window);
}
);
window->resize(QSize(680, 400));
connect(dynamic_cast<QtProjectWizzardContentSelect*>(window->content()),
&QtProjectWizzardContentSelect::selected,
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
+15 -9
View File
@@ -6,6 +6,7 @@
#include <QPushButton>
#include "qt/window/project_wizzard/QtProjectWizzardWindow.h"
#include "qt/utility/QtFlowLayout.h"
#include "settings/LanguageType.h"
#include "utility/ResourcePaths.h"
#include "utility/utilityString.h"
@@ -112,7 +113,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
}
);
QHBoxLayout* hlayout = new QHBoxLayout();
QtFlowLayout* flayout = new QtFlowLayout(10, 0, 0);
for (auto& languageIt: sourceGroupInfos)
{
@@ -126,7 +127,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
);
b->setProperty("source_group_type", int(sourceGroupIt.type));
sourceGroupButtons->addButton(b);
hlayout->addWidget(b);
flayout->addWidget(b);
}
m_buttons[languageIt.first] = sourceGroupButtons;
@@ -152,19 +153,25 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
);
}
QFrame* container = new QFrame();
container->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
container->setObjectName("sourceGroupContainer");
container->setLayout(hlayout);
QWidget* container = new QWidget();
QVBoxLayout* containerLayout = new QVBoxLayout();
containerLayout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(container, 0, QtProjectWizzardWindow::BACK_COL);
QFrame* groupContainer = new QFrame();
groupContainer->setObjectName("sourceGroupContainer");
groupContainer->setLayout(flayout);
containerLayout->addWidget(groupContainer, 0);
m_description = new QLabel(" \n \n");
m_description->setWordWrap(true);
m_description->setOpenExternalLinks(true);
m_description->setObjectName("sourceGroupDescription");
m_description->setTextInteractionFlags(Qt::TextSelectableByMouse);
layout->addWidget(m_description, 1, QtProjectWizzardWindow::BACK_COL);
m_description->setMinimumHeight(80);
containerLayout->addWidget(m_description, 0);
container->setLayout(containerLayout);
layout->addWidget(container, 0, QtProjectWizzardWindow::BACK_COL);
m_title = new QLabel("Source Group Types");
m_title->setObjectName("sourceGroupTitle");
@@ -172,7 +179,6 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
layout->addWidget(m_title, 0, QtProjectWizzardWindow::BACK_COL, Qt::AlignLeft | Qt::AlignTop);
layout->setRowStretch(0, 0);
layout->setRowStretch(1, 1);
layout->setColumnStretch(QtProjectWizzardWindow::FRONT_COL, 0);
layout->setColumnStretch(QtProjectWizzardWindow::BACK_COL, 1);
layout->setHorizontalSpacing(0);