Skip to content

Input editor: improve UI by adding a button at the right of the table to add a new input column #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Perdu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Input editor: improve UI by adding a button at the right of the table to add a new input column #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/program/ui/InputEditorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <QtWidgets/QScrollBar>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QPushButton>
#include <QtGui/QClipboard>
#include <QtGui/QGuiApplication>
#include <QShortcut>
Expand Down Expand Up @@ -113,6 +114,12 @@ InputEditorView::InputEditorView(Context* c, MovieFile *m, QWidget *parent) : QT
keyDialog = new KeyPressedDialog(c, this);
keyDialog->withModifiers = false;

addColumnBtn = new QPushButton("+", horizontalHeader());
addColumnBtn->setFixedSize(20, horizontalHeader()->height());
addColumnBtn->move(horizontalHeader()->length(), 0);
addColumnBtn->show();
connect(addColumnBtn, &QPushButton::clicked, this, &InputEditorView::addInputColumn);

inputEventWindow = new InputEventWindow(c, movie, this);

currentMarkerText = "";
Expand Down Expand Up @@ -239,6 +246,14 @@ void InputEditorView::resizeAllColumns()
}
}

void InputEditorView::resizeEvent(QResizeEvent* event)
{
QTableView::resizeEvent(event);
if (addColumnBtn && horizontalHeader()) {
addColumnBtn->move(horizontalHeader()->length(), 0);
}
}

void InputEditorView::update()
{
static uint64_t last_framecount = -1;
Expand Down
4 changes: 4 additions & 0 deletions src/program/ui/InputEditorView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <QtWidgets/QTableView>
#include <QtWidgets/QMenu>
#include <QtWidgets/QPushButton>

/* Forward declaration */
struct Context;
Expand Down Expand Up @@ -91,6 +92,7 @@ public slots:
void timerEvent(QTimerEvent* event) override;
void hideEvent(QHideEvent* event) override;
void leaveEvent(QEvent *event) override;
void resizeEvent(QResizeEvent* event) override;

private slots:
void resizeAllColumns();
Expand Down Expand Up @@ -139,6 +141,8 @@ private slots:
QAction *autoholdAction;
QAction *autofireAction;

QPushButton *addColumnBtn = nullptr;

bool autoScroll = true;
int markerTimerId = 0;
int markerRow = 0;
Expand Down