diff options
author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-18 22:20:34 -0700 |
---|---|---|
committer | Jay Sorg <jay.sorg@gmail.com> | 2013-07-18 22:20:34 -0700 |
commit | 89daffaaef626c82f0a7822b1679d0703990667b (patch) | |
tree | 219df455de50728f42c98dc210554bb7bdb24fe2 /vrplayer | |
parent | 4322a136f1d23585e6b95c9d38e1f56de4cb81d0 (diff) | |
download | xrdp-proprietary-89daffaaef626c82f0a7822b1679d0703990667b.tar.gz xrdp-proprietary-89daffaaef626c82f0a7822b1679d0703990667b.zip |
vrplayer: added help about and fix seg fault when closing
Diffstat (limited to 'vrplayer')
-rw-r--r-- | vrplayer/mainwindow.cpp | 10 | ||||
-rw-r--r-- | vrplayer/mainwindow.h | 2 | ||||
-rw-r--r-- | vrplayer/mainwindow.ui | 12 |
3 files changed, 24 insertions, 0 deletions
diff --git a/vrplayer/mainwindow.cpp b/vrplayer/mainwindow.cpp index ec2d338a..4c8ea2b1 100644 --- a/vrplayer/mainwindow.cpp +++ b/vrplayer/mainwindow.cpp @@ -483,3 +483,13 @@ void MainWindow::onMoveCompleted() interface->setVcrOp(VCR_PLAY); vcrFlag = VCR_PLAY; } + +void MainWindow::on_actionAbout_triggered() +{ + QMessageBox msgBox; + + msgBox.setText("VRPlayer version 1.2"); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.exec(); +} diff --git a/vrplayer/mainwindow.h b/vrplayer/mainwindow.h index 56f94edb..50663408 100644 --- a/vrplayer/mainwindow.h +++ b/vrplayer/mainwindow.h @@ -79,6 +79,8 @@ private slots: void onSliderActionTriggered(int value); void onMoveCompleted(); + void on_actionAbout_triggered(); + protected: void resizeEvent(QResizeEvent *e); void closeEvent(QCloseEvent *e); diff --git a/vrplayer/mainwindow.ui b/vrplayer/mainwindow.ui index af924894..b9c2a85c 100644 --- a/vrplayer/mainwindow.ui +++ b/vrplayer/mainwindow.ui @@ -31,7 +31,14 @@ <addaction name="separator"/> <addaction name="actionExit"/> </widget> + <widget class="QMenu" name="menuHelp"> + <property name="title"> + <string>Help</string> + </property> + <addaction name="actionAbout"/> + </widget> <addaction name="menuFile"/> + <addaction name="menuHelp"/> </widget> <widget class="QToolBar" name="mainToolBar"> <attribute name="toolBarArea"> @@ -55,6 +62,11 @@ <string>Exit application</string> </property> </action> + <action name="actionAbout"> + <property name="text"> + <string>About</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources/> |