minor UI improvements

This commit is contained in:
itsmattkc 2023-09-14 10:14:49 -07:00
parent bfed518337
commit e6a2beba08
5 changed files with 21 additions and 13 deletions

View file

@ -51,7 +51,7 @@ MainWindow::MainWindow(QWidget *parent) :
action_layout->addStretch();
config_stack_ = new QStackedWidget();
config_layout->addWidget(config_stack_);
config_layout->addWidget(config_stack_, 1);
panel_blank_ = new Panel();
config_stack_->addWidget(panel_blank_);
@ -69,8 +69,9 @@ MainWindow::MainWindow(QWidget *parent) :
properties_layout->addWidget(new QLabel(tr("Extra")), prow, 0);
m_extraEdit = new QLineEdit(this);
connect(m_extraEdit, &QLineEdit::textChanged, this, &MainWindow::ExtraChanged);
m_extraEdit = new QPlainTextEdit(this);
m_extraEdit->setFixedHeight(m_extraEdit->fontMetrics().height() * 3);
connect(m_extraEdit, &QPlainTextEdit::textChanged, this, &MainWindow::ExtraChanged);
properties_layout->addWidget(m_extraEdit, prow, 1);
prow++;
@ -158,7 +159,7 @@ void MainWindow::SetPanel(Panel *panel, si::Object *chunk)
properties_group_->setEnabled(chunk);
if (chunk) {
m_extraEdit->setText(QString::fromUtf8(chunk->extra_.data()));
m_extraEdit->setPlainText(QString::fromUtf8(chunk->extra_.data()));
m_LocationEdit->SetValue(chunk->location_);
m_UpEdit->SetValue(chunk->up_);
start_time_edit_->setValue(chunk->time_offset_);
@ -344,9 +345,11 @@ void MainWindow::ViewSIFile()
}
}
void MainWindow::ExtraChanged(const QString &v)
void MainWindow::ExtraChanged()
{
if (last_set_data_) {
auto edit = static_cast<QPlainTextEdit*>(sender());
QString v = edit->toPlainText();
last_set_data_->extra_ = bytearray(v.toUtf8(), v.size() + 1);
last_set_data_->extra_[v.size()] = 0;
}

View file

@ -5,6 +5,7 @@
#include <object.h>
#include <QGroupBox>
#include <QMainWindow>
#include <QPlainTextEdit>
#include <QStackedWidget>
#include <QTreeView>
@ -55,7 +56,7 @@ private:
QGroupBox *properties_group_;
QLineEdit *m_extraEdit;
QPlainTextEdit *m_extraEdit;
Vector3Edit *m_LocationEdit;
Vector3Edit *m_UpEdit;
@ -78,7 +79,7 @@ private slots:
void ViewSIFile();
void ExtraChanged(const QString &v);
void ExtraChanged();
void LocationChanged(const si::Vector3 &v);
void UpChanged(const si::Vector3 &v);
void StartTimeChanged(int t);

View file

@ -5,6 +5,7 @@ Panel::Panel(QWidget *parent) :
data_(nullptr)
{
outer_layout_ = new QVBoxLayout(this);
outer_layout_->setContentsMargins(0, 0, 0, 0);
layout_ = new QGridLayout();
outer_layout_->addLayout(layout_);

View file

@ -10,12 +10,11 @@ InfoPanel::InfoPanel(QWidget *parent) :
int row = 0;
QScrollArea *scrollArea = new QScrollArea(this);
// scrollArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
scrollArea->setWidgetResizable(true);
layout()->addWidget(scrollArea, row, 0);
m_Lbl = new QLabel();
m_Lbl->setAlignment(Qt::AlignLeft);
m_Lbl = new QLabel(scrollArea);
m_Lbl->setAlignment(Qt::AlignTop | Qt::AlignLeft);
scrollArea->setWidget(m_Lbl);
row++;
@ -32,7 +31,7 @@ InfoPanel::InfoPanel(QWidget *parent) :
layout()->addWidget(m_DataView, row, 0);
m_DataView->hide();
FinishLayout();
//FinishLayout();
}
void InfoPanel::OnOpeningData(void *data)

View file

@ -26,11 +26,15 @@ SIViewDialog::SIViewDialog(Info *riff, QWidget *parent) :
connect(tree->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &SIViewDialog::SelectionChanged);
splitter->addWidget(tree);
config_stack_ = new QStackedWidget();
/*config_stack_ = new QStackedWidget();
config_stack_->setContentsMargins(0,0,0,0);
splitter->addWidget(config_stack_);
panel_ = new InfoPanel();
config_stack_->addWidget(panel_);
config_stack_->addWidget(panel_);*/
panel_ = new InfoPanel();
splitter->addWidget(panel_);
splitter->setSizes({99999, 99999});