feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Use LayoutBuilder for change log dialog

Browse Source 
Change-Id: I0b0678dadd57b2873cf0c8ea2c6fe1cb3370d8ae
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2024-07-09 18:38:09 +02:00
parent 9e3e3241ca
commit 0222dd7066
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/coreplugin/icore.cpp
View File

@@ -59,6 +59,7 @@
#include <utils/guiutils.h> #include <utils/guiutils.h>
#include <utils/historycompleter.h> #include <utils/historycompleter.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/layoutbuilder.h>
#include <utils/mimeutils.h> #include <utils/mimeutils.h>
#include <utils/proxyaction.h> #include <utils/proxyaction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -2526,12 +2527,7 @@ void ICorePrivate::changeLog()
for (const VersionFilePair &f : versionedFiles) for (const VersionFilePair &f : versionedFiles)
versionCombo->addItem(f.first.toString()); versionCombo->addItem(f.first.toString());
dialog = new LogDialog(ICore::dialogParent()); dialog = new LogDialog(ICore::dialogParent());
auto versionLayout = new QHBoxLayout;
versionLayout->addWidget(new QLabel(Tr::tr("Version:")));
versionLayout->addWidget(versionCombo);
versionLayout->addStretch(1);
auto showInExplorer = new QPushButton(FileUtils::msgGraphicalShellAction()); auto showInExplorer = new QPushButton(FileUtils::msgGraphicalShellAction());
versionLayout->addWidget(showInExplorer);
auto textEdit = new QTextBrowser; auto textEdit = new QTextBrowser;
textEdit->setOpenExternalLinks(true); textEdit->setOpenExternalLinks(true);
@@ -2541,27 +2537,25 @@ void ICorePrivate::changeLog()
new MarkdownHighlighter(textEdit->document()); new MarkdownHighlighter(textEdit->document());
auto textEditWidget = new QFrame;
textEditWidget->setFrameStyle(QFrame::NoFrame);
auto findToolBar = new FindToolBarPlaceHolder(dialog); auto findToolBar = new FindToolBarPlaceHolder(dialog);
findToolBar->setLightColored(true); findToolBar->setLightColored(true);
auto textEditLayout = new QVBoxLayout;
textEditLayout->setContentsMargins(0, 0, 0, 0);
textEditLayout->setSpacing(0);
textEditLayout->addWidget(textEdit);
textEditLayout->addWidget(findToolBar);
textEditWidget->setLayout(textEditLayout);
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
auto dialogLayout = new QVBoxLayout;
dialogLayout->addLayout(versionLayout);
dialogLayout->addWidget(textEditWidget);
dialogLayout->addWidget(buttonBox);
dialog->setLayout(dialogLayout);
dialog->resize(700, 600); dialog->resize(700, 600);
dialog->setWindowTitle(Tr::tr("Change Log")); dialog->setWindowTitle(Tr::tr("Change Log"));
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
ICore::registerWindow(dialog, Context("CorePlugin.VersionDialog")); ICore::registerWindow(dialog, Context("CorePlugin.VersionDialog"));
using namespace Layouting;
Column {
Row { Tr::tr("Version:"), versionCombo, st, showInExplorer },
Column {
textEdit,
findToolBar,
spacing(0),
},
buttonBox,
}.attachTo(dialog);
connect(buttonBox, &QDialogButtonBox::rejected, dialog, &QDialog::close); connect(buttonBox, &QDialogButtonBox::rejected, dialog, &QDialog::close);
QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close); QPushButton *closeButton = buttonBox->button(QDialogButtonBox::Close);
if (QTC_GUARD(closeButton)) if (QTC_GUARD(closeButton))