diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index a147d8981..8548a937a 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -46,6 +46,10 @@ EventBrowser::EventBrowser(Core *core, QWidget *parent) : // Qt doesn't allow moving the column with the expand/collapse widgets, so this // becomes quickly infuriating to rearrange, just disable until that can be fixed. ui->events->header()->setSectionsMovable(false); + + ui->jumpStrip->hide(); + ui->findStrip->hide(); + ui->bookmarkStrip->hide(); } EventBrowser::~EventBrowser() @@ -81,10 +85,23 @@ void EventBrowser::OnEventSelected(uint32_t frameID, uint32_t eventID) void EventBrowser::on_find_clicked() { + ui->jumpStrip->hide(); + ui->findStrip->show(); + ui->bookmarkStrip->hide(); } void EventBrowser::on_gotoEID_clicked() { + ui->jumpStrip->show(); + ui->findStrip->hide(); + ui->bookmarkStrip->hide(); +} + +void EventBrowser::on_toolButton_clicked() +{ + ui->jumpStrip->hide(); + ui->findStrip->hide(); + ui->bookmarkStrip->show(); } static void SetDrawcallTimes(QTreeWidgetItem *node, const rdctype::array &results) diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h index d83c70bfb..3257c063a 100644 --- a/qrenderdoc/Windows/EventBrowser.h +++ b/qrenderdoc/Windows/EventBrowser.h @@ -30,7 +30,9 @@ class EventBrowser : public QFrame, public ILogViewerForm void on_timeDraws_clicked(); - private: + void on_toolButton_clicked(); + + private: Ui::EventBrowser *ui; Core *m_Core; }; diff --git a/qrenderdoc/Windows/EventBrowser.ui b/qrenderdoc/Windows/EventBrowser.ui index 13cad22da..ee487c31e 100644 --- a/qrenderdoc/Windows/EventBrowser.ui +++ b/qrenderdoc/Windows/EventBrowser.ui @@ -46,6 +46,9 @@ 6 + + 6 + @@ -98,6 +101,9 @@ :/Resources/flag_green.png:/Resources/flag_green.png + + Ctrl+G + true @@ -112,6 +118,26 @@ :/Resources/time.png:/Resources/time.png + + Ctrl+T + + + true + + + + + + + + + + + :/Resources/asterisk_orange.png:/Resources/asterisk_orange.png + + + Ctrl+B + true @@ -132,6 +158,319 @@ + + + + + 3 + + + 6 + + + 0 + + + 6 + + + 0 + + + + + + + + :/Resources/flag_green.png + + + + + + + Jump to Event + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 0 + + + + + + + + 0 + 0 + + + + QFrame::Box + + + QFrame::Plain + + + 1 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 20 + + + + false + + + false + + + Event ID + + + false + + + + + + + + + + + + + + 3 + + + 6 + + + 0 + + + 6 + + + 0 + + + + + + + + :/Resources/find.png + + + + + + + Find Event + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 0 + + + + + + + QFrame::Box + + + QFrame::Plain + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 20 + + + + false + + + false + + + + + + false + + + + + + + + + + + + + + :/Resources/cross.png:/Resources/cross.png + + + Esc + + + true + + + + + + + + + + + :/Resources/stepnext.png:/Resources/stepnext.png + + + true + + + + + + + + + + + :/Resources/stepprev.png:/Resources/stepprev.png + + + true + + + + + + + + + + + 3 + + + 6 + + + 0 + + + 6 + + + 0 + + + + + + + + :/Resources/asterisk_orange.png + + + + + + + Bookmarks + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 0 + + + + + + + Qt::Vertical + + + + + + + Qt::Horizontal + + + + 564 + 20 + + + + + + +