Merge remote-tracking branch 'upstream/release-next'

Framework/Kernel/src/ErrorReporter.cpp

@@ -102,6 +102,9 @@ std::string ErrorReporter::generateErrorMessage() {
   if (m_share) {
     message["email"] = m_email;
     message["name"] = m_name;
+  } else {
+    message["email"] = "";
+    message["name"] = "";
   }
 
   ::Json::FastWriter writer;

MantidPlot/CMakeLists.txt

@@ -668,6 +668,7 @@ qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/images.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/MantidWidgets.qrc )
 qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images//fonts/fonts.qrc )
 qt4_add_resources ( RES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/icons.qrc )
+qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/scripts/ErrorReporter/errorreporter.qrc )
 
 ###########################################################################
 # Add the dependencies

MantidPlot/src/Mantid/MantidApplication.cpp

@@ -86,7 +86,8 @@ bool MantidApplication::notify(QObject *receiver, QEvent *event) {
                        "ErrorReporterPresenter"
                        "\nfrom ErrorReporter.errorreport import CrashReportPage"
                        "\npage = CrashReportPage(show_continue_terminate=True)"
-                       "\npresenter = ErrorReporterPresenter(page, '')");
+                       "\npresenter = ErrorReporterPresenter(page, '')"
+                       "\npresenter.show_view()");
 
     emit runAsPythonScript(pythonCode);
   } else if (error) {

buildconfig/CMake/VersionNumber.cmake

 # Set the version number here for MantidVersion and the package filenames
 
 set ( VERSION_MAJOR 3 )
-set ( VERSION_MINOR 12 )
+set ( VERSION_MINOR 13 )
 
 # UNCOMMENT the next 'set' line to 'force' the patch version number to
 # a value (instead of using the count coming out of 'git describe')
 # DO NOT COMMIT THIS TO MASTER UNCOMMENTED, ONLY TO A RELEASE BRANCH
-#set ( VERSION_PATCH 0 )
+set ( VERSION_PATCH 0 )

scripts/ErrorReporter/error_dialog_app.py

@@ -30,9 +30,11 @@ def main():
         return int(command_line_args.exit_code)
     app = QtGui.QApplication(sys.argv)
     form = CrashReportPage(show_continue_terminate=False)
-    ErrorReporterPresenter(form, command_line_args.exit_code)
+    presenter = ErrorReporterPresenter(form, command_line_args.exit_code)
+    presenter.show_view()
     app.exec_()
     return int(command_line_args.exit_code)
 
+
 if __name__ == '__main__':              # if we're running file directly and not importing it
     sys.exit(main())                              # run the main function

scripts/ErrorReporter/error_report_presenter.py

@@ -2,24 +2,21 @@ from mantid.kernel import ErrorReporter, UsageService
 from mantid.kernel import Logger
 
 
-class ErrorReporterPresenter():
+class ErrorReporterPresenter(object):
     def __init__(self, view, exit_code):
+        self.error_log = Logger("error")
         self._view = view
         self._exit_code = exit_code
-        self._view.connect_signal(self.error_handler)
-        self._view.show()
-        self.error_log = Logger("error")
+        self._view.action.connect(self.error_handler)
 
     def error_handler(self, continue_working, share, name, email):
         if share == 0:
             errorReporter = ErrorReporter(
-                "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code,
-                True, str(name), str(email))
+                "mantidplot", UsageService.getUpTime(), self._exit_code, True, str(name), str(email))
             errorReporter.sendErrorReport()
         elif share == 1:
             errorReporter = ErrorReporter(
-                "mantidplot",UsageService.getUpTime(), UsageService.isEnabled(), self._exit_code,
-                False, str(name), str(email))
+                "mantidplot", UsageService.getUpTime(), self._exit_code, False, str(name), str(email))
             errorReporter.sendErrorReport()
 
         if not continue_working:
@@ -27,3 +24,6 @@ class ErrorReporterPresenter():
             self._view.quit()
         else:
             self.error_log.error("Continue working.")
+
+    def show_view(self):
+        self._view.show()

scripts/ErrorReporter/errorreport.py

@@ -39,9 +39,6 @@ class CrashReportPage(QtGui.QWidget, ui_errorreport.Ui_Errorreport):
     def quit (self):
         self.quit_signal.emit()
 
-    def connect_signal(self, slot):
-        self.action.connect(slot)
-
     def fullShare(self):
         self.action.emit(self.continue_working, 0, self.input_name, self.input_email)
         self.close()