forked from qt-creator/qt-creator
BinEditor: Use LayoutBuilder for toolbar
Change-Id: Ibdddde7be1df94112013f59561955e54ec45052d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
#include <utils/fadingindicator.h>
|
#include <utils/fadingindicator.h>
|
||||||
#include <utils/filepath.h>
|
#include <utils/filepath.h>
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
|
#include <utils/layoutbuilder.h>
|
||||||
#include <utils/mimeconstants.h>
|
#include <utils/mimeconstants.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/reloadpromptutils.h>
|
#include <utils/reloadpromptutils.h>
|
||||||
@@ -2179,27 +2180,27 @@ public:
|
|||||||
{
|
{
|
||||||
setWidget(m_widget);
|
setWidget(m_widget);
|
||||||
setDuplicateSupported(true);
|
setDuplicateSupported(true);
|
||||||
|
|
||||||
auto codecChooser = new CodecChooser(CodecChooser::Filter::SingleByte);
|
auto codecChooser = new CodecChooser(CodecChooser::Filter::SingleByte);
|
||||||
codecChooser->prependNone();
|
codecChooser->prependNone();
|
||||||
|
|
||||||
auto l = new QHBoxLayout;
|
|
||||||
auto w = new QWidget;
|
|
||||||
l->setContentsMargins(0, 0, 5, 0);
|
|
||||||
l->addStretch(1);
|
|
||||||
l->addWidget(codecChooser);
|
|
||||||
l->addWidget(m_widget->addressEdit());
|
|
||||||
w->setLayout(l);
|
|
||||||
|
|
||||||
m_toolBar = new QToolBar;
|
|
||||||
m_toolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
|
||||||
m_toolBar->addWidget(w);
|
|
||||||
|
|
||||||
connect(codecChooser, &CodecChooser::codecChanged,
|
connect(codecChooser, &CodecChooser::codecChanged,
|
||||||
m_widget, &BinEditorWidget::setCodec);
|
m_widget, &BinEditorWidget::setCodec);
|
||||||
const QVariant setting = ICore::settings()->value(C_ENCODING_SETTING);
|
const QVariant setting = ICore::settings()->value(C_ENCODING_SETTING);
|
||||||
if (!setting.isNull())
|
if (!setting.isNull())
|
||||||
codecChooser->setAssignedCodec(QTextCodec::codecForName(setting.toByteArray()));
|
codecChooser->setAssignedCodec(QTextCodec::codecForName(setting.toByteArray()));
|
||||||
|
|
||||||
|
using namespace Layouting;
|
||||||
|
auto w = Row {
|
||||||
|
customMargins(0, 0, 5, 0),
|
||||||
|
st,
|
||||||
|
codecChooser,
|
||||||
|
m_widget->addressEdit()
|
||||||
|
}.emerge();
|
||||||
|
|
||||||
|
m_toolBar = new QToolBar;
|
||||||
|
m_toolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||||
|
m_toolBar->addWidget(w);
|
||||||
|
|
||||||
m_undoAction = new QAction(Tr::tr("&Undo"), this);
|
m_undoAction = new QAction(Tr::tr("&Undo"), this);
|
||||||
m_redoAction = new QAction(Tr::tr("&Redo"), this);
|
m_redoAction = new QAction(Tr::tr("&Redo"), this);
|
||||||
m_copyAction = new QAction(this);
|
m_copyAction = new QAction(this);
|
||||||
|
Reference in New Issue
Block a user