From bebb9a2c181ef1d97825bbed0eda9fc8d25497a6 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Tue, 13 Dec 2011 12:06:25 +0100
Subject: [PATCH] moved about-menuitem to help-menu
---
Gui/mainwindow.cpp | 2 ++
Gui/mainwindow.ui | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index ccefcff4a61..0d223c4d79f 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -727,7 +727,9 @@ void MainWindow::about()
QString about = tr("Built on %1\nOGS Version: %2\n\n").arg(
QDate::currentDate().toString()).arg(ogsVersion);
#ifdef OGS_BUILD_INFO
+#ifdef SVN_REVISION
about.append(QString("Svn commit: %1\n").arg(SVN_REVISION));
+#endif
#ifdef GIT_COMMIT_INFO
QString gitCommit = QString(GIT_COMMIT_INFO);
about.append(QString("Git commit: %1\n").arg(gitCommit.mid(7)));
diff --git a/Gui/mainwindow.ui b/Gui/mainwindow.ui
index 08bb9ad0e07..aad1c105991 100644
--- a/Gui/mainwindow.ui
+++ b/Gui/mainwindow.ui
@@ -81,7 +81,7 @@
<x>0</x>
<y>0</y>
<width>801</width>
- <height>22</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -106,7 +106,6 @@
<addaction name="separator"/>
<addaction name="menuExport"/>
<addaction name="separator"/>
- <addaction name="actionAbout"/>
<addaction name="separator"/>
<addaction name="action_Exit"/>
</widget>
@@ -131,10 +130,17 @@
<addaction name="actionDiagram_Viewer"/>
<addaction name="actionFEM_Test"/>
</widget>
+ <widget class="QMenu" name="menuHelp">
+ <property name="title">
+ <string>Help</string>
+ </property>
+ <addaction name="actionAbout"/>
+ </widget>
<addaction name="menu_File"/>
<addaction name="menuTools"/>
<addaction name="menuWindows"/>
<addaction name="menuSettings"/>
+ <addaction name="menuHelp"/>
</widget>
<widget class="QToolBar" name="mainToolBar">
<attribute name="toolBarArea">
--
GitLab