Skip to content

Commit 2b5bbe5

Browse files
committed
Show help and about menu.
1 parent b6c756d commit 2b5bbe5

File tree

4 files changed

+36
-1
lines changed

4 files changed

+36
-1
lines changed

relightlab/mainwindow.cpp

+27-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "rtiframe.h"
1717
#include "normalsframe.h"
1818
#include "queueframe.h"
19-
19+
#include "helpbutton.h"
2020

2121
#include <QMessageBox>
2222
#include <QDebug>
@@ -85,6 +85,24 @@ void MainWindow::createMenu() {
8585
menuFile->addSeparator();
8686
menuFile->addAction(qRelightApp->action("exit"));
8787

88+
QMenu *menuView= new QMenu(menubar);
89+
menuView->setTitle("View");
90+
91+
menuView->addAction(qRelightApp->action("view_rti"));
92+
menubar->addAction(menuView->menuAction());
93+
94+
QMenu *menuHelp = new QMenu(menubar);
95+
menuHelp->setTitle("Help");
96+
97+
QAction *help = qRelightApp->action("help");
98+
connect(help, SIGNAL(triggered()), this, SLOT(showHelp()));
99+
menuHelp->addAction(help);
100+
101+
QAction *about = qRelightApp->action("about");
102+
connect(about, SIGNAL(triggered()), this, SLOT(showAbout()));
103+
menuHelp->addAction(about);
104+
menubar->addAction(menuHelp->menuAction());
105+
88106
setMenuBar(menubar);
89107
}
90108

@@ -127,4 +145,12 @@ void MainWindow::init() {
127145
rti_frame->init();
128146
}
129147

148+
void MainWindow::showHelp() {
149+
HelpDialog &dialog = HelpDialog::instance();
150+
dialog.showPage("index");
151+
}
130152

153+
void MainWindow::showAbout() {
154+
HelpDialog &dialog = HelpDialog::instance();
155+
dialog.showPage("about");
156+
}

relightlab/mainwindow.h

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class MainWindow: public QMainWindow {
3232

3333
public slots:
3434
void showQueue();
35+
void showHelp();
36+
void showAbout();
3537

3638
protected:
3739

relightlab/relightapp.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ RelightApp::RelightApp(int &argc, char **argv): QApplication(argc, argv) {
104104
addAction("show_list", "Show list", "list", "");
105105
addAction("show_grid", "Show grid", "grid", "");
106106

107+
addAction("view_rti", "View RTI", "cast", "");
108+
109+
addAction("help", "Help", "help-circle", "");
110+
addAction("about", "About", "info", "");
111+
107112

108113
if(QSystemTrayIcon::isSystemTrayAvailable()) {
109114
QIcon icon(":/relight.png");

relightlab/res.qrc

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<file>icons/dark/index.theme</file>
2727
<file>icons/dark/scalable/grid.svg</file>
2828
<file>icons/dark/scalable/help-circle.svg</file>
29+
<file>icons/dark/scalable/info.svg</file>
2930
<file>icons/dark/scalable/rotate-ccw</file>
3031
<file>icons/dark/scalable/rotate-ccw.svg</file>
3132
<file>icons/dark/scalable/rotate-cw</file>
@@ -51,6 +52,7 @@
5152
<file>icons/light/scalable/folder.svg</file>
5253
<file>icons/light/scalable/grid.svg</file>
5354
<file>icons/light/scalable/help-circle.svg</file>
55+
<file>icons/light/scalable/info.svg</file>
5456
<file>icons/light/scalable/highlight.svg</file>
5557
<file>icons/light/scalable/home.svg</file>
5658
<file>icons/light/scalable/image.svg</file>

0 commit comments

Comments
 (0)