Merge remote-tracking branch 'origin/feature/8132_help_page'

mantidproject · Oct 18, 2013 · 9cfe648 · 9cfe648
2 parents 095bb6f + 02a12f6
commit 9cfe648
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Code/Mantid/scripts/Reflectometry/isis_reflgui/reflgui.py b/Code/Mantid/scripts/Reflectometry/isis_reflgui/reflgui.py
@@ -413,11 +413,12 @@ def setupUi(self, MainWindow):
         self.menuBar.setObjectName(_fromUtf8("menuBar"))
         self.menuFile = QtGui.QMenu(self.menuBar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
+
         MainWindow.setMenuBar(self.menuBar)
         self.statusBar = QtGui.QStatusBar(MainWindow)
         self.statusBar.setObjectName(_fromUtf8("statusBar"))
         MainWindow.setStatusBar(self.statusBar)
-
+        
         self.actionInter = QtGui.QAction(MainWindow)
         self.actionInter.setObjectName(_fromUtf8("actionInter"))
         self.actionSURF = QtGui.QAction(MainWindow)
@@ -432,6 +433,7 @@ def setupUi(self, MainWindow):
         self.actionSave_table.setObjectName(_fromUtf8("actionSave_table"))
         self.actionSave_table.setShortcut('Ctrl+S')
         self.actionLoad_table = QtGui.QAction(MainWindow)
+
         self.actionLoad_table.setObjectName(_fromUtf8("actionLoad_table"))
         self.actionLoad_table.setShortcut('Ctrl+O')
         self.actionReLoad_table = QtGui.QAction(MainWindow)
@@ -445,6 +447,11 @@ def setupUi(self, MainWindow):
         self.menuFile.addAction(self.actionReLoad_table)
         self.menuFile.addAction(self.actionSaveDialog)
         self.menuBar.addAction(self.menuFile.menuAction())
+
+        self.helpMenu = self.menuBar.addMenu("&Help")
+        self.actionHelp_page = QtGui.QAction("Mantid Help", MainWindow)
+        self.actionHelp_page.setShortcut('Ctrl+H')
+        self.helpMenu.addAction(self.actionHelp_page)
 
 
         self.retranslateUi(MainWindow)
@@ -462,6 +469,7 @@ def setupUi(self, MainWindow):
         QtCore.QObject.connect(self.actionLoad_table, QtCore.SIGNAL(_fromUtf8("triggered()")), self.loadDialog)
         QtCore.QObject.connect(self.actionReLoad_table, QtCore.SIGNAL(_fromUtf8("triggered()")), self.ReloadDialog)
         QtCore.QObject.connect(self.actionSaveDialog, QtCore.SIGNAL(_fromUtf8("triggered()")), self.saveWksp)
+        QtCore.QObject.connect(self.actionHelp_page, QtCore.SIGNAL(_fromUtf8("triggered()")), self.showHelp)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
@@ -609,6 +617,10 @@ def unTickAll(self):
                 self.tableWidget.cellWidget(row, 17).setCheckState(False)
             # self.tableWidget.setCellWidget(row, 17, item)
 
+    def showHelp(self):
+        import webbrowser
+        webbrowser.open('http://www.mantidproject.org/ISIS_Reflectometry_GUI')
+
 #--------- If "Process" button pressed, convert raw files to IvsLam and IvsQ and combine if checkbox ticked -------------
     def buttonClickHandler1(self):
         rows = []