diff --git a/qrenderdoc/Code/Core.cpp b/qrenderdoc/Code/Core.cpp index 14d36b962..94e83d3b4 100644 --- a/qrenderdoc/Code/Core.cpp +++ b/qrenderdoc/Code/Core.cpp @@ -15,6 +15,8 @@ Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool memset(&m_APIProps, 0, sizeof(m_APIProps)); + qApp->setApplicationVersion(RENDERDOC_GetVersionString()); + m_MainWindow = new MainWindow(this); m_MainWindow->show(); diff --git a/qrenderdoc/Windows/AboutDialog.cpp b/qrenderdoc/Windows/AboutDialog.cpp new file mode 100644 index 000000000..eaa158af0 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.cpp @@ -0,0 +1,19 @@ +#include "AboutDialog.h" +#include "ui_AboutDialog.h" + +#include +#include +#include + +AboutDialog::AboutDialog(QWidget *parent) + : QDialog(parent) + , ui(new Ui::AboutDialog) +{ + ui->setupUi(this); + ui->version->setText("Version v" + qApp->applicationVersion()); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} diff --git a/qrenderdoc/Windows/AboutDialog.h b/qrenderdoc/Windows/AboutDialog.h new file mode 100644 index 000000000..e6a0f35c4 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.h @@ -0,0 +1,21 @@ +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include + +namespace Ui { + class AboutDialog; +} + +class AboutDialog : public QDialog +{ + Q_OBJECT +public: + explicit AboutDialog(QWidget *parent = 0); + ~AboutDialog(); + +private: + Ui::AboutDialog *ui; +}; + +#endif diff --git a/qrenderdoc/Windows/AboutDialog.ui b/qrenderdoc/Windows/AboutDialog.ui new file mode 100644 index 000000000..0b01acb98 --- /dev/null +++ b/qrenderdoc/Windows/AboutDialog.ui @@ -0,0 +1,126 @@ + + + AboutDialog + + + + 0 + 0 + 518 + 302 + + + + About RenderDoc + + + + QLayout::SetFixedSize + + + + + + + + :/Resources/128.png + + + + + + + Version v0.00 + + + + + + + Baldur Karsson + + + + + + + <a href='mailto:baldurk@baldurk.org'>baldurk@baldurk.org</a> + + + Qt::RichText + + + true + + + + + + + <a href='https://github.com/baldurk/renderdoc'>https://github.com/baldurk/renderdoc</a> + + + Qt::RichText + + + true + + + + + + + Copyright Baldur Karlsson 2016 + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + + + + buttonBox + accepted() + AboutDialog + accept() + + + 20 + 20 + + + 20 + 20 + + + + + buttonBox + rejected() + AboutDialog + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index e5a217beb..787d049ef 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -1,4 +1,5 @@ #include "MainWindow.h" +#include "Windows/AboutDialog.h" #include "EventBrowser.h" #include "TextureViewer.h" #include "ui_MainWindow.h" @@ -52,3 +53,9 @@ void MainWindow::on_action_Open_Log_triggered() thread->start(); } } + +void MainWindow::on_action_About_triggered() +{ + AboutDialog about(this); + about.exec(); +} diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index 05344b3c2..3fa1fb74a 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -21,7 +21,7 @@ class MainWindow : public QMainWindow private slots: void on_action_Exit_triggered(); - + void on_action_About_triggered(); void on_action_Open_Log_triggered(); private: diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index ded9c8aa8..afed48853 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -65,6 +65,7 @@ SOURCES += Code/main.cpp \ Windows/MainWindow.cpp \ Windows/EventBrowser.cpp \ Windows/TextureViewer.cpp \ + Windows/AboutDialog.cpp \ Widgets/CustomPaintWidget.cpp \ 3rdparty/toolwindowmanager/ToolWindowManager.cpp \ 3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \ @@ -77,6 +78,7 @@ SOURCES += Code/main.cpp \ HEADERS += Windows/MainWindow.h \ Windows/EventBrowser.h \ Windows/TextureViewer.h \ + Windows/AboutDialog.h \ Widgets/CustomPaintWidget.h \ 3rdparty/toolwindowmanager/ToolWindowManager.h \ 3rdparty/toolwindowmanager/ToolWindowManagerArea.h \ @@ -88,7 +90,8 @@ HEADERS += Windows/MainWindow.h \ FORMS += Windows/MainWindow.ui \ Windows/EventBrowser.ui \ - Windows/TextureViewer.ui + Windows/TextureViewer.ui \ + Windows/AboutDialog.ui RESOURCES += \ resources.qrc